diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index a4a653b175..fedcd5d75f 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -134,7 +134,9 @@ /pkgs/development/ruby-modules @marsam # Rust -/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq +/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq @winterqt @figsoda +/pkgs/build-support/rust @zowoq @winterqt @figsoda +/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda # C compilers /pkgs/development/compilers/gcc @matthewbauer diff --git a/third_party/nixpkgs/.github/workflows/backport.yml b/third_party/nixpkgs/.github/workflows/backport.yml index 2e70517846..f402376ebf 100644 --- a/third_party/nixpkgs/.github/workflows/backport.yml +++ b/third_party/nixpkgs/.github/workflows/backport.yml @@ -24,7 +24,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs - uses: korthout/backport-action@v1.0.1 + uses: korthout/backport-action@v1.1.0 with: # Config README: https://github.com/korthout/backport-action#backport-action pull_description: |- diff --git a/third_party/nixpkgs/.github/workflows/editorconfig.yml b/third_party/nixpkgs/.github/workflows/editorconfig.yml index 081bd6146a..ae411fefbe 100644 --- a/third_party/nixpkgs/.github/workflows/editorconfig.yml +++ b/third_party/nixpkgs/.github/workflows/editorconfig.yml @@ -11,7 +11,7 @@ on: jobs: tests: runs-on: ubuntu-latest - if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip editorconfig]')" + if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: - name: Get list of changed files from PR env: diff --git a/third_party/nixpkgs/.github/workflows/labels.yml b/third_party/nixpkgs/.github/workflows/labels.yml index 5f949ddc56..35f5f24ce3 100644 --- a/third_party/nixpkgs/.github/workflows/labels.yml +++ b/third_party/nixpkgs/.github/workflows/labels.yml @@ -16,7 +16,7 @@ permissions: jobs: labels: runs-on: ubuntu-latest - if: github.repository_owner == 'NixOS' + if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: - uses: actions/labeler@v4 with: diff --git a/third_party/nixpkgs/doc/builders/images/dockertools.section.md b/third_party/nixpkgs/doc/builders/images/dockertools.section.md index dfc012b80c..2467739a1a 100644 --- a/third_party/nixpkgs/doc/builders/images/dockertools.section.md +++ b/third_party/nixpkgs/doc/builders/images/dockertools.section.md @@ -145,7 +145,7 @@ Create a Docker image with many of the store paths being on their own layer to i `architecture` is _optional_ and used to specify the image architecture, this is useful for multi-architecture builds that don't need cross compiling. If not specified it will default to `hostPlatform`. -: Run-time configuration of the container. A full list of the options are available at in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions). +: Run-time configuration of the container. A full list of the options available is in the [Docker Image Specification v1.2.0](https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions). *Default:* `{}` diff --git a/third_party/nixpkgs/doc/builders/packages/citrix.section.md b/third_party/nixpkgs/doc/builders/packages/citrix.section.md index 4721f7e90f..bcf0924249 100644 --- a/third_party/nixpkgs/doc/builders/packages/citrix.section.md +++ b/third_party/nixpkgs/doc/builders/packages/citrix.section.md @@ -4,7 +4,7 @@ The [Citrix Workspace App](https://www.citrix.com/products/workspace-app/) is a ## Basic usage {#sec-citrix-base} -The tarball archive needs to be downloaded manually, as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store, the package can be built and installed with Nix. +The tarball archive needs to be downloaded manually, as the license agreements of the vendor for [Citrix Workspace](https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html) needs to be accepted first. Then run `nix-prefetch-url file://$PWD/linuxx64-$version.tar.gz`. With the archive available in the store, the package can be built and installed with Nix. ## Citrix Self-service {#sec-citrix-selfservice} @@ -19,7 +19,7 @@ $ selfservice ## Custom certificates {#sec-citrix-custom-certs} -The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However, several companies using Citrix might require their own corporate certificate. On distros with imperative packaging, these certs can be stored easily in [`$ICAROOT`](https://developer-docs.citrix.com/projects/receiver-for-linux-command-reference/en/13.7/), however this directory is a store path in `nixpkgs`. In order to work around this issue, the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`: +The `Citrix Workspace App` in `nixpkgs` trusts several certificates [from the Mozilla database](https://curl.haxx.se/docs/caextract.html) by default. However, several companies using Citrix might require their own corporate certificate. On distros with imperative packaging, these certs can be stored easily in [`$ICAROOT`](https://citrix.github.io/receiver-for-linux-command-reference/), however this directory is a store path in `nixpkgs`. In order to work around this issue, the package provides a simple mechanism to add custom certificates without rebuilding the entire package using `symlinkJoin`: ```nix with import { config.allowUnfree = true; }; diff --git a/third_party/nixpkgs/doc/builders/packages/ibus.section.md b/third_party/nixpkgs/doc/builders/packages/ibus.section.md index 1b09d3fbba..ec78cd0c9a 100644 --- a/third_party/nixpkgs/doc/builders/packages/ibus.section.md +++ b/third_party/nixpkgs/doc/builders/packages/ibus.section.md @@ -4,7 +4,7 @@ This package is an ibus-based completion method to speed up typing. ## Activating the engine {#sec-ibus-typing-booster-activate} -IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/documentation.html). +IBus needs to be configured accordingly to activate `typing-booster`. The configuration depends on the desktop manager in use. For detailed instructions, please refer to the [upstream docs](https://mike-fabian.github.io/ibus-typing-booster/). On NixOS, you need to explicitly enable `ibus` with given engines before customizing your desktop to use `typing-booster`. This can be achieved using the `ibus` module: diff --git a/third_party/nixpkgs/doc/builders/testers.chapter.md b/third_party/nixpkgs/doc/builders/testers.chapter.md index 3d91f09605..a0f0f97f9d 100644 --- a/third_party/nixpkgs/doc/builders/testers.chapter.md +++ b/third_party/nixpkgs/doc/builders/testers.chapter.md @@ -1,6 +1,19 @@ # Testers {#chap-testers} This chapter describes several testing builders which are available in the testers namespace. +## `hasPkgConfigModule` {#tester-hasPkgConfigModule} + +Checks whether a package exposes a certain `pkg-config` module. + +Example: + +```nix +passthru.tests.pkg-config = testers.hasPkgConfigModule { + package = finalAttrs.finalPackage; + moduleName = "libfoo"; +} +``` + ## `testVersion` {#tester-testVersion} Checks the command output contains the specified version diff --git a/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md b/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md index 889b4114ac..a732eee4b9 100644 --- a/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md +++ b/third_party/nixpkgs/doc/contributing/contributing-to-documentation.chapter.md @@ -27,7 +27,7 @@ If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual. As per [RFC 0072](https://github.com/NixOS/rfcs/pull/72), all new documentation content should be written in [CommonMark](https://commonmark.org/) Markdown dialect. -Additional syntax extensions are available, though not all extensions can be used in NixOS option documentation. The following extensions are currently used: +Additional syntax extensions are available, all of which can be used in NixOS option documentation. The following extensions are currently used: - []{#ssec-contributing-markup-anchors} Explicitly defined **anchors** on headings, to allow linking to sections. These should be always used, to ensure the anchors can be linked even when the heading text changes, and to prevent conflicts between [automatically assigned identifiers](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/auto_identifiers.md). @@ -38,6 +38,10 @@ Additional syntax extensions are available, though not all extensions can be use ## Syntax {#sec-contributing-markup} ``` + ::: {.note} + NixOS option documentation does not support headings in general. + ::: + - []{#ssec-contributing-markup-anchors-inline} **Inline anchors**, which allow linking arbitrary place in the text (e.g. individual list items, sentences…). @@ -67,10 +71,6 @@ Additional syntax extensions are available, though not all extensions can be use This syntax is taken from [MyST](https://myst-parser.readthedocs.io/en/latest/syntax/syntax.html#roles-an-in-line-extension-point). Though, the feature originates from [reStructuredText](https://www.sphinx-doc.org/en/master/usage/restructuredtext/roles.html#role-manpage) with slightly different syntax. - ::: {.note} - Inline roles are available for option documentation. - ::: - - []{#ssec-contributing-markup-admonitions} **Admonitions**, set off from the text to bring attention to something. @@ -96,10 +96,6 @@ Additional syntax extensions are available, though not all extensions can be use - [`tip`](https://tdg.docbook.org/tdg/5.0/tip.html) - [`warning`](https://tdg.docbook.org/tdg/5.0/warning.html) - ::: {.note} - Admonitions are available for option documentation. - ::: - - []{#ssec-contributing-markup-definition-lists} [**Definition lists**](https://github.com/jgm/commonmark-hs/blob/master/commonmark-extensions/test/definition_lists.md), for defining a group of terms: diff --git a/third_party/nixpkgs/doc/hooks/postgresql-test-hook.section.md b/third_party/nixpkgs/doc/hooks/postgresql-test-hook.section.md index 64f7fd415b..8b37ca1e4b 100644 --- a/third_party/nixpkgs/doc/hooks/postgresql-test-hook.section.md +++ b/third_party/nixpkgs/doc/hooks/postgresql-test-hook.section.md @@ -9,7 +9,7 @@ stdenv.mkDerivation { # ... - checkInputs = [ + nativeCheckInputs = [ postgresql postgresqlTestHook ]; @@ -46,6 +46,12 @@ Bash-only variables: - `postgresqlEnableTCP`: set to `1` to enable TCP listening. Flaky; not recommended. - `postgresqlStartCommands`: defaults to `pg_ctl start`. +## Hooks {#sec-postgresqlTestHook-hooks} + +A number of additional hooks are ran in postgresqlTestHook + + - `postgresqlTestSetupPost`: ran after postgresql has been set up. + ## TCP and the Nix sandbox {#sec-postgresqlTestHook-tcp} `postgresqlEnableTCP` relies on network sandboxing, which is not available on macOS and some custom Nix installations, resulting in flaky tests. diff --git a/third_party/nixpkgs/doc/languages-frameworks/android.section.md b/third_party/nixpkgs/doc/languages-frameworks/android.section.md index 15b8d3839b..6f9717ca09 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/android.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/android.section.md @@ -13,6 +13,7 @@ with import {}; let androidComposition = androidenv.composeAndroidPackages { + cmdLineToolsVersion = "8.0"; toolsVersion = "26.1.1"; platformToolsVersion = "30.0.5"; buildToolsVersions = [ "30.0.3" ]; @@ -42,7 +43,10 @@ exceptions are the tools, platform-tools and build-tools sub packages. The following parameters are supported: -* `toolsVersion`, specifies the version of the tools package to use +* `cmdLineToolsVersion `, specifies the version of the `cmdline-tools` package to use +* `toolsVersion`, specifies the version of the `tools` package. Notice `tools` is + obsolete, and currently only `26.1.1` is available, so there's not a lot of + options here, however, you can set it as `null` if you don't want it. * `platformsToolsVersion` specifies the version of the `platform-tools` plugin * `buildToolsVersions` specifies the versions of the `build-tools` plugins to use. diff --git a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md index 63f49adccb..6b3a369c29 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md @@ -128,7 +128,7 @@ You will need to run the build process once to fix the hash to correspond to you ###### FOD {#fixed-output-derivation} -A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [elixir_ls](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/beam-modules/elixir_ls.nix) for a usage example of FOD. +A fixed output derivation will download mix dependencies from the internet. To ensure reproducibility, a hash will be supplied. Note that mix is relatively reproducible. An FOD generating a different hash on each run hasn't been observed (as opposed to npm where the chances are relatively high). See [elixir_ls](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/beam-modules/elixir-ls/default.nix) for a usage example of FOD. Practical steps diff --git a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md index bfb193b1f0..30a12d4e8f 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md @@ -28,13 +28,13 @@ mkShell { packages = [ (with dotnetCorePackages; combinePackages [ sdk_3_1 - sdk_5_0 + sdk_6_0 ]) ]; } ``` -This will produce a dotnet installation that has the dotnet 3.1, 3.0, and 2.1 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: +This will produce a dotnet installation that has the dotnet 3.1 6.0 sdk. The first sdk listed will have it's cli utility present in the resulting environment. Example info output: ```ShellSession $ dotnet --info @@ -120,7 +120,7 @@ in buildDotnetModule rec { projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure. dotnet-sdk = dotnetCorePackages.sdk_3_1; - dotnet-runtime = dotnetCorePackages.net_5_0; + dotnet-runtime = dotnetCorePackages.net_6_0; executables = [ "foo" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`. executables = []; # Don't install any executables. diff --git a/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md b/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md index d5996cce13..0d4865b7af 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/gnome.section.md @@ -34,7 +34,7 @@ To allow software to use various virtual file systems, `gvfs` package can be als ### GdkPixbuf loaders {#ssec-gnome-gdk-pixbuf-loaders} -GTK applications typically use [GdkPixbuf](https://developer.gnome.org/gdk-pixbuf/stable/) to load images. But `gdk-pixbuf` package only supports basic bitmap formats like JPEG, PNG or TIFF, requiring to use third-party loader modules for other formats. This is especially painful since GTK itself includes SVG icons, which cannot be rendered without a loader provided by `librsvg`. +GTK applications typically use [GdkPixbuf](https://gitlab.gnome.org/GNOME/gdk-pixbuf/) to load images. But `gdk-pixbuf` package only supports basic bitmap formats like JPEG, PNG or TIFF, requiring to use third-party loader modules for other formats. This is especially painful since GTK itself includes SVG icons, which cannot be rendered without a loader provided by `librsvg`. Unlike other libraries mentioned in this section, GdkPixbuf only supports a single value in its controlling environment variable `GDK_PIXBUF_MODULE_FILE`. It is supposed to point to a cache file containing information about the available loaders. Each loader package will contain a `lib/gdk-pixbuf-2.0/2.10.0/loaders.cache` file describing the default loaders in `gdk-pixbuf` package plus the loader contained in the package itself. If you want to use multiple third-party loaders, you will need to create your own cache file manually. Fortunately, this is pretty rare as [not many loaders exist](https://gitlab.gnome.org/federico/gdk-pixbuf-survey/blob/master/src/modules.md). @@ -70,7 +70,7 @@ Also make sure that `icon-theme.cache` is installed for each theme provided by t ### GTK Themes {#ssec-gnome-themes} -Previously, a GTK theme needed to be in `XDG_DATA_DIRS`. This is no longer necessary for most programs since GTK incorporated Adwaita theme. Some programs (for example, those designed for [elementary HIG](https://elementary.io/docs/human-interface-guidelines#human-interface-guidelines)) might require a special theme like `pantheon.elementary-gtk-theme`. +Previously, a GTK theme needed to be in `XDG_DATA_DIRS`. This is no longer necessary for most programs since GTK incorporated Adwaita theme. Some programs (for example, those designed for [elementary HIG](https://docs.elementary.io/hig)) might require a special theme like `pantheon.elementary-gtk-theme`. ### GObject introspection typelibs {#ssec-gnome-typelibs} diff --git a/third_party/nixpkgs/doc/languages-frameworks/index.xml b/third_party/nixpkgs/doc/languages-frameworks/index.xml index 7d404643d3..3774924c0b 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/index.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/index.xml @@ -32,6 +32,7 @@ + diff --git a/third_party/nixpkgs/doc/languages-frameworks/ocaml.section.md b/third_party/nixpkgs/doc/languages-frameworks/ocaml.section.md index 347b2ea2ec..1e5a5cb453 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/ocaml.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/ocaml.section.md @@ -129,3 +129,8 @@ packaged libraries may still use the old spelling: maintainers are invited to fix this when updating packages. Massive renaming is strongly discouraged as it would be challenging to review, difficult to test, and will cause unnecessary rebuild. + +The build will automatically fail if two distinct versions of the same library +are added to `buildInputs` (which usually happens transitively because of +`propagatedBuildInputs`). Set `dontDetectOcamlConflicts` to true to disable this +behavior. diff --git a/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md b/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md new file mode 100644 index 0000000000..ee0a471be3 --- /dev/null +++ b/third_party/nixpkgs/doc/languages-frameworks/pkg-config.section.md @@ -0,0 +1,9 @@ +# pkg-config {#sec-pkg-config} + +*pkg-config* is a unified interface for declaring and querying built C/C++ libraries. + +Nixpkgs provides a couple of facilities for working with this tool. + + - A [setup hook](#setup-hook-pkg-config) bundled with in the `pkg-config` package, to bring a derivation's declared build inputs into the environment. + - The [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), for packages that provide pkg-config modules. + - The `defaultPkgConfigPackages` package set: a set of aliases, named after the modules they provide. This is meant to be used by language-to-nix integrations. Hand-written packages should use the normal Nixpkgs attribute name instead. diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index 2f15d0f046..c1945adb1c 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -58,7 +58,7 @@ with a nix-shell that has `numpy` and `toolz` in Python 3.9; then we will create a re-usable environment in a single-file Python script; then we will create a full Python environment for development with this same environment. -Philosphically, this should be familiar to users who are used to a `venv` style +Philosophically, this should be familiar to users who are used to a `venv` style of development: individual projects create their own Python environments without impacting the global environment or each other. @@ -436,7 +436,7 @@ arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is exclusively a build-time dependency, then the dependency should be included in `buildInputs`, but if it is (also) a runtime dependency, then it should be added to `propagatedBuildInputs`. Test dependencies are considered -build-time dependencies and passed to `checkInputs`. +build-time dependencies and passed to `nativeCheckInputs`. The following example shows which arguments are given to `buildPythonPackage` in order to build [`datashape`](https://github.com/blaze/datashape). @@ -453,7 +453,7 @@ buildPythonPackage rec { hash = "sha256-FLLvdm1MllKrgTGC6Gb0k0deZeVYvtCCLji/B7uhong="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ numpy multipledispatch python-dateutil ]; meta = with lib; { @@ -466,7 +466,7 @@ buildPythonPackage rec { ``` We can see several runtime dependencies, `numpy`, `multipledispatch`, and -`python-dateutil`. Furthermore, we have one `checkInputs`, i.e. `pytest`. `pytest` is a +`python-dateutil`. Furthermore, we have one `nativeCheckInputs`, i.e. `pytest`. `pytest` is a test runner and is only used during the `checkPhase` and is therefore not added to `propagatedBuildInputs`. @@ -569,7 +569,7 @@ Pytest is the most common test runner for python repositories. A trivial test run would be: ``` - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' runHook preCheck @@ -585,7 +585,7 @@ sandbox, and will generally need many tests to be disabled. To filter tests using pytest, one can do the following: ``` - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # avoid tests which need additional data or touch network checkPhase = '' runHook preCheck @@ -618,7 +618,7 @@ when a package may need many items disabled to run the test suite. Using the example above, the analogous `pytestCheckHook` usage would be: ``` - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # requires additional data pytestFlagsArray = [ "tests/" "--ignore=tests/integration" ]; @@ -744,17 +744,17 @@ work in any of the formats supported by `buildPythonPackage` currently, with the exception of `other` (see `format` in [`buildPythonPackage` parameters](#buildpythonpackage-parameters) for more details). -### Using unittestCheckHook {#using-unittestcheckhook} +#### Using unittestCheckHook {#using-unittestcheckhook} `unittestCheckHook` is a hook which will substitute the setuptools `test` command for a `checkPhase` which runs `python -m unittest discover`: ``` - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; - unittestFlags = [ "-s" "tests" "-v" ]; + unittestFlagsArray = [ "-s" "tests" "-v" ]; ``` -##### Using sphinxHook {#using-sphinxhook} +#### Using sphinxHook {#using-sphinxhook} The `sphinxHook` is a helpful tool to build documentation and manpages using the popular Sphinx documentation generator. @@ -1006,7 +1006,7 @@ buildPythonPackage rec { rm testing/test_argcomplete.py ''; - checkInputs = [ hypothesis ]; + nativeCheckInputs = [ hypothesis ]; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy ]; @@ -1028,7 +1028,7 @@ The `buildPythonPackage` mainly does four things: * In the `installCheck` phase, `${python.interpreter} setup.py test` is run. By default tests are run because `doCheck = true`. Test dependencies, like -e.g. the test runner, should be added to `checkInputs`. +e.g. the test runner, should be added to `nativeCheckInputs`. By default `meta.platforms` is set to the same value as the interpreter unless overridden otherwise. @@ -1082,7 +1082,7 @@ because their behaviour is different: * `buildInputs ? []`: Build and/or run-time dependencies that need to be compiled for the host machine. Typically non-Python libraries which are being linked. -* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These +* `nativeCheckInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `nativeBuildInputs` when `doCheck = true`. Items listed in `tests_require` go here. * `propagatedBuildInputs ? []`: Aside from propagating dependencies, @@ -1416,7 +1416,7 @@ example of such a situation is when `py.test` is used. buildPythonPackage { # ... # assumes the tests are located in tests - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' runHook preCheck @@ -1768,7 +1768,7 @@ In a `setup.py` or `setup.cfg` it is common to declare dependencies: * `setup_requires` corresponds to `nativeBuildInputs` * `install_requires` corresponds to `propagatedBuildInputs` -* `tests_require` corresponds to `checkInputs` +* `tests_require` corresponds to `nativeCheckInputs` ## Contributing {#contributing} diff --git a/third_party/nixpkgs/doc/manpage-urls.json b/third_party/nixpkgs/doc/manpage-urls.json index 0ff4b762be..e83708dd64 100644 --- a/third_party/nixpkgs/doc/manpage-urls.json +++ b/third_party/nixpkgs/doc/manpage-urls.json @@ -1,5 +1,8 @@ { - "nix.conf(5)": "https://nixos.org/manual/nix/stable/#sec-conf-file", + "gnunet.conf(5)": "https://docs.gnunet.org/users/configuration.html", + "mpd(1)": "https://mpd.readthedocs.io/en/latest/mpd.1.html", + "mpd.conf(5)": "https://mpd.readthedocs.io/en/latest/mpd.conf.5.html", + "nix.conf(5)": "https://nixos.org/manual/nix/stable/command-ref/conf-file.html", "journald.conf(5)": "https://www.freedesktop.org/software/systemd/man/journald.conf.html", "logind.conf(5)": "https://www.freedesktop.org/software/systemd/man/logind.conf.html", diff --git a/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md b/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md index 5f7ff51395..e659e18038 100644 --- a/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md @@ -150,7 +150,7 @@ depsBuildBuild = [ buildPackages.stdenv.cc ]; Add the following to your `mkDerivation` invocation. ```nix -doCheck = stdenv.hostPlatform == stdenv.buildPlatform; +doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; ``` #### Package using Meson needs to run binaries for the host platform during build. {#cross-meson-runs-host-code} diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md index 7d861860a7..a12d68c093 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -253,7 +253,7 @@ The propagated equivalent of `depsTargetTarget`. This is prefixed for the same r #### `NIX_DEBUG` {#var-stdenv-NIX_DEBUG} -A natural number indicating how much information to log. If set to 1 or higher, `stdenv` will print moderate debugging information during the build. In particular, the `gcc` and `ld` wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the `stdenv` setup script will be run with `set -x` tracing. If set to 7 or higher, the `gcc` and `ld` wrapper scripts will also be run with `set -x` tracing. +A number between 0 and 7 indicating how much information to log. If set to 1 or higher, `stdenv` will print moderate debugging information during the build. In particular, the `gcc` and `ld` wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the `stdenv` setup script will be run with `set -x` tracing. If set to 7 or higher, the `gcc` and `ld` wrapper scripts will also be run with `set -x` tracing. ### Attributes affecting build properties {#attributes-affecting-build-properties} @@ -626,7 +626,7 @@ Before and after running `make`, the hooks `preBuild` and `postBuild` are called ### The check phase {#ssec-check-phase} -The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make check`, but only if the `doCheck` variable is enabled. +The check phase checks whether the package was built correctly by running its test suite. The default `checkPhase` calls `make $checkTarget`, but only if the `doCheck` variable is enabled (see below). #### Variables controlling the check phase {#variables-controlling-the-check-phase} @@ -646,7 +646,7 @@ See the [build phase](#var-stdenv-makeFlags) for details. ##### `checkTarget` {#var-stdenv-checkTarget} -The make target that runs the tests. Defaults to `check`. +The make target that runs the tests. Defaults to `check` if it exists, otherwise `test`; if neither is found, do nothing. ##### `checkFlags` / `checkFlagsArray` {#var-stdenv-checkFlags} @@ -654,7 +654,11 @@ A list of strings passed as additional flags to `make`. Like `makeFlags` and `ma ##### `checkInputs` {#var-stdenv-checkInputs} -A list of dependencies used by the phase. This gets included in `nativeBuildInputs` when `doCheck` is set. +A list of host dependencies used by the phase, usually libraries linked into executables built during tests. This gets included in `buildInputs` when `doCheck` is set. + +##### `nativeCheckInputs` {#var-stdenv-nativeCheckInputs} + +A list of native dependencies used by the phase, notably tools needed on `$PATH`. This gets included in `nativeBuildInputs` when `doCheck` is set. ##### `preCheck` {#var-stdenv-preCheck} @@ -821,7 +825,11 @@ A list of strings passed as additional flags to `make`. Like `makeFlags` and `ma ##### `installCheckInputs` {#var-stdenv-installCheckInputs} -A list of dependencies used by the phase. This gets included in `nativeBuildInputs` when `doInstallCheck` is set. +A list of host dependencies used by the phase, usually libraries linked into executables built during tests. This gets included in `buildInputs` when `doInstallCheck` is set. + +##### `nativeInstallCheckInputs` {#var-stdenv-nativeInstallCheckInputs} + +A list of native dependencies used by the phase, notably tools needed on `$PATH`. This gets included in `nativeBuildInputs` when `doInstallCheck` is set. ##### `preInstallCheck` {#var-stdenv-preInstallCheck} diff --git a/third_party/nixpkgs/lib/attrsets.nix b/third_party/nixpkgs/lib/attrsets.nix index 1a7b90593b..30952651ad 100644 --- a/third_party/nixpkgs/lib/attrsets.nix +++ b/third_party/nixpkgs/lib/attrsets.nix @@ -168,7 +168,7 @@ rec { ] { a.b.c = 0; } => { a = { b = { d = 1; }; }; x = { y = "xy"; }; } - Type: updateManyAttrsByPath :: [{ path :: [String], update :: (Any -> Any) }] -> AttrSet -> AttrSet + Type: updateManyAttrsByPath :: [{ path :: [String]; update :: (Any -> Any); }] -> AttrSet -> AttrSet */ updateManyAttrsByPath = let # When recursing into attributes, instead of updating the `path` of each @@ -414,7 +414,7 @@ rec { => { name = "some"; value = 6; } Type: - nameValuePair :: String -> Any -> { name :: String, value :: Any } + nameValuePair :: String -> Any -> { name :: String; value :: Any; } */ nameValuePair = # Attribute name @@ -449,7 +449,7 @@ rec { => { foo_x = "bar-a"; foo_y = "bar-b"; } Type: - mapAttrs' :: (String -> Any -> { name = String; value = Any }) -> AttrSet -> AttrSet + mapAttrs' :: (String -> Any -> { name :: String; value :: Any; }) -> AttrSet -> AttrSet */ mapAttrs' = # A function, given an attribute's name and value, returns a new `nameValuePair`. @@ -480,8 +480,13 @@ rec { /* Like `mapAttrs`, except that it recursively applies itself to - attribute sets. Also, the first argument of the argument - function is a *list* of the names of the containing attributes. + the *leaf* attributes of a potentially-nested attribute set: + the second argument of the function will never be an attrset. + Also, the first argument of the argument function is a *list* + of the attribute names that form the path to the leaf attribute. + + For a function that gives you control over what counts as a leaf, + see `mapAttrsRecursiveCond`. Example: mapAttrsRecursive (path: value: concatStringsSep "-" (path ++ [value])) @@ -644,7 +649,7 @@ rec { Example: zipAttrsWith (name: values: values) [{a = "x";} {a = "y"; b = "z";}] - => { a = ["x" "y"]; b = ["z"] } + => { a = ["x" "y"]; b = ["z"]; } Type: zipAttrsWith :: (String -> [ Any ] -> Any) -> [ AttrSet ] -> AttrSet @@ -659,7 +664,7 @@ rec { Example: zipAttrs [{a = "x";} {a = "y"; b = "z";}] - => { a = ["x" "y"]; b = ["z"] } + => { a = ["x" "y"]; b = ["z"]; } Type: zipAttrs :: [ AttrSet ] -> AttrSet diff --git a/third_party/nixpkgs/lib/customisation.nix b/third_party/nixpkgs/lib/customisation.nix index 101c9e62b9..42d711cf5f 100644 --- a/third_party/nixpkgs/lib/customisation.nix +++ b/third_party/nixpkgs/lib/customisation.nix @@ -252,7 +252,8 @@ rec { outputsList = map makeOutput outputs; drv' = (lib.head outputsList).value; - in lib.deepSeq drv' drv'; + in if drv == null then null else + lib.deepSeq drv' drv'; /* Make a set of packages with a common scope. All packages called with the provided `callPackage` will be evaluated with the same diff --git a/third_party/nixpkgs/lib/default.nix b/third_party/nixpkgs/lib/default.nix index 8ce1de33f5..b1441c7281 100644 --- a/third_party/nixpkgs/lib/default.nix +++ b/third_party/nixpkgs/lib/default.nix @@ -94,7 +94,7 @@ let subtractLists mutuallyExclusive groupBy groupBy'; inherit (self.strings) concatStrings concatMapStrings concatImapStrings intersperse concatStringsSep concatMapStringsSep - concatImapStringsSep makeSearchPath makeSearchPathOutput + concatImapStringsSep concatLines makeSearchPath makeSearchPathOutput makeLibraryPath makeBinPath optionalString hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape escapeShellArg escapeShellArgs diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix index 52956e52af..f22d140141 100644 --- a/third_party/nixpkgs/lib/licenses.nix +++ b/third_party/nixpkgs/lib/licenses.nix @@ -558,6 +558,12 @@ in mkLicense lset) ({ redistributable = false; }; + fair = { + fullName = "Fair License"; + spdxId = "Fair"; + free = true; + }; + issl = { fullName = "Intel Simplified Software License"; url = "https://software.intel.com/en-us/license/intel-simplified-software-license"; @@ -709,7 +715,12 @@ in mkLicense lset) ({ ncsa = { spdxId = "NCSA"; - fullName = "University of Illinois/NCSA Open Source License"; + fullName = "University of Illinois/NCSA Open Source License"; + }; + + nlpl = { + spdxId = "NLPL"; + fullName = "No Limit Public License"; }; nposl3 = { diff --git a/third_party/nixpkgs/lib/lists.nix b/third_party/nixpkgs/lib/lists.nix index 8b2c2d1280..9f69485b40 100644 --- a/third_party/nixpkgs/lib/lists.nix +++ b/third_party/nixpkgs/lib/lists.nix @@ -306,7 +306,7 @@ rec { /* Splits the elements of a list in two lists, `right` and `wrong`, depending on the evaluation of a predicate. - Type: (a -> bool) -> [a] -> { right :: [a], wrong :: [a] } + Type: (a -> bool) -> [a] -> { right :: [a]; wrong :: [a]; } Example: partition (x: x > 2) [ 5 1 2 3 4 ] @@ -374,7 +374,7 @@ rec { /* Merges two lists of the same size together. If the sizes aren't the same the merging stops at the shortest. - Type: zipLists :: [a] -> [b] -> [{ fst :: a, snd :: b}] + Type: zipLists :: [a] -> [b] -> [{ fst :: a; snd :: b; }] Example: zipLists [ 1 2 ] [ "a" "b" ] diff --git a/third_party/nixpkgs/lib/meta.nix b/third_party/nixpkgs/lib/meta.nix index 62894aeb31..5fd55c4e90 100644 --- a/third_party/nixpkgs/lib/meta.nix +++ b/third_party/nixpkgs/lib/meta.nix @@ -76,7 +76,9 @@ rec { 1. (legacy) a system string. - 2. (modern) a pattern for the platform `parsed` field. + 2. (modern) a pattern for the entire platform structure (see `lib.systems.inspect.platformPatterns`). + + 3. (modern) a pattern for the platform `parsed` field (see `lib.systems.inspect.patterns`). We can inject these into a pattern for the whole of a structured platform, and then match that. @@ -85,6 +87,8 @@ rec { pattern = if builtins.isString elem then { system = elem; } + else if elem?parsed + then elem else { parsed = elem; }; in lib.matchAttrs pattern platform; diff --git a/third_party/nixpkgs/lib/options.nix b/third_party/nixpkgs/lib/options.nix index ce66bfb9d5..d14d209a83 100644 --- a/third_party/nixpkgs/lib/options.nix +++ b/third_party/nixpkgs/lib/options.nix @@ -114,7 +114,7 @@ rec { You can omit the default path if the name of the option is also attribute path in nixpkgs. - Type: mkPackageOption :: pkgs -> string -> { default :: [string], example :: null | string | [string] } -> option + Type: mkPackageOption :: pkgs -> string -> { default :: [string]; example :: null | string | [string]; } -> option Example: mkPackageOption pkgs "hello" { } @@ -201,7 +201,7 @@ rec { /* Extracts values of all "value" keys of the given list. - Type: getValues :: [ { value :: a } ] -> [a] + Type: getValues :: [ { value :: a; } ] -> [a] Example: getValues [ { value = 1; } { value = 2; } ] // => [ 1 2 ] @@ -211,7 +211,7 @@ rec { /* Extracts values of all "file" keys of the given list - Type: getFiles :: [ { file :: a } ] -> [a] + Type: getFiles :: [ { file :: a; } ] -> [a] Example: getFiles [ { file = "file1"; } { file = "file2"; } ] // => [ "file1" "file2" ] diff --git a/third_party/nixpkgs/lib/strings.nix b/third_party/nixpkgs/lib/strings.nix index 2188fcb1db..68d9309506 100644 --- a/third_party/nixpkgs/lib/strings.nix +++ b/third_party/nixpkgs/lib/strings.nix @@ -128,6 +128,17 @@ rec { # List of input strings list: concatStringsSep sep (lib.imap1 f list); + /* Concatenate a list of strings, adding a newline at the end of each one. + Defined as `concatMapStrings (s: s + "\n")`. + + Type: concatLines :: [string] -> string + + Example: + concatLines [ "foo" "bar" ] + => "foo\nbar\n" + */ + concatLines = concatMapStrings (s: s + "\n"); + /* Construct a Unix-style, colon-separated search path consisting of the given `subDir` appended to each of the given paths. diff --git a/third_party/nixpkgs/lib/systems/inspect.nix b/third_party/nixpkgs/lib/systems/inspect.nix index a5fed5acf2..30615c9fde 100644 --- a/third_party/nixpkgs/lib/systems/inspect.nix +++ b/third_party/nixpkgs/lib/systems/inspect.nix @@ -7,6 +7,7 @@ let abis_ = abis; in let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis_; in rec { + # these patterns are to be matched against {host,build,target}Platform.parsed patterns = rec { isi686 = { cpu = cpuTypes.i686; }; isx86_32 = { cpu = { family = "x86"; bits = 32; }; }; @@ -81,8 +82,13 @@ rec { isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf muslabin32 muslabi64 ]; isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ]; - isEfi = map (family: { cpu.family = family; }) - [ "x86" "arm" "aarch64" "riscv" ]; + isEfi = [ + { cpu = { family = "arm"; version = "6"; }; } + { cpu = { family = "arm"; version = "7"; }; } + { cpu = { family = "arm"; version = "8"; }; } + { cpu = { family = "riscv"; }; } + { cpu = { family = "x86"; }; } + ]; }; matchAnyAttrs = patterns: @@ -90,4 +96,13 @@ rec { else matchAttrs patterns; predicates = mapAttrs (_: matchAnyAttrs) patterns; + + # these patterns are to be matched against the entire + # {host,build,target}Platform structure; they include a `parsed={}` marker so + # that `lib.meta.availableOn` can distinguish them from the patterns which + # apply only to the `parsed` field. + + platformPatterns = mapAttrs (_: p: { parsed = {}; } // p) { + isStatic = { isStatic = true; }; + }; } diff --git a/third_party/nixpkgs/lib/tests/maintainer-module.nix b/third_party/nixpkgs/lib/tests/maintainer-module.nix index 8cf8411b47..afa12587a9 100644 --- a/third_party/nixpkgs/lib/tests/maintainer-module.nix +++ b/third_party/nixpkgs/lib/tests/maintainer-module.nix @@ -7,7 +7,8 @@ in { type = types.str; }; email = lib.mkOption { - type = types.str; + type = types.nullOr types.str; + default = null; }; matrix = lib.mkOption { type = types.nullOr types.str; diff --git a/third_party/nixpkgs/lib/tests/maintainers.nix b/third_party/nixpkgs/lib/tests/maintainers.nix index 8a9a2b26ef..be1c8aaa85 100644 --- a/third_party/nixpkgs/lib/tests/maintainers.nix +++ b/third_party/nixpkgs/lib/tests/maintainers.nix @@ -1,5 +1,6 @@ # to run these tests (and the others) # nix-build nixpkgs/lib/tests/release.nix +# These tests should stay in sync with the comment in maintainers/maintainers-list.nix { # The pkgs used for dependencies for the testing itself pkgs ? import ../.. {} , lib ? pkgs.lib @@ -20,7 +21,7 @@ let ]; }).config; - checkGithubId = lib.optional (checkedAttrs.github != null && checkedAttrs.githubId == null) '' + checks = lib.optional (checkedAttrs.github != null && checkedAttrs.githubId == null) '' echo ${lib.escapeShellArg (lib.showOption prefix)}': If `github` is specified, `githubId` must be too.' # Calling this too often would hit non-authenticated API limits, but this # shouldn't happen since such errors will get fixed rather quickly @@ -28,8 +29,12 @@ let id=$(jq -r '.id' <<< "$info") echo "The GitHub ID for GitHub user ${checkedAttrs.github} is $id:" echo -e " githubId = $id;\n" + '' ++ lib.optional (checkedAttrs.email == null && checkedAttrs.github == null && checkedAttrs.matrix == null) '' + echo ${lib.escapeShellArg (lib.showOption prefix)}': At least one of `email`, `github` or `matrix` must be specified, so that users know how to reach you.' + '' ++ lib.optional (checkedAttrs.email != null && lib.hasSuffix "noreply.github.com" checkedAttrs.email) '' + echo ${lib.escapeShellArg (lib.showOption prefix)}': If an email address is given, it should allow people to reach you. If you do not want that, you can just provide `github` or `matrix` instead.' ''; - in lib.deepSeq checkedAttrs checkGithubId; + in lib.deepSeq checkedAttrs checks; missingGithubIds = lib.concatLists (lib.mapAttrsToList checkMaintainer lib.maintainers); diff --git a/third_party/nixpkgs/lib/tests/misc.nix b/third_party/nixpkgs/lib/tests/misc.nix index faf2b96530..c14bddb11a 100644 --- a/third_party/nixpkgs/lib/tests/misc.nix +++ b/third_party/nixpkgs/lib/tests/misc.nix @@ -153,6 +153,11 @@ runTests { expected = "a,b,c"; }; + testConcatLines = { + expr = concatLines ["a" "b" "c"]; + expected = "a\nb\nc\n"; + }; + testSplitStringsSimple = { expr = strings.splitString "." "a.b.c.d"; expected = [ "a" "b" "c" "d" ]; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 3f53481390..94aab69a2c 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -3,12 +3,13 @@ handle = { # Required name = "Your name"; - email = "address@example.org"; - # Optional + # Optional, but at least one of email, matrix or githubId must be given + email = "address@example.org"; matrix = "@user:example.org"; github = "GithubUsername"; githubId = your-github-id; + keys = [{ fingerprint = "AAAA BBBB CCCC DDDD EEEE FFFF 0000 1111 2222 3333"; }]; @@ -25,6 +26,9 @@ - `githubId` is your GitHub user ID, which can be found at `https://api.github.com/users/`, - `keys` is a list of your PGP/GPG key fingerprints. + Specifying a GitHub account ensures that you automatically get a review request on + pull requests that modify a package for which you are a maintainer. + `handle == github` is strongly preferred whenever `github` is an acceptable attribute name and is short and convenient. If `github` begins with a numeral, `handle` should be prefixed with an underscore. @@ -105,13 +109,11 @@ }; _1000teslas = { name = "Kevin Tran"; - email = "47207223+1000teslas@users.noreply.github.com"; github = "1000teslas"; githubId = 47207223; }; _2gn = { name = "Hiram Tanner"; - email = "101851090+2gn@users.noreply.github.com"; github = "2gn"; githubId = 101851090; }; @@ -719,10 +721,10 @@ }]; }; alyaeanyx = { - email = "alexandra.hollmeier@mailbox.org"; + email = "alyaeanyx@mailbox.org"; github = "alyaeanyx"; githubId = 74795488; - name = "Alexandra Hollmeier"; + name = "alyaeanyx"; keys = [{ fingerprint = "1F73 8879 5E5A 3DFC E2B3 FA32 87D1 AADC D25B 8DEE"; }]; @@ -757,6 +759,12 @@ githubId = 2626481; name = "Ambroz Bizjak"; }; + ameer = { + name = "Ameer Taweel"; + email = "ameertaweel2002@gmail.com"; + github = "AmeerTaweel"; + githubId = 20538273; + }; amesgen = { email = "amesgen@amesgen.de"; github = "amesgen"; @@ -916,7 +924,6 @@ name = "Anders Sildnes"; }; andys8 = { - email = "andys8@users.noreply.github.com"; github = "andys8"; githubId = 13085980; name = "Andy"; @@ -1102,7 +1109,6 @@ name = "Blaž Hrastnik"; }; arcnmx = { - email = "arcnmx@users.noreply.github.com"; github = "arcnmx"; githubId = 13426784; name = "arcnmx"; @@ -1330,6 +1336,12 @@ githubId = 55833; name = "Troels Henriksen"; }; + athre0z = { + email = "joel@zyantific.com"; + github = "athre0z"; + githubId = 6553158; + name = "Joel Höner"; + }; atila = { name = "Átila Saraiva"; email = "atilasaraiva@gmail.com"; @@ -1615,6 +1627,16 @@ githubId = 45811; name = "Svein Ove Aas"; }; + Bauke = { + name = "Bauke"; + email = "me@bauke.xyz"; + matrix = "@baukexyz:matrix.org"; + github = "Bauke"; + githubId = 19501722; + keys = [{ + fingerprint = "C593 27B5 9D0F 2622 23F6 1D03 C1C0 F299 52BC F558"; + }]; + }; bb010g = { email = "me@bb010g.com"; matrix = "@bb010g:matrix.org"; @@ -1622,12 +1644,28 @@ githubId = 340132; name = "Brayden Banks"; }; + bb2020 = { + github = "bb2020"; + githubId = 19290397; + name = "Tunc Uzlu"; + }; bbarker = { email = "brandon.barker@gmail.com"; github = "bbarker"; githubId = 916366; name = "Brandon Elam Barker"; }; + bbenne10 = { + email = "Bryan.Bennett@protonmail.com"; + matrix = "@bryan.bennett:matrix.org"; + github = "bbenne10"; + githubId = 687376; + name = "Bryan Bennett"; + keys = [{ + # compare with https://keybase.io/bbenne10 + fingerprint = "41EA 00B4 00F9 6970 1CB2 D3AF EF90 E3E9 8B8F 5C0B"; + }]; + }; bbenno = { email = "nix@bbenno.com"; github = "bbenno"; @@ -1762,6 +1800,15 @@ githubId = 26041945; name = "Potato Hatsue"; }; + berbiche = { + name = "Nicolas Berbiche"; + email = "nicolas@normie.dev"; + github = "berbiche"; + githubId = 20448408; + keys = [{ + fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; + }]; + }; berce = { email = "bert.moens@gmail.com"; github = "berce"; @@ -1804,6 +1851,12 @@ githubId = 9730330; name = "Benoit de Chezelles"; }; + bezmuth = { + email = "benkel97@protonmail.com"; + name = "Ben Kelly"; + github = "bezmuth"; + githubId = 31394095; + }; bfortz = { email = "bernard.fortz@gmail.com"; github = "bfortz"; @@ -1999,6 +2052,12 @@ github = "bouk"; githubId = 97820; }; + bpaulin = { + email = "brunopaulin@bpaulin.net"; + github = "bpaulin"; + githubId = 115711; + name = "bpaulin"; + }; bradediger = { email = "brad@bradediger.com"; github = "bradediger"; @@ -2108,6 +2167,12 @@ githubId = 53131727; name = "Bryan Albuquerque"; }; + bryanhonof = { + name = "Bryan Honof"; + email = "bryanhonof@gmail.com"; + github = "bryanhonof"; + githubId = 5932804; + }; btlvr = { email = "btlvr@protonmail.com"; github = "btlvr"; @@ -2202,6 +2267,21 @@ } ]; }; + cafkafk = { + email = "christina@cafkafk.com"; + matrix = "@cafkafk:matrix.cafkafk.com"; + name = "Christina Sørensen"; + github = "cafkafk"; + githubId = 89321978; + keys = [ + { + fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; + } + { + fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; + } + ]; + }; calbrecht = { email = "christian.albrecht@mayflower.de"; github = "calbrecht"; @@ -2450,6 +2530,12 @@ githubId = 89596; name = "Florian Friesdorf"; }; + ChaosAttractor = { + email = "lostattractor@gmail.com"; + github = "LostAttractor"; + githubId = 46527539; + name = "ChaosAttractor"; + }; chekoopa = { email = "chekoopa@mail.ru"; github = "chekoopa"; @@ -2565,7 +2651,6 @@ }]; }; christophcharles = { - email = "23055925+christophcharles@users.noreply.github.com"; github = "christophcharles"; githubId = 23055925; name = "Christoph Charles"; @@ -2919,6 +3004,11 @@ githubId = 1573344; name = "Andrey Pavlov"; }; + cpcloud = { + name = "Phillip Cloud"; + github = "cpcloud"; + githubId = 417981; + }; cpages = { email = "page@ruiec.cat"; github = "cpages"; @@ -3234,11 +3324,16 @@ name = "Daniel Șerbănescu"; }; datafoo = { - email = "34766150+datafoo@users.noreply.github.com"; github = "datafoo"; githubId = 34766150; name = "datafoo"; }; + davegallant = { + name = "Dave Gallant"; + email = "davegallant@gmail.com"; + github = "davegallant"; + githubId = 4519234; + }; davhau = { email = "d.hauer.it@gmail.com"; name = "David Hauer"; @@ -3372,6 +3467,17 @@ githubId = 156239; name = "D Anzorge"; }; + deifactor = { + name = "Ash Zahlen"; + email = "ext0l@riseup.net"; + github = "deifactor"; + githubId = 30192992; + }; + deinferno = { + name = "deinferno"; + github = "deinferno"; + githubId = 14363193; + }; delan = { name = "Delan Azabani"; email = "delan@azabani.com"; @@ -3385,7 +3491,6 @@ githubId = 1153808; }; deliciouslytyped = { - email = "47436522+deliciouslytyped@users.noreply.github.com"; github = "deliciouslytyped"; githubId = 47436522; name = "deliciouslytyped"; @@ -3481,6 +3586,12 @@ githubId = 10042482; name = "Louis Pearson"; }; + detegr = { + name = "Antti Keränen"; + email = "detegr@rbx.email"; + github = "Detegr"; + githubId = 724433; + }; Dettorer = { name = "Paul Hervot"; email = "paul.hervot@dettorer.net"; @@ -3512,6 +3623,12 @@ githubId = 579369; name = "Tuomas Tynkkynen"; }; + dfithian = { + email = "daniel.m.fithian@gmail.com"; + name = "Daniel Fithian"; + github = "dfithian"; + githubId = 8409320; + }; dfordivam = { email = "dfordivam+nixpkgs@gmail.com"; github = "dfordivam"; @@ -3549,7 +3666,6 @@ name = "David Leung"; }; DianaOlympos = { - email = "DianaOlympos@noreply.github.com"; github = "DianaOlympos"; githubId = 15774340; name = "Thomas Depierre"; @@ -3574,7 +3690,6 @@ }; diogox = { name = "Diogo Xavier"; - email = "13244408+diogox@users.noreply.github.com"; github = "diogox"; githubId = 13244408; }; @@ -3741,12 +3856,6 @@ fingerprint = "A8DF 1326 9E5D 9A38 E57C FAC2 9D20 F650 3E33 8888"; }]; }; - doublec = { - email = "chris.double@double.co.nz"; - github = "doublec"; - githubId = 16599; - name = "Chris Double"; - }; dpaetzel = { email = "david.paetzel@posteo.de"; github = "dpaetzel"; @@ -3805,7 +3914,6 @@ name = "Dominik Ritter"; }; drperceptron = { - email = "92106371+drperceptron@users.noreply.github.com"; github = "drperceptron"; githubId = 92106371; name = "Dr Perceptron"; @@ -4134,6 +4242,12 @@ githubId = 103082; name = "Ed Brindley"; }; + eliandoran = { + email = "contact@eliandoran.me"; + name = "Elian Doran"; + github = "eliandoran"; + githubId = 21236836; + }; elizagamedev = { email = "eliza@eliza.sh"; github = "elizagamedev"; @@ -4252,7 +4366,6 @@ name = "Ente"; }; Enzime = { - email = "enzime@users.noreply.github.com"; github = "Enzime"; githubId = 10492681; name = "Michael Hoang"; @@ -4383,7 +4496,6 @@ name = "Ertugrul Söylemez"; }; esclear = { - email = "esclear@users.noreply.github.com"; github = "esclear"; githubId = 7432848; name = "Daniel Albert"; @@ -4791,7 +4903,6 @@ name = "Florian Klink"; }; florentc = { - email = "florentc@users.noreply.github.com"; github = "florentc"; githubId = 1149048; name = "Florent Ch."; @@ -4893,13 +5004,18 @@ githubId = 84968; name = "Florian Paul Schmidt"; }; - fragamus = { email = "innovative.engineer@gmail.com"; github = "fragamus"; githubId = 119691; name = "Michael Gough"; }; + franzmondlichtmann = { + name = "Franz Schroepf"; + email = "franz-schroepf@t-online.de"; + github = "franzmondlichtmann"; + githubId = 105480088; + }; freax13 = { email = "erbse.13@gmx.de"; github = "Freax13"; @@ -4913,7 +5029,6 @@ name = "Frede Emil"; }; freezeboy = { - email = "freezeboy@users.noreply.github.com"; github = "freezeboy"; githubId = 13279982; name = "freezeboy"; @@ -5014,6 +5129,13 @@ githubId = 3036816; name = "Edgar Aroutiounian"; }; + fzakaria = { + name = "Farid Zakaria"; + email = "farid.m.zakaria@gmail.com"; + matrix = "@fzakaria:matrix.org"; + github = "fzakaria"; + githubId = 605070; + }; gabesoft = { email = "gabesoft@gmail.com"; github = "gabesoft"; @@ -5172,6 +5294,15 @@ githubId = 3217744; name = "Peter Ferenczy"; }; + ggwpaiushtha = { + name = "Ivan"; + email = "ggwpaiushtha@gmail.com"; + github = "GGwpAiushtha"; + githubId = 6987136; + keys = [{ + fingerprint = "2C6D 37D4 6AA1 DCDA BE8D F346 43E2 CF4C 01B9 4940"; + }]; + }; ghostbuster91 = { name = "Kasper Kondzielski"; email = "kghost0@gmail.com"; @@ -5220,6 +5351,12 @@ githubId = 60962839; name = "Mazen Zahr"; }; + gkleen = { + name = "Gregor Kleen"; + email = "xpnfr@bouncy.email"; + github = "gkleen"; + githubId = 20089782; + }; gleber = { email = "gleber.p@gmail.com"; github = "gleber"; @@ -5464,7 +5601,6 @@ name = "Guillaume Koenig"; }; guserav = { - email = "guserav@users.noreply.github.com"; github = "guserav"; githubId = 28863828; name = "guserav"; @@ -5781,12 +5917,28 @@ github = "thbkrshw"; githubId = 33122; }; + hloeffler = { + name = "Hauke Löffler"; + email = "nix@hauke-loeffler.de"; + github = "hloeffler"; + githubId = 6627191; + }; hlolli = { email = "hlolli@gmail.com"; github = "hlolli"; githubId = 6074754; name = "Hlodver Sigurdsson"; }; + hmenke = { + name = "Henri Menke"; + email = "henri@henrimenke.de"; + matrix = "@hmenke:matrix.org"; + github = "hmenke"; + githubId = 1903556; + keys = [{ + fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; + }]; + }; huantian = { name = "David Li"; email = "davidtianli@gmail.com"; @@ -5953,7 +6105,6 @@ name = "Imran Hossain"; }; iagoq = { - email = "18238046+iagocq@users.noreply.github.com"; github = "iagocq"; githubId = 18238046; name = "Iago Manoel Brito"; @@ -6021,7 +6172,6 @@ name = "Dominic Steinitz"; }; ifurther = { - email = "55025025+ifurther@users.noreply.github.com"; github = "ifurther"; githubId = 55025025; name = "Feather Lin"; @@ -6166,6 +6316,12 @@ githubId = 4085046; name = "Imuli"; }; + inclyc = { + email = "i@lyc.dev"; + github = "inclyc"; + githubId = 36667224; + name = "Yingchi Long"; + }; ineol = { email = "leo.stefanesco@gmail.com"; github = "ineol"; @@ -6272,7 +6428,6 @@ }]; }; ivankovnatsky = { - email = "75213+ivankovnatsky@users.noreply.github.com"; github = "ivankovnatsky"; githubId = 75213; name = "Ivan Kovnatsky"; @@ -6350,6 +6505,12 @@ fingerprint = "B982 0250 1720 D540 6A18 2DA8 188E 4945 E85B 2D21"; }]; }; + jali-clarke = { + email = "jinnah.ali-clarke@outlook.com"; + name = "Jinnah Ali-Clarke"; + github = "jali-clarke"; + githubId = 17733984; + }; jasoncarr = { email = "jcarr250@gmail.com"; github = "jasoncarr0"; @@ -6434,6 +6595,13 @@ githubId = 20176306; name = "jammerful"; }; + janik = { + name = "Janik"; + email = "janik@aq0.de"; + matrix = "@janik0:matrix.org"; + github = "Janik-Haag"; + githubId = 80165193; + }; jansol = { email = "jan.solanti@paivola.fi"; github = "jansol"; @@ -6483,6 +6651,13 @@ githubId = 221929; name = "Jean-Baptiste Giraudeau"; }; + jboy = { + email = "jboy+nixos@bius.moe"; + githubId = 2187261; + github = "jboynyc"; + matrix = "@jboy:utwente.io"; + name = "John Boy"; + }; jc = { name = "Josh Cooper"; email = "josh@cooper.is"; @@ -6865,7 +7040,6 @@ name = "Jocelyn Thode"; }; joedevivo = { - email = "55951+joedevivo@users.noreply.github.com"; github = "joedevivo"; githubId = 55951; name = "Joe DeVivo"; @@ -7052,6 +7226,12 @@ githubId = 15893072; name = "Josh van Leeuwen"; }; + jpagex = { + name = "Jérémy Pagé"; + email = "contact@jeremypage.me"; + github = "jpagex"; + githubId = 635768; + }; jpas = { name = "Jarrod Pas"; email = "jarrod@jarrodpas.com"; @@ -7523,6 +7703,11 @@ githubId = 44045911; name = "Kid"; }; + kidsan = { + github = "kidsan"; + githubId = 8798449; + name = "kidsan"; + }; kierdavis = { email = "kierdavis@gmail.com"; github = "kierdavis"; @@ -7614,6 +7799,12 @@ github = "kjeremy"; githubId = 4325700; }; + kkharji = { + name = "kkharji"; + email = "kkharji@protonmail.com"; + github = "kkharji"; + githubId = 65782666; + }; klden = { name = "Kenzyme Le"; email = "kl@kenzymele.com"; @@ -7787,6 +7978,12 @@ githubId = 17659803; name = "Matthias Axel Kröll"; }; + krostar = { + email = "alexis.destrez@pm.me"; + github = "krostar"; + githubId = 5759930; + name = "Alexis Destrez"; + }; kristian-brucaj = { email = "kbrucaj@gmail.com"; github = "Kristian-Brucaj"; @@ -7829,6 +8026,12 @@ githubId = 2943605; name = "Evgeny Kurnevsky"; }; + kuwii = { + name = "kuwii"; + email = "kuwii.someone@gmail.com"; + github = "kuwii"; + githubId = 10705175; + }; kuznero = { email = "roman@kuznero.com"; github = "kuznero"; @@ -8273,6 +8476,12 @@ fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A"; }]; }; + lorenz = { + name = "Lorenz Brun"; + email = "lorenz@brun.one"; + github = "lorenz"; + githubId = 5228892; + }; lorenzleutgeb = { email = "lorenz@leutgeb.xyz"; github = "lorenzleutgeb"; @@ -8389,6 +8598,13 @@ githubId = 4969294; name = "Louis Tim Larsen"; }; + loveisgrief = { + name = "LoveIsGrief"; + email = "loveisgrief@tuta.io"; + keys = [{ + fingerprint = "9847 4F48 18C6 4E0A F0C5 3529 E96D 1EDF A053 45EB"; + }]; + }; lovek323 = { email = "jason@oconal.id.au"; github = "lovek323"; @@ -8596,6 +8812,15 @@ githubId = 42545625; name = "Maas Lalani"; }; + macalinao = { + email = "me@ianm.com"; + name = "Ian Macalinao"; + github = "macalinao"; + githubId = 401263; + keys = [{ + fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; + }]; + }; maddiethecafebabe = { email = "maddie@cafebabe.date"; github = "maddiethecafebabe"; @@ -8768,7 +8993,6 @@ githubId = 22586596; }; marsam = { - email = "marsam@users.noreply.github.com"; github = "marsam"; githubId = 65531; name = "Mario Rodas"; @@ -8812,6 +9036,12 @@ fingerprint = "B573 5118 0375 A872 FBBF 7770 B629 036B E399 EEE9"; }]; }; + masaeedu = { + email = "masaeedu@gmail.com"; + github = "masaeedu"; + githubId = 3674056; + name = "Asad Saeeduddin"; + }; masipcat = { email = "jordi@masip.cat"; github = "masipcat"; @@ -8866,6 +9096,12 @@ githubId = 952712; name = "Matt Christ"; }; + matthewcroughan = { + email = "matt@croughan.sh"; + github = "MatthewCroughan"; + githubId = 26458780; + name = "Matthew Croughan"; + }; matthewbauer = { email = "mjbauer95@gmail.com"; github = "matthewbauer"; @@ -9012,7 +9248,6 @@ name = "Mateusz Mazur"; }; mbaeten = { - email = "mbaeten@users.noreply.github.com"; github = "mbaeten"; githubId = 2649304; name = "M. Baeten"; @@ -9119,6 +9354,12 @@ fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; }]; }; + mdr = { + email = "MattRussellUK@gmail.com"; + github = "mdr"; + githubId = 241257; + name = "Matt Russell"; + }; meain = { email = "mail@meain.io"; matrix = "@meain:matrix.org"; @@ -9156,11 +9397,11 @@ githubId = 365721; name = "Francois Truphemus"; }; - melsigl = { - email = "melanie.bianca.sigl@gmail.com"; - github = "melsigl"; - githubId = 15093162; - name = "Melanie B. Sigl"; + melias122 = { + name = "Martin Elias"; + email = "martin+nixpkgs@elias.sx"; + github = "melias122"; + githubId = 1027766; }; melkor333 = { email = "samuel@ton-kunst.ch"; @@ -9168,6 +9409,18 @@ githubId = 6412377; name = "Samuel Ruprecht"; }; + melling = { + email = "mattmelling@fastmail.com"; + github = "mattmelling"; + githubId = 1215331; + name = "Matt Melling"; + }; + melsigl = { + email = "melanie.bianca.sigl@gmail.com"; + github = "melsigl"; + githubId = 15093162; + name = "Melanie B. Sigl"; + }; kira-bruneau = { email = "kira.bruneau@pm.me"; name = "Kira Bruneau"; @@ -9224,7 +9477,6 @@ name = "Maximilian Güntner"; }; mh = { - email = "68288772+markus-heinrich@users.noreply.github.com"; github = "markus-heinrich"; githubId = 68288772; name = "Markus Heinrich"; @@ -9242,7 +9494,6 @@ name = "Max Hofer"; }; miangraham = { - email = "miangraham@users.noreply.github.com"; github = "miangraham"; githubId = 704580; name = "M. Ian Graham"; @@ -9453,6 +9704,12 @@ fingerprint = "7088 C742 1873 E0DB 97FF 17C2 245C AB70 B4C2 25E9"; }]; }; + misuzu = { + email = "bakalolka@gmail.com"; + github = "misuzu"; + githubId = 248143; + name = "misuzu"; + }; mitchmindtree = { email = "mail@mitchellnordine.com"; github = "mitchmindtree"; @@ -9517,6 +9774,12 @@ fingerprint = "64BE BF11 96C3 DD7A 443E 8314 1DC0 82FA DE5B A863"; }]; }; + mlatus = { + email = "wqseleven@gmail.com"; + github = "Ninlives"; + githubId = 17873203; + name = "mlatus"; + }; mlieberman85 = { email = "mlieberman85@gmail.com"; github = "mlieberman85"; @@ -9525,7 +9788,6 @@ }; mlvzk = { name = "mlvzk"; - email = "mlvzk@users.noreply.github.com"; github = "mlvzk"; githubId = 44906333; }; @@ -9542,7 +9804,6 @@ name = "Henri Bourcereau"; }; mmesch = { - email = "mmesch@noreply.github.com"; github = "MMesch"; githubId = 2597803; name = "Matthias Meschede"; @@ -9924,6 +10185,12 @@ githubId = 6783654; name = "Nadrieril Feneanar"; }; + nagisa = { + name = "Simonas Kazlauskas"; + email = "nixpkgs@kazlauskas.me"; + github = "nagisa"; + githubId = 679122; + }; nagy = { email = "danielnagy@posteo.de"; github = "nagy"; @@ -9946,7 +10213,6 @@ name = "Roman Naumann"; }; naphta = { - email = "naphta@noreply.github.com"; github = "naphta"; githubId = 6709831; name = "Jake Hill"; @@ -9961,7 +10227,6 @@ }]; }; nat-418 = { - email = "93013864+nat-418@users.noreply.github.com"; github = "nat-418"; githubId = 93013864; name = "nat-418"; @@ -9979,7 +10244,6 @@ name = "Nathan Bijnens"; }; nathyong = { - email = "nathyong@noreply.github.com"; github = "nathyong"; githubId = 818502; name = "Nathan Yong"; @@ -10001,7 +10265,6 @@ }; nazarewk = { name = "Krzysztof Nazarewski"; - email = "3494992+nazarewk@users.noreply.github.com"; matrix = "@nazarewk:matrix.org"; github = "nazarewk"; githubId = 3494992; @@ -10010,7 +10273,6 @@ }]; }; nbr = { - email = "nbr@users.noreply.github.com"; github = "nbr"; githubId = 3819225; name = "Nick Braga"; @@ -10043,6 +10305,12 @@ githubId = 137805; name = "Alexander Tsvyashchenko"; }; + nebulka = { + email = "arapun@proton.me"; + github = "nebulka1"; + githubId = 121920704; + name = "Nebulka"; + }; Necior = { email = "adrian@sadlocha.eu"; github = "Necior"; @@ -10168,6 +10436,18 @@ githubId = 6391776; name = "Nikita Voloboev"; }; + nikstur = { + email = "nikstur@outlook.com"; + name = "nikstur"; + github = "nikstur"; + githubId = 61635709; + }; + ngerstle = { + name = "Nicholas Gerstle"; + email = "ngerstle@gmail.com"; + github = "ngerstle"; + githubId = 1023752; + }; ngiger = { email = "niklaus.giger@member.fsf.org"; github = "ngiger"; @@ -10241,6 +10521,12 @@ fingerprint = "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564"; }]; }; + nigelgbanks = { + name = "Nigel Banks"; + email = "nigel.g.banks@gmail.com"; + github = "nigelgbanks"; + githubId = 487373; + }; NikolaMandic = { email = "nikola@mandic.email"; github = "NikolaMandic"; @@ -10272,15 +10558,6 @@ githubId = 1219785; name = "Félix Baylac-Jacqué"; }; - ninjin = { - email = "pontus@stenetorp.se"; - github = "ninjin"; - githubId = 354934; - name = "Pontus Stenetorp"; - keys = [{ - fingerprint = "0966 2F9F 3FDA C22B C22E 4CE1 D430 2875 00E6 483C"; - }]; - }; nioncode = { email = "nioncode+github@gmail.com"; github = "nioncode"; @@ -10298,7 +10575,6 @@ }; nitsky = { name = "nitsky"; - email = "492793+nitsky@users.noreply.github.com"; github = "nitsky"; githubId = 492793; }; @@ -10415,12 +10691,24 @@ githubId = 6052922; name = "Kirill Struokov"; }; + novenary = { + email = "streetwalkermc@gmail.com"; + github = "9ary"; + githubId = 1155030; + name = "novenary"; + }; np = { email = "np.nix@nicolaspouillard.fr"; github = "np"; githubId = 5548; name = "Nicolas Pouillard"; }; + npatsakula = { + email = "nikita.patsakula@gmail.com"; + name = "Patsakula Nikita"; + github = "npatsakula"; + githubId = 23001619; + }; nphilou = { email = "nphilou@gmail.com"; github = "nphilou"; @@ -10434,6 +10722,12 @@ githubId = 34083928; name = "Tim DeHerrera"; }; + nrhelmi = { + email = "helmiinour@gmail.com"; + github = "nrhelmi"; + githubId = 15707703; + name = "Helmi Nour"; + }; nshalman = { email = "nahamu@gmail.com"; github = "nshalman"; @@ -10603,7 +10897,6 @@ name = "Ole Jørgen Brønner"; }; ollieB = { - email = "1237862+oliverbunting@users.noreply.github.com"; github = "oliverbunting"; githubId = 1237862; name = "Ollie Bunting"; @@ -10621,7 +10914,6 @@ name = "Owen Lynch"; }; omasanori = { - email = "167209+omasanori@users.noreply.github.com"; github = "omasanori"; githubId = 167209; name = "Masanori Ogino"; @@ -11226,6 +11518,12 @@ githubId = 3737; name = "Peter Jones"; }; + phip1611 = { + email = "phip1611@gmail.com"; + github = "phip1611"; + githubId = 5737016; + name = "Philipp Schuster"; + }; pkharvey = { email = "kayharvey@protonmail.com"; github = "pkharvey"; @@ -11393,7 +11691,6 @@ githubId = 51489; }; polykernel = { - email = "81340136+polykernel@users.noreply.github.com"; github = "polykernel"; githubId = 81340136; name = "polykernel"; @@ -11416,6 +11713,18 @@ githubId = 138074; name = "Pedro Pombeiro"; }; + pongo1231 = { + email = "pongo1999712@gmail.com"; + github = "pongo1231"; + githubId = 4201956; + name = "pongo1231"; + }; + portothree = { + name = "Gustavo Porto"; + email = "gus@p8s.co"; + github = "portothree"; + githubId = 3718120; + }; poscat = { email = "poscat@mail.poscat.moe"; github = "poscat0x04"; @@ -11470,6 +11779,16 @@ githubId = 228931; name = "Philipp Riegger"; }; + princemachiavelli = { + name = "Josh Hoffer"; + email = "jhoffer@sansorgan.es"; + matrix = "@princemachiavelli:matrix.org"; + github = "Princemachiavelli"; + githubId = 2730968; + keys = [{ + fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; + }]; + }; prikhi = { email = "pavan.rikhi@gmail.com"; github = "prikhi"; @@ -11611,6 +11930,11 @@ githubId = 37715; name = "Brian McKenna"; }; + pulsation = { + name = "Philippe Sam-Long"; + github = "pulsation"; + githubId = 1838397; + }; purcell = { email = "steve@sanityinc.com"; github = "purcell"; @@ -11630,6 +11954,12 @@ githubId = 23097564; name = "Nora Widdecke"; }; + pwoelfel = { + name = "Philipp Woelfel"; + email = "philipp.woelfel@gmail.com"; + github = "PhilippWoelfel"; + githubId = 19400064; + }; pyrolagus = { email = "pyrolagus@gmail.com"; github = "PyroLagus"; @@ -11648,6 +11978,16 @@ githubId = 315234; name = "Serge Bazanski"; }; + qbit = { + name = "Aaron Bieber"; + email = "aaron@bolddaemon.com"; + github = "qbit"; + githubId = 68368; + matrix = "@qbit:tapenet.org"; + keys = [{ + fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; + }]; + }; qknight = { email = "js@lastlog.de"; github = "qknight"; @@ -11713,6 +12053,12 @@ githubId = 131856; name = "Arnout Engelen"; }; + raehik = { + email = "thefirstmuffinman@gmail.com"; + github = "raehik"; + githubId = 3764592; + name = "Ben Orchard"; + }; rafael = { name = "Rafael"; email = "pr9@tuta.io"; @@ -11760,6 +12106,12 @@ githubId = 882; name = "Ragnar Dahlen"; }; + rakesh4g = { + email = "rakeshgupta4u@gmail.com"; + github = "Rakesh4G"; + githubId = 50867187; + name = "Rakesh Gupta"; + }; ralith = { email = "ben.e.saunders@gmail.com"; matrix = "@ralith:ralith.com"; @@ -11815,6 +12167,12 @@ githubId = 1758708; name = "Răzvan Flavius Panda"; }; + rb = { + email = "maintainers@cloudposse.com"; + github = "nitrocode"; + githubId = 7775707; + name = "RB"; + }; rb2k = { email = "nix@marc-seeger.com"; github = "rb2k"; @@ -11829,7 +12187,6 @@ }; rbreslow = { name = "Rocky Breslow"; - email = "1774125+rbreslow@users.noreply.github.com"; github = "rbreslow"; githubId = 1774125; keys = [{ @@ -11922,7 +12279,6 @@ name = "Ricky Elrod"; }; rembo10 = { - email = "rembo10@users.noreply.github.com"; github = "rembo10"; githubId = 801525; name = "rembo10"; @@ -11934,7 +12290,6 @@ name = "Renato Garcia"; }; rencire = { - email = "546296+rencire@users.noreply.github.com"; github = "rencire"; githubId = 546296; name = "Eric Ren"; @@ -12235,6 +12590,12 @@ githubId = 710906; name = "Roel van Dijk"; }; + roman = { + email = "open-source@roman-gonzalez.info"; + github = "roman"; + githubId = 7335; + name = "Roman Gonzalez"; + }; romildo = { email = "malaquias@gmail.com"; github = "romildo"; @@ -12265,13 +12626,18 @@ }; rople380 = { name = "rople380"; - email = "55679162+rople380@users.noreply.github.com"; github = "rople380"; githubId = 55679162; keys = [{ fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; }]; }; + RossComputerGuy = { + name = "Tristan Ross"; + email = "tristan.ross@midstall.com"; + github = "RossComputerGuy"; + githubId = 19699320; + }; rowanG077 = { email = "goemansrowan@gmail.com"; github = "rowanG077"; @@ -12353,6 +12719,12 @@ githubId = 61306; name = "Rene Treffer"; }; + rumpelsepp = { + name = "Stefan Tatschner"; + email = "stefan@rumpelsepp.org"; + github = "rumpelsepp"; + githubId = 1961699; + }; rushmorem = { email = "rushmore@webenchanter.com"; github = "rushmorem"; @@ -12402,7 +12774,6 @@ name = "Ryan Artecona"; }; ryanorendorff = { - email = "12442942+ryanorendorff@users.noreply.github.com"; github = "ryanorendorff"; githubId = 12442942; name = "Ryan Orendorff"; @@ -12582,6 +12953,12 @@ githubId = 695473; name = "Sascha Grunert"; }; + saulecabrera = { + name = "Saúl Cabrera"; + email = "saulecabrera@gmail.com"; + github = "saulecabrera"; + githubId = 1423601; + }; sauyon = { email = "s@uyon.co"; github = "sauyon"; @@ -12614,7 +12991,6 @@ }; sbond75 = { name = "sbond75"; - email = "43617712+sbond75@users.noreply.github.com"; github = "sbond75"; githubId = 43617712; }; @@ -12638,7 +13014,6 @@ }; sioodmy = { name = "Antoni Sokołowski"; - email = "81568712+sioodmy@users.noreply.github.com"; github = "sioodmy"; githubId = 81568712; }; @@ -12667,7 +13042,6 @@ name = "schneefux"; }; schnusch = { - email = "schnusch@users.noreply.github.com"; github = "schnusch"; githubId = 5104601; name = "schnusch"; @@ -12689,7 +13063,6 @@ }; scoder12 = { name = "Spencer Pogorzelski"; - email = "34356756+Scoder12@users.noreply.github.com"; github = "Scoder12"; githubId = 34356756; }; @@ -12780,6 +13153,12 @@ githubId = 17243347; name = "Sebastian Sellmeier"; }; + sei40kr = { + name = "Seong Yong-ju"; + email = "sei40kr@gmail.com"; + github = "sei40kr"; + githubId = 11665236; + }; sellout = { email = "greg@technomadic.org"; github = "sellout"; @@ -12874,7 +13253,6 @@ name = "Sebastian Graf"; }; shadaj = { - email = "shadaj@users.noreply.github.com"; github = "shadaj"; githubId = 543055; name = "Shadaj Laddad"; @@ -12900,7 +13278,6 @@ }; ShamrockLee = { name = "Shamrock Lee"; - email = "44064051+ShamrockLee@users.noreply.github.com"; github = "ShamrockLee"; githubId = 44064051; }; @@ -12919,6 +13296,12 @@ }]; name = "Shane Sveller"; }; + shardy = { + email = "shardul@baral.ca"; + github = "shardulbee"; + githubId = 16765155; + name = "Shardul Baral"; + }; shawndellysse = { email = "sdellysse@gmail.com"; github = "sdellysse"; @@ -13092,7 +13475,6 @@ name = "Simon Vandel Sillesen"; }; sir4ur0n = { - email = "sir4ur0n@users.noreply.github.com"; github = "sir4ur0n"; githubId = 1204125; name = "sir4ur0n"; @@ -13156,7 +13538,6 @@ name = "Sven Keidel"; }; skykanin = { - email = "skykanin@users.noreply.github.com"; github = "skykanin"; githubId = 3789764; name = "skykanin"; @@ -13235,12 +13616,23 @@ github = "snapdgn"; githubId = 85608760; }; + snglth = { + email = "illia@ishestakov.com"; + github = "snglth"; + githubId = 8686360; + name = "Illia Shestakov"; + }; snicket2100 = { - email = "57048005+snicket2100@users.noreply.github.com"; github = "snicket2100"; githubId = 57048005; name = "snicket2100"; }; + snpschaaf = { + email = "philipe.schaaf@secunet.com"; + name = "Philippe Schaaf"; + github = "snpschaaf"; + githubId = 105843013; + }; snyh = { email = "snyh@snyh.org"; github = "snyh"; @@ -13259,6 +13651,15 @@ githubId = 2157287; name = "sohalt"; }; + SohamG = { + email = "sohamg2@gmail.com"; + name = "Soham S Gumaste"; + github = "SohamG"; + githubId = 7116239; + keys = [{ + fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442"; + }]; + }; solson = { email = "scott@solson.me"; matrix = "@solson:matrix.org"; @@ -13365,7 +13766,6 @@ name = "Sergei Khoma"; }; srgom = { - email = "srgom@users.noreply.github.com"; github = "SRGOM"; githubId = 8103619; name = "SRGOM"; @@ -13377,6 +13777,12 @@ githubId = 219362; name = "Sarah Brofeldt"; }; + srounce = { + name = "Samuel Rounce"; + email = "me@samuelrounce.co.uk"; + github = "srounce"; + githubId = 60792; + }; SShrike = { email = "severen@shrike.me"; github = "severen"; @@ -13401,6 +13807,15 @@ githubId = 7512804; name = "Martin Langlotz"; }; + starcraft66 = { + name = "Tristan Gosselin-Hane"; + email = "starcraft66@gmail.com"; + github = "starcraft66"; + githubId = 1858154; + keys = [{ + fingerprint = "8597 4506 EC69 5392 0443 0805 9D98 CDAC FF04 FD78"; + }]; + }; stargate01 = { email = "christoph.honal@web.de"; github = "StarGate01"; @@ -13462,7 +13877,6 @@ }; stephenwithph = { name = "StephenWithPH"; - email = "StephenWithPH@users.noreply.github.com"; github = "StephenWithPH"; githubId = 2990492; }; @@ -13607,6 +14021,13 @@ githubId = 2666479; name = "Y Nguyen"; }; + superherointj = { + name = "Sérgio Marcelo"; + email = "sergiomarcelo+nixpkgs@ya.ru"; + matrix = "@superherointj:matrix.org"; + github = "superherointj"; + githubId = 5861043; + }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; matrix = "@sandro:supersandro.de"; @@ -13741,6 +14162,15 @@ githubId = 5991987; name = "Alexander Sosedkin"; }; + t4ccer = { + email = "t4ccer@gmail.com"; + github = "t4ccer"; + githubId = 64430288; + name = "Tomasz Maciosowski"; + keys = [{ + fingerprint = "6866 981C 4992 4D64 D154 E1AC 19E5 A2D8 B1E4 3F19"; + }]; + }; tadeokondrak = { email = "me@tadeo.ca"; github = "tadeokondrak"; @@ -13904,7 +14334,6 @@ name = "techknowlogick"; }; Technical27 = { - email = "38222826+Technical27@users.noreply.github.com"; github = "Technical27"; githubId = 38222826; name = "Aamaruvi Yogamani"; @@ -14000,6 +14429,11 @@ githubId = 29044; name = "Jacek Galowicz"; }; + tfmoraes = { + name = "Thiago Franco de Moraes"; + github = "tfmoraes"; + githubId = 351108; + }; tg-x = { email = "*@tg-x.net"; github = "tg-x"; @@ -14046,6 +14480,13 @@ fingerprint = "D2A2 F0A1 E7A8 5E6F B711 DEE5 63A4 4817 A52E AB7B"; }]; }; + the-argus = { + email = "i.mcfarlane2002@gmail.com"; + github = "the-argus"; + name = "Ian McFarlane"; + githubId = 70479099; + matrix = "@eyes1238:matrix.org"; + }; TheBrainScrambler = { email = "esthromeris@riseup.net"; github = "TheBrainScrambler"; @@ -14145,6 +14586,12 @@ githubId = 3268082; name = "Thibaut Marty"; }; + thled = { + name = "Thomas Le Duc"; + email = "dev@tleduc.de"; + github = "thled"; + githubId = 28220902; + }; thyol = { name = "thyol"; email = "thyol@pm.me"; @@ -14275,6 +14722,16 @@ githubId = 13026; name = "Jonathan Rudenberg"; }; + tjni = { + email = "43ngvg@masqt.com"; + matrix = "@tni:matrix.org"; + name = "Theodore Ni"; + github = "tjni"; + githubId = 3806110; + keys = [{ + fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; + }]; + }; tkerber = { email = "tk@drwx.org"; github = "tkerber"; @@ -14296,6 +14753,12 @@ githubId = 1280118; name = "Tomislav Markovski"; }; + tmarkus = { + email = "tobias@markus-regensburg.de"; + github = "hesiod"; + githubId = 3159881; + name = "Tobias Markus"; + }; tmountain = { email = "tinymountain@gmail.com"; github = "tmountain"; @@ -14522,6 +14985,12 @@ githubId = 563054; name = "Thomas Tuegel"; }; + turbomack = { + email = "marek.faj@gmail.com"; + github = "turboMaCk"; + githubId = 2130305; + name = "Marek Fajkus"; + }; turion = { email = "programming@manuelbaerenz.de"; github = "turion"; @@ -14816,6 +15285,12 @@ githubId = 797581; name = "Vincent Bernardoff"; }; + vbrandl = { + name = "Valentin Brandl"; + email = "mail+nixpkgs@vbrandl.net"; + github = "vbrandl"; + githubId = 20639051; + }; vcanadi = { email = "vito.canadi@gmail.com"; github = "vcanadi"; @@ -14839,6 +15314,12 @@ githubId = 6508; name = "Vincent Demeester"; }; + vdot0x23 = { + name = "Victor Büttner"; + email = "nix.victor@0x23.dk"; + github = "vdot0x23"; + githubId = 40716069; + }; veehaitch = { name = "Vincent Haupert"; email = "mail@vincent-haupert.de"; @@ -15059,6 +15540,18 @@ fingerprint = "E595 7FE4 FEF6 714B 1AD3 1483 937F 2AE5 CCEF BF59"; }]; }; + waelwindows = { + email = "waelwindows9922@gmail.com"; + github = "Waelwindows"; + githubId = 5228243; + name = "waelwindows"; + }; + waiting-for-dev = { + email = "marc@lamarciana.com"; + github = "waiting-for-dev"; + githubId = 52650; + name = "Marc Busqué"; + }; wakira = { name = "Sheng Wang"; email = "sheng@a64.work"; @@ -15092,6 +15585,12 @@ githubId = 34962284; name = "wchresta"; }; + wd15 = { + email = "daniel.wheeler2@gmail.com"; + github = "wd15"; + githubId = 1986844; + name = "Daniel Wheeler"; + }; wdavidw = { name = "David Worms"; email = "david@adaltas.com"; @@ -15129,6 +15628,12 @@ fingerprint = "2145 955E 3F5E 0C95 3458 41B5 11F7 BAEA 8567 43FF"; }]; }; + wenngle = { + name = "Zeke Stephens"; + email = "zekestephens@gmail.com"; + github = "wenngle"; + githubId = 63376671; + }; wentam = { name = "Matt Egeler"; email = "wentam42@gmail.com"; @@ -15141,6 +15646,12 @@ github = "wentasah"; githubId = 140542; }; + wesleyjrz = { + email = "dev@wesleyjrz.com"; + name = "Wesley V. Santos Jr."; + github = "wesleyjrz"; + githubId = 60184588; + }; wesnel = { name = "Wesley Nelson"; email = "wgn@wesnel.dev"; @@ -15156,6 +15667,24 @@ githubId = 13031455; name = "Jakob Schmutz"; }; + witchof0x20 = { + name = "Jade"; + email = "jade@witchof.space"; + github = "witchof0x20"; + githubId = 36118348; + keys = [{ + fingerprint = "69C9 876B 5797 1B2E 11C5 7C39 80A1 F76F C9F9 54AE"; + }]; + }; + WhiteBlackGoose = { + email = "wbg@angouri.org"; + github = "WhiteBlackGoose"; + githubId = 31178401; + name = "WhiteBlackGoose"; + keys = [{ + fingerprint = "640B EDDE 9734 310A BFA3 B257 52ED AE6A 3995 AFAB"; + }]; + }; WhittlesJr = { email = "alex.joseph.whitt@gmail.com"; github = "WhittlesJr"; @@ -15184,11 +15713,16 @@ name = "Willi Butz"; }; willcohen = { - email = "willcohen@users.noreply.github.com"; github = "willcohen"; githubId = 5185341; name = "Will Cohen"; }; + wilsonehusin = { + name = "Wilson E. Husin"; + email = "wilsonehusin@gmail.com"; + github = "wilsonehusin"; + githubId = 14004487; + }; winpat = { email = "patrickwinter@posteo.ch"; github = "winpat"; @@ -15214,7 +15748,6 @@ name = "Alexander Krimm"; }; wishfort36 = { - email = "42300264+wishfort36@users.noreply.github.com"; github = "wishfort36"; githubId = 42300264; name = "wishfort36"; @@ -15336,8 +15869,13 @@ github = "wunderbrick"; githubId = 52174714; }; + wuyoli = { + name = "wuyoli"; + email = "wuyoli@tilde.team"; + github = "wuyoli"; + githubId = 104238274; + }; wyndon = { - email = "72203260+wyndon@users.noreply.github.com"; matrix = "@wyndon:envs.net"; github = "wyndon"; githubId = 72203260; @@ -15367,6 +15905,12 @@ githubId = 11050617; name = "Dominik Xaver Hörl"; }; + xavierzwirtz = { + email = "me@xavierzwirtz.com"; + github = "xavierzwirtz"; + githubId = 474343; + name = "Xavier Zwirtz"; + }; xbreak = { email = "xbreak@alphaware.se"; github = "xbreak"; @@ -15375,7 +15919,6 @@ }; xdhampus = { name = "Hampus"; - email = "16954508+xdHampus@users.noreply.github.com"; github = "xdHampus"; githubId = 16954508; }; @@ -15417,6 +15960,12 @@ githubId = 17534323; name = "Quentin Vaucher"; }; + xlambein = { + email = "xlambein@gmail.com"; + github = "xlambein"; + githubId = 5629059; + name = "Xavier Lambein"; + }; xnaveira = { email = "xnaveira@gmail.com"; github = "xnaveira"; @@ -15430,7 +15979,6 @@ name = "Guillermo NWDD"; }; xrelkd = { - email = "46590321+xrelkd@users.noreply.github.com"; github = "xrelkd"; githubId = 46590321; name = "xrelkd"; @@ -15448,7 +15996,6 @@ name = "Marti Serra"; }; xworld21 = { - email = "1962985+xworld21@users.noreply.github.com"; github = "xworld21"; githubId = 1962985; name = "Vincenzo Mantova"; @@ -15477,8 +16024,13 @@ githubId = 1643293; name = "Yana Timoshenko"; }; + yanganto = { + name = "Antonio Yang"; + email = "yanganto@gmail.com"; + github = "yanganto"; + githubId = 10803111; + }; yarny = { - email = "41838844+Yarny0@users.noreply.github.com"; github = "Yarny0"; githubId = 41838844; name = "Yarny"; @@ -15496,6 +16048,15 @@ githubId = 73759599; name = "Lara A."; }; + ydlr = { + name = "ydlr"; + email = "ydlr@ydlr.io"; + github = "ydlr"; + githubId = 58453832; + keys = [{ + fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; + }]; + }; yesbox = { email = "jesper.geertsen.jonsson@gmail.com"; github = "yesbox"; @@ -15508,6 +16069,12 @@ githubId = 11229748; name = "Lin Yinfeng"; }; + yisuidenghua = { + email = "bileiner@gmail.com"; + name = "Milena Yisui"; + github = "YisuiDenghua"; + githubId = 102890144; + }; ylecornec = { email = "yves.stan.lecornec@tweag.io"; github = "ylecornec"; @@ -15532,6 +16099,25 @@ githubId = 1311192; name = "Alexander Kiselyov"; }; + ymarkus = { + name = "Yannick Markus"; + email = "nixpkgs@ymarkus.dev"; + github = "ymarkus"; + githubId = 62380378; + }; + ymatsiuk = { + name = "Yurii Matsiuk"; + github = "ymatsiuk"; + githubId = 24990891; + keys = [{ + fingerprint = "7BB8 84B5 74DA FDB1 E194 ED21 6130 2290 2986 01AA"; + }]; + }; + ymeister = { + name = "Yuri Meister"; + github = "ymeister"; + githubId = 47071325; + }; yochai = { email = "yochai@titat.info"; github = "yochai"; @@ -15563,6 +16149,12 @@ github = "yrd"; githubId = 1820447; }; + yshym = { + name = "Yevhen Shymotiuk"; + email = "yshym@pm.me"; + github = "yshym"; + githubId = 44244245; + }; ysndr = { email = "me@ysndr.de"; github = "ysndr"; @@ -15670,6 +16262,21 @@ githubId = 1319905; name = "Uma Zalakain"; }; + zanculmarktum = { + name = "Azure Zanculmarktum"; + email = "zanculmarktum@gmail.com"; + github = "zanculmarktum"; + githubId = 16958511; + }; + zane = { + name = "Zane van Iperen"; + email = "zane@zanevaniperen.com"; + github = "vs49688"; + githubId = 4423262; + keys = [{ + fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; + }]; + }; zaninime = { email = "francesco@zanini.me"; github = "zaninime"; @@ -15694,6 +16301,12 @@ githubId = 6191421; name = "Edward d'Albon"; }; + zbioe = { + name = "Iury Fukuda"; + email = "zbioe@protonmail.com"; + github = "zbioe"; + githubId = 7332055; + }; zebreus = { matrix = "@lennart:cicen.net"; email = "lennarteichhorn+nixpkgs@gmail.com"; @@ -15701,6 +16314,27 @@ githubId = 1557253; name = "Lennart Eichhorn"; }; + zeri = { + name = "zeri"; + matrix = "@zeri:matrix.org"; + github = "zeri42"; + githubId = 68825133; + }; + zendo = { + name = "zendo"; + email = "linzway@qq.com"; + github = "zendo"; + githubId = 348013; + }; + zenithal = { + name = "zenithal"; + email = "i@zenithal.me"; + github = "ZenithalHourlyRate"; + githubId = 19512674; + keys = [{ + fingerprint = "1127 F188 280A E312 3619 3329 87E1 7EEF 9B18 B6C9"; + }]; + }; zeratax = { email = "mail@zera.tax"; github = "zeratax"; @@ -15729,6 +16363,12 @@ githubId = 2189609; name = "Zhaofeng Li"; }; + ziguana = { + name = "Zig Uana"; + email = "git@ziguana.dev"; + github = "ziguana"; + githubId = 45833444; + }; zimbatm = { email = "zimbatm@zimbatm.com"; github = "zimbatm"; @@ -15741,12 +16381,33 @@ githubId = 1108325; name = "Théo Zimmermann"; }; + zoedsoupe = { + github = "zoedsoupe"; + githubId = 44469426; + name = "Zoey de Souza Pessanha"; + email = "zoey.spessanha@outlook.com"; + keys = [{ + fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315"; + }]; + }; zohl = { email = "zohl@fmap.me"; github = "zohl"; githubId = 6067895; name = "Al Zohali"; }; + zokrezyl = { + email = "zokrezyl@gmail.com"; + github = "zokrezyl"; + githubId = 51886259; + name = "Zokre Zyl"; + }; + zombiezen = { + name = "Ross Light"; + email = "ross@zombiezen.com"; + github = "zombiezen"; + githubId = 181535; + }; zookatron = { email = "tim@zookatron.com"; github = "zookatron"; @@ -15760,7 +16421,6 @@ name = "Alexandre Macabies"; }; zowoq = { - email = "59103226+zowoq@users.noreply.github.com"; github = "zowoq"; githubId = 59103226; name = "zowoq"; @@ -15771,12 +16431,33 @@ githubId = 8100652; name = "David Mell"; }; + zseri = { + name = "zseri"; + email = "zseri.devel@ytrizja.de"; + github = "zseri"; + githubId = 1618343; + keys = [{ + fingerprint = "7AFB C595 0D3A 77BD B00F 947B 229E 63AE 5644 A96D"; + }]; + }; ztzg = { email = "dd@crosstwine.com"; github = "ztzg"; githubId = 393108; name = "Damien Diederen"; }; + zupo = { + name = "Nejc Zupan"; + email = "nejczupan+nix@gmail.com"; + github = "zupo"; + githubId = 311580; + }; + zuzuleinen = { + email = "andrey.boar@gmail.com"; + name = "Andrei Boar"; + github = "zuzuleinen"; + githubId = 944919; + }; zx2c4 = { email = "Jason@zx2c4.com"; github = "zx2c4"; @@ -15795,576 +16476,5 @@ githubId = 32876; name = "Diego Zamboni"; }; - turbomack = { - email = "marek.faj@gmail.com"; - github = "turboMaCk"; - githubId = 2130305; - name = "Marek Fajkus"; - }; - melling = { - email = "mattmelling@fastmail.com"; - github = "mattmelling"; - githubId = 1215331; - name = "Matt Melling"; - }; - wd15 = { - email = "daniel.wheeler2@gmail.com"; - github = "wd15"; - githubId = 1986844; - name = "Daniel Wheeler"; - }; - misuzu = { - email = "bakalolka@gmail.com"; - github = "misuzu"; - githubId = 248143; - name = "misuzu"; - }; - zokrezyl = { - email = "zokrezyl@gmail.com"; - github = "zokrezyl"; - githubId = 51886259; - name = "Zokre Zyl"; - }; - rakesh4g = { - email = "rakeshgupta4u@gmail.com"; - github = "Rakesh4G"; - githubId = 50867187; - name = "Rakesh Gupta"; - }; - mlatus = { - email = "wqseleven@gmail.com"; - github = "Ninlives"; - githubId = 17873203; - name = "mlatus"; - }; - waiting-for-dev = { - email = "marc@lamarciana.com"; - github = "waiting-for-dev"; - githubId = 52650; - name = "Marc Busqué"; - }; - snglth = { - email = "illia@ishestakov.com"; - github = "snglth"; - githubId = 8686360; - name = "Illia Shestakov"; - }; - masaeedu = { - email = "masaeedu@gmail.com"; - github = "masaeedu"; - githubId = 3674056; - name = "Asad Saeeduddin"; - }; - matthewcroughan = { - email = "matt@croughan.sh"; - github = "MatthewCroughan"; - githubId = 26458780; - name = "Matthew Croughan"; - }; - ngerstle = { - name = "Nicholas Gerstle"; - email = "ngerstle@gmail.com"; - github = "ngerstle"; - githubId = 1023752; - }; - shardy = { - email = "shardul@baral.ca"; - github = "shardulbee"; - githubId = 16765155; - name = "Shardul Baral"; - }; - xavierzwirtz = { - email = "me@xavierzwirtz.com"; - github = "xavierzwirtz"; - githubId = 474343; - name = "Xavier Zwirtz"; - }; - ymarkus = { - name = "Yannick Markus"; - email = "nixpkgs@ymarkus.dev"; - github = "ymarkus"; - githubId = 62380378; - }; - ymatsiuk = { - name = "Yurii Matsiuk"; - email = "ymatsiuk@users.noreply.github.com"; - github = "ymatsiuk"; - githubId = 24990891; - keys = [{ - fingerprint = "7BB8 84B5 74DA FDB1 E194 ED21 6130 2290 2986 01AA"; - }]; - }; - ymeister = { - name = "Yuri Meister"; - email = "47071325+ymeister@users.noreply.github.com"; - github = "ymeister"; - githubId = 47071325; - }; - cpcloud = { - name = "Phillip Cloud"; - email = "417981+cpcloud@users.noreply.github.com"; - github = "cpcloud"; - githubId = 417981; - }; - davegallant = { - name = "Dave Gallant"; - email = "davegallant@gmail.com"; - github = "davegallant"; - githubId = 4519234; - }; - saulecabrera = { - name = "Saúl Cabrera"; - email = "saulecabrera@gmail.com"; - github = "saulecabrera"; - githubId = 1423601; - }; - tfmoraes = { - name = "Thiago Franco de Moraes"; - email = "351108+tfmoraes@users.noreply.github.com"; - github = "tfmoraes"; - githubId = 351108; - }; - deifactor = { - name = "Ash Zahlen"; - email = "ext0l@riseup.net"; - github = "deifactor"; - githubId = 30192992; - }; - deinferno = { - name = "deinferno"; - email = "14363193+deinferno@users.noreply.github.com"; - github = "deinferno"; - githubId = 14363193; - }; - fzakaria = { - name = "Farid Zakaria"; - email = "farid.m.zakaria@gmail.com"; - matrix = "@fzakaria:matrix.org"; - github = "fzakaria"; - githubId = 605070; - }; - nagisa = { - name = "Simonas Kazlauskas"; - email = "nixpkgs@kazlauskas.me"; - github = "nagisa"; - githubId = 679122; - }; - yshym = { - name = "Yevhen Shymotiuk"; - email = "yshym@pm.me"; - github = "yshym"; - githubId = 44244245; - }; - hmenke = { - name = "Henri Menke"; - email = "henri@henrimenke.de"; - matrix = "@hmenke:matrix.org"; - github = "hmenke"; - githubId = 1903556; - keys = [{ - fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; - }]; - }; - berbiche = { - name = "Nicolas Berbiche"; - email = "nicolas@normie.dev"; - github = "berbiche"; - githubId = 20448408; - keys = [{ - fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; - }]; - }; - wenngle = { - name = "Zeke Stephens"; - email = "zekestephens@gmail.com"; - github = "wenngle"; - githubId = 63376671; - }; - yanganto = { - name = "Antonio Yang"; - email = "yanganto@gmail.com"; - github = "yanganto"; - githubId = 10803111; - }; - starcraft66 = { - name = "Tristan Gosselin-Hane"; - email = "starcraft66@gmail.com"; - github = "starcraft66"; - githubId = 1858154; - keys = [{ - fingerprint = "8597 4506 EC69 5392 0443 0805 9D98 CDAC FF04 FD78"; - }]; - }; - hloeffler = { - name = "Hauke Löffler"; - email = "nix@hauke-loeffler.de"; - github = "hloeffler"; - githubId = 6627191; - }; - wilsonehusin = { - name = "Wilson E. Husin"; - email = "wilsonehusin@gmail.com"; - github = "wilsonehusin"; - githubId = 14004487; - }; - bb2020 = { - email = "bb2020@users.noreply.github.com"; - github = "bb2020"; - githubId = 19290397; - name = "Tunc Uzlu"; - }; - pulsation = { - name = "Philippe Sam-Long"; - email = "1838397+pulsation@users.noreply.github.com"; - github = "pulsation"; - githubId = 1838397; - }; - princemachiavelli = { - name = "Josh Hoffer"; - email = "jhoffer@sansorgan.es"; - matrix = "@princemachiavelli:matrix.org"; - github = "Princemachiavelli"; - githubId = 2730968; - keys = [{ - fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; - }]; - }; - ydlr = { - name = "ydlr"; - email = "ydlr@ydlr.io"; - github = "ydlr"; - githubId = 58453832; - keys = [{ - fingerprint = "FD0A C425 9EF5 4084 F99F 9B47 2ACC 9749 7C68 FAD4"; - }]; - }; - zane = { - name = "Zane van Iperen"; - email = "zane@zanevaniperen.com"; - github = "vs49688"; - githubId = 4423262; - keys = [{ - fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; - }]; - }; - zbioe = { - name = "Iury Fukuda"; - email = "zbioe@protonmail.com"; - github = "zbioe"; - githubId = 7332055; - }; - zendo = { - name = "zendo"; - email = "linzway@qq.com"; - github = "zendo"; - githubId = 348013; - }; - zenithal = { - name = "zenithal"; - email = "i@zenithal.me"; - github = "ZenithalHourlyRate"; - githubId = 19512674; - keys = [{ - fingerprint = "1127 F188 280A E312 3619 3329 87E1 7EEF 9B18 B6C9"; - }]; - }; - zeri = { - name = "zeri"; - email = "68825133+zeri42@users.noreply.github.com"; - matrix = "@zeri:matrix.org"; - github = "zeri42"; - githubId = 68825133; - }; - zoedsoupe = { - github = "zoedsoupe"; - githubId = 44469426; - name = "Zoey de Souza Pessanha"; - email = "zoey.spessanha@outlook.com"; - keys = [{ - fingerprint = "EAA1 51DB 472B 0122 109A CB17 1E1E 889C DBD6 A315"; - }]; - }; - zombiezen = { - name = "Ross Light"; - email = "ross@zombiezen.com"; - github = "zombiezen"; - githubId = 181535; - }; - zseri = { - name = "zseri"; - email = "zseri.devel@ytrizja.de"; - github = "zseri"; - githubId = 1618343; - keys = [{ - fingerprint = "7AFB C595 0D3A 77BD B00F 947B 229E 63AE 5644 A96D"; - }]; - }; - zupo = { - name = "Nejc Zupan"; - email = "nejczupan+nix@gmail.com"; - github = "zupo"; - githubId = 311580; - }; - sei40kr = { - name = "Seong Yong-ju"; - email = "sei40kr@gmail.com"; - github = "sei40kr"; - githubId = 11665236; - }; - vdot0x23 = { - name = "Victor Büttner"; - email = "nix.victor@0x23.dk"; - github = "vdot0x23"; - githubId = 40716069; - }; - jpagex = { - name = "Jérémy Pagé"; - email = "contact@jeremypage.me"; - github = "jpagex"; - githubId = 635768; - }; - vbrandl = { - name = "Valentin Brandl"; - email = "mail+nixpkgs@vbrandl.net"; - github = "vbrandl"; - githubId = 20639051; - }; - portothree = { - name = "Gustavo Porto"; - email = "gus@p8s.co"; - github = "portothree"; - githubId = 3718120; - }; - pwoelfel = { - name = "Philipp Woelfel"; - email = "philipp.woelfel@gmail.com"; - github = "PhilippWoelfel"; - githubId = 19400064; - }; - qbit = { - name = "Aaron Bieber"; - email = "aaron@bolddaemon.com"; - github = "qbit"; - githubId = 68368; - matrix = "@qbit:tapenet.org"; - keys = [{ - fingerprint = "3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE"; - }]; - }; - ameer = { - name = "Ameer Taweel"; - email = "ameertaweel2002@gmail.com"; - github = "AmeerTaweel"; - githubId = 20538273; - }; - nigelgbanks = { - name = "Nigel Banks"; - email = "nigel.g.banks@gmail.com"; - github = "nigelgbanks"; - githubId = 487373; - }; - zanculmarktum = { - name = "Azure Zanculmarktum"; - email = "zanculmarktum@gmail.com"; - github = "zanculmarktum"; - githubId = 16958511; - }; - kuwii = { - name = "kuwii"; - email = "kuwii.someone@gmail.com"; - github = "kuwii"; - githubId = 10705175; - }; - kkharji = { - name = "kkharji"; - email = "kkharji@protonmail.com"; - github = "kkharji"; - githubId = 65782666; - }; - melias122 = { - name = "Martin Elias"; - email = "martin+nixpkgs@elias.sx"; - github = "melias122"; - githubId = 1027766; - }; - bryanhonof = { - name = "Bryan Honof"; - email = "bryanhonof@gmail.com"; - github = "bryanhonof"; - githubId = 5932804; - }; - bbenne10 = { - email = "Bryan.Bennett@protonmail.com"; - matrix = "@bryan.bennett:matrix.org"; - github = "bbenne10"; - githubId = 687376; - name = "Bryan Bennett"; - keys = [{ - # compare with https://keybase.io/bbenne10 - fingerprint = "41EA 00B4 00F9 6970 1CB2 D3AF EF90 E3E9 8B8F 5C0B"; - }]; - }; - snpschaaf = { - email = "philipe.schaaf@secunet.com"; - name = "Philippe Schaaf"; - github = "snpschaaf"; - githubId = 105843013; - }; - SohamG = { - email = "sohamg2@gmail.com"; - name = "Soham S Gumaste"; - github = "SohamG"; - githubId = 7116239; - keys = [{ - fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442"; - }]; - }; - jali-clarke = { - email = "jinnah.ali-clarke@outlook.com"; - name = "Jinnah Ali-Clarke"; - github = "jali-clarke"; - githubId = 17733984; - }; - wesleyjrz = { - email = "dev@wesleyjrz.com"; - name = "Wesley V. Santos Jr."; - github = "wesleyjrz"; - githubId = 60184588; - }; - npatsakula = { - email = "nikita.patsakula@gmail.com"; - name = "Patsakula Nikita"; - github = "npatsakula"; - githubId = 23001619; - }; - dfithian = { - email = "daniel.m.fithian@gmail.com"; - name = "Daniel Fithian"; - github = "dfithian"; - githubId = 8409320; - }; - nikstur = { - email = "nikstur@outlook.com"; - name = "nikstur"; - github = "nikstur"; - githubId = 61635709; - }; - yisuidenghua = { - email = "bileiner@gmail.com"; - name = "Milena Yisui"; - github = "YisuiDenghua"; - githubId = 102890144; - }; - macalinao = { - email = "me@ianm.com"; - name = "Ian Macalinao"; - github = "macalinao"; - githubId = 401263; - keys = [{ - fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; - }]; - }; - tjni = { - email = "43ngvg@masqt.com"; - matrix = "@tni:matrix.org"; - name = "Theodore Ni"; - github = "tjni"; - githubId = 3806110; - keys = [{ - fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; - }]; - }; - bezmuth = { - email = "benkel97@protonmail.com"; - name = "Ben Kelly"; - github = "bezmuth"; - githubId = 31394095; - }; - cafkafk = { - email = "christina@cafkafk.com"; - matrix = "@cafkafk:matrix.cafkafk.com"; - name = "Christina Sørensen"; - github = "cafkafk"; - githubId = 89321978; - keys = [ - { - fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; - } - { - fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; - } - ]; - }; - rb = { - email = "maintainers@cloudposse.com"; - github = "nitrocode"; - githubId = 7775707; - name = "RB"; - }; - bpaulin = { - email = "brunopaulin@bpaulin.net"; - github = "bpaulin"; - githubId = 115711; - name = "bpaulin"; - }; - zuzuleinen = { - email = "andrey.boar@gmail.com"; - name = "Andrei Boar"; - github = "zuzuleinen"; - githubId = 944919; - }; - waelwindows = { - email = "waelwindows9922@gmail.com"; - github = "Waelwindows"; - githubId = 5228243; - name = "waelwindows"; - }; - witchof0x20 = { - name = "Jade"; - email = "jade@witchof.space"; - github = "witchof0x20"; - githubId = 36118348; - keys = [{ - fingerprint = "69C9 876B 5797 1B2E 11C5 7C39 80A1 F76F C9F9 54AE"; - }]; - }; - WhiteBlackGoose = { - email = "wbg@angouri.org"; - github = "WhiteBlackGoose"; - githubId = 31178401; - name = "WhiteBlackGoose"; - keys = [{ - fingerprint = "640B EDDE 9734 310A BFA3 B257 52ED AE6A 3995 AFAB"; - }]; - }; - wuyoli = { - name = "wuyoli"; - email = "wuyoli@tilde.team"; - github = "wuyoli"; - githubId = 104238274; - }; - ziguana = { - name = "Zig Uana"; - email = "git@ziguana.dev"; - github = "ziguana"; - githubId = 45833444; - }; - detegr = { - name = "Antti Keränen"; - email = "detegr@rbx.email"; - github = "Detegr"; - githubId = 724433; - }; - RossComputerGuy = { - name = "Tristan Ross"; - email = "tristan.ross@midstall.com"; - github = "RossComputerGuy"; - githubId = 19699320; - }; - franzmondlichtmann = { - name = "Franz Schroepf"; - email = "franz-schroepf@t-online.de"; - github = "franzmondlichtmann"; - githubId = 105480088; - }; } +/* Keep the list alphabetically sorted. */ diff --git a/third_party/nixpkgs/maintainers/scripts/eval-release.nix b/third_party/nixpkgs/maintainers/scripts/eval-release.nix index bb9572cbc7..4f0ca24650 100644 --- a/third_party/nixpkgs/maintainers/scripts/eval-release.nix +++ b/third_party/nixpkgs/maintainers/scripts/eval-release.nix @@ -17,6 +17,7 @@ let if (builtins.tryEval attrs.drvPath).success then { inherit (attrs) name drvPath; } else { failed = true; } + else if attrs == null then {} else { recurseForDerivations = true; } // mapAttrs (n: v: let path' = path ++ [n]; in trace path' (recurse path' v)) attrs else { }; diff --git a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv index d6d2a9da06..b8f8bf6ef4 100644 --- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -65,6 +65,7 @@ luaevent,,,,,, luaexpat,,,,1.4.1-1,,arobyn flosse luaffi,,,http://luarocks.org/dev,,, luafilesystem,,,,1.8.0-1,,flosse +lualdap,,,,,,aanderse lualogging,,,,,, luaossl,,,,,5.1, luaposix,,,,34.1.1-1,,vyp lblasc diff --git a/third_party/nixpkgs/maintainers/scripts/nix-generate-from-cpan.nix b/third_party/nixpkgs/maintainers/scripts/nix-generate-from-cpan.nix index 9f9833d406..bf48a53186 100644 --- a/third_party/nixpkgs/maintainers/scripts/nix-generate-from-cpan.nix +++ b/third_party/nixpkgs/maintainers/scripts/nix-generate-from-cpan.nix @@ -9,15 +9,14 @@ stdenv.mkDerivation { perl GetoptLongDescriptive CPANPLUS Readonly LogLog4perl ]; - phases = [ "installPhase" ]; + dontUnpack = true; - installPhase = - '' - mkdir -p $out/bin - cp ${./nix-generate-from-cpan.pl} $out/bin/nix-generate-from-cpan - patchShebangs $out/bin/nix-generate-from-cpan - wrapProgram $out/bin/nix-generate-from-cpan --set PERL5LIB $PERL5LIB - ''; + installPhase = '' + mkdir -p $out/bin + cp ${./nix-generate-from-cpan.pl} $out/bin/nix-generate-from-cpan + patchShebangs $out/bin/nix-generate-from-cpan + wrapProgram $out/bin/nix-generate-from-cpan --set PERL5LIB $PERL5LIB + ''; meta = { maintainers = with lib.maintainers; [ eelco ]; diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 8bf5f07bc4..49ddf1f10b 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -168,6 +168,15 @@ with lib.maintainers; { shortName = "Cosmopolitan"; }; + deepin = { + members = [ + rewine + ]; + scope = "Maintain deepin desktop environment and related packages."; + shortName = "DDE"; + enableFeatureFreezePing = true; + }; + deshaw = { # Verify additions to this team with at least one already existing member of the team. members = [ @@ -398,6 +407,19 @@ with lib.maintainers; { shortName = "Linux Kernel"; }; + llvm = { + members = [ + ericson2314 + sternenseemann + lovek323 + dtzWill + primeos + ]; + scope = "Maintain LLVM package sets and related packages"; + shortName = "LLVM"; + enableFeatureFreezePing = true; + }; + lumiguide = { # Verify additions by approval of an already existing member of the team. members = [ @@ -676,9 +698,11 @@ with lib.maintainers; { rust = { members = [ - andir + figsoda lnl7 mic92 + tjni + winter zowoq ]; scope = "Maintain the Rust compiler toolchain and nixpkgs integration."; diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/config-file.section.md b/third_party/nixpkgs/nixos/doc/manual/configuration/config-file.section.md index efd231fd1f..b010026c58 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/config-file.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/config-file.section.md @@ -170,6 +170,6 @@ Packages ``` The latter option definition changes the default PostgreSQL package - used by NixOS's PostgreSQL service to 10.x. For more information on + used by NixOS's PostgreSQL service to 14.x. For more information on packages, including how to add new ones, see [](#sec-custom-packages). diff --git a/third_party/nixpkgs/nixos/doc/manual/default.nix b/third_party/nixpkgs/nixos/doc/manual/default.nix index 9b72e840f4..913058746b 100644 --- a/third_party/nixpkgs/nixos/doc/manual/default.nix +++ b/third_party/nixpkgs/nixos/doc/manual/default.nix @@ -68,12 +68,15 @@ let sources = lib.sourceFilesBySuffices ./. [".xml"]; - modulesDoc = builtins.toFile "modules.xml" '' -
- ${(lib.concatMapStrings (path: '' - - '') (lib.catAttrs "value" config.meta.doc))} -
+ modulesDoc = runCommand "modules.xml" { + nativeBuildInputs = [ pkgs.nixos-render-docs ]; + } '' + nixos-render-docs manual docbook \ + --manpage-urls ${pkgs.path + "/doc/manpage-urls.json"} \ + "$out" \ + --section \ + --section-id modules \ + --chapters ${lib.concatMapStrings (p: "${p.value} ") config.meta.doc} ''; generatedSources = runCommand "generated-docbook" {} '' @@ -176,40 +179,10 @@ let lintrng $out/man-pages-combined.xml ''; - olinkDB = runCommand "manual-olinkdb" - { inherit sources; - nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ]; - } - '' - xsltproc \ - ${manualXsltprocOptions} \ - --stringparam collect.xref.targets only \ - --stringparam targets.filename "$out/manual.db" \ - --nonet \ - ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ - ${manual-combined}/manual-combined.xml - - cat > "$out/olinkdb.xml" < - - ]> - - - Allows for cross-referencing olinks between the manpages - and manual. - - - &manualtargets; - - EOF - ''; - in rec { inherit generatedSources; - inherit (optionsDoc) optionsJSON optionsNix optionsDocBook; + inherit (optionsDoc) optionsJSON optionsNix optionsDocBook optionsUsedDocbook; # Generate the NixOS manual. manualHTML = runCommand "nixos-manual-html" @@ -224,7 +197,6 @@ in rec { mkdir -p $dst xsltproc \ ${manualXsltprocOptions} \ - --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ --stringparam id.warnings "1" \ --nonet --output $dst/ \ ${docbook_xsl_ns}/xml/xsl/docbook/xhtml/chunktoc.xsl \ @@ -261,7 +233,6 @@ in rec { xsltproc \ ${manualXsltprocOptions} \ - --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ --nonet --xinclude --output $dst/epub/ \ ${docbook_xsl_ns}/xml/xsl/docbook/epub/docbook.xsl \ ${manual-combined}/manual-combined.xml @@ -295,7 +266,6 @@ in rec { --param man.output.base.dir "'$out/share/man/'" \ --param man.endnotes.are.numbered 0 \ --param man.break.after.slash 1 \ - --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ ${docbook_xsl_ns}/xml/xsl/docbook/manpages/docbook.xsl \ ${manual-combined}/man-pages-combined.xml ''; diff --git a/third_party/nixpkgs/nixos/doc/manual/development/meta-attributes.section.md b/third_party/nixpkgs/nixos/doc/manual/development/meta-attributes.section.md index 7129cf8723..33b41fe74d 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/meta-attributes.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/meta-attributes.section.md @@ -23,7 +23,7 @@ file. meta = { maintainers = with lib.maintainers; [ ericsagnes ]; - doc = ./default.xml; + doc = ./default.md; buildDocsInSandbox = true; }; } @@ -31,7 +31,9 @@ file. - `maintainers` contains a list of the module maintainers. -- `doc` points to a valid DocBook file containing the module +- `doc` points to a valid [Nixpkgs-flavored CommonMark]( + https://nixos.org/manual/nixpkgs/unstable/#sec-contributing-markup + ) file containing the module documentation. Its contents is automatically added to [](#ch-configuration). Changes to a module documentation have to be checked to not break building the NixOS manual: @@ -40,26 +42,6 @@ file. $ nix-build nixos/release.nix -A manual.x86_64-linux ``` - This file should *not* usually be written by hand. Instead it is preferred - to write documentation using CommonMark and converting it to CommonMark - using pandoc. The simplest documentation can be converted using just - - ```ShellSession - $ pandoc doc.md -t docbook --top-level-division=chapter -f markdown+smart > doc.xml - ``` - - More elaborate documentation may wish to add one or more of the pandoc - filters used to build the remainder of the manual, for example the GNOME - desktop uses - - ```ShellSession - $ pandoc gnome.md -t docbook --top-level-division=chapter \ - --extract-media=media -f markdown+smart \ - --lua-filter ../../../../../doc/build-aux/pandoc-filters/myst-reader/roles.lua \ - --lua-filter ../../../../../doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua \ - > gnome.xml - ``` - - `buildDocsInSandbox` indicates whether the option documentation for the module can be built in a derivation sandbox. This option is currently only honored for modules shipped by nixpkgs. User modules and modules taken from diff --git a/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md b/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md index aa747f47c9..18ec7ba903 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md @@ -78,7 +78,7 @@ For example: ::: {#ex-options-declarations-util-mkEnableOption-magic .example} ```nix -lib.mkEnableOption "magic" +lib.mkEnableOption (lib.mdDoc "magic") # is like lib.mkOption { type = lib.types.bool; @@ -113,7 +113,7 @@ Examples: ::: {#ex-options-declarations-util-mkPackageOption-hello .example} ```nix -lib.mkPackageOption pkgs "hello" { } +lib.mkPackageOptionMD pkgs "hello" { } # is like lib.mkOption { type = lib.types.package; @@ -125,7 +125,7 @@ lib.mkOption { ::: {#ex-options-declarations-util-mkPackageOption-ghc .example} ```nix -lib.mkPackageOption pkgs "GHC" { +lib.mkPackageOptionMD pkgs "GHC" { default = [ "ghc" ]; example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; } diff --git a/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.section.md b/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.section.md index 1130672cb3..54002941d6 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/running-nixos-tests-interactively.section.md @@ -24,6 +24,39 @@ back into the test driver command line upon its completion. This allows you to inspect the state of the VMs after the test (e.g. to debug the test script). +## Shell access in interactive mode {#sec-nixos-test-shell-access} + +The function `.shell_interact()` grants access to a shell running +inside a virtual machine. To use it, replace `` with the name of a +virtual machine defined in the test, for example: `machine.shell_interact()`. +Keep in mind that this shell may not display everything correctly as it is +running within an interactive Python REPL, and logging output from the virtual +machine may overwrite input and output from the guest shell: + +```py +>>> machine.shell_interact() +machine: Terminal is ready (there is no initial prompt): +$ hostname +machine +``` + +As an alternative, you can proxy the guest shell to a local TCP server by first +starting a TCP server in a terminal using the command: + +```ShellSession +$ socat 'READLINE,PROMPT=$ ' tcp-listen:4444,reuseaddr` +``` + +In the terminal where the test driver is running, connect to this server by +using: + +```py +>>> machine.shell_interact("tcp:127.0.0.1:4444") +``` + +Once the connection is established, you can enter commands in the socat terminal +where socat is running. + ## Reuse VM state {#sec-nixos-test-reuse-vm-state} You can re-use the VM states coming from a previous run by setting the diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/config-file.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/config-file.section.xml index f6c8f70cff..da5419cde4 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/config-file.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/config-file.section.xml @@ -221,7 +221,7 @@ services.postgresql.package = pkgs.postgresql_14; The latter option definition changes the default PostgreSQL - package used by NixOS’s PostgreSQL service to 10.x. For more + package used by NixOS’s PostgreSQL service to 14.x. For more information on packages, including how to add new ones, see . diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/meta-attributes.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/meta-attributes.section.xml index 450a5f670f..64234f1cc0 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/meta-attributes.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/meta-attributes.section.xml @@ -28,7 +28,7 @@ meta = { maintainers = with lib.maintainers; [ ericsagnes ]; - doc = ./default.xml; + doc = ./default.md; buildDocsInSandbox = true; }; } @@ -42,35 +42,16 @@ - doc points to a valid DocBook file containing - the module documentation. Its contents is automatically added to + doc points to a valid + Nixpkgs-flavored + CommonMark file containing the module documentation. Its + contents is automatically added to . Changes to a module documentation have to be checked to not break building the NixOS manual: $ nix-build nixos/release.nix -A manual.x86_64-linux - - - This file should not usually be written by - hand. Instead it is preferred to write documentation using - CommonMark and converting it to CommonMark using pandoc. The - simplest documentation can be converted using just - - -$ pandoc doc.md -t docbook --top-level-division=chapter -f markdown+smart > doc.xml - - - More elaborate documentation may wish to add one or more of the - pandoc filters used to build the remainder of the manual, for - example the GNOME desktop uses - - -$ pandoc gnome.md -t docbook --top-level-division=chapter \ - --extract-media=media -f markdown+smart \ - --lua-filter ../../../../../doc/build-aux/pandoc-filters/myst-reader/roles.lua \ - --lua-filter ../../../../../doc/build-aux/pandoc-filters/docbook-writer/rst-roles.lua \ - > gnome.xml diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml index cc4893939c..af05e61363 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -128,7 +128,7 @@ options = { -lib.mkEnableOption "magic" +lib.mkEnableOption (lib.mdDoc "magic") # is like lib.mkOption { type = lib.types.bool; @@ -188,7 +188,7 @@ mkPackageOption pkgs "name" { default = [ "path" "in&qu -lib.mkPackageOption pkgs "hello" { } +lib.mkPackageOptionMD pkgs "hello" { } # is like lib.mkOption { type = lib.types.package; @@ -199,7 +199,7 @@ lib.mkOption { -lib.mkPackageOption pkgs "GHC" { +lib.mkPackageOptionMD pkgs "GHC" { default = [ "ghc" ]; example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; } diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml index 16db709f8b..30aa24f26e 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/running-nixos-tests-interactively.section.xml @@ -25,6 +25,46 @@ $ ./result/bin/nixos-test-driver completion. This allows you to inspect the state of the VMs after the test (e.g. to debug the test script). +
+ Shell access in interactive mode + + The function + <yourmachine>.shell_interact() grants + access to a shell running inside a virtual machine. To use it, + replace <yourmachine> with the name of a + virtual machine defined in the test, for example: + machine.shell_interact(). Keep in mind that + this shell may not display everything correctly as it is running + within an interactive Python REPL, and logging output from the + virtual machine may overwrite input and output from the guest + shell: + + +>>> machine.shell_interact() +machine: Terminal is ready (there is no initial prompt): +$ hostname +machine + + + As an alternative, you can proxy the guest shell to a local TCP + server by first starting a TCP server in a terminal using the + command: + + +$ socat 'READLINE,PROMPT=$ ' tcp-listen:4444,reuseaddr` + + + In the terminal where the test driver is running, connect to this + server by using: + + +>>> machine.shell_interact("tcp:127.0.0.1:4444") + + + Once the connection is established, you can enter commands in the + socat terminal where socat is running. + +
Reuse VM state diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 5e2a65061f..b8affabb86 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -61,6 +61,13 @@ services.printing.cups-pdf. + + + Cloudlog, + a web-based Amateur Radio logging application. Available as + services.cloudlog. + + fzf, @@ -83,6 +90,14 @@ networking.stevenblack. + + + goeland, + an alternative to rss2email written in golang with many + filters. Available as + services.goeland. + + atuin, @@ -98,6 +113,14 @@ services.mmsd. + + + QDMR, a + gui application and command line tool for programming cheap + DMR radios + programs.qdmr + + v2rayA, a Linux @@ -122,6 +145,13 @@ services.photoprism. + + + autosuspend, + a python daemon that suspends a system if certain conditions + are met, or not met. + +
@@ -138,6 +168,30 @@ instead. + + + checkInputs have been renamed to + nativeCheckInputs, because they behave the + same as nativeBuildInputs when + doCheck is set. + checkInputs now denote a new type of + dependencies, added to buildInputs when + doCheck is set. As a rule of thumb, + nativeCheckInputs are tools on + $PATH used during the tests, and + checkInputs are libraries which are linked + to executables built as part of the tests. Similarly, + installCheckInputs are renamed to + nativeInstallCheckInputs, corresponding to + nativeBuildInputs, and + installCheckInputs are a new type of + dependencies added to buildInputs when + doInstallCheck is set. (Note that this + change will not cause breakage to derivations with + strictDeps unset, which are most packages + except python, rust and go packages). + + borgbackup module now has an option for @@ -163,6 +217,18 @@ to upgrade existing repositories. + + + The services.kubo.settings option is now no + longer stateful. If you changed any of the options in + services.kubo.settings in the past and then + removed them from your NixOS configuration again, those + changes are still in your Kubo configuration file but will now + be reset to the default. If you’re unsure, you may want to + make a backup of your configuration file (probably + /var/lib/ipfs/config) and compare after the update. + + The EC2 image module no longer fetches instance metadata in @@ -237,6 +303,33 @@ or configure your firewall. + + + Kime has been updated from 2.5.6 to 3.0.2 and the + i18n.inputMethod.kime.config option has + been removed. Users should use + daemonModules, + iconColor, and + extraConfig options under + i18n.inputMethod.kime instead. + + + + + tut has been updated from 1.0.34 to 2.0.0, + and now uses the TOML format for the configuration file + instead of INI. Additional information can be found + here. + + + + + The wordpress derivation no longer contains + any builtin plugins or themes. If you need them you have to + add them back to prevent your site from breaking. You can find + them in wordpressPackages.{plugins,themes}. + + llvmPackages_rocm.llvm will not contain @@ -248,16 +341,6 @@ llvmPackages_rocm.clang-unwrapped. - - - The Nginx module now validates the syntax of config files at - build time. For more complex configurations (using - include with out-of-store files notably) - you may need to disable this check by setting - services.nginx.validateConfig - to false. - - The EC2 image module previously detected and automatically @@ -270,6 +353,16 @@ stage-2. + + + teleport has been upgraded to major version + 11. Please see upstream + upgrade + instructions and + release + notes. + + The EC2 image module previously detected and activated @@ -278,6 +371,12 @@ relying on this should provide their own implementation. + + + Calling makeSetupHook without passing a + name argument is deprecated. + + Qt 5.12 and 5.14 have been removed, as the corresponding @@ -287,6 +386,17 @@ updated manually. + + + The + services.wordpress.sites.<name>.plugins + and + services.wordpress.sites.<name>.themes + options have been converted from sets to attribute sets to + allow for consumers to specify explicit install paths via + attribute name. + + In mastodon it is now necessary to specify @@ -298,6 +408,15 @@ been changed to null. + + + The --target-host and + --build-host options of + nixos-rebuild no longer treat the + localhost value specially – to build + on/deploy to local machine, omit the relevant flag. + + The nix.readOnlyStore option has been @@ -313,6 +432,24 @@ freetype and others. + + + .NET 5.0 was removed due to being end-of-life, use a newer, + supported .NET version - + https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core + + + + + The iputils package, which is installed by default, no longer + provides the ninfod, + rarpd and rdisc tools. + See + upstream’s + release notes for more details and available + replacements. + +
@@ -374,6 +511,32 @@ sudo and sources the environment variables. + + + DocBook option documentation, which has been deprecated since + 22.11, will now cause a warning when documentation is built. + Out-of-tree modules should migrate to using CommonMark + documentation as outlined in + to silence this + warning. + + + DocBook option documentation support will be removed in the + next release and CommonMark will become the default. DocBook + option documentation that has not been migrated until then + will no longer render properly or cause errors. + + + + + NixOS now defaults to using nsncd (a non-caching + reimplementation in Rust) as NSS lookup dispatcher, instead of + the buggy and deprecated glibc-provided nscd. If you need to + switch back, set + services.nscd.enableNsncd = false, but + please open an issue in nixpkgs so your issue can be fixed. + + The dnsmasq service now takes configuration @@ -422,6 +585,17 @@ nixos/modules/profiles/minimal.nix profile. + + + The ghcWithPackages and + ghcWithHoogle wrappers will now also + symlink GHC’s and all included libraries’ documentation to + $out/share/doc for convenience. If + undesired, the old behavior can be restored by overriding the + builders with + { installDocumentation = false; }. + + mastodon now supports connection to a @@ -455,6 +629,13 @@ security. + + + services.dhcpcd service now don’t solicit + or accept IPv6 Router Advertisements on interfaces that use + static IPv6 addresses. + + The module services.headscale was @@ -546,6 +727,36 @@ here. + + + Updated recommended settings in + services.nginx.recommendedGzipSettings: + + + + + Enables gzip compression for only certain proxied + requests. + + + + + Allow checking and loading of precompressed files. + + + + + Updated gzip mime-types. + + + + + Increased the minimum length of a response that will be + gzipped. + + + + Garage @@ -568,6 +779,13 @@ hipcc. + + + services.nginx.recommendedProxySettings now + removes the Connection header preventing + clients from closing backend connections. + + Resilio sync secret keys can now be provided using a secrets diff --git a/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml b/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml index c80bfaaf51..bf0f4aafa1 100644 --- a/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml +++ b/third_party/nixpkgs/nixos/doc/manual/man-nixos-rebuild.xml @@ -583,15 +583,15 @@ Specifies the NixOS target host. By setting this to something other than - localhost, the system activation will happen + an empty string, the system activation will happen on the remote host instead of the local machine. The remote host needs to be accessible over ssh, and for the commands , and you need root access. - If is not explicitly specified, building - will take place locally. + If is not explicitly specified or empty, + building will take place locally. diff --git a/third_party/nixpkgs/nixos/doc/manual/md-to-db.sh b/third_party/nixpkgs/nixos/doc/manual/md-to-db.sh index a7421bed53..4698e94f50 100755 --- a/third_party/nixpkgs/nixos/doc/manual/md-to-db.sh +++ b/third_party/nixpkgs/nixos/doc/manual/md-to-db.sh @@ -50,21 +50,3 @@ for mf in ${MD_FILES[*]}; do done popd - -# now handle module chapters. we'll need extra checks to ensure that we don't process -# markdown files we're not interested in, so we'll require an x.nix file for ever x.md -# that we'll convert to xml. -pushd "$DIR/../../modules" - -mapfile -t MD_FILES < <(find . -type f -regex '.*\.md$') - -for mf in ${MD_FILES[*]}; do - [ -f "${mf%.md}.nix" ] || continue - - pandoc --top-level-division=chapter "$mf" "${pandoc_flags[@]}" -o "${mf%.md}.xml" - sed -i -e '1 i ' \ - "${mf%.md}.xml" -done - -popd diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md index 8c67815ada..96f6767321 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md @@ -24,34 +24,46 @@ In addition to numerous new and upgraded packages, this release has the followin - [cups-pdf-to-pdf](https://github.com/alexivkin/CUPS-PDF-to-PDF), a pdf-generating cups backend based on [cups-pdf](https://www.cups-pdf.de/). Available as [services.printing.cups-pdf](#opt-services.printing.cups-pdf.enable). +- [Cloudlog](https://www.magicbug.co.uk/cloudlog/), a web-based Amateur Radio logging application. Available as [services.cloudlog](#opt-services.cloudlog.enable). + - [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion). - [gmediarender](https://github.com/hzeller/gmrender-resurrect), a simple, headless UPnP/DLNA renderer. Available as [services.gmediarender](options.html#opt-services.gmediarender.enable). - [stevenblack-blocklist](https://github.com/StevenBlack/hosts), A unified hosts file with base extensions for blocking unwanted websites. Available as [networking.stevenblack](options.html#opt-networking.stevenblack.enable). +- [goeland](https://github.com/slurdge/goeland), an alternative to rss2email written in golang with many filters. Available as [services.goeland](#opt-services.goeland.enable). + - [atuin](https://github.com/ellie/atuin), a sync server for shell history. Available as [services.atuin](#opt-services.atuin.enable). - [mmsd](https://gitlab.com/kop316/mmsd), a lower level daemon that transmits and recieves MMSes. Available as [services.mmsd](#opt-services.mmsd.enable). +- [QDMR](https://dm3mat.darc.de/qdmr/), a gui application and command line tool for programming cheap DMR radios [programs.qdmr](#opt-programs.qdmr.enable) + - [v2rayA](https://v2raya.org), a Linux web GUI client of Project V which supports V2Ray, Xray, SS, SSR, Trojan and Pingtunnel. Available as [services.v2raya](options.html#opt-services.v2raya.enable). - [ulogd](https://www.netfilter.org/projects/ulogd/index.html), a userspace logging daemon for netfilter/iptables related logging. Available as [services.ulogd](options.html#opt-services.ulogd.enable). - [photoprism](https://photoprism.app/), a AI-Powered Photos App for the Decentralized Web. Available as [services.photoprism](options.html#opt-services.photoprism.enable). +- [autosuspend](https://github.com/languitar/autosuspend), a python daemon that suspends a system if certain conditions are met, or not met. + ## Backward Incompatibilities {#sec-release-23.05-incompatibilities} - `carnix` and `cratesIO` has been removed due to being unmaintained, use alternatives such as [naersk](https://github.com/nix-community/naersk) and [crate2nix](https://github.com/kolloch/crate2nix) instead. +- `checkInputs` have been renamed to `nativeCheckInputs`, because they behave the same as `nativeBuildInputs` when `doCheck` is set. `checkInputs` now denote a new type of dependencies, added to `buildInputs` when `doCheck` is set. As a rule of thumb, `nativeCheckInputs` are tools on `$PATH` used during the tests, and `checkInputs` are libraries which are linked to executables built as part of the tests. Similarly, `installCheckInputs` are renamed to `nativeInstallCheckInputs`, corresponding to `nativeBuildInputs`, and `installCheckInputs` are a new type of dependencies added to `buildInputs` when `doInstallCheck` is set. (Note that this change will not cause breakage to derivations with `strictDeps` unset, which are most packages except python, rust and go packages). + - `borgbackup` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.borgbackup.jobs..inhibitsSleep`](#opt-services.borgbackup.jobs._name_.inhibitsSleep). - `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems. - `git-bug` has been updated to at least version 0.8.0, which includes backwards incompatible changes. The `git-bug-migration` package can be used to upgrade existing repositories. +- The `services.kubo.settings` option is now no longer stateful. If you changed any of the options in `services.kubo.settings` in the past and then removed them from your NixOS configuration again, those changes are still in your Kubo configuration file but will now be reset to the default. If you're unsure, you may want to make a backup of your configuration file (probably /var/lib/ipfs/config) and compare after the update. + - The EC2 image module no longer fetches instance metadata in stage-1. This results in a significantly smaller initramfs, since network drivers no longer need to be included, and faster boots, since metadata fetching can happen in parallel with startup of other services. This breaks services which rely on metadata being present by the time stage-2 is entered. Anything which reads EC2 metadata from `/etc/ec2-metadata` should now have an `after` dependency on `fetch-ec2-metadata.service` @@ -65,22 +77,41 @@ In addition to numerous new and upgraded packages, this release has the followin - The [services.unifi-video.openFirewall](#opt-services.unifi-video.openFirewall) module option default value has been changed from `true` to `false`. You will need to explicitly set this option to `true`, or configure your firewall. -- `llvmPackages_rocm.llvm` will not contain `clang` or `compiler-rt`. `llvmPackages_rocm.clang` will not contain `llvm`. `llvmPackages_rocm.clangNoCompilerRt` has been removed in favor of using `llvmPackages_rocm.clang-unwrapped`. +- Kime has been updated from 2.5.6 to 3.0.2 and the `i18n.inputMethod.kime.config` option has been removed. Users should use `daemonModules`, `iconColor`, and `extraConfig` options under `i18n.inputMethod.kime` instead. -- The Nginx module now validates the syntax of config files at build time. For more complex configurations (using `include` with out-of-store files notably) you may need to disable this check by setting [services.nginx.validateConfig](#opt-services.nginx.validateConfig) to `false`. +- `tut` has been updated from 1.0.34 to 2.0.0, and now uses the TOML format for the configuration file instead of INI. Additional information can be found [here](https://github.com/RasmusLindroth/tut/releases/tag/2.0.0). + +- The `wordpress` derivation no longer contains any builtin plugins or themes. If you need them you have to add them back to prevent your site from breaking. You can find them in `wordpressPackages.{plugins,themes}`. + +- `llvmPackages_rocm.llvm` will not contain `clang` or `compiler-rt`. `llvmPackages_rocm.clang` will not contain `llvm`. `llvmPackages_rocm.clangNoCompilerRt` has been removed in favor of using `llvmPackages_rocm.clang-unwrapped`. - The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2. +- `teleport` has been upgraded to major version 11. Please see upstream [upgrade instructions](https://goteleport.com/docs/setup/operations/upgrading/) and [release notes](https://goteleport.com/docs/changelog/#1100). + - The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation. +- Calling `makeSetupHook` without passing a `name` argument is deprecated. + - Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually. +- The [services.wordpress.sites.<name>.plugins](#opt-services.wordpress.sites._name_.plugins) and [services.wordpress.sites.<name>.themes](#opt-services.wordpress.sites._name_.themes) options have been converted from sets to attribute sets to allow for consumers to specify explicit install paths via attribute name. + - In `mastodon` it is now necessary to specify location of file with `PostgreSQL` database password. In `services.mastodon.database.passwordFile` parameter default value `/var/lib/mastodon/secrets/db-password` has been changed to `null`. +- The `--target-host` and `--build-host` options of `nixos-rebuild` no longer treat the `localhost` value specially – to build on/deploy to local machine, omit the relevant flag. + - The `nix.readOnlyStore` option has been renamed to `boot.readOnlyNixStore` to clarify that it configures the NixOS boot process, not the Nix daemon. - Deprecated `xlibsWrapper` transitional package has been removed in favour of direct use of its constitutents: `xorg.libX11`, `freetype` and others. +- .NET 5.0 was removed due to being end-of-life, use a newer, supported .NET version - https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core + +- The iputils package, which is installed by default, no longer provides the + `ninfod`, `rarpd` and `rdisc` tools. See + [upstream's release notes](https://github.com/iputils/iputils/releases/tag/20221126) + for more details and available replacements. + ## Other Notable Changes {#sec-release-23.05-notable-changes} @@ -95,6 +126,12 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.mastodon` gained a tootctl wrapped named `mastodon-tootctl` similar to `nextcloud-occ` which can be executed from any user and switches to the configured mastodon user with sudo and sources the environment variables. +- DocBook option documentation, which has been deprecated since 22.11, will now cause a warning when documentation is built. Out-of-tree modules should migrate to using CommonMark documentation as outlined in [](#sec-option-declarations) to silence this warning. + + DocBook option documentation support will be removed in the next release and CommonMark will become the default. DocBook option documentation that has not been migrated until then will no longer render properly or cause errors. + +- NixOS now defaults to using nsncd (a non-caching reimplementation in Rust) as NSS lookup dispatcher, instead of the buggy and deprecated glibc-provided nscd. If you need to switch back, set `services.nscd.enableNsncd = false`, but please open an issue in nixpkgs so your issue can be fixed. + - The `dnsmasq` service now takes configuration via the `services.dnsmasq.settings` attribute set. The option `services.dnsmasq.extraConfig` will be deprecated when NixOS 22.11 reaches @@ -110,6 +147,11 @@ In addition to numerous new and upgraded packages, this release has the followin - The minimal ISO image now uses the `nixos/modules/profiles/minimal.nix` profile. +- The `ghcWithPackages` and `ghcWithHoogle` wrappers will now also symlink GHC's + and all included libraries' documentation to `$out/share/doc` for convenience. + If undesired, the old behavior can be restored by overriding the builders with + `{ installDocumentation = false; }`. + - `mastodon` now supports connection to a remote `PostgreSQL` database. - `services.peertube` now requires you to specify the secret file `secrets.secretsFile`. It can be generated by running `openssl rand -hex 32`. @@ -120,6 +162,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `services.chronyd` is now started with additional systemd sandbox/hardening options for better security. +- `services.dhcpcd` service now don't solicit or accept IPv6 Router Advertisements on interfaces that use static IPv6 addresses. + - The module `services.headscale` was refactored to be compliant with [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md). To be precise, this means that the following things have changed: - Most settings has been migrated under [services.headscale.settings](#opt-services.headscale.settings) which is an attribute-set that @@ -141,10 +185,18 @@ In addition to numerous new and upgraded packages, this release has the followin - A new option `recommendedBrotliSettings` has been added to `services.nginx`. Learn more about compression in Brotli format [here](https://github.com/google/ngx_brotli/blob/master/README.md). +- Updated recommended settings in `services.nginx.recommendedGzipSettings`: + - Enables gzip compression for only certain proxied requests. + - Allow checking and loading of precompressed files. + - Updated gzip mime-types. + - Increased the minimum length of a response that will be gzipped. + - [Garage](https://garagehq.deuxfleurs.fr/) version is based on [system.stateVersion](options.html#opt-system.stateVersion), existing installations will keep using version 0.7. New installations will use version 0.8. In order to upgrade a Garage cluster, please follow [upstream instructions](https://garagehq.deuxfleurs.fr/documentation/cookbook/upgrading/) and force [services.garage.package](options.html#opt-services.garage.package) or upgrade accordingly [system.stateVersion](options.html#opt-system.stateVersion). - `hip` has been separated into `hip`, `hip-common` and `hipcc`. +- `services.nginx.recommendedProxySettings` now removes the `Connection` header preventing clients from closing backend connections. + - Resilio sync secret keys can now be provided using a secrets file at runtime, preventing these secrets from ending up in the Nix store. - The `firewall` and `nat` module now has a nftables based implementation. Enable `networking.nftables` to use it. diff --git a/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix b/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix index e2ed7bb718..271af9ba18 100644 --- a/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix +++ b/third_party/nixpkgs/nixos/lib/make-options-doc/default.nix @@ -78,16 +78,13 @@ let title = args.title or null; name = args.name or (lib.concatStringsSep "." args.path); in '' - - - - ${lib.optionalString (title != null) "${title} aka "}pkgs.${name} - - - ${lib.optionalString (args ? comment) "${args.comment}"} - + - [`${lib.optionalString (title != null) "${title} aka "}pkgs.${name}`]( + https://search.nixos.org/packages?show=${name}&sort=relevance&query=${name} + )${ + lib.optionalString (args ? comment) "\n\n ${args.comment}" + } ''; - in "${lib.concatStringsSep "\n" (map (p: describe (unpack p)) packages)}"; + in lib.concatMapStrings (p: describe (unpack p)) packages; optionsNix = builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList); @@ -112,16 +109,7 @@ in rec { { meta.description = "List of NixOS options in JSON format"; nativeBuildInputs = [ pkgs.brotli - (let - # python3Minimal can't be overridden with packages on Darwin, due to a missing framework. - # Instead of modifying stdenv, we take the easy way out, since most people on Darwin will - # just be hacking on the Nixpkgs manual (which also uses make-options-doc). - python = if pkgs.stdenv.isDarwin then pkgs.python3 else pkgs.python3Minimal; - self = (python.override { - inherit self; - includeSiteCustomize = true; - }); - in self.withPackages (p: [ p.mistune ])) + pkgs.python3Minimal ]; options = builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsNix)); @@ -131,18 +119,16 @@ in rec { if baseOptionsJSON == null then builtins.toFile "base.json" "{}" else baseOptionsJSON; - - MANPAGE_URLS = pkgs.path + "/doc/manpage-urls.json"; } '' # Export list of options in different format. dst=$out/share/doc/nixos mkdir -p $dst + TOUCH_IF_DB=$dst/.used-docbook \ python ${./mergeJSON.py} \ ${lib.optionalString warningsAreErrors "--warnings-are-errors"} \ - ${lib.optionalString (! allowDocBook) "--error-on-docbook"} \ - ${lib.optionalString markdownByDefault "--markdown-by-default"} \ + ${if allowDocBook then "--warn-on-docbook" else "--error-on-docbook"} \ $baseJSON $options \ > $dst/options.json @@ -153,21 +139,30 @@ in rec { echo "file json-br $dst/options.json.br" >> $out/nix-support/hydra-build-products ''; - # Convert options.json into an XML file. - # The actual generation of the xml file is done in nix purely for the convenience - # of not having to generate the xml some other way - optionsXML = pkgs.runCommand "options.xml" {} '' - export NIX_STORE_DIR=$TMPDIR/store - export NIX_STATE_DIR=$TMPDIR/state - ${pkgs.nix}/bin/nix-instantiate \ - --eval --xml --strict ${./optionsJSONtoXML.nix} \ - --argstr file ${optionsJSON}/share/doc/nixos/options.json \ - > "$out" + optionsUsedDocbook = pkgs.runCommand "options-used-docbook" {} '' + if [ -e ${optionsJSON}/share/doc/nixos/.used-docbook ]; then + echo 1 + else + echo 0 + fi >"$out" ''; - optionsDocBook = pkgs.runCommand "options-docbook.xml" {} '' - optionsXML=${optionsXML} - if grep /nixpkgs/nixos/modules $optionsXML; then + optionsDocBook = pkgs.runCommand "options-docbook.xml" { + nativeBuildInputs = [ + pkgs.nixos-render-docs + ]; + } '' + nixos-render-docs options docbook \ + --manpage-urls ${pkgs.path + "/doc/manpage-urls.json"} \ + --revision ${lib.escapeShellArg revision} \ + --document-type ${lib.escapeShellArg documentType} \ + --varlist-id ${lib.escapeShellArg variablelistId} \ + --id-prefix ${lib.escapeShellArg optionIdPrefix} \ + ${lib.optionalString markdownByDefault "--markdown-by-default"} \ + ${optionsJSON}/share/doc/nixos/options.json \ + options.xml + + if grep /nixpkgs/nixos/modules options.xml; then echo "The manual appears to depend on the location of Nixpkgs, which is bad" echo "since this prevents sharing via the NixOS channel. This is typically" echo "caused by an option default that refers to a relative path (see above" @@ -175,14 +170,7 @@ in rec { exit 1 fi - ${pkgs.python3Minimal}/bin/python ${./sortXML.py} $optionsXML sorted.xml ${pkgs.libxslt.bin}/bin/xsltproc \ - --stringparam documentType '${documentType}' \ - --stringparam revision '${revision}' \ - --stringparam variablelistId '${variablelistId}' \ - --stringparam optionIdPrefix '${optionIdPrefix}' \ - -o intermediate.xml ${./options-to-docbook.xsl} sorted.xml - ${pkgs.libxslt.bin}/bin/xsltproc \ - -o "$out" ${./postprocess-option-descriptions.xsl} intermediate.xml + -o "$out" ${./postprocess-option-descriptions.xsl} options.xml ''; } diff --git a/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py b/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py index c4f490fc2a..b4f72b8a3f 100644 --- a/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py +++ b/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py @@ -4,11 +4,6 @@ import os import sys from typing import Any, Dict, List -# for MD conversion -import mistune -import re -from xml.sax.saxutils import escape, quoteattr - JSON = Dict[str, Any] class Key: @@ -47,200 +42,20 @@ def unpivot(options: Dict[Key, Option]) -> Dict[str, JSON]: result[opt.name] = opt.value return result -manpage_urls = json.load(open(os.getenv('MANPAGE_URLS'))) - -admonitions = { - '.warning': 'warning', - '.important': 'important', - '.note': 'note' -} -class Renderer(mistune.renderers.BaseRenderer): - def _get_method(self, name): - try: - return super(Renderer, self)._get_method(name) - except AttributeError: - def not_supported(*args, **kwargs): - raise NotImplementedError("md node not supported yet", name, args, **kwargs) - return not_supported - - def text(self, text): - return escape(text) - def paragraph(self, text): - return text + "\n\n" - def newline(self): - return "\n" - def codespan(self, text): - return f"{escape(text)}" - def block_code(self, text, info=None): - info = f" language={quoteattr(info)}" if info is not None else "" - return f"\n{escape(text)}" - def link(self, link, text=None, title=None): - tag = "link" - if link[0:1] == '#': - if text == "": - tag = "xref" - attr = "linkend" - link = quoteattr(link[1:]) - else: - # try to faithfully reproduce links that were of the form - # in docbook format - if text == link: - text = "" - attr = "xlink:href" - link = quoteattr(link) - return f"<{tag} {attr}={link}>{text}" - def list(self, text, ordered, level, start=None): - if ordered: - raise NotImplementedError("ordered lists not supported yet") - return f"\n{text}\n" - def list_item(self, text, level): - return f"{text}\n" - def block_text(self, text): - return text - def emphasis(self, text): - return f"{text}" - def strong(self, text): - return f"{text}" - def admonition(self, text, kind): - if kind not in admonitions: - raise NotImplementedError(f"admonition {kind} not supported yet") - tag = admonitions[kind] - # we don't keep whitespace here because usually we'll contain only - # a single paragraph and the original docbook string is no longer - # available to restore the trailer. - return f"<{tag}>{text.rstrip()}" - def block_quote(self, text): - return f"
{text}
" - def command(self, text): - return f"{escape(text)}" - def option(self, text): - return f"" - def file(self, text): - return f"{escape(text)}" - def var(self, text): - return f"{escape(text)}" - def env(self, text): - return f"{escape(text)}" - def manpage(self, page, section): - man = f"{page}({section})" - title = f"{escape(page)}" - vol = f"{escape(section)}" - ref = f"{title}{vol}" - if man in manpage_urls: - return self.link(manpage_urls[man], text=ref) - else: - return ref - - def finalize(self, data): - return "".join(data) - -def p_command(md): - COMMAND_PATTERN = r'\{command\}`(.*?)`' - def parse(self, m, state): - return ('command', m.group(1)) - md.inline.register_rule('command', COMMAND_PATTERN, parse) - md.inline.rules.append('command') - -def p_file(md): - FILE_PATTERN = r'\{file\}`(.*?)`' - def parse(self, m, state): - return ('file', m.group(1)) - md.inline.register_rule('file', FILE_PATTERN, parse) - md.inline.rules.append('file') - -def p_var(md): - VAR_PATTERN = r'\{var\}`(.*?)`' - def parse(self, m, state): - return ('var', m.group(1)) - md.inline.register_rule('var', VAR_PATTERN, parse) - md.inline.rules.append('var') - -def p_env(md): - ENV_PATTERN = r'\{env\}`(.*?)`' - def parse(self, m, state): - return ('env', m.group(1)) - md.inline.register_rule('env', ENV_PATTERN, parse) - md.inline.rules.append('env') - -def p_option(md): - OPTION_PATTERN = r'\{option\}`(.*?)`' - def parse(self, m, state): - return ('option', m.group(1)) - md.inline.register_rule('option', OPTION_PATTERN, parse) - md.inline.rules.append('option') - -def p_manpage(md): - MANPAGE_PATTERN = r'\{manpage\}`(.*?)\((.+?)\)`' - def parse(self, m, state): - return ('manpage', m.group(1), m.group(2)) - md.inline.register_rule('manpage', MANPAGE_PATTERN, parse) - md.inline.rules.append('manpage') - -def p_admonition(md): - ADMONITION_PATTERN = re.compile(r'^::: \{([^\n]*?)\}\n(.*?)^:::$\n*', flags=re.MULTILINE|re.DOTALL) - def parse(self, m, state): - return { - 'type': 'admonition', - 'children': self.parse(m.group(2), state), - 'params': [ m.group(1) ], - } - md.block.register_rule('admonition', ADMONITION_PATTERN, parse) - md.block.rules.append('admonition') - -md = mistune.create_markdown(renderer=Renderer(), plugins=[ - p_command, p_file, p_var, p_env, p_option, p_manpage, p_admonition -]) - -# converts in-place! -def convertMD(options: Dict[str, Any]) -> str: - def convertString(path: str, text: str) -> str: - try: - rendered = md(text) - # keep trailing spaces so we can diff the generated XML to check for conversion bugs. - return rendered.rstrip() + text[len(text.rstrip()):] - except: - print(f"error in {path}") - raise - - def optionIs(option: Dict[str, Any], key: str, typ: str) -> bool: - if key not in option: return False - if type(option[key]) != dict: return False - if '_type' not in option[key]: return False - return option[key]['_type'] == typ - - for (name, option) in options.items(): - try: - if optionIs(option, 'description', 'mdDoc'): - option['description'] = convertString(name, option['description']['text']) - elif markdownByDefault: - option['description'] = convertString(name, option['description']) - - if optionIs(option, 'example', 'literalMD'): - docbook = convertString(name, option['example']['text']) - option['example'] = { '_type': 'literalDocBook', 'text': docbook } - if optionIs(option, 'default', 'literalMD'): - docbook = convertString(name, option['default']['text']) - option['default'] = { '_type': 'literalDocBook', 'text': docbook } - except Exception as e: - raise Exception(f"Failed to render option {name}: {str(e)}") - - - return options - warningsAreErrors = False +warnOnDocbook = False errorOnDocbook = False -markdownByDefault = False optOffset = 0 for arg in sys.argv[1:]: if arg == "--warnings-are-errors": optOffset += 1 warningsAreErrors = True - if arg == "--error-on-docbook": + if arg == "--warn-on-docbook": + optOffset += 1 + warnOnDocbook = True + elif arg == "--error-on-docbook": optOffset += 1 errorOnDocbook = True - if arg == "--markdown-by-default": - optOffset += 1 - markdownByDefault = True options = pivot(json.load(open(sys.argv[1 + optOffset], 'r'))) overrides = pivot(json.load(open(sys.argv[2 + optOffset], 'r'))) @@ -278,26 +93,27 @@ def is_docbook(o, key): # check that every option has a description hasWarnings = False hasErrors = False -hasDocBookErrors = False +hasDocBook = False for (k, v) in options.items(): - if errorOnDocbook: + if warnOnDocbook or errorOnDocbook: + kind = "error" if errorOnDocbook else "warning" if isinstance(v.value.get('description', {}), str): - hasErrors = True - hasDocBookErrors = True + hasErrors |= errorOnDocbook + hasDocBook = True print( - f"\x1b[1;31merror: option {v.name} description uses DocBook\x1b[0m", + f"\x1b[1;31m{kind}: option {v.name} description uses DocBook\x1b[0m", file=sys.stderr) elif is_docbook(v.value, 'defaultText'): - hasErrors = True - hasDocBookErrors = True + hasErrors |= errorOnDocbook + hasDocBook = True print( - f"\x1b[1;31merror: option {v.name} default uses DocBook\x1b[0m", + f"\x1b[1;31m{kind}: option {v.name} default uses DocBook\x1b[0m", file=sys.stderr) elif is_docbook(v.value, 'example'): - hasErrors = True - hasDocBookErrors = True + hasErrors |= errorOnDocbook + hasDocBook = True print( - f"\x1b[1;31merror: option {v.name} example uses DocBook\x1b[0m", + f"\x1b[1;31m{kind}: option {v.name} example uses DocBook\x1b[0m", file=sys.stderr) if v.value.get('description', None) is None: @@ -310,10 +126,14 @@ for (k, v) in options.items(): f"\x1b[1;31m{severity}: option {v.name} has no type. Please specify a valid type, see " + "https://nixos.org/manual/nixos/stable/index.html#sec-option-types\x1b[0m", file=sys.stderr) -if hasDocBookErrors: +if hasDocBook: + (why, what) = ( + ("disallowed for in-tree modules", "contribution") if errorOnDocbook + else ("deprecated for option documentation", "module") + ) print("Explanation: The documentation contains descriptions, examples, or defaults written in DocBook. " + "NixOS is in the process of migrating from DocBook to Markdown, and " + - "DocBook is disallowed for in-tree modules. To change your contribution to "+ + f"DocBook is {why}. To change your {what} to "+ "use Markdown, apply mdDoc and literalMD and use the *MD variants of option creation " + "functions where they are available. For example:\n" + "\n" + @@ -326,6 +146,9 @@ if hasDocBookErrors: " example.package = mkPackageOptionMD pkgs \"your-package\" {};\n" + " imports = [ (mkAliasOptionModuleMD [ \"example\" \"args\" ] [ \"example\" \"settings\" ]) ];", file = sys.stderr) + with open(os.getenv('TOUCH_IF_DB'), 'x'): + # just make sure it exists + pass if hasErrors: sys.exit(1) @@ -338,4 +161,4 @@ if hasWarnings and warningsAreErrors: file=sys.stderr) sys.exit(1) -json.dump(convertMD(unpivot(options)), fp=sys.stdout) +json.dump(unpivot(options), fp=sys.stdout) diff --git a/third_party/nixpkgs/nixos/lib/make-options-doc/options-to-docbook.xsl b/third_party/nixpkgs/nixos/lib/make-options-doc/options-to-docbook.xsl deleted file mode 100644 index ac49659c68..0000000000 --- a/third_party/nixpkgs/nixos/lib/make-options-doc/options-to-docbook.xsl +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - - - - - - - - - - - - - Configuration Options - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Type: - - - - - (read only) - - - - - - - Default: - - - - - - - - Example: - - - - - - - - Related packages: - - - - - - - - Declared by: - - - - - - - Defined by: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - https://github.com/NixOS/nixpkgs/blob/master/ - - - https://github.com/NixOS/nixpkgs/blob// - - - - - https://github.com/NixOS/nixops/blob//nix/ - - - file:// - - - - - - <nixpkgs/> - - - <nixops/> - - - - - - - - - - - diff --git a/third_party/nixpkgs/nixos/lib/make-options-doc/optionsJSONtoXML.nix b/third_party/nixpkgs/nixos/lib/make-options-doc/optionsJSONtoXML.nix deleted file mode 100644 index ba50c5f898..0000000000 --- a/third_party/nixpkgs/nixos/lib/make-options-doc/optionsJSONtoXML.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ file }: - -builtins.attrValues - (builtins.mapAttrs - (name: def: def // { inherit name; }) - (builtins.fromJSON (builtins.readFile file))) diff --git a/third_party/nixpkgs/nixos/lib/make-options-doc/sortXML.py b/third_party/nixpkgs/nixos/lib/make-options-doc/sortXML.py deleted file mode 100644 index e63ff3538b..0000000000 --- a/third_party/nixpkgs/nixos/lib/make-options-doc/sortXML.py +++ /dev/null @@ -1,27 +0,0 @@ -import xml.etree.ElementTree as ET -import sys - -tree = ET.parse(sys.argv[1]) -# the xml tree is of the form -# {all options, each an attrs} -options = list(tree.getroot().find('list')) - -def sortKey(opt): - def order(s): - if s.startswith("enable"): - return 0 - if s.startswith("package"): - return 1 - return 2 - - return [ - (order(p.attrib['value']), p.attrib['value']) - for p in opt.findall('attr[@name="loc"]/list/string') - ] - -options.sort(key=sortKey) - -doc = ET.Element("expr") -newOptions = ET.SubElement(doc, "list") -newOptions.extend(options) -ET.ElementTree(doc).write(sys.argv[2], encoding='utf-8') diff --git a/third_party/nixpkgs/nixos/lib/test-driver/default.nix b/third_party/nixpkgs/nixos/lib/test-driver/default.nix index e3786622c3..33313059ff 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/default.nix +++ b/third_party/nixpkgs/nixos/lib/test-driver/default.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { ++ extraPythonPackages python3Packages; doCheck = true; - checkInputs = with python3Packages; [ mypy pylint black ]; + nativeCheckInputs = with python3Packages; [ mypy pylint black ]; checkPhase = '' mypy --disallow-untyped-defs \ --no-implicit-optional \ diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py index 6af964a0f5..8f01833bff 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py @@ -549,18 +549,27 @@ class Machine: return (rc, output.decode()) - def shell_interact(self) -> None: - """Allows you to interact with the guest shell + def shell_interact(self, address: Optional[str] = None) -> None: + """Allows you to interact with the guest shell for debugging purposes. - Should only be used during test development, not in the production test.""" + @address string passed to socat that will be connected to the guest shell. + Check the `Running Tests interactivly` chapter of NixOS manual for an example. + """ self.connect() - self.log("Terminal is ready (there is no initial prompt):") + + if address is None: + address = "READLINE,prompt=$ " + self.log("Terminal is ready (there is no initial prompt):") assert self.shell - subprocess.run( - ["socat", "READLINE,prompt=$ ", f"FD:{self.shell.fileno()}"], - pass_fds=[self.shell.fileno()], - ) + try: + subprocess.run( + ["socat", address, f"FD:{self.shell.fileno()}"], + pass_fds=[self.shell.fileno()], + ) + # allow users to cancel this command without breaking the test + except KeyboardInterrupt: + pass def console_interact(self) -> None: """Allows you to interact with QEMU's stdin diff --git a/third_party/nixpkgs/nixos/lib/testing/testScript.nix b/third_party/nixpkgs/nixos/lib/testing/testScript.nix index 5d4181c5f5..5c36d754d7 100644 --- a/third_party/nixpkgs/nixos/lib/testing/testScript.nix +++ b/third_party/nixpkgs/nixos/lib/testing/testScript.nix @@ -7,7 +7,7 @@ in options = { testScript = mkOption { type = either str (functionTo str); - description = '' + description = mdDoc '' A series of python declarations and statements that you write to perform the test. ''; diff --git a/third_party/nixpkgs/nixos/modules/config/console.nix b/third_party/nixpkgs/nixos/modules/config/console.nix index f5db5dc5df..854d7acf92 100644 --- a/third_party/nixpkgs/nixos/modules/config/console.nix +++ b/third_party/nixpkgs/nixos/modules/config/console.nix @@ -168,6 +168,7 @@ in "${config.boot.initrd.systemd.package.kbd}/bin/setfont" "${config.boot.initrd.systemd.package.kbd}/bin/loadkeys" "${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # Fonts and keyboard layouts are compressed + "${config.boot.initrd.systemd.package.kbd.gzip}/bin/.gzip-wrapped" ] ++ optionals (hasPrefix builtins.storeDir cfg.font) [ "${cfg.font}" ] ++ optionals (hasPrefix builtins.storeDir cfg.keyMap) [ diff --git a/third_party/nixpkgs/nixos/modules/config/mysql.nix b/third_party/nixpkgs/nixos/modules/config/mysql.nix index af20a5e953..2f13c56f2a 100644 --- a/third_party/nixpkgs/nixos/modules/config/mysql.nix +++ b/third_party/nixpkgs/nixos/modules/config/mysql.nix @@ -181,7 +181,7 @@ in example = "pid"; description = lib.mdDoc '' The name of the column in the log table to which the pid of the - process utilising the `pam_mysql's` authentication + process utilising the `pam_mysql` authentication service is stored. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix index 9c83a44d7b..1d0bc73cac 100644 --- a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix +++ b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix @@ -32,13 +32,17 @@ with lib; dbus = super.dbus.override { x11Support = false; }; ffmpeg_4 = super.ffmpeg_4-headless; ffmpeg_5 = super.ffmpeg_5-headless; + # dep of graphviz, libXpm is optional for Xpm support + gd = super.gd.override { withXorg = false; }; gobject-introspection = super.gobject-introspection.override { x11Support = false; }; + gpsd = super.gpsd.override { guiSupport = false; }; + graphviz = super.graphviz-nox; gst_all_1 = super.gst_all_1 // { gst-plugins-base = super.gst_all_1.gst-plugins-base.override { enableX11 = false; }; }; - gpsd = super.gpsd.override { guiSupport = false; }; imagemagick = super.imagemagick.override { libX11Support = false; libXtSupport = false; }; imagemagickBig = super.imagemagickBig.override { libX11Support = false; libXtSupport = false; }; + libdevil = super.libdevil-nox; libextractor = super.libextractor.override { gtkSupport = false; }; libva = super.libva-minimal; limesuite = super.limesuite.override { withGui = false; }; @@ -51,9 +55,16 @@ with lib; networkmanager-openvpn = super.networkmanager-openvpn.override { withGnome = false; }; networkmanager-sstp = super.networkmanager-vpnc.override { withGnome = false; }; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; + pango = super.pango.override { x11Support = false; }; pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; }; qemu = super.qemu.override { gtkSupport = false; spiceSupport = false; sdlSupport = false; }; qrencode = super.qrencode.overrideAttrs (_: { doCheck = false; }); + qt5 = super.qt5.overrideScope' (self': super': { + qtbase = super'.qtbase.override { withGtk3 = false; }; + }); + stoken = super.stoken.override { withGTK3 = false; }; + # translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11 + util-linux = super.util-linux.override { translateManpages = false; }; zbar = super.zbar.override { enableVideo = false; withXorg = false; }; })); }; diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix index 76092e738e..352d6e3943 100644 --- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix +++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix @@ -90,7 +90,7 @@ let only has an effect if {option}`uid` is {option}`null`, in which case it determines whether the user's UID is allocated in the range for system users - (below 500) or in the range for normal users (starting at + (below 1000) or in the range for normal users (starting at 1000). Exactly one of `isNormalUser` and `isSystemUser` must be true. @@ -677,7 +677,7 @@ in { { assertion = let xor = a: b: a && !b || b && !a; - isEffectivelySystemUser = user.isSystemUser || (user.uid != null && user.uid < 500); + isEffectivelySystemUser = user.isSystemUser || (user.uid != null && user.uid < 1000); in xor isEffectivelySystemUser user.isNormalUser; message = '' Exactly one of users.users.${user.name}.isSystemUser and users.users.${user.name}.isNormalUser must be set. diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/default.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/default.nix index 07fb86bcc2..5f803b4f2e 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/default.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/default.nix @@ -66,7 +66,7 @@ in meta = { maintainers = with lib.maintainers; [ ericsagnes ]; - doc = ./default.xml; + doc = ./default.md; }; } diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml b/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml deleted file mode 100644 index 7b7907cd32..0000000000 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/default.xml +++ /dev/null @@ -1,275 +0,0 @@ - - - Input Methods - - Input methods are an operating system component that allows any - data, such as keyboard strokes or mouse movements, to be received as - input. In this way users can enter characters and symbols not found - on their input devices. Using an input method is obligatory for any - language that has more graphemes than there are keys on the - keyboard. - - - The following input methods are available in NixOS: - - - - - IBus: The intelligent input bus. - - - - - Fcitx: A customizable lightweight input method. - - - - - Nabi: A Korean input method based on XIM. - - - - - Uim: The universal input method, is a library with a XIM bridge. - - - - - Hime: An extremely easy-to-use input method framework. - - - - - Kime: Korean IME - - - -
- IBus - - IBus is an Intelligent Input Bus. It provides full featured and - user friendly input method user interface. - - - The following snippet can be used to configure IBus: - - -i18n.inputMethod = { - enabled = "ibus"; - ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ]; -}; - - - i18n.inputMethod.ibus.engines is optional and - can be used to add extra IBus engines. - - - Available extra IBus engines are: - - - - - Anthy (ibus-engines.anthy): Anthy is a - system for Japanese input method. It converts Hiragana text to - Kana Kanji mixed text. - - - - - Hangul (ibus-engines.hangul): Korean input - method. - - - - - m17n (ibus-engines.m17n): m17n is an input - method that uses input methods and corresponding icons in the - m17n database. - - - - - mozc (ibus-engines.mozc): A Japanese input - method from Google. - - - - - Table (ibus-engines.table): An input method - that load tables of input methods. - - - - - table-others (ibus-engines.table-others): - Various table-based input methods. To use this, and any other - table-based input methods, it must appear in the list of - engines along with table. For example: - - -ibus.engines = with pkgs.ibus-engines; [ table table-others ]; - - - - - To use any input method, the package must be added in the - configuration, as shown above, and also (after running - nixos-rebuild) the input method must be added - from IBus’ preference dialog. - -
- Troubleshooting - - If IBus works in some applications but not others, a likely - cause of this is that IBus is depending on a different version - of glib to what the applications are - depending on. This can be checked by running - nix-store -q --requisites <path> | grep glib, - where <path> is the path of either IBus - or an application in the Nix store. The glib - packages must match exactly. If they do not, uninstalling and - reinstalling the application is a likely fix. - -
-
-
- Fcitx - - Fcitx is an input method framework with extension support. It has - three built-in Input Method Engine, Pinyin, QuWei and Table-based - input methods. - - - The following snippet can be used to configure Fcitx: - - -i18n.inputMethod = { - enabled = "fcitx"; - fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ]; -}; - - - i18n.inputMethod.fcitx.engines is optional and - can be used to add extra Fcitx engines. - - - Available extra Fcitx engines are: - - - - - Anthy (fcitx-engines.anthy): Anthy is a - system for Japanese input method. It converts Hiragana text to - Kana Kanji mixed text. - - - - - Chewing (fcitx-engines.chewing): Chewing is - an intelligent Zhuyin input method. It is one of the most - popular input methods among Traditional Chinese Unix users. - - - - - Hangul (fcitx-engines.hangul): Korean input - method. - - - - - Unikey (fcitx-engines.unikey): Vietnamese - input method. - - - - - m17n (fcitx-engines.m17n): m17n is an input - method that uses input methods and corresponding icons in the - m17n database. - - - - - mozc (fcitx-engines.mozc): A Japanese input - method from Google. - - - - - table-others (fcitx-engines.table-others): - Various table-based input methods. - - - -
-
- Nabi - - Nabi is an easy to use Korean X input method. It allows you to - enter phonetic Korean characters (hangul) and pictographic Korean - characters (hanja). - - - The following snippet can be used to configure Nabi: - - -i18n.inputMethod = { - enabled = "nabi"; -}; - -
-
- Uim - - Uim (short for universal input method) is a - multilingual input method framework. Applications can use it - through so-called bridges. - - - The following snippet can be used to configure uim: - - -i18n.inputMethod = { - enabled = "uim"; -}; - - - Note: The - option can be used to choose uim toolbar. - -
-
- Hime - - Hime is an extremely easy-to-use input method framework. It is - lightweight, stable, powerful and supports many commonly used - input methods, including Cangjie, Zhuyin, Dayi, Rank, Shrimp, - Greek, Korean Pinyin, Latin Alphabet, etc… - - - The following snippet can be used to configure Hime: - - -i18n.inputMethod = { - enabled = "hime"; -}; - -
-
- Kime - - Kime is Korean IME. it’s built with Rust language and let you get - simple, safe, fast Korean typing - - - The following snippet can be used to configure Kime: - - -i18n.inputMethod = { - enabled = "kime"; -}; - -
- diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix index 29224a6bf7..e82996926b 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix @@ -1,40 +1,37 @@ { config, pkgs, lib, generators, ... }: -with lib; -let - cfg = config.i18n.inputMethod.kime; - yamlFormat = pkgs.formats.yaml { }; -in -{ - options = { - i18n.inputMethod.kime = { - config = mkOption { - type = yamlFormat.type; - default = { }; - example = literalExpression '' - { - daemon = { - modules = ["Xim" "Indicator"]; - }; +let imcfg = config.i18n.inputMethod; +in { + imports = [ + (lib.mkRemovedOptionModule [ "i18n" "inputMethod" "kime" "config" ] "Use i18n.inputMethod.kime.* instead") + ]; - indicator = { - icon_color = "White"; - }; - - engine = { - hangul = { - layout = "dubeolsik"; - }; - }; - } - ''; - description = lib.mdDoc '' - kime configuration. Refer to for details on supported values. - ''; - }; + options.i18n.inputMethod.kime = { + daemonModules = lib.mkOption { + type = lib.types.listOf (lib.types.enum [ "Xim" "Wayland" "Indicator" ]); + default = [ "Xim" "Wayland" "Indicator" ]; + example = [ "Xim" "Indicator" ]; + description = lib.mdDoc '' + List of enabled daemon modules + ''; + }; + iconColor = lib.mkOption { + type = lib.types.enum [ "Black" "White" ]; + default = "Black"; + example = "White"; + description = lib.mdDoc '' + Color of the indicator icon + ''; + }; + extraConfig = lib.mkOption { + type = lib.types.lines; + default = ""; + description = lib.mdDoc '' + extra kime configuration. Refer to for details on supported values. + ''; }; }; - config = mkIf (config.i18n.inputMethod.enabled == "kime") { + config = lib.mkIf (imcfg.enabled == "kime") { i18n.inputMethod.package = pkgs.kime; environment.variables = { @@ -43,7 +40,12 @@ in XMODIFIERS = "@im=kime"; }; - environment.etc."xdg/kime/config.yaml".text = replaceStrings [ "\\\\" ] [ "\\" ] (builtins.toJSON cfg.config); + environment.etc."xdg/kime/config.yaml".text = '' + daemon: + modules: [${lib.concatStringsSep "," imcfg.kime.daemonModules}] + indicator: + icon_color: ${imcfg.kime.iconColor} + '' + imcfg.kime.extraConfig; }; # uses attributes of the linked package diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/channel.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/channel.nix index 4b4c2e3933..8426ba8fac 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/channel.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/channel.nix @@ -42,7 +42,7 @@ in # see discussion in https://github.com/NixOS/nixpkgs/pull/204178#issuecomment-1336289021 nix.registry.nixpkgs.to = { type = "path"; - path = nixpkgs; + path = "${channelSources}/nixos"; }; # Provide the NixOS/Nixpkgs sources in /etc/nixos. This is required diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix index 3eca901bdb..c9cb65dbbe 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/h88w1442c7hzkbw8sgpcsbqp4lhz6l5p-nix-2.12.0"; - i686-linux = "/nix/store/j23527l1c3hfx17nssc0v53sq6c741zs-nix-2.12.0"; - aarch64-linux = "/nix/store/zgzmdymyh934y3r4vqh8z337ba4cwsjb-nix-2.12.0"; - x86_64-darwin = "/nix/store/wnlrzllazdyg1nrw9na497p4w0m7i7mm-nix-2.12.0"; - aarch64-darwin = "/nix/store/7n5yamgzg5dpp5vb6ipdqgfh6cf30wmn-nix-2.12.0"; + x86_64-linux = "/nix/store/lsr79q5xqd9dv97wn87x12kzax8s8i1s-nix-2.13.2"; + i686-linux = "/nix/store/wky9xjwiwzpifgk0s3f2nrg8nr67bi7x-nix-2.13.2"; + aarch64-linux = "/nix/store/v8drr3x1ia6bdr8y4vl79mlz61xynrpm-nix-2.13.2"; + x86_64-darwin = "/nix/store/1l14si31p4aw7c1gwgjy0nq55k38j9nj-nix-2.13.2"; + aarch64-darwin = "/nix/store/6x7nr1r780fgn254zhkwhih3f3i8cr45-nix-2.13.2"; } diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh index 9f609cefe6..20fec525e7 100755 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-install.sh @@ -188,17 +188,6 @@ nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \ mkdir -m 0755 -p "$mountPoint/etc" touch "$mountPoint/etc/NIXOS" -# Create a bind mount for each of the mount points inside the target file -# system. This preserves the validity of their absolute paths after changing -# the root with `nixos-enter`. -# Without this the bootloader installation may fail due to options that -# contain paths referenced during evaluation, like initrd.secrets. -if (( EUID == 0 )); then - mount --rbind --mkdir "$mountPoint" "$mountPoint$mountPoint" - mount --make-rslave "$mountPoint$mountPoint" - trap 'umount -R "$mountPoint$mountPoint" && rmdir "$mountPoint$mountPoint"' EXIT -fi - # Switch to the new system configuration. This will install Grub with # a menu default pointing at the kernel/initrd/etc of the new # configuration. @@ -206,7 +195,20 @@ if [[ -z $noBootLoader ]]; then echo "installing the boot loader..." # Grub needs an mtab. ln -sfn /proc/mounts "$mountPoint"/etc/mtab - NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot + export mountPoint + NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -c "$(cat <<'EOF' + # Create a bind mount for each of the mount points inside the target file + # system. This preserves the validity of their absolute paths after changing + # the root with `nixos-enter`. + # Without this the bootloader installation may fail due to options that + # contain paths referenced during evaluation, like initrd.secrets. + # when not root, re-execute the script in an unshared namespace + mount --rbind --mkdir / "$mountPoint" + mount --make-rslave "$mountPoint" + /run/current-system/bin/switch-to-configuration boot + umount -R "$mountPoint" && rmdir "$mountPoint" +EOF +)" fi # Ask the user to set a root password, but only if the passwd command diff --git a/third_party/nixpkgs/nixos/modules/misc/documentation.nix b/third_party/nixpkgs/nixos/modules/misc/documentation.nix index e44a989977..ecc40ad6ad 100644 --- a/third_party/nixpkgs/nixos/modules/misc/documentation.nix +++ b/third_party/nixpkgs/nixos/modules/misc/documentation.nix @@ -357,6 +357,14 @@ in (mkIf cfg.nixos.enable { system.build.manual = manual; + system.activationScripts.check-manual-docbook = '' + if [[ $(cat ${manual.optionsUsedDocbook}) = 1 ]]; then + echo -e "\e[31;1mwarning\e[0m: This configuration contains option documentation in docbook." \ + "Support for docbook is deprecated and will be removed after NixOS 23.05." \ + "See nix-store --read-log ${builtins.unsafeDiscardStringContext manual.optionsJSON.drvPath}" + fi + ''; + environment.systemPackages = [] ++ optional cfg.man.enable manual.manpages ++ optionals cfg.doc.enable [ manual.manualHTML nixos-help ]; diff --git a/third_party/nixpkgs/nixos/modules/misc/meta.nix b/third_party/nixpkgs/nixos/modules/misc/meta.nix index e1d16f802c..95f2765aff 100644 --- a/third_party/nixpkgs/nixos/modules/misc/meta.nix +++ b/third_party/nixpkgs/nixos/modules/misc/meta.nix @@ -47,7 +47,7 @@ in doc = mkOption { type = docFile; internal = true; - example = "./meta.chapter.xml"; + example = "./meta.chapter.md"; description = lib.mdDoc '' Documentation prologue for the set of options of each module. This option should be defined at most once per module. diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index dce6e87854..82eec40ecf 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -172,7 +172,6 @@ ./programs/geary.nix ./programs/git.nix ./programs/gnome-disks.nix - ./programs/gnome-documents.nix ./programs/gnome-terminal.nix ./programs/gnupg.nix ./programs/gpaste.nix @@ -215,6 +214,7 @@ ./programs/partition-manager.nix ./programs/plotinus.nix ./programs/proxychains.nix + ./programs/qdmr.nix ./programs/qt5ct.nix ./programs/rog-control-center.nix ./programs/rust-motd.nix @@ -530,6 +530,7 @@ ./services/mail/dovecot.nix ./services/mail/dspam.nix ./services/mail/exim.nix + ./services/mail/goeland.nix ./services/mail/listmonk.nix ./services/mail/maddy.nix ./services/mail/mail.nix @@ -570,6 +571,7 @@ ./services/misc/atuin.nix ./services/misc/autofs.nix ./services/misc/autorandr.nix + ./services/misc/autosuspend.nix ./services/misc/bazarr.nix ./services/misc/beanstalkd.nix ./services/misc/bees.nix @@ -1117,6 +1119,7 @@ ./services/web-apps/bookstack.nix ./services/web-apps/calibre-web.nix ./services/web-apps/changedetection-io.nix + ./services/web-apps/cloudlog.nix ./services/web-apps/code-server.nix ./services/web-apps/convos.nix ./services/web-apps/dex.nix diff --git a/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.nix b/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.nix index 054110fe5d..5ee6cdafe6 100644 --- a/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.nix +++ b/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.nix @@ -33,7 +33,7 @@ in }; meta = { - doc = ./default.xml; + doc = ./default.md; maintainers = with lib.maintainers; [ vidbina ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.xml b/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.xml deleted file mode 100644 index ee89252322..0000000000 --- a/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - Digital Bitbox - - Digital Bitbox is a hardware wallet and second-factor authenticator. - - - The digitalbitbox programs module may be - installed by setting programs.digitalbitbox to - true in a manner similar to - - -programs.digitalbitbox.enable = true; - - - and bundles the digitalbitbox package (see - ), which contains the - dbb-app and dbb-cli binaries, - along with the hardware module (see - ) which sets up - the necessary udev rules to access the device. - - - Enabling the digitalbitbox module is pretty much the easiest way to - get a Digital Bitbox device working on your system. - - - For more information, see - https://digitalbitbox.com/start_linux. - -
- Package - - The binaries, dbb-app (a GUI tool) and - dbb-cli (a CLI tool), are available through the - digitalbitbox package which could be installed - as follows: - - -environment.systemPackages = [ - pkgs.digitalbitbox -]; - -
-
- Hardware - - The digitalbitbox hardware package enables the udev rules for - Digital Bitbox devices and may be installed as follows: - - -hardware.digitalbitbox.enable = true; - - - In order to alter the udev rules, one may provide different values - for the udevRule51 and - udevRule52 attributes by means of overriding as - follows: - - -programs.digitalbitbox = { - enable = true; - package = pkgs.digitalbitbox.override { - udevRule51 = "something else"; - }; -}; - -
- diff --git a/third_party/nixpkgs/nixos/modules/programs/gnome-documents.nix b/third_party/nixpkgs/nixos/modules/programs/gnome-documents.nix deleted file mode 100644 index 2831ac9aff..0000000000 --- a/third_party/nixpkgs/nixos/modules/programs/gnome-documents.nix +++ /dev/null @@ -1,54 +0,0 @@ -# GNOME Documents. - -{ config, pkgs, lib, ... }: - -with lib; - -{ - - meta = { - maintainers = teams.gnome.members; - }; - - # Added 2019-08-09 - imports = [ - (mkRenamedOptionModule - [ "services" "gnome" "gnome-documents" "enable" ] - [ "programs" "gnome-documents" "enable" ]) - ]; - - ###### interface - - options = { - - programs.gnome-documents = { - - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Whether to enable GNOME Documents, a document - manager application for GNOME. - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf config.programs.gnome-documents.enable { - - environment.systemPackages = [ pkgs.gnome.gnome-documents ]; - - services.dbus.packages = [ pkgs.gnome.gnome-documents ]; - - services.gnome.gnome-online-accounts.enable = true; - - services.gnome.gnome-online-miners.enable = true; - - }; - -} diff --git a/third_party/nixpkgs/nixos/modules/programs/plotinus.nix b/third_party/nixpkgs/nixos/modules/programs/plotinus.nix index a011bb862a..c2b6884d64 100644 --- a/third_party/nixpkgs/nixos/modules/programs/plotinus.nix +++ b/third_party/nixpkgs/nixos/modules/programs/plotinus.nix @@ -8,7 +8,7 @@ in { meta = { maintainers = pkgs.plotinus.meta.maintainers; - doc = ./plotinus.xml; + doc = ./plotinus.md; }; ###### interface diff --git a/third_party/nixpkgs/nixos/modules/programs/plotinus.xml b/third_party/nixpkgs/nixos/modules/programs/plotinus.xml deleted file mode 100644 index 2d4db02851..0000000000 --- a/third_party/nixpkgs/nixos/modules/programs/plotinus.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - Plotinus - - Source: - modules/programs/plotinus.nix - - - Upstream documentation: - https://github.com/p-e-w/plotinus - - - Plotinus is a searchable command palette in every modern GTK - application. - - - When in a GTK 3 application and Plotinus is enabled, you can press - Ctrl+Shift+P to open the command palette. The - command palette provides a searchable list of of all menu items in - the application. - - - To enable Plotinus, add the following to your - configuration.nix: - - -programs.plotinus.enable = true; - - diff --git a/third_party/nixpkgs/nixos/modules/programs/qdmr.nix b/third_party/nixpkgs/nixos/modules/programs/qdmr.nix new file mode 100644 index 0000000000..c0b1984eff --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/qdmr.nix @@ -0,0 +1,25 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.qdmr; +in { + meta.maintainers = [ lib.maintainers.janik ]; + + options = { + programs.qdmr = { + enable = lib.mkEnableOption (lib.mdDoc "QDMR - a GUI application and command line tool for programming DMR radios"); + package = lib.mkPackageOptionMD pkgs "qdmr" { }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + users.groups.wireshark = {}; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix index 41ea31b0f1..83eee1c88b 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -142,5 +142,5 @@ in }; - meta.doc = ./oh-my-zsh.xml; + meta.doc = ./oh-my-zsh.md; } diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.xml b/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.xml deleted file mode 100644 index 2a2bba96b8..0000000000 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - Oh my ZSH - - oh-my-zsh - is a framework to manage your - ZSH configuration - including completion scripts for several CLI tools or custom prompt - themes. - -
- Basic usage - - The module uses the oh-my-zsh package with all - available features. The initial setup using Nix expressions is - fairly similar to the configuration format of - oh-my-zsh. - - -{ - programs.zsh.ohMyZsh = { - enable = true; - plugins = [ "git" "python" "man" ]; - theme = "agnoster"; - }; -} - - - For a detailed explanation of these arguments please refer to the - oh-my-zsh - docs. - - - The expression generates the needed configuration and writes it - into your /etc/zshrc. - -
-
- Custom additions - - Sometimes third-party or custom scripts such as a modified theme - may be needed. oh-my-zsh provides the - ZSH_CUSTOM - environment variable for this which points to a directory with - additional scripts. - - - The module can do this as well: - - -{ - programs.zsh.ohMyZsh.custom = "~/path/to/custom/scripts"; -} - -
-
- Custom environments - - There are several extensions for oh-my-zsh - packaged in nixpkgs. One of them is - nix-zsh-completions - which bundles completion scripts and a plugin for - oh-my-zsh. - - - Rather than using a single mutable path for - ZSH_CUSTOM, it’s also possible to generate this - path from a list of Nix packages: - - -{ pkgs, ... }: -{ - programs.zsh.ohMyZsh.customPkgs = [ - pkgs.nix-zsh-completions - # and even more... - ]; -} - - - Internally a single store path will be created using - buildEnv. Please refer to the docs of - buildEnv - for further reference. - - - Please keep in mind that this is not compatible with - programs.zsh.ohMyZsh.custom as it requires an - immutable store path while custom shall remain - mutable! An evaluation failure will be thrown if both - custom and customPkgs are - set. - -
-
- Package your own customizations - - If third-party customizations (e.g. new themes) are supposed to be - added to oh-my-zsh there are several pitfalls - to keep in mind: - - - - - To comply with the default structure of ZSH - the entire output needs to be written to - $out/share/zsh. - - - - - Completion scripts are supposed to be stored at - $out/share/zsh/site-functions. This - directory is part of the - fpath - and the package should be compatible with pure - ZSH setups. The module will automatically - link the contents of site-functions to - completions directory in the proper store path. - - - - - The plugins directory needs the structure - pluginname/pluginname.plugin.zsh as - structured in the - upstream - repo. - - - - - A derivation for oh-my-zsh may look like this: - - -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "exemplary-zsh-customization-${version}"; - version = "1.0.0"; - src = fetchFromGitHub { - # path to the upstream repository - }; - - dontBuild = true; - installPhase = '' - mkdir -p $out/share/zsh/site-functions - cp {themes,plugins} $out/share/zsh - cp completions $out/share/zsh/site-functions - ''; -} - -
- diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index d88baac7a5..d8a18cfcc6 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -36,6 +36,7 @@ with lib; '') (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "programs" "gnome-documents" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "way-cooler" ] ("way-cooler is abandoned by its author: " + "https://way-cooler.org/blog/2020/01/09/way-cooler-post-mortem.html")) @@ -49,7 +50,6 @@ with lib; (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.") - (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.") (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") (mkRemovedOptionModule [ "services" "firefox" "syncserver" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "flashpolicyd" ] "The flashpolicyd module has been removed. Adobe Flash Player is deprecated.") diff --git a/third_party/nixpkgs/nixos/modules/security/acme/default.nix b/third_party/nixpkgs/nixos/modules/security/acme/default.nix index 06db420632..ef06362589 100644 --- a/third_party/nixpkgs/nixos/modules/security/acme/default.nix +++ b/third_party/nixpkgs/nixos/modules/security/acme/default.nix @@ -727,7 +727,7 @@ in { Default values inheritable by all configured certs. You can use this to define options shared by all your certs. These defaults can also be ignored on a per-cert basis using the - `security.acme.certs.''${cert}.inheritDefaults' option. + {option}`security.acme.certs.''${cert}.inheritDefaults` option. ''; }; @@ -916,6 +916,6 @@ in { meta = { maintainers = lib.teams.acme.members; - doc = ./default.xml; + doc = ./default.md; }; } diff --git a/third_party/nixpkgs/nixos/modules/security/acme/default.xml b/third_party/nixpkgs/nixos/modules/security/acme/default.xml deleted file mode 100644 index e80ce3b6a4..0000000000 --- a/third_party/nixpkgs/nixos/modules/security/acme/default.xml +++ /dev/null @@ -1,395 +0,0 @@ - - - SSL/TLS Certificates with ACME - - NixOS supports automatic domain validation & certificate - retrieval and renewal using the ACME protocol. Any provider can be - used, but by default NixOS uses Let’s Encrypt. The alternative ACME - client - lego is - used under the hood. - - - Automatic cert validation and configuration for Apache and Nginx - virtual hosts is included in NixOS, however if you would like to - generate a wildcard cert or you are not using a web server you will - have to configure DNS based validation. - -
- Prerequisites - - To use the ACME module, you must accept the provider’s terms of - service by setting - to - true. The Let’s Encrypt ToS can be found - here. - - - You must also set an email address to be used when creating - accounts with Let’s Encrypt. You can set this for all certs with - and/or on a - per-cert basis with - . This - address is only used for registration and renewal reminders, and - cannot be used to administer the certificates in any way. - - - Alternatively, you can use a different ACME server by changing the - option to a - provider of your choosing, or just change the server for one cert - with . - - - You will need an HTTP server or DNS server for verification. For - HTTP, the server must have a webroot defined that can serve - .well-known/acme-challenge. This directory - must be writeable by the user that will run the ACME client. For - DNS, you must set up credentials with your provider/server for use - with lego. - -
-
- Using ACME certificates in Nginx - - NixOS supports fetching ACME certificates for you by setting - enableACME = true; in a virtualHost config. We - first create self-signed placeholder certificates in place of the - real ACME certs. The placeholder certs are overwritten when the - ACME certs arrive. For foo.example.com the - config would look like this: - - -security.acme.acceptTerms = true; -security.acme.defaults.email = "admin+acme@example.com"; -services.nginx = { - enable = true; - virtualHosts = { - "foo.example.com" = { - forceSSL = true; - enableACME = true; - # All serverAliases will be added as extra domain names on the certificate. - serverAliases = [ "bar.example.com" ]; - locations."/" = { - root = "/var/www"; - }; - }; - - # We can also add a different vhost and reuse the same certificate - # but we have to append extraDomainNames manually beforehand: - # security.acme.certs."foo.example.com".extraDomainNames = [ "baz.example.com" ]; - "baz.example.com" = { - forceSSL = true; - useACMEHost = "foo.example.com"; - locations."/" = { - root = "/var/www"; - }; - }; - }; -} - -
-
- Using ACME certificates in Apache/httpd - - Using ACME certificates with Apache virtual hosts is identical to - using them with Nginx. The attribute names are all the same, just - replace nginx with httpd where - appropriate. - -
-
- Manual configuration of HTTP-01 validation - - First off you will need to set up a virtual host to serve the - challenges. This example uses a vhost called - certs.example.com, with the intent that you - will generate certs for all your vhosts and redirect everyone to - HTTPS. - - -security.acme.acceptTerms = true; -security.acme.defaults.email = "admin+acme@example.com"; - -# /var/lib/acme/.challenges must be writable by the ACME user -# and readable by the Nginx user. The easiest way to achieve -# this is to add the Nginx user to the ACME group. -users.users.nginx.extraGroups = [ "acme" ]; - -services.nginx = { - enable = true; - virtualHosts = { - "acmechallenge.example.com" = { - # Catchall vhost, will redirect users to HTTPS for all vhosts - serverAliases = [ "*.example.com" ]; - locations."/.well-known/acme-challenge" = { - root = "/var/lib/acme/.challenges"; - }; - locations."/" = { - return = "301 https://$host$request_uri"; - }; - }; - }; -} -# Alternative config for Apache -users.users.wwwrun.extraGroups = [ "acme" ]; -services.httpd = { - enable = true; - virtualHosts = { - "acmechallenge.example.com" = { - # Catchall vhost, will redirect users to HTTPS for all vhosts - serverAliases = [ "*.example.com" ]; - # /var/lib/acme/.challenges must be writable by the ACME user and readable by the Apache user. - # By default, this is the case. - documentRoot = "/var/lib/acme/.challenges"; - extraConfig = '' - RewriteEngine On - RewriteCond %{HTTPS} off - RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge [NC] - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301] - ''; - }; - }; -} - - - Now you need to configure ACME to generate a certificate. - - -security.acme.certs."foo.example.com" = { - webroot = "/var/lib/acme/.challenges"; - email = "foo@example.com"; - # Ensure that the web server you use can read the generated certs - # Take a look at the group option for the web server you choose. - group = "nginx"; - # Since we have a wildcard vhost to handle port 80, - # we can generate certs for anything! - # Just make sure your DNS resolves them. - extraDomainNames = [ "mail.example.com" ]; -}; - - - The private key key.pem and certificate - fullchain.pem will be put into - /var/lib/acme/foo.example.com. - - - Refer to for all available - configuration options for the - security.acme - module. - -
-
- Configuring ACME for DNS validation - - This is useful if you want to generate a wildcard certificate, - since ACME servers will only hand out wildcard certs over DNS - validation. There are a number of supported DNS providers and - servers you can utilise, see the - lego - docs for provider/server specific configuration values. For - the sake of these docs, we will provide a fully self-hosted - example using bind. - - -services.bind = { - enable = true; - extraConfig = '' - include "/var/lib/secrets/dnskeys.conf"; - ''; - zones = [ - rec { - name = "example.com"; - file = "/var/db/bind/${name}"; - master = true; - extraConfig = "allow-update { key rfc2136key.example.com.; };"; - } - ]; -} - -# Now we can configure ACME -security.acme.acceptTerms = true; -security.acme.defaults.email = "admin+acme@example.com"; -security.acme.certs."example.com" = { - domain = "*.example.com"; - dnsProvider = "rfc2136"; - credentialsFile = "/var/lib/secrets/certs.secret"; - # We don't need to wait for propagation since this is a local DNS server - dnsPropagationCheck = false; -}; - - - The dnskeys.conf and - certs.secret must be kept secure and thus you - should not keep their contents in your Nix config. Instead, - generate them one time with a systemd service: - - -systemd.services.dns-rfc2136-conf = { - requiredBy = ["acme-example.com.service" "bind.service"]; - before = ["acme-example.com.service" "bind.service"]; - unitConfig = { - ConditionPathExists = "!/var/lib/secrets/dnskeys.conf"; - }; - serviceConfig = { - Type = "oneshot"; - UMask = 0077; - }; - path = [ pkgs.bind ]; - script = '' - mkdir -p /var/lib/secrets - chmod 755 /var/lib/secrets - tsig-keygen rfc2136key.example.com > /var/lib/secrets/dnskeys.conf - chown named:root /var/lib/secrets/dnskeys.conf - chmod 400 /var/lib/secrets/dnskeys.conf - - # extract secret value from the dnskeys.conf - while read x y; do if [ "$x" = "secret" ]; then secret="''${y:1:''${#y}-3}"; fi; done < /var/lib/secrets/dnskeys.conf - - cat > /var/lib/secrets/certs.secret << EOF - RFC2136_NAMESERVER='127.0.0.1:53' - RFC2136_TSIG_ALGORITHM='hmac-sha256.' - RFC2136_TSIG_KEY='rfc2136key.example.com' - RFC2136_TSIG_SECRET='$secret' - EOF - chmod 400 /var/lib/secrets/certs.secret - ''; -}; - - - Now you’re all set to generate certs! You should monitor the first - invocation by running - systemctl start acme-example.com.service & journalctl -fu acme-example.com.service - and watching its log output. - -
-
- Using DNS validation with web server virtual hosts - - It is possible to use DNS-01 validation with all certificates, - including those automatically configured via the Nginx/Apache - enableACME - option. This configuration pattern is fully supported and part of - the module’s test suite for Nginx + Apache. - - - You must follow the guide above on configuring DNS-01 validation - first, however instead of setting the options for one certificate - (e.g. - ) you - will set them as defaults (e.g. - ). - - -# Configure ACME appropriately -security.acme.acceptTerms = true; -security.acme.defaults.email = "admin+acme@example.com"; -security.acme.defaults = { - dnsProvider = "rfc2136"; - credentialsFile = "/var/lib/secrets/certs.secret"; - # We don't need to wait for propagation since this is a local DNS server - dnsPropagationCheck = false; -}; - -# For each virtual host you would like to use DNS-01 validation with, -# set acmeRoot = null -services.nginx = { - enable = true; - virtualHosts = { - "foo.example.com" = { - enableACME = true; - acmeRoot = null; - }; - }; -} - - - And that’s it! Next time your configuration is rebuilt, or when - you add a new virtualHost, it will be DNS-01 validated. - -
-
- Using ACME with services demanding root owned - certificates - - Some services refuse to start if the configured certificate files - are not owned by root. PostgreSQL and OpenSMTPD are examples of - these. There is no way to change the user the ACME module uses (it - will always be acme), however you can use - systemd’s LoadCredential feature to resolve - this elegantly. Below is an example configuration for OpenSMTPD, - but this pattern can be applied to any service. - - -# Configure ACME however you like (DNS or HTTP validation), adding -# the following configuration for the relevant certificate. -# Note: You cannot use `systemctl reload` here as that would mean -# the LoadCredential configuration below would be skipped and -# the service would continue to use old certificates. -security.acme.certs."mail.example.com".postRun = '' - systemctl restart opensmtpd -''; - -# Now you must augment OpenSMTPD's systemd service to load -# the certificate files. -systemd.services.opensmtpd.requires = ["acme-finished-mail.example.com.target"]; -systemd.services.opensmtpd.serviceConfig.LoadCredential = let - certDir = config.security.acme.certs."mail.example.com".directory; -in [ - "cert.pem:${certDir}/cert.pem" - "key.pem:${certDir}/key.pem" -]; - -# Finally, configure OpenSMTPD to use these certs. -services.opensmtpd = let - credsDir = "/run/credentials/opensmtpd.service"; -in { - enable = true; - setSendmail = false; - serverConfiguration = '' - pki mail.example.com cert "${credsDir}/cert.pem" - pki mail.example.com key "${credsDir}/key.pem" - listen on localhost tls pki mail.example.com - action act1 relay host smtp://127.0.0.1:10027 - match for local action act1 - ''; -}; - -
-
- Regenerating certificates - - Should you need to regenerate a particular certificate in a hurry, - such as when a vulnerability is found in Let’s Encrypt, there is - now a convenient mechanism for doing so. Running - systemctl clean --what=state acme-example.com.service - will remove all certificate files and the account data for the - given domain, allowing you to then - systemctl start acme-example.com.service to - generate fresh ones. - -
-
- Fixing JWS Verification error - - It is possible that your account credentials file may become - corrupt and need to be regenerated. In this scenario lego will - produce the error JWS verification error. The - solution is to simply delete the associated accounts file and - re-run the affected service(s). - - -# Find the accounts folder for the certificate -systemctl cat acme-example.com.service | grep -Po 'accounts/[^:]*' -export accountdir="$(!!)" -# Move this folder to some place else -mv /var/lib/acme/.lego/$accountdir{,.bak} -# Recreate the folder using systemd-tmpfiles -systemd-tmpfiles --create -# Get a new account and reissue certificates -# Note: Do this for all certs that share the same account email address -systemctl start acme-example.com.service - -
- diff --git a/third_party/nixpkgs/nixos/modules/security/audit.nix b/third_party/nixpkgs/nixos/modules/security/audit.nix index 06b4766c8f..afc7dd1303 100644 --- a/third_party/nixpkgs/nixos/modules/security/audit.nix +++ b/third_party/nixpkgs/nixos/modules/security/audit.nix @@ -57,7 +57,7 @@ in { type = types.enum [ false true "lock" ]; default = false; description = lib.mdDoc '' - Whether to enable the Linux audit system. The special `lock' value can be used to + Whether to enable the Linux audit system. The special `lock` value can be used to enable auditing and prevent disabling it until a restart. Be careful about locking this, as it will prevent you from changing your audit configuration until you restart. If possible, test your configuration using build-vm beforehand. diff --git a/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix b/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix index be04741f4d..cdf6c22ef1 100644 --- a/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix +++ b/third_party/nixpkgs/nixos/modules/security/systemd-confinement.nix @@ -94,7 +94,6 @@ in { }; config = let - rootName = "${mkPathSafeName name}-chroot"; inherit (config.confinement) binSh fullUnit; wantsAPIVFS = lib.mkDefault (config.confinement.mode == "full-apivfs"); in lib.mkIf config.confinement.enable { diff --git a/third_party/nixpkgs/nixos/modules/services/amqp/activemq/default.nix b/third_party/nixpkgs/nixos/modules/services/amqp/activemq/default.nix index bd37fe3b55..b1f9b7a3bb 100644 --- a/third_party/nixpkgs/nixos/modules/services/amqp/activemq/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/amqp/activemq/default.nix @@ -7,20 +7,19 @@ let cfg = config.services.activemq; - activemqBroker = stdenv.mkDerivation { - name = "activemq-broker"; - phases = [ "installPhase" ]; - buildInputs = [ jdk ]; - installPhase = '' - mkdir -p $out/lib - source ${activemq}/lib/classpath.env - export CLASSPATH - ln -s "${./ActiveMQBroker.java}" ActiveMQBroker.java - javac -d $out/lib ActiveMQBroker.java - ''; - }; + activemqBroker = runCommand "activemq-broker" + { + nativeBuildInputs = [ jdk ]; + } '' + mkdir -p $out/lib + source ${activemq}/lib/classpath.env + export CLASSPATH + ln -s "${./ActiveMQBroker.java}" ActiveMQBroker.java + javac -d $out/lib ActiveMQBroker.java + ''; -in { +in +{ options = { services.activemq = { diff --git a/third_party/nixpkgs/nixos/modules/services/audio/hqplayerd.nix b/third_party/nixpkgs/nixos/modules/services/audio/hqplayerd.nix index eff1549380..d54400b18e 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/hqplayerd.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/hqplayerd.nix @@ -82,7 +82,6 @@ in etc = { "hqplayer/hqplayerd.xml" = mkIf (cfg.config != null) { source = pkgs.writeText "hqplayerd.xml" cfg.config; }; "hqplayer/hqplayerd4-key.xml" = mkIf (cfg.licenseFile != null) { source = cfg.licenseFile; }; - "modules-load.d/taudio2.conf".source = "${pkg}/etc/modules-load.d/taudio2.conf"; }; systemPackages = [ pkg ]; }; @@ -91,8 +90,6 @@ in allowedTCPPorts = [ 8088 4321 ]; }; - services.udev.packages = [ pkg ]; - systemd = { tmpfiles.rules = [ "d ${configDir} 0755 hqplayer hqplayer - -" diff --git a/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix b/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix index ba1e4716c9..3c853973c8 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix @@ -102,7 +102,7 @@ in { Extra directives added to to the end of MPD's configuration file, mpd.conf. Basic configuration like file location and uid/gid is added automatically to the beginning of the file. For available - options see `man 5 mpd.conf`'. + options see {manpage}`mpd.conf(5)`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/roon-bridge.nix b/third_party/nixpkgs/nixos/modules/services/audio/roon-bridge.nix index e9335091ba..70392b647c 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/roon-bridge.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/roon-bridge.nix @@ -42,7 +42,7 @@ in { environment.ROON_DATAROOT = "/var/lib/${name}"; serviceConfig = { - ExecStart = "${pkgs.roon-bridge}/start.sh"; + ExecStart = "${pkgs.roon-bridge}/bin/RoonBridge"; LimitNOFILE = 8192; User = cfg.user; Group = cfg.group; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix index c5fc09dcea..bc2d79ac10 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix @@ -226,7 +226,7 @@ let in { meta.maintainers = with maintainers; [ dotlambda ]; - meta.doc = ./borgbackup.xml; + meta.doc = ./borgbackup.md; ###### interface diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.xml b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.xml deleted file mode 100644 index 2b9e0baa6d..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.xml +++ /dev/null @@ -1,215 +0,0 @@ - - - BorgBackup - - Source: - modules/services/backup/borgbackup.nix - - - Upstream documentation: - https://borgbackup.readthedocs.io/ - - - BorgBackup - (short: Borg) is a deduplicating backup program. Optionally, it - supports compression and authenticated encryption. - - - The main goal of Borg is to provide an efficient and secure way to - backup data. The data deduplication technique used makes Borg - suitable for daily backups since only changes are stored. The - authenticated encryption technique makes it suitable for backups to - not fully trusted targets. - -
- Configuring - - A complete list of options for the Borgbase module may be found - here. - -
-
- Basic usage for a local backup - - A very basic configuration for backing up to a locally accessible - directory is: - - -{ - opt.services.borgbackup.jobs = { - { rootBackup = { - paths = "/"; - exclude = [ "/nix" "/path/to/local/repo" ]; - repo = "/path/to/local/repo"; - doInit = true; - encryption = { - mode = "repokey"; - passphrase = "secret"; - }; - compression = "auto,lzma"; - startAt = "weekly"; - }; - } - }; -} - - - - If you do not want the passphrase to be stored in the - world-readable Nix store, use passCommand. You find an example - below. - - -
-
- Create a borg backup server - - You should use a different SSH key for each repository you write - to, because the specified keys are restricted to running borg - serve and can only access this single repository. You need the - output of the generate pub file. - - -# sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_my_borg_repo -# cat /run/keys/id_ed25519_my_borg_repo -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos - - - Add the following snippet to your NixOS configuration: - - -{ - services.borgbackup.repos = { - my_borg_repo = { - authorizedKeys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos" - ] ; - path = "/var/lib/my_borg_repo" ; - }; - }; -} - -
-
- Backup to the borg repository server - - The following NixOS snippet creates an hourly backup to the - service (on the host nixos) as created in the section above. We - assume that you have stored a secret passphrasse in the file - /run/keys/borgbackup_passphrase, which should - be only accessible by root - - -{ - services.borgbackup.jobs = { - backupToLocalServer = { - paths = [ "/etc/nixos" ]; - doInit = true; - repo = "borg@nixos:." ; - encryption = { - mode = "repokey-blake2"; - passCommand = "cat /run/keys/borgbackup_passphrase"; - }; - environment = { BORG_RSH = "ssh -i /run/keys/id_ed25519_my_borg_repo"; }; - compression = "auto,lzma"; - startAt = "hourly"; - }; - }; -}; - - - The following few commands (run as root) let you test your backup. - - -> nixos-rebuild switch -...restarting the following units: polkit.service -> systemctl restart borgbackup-job-backupToLocalServer -> sleep 10 -> systemctl restart borgbackup-job-backupToLocalServer -> export BORG_PASSPHRASE=topSecrect -> borg list --rsh='ssh -i /run/keys/id_ed25519_my_borg_repo' borg@nixos:. -nixos-backupToLocalServer-2020-03-30T21:46:17 Mon, 2020-03-30 21:46:19 [84feb97710954931ca384182f5f3cb90665f35cef214760abd7350fb064786ac] -nixos-backupToLocalServer-2020-03-30T21:46:30 Mon, 2020-03-30 21:46:32 [e77321694ecd160ca2228611747c6ad1be177d6e0d894538898de7a2621b6e68] - -
-
- Backup to a hosting service - - Several companies offer - (paid) - hosting services for Borg repositories. - - - To backup your home directory to borgbase you have to: - - - - - Generate a SSH key without a password, to access the remote - server. E.g. - - -sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_borgbase - - - - - Create the repository on the server by following the - instructions for your hosting server. - - - - - Initialize the repository on the server. Eg. - - -sudo borg init --encryption=repokey-blake2 \ - -rsh "ssh -i /run/keys/id_ed25519_borgbase" \ - zzz2aaaaa@zzz2aaaaa.repo.borgbase.com:repo - - - - - Add it to your NixOS configuration, e.g. - - -{ - services.borgbackup.jobs = { - my_Remote_Backup = { - paths = [ "/" ]; - exclude = [ "/nix" "'**/.cache'" ]; - repo = "zzz2aaaaa@zzz2aaaaa.repo.borgbase.com:repo"; - encryption = { - mode = "repokey-blake2"; - passCommand = "cat /run/keys/borgbackup_passphrase"; - }; - environment = { BORG_RSH = "ssh -i /run/keys/id_ed25519_borgbase"; }; - compression = "auto,lzma"; - startAt = "daily"; - }; - }; -}} - - - -
-
- Vorta backup client for the desktop - - Vorta is a backup client for macOS and Linux desktops. It - integrates the mighty BorgBackup with your desktop environment to - protect your data from disk failure, ransomware and theft. - - - It can be installed in NixOS e.g. by adding - pkgs.vorta to - . - - - Details about using Vorta can be found under - https://vorta.borgbase.com - . - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix index 0d21b1e8d6..bc24e13aa0 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix @@ -126,6 +126,21 @@ in ]; }; + exclude = mkOption { + type = types.listOf types.str; + default = [ ]; + description = lib.mdDoc '' + Patterns to exclude when backing up. See + https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files for + details on syntax. + ''; + example = [ + "/var/cache" + "/home/*/.cache" + ".git" + ]; + }; + timerConfig = mkOption { type = types.attrsOf unitOption; default = { @@ -249,6 +264,7 @@ in example = { localbackup = { paths = [ "/home" ]; + exclude = [ "/home/*/.cache" ]; repository = "/mnt/backup-hdd"; passwordFile = "/etc/nixos/secrets/restic-password"; initialize = true; @@ -270,12 +286,17 @@ in config = { warnings = mapAttrsToList (n: v: "services.restic.backups.${n}.s3CredentialsFile is deprecated, please use services.restic.backups.${n}.environmentFile instead.") (filterAttrs (n: v: v.s3CredentialsFile != null) config.services.restic.backups); + assertions = mapAttrsToList (n: v: { + assertion = (v.repository == null) != (v.repositoryFile == null); + message = "services.restic.backups.${n}: exactly one of repository or repositoryFile should be set"; + }) config.services.restic.backups; systemd.services = mapAttrs' (name: backup: let extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions; resticCmd = "${backup.package}/bin/restic${extraOptions}"; + excludeFlags = if (backup.exclude != []) then ["--exclude-file=${pkgs.writeText "exclude-patterns" (concatStringsSep "\n" backup.exclude)}"] else []; filesFromTmpFile = "/run/restic-backups-${name}/includes"; backupPaths = if (backup.dynamicFilesFrom == null) @@ -311,7 +332,7 @@ in restartIfChanged = false; serviceConfig = { Type = "oneshot"; - ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " backup.extraBackupArgs} ${backupPaths}" ]) + ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup --cache-dir=%C/restic-backups-${name} ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} ${backupPaths}" ]) ++ pruneCmd; User = backup.user; RuntimeDirectory = "restic-backups-${name}"; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/foundationdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/foundationdb.nix index 16d539b661..48e9898a68 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/foundationdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/foundationdb.nix @@ -424,6 +424,6 @@ in }; }; - meta.doc = ./foundationdb.xml; + meta.doc = ./foundationdb.md; meta.maintainers = with lib.maintainers; [ thoughtpolice ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/databases/foundationdb.xml b/third_party/nixpkgs/nixos/modules/services/databases/foundationdb.xml deleted file mode 100644 index 611535a9eb..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/databases/foundationdb.xml +++ /dev/null @@ -1,425 +0,0 @@ - - - FoundationDB - - Source: - modules/services/databases/foundationdb.nix - - - Upstream documentation: - https://apple.github.io/foundationdb/ - - - Maintainer: Austin Seipp - - - Available version(s): 5.1.x, 5.2.x, 6.0.x - - - FoundationDB (or FDB) is an open source, distributed, - transactional key-value store. - -
- Configuring and basic setup - - To enable FoundationDB, add the following to your - configuration.nix: - - -services.foundationdb.enable = true; -services.foundationdb.package = pkgs.foundationdb52; # FoundationDB 5.2.x - - - The option is - required, and must always be specified. Due to the fact - FoundationDB network protocols and on-disk storage formats may - change between (major) versions, and upgrades must be explicitly - handled by the user, you must always manually specify this - yourself so that the NixOS module will use the proper version. - Note that minor, bugfix releases are always compatible. - - - After running nixos-rebuild, you can verify - whether FoundationDB is running by executing - fdbcli (which is added to - ): - - -$ sudo -u foundationdb fdbcli -Using cluster file `/etc/foundationdb/fdb.cluster'. - -The database is available. - -Welcome to the fdbcli. For help, type `help'. -fdb> status - -Using cluster file `/etc/foundationdb/fdb.cluster'. - -Configuration: - Redundancy mode - single - Storage engine - memory - Coordinators - 1 - -Cluster: - FoundationDB processes - 1 - Machines - 1 - Memory availability - 5.4 GB per process on machine with least available - Fault Tolerance - 0 machines - Server time - 04/20/18 15:21:14 - -... - -fdb> - - - You can also write programs using the available client libraries. - For example, the following Python program can be run in order to - grab the cluster status, as a quick example. (This example uses - nix-shell shebang support to automatically - supply the necessary Python modules). - - -a@link> cat fdb-status.py -#! /usr/bin/env nix-shell -#! nix-shell -i python -p python pythonPackages.foundationdb52 - -import fdb -import json - -def main(): - fdb.api_version(520) - db = fdb.open() - - @fdb.transactional - def get_status(tr): - return str(tr['\xff\xff/status/json']) - - obj = json.loads(get_status(db)) - print('FoundationDB available: %s' % obj['client']['database_status']['available']) - -if __name__ == "__main__": - main() -a@link> chmod +x fdb-status.py -a@link> ./fdb-status.py -FoundationDB available: True -a@link> - - - FoundationDB is run under the foundationdb user - and group by default, but this may be changed in the NixOS - configuration. The systemd unit - foundationdb.service controls the - fdbmonitor process. - - - By default, the NixOS module for FoundationDB creates a single - SSD-storage based database for development and basic usage. This - storage engine is designed for SSDs and will perform poorly on - HDDs; however it can handle far more data than the alternative - memory engine and is a better default choice for - most deployments. (Note that you can change the storage backend - on-the-fly for a given FoundationDB cluster using - fdbcli.) - - - Furthermore, only 1 server process and 1 backup agent are started - in the default configuration. See below for more on scaling to - increase this. - - - FoundationDB stores all data for all server processes under - /var/lib/foundationdb. You can override this - using , e.g. - - -services.foundationdb.dataDir = "/data/fdb"; - - - Similarly, logs are stored under - /var/log/foundationdb by default, and there - is a corresponding - as well. - -
-
- Scaling processes and backup agents - - Scaling the number of server processes is quite easy; simply - specify to - be the number of FoundationDB worker processes that should be - started on the machine. - - - FoundationDB worker processes typically require 4GB of RAM - per-process at minimum for good performance, so this option is set - to 1 by default since the maximum amount of RAM is unknown. You’re - advised to abide by this restriction, so pick a number of - processes so that each has 4GB or more. - - - A similar option exists in order to scale backup agent processes, - . Backup - agents are not as performance/RAM sensitive, so feel free to - experiment with the number of available backup processes. - -
-
- Clustering - - FoundationDB on NixOS works similarly to other Linux systems, so - this section will be brief. Please refer to the full FoundationDB - documentation for more on clustering. - - - FoundationDB organizes clusters using a set of - coordinators, which are just - specially-designated worker processes. By default, every - installation of FoundationDB on NixOS will start as its own - individual cluster, with a single coordinator: the first worker - process on localhost. - - - Coordinators are specified globally using the - /etc/foundationdb/fdb.cluster file, which all - servers and client applications will use to find and join - coordinators. Note that this file can not be - managed by NixOS so easily: FoundationDB is designed so that it - will rewrite the file at runtime for all clients and nodes when - cluster coordinators change, with clients transparently handling - this without intervention. It is fundamentally a mutable file, and - you should not try to manage it in any way in NixOS. - - - When dealing with a cluster, there are two main things you want to - do: - - - - - Add a node to the cluster for storage/compute. - - - - - Promote an ordinary worker to a coordinator. - - - - - A node must already be a member of the cluster in order to - properly be promoted to a coordinator, so you must always add it - first if you wish to promote it. - - - To add a machine to a FoundationDB cluster: - - - - - Choose one of the servers to start as the initial coordinator. - - - - - Copy the /etc/foundationdb/fdb.cluster file - from this server to all the other servers. Restart - FoundationDB on all of these other servers, so they join the - cluster. - - - - - All of these servers are now connected and working together in - the cluster, under the chosen coordinator. - - - - - At this point, you can add as many nodes as you want by just - repeating the above steps. By default there will still be a single - coordinator: you can use fdbcli to change this - and add new coordinators. - - - As a convenience, FoundationDB can automatically assign - coordinators based on the redundancy mode you wish to achieve for - the cluster. Once all the nodes have been joined, simply set the - replication policy, and then issue the - coordinators auto command - - - For example, assuming we have 3 nodes available, we can enable - double redundancy mode, then auto-select coordinators. For double - redundancy, 3 coordinators is ideal: therefore FoundationDB will - make every node a coordinator automatically: - - -fdbcli> configure double ssd -fdbcli> coordinators auto - - - This will transparently update all the servers within seconds, and - appropriately rewrite the fdb.cluster file, as - well as informing all client processes to do the same. - -
-
- Client connectivity - - By default, all clients must use the current - fdb.cluster file to access a given FoundationDB - cluster. This file is located by default in - /etc/foundationdb/fdb.cluster on all machines - with the FoundationDB service enabled, so you may copy the active - one from your cluster to a new node in order to connect, if it is - not part of the cluster. - -
-
- Client authorization and TLS - - By default, any user who can connect to a FoundationDB process - with the correct cluster configuration can access anything. - FoundationDB uses a pluggable design to transport security, and - out of the box it supports a LibreSSL-based plugin for TLS - support. This plugin not only does in-flight encryption, but also - performs client authorization based on the given endpoint’s - certificate chain. For example, a FoundationDB server may be - configured to only accept client connections over TLS, where the - client TLS certificate is from organization Acme - Co in the Research and Development - unit. - - - Configuring TLS with FoundationDB is done using the - options in order to - control the peer verification string, as well as the certificate - and its private key. - - - Note that the certificate and its private key must be accessible - to the FoundationDB user account that the server runs under. These - files are also NOT managed by NixOS, as putting them into the - store may reveal private information. - - - After you have a key and certificate file in place, it is not - enough to simply set the NixOS module options – you must also - configure the fdb.cluster file to specify that - a given set of coordinators use TLS. This is as simple as adding - the suffix :tls to your cluster coordinator - configuration, after the port number. For example, assuming you - have a coordinator on localhost with the default configuration, - simply specifying: - - -XXXXXX:XXXXXX@127.0.0.1:4500:tls - - - will configure all clients and server processes to use TLS from - now on. - -
-
- Backups and Disaster Recovery - - The usual rules for doing FoundationDB backups apply on NixOS as - written in the FoundationDB manual. However, one important - difference is the security profile for NixOS: by default, the - foundationdb systemd unit uses Linux - namespaces to restrict write access to the system, - except for the log directory, data directory, and the - /etc/foundationdb/ directory. This is enforced - by default and cannot be disabled. - - - However, a side effect of this is that the - fdbbackup command doesn’t work properly for - local filesystem backups: FoundationDB uses a server process - alongside the database processes to perform backups and copy the - backups to the filesystem. As a result, this process is put under - the restricted namespaces above: the backup process can only write - to a limited number of paths. - - - In order to allow flexible backup locations on local disks, the - FoundationDB NixOS module supports a - option. - This option takes a list of paths, and adds them to the systemd - unit, allowing the processes inside the service to write (and - read) the specified directories. - - - For example, to create backups in - /opt/fdb-backups, first set up the paths in the - module options: - - -services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ]; - - - Restart the FoundationDB service, and it will now be able to write - to this directory (even if it does not yet exist.) Note: this path - must exist before restarting the unit. - Otherwise, systemd will not include it in the private FoundationDB - namespace (and it will not add it dynamically at runtime). - - - You can now perform a backup: - - -$ sudo -u foundationdb fdbbackup start -t default -d file:///opt/fdb-backups -$ sudo -u foundationdb fdbbackup status -t default - -
-
- Known limitations - - The FoundationDB setup for NixOS should currently be considered - beta. FoundationDB is not new software, but the NixOS compilation - and integration has only undergone fairly basic testing of all the - available functionality. - - - - - There is no way to specify individual parameters for - individual fdbserver processes. Currently, - all server processes inherit all the global - fdbmonitor settings. - - - - - Ruby bindings are not currently installed. - - - - - Go bindings are not currently installed. - - - -
-
- Options - - NixOS’s FoundationDB module allows you to configure all of the - most relevant configuration options for - fdbmonitor, matching it quite closely. A - complete list of options for the FoundationDB module may be found - here. You - should also read the FoundationDB documentation as well. - -
-
- Full documentation - - FoundationDB is a complex piece of software, and requires careful - administration to properly use. Full documentation for - administration can be found here: - https://apple.github.io/foundationdb/. - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix index 6665e7a088..7bbe1ad225 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix @@ -585,6 +585,6 @@ in }; - meta.doc = ./postgresql.xml; + meta.doc = ./postgresql.md; meta.maintainers = with lib.maintainers; [ thoughtpolice danbst ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.xml b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.xml deleted file mode 100644 index 2f62d5d80b..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.xml +++ /dev/null @@ -1,250 +0,0 @@ - - - PostgreSQL - - Source: - modules/services/databases/postgresql.nix - - - Upstream documentation: - http://www.postgresql.org/docs/ - - - PostgreSQL is an advanced, free relational database. - -
- Configuring - - To enable PostgreSQL, add the following to your - configuration.nix: - - -services.postgresql.enable = true; -services.postgresql.package = pkgs.postgresql_11; - - - Note that you are required to specify the desired version of - PostgreSQL (e.g. pkgs.postgresql_11). Since - upgrading your PostgreSQL version requires a database dump and - reload (see below), NixOS cannot provide a default value for - such as the - most recent release of PostgreSQL. - - - By default, PostgreSQL stores its databases in - /var/lib/postgresql/$psqlSchema. You can - override this using - , e.g. - - -services.postgresql.dataDir = "/data/postgresql"; - -
-
- Upgrading - - - The steps below demonstrate how to upgrade from an older version - to pkgs.postgresql_13. These instructions are - also applicable to other versions. - - - - Major PostgreSQL upgrades require a downtime and a few imperative - steps to be called. This is the case because each major version - has some internal changes in the databases’ state during major - releases. Because of that, NixOS places the state into - /var/lib/postgresql/<version> where - each version can be obtained like this: - - -$ nix-instantiate --eval -A postgresql_13.psqlSchema -"13" - - - For an upgrade, a script like this can be used to simplify the - process: - - -{ config, pkgs, ... }: -{ - environment.systemPackages = [ - (let - # XXX specify the postgresql package you'd like to upgrade to. - # Do not forget to list the extensions you need. - newPostgres = pkgs.postgresql_13.withPackages (pp: [ - # pp.plv8 - ]); - in pkgs.writeScriptBin "upgrade-pg-cluster" '' - set -eux - # XXX it's perhaps advisable to stop all services that depend on postgresql - systemctl stop postgresql - - export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}" - - export NEWBIN="${newPostgres}/bin" - - export OLDDATA="${config.services.postgresql.dataDir}" - export OLDBIN="${config.services.postgresql.package}/bin" - - install -d -m 0700 -o postgres -g postgres "$NEWDATA" - cd "$NEWDATA" - sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" - - sudo -u postgres $NEWBIN/pg_upgrade \ - --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \ - --old-bindir $OLDBIN --new-bindir $NEWBIN \ - "$@" - '') - ]; -} - - - The upgrade process is: - - - - - Rebuild nixos configuration with the configuration above added - to your configuration.nix. Alternatively, - add that into separate file and reference it in - imports list. - - - - - Login as root (sudo su -) - - - - - Run upgrade-pg-cluster. It will stop old - postgresql, initialize a new one and migrate the old one to - the new one. You may supply arguments like - --jobs 4 and --link to - speedup migration process. See - https://www.postgresql.org/docs/current/pgupgrade.html - for details. - - - - - Change postgresql package in NixOS configuration to the one - you were upgrading to via - . Rebuild - NixOS. This should start new postgres using upgraded data - directory and all services you stopped during the upgrade. - - - - - After the upgrade it’s advisable to analyze the new cluster. - - - - - For PostgreSQL ≥ 14, use the vacuumdb - command printed by the upgrades script. - - - - - For PostgreSQL < 14, run (as - su -l postgres in the - , in - this example /var/lib/postgresql/13): - - -$ ./analyze_new_cluster.sh - - - - - - The next step removes the old state-directory! - - - -$ ./delete_old_cluster.sh - - - -
-
- Options - - A complete list of options for the PostgreSQL module may be found - here. - -
-
- Plugins - - Plugins collection for each PostgreSQL version can be accessed - with .pkgs. For example, for - pkgs.postgresql_11 package, its plugin - collection is accessed by - pkgs.postgresql_11.pkgs: - - -$ nix repl '<nixpkgs>' - -Loading '<nixpkgs>'... -Added 10574 variables. - -nix-repl> postgresql_11.pkgs.<TAB><TAB> -postgresql_11.pkgs.cstore_fdw postgresql_11.pkgs.pg_repack -postgresql_11.pkgs.pg_auto_failover postgresql_11.pkgs.pg_safeupdate -postgresql_11.pkgs.pg_bigm postgresql_11.pkgs.pg_similarity -postgresql_11.pkgs.pg_cron postgresql_11.pkgs.pg_topn -postgresql_11.pkgs.pg_hll postgresql_11.pkgs.pgjwt -postgresql_11.pkgs.pg_partman postgresql_11.pkgs.pgroonga -... - - - To add plugins via NixOS configuration, set - services.postgresql.extraPlugins: - - -services.postgresql.package = pkgs.postgresql_11; -services.postgresql.extraPlugins = with pkgs.postgresql_11.pkgs; [ - pg_repack - postgis -]; - - - You can build custom PostgreSQL-with-plugins (to be used outside - of NixOS) using function .withPackages. For - example, creating a custom PostgreSQL package in an overlay can - look like: - - -self: super: { - postgresql_custom = self.postgresql_11.withPackages (ps: [ - ps.pg_repack - ps.postgis - ]); -} - - - Here’s a recipe on how to override a particular plugin through an - overlay: - - -self: super: { - postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // { - pkgs = super.postgresql_11.pkgs // { - pg_repack = super.postgresql_11.pkgs.pg_repack.overrideAttrs (_: { - name = "pg_repack-v20181024"; - src = self.fetchzip { - url = "https://github.com/reorg/pg_repack/archive/923fa2f3c709a506e111cc963034bf2fd127aa00.tar.gz"; - sha256 = "17k6hq9xaax87yz79j773qyigm4fwk8z4zh5cyp6z0sxnwfqxxw5"; - }; - }); - }; - }; -} - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix b/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix index 3b14ad75ab..d99faf381e 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.nix @@ -7,7 +7,7 @@ let cfg = config.services.flatpak; in { meta = { - doc = ./flatpak.xml; + doc = ./flatpak.md; maintainers = pkgs.flatpak.meta.maintainers; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.xml b/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.xml deleted file mode 100644 index cdc3278fa9..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/desktops/flatpak.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - Flatpak - - Source: - modules/services/desktop/flatpak.nix - - - Upstream documentation: - https://github.com/flatpak/flatpak/wiki - - - Flatpak is a system for building, distributing, and running - sandboxed desktop applications on Linux. - - - To enable Flatpak, add the following to your - configuration.nix: - - - services.flatpak.enable = true; - - - For the sandboxed apps to work correctly, desktop integration - portals need to be installed. If you run GNOME, this will be handled - automatically for you; in other cases, you will need to add - something like the following to your - configuration.nix: - - - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - - - Then, you will need to add a repository, for example, - Flathub, - either using the following commands: - - -$ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -$ flatpak update - - - or by opening the - repository - file in GNOME Software. - - - Finally, you can search and install programs: - - -$ flatpak search bustle -$ flatpak install flathub org.freedesktop.Bustle -$ flatpak run org.freedesktop.Bustle - - - Again, GNOME Software offers graphical interface for these tasks. - - diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json index 9aa51b6143..c204606193 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json @@ -35,5 +35,20 @@ } ], "filter.properties": {}, - "stream.properties": {} + "stream.properties": {}, + "alsa.properties": {}, + "alsa.rules": [ + { + "matches": [ + { + "application.process.binary": "resolve" + } + ], + "actions": { + "update-props": { + "alsa.buffer-bytes": 131072 + } + } + } + ] } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json index 4a173f7322..f2e396dd28 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/jack.conf.json @@ -58,6 +58,18 @@ "node.passive": true } } + }, + { + "matches": [ + { + "client.name": "Mixxx" + } + ], + "actions": { + "update-props": { + "jack.merge-monitor": false + } + } } ] } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix index a4ef88a45a..09cec9a791 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -42,7 +42,7 @@ let in { meta = { - maintainers = teams.freedesktop.members; + maintainers = teams.freedesktop.members ++ [ lib.maintainers.k900 ]; # uses attributes of the linked package buildDocsInSandbox = false; }; diff --git a/third_party/nixpkgs/nixos/modules/services/development/blackfire.nix b/third_party/nixpkgs/nixos/modules/services/development/blackfire.nix index 054cef9ae8..3c98d7a281 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/blackfire.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/blackfire.nix @@ -11,7 +11,7 @@ let in { meta = { maintainers = pkgs.blackfire.meta.maintainers; - doc = ./blackfire.xml; + doc = ./blackfire.md; }; options = { diff --git a/third_party/nixpkgs/nixos/modules/services/development/blackfire.xml b/third_party/nixpkgs/nixos/modules/services/development/blackfire.xml deleted file mode 100644 index 842e5bec97..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/development/blackfire.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - Blackfire profiler - - Source: - modules/services/development/blackfire.nix - - - Upstream documentation: - https://blackfire.io/docs/introduction - - - Blackfire is a - proprietary tool for profiling applications. There are several - languages supported by the product but currently only PHP support is - packaged in Nixpkgs. The back-end consists of a module that is - loaded into the language runtime (called probe) - and a service (agent) that the probe connects - to and that sends the profiles to the server. - - - To use it, you will need to enable the agent and the probe on your - server. The exact method will depend on the way you use PHP but here - is an example of NixOS configuration for PHP-FPM: - - -let - php = pkgs.php.withExtensions ({ enabled, all }: enabled ++ (with all; [ - blackfire - ])); -in { - # Enable the probe extension for PHP-FPM. - services.phpfpm = { - phpPackage = php; - }; - - # Enable and configure the agent. - services.blackfire-agent = { - enable = true; - settings = { - # You will need to get credentials at https://blackfire.io/my/settings/credentials - # You can also use other options described in https://blackfire.io/docs/up-and-running/configuration/agent - server-id = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"; - server-token = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"; - }; - }; - - # Make the agent run on start-up. - # (WantedBy= from the upstream unit not respected: https://github.com/NixOS/nixpkgs/issues/81138) - # Alternately, you can start it manually with `systemctl start blackfire-agent`. - systemd.services.blackfire-agent.wantedBy = [ "phpfpm-foo.service" ]; -} - - - On your developer machine, you will also want to install - the - client (see blackfire package) or the - browser extension to actually trigger the profiling. - - diff --git a/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix b/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix index 5ae28cd9bb..2be46e47d6 100644 --- a/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix +++ b/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix @@ -99,5 +99,5 @@ in environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "${editorScript}/bin/emacseditor"); }; - meta.doc = ./emacs.xml; + meta.doc = ./emacs.md; } diff --git a/third_party/nixpkgs/nixos/modules/services/editors/emacs.xml b/third_party/nixpkgs/nixos/modules/services/editors/emacs.xml deleted file mode 100644 index 37d7a93a12..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/editors/emacs.xml +++ /dev/null @@ -1,490 +0,0 @@ - - - Emacs - - Emacs - is an extensible, customizable, self-documenting real-time display - editor — and more. At its core is an interpreter for Emacs Lisp, a - dialect of the Lisp programming language with extensions to support - text editing. - - - Emacs runs within a graphical desktop environment using the X Window - System, but works equally well on a text terminal. Under macOS, a - Mac port edition is available, which uses Apple’s - native GUI frameworks. - - - Nixpkgs provides a superior environment for running Emacs. It’s - simple to create custom builds by overriding the default packages. - Chaotic collections of Emacs Lisp code and extensions can be brought - under control using declarative package management. NixOS even - provides a systemd user service for automatically - starting the Emacs daemon. - -
- Installing Emacs - - Emacs can be installed in the normal way for Nix (see - ). In addition, a NixOS - service can be enabled. - -
- The Different Releases of Emacs - - Nixpkgs defines several basic Emacs packages. The following are - attributes belonging to the pkgs set: - - - - - emacs - - - - The latest stable version of Emacs using the - GTK 2 widget - toolkit. - - - - - - emacs-nox - - - - Emacs built without any dependency on X11 libraries. - - - - - - emacsMacport - - - - Emacs with the Mac port patches, providing - a more native look and feel under macOS. - - - - - - If those aren’t suitable, then the following imitation Emacs - editors are also available in Nixpkgs: - Zile, - mg, - Yi, - jmacs. - -
-
- Adding Packages to Emacs - - Emacs includes an entire ecosystem of functionality beyond text - editing, including a project planner, mail and news reader, - debugger interface, calendar, and more. - - - Most extensions are gotten with the Emacs packaging system - (package.el) from - Emacs Lisp Package - Archive (ELPA), - MELPA, - MELPA - Stable, and - Org ELPA. - Nixpkgs is regularly updated to mirror all these archives. - - - Under NixOS, you can continue to use - package-list-packages and - package-install to install packages. You can - also declare the set of Emacs packages you need using the - derivations from Nixpkgs. The rest of this section discusses - declarative installation of Emacs packages through nixpkgs. - - - The first step to declare the list of packages you want in your - Emacs installation is to create a dedicated derivation. This can - be done in a dedicated emacs.nix file such - as: - - - - - -/* -This is a nix expression to build Emacs and some Emacs packages I like -from source on any distribution where Nix is installed. This will install -all the dependencies from the nixpkgs repository and build the binary files -without interfering with the host distribution. - -To build the project, type the following from the current directory: - -$ nix-build emacs.nix - -To run the newly compiled executable: - -$ ./result/bin/emacs -*/ - -# The first non-comment line in this file indicates that -# the whole file represents a function. -{ pkgs ? import <nixpkgs> {} }: - -let - # The let expression below defines a myEmacs binding pointing to the - # current stable version of Emacs. This binding is here to separate - # the choice of the Emacs binary from the specification of the - # required packages. - myEmacs = pkgs.emacs; - # This generates an emacsWithPackages function. It takes a single - # argument: a function from a package set to a list of packages - # (the packages that will be available in Emacs). - emacsWithPackages = (pkgs.emacsPackagesFor myEmacs).emacsWithPackages; -in - # The rest of the file specifies the list of packages to install. In the - # example, two packages (magit and zerodark-theme) are taken from - # MELPA stable. - emacsWithPackages (epkgs: (with epkgs.melpaStablePackages; [ - magit # ; Integrate git <C-x g> - zerodark-theme # ; Nicolas' theme - ]) - # Two packages (undo-tree and zoom-frm) are taken from MELPA. - ++ (with epkgs.melpaPackages; [ - undo-tree # ; <C-x u> to show the undo tree - zoom-frm # ; increase/decrease font size for all buffers %lt;C-x C-+> - ]) - # Three packages are taken from GNU ELPA. - ++ (with epkgs.elpaPackages; [ - auctex # ; LaTeX mode - beacon # ; highlight my cursor when scrolling - nameless # ; hide current package name everywhere in elisp code - ]) - # notmuch is taken from a nixpkgs derivation which contains an Emacs mode. - ++ [ - pkgs.notmuch # From main packages set - ]) - - - The result of this configuration will be an - emacs command which launches Emacs with all - of your chosen packages in the load-path. - - - You can check that it works by executing this in a terminal: - - -$ nix-build emacs.nix -$ ./result/bin/emacs -q - - - and then typing M-x package-initialize. Check - that you can use all the packages you want in this Emacs - instance. For example, try switching to the zerodark theme - through - M-x load-theme <RET> zerodark <RET> y. - - - - A few popular extensions worth checking out are: auctex, - company, edit-server, flycheck, helm, iedit, magit, - multiple-cursors, projectile, and yasnippet. - - - - The list of available packages in the various ELPA repositories - can be seen with the following commands: - - - -nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.elpaPackages -nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.melpaPackages -nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.melpaStablePackages -nix-env -f "<nixpkgs>" -qaP -A emacs.pkgs.orgPackages - - - If you are on NixOS, you can install this particular Emacs for - all users by adding it to the list of system packages (see - ). Simply modify - your file configuration.nix to make it - contain: - - - -{ - environment.systemPackages = [ - # [...] - (import /path/to/emacs.nix { inherit pkgs; }) - ]; -} - - - In this case, the next nixos-rebuild switch - will take care of adding your emacs to the - PATH environment variable (see - ). - - - If you are not on NixOS or want to install this particular Emacs - only for yourself, you can do so by adding it to your - ~/.config/nixpkgs/config.nix (see - Nixpkgs - manual): - - - -{ - packageOverrides = super: let self = super.pkgs; in { - myemacs = import /path/to/emacs.nix { pkgs = self; }; - }; -} - - - In this case, the next - nix-env -f '<nixpkgs>' -iA myemacs will - take care of adding your emacs to the PATH - environment variable. - -
-
- Advanced Emacs Configuration - - If you want, you can tweak the Emacs package itself from your - emacs.nix. For example, if you want to have - a GTK 3-based Emacs instead of the default GTK 2-based binary - and remove the automatically generated - emacs.desktop (useful if you only use - emacsclient), you can change your file - emacs.nix in this way: - - - - - -{ pkgs ? import <nixpkgs> {} }: -let - myEmacs = (pkgs.emacs.override { - # Use gtk3 instead of the default gtk2 - withGTK3 = true; - withGTK2 = false; - }).overrideAttrs (attrs: { - # I don't want emacs.desktop file because I only use - # emacsclient. - postInstall = (attrs.postInstall or "") + '' - rm $out/share/applications/emacs.desktop - ''; - }); -in [...] - - - After building this file as shown in - the example above, you will - get an GTK 3-based Emacs binary pre-loaded with your favorite - packages. - -
-
-
- Running Emacs as a Service - - NixOS provides an optional systemd service - which launches - Emacs - daemon with the user’s login session. - - - Source: - modules/services/editors/emacs.nix - -
- Enabling the Service - - To install and enable the systemd user - service for Emacs daemon, add the following to your - configuration.nix: - - -services.emacs.enable = true; -services.emacs.package = import /home/cassou/.emacs.d { pkgs = pkgs; }; - - - The services.emacs.package option allows a - custom derivation to be used, for example, one created by - emacsWithPackages. - - - Ensure that the Emacs server is enabled for your user’s Emacs - configuration, either by customizing the - server-mode variable, or by adding - (server-start) to - ~/.emacs.d/init.el. - - - To start the daemon, execute the following: - - -$ nixos-rebuild switch # to activate the new configuration.nix -$ systemctl --user daemon-reload # to force systemd reload -$ systemctl --user start emacs.service # to start the Emacs daemon - - - The server should now be ready to serve Emacs clients. - -
-
- Starting the client - - Ensure that the emacs server is enabled, either by customizing - the server-mode variable, or by adding - (server-start) to - ~/.emacs. - - - To connect to the emacs daemon, run one of the following: - - -emacsclient FILENAME -emacsclient --create-frame # opens a new frame (window) -emacsclient --create-frame --tty # opens a new frame on the current terminal - -
-
- Configuring the <varname>EDITOR</varname> variable - - If is - true, the EDITOR variable - will be set to a wrapper script which launches - emacsclient. - - - Any setting of EDITOR in the shell config - files will override - services.emacs.defaultEditor. To make sure - EDITOR refers to the Emacs wrapper script, - remove any existing EDITOR assignment from - .profile, .bashrc, - .zshenv or any other shell config file. - - - If you have formed certain bad habits when editing files, these - can be corrected with a shell alias to the wrapper script: - - -alias vi=$EDITOR - -
-
- Per-User Enabling of the Service - - In general, systemd user services are - globally enabled by symlinks in - /etc/systemd/user. In the case where Emacs - daemon is not wanted for all users, it is possible to install - the service but not globally enable it: - - -services.emacs.enable = false; -services.emacs.install = true; - - - To enable the systemd user service for just - the currently logged in user, run: - - -systemctl --user enable emacs - - - This will add the symlink - ~/.config/systemd/user/emacs.service. - -
-
-
- Configuring Emacs - - The Emacs init file should be changed to load the extension - packages at startup: - - - -(require 'package) - -;; optional. makes unpure packages archives unavailable -(setq package-archives nil) - -(setq package-enable-at-startup nil) -(package-initialize) - - - After the declarative emacs package configuration has been tested, - previously downloaded packages can be cleaned up by removing - ~/.emacs.d/elpa (do make a backup first, in - case you forgot a package). - -
- A Major Mode for Nix Expressions - - Of interest may be melpaPackages.nix-mode, - which provides syntax highlighting for the Nix language. This is - particularly convenient if you regularly edit Nix files. - -
-
- Accessing man pages - - You can use woman to get completion of all - available man pages. For example, type - M-x woman <RET> nixos-rebuild <RET>. - -
-
- Editing DocBook 5 XML Documents - - Emacs includes - nXML, - a major-mode for validating and editing XML documents. When - editing DocBook 5.0 documents, such as - this one, nXML needs to - be configured with the relevant schema, which is not included. - - - To install the DocBook 5.0 schemas, either add - pkgs.docbook5 to - - (NixOS), or - run nix-env -f '<nixpkgs>' -iA docbook5 - (Nix). - - - Then customize the variable - rng-schema-locating-files to include - ~/.emacs.d/schemas.xml and put the - following text into that file: - - - -<?xml version="1.0"?> -<!-- - To let emacs find this file, evaluate: - (add-to-list 'rng-schema-locating-files "~/.emacs.d/schemas.xml") ---> -<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0"> - <!-- - Use this variation if pkgs.docbook5 is added to environment.systemPackages - --> - <namespace ns="http://docbook.org/ns/docbook" - uri="/run/current-system/sw/share/xml/docbook-5.0/rng/docbookxi.rnc"/> - <!-- - Use this variation if installing schema with "nix-env -iA pkgs.docbook5". - <namespace ns="http://docbook.org/ns/docbook" - uri="../.nix-profile/share/xml/docbook-5.0/rng/docbookxi.rnc"/> - --> -</locatingRules> - -
-
- diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix b/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix index 6453e6968d..2a58be51bb 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix @@ -71,6 +71,29 @@ in }; description = lib.mdDoc "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf)."; }; + + input = mkOption { + type = cfgFmt.type; + default = { }; + example = { + General = { + IdleTimeout = 30; + ClassicBondedOnly = true; + }; + }; + description = lib.mdDoc "Set configuration for the input service (/etc/bluetooth/input.conf)."; + }; + + network = mkOption { + type = cfgFmt.type; + default = { }; + example = { + General = { + DisableSecurity = true; + }; + }; + description = lib.mdDoc "Set configuration for the network service (/etc/bluetooth/network.conf)."; + }; }; }; @@ -80,6 +103,10 @@ in environment.systemPackages = [ package ] ++ optional cfg.hsphfpd.enable pkgs.hsphfpd; + environment.etc."bluetooth/input.conf".source = + cfgFmt.generate "input.conf" cfg.input; + environment.etc."bluetooth/network.conf".source = + cfgFmt.generate "network.conf" cfg.network; environment.etc."bluetooth/main.conf".source = cfgFmt.generate "main.conf" (recursiveUpdate defaults cfg.settings); services.udev.packages = [ package ]; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix index a3bb61a6cb..4e7d730d12 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix @@ -18,12 +18,6 @@ let fwupd = cfg.daemonSettings; }; }; - "fwupd/uefi_capsule.conf" = { - source = pkgs.writeText "uefi_capsule.conf" '' - [uefi_capsule] - OverrideESPMountPoint=${config.boot.loader.efi.efiSysMountPoint} - ''; - }; }; originalEtc = @@ -127,6 +121,16 @@ in { List of plugins to be disabled. ''; }; + + EspLocation = mkOption { + type = types.path; + default = config.boot.loader.efi.efiSysMountPoint; + defaultText = lib.literalExpression "config.boot.loader.efi.efiSysMountPoint"; + description = lib.mdDoc '' + The EFI system partition (ESP) path used if UDisks is not available + or if this partition is not mounted at /boot/efi, /boot, or /efi + ''; + }; }; }; default = {}; @@ -147,7 +151,10 @@ in { ###### implementation config = mkIf cfg.enable { # Disable test related plug-ins implicitly so that users do not have to care about them. - services.fwupd.daemonSettings.DisabledPlugins = cfg.package.defaultDisabledPlugins; + services.fwupd.daemonSettings = { + DisabledPlugins = cfg.package.defaultDisabledPlugins; + EspLocation = config.boot.loader.efi.efiSysMountPoint; + }; environment.systemPackages = [ cfg.package ]; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/throttled.nix b/third_party/nixpkgs/nixos/modules/services/hardware/throttled.nix index 99735ff651..afca24d976 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/throttled.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/throttled.nix @@ -20,12 +20,12 @@ in { config = mkIf cfg.enable { systemd.packages = [ pkgs.throttled ]; # The upstream package has this in Install, but that's not enough, see the NixOS manual - systemd.services.lenovo_fix.wantedBy = [ "multi-user.target" ]; + systemd.services.throttled.wantedBy = [ "multi-user.target" ]; - environment.etc."lenovo_fix.conf".source = + environment.etc."throttled.conf".source = if cfg.extraConfig != "" - then pkgs.writeText "lenovo_fix.conf" cfg.extraConfig - else "${pkgs.throttled}/etc/lenovo_fix.conf"; + then pkgs.writeText "throttled.conf" cfg.extraConfig + else "${pkgs.throttled}/etc/throttled.conf"; # Kernel 5.9 spams warnings whenever userspace writes to CPU MSRs. # See https://github.com/erpalma/throttled/issues/215 diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix b/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix index 70c1fd0986..b2217fc971 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix @@ -8,7 +8,7 @@ in { ### docs meta = { - doc = ./trezord.xml; + doc = ./trezord.md; }; ### interface diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/trezord.xml b/third_party/nixpkgs/nixos/modules/services/hardware/trezord.xml deleted file mode 100644 index 1ba9dc1f18..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/hardware/trezord.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - Trezor - - Trezor is an open-source cryptocurrency hardware wallet and security - token allowing secure storage of private keys. - - - It offers advanced features such U2F two-factor authorization, SSH - login through - Trezor SSH - agent, - GPG and a - password - manager. For more information, guides and documentation, see - https://wiki.trezor.io. - - - To enable Trezor support, add the following to your - configuration.nix: - - -services.trezord.enable = true; - - - This will add all necessary udev rules and start Trezor Bridge. - - diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix index fa06e5391b..9f6f153a10 100644 --- a/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix +++ b/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix @@ -438,11 +438,13 @@ in { "aranet" "bluemaestro" "bluetooth" + "bluetooth_adapters" "bluetooth_le_tracker" "bluetooth_tracker" "bthome" "default_config" "eq3btsmart" + "eufylife_ble" "esphome" "fjaraskupan" "govee_ble" @@ -452,8 +454,10 @@ in { "led_ble" "melnor" "moat" + "mopeka" "oralb" "qingping" + "ruuvi_gateway" "ruuvitag_ble" "sensirion_ble" "sensorpro" diff --git a/third_party/nixpkgs/nixos/modules/services/mail/goeland.nix b/third_party/nixpkgs/nixos/modules/services/mail/goeland.nix new file mode 100644 index 0000000000..13092a65ed --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/mail/goeland.nix @@ -0,0 +1,74 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.goeland; + tomlFormat = pkgs.formats.toml { }; +in +{ + options.services.goeland = { + enable = mkEnableOption (mdDoc "goeland"); + + settings = mkOption { + description = mdDoc '' + Configuration of goeland. + See the [example config file](https://github.com/slurdge/goeland/blob/master/cmd/asset/config.default.toml) for the available options. + ''; + default = { }; + type = tomlFormat.type; + }; + schedule = mkOption { + type = types.str; + default = "12h"; + example = "Mon, 00:00:00"; + description = mdDoc "How often to run goeland, in systemd time format."; + }; + stateDir = mkOption { + type = types.path; + default = "/var/lib/goeland"; + description = mdDoc '' + The data directory for goeland where the database will reside if using the unseen filter. + If left as the default value this directory will automatically be created before the goeland + server starts, otherwise you are responsible for ensuring the directory exists with + appropriate ownership and permissions. + ''; + }; + }; + + config = mkIf cfg.enable { + services.goeland.settings.database = "${cfg.stateDir}/goeland.db"; + + systemd.services.goeland = { + serviceConfig = let confFile = tomlFormat.generate "config.toml" cfg.settings; in mkMerge [ + { + ExecStart = "${pkgs.goeland}/bin/goeland run -c ${confFile}"; + User = "goeland"; + Group = "goeland"; + } + (mkIf (cfg.stateDir == "/var/lib/goeland") { + StateDirectory = "goeland"; + StateDirectoryMode = "0750"; + }) + ]; + startAt = cfg.schedule; + }; + + users.users.goeland = { + description = "goeland user"; + group = "goeland"; + isSystemUser = true; + }; + users.groups.goeland = { }; + + warnings = optionals (hasAttr "password" cfg.settings.email) [ + '' + It is not recommended to set the "services.goeland.settings.email.password" + option as it will be in cleartext in the Nix store. + Please use "services.goeland.settings.email.password_file" instead. + '' + ]; + }; + + meta.maintainers = with maintainers; [ sweenu ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix b/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix index 2adc7427ab..9273f71db7 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix @@ -642,7 +642,7 @@ in { meta = { maintainers = with lib.maintainers; [ lheckemann qyliss ma27 ]; - doc = ./mailman.xml; + doc = ./mailman.md; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/mail/mailman.xml b/third_party/nixpkgs/nixos/modules/services/mail/mailman.xml deleted file mode 100644 index 23b0d0b7da..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/mail/mailman.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - Mailman - - Mailman is free - software for managing electronic mail discussion and e-newsletter - lists. Mailman and its web interface can be configured using the - corresponding NixOS module. Note that this service is best used with - an existing, securely configured Postfix setup, as it does not - automatically configure this. - -
- Basic usage with Postfix - - For a basic configuration with Postfix as the MTA, the following - settings are suggested: - - -{ config, ... }: { - services.postfix = { - enable = true; - relayDomains = ["hash:/var/lib/mailman/data/postfix_domains"]; - sslCert = config.security.acme.certs."lists.example.org".directory + "/full.pem"; - sslKey = config.security.acme.certs."lists.example.org".directory + "/key.pem"; - config = { - transport_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"]; - local_recipient_maps = ["hash:/var/lib/mailman/data/postfix_lmtp"]; - }; - }; - services.mailman = { - enable = true; - serve.enable = true; - hyperkitty.enable = true; - webHosts = ["lists.example.org"]; - siteOwner = "mailman@example.org"; - }; - services.nginx.virtualHosts."lists.example.org".enableACME = true; - networking.firewall.allowedTCPPorts = [ 25 80 443 ]; -} - - - DNS records will also be required: - - - - - AAAA and A records - pointing to the host in question, in order for browsers to be - able to discover the address of the web server; - - - - - An MX record pointing to a domain name at - which the host is reachable, in order for other mail servers - to be able to deliver emails to the mailing lists it hosts. - - - - - After this has been done and appropriate DNS records have been set - up, the Postorius mailing list manager and the Hyperkitty archive - browser will be available at https://lists.example.org/. Note that - this setup is not sufficient to deliver emails to most email - providers nor to avoid spam – a number of additional measures for - authenticating incoming and outgoing mails, such as SPF, DMARC and - DKIM are necessary, but outside the scope of the Mailman module. - -
-
- Using with other MTAs - - Mailman also supports other MTA, though with a little bit more - configuration. For example, to use Mailman with Exim, you can use - the following settings: - - -{ config, ... }: { - services = { - mailman = { - enable = true; - siteOwner = "mailman@example.org"; - enablePostfix = false; - settings.mta = { - incoming = "mailman.mta.exim4.LMTP"; - outgoing = "mailman.mta.deliver.deliver"; - lmtp_host = "localhost"; - lmtp_port = "8024"; - smtp_host = "localhost"; - smtp_port = "25"; - configuration = "python:mailman.config.exim4"; - }; - }; - exim = { - enable = true; - # You can configure Exim in a separate file to reduce configuration.nix clutter - config = builtins.readFile ./exim.conf; - }; - }; -} - - - The exim config needs some special additions to work with Mailman. - Currently NixOS can’t manage Exim config with such granularity. - Please refer to - Mailman - documentation for more info on configuring Mailman for - working with Exim. - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/mjolnir.nix b/third_party/nixpkgs/nixos/modules/services/matrix/mjolnir.nix index cbf7b93329..b6a3e5e8c7 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/mjolnir.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/mjolnir.nix @@ -236,7 +236,7 @@ in }; meta = { - doc = ./mjolnir.xml; + doc = ./mjolnir.md; maintainers = with maintainers; [ jojosch ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/mjolnir.xml b/third_party/nixpkgs/nixos/modules/services/matrix/mjolnir.xml deleted file mode 100644 index 5bd2919e43..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/matrix/mjolnir.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - Mjolnir (Matrix Moderation Tool) - - This chapter will show you how to set up your own, self-hosted - Mjolnir - instance. - - - As an all-in-one moderation tool, it can protect your server from - malicious invites, spam messages, and whatever else you don’t want. - In addition to server-level protection, Mjolnir is great for - communities wanting to protect their rooms without having to use - their personal accounts for moderation. - - - The bot by default includes support for bans, redactions, anti-spam, - server ACLs, room directory changes, room alias transfers, account - deactivation, room shutdown, and more. - - - See the - README - page and the - Moderator’s - guide for additional instructions on how to setup and use - Mjolnir. - - - For additional - settings see - the - default configuration. - -
- Mjolnir Setup - - First create a new Room which will be used as a management room - for Mjolnir. In this room, Mjolnir will log possible errors and - debugging information. You’ll need to set this Room-ID in - services.mjolnir.managementRoom. - - - Next, create a new user for Mjolnir on your homeserver, if not - present already. - - - The Mjolnir Matrix user expects to be free of any rate limiting. - See - Synapse - #6286 for an example on how to achieve this. - - - If you want Mjolnir to be able to deactivate users, move room - aliases, shutdown rooms, etc. you’ll need to make the Mjolnir user - a Matrix server admin. - - - Now invite the Mjolnir user to the management room. - - - It is recommended to use - Pantalaimon, - so your management room can be encrypted. This also applies if you - are looking to moderate an encrypted room. - - - To enable the Pantalaimon E2E Proxy for mjolnir, enable - services.mjolnir.pantalaimon. - This will autoconfigure a new Pantalaimon instance, which will - connect to the homeserver set in - services.mjolnir.homeserverUrl - and Mjolnir itself will be configured to connect to the new - Pantalaimon instance. - - -{ - services.mjolnir = { - enable = true; - homeserverUrl = "https://matrix.domain.tld"; - pantalaimon = { - enable = true; - username = "mjolnir"; - passwordFile = "/run/secrets/mjolnir-password"; - }; - protectedRooms = [ - "https://matrix.to/#/!xxx:domain.tld" - ]; - managementRoom = "!yyy:domain.tld"; - }; -} - -
- Element Matrix Services (EMS) - - If you are using a managed - Element Matrix - Services (EMS) server, you will need to consent - to the terms and conditions. Upon startup, an error log entry - with a URL to the consent page will be generated. - -
-
-
- Synapse Antispam Module - - A Synapse module is also available to apply the same rulesets the - bot uses across an entire homeserver. - - - To use the Antispam Module, add - matrix-synapse-plugins.matrix-synapse-mjolnir-antispam - to the Synapse plugin list and enable the - mjolnir.Module module. - - -{ - services.matrix-synapse = { - plugins = with pkgs; [ - matrix-synapse-plugins.matrix-synapse-mjolnir-antispam - ]; - extraConfig = '' - modules: - - module: mjolnir.Module - config: - # Prevent servers/users in the ban lists from inviting users on this - # server to rooms. Default true. - block_invites: true - # Flag messages sent by servers/users in the ban lists as spam. Currently - # this means that spammy messages will appear as empty to users. Default - # false. - block_messages: false - # Remove users from the user directory search by filtering matrix IDs and - # display names by the entries in the user ban list. Default false. - block_usernames: false - # The room IDs of the ban lists to honour. Unlike other parts of Mjolnir, - # this list cannot be room aliases or permalinks. This server is expected - # to already be joined to the room - Mjolnir will not automatically join - # these rooms. - ban_lists: - - "!roomid:example.org" - ''; - }; -} - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/synapse.nix b/third_party/nixpkgs/nixos/modules/services/matrix/synapse.nix index 3087d879b9..aee275dab1 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/synapse.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/synapse.nix @@ -801,7 +801,7 @@ in { meta = { buildDocsInSandbox = false; - doc = ./synapse.xml; + doc = ./synapse.md; maintainers = teams.matrix.members; }; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/synapse.xml b/third_party/nixpkgs/nixos/modules/services/matrix/synapse.xml deleted file mode 100644 index 686aec93ab..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/matrix/synapse.xml +++ /dev/null @@ -1,263 +0,0 @@ - - - Matrix - - Matrix is an open - standard for interoperable, decentralised, real-time communication - over IP. It can be used to power Instant Messaging, VoIP/WebRTC - signalling, Internet of Things communication - or anywhere you need - a standard HTTP API for publishing and subscribing to data whilst - tracking the conversation history. - - - This chapter will show you how to set up your own, self-hosted - Matrix homeserver using the Synapse reference homeserver, and how to - serve your own copy of the Element web client. See the - Try - Matrix Now! overview page for links to Element Apps for - Android and iOS, desktop clients, as well as bridges to other - networks and other projects around Matrix. - -
- Synapse Homeserver - - Synapse - is the reference homeserver implementation of Matrix from the core - development team at matrix.org. The following configuration - example will set up a synapse server for the - example.org domain, served from the host - myhostname.example.org. For more information, - please refer to the - installation - instructions of Synapse . - - -{ pkgs, lib, config, ... }: -let - fqdn = "${config.networking.hostName}.${config.networking.domain}"; - clientConfig = { - "m.homeserver".base_url = "https://${fqdn}"; - "m.identity_server" = {}; - }; - serverConfig."m.server" = "${config.services.matrix-synapse.settings.server_name}:443"; - mkWellKnown = data: '' - add_header Content-Type application/json; - add_header Access-Control-Allow-Origin *; - return 200 '${builtins.toJSON data}'; - ''; -in { - networking.hostName = "myhostname"; - networking.domain = "example.org"; - networking.firewall.allowedTCPPorts = [ 80 443 ]; - - services.postgresql.enable = true; - services.postgresql.initialScript = pkgs.writeText "synapse-init.sql" '' - CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse'; - CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" - TEMPLATE template0 - LC_COLLATE = "C" - LC_CTYPE = "C"; - ''; - - services.nginx = { - enable = true; - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - recommendedProxySettings = true; - virtualHosts = { - # If the A and AAAA DNS records on example.org do not point on the same host as the - # records for myhostname.example.org, you can easily move the /.well-known - # virtualHost section of the code to the host that is serving example.org, while - # the rest stays on myhostname.example.org with no other changes required. - # This pattern also allows to seamlessly move the homeserver from - # myhostname.example.org to myotherhost.example.org by only changing the - # /.well-known redirection target. - "${config.networking.domain}" = { - enableACME = true; - forceSSL = true; - # This section is not needed if the server_name of matrix-synapse is equal to - # the domain (i.e. example.org from @foo:example.org) and the federation port - # is 8448. - # Further reference can be found in the docs about delegation under - # https://matrix-org.github.io/synapse/latest/delegate.html - locations."= /.well-known/matrix/server".extraConfig = mkWellKnown serverConfig; - # This is usually needed for homeserver discovery (from e.g. other Matrix clients). - # Further reference can be found in the upstream docs at - # https://spec.matrix.org/latest/client-server-api/#getwell-knownmatrixclient - locations."= /.well-known/matrix/client".extraConfig = mkWellKnown clientConfig; - }; - "${fqdn}" = { - enableACME = true; - forceSSL = true; - # It's also possible to do a redirect here or something else, this vhost is not - # needed for Matrix. It's recommended though to *not put* element - # here, see also the section about Element. - locations."/".extraConfig = '' - return 404; - ''; - # Forward all Matrix API calls to the synapse Matrix homeserver. A trailing slash - # *must not* be used here. - locations."/_matrix".proxyPass = "http://[::1]:8008"; - # Forward requests for e.g. SSO and password-resets. - locations."/_synapse/client".proxyPass = "http://[::1]:8008"; - }; - }; - }; - - services.matrix-synapse = { - enable = true; - settings.server_name = config.networking.domain; - settings.listeners = [ - { port = 8008; - bind_addresses = [ "::1" ]; - type = "http"; - tls = false; - x_forwarded = true; - resources = [ { - names = [ "client" "federation" ]; - compress = true; - } ]; - } - ]; - }; -} - -
-
- Registering Matrix users - - If you want to run a server with public registration by anybody, - you can then enable - services.matrix-synapse.settings.enable_registration = true;. - Otherwise, or you can generate a registration secret with - pwgen -s 64 1 and set it with - . - To create a new user or admin, run the following after you have - set the secret and have rebuilt NixOS: - - -$ nix-shell -p matrix-synapse -$ register_new_matrix_user -k your-registration-shared-secret http://localhost:8008 -New user localpart: your-username -Password: -Confirm password: -Make admin [no]: -Success! - - - In the example, this would create a user with the Matrix - Identifier @your-username:example.org. - - - - When using - , - the secret will end up in the world-readable store. Instead it’s - recommended to deploy the secret in an additional file like - this: - - - - - Create a file with the following contents: - - -registration_shared_secret: your-very-secret-secret - - - - - Deploy the file with a secret-manager such as - - from - nixops1 - or - sops-nix - to e.g. - /run/secrets/matrix-shared-secret and - ensure that it’s readable by - matrix-synapse. - - - - - Include the file like this in your configuration: - - -{ - services.matrix-synapse.extraConfigFiles = [ - "/run/secrets/matrix-shared-secret" - ]; -} - - - - - - - It’s also possible to user alternative authentication mechanism - such as - LDAP - (via matrix-synapse-ldap3) or - OpenID. - - -
-
- Element (formerly known as Riot) Web Client - - Element - Web is the reference web client for Matrix and developed by - the core team at matrix.org. Element was formerly known as - Riot.im, see the - Element - introductory blog post for more information. The following - snippet can be optionally added to the code before to complete the - synapse installation with a web client served at - https://element.myhostname.example.org and - https://element.example.org. Alternatively, you - can use the hosted copy at - https://app.element.io/, - or use other web clients or native client applications. Due to the - /.well-known urls set up done above, many - clients should fill in the required connection details - automatically when you enter your Matrix Identifier. See - Try - Matrix Now! for a list of existing clients and their - supported featureset. - - -{ - services.nginx.virtualHosts."element.${fqdn}" = { - enableACME = true; - forceSSL = true; - serverAliases = [ - "element.${config.networking.domain}" - ]; - - root = pkgs.element-web.override { - conf = { - default_server_config = clientConfig; # see `clientConfig` from the snippet above. - }; - }; - }; -} - - - - The Element developers do not recommend running Element and your - Matrix homeserver on the same fully-qualified domain name for - security reasons. In the example, this means that you should not - reuse the myhostname.example.org virtualHost - to also serve Element, but instead serve it on a different - subdomain, like element.example.org in the - example. See the - Element - Important Security Notes for more information on this - subject. - - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/misc/autosuspend.nix b/third_party/nixpkgs/nixos/modules/services/misc/autosuspend.nix new file mode 100644 index 0000000000..b3e362533a --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/autosuspend.nix @@ -0,0 +1,230 @@ +{ config, pkgs, lib, ... }: +let + inherit (lib) mapAttrs' nameValuePair filterAttrs types mkEnableOption + mdDoc mkPackageOptionMD mkOption literalExpression mkIf flatten + maintainers attrValues; + + cfg = config.services.autosuspend; + + settingsFormat = pkgs.formats.ini { }; + + checks = + mapAttrs' + (n: v: nameValuePair "check.${n}" (filterAttrs (_: v: v != null) v)) + cfg.checks; + wakeups = + mapAttrs' + (n: v: nameValuePair "wakeup.${n}" (filterAttrs (_: v: v != null) v)) + cfg.wakeups; + + # Whether the given check is enabled + hasCheck = class: + (filterAttrs + (n: v: v.enabled && (if v.class == null then n else v.class) == class) + cfg.checks) + != { }; + + # Dependencies needed by specific checks + dependenciesForChecks = { + "Smb" = pkgs.samba; + "XIdleTime" = [ pkgs.xprintidle pkgs.sudo ]; + }; + + autosuspend-conf = + settingsFormat.generate "autosuspend.conf" ({ general = cfg.settings; } // checks // wakeups); + + autosuspend = cfg.package; + + checkType = types.submodule { + freeformType = settingsFormat.type.nestedTypes.elemType; + + options.enabled = mkEnableOption (mdDoc "this activity check") // { default = true; }; + + options.class = mkOption { + default = null; + type = with types; nullOr (enum [ + "ActiveCalendarEvent" + "ActiveConnection" + "ExternalCommand" + "JsonPath" + "Kodi" + "KodiIdleTime" + "LastLogActivity" + "Load" + "LogindSessionsIdle" + "Mpd" + "NetworkBandwidth" + "Ping" + "Processes" + "Smb" + "Users" + "XIdleTime" + "XPath" + ]); + description = mdDoc '' + Name of the class implementing the check. If this option is not specified, the check's + name must represent a valid internal check class. + ''; + }; + }; + + wakeupType = types.submodule { + freeformType = settingsFormat.type.nestedTypes.elemType; + + options.enabled = mkEnableOption (mdDoc "this wake-up check") // { default = true; }; + + options.class = mkOption { + default = null; + type = with types; nullOr (enum [ + "Calendar" + "Command" + "File" + "Periodic" + "SystemdTimer" + "XPath" + "XPathDelta" + ]); + description = mdDoc '' + Name of the class implementing the check. If this option is not specified, the check's + name must represent a valid internal check class. + ''; + }; + }; +in +{ + options = { + services.autosuspend = { + enable = mkEnableOption (mdDoc "the autosuspend daemon"); + + package = mkPackageOptionMD pkgs "autosuspend" { }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type.nestedTypes.elemType; + + options = { + # Provide reasonable defaults for these two (required) options + suspend_cmd = mkOption { + default = "systemctl suspend"; + type = with types; str; + description = mdDoc '' + The command to execute in case the host shall be suspended. This line can contain + additional command line arguments to the command to execute. + ''; + }; + wakeup_cmd = mkOption { + default = ''sh -c 'echo 0 > /sys/class/rtc/rtc0/wakealarm && echo {timestamp:.0f} > /sys/class/rtc/rtc0/wakealarm' ''; + type = with types; str; + description = mdDoc '' + The command to execute for scheduling a wake up of the system. The given string is + processed using Python’s `str.format()` and a format argument called `timestamp` + encodes the UTC timestamp of the planned wake up time (float). Additionally `iso` + can be used to acquire the timestamp in ISO 8601 format. + ''; + }; + }; + }; + default = { }; + example = literalExpression '' + { + enable = true; + interval = 30; + idle_time = 120; + } + ''; + description = mdDoc '' + Configuration for autosuspend, see + + for supported values. + ''; + }; + + checks = mkOption { + default = { }; + type = with types; attrsOf checkType; + description = mdDoc '' + Checks for activity. For more information, see: + - + - + ''; + example = literalExpression '' + { + # Basic activity check configuration. + # The check class name is derived from the section header (Ping in this case). + # Remember to enable desired checks. They are disabled by default. + Ping = { + hosts = "192.168.0.7"; + }; + + # This check is disabled. + Smb.enabled = false; + + # Example for a custom check name. + # This will use the Users check with the custom name RemoteUsers. + # Custom names are necessary in case a check class is used multiple times. + # Custom names can also be used for clarification. + RemoteUsers = { + class = "Users"; + name = ".*"; + terminal = ".*"; + host = "[0-9].*"; + }; + + # Here the Users activity check is used again with different settings and a different name + LocalUsers = { + class = "Users"; + name = ".*"; + terminal = ".*"; + host = "localhost"; + }; + } + ''; + }; + + wakeups = mkOption { + default = { }; + type = with types; attrsOf wakeupType; + description = mdDoc '' + Checks for wake up. For more information, see: + - + - + ''; + example = literalExpression '' + { + # Wake up checks reuse the same configuration mechanism as activity checks. + Calendar = { + url = "http://example.org/test.ics"; + }; + } + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.autosuspend = { + description = "A daemon to suspend your server in case of inactivity"; + documentation = [ "https://autosuspend.readthedocs.io/en/latest/systemd_integration.html" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + path = flatten (attrValues (filterAttrs (n: _: hasCheck n) dependenciesForChecks)); + serviceConfig = { + ExecStart = ''${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} daemon''; + }; + }; + + systemd.services.autosuspend-detect-suspend = { + description = "Notifies autosuspend about suspension"; + documentation = [ "https://autosuspend.readthedocs.io/en/latest/systemd_integration.html" ]; + wantedBy = [ "sleep.target" ]; + after = [ "sleep.target" ]; + serviceConfig = { + ExecStart = ''${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} presuspend''; + }; + }; + }; + + meta = { + maintainers = with maintainers; [ xlambein ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix index e6689217ad..179359c97a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -1504,6 +1504,6 @@ in { }; - meta.doc = ./gitlab.xml; + meta.doc = ./gitlab.md; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.xml b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.xml deleted file mode 100644 index a193657b0b..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - GitLab - - GitLab is a feature-rich git hosting service. - -
- Prerequisites - - The gitlab service exposes only an Unix socket - at /run/gitlab/gitlab-workhorse.socket. You - need to configure a webserver to proxy HTTP requests to the - socket. - - - For instance, the following configuration could be used to use - nginx as frontend proxy: - - -services.nginx = { - enable = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - virtualHosts."git.example.com" = { - enableACME = true; - forceSSL = true; - locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; - }; -}; - -
-
- Configuring - - GitLab depends on both PostgreSQL and Redis and will automatically - enable both services. In the case of PostgreSQL, a database and a - role will be created. - - - The default state dir is /var/gitlab/state. - This is where all data like the repositories and uploads will be - stored. - - - A basic configuration with some custom settings could look like - this: - - -services.gitlab = { - enable = true; - databasePasswordFile = "/var/keys/gitlab/db_password"; - initialRootPasswordFile = "/var/keys/gitlab/root_password"; - https = true; - host = "git.example.com"; - port = 443; - user = "git"; - group = "git"; - smtp = { - enable = true; - address = "localhost"; - port = 25; - }; - secrets = { - dbFile = "/var/keys/gitlab/db"; - secretFile = "/var/keys/gitlab/secret"; - otpFile = "/var/keys/gitlab/otp"; - jwsFile = "/var/keys/gitlab/jws"; - }; - extraConfig = { - gitlab = { - email_from = "gitlab-no-reply@example.com"; - email_display_name = "Example GitLab"; - email_reply_to = "gitlab-no-reply@example.com"; - default_projects_features = { builds = false; }; - }; - }; -}; - - - If you’re setting up a new GitLab instance, generate new secrets. - You for instance use - tr -dc A-Za-z0-9 < /dev/urandom | head -c 128 > /var/keys/gitlab/db - to generate a new db secret. Make sure the files can be read by, - and only by, the user specified by - services.gitlab.user. - GitLab encrypts sensitive data stored in the database. If you’re - restoring an existing GitLab instance, you must specify the - secrets secret from config/secrets.yml located - in your GitLab state folder. - - - When incoming_mail.enabled is set to - true in - extraConfig - an additional service called gitlab-mailroom is - enabled for fetching incoming mail. - - - Refer to for all available - configuration options for the - services.gitlab - module. - -
-
- Maintenance -
- Backups - - Backups can be configured with the options in - services.gitlab.backup. - Use the - services.gitlab.backup.startAt - option to configure regular backups. - - - To run a manual backup, start the - gitlab-backup service: - - -$ systemctl start gitlab-backup.service - -
-
- Rake tasks - - You can run GitLab’s rake tasks with - gitlab-rake which will be available on the - system when GitLab is enabled. You will have to run the command - as the user that you configured to run GitLab with. - - - A list of all available rake tasks can be obtained by running: - - -$ sudo -u git -H gitlab-rake -T - -
-
- diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gpsd.nix b/third_party/nixpkgs/nixos/modules/services/misc/gpsd.nix index ec0a8e1eaa..9b03b6f966 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gpsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gpsd.nix @@ -22,7 +22,7 @@ in type = types.bool; default = false; description = lib.mdDoc '' - Whether to enable `gpsd', a GPS service daemon. + Whether to enable `gpsd`, a GPS service daemon. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix b/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix index c216c6fa2b..43e0ce0c21 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix @@ -106,6 +106,9 @@ in systemd.tmpfiles.rules = [ "d '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" + # this will allow octoprint access to raspberry specific hardware to check for throttling + # read-only will not work: "VCHI initialization failed" error + "a /dev/vchiq - - - - u:octoprint:rw" ]; systemd.services.octoprint = { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix b/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix index 1dddd147ac..667f16d98f 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix @@ -226,9 +226,26 @@ in # Auto-migrate on first run or if the package has changed versionFile="${cfg.dataDir}/src-version" - if [[ $(cat "$versionFile" 2>/dev/null) != ${pkg} ]]; then + version=$(cat "$versionFile" 2>/dev/null || echo 0) + + if [[ $version != ${pkg.version} ]]; then ${pkg}/bin/paperless-ngx migrate - echo ${pkg} > "$versionFile" + + # Parse old version string format for backwards compatibility + version=$(echo "$version" | grep -ohP '[^-]+$') + + versionLessThan() { + target=$1 + [[ $({ echo "$version"; echo "$target"; } | sort -V | head -1) != "$target" ]] + } + + if versionLessThan 1.12.0; then + # Reindex documents as mentioned in https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.12.1 + echo "Reindexing documents, to allow searching old comments. Required after the 1.12.x upgrade." + ${pkg}/bin/paperless-ngx document_index reindex + fi + + echo ${pkg.version} > "$versionFile" fi '' + optionalString (cfg.passwordFile != null) '' diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix index b03cf0739e..b2cadbf0c4 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix @@ -1390,6 +1390,6 @@ in '') ]; - meta.doc = ./default.xml; + meta.doc = ./default.md; meta.maintainers = with maintainers; [ tomberek ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.xml b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.xml deleted file mode 100644 index 1d8330931d..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - Sourcehut - - Sourcehut is an - open-source, self-hostable software development platform. The server - setup can be automated using - services.sourcehut. - -
- Basic usage - - Sourcehut is a Python and Go based set of applications. This NixOS - module also provides basic configuration integrating Sourcehut - into locally running services.nginx, - services.redis.servers.sourcehut, - services.postfix and - services.postgresql services. - - - A very basic configuration may look like this: - - -{ pkgs, ... }: -let - fqdn = - let - join = hostName: domain: hostName + optionalString (domain != null) ".${domain}"; - in join config.networking.hostName config.networking.domain; -in { - - networking = { - hostName = "srht"; - domain = "tld"; - firewall.allowedTCPPorts = [ 22 80 443 ]; - }; - - services.sourcehut = { - enable = true; - git.enable = true; - man.enable = true; - meta.enable = true; - nginx.enable = true; - postfix.enable = true; - postgresql.enable = true; - redis.enable = true; - settings = { - "sr.ht" = { - environment = "production"; - global-domain = fqdn; - origin = "https://${fqdn}"; - # Produce keys with srht-keygen from sourcehut.coresrht. - network-key = "/run/keys/path/to/network-key"; - service-key = "/run/keys/path/to/service-key"; - }; - webhooks.private-key= "/run/keys/path/to/webhook-key"; - }; - }; - - security.acme.certs."${fqdn}".extraDomainNames = [ - "meta.${fqdn}" - "man.${fqdn}" - "git.${fqdn}" - ]; - - services.nginx = { - enable = true; - # only recommendedProxySettings are strictly required, but the rest make sense as well. - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - recommendedProxySettings = true; - - # Settings to setup what certificates are used for which endpoint. - virtualHosts = { - "${fqdn}".enableACME = true; - "meta.${fqdn}".useACMEHost = fqdn: - "man.${fqdn}".useACMEHost = fqdn: - "git.${fqdn}".useACMEHost = fqdn: - }; - }; -} - - - The hostName option is used internally to - configure the nginx reverse-proxy. The settings - attribute set is used by the configuration generator and the - result is placed in /etc/sr.ht/config.ini. - -
-
- Configuration - - All configuration parameters are also stored in - /etc/sr.ht/config.ini which is generated by the - module and linked from the store to ensure that all values from - config.ini can be modified by the module. - -
-
- Using an alternative webserver as reverse-proxy (e.g. - <literal>httpd</literal>) - - By default, nginx is used as reverse-proxy for - sourcehut. However, it’s possible to use e.g. - httpd by explicitly disabling - nginx using - and fixing the - settings. - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/misc/taskserver/default.nix b/third_party/nixpkgs/nixos/modules/services/misc/taskserver/default.nix index 7331c323ad..775b3b6d2e 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/taskserver/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/taskserver/default.nix @@ -566,5 +566,5 @@ in { }) ]; - meta.doc = ./default.xml; + meta.doc = ./default.md; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/taskserver/default.xml b/third_party/nixpkgs/nixos/modules/services/misc/taskserver/default.xml deleted file mode 100644 index bbb38211b7..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/misc/taskserver/default.xml +++ /dev/null @@ -1,130 +0,0 @@ - - - Taskserver - - Taskserver is the server component of - Taskwarrior, a - free and open source todo list application. - - - Upstream documentation: - https://taskwarrior.org/docs/#taskd - -
- Configuration - - Taskserver does all of its authentication via TLS using client - certificates, so you either need to roll your own CA or purchase a - certificate from a known CA, which allows creation of client - certificates. These certificates are usually advertised as - server certificates. - - - So in order to make it easier to handle your own CA, there is a - helper tool called nixos-taskserver which - manages the custom CA along with Taskserver organisations, users - and groups. - - - While the client certificates in Taskserver only authenticate - whether a user is allowed to connect, every user has its own UUID - which identifies it as an entity. - - - With nixos-taskserver the client certificate is - created along with the UUID of the user, so it handles all of the - credentials needed in order to setup the Taskwarrior client to - work with a Taskserver. - -
-
- The nixos-taskserver tool - - Because Taskserver by default only provides scripts to setup users - imperatively, the nixos-taskserver tool is used - for addition and deletion of organisations along with users and - groups defined by - and as - well for imperative set up. - - - The tool is designed to not interfere if the command is used to - manually set up some organisations, users or groups. - - - For example if you add a new organisation using - nixos-taskserver org add foo, the organisation - is not modified and deleted no matter what you define in - , even if you’re - adding the same organisation in that option. - - - The tool is modelled to imitate the official - taskd command, documentation for each - subcommand can be shown by using the - switch. - -
-
- Declarative/automatic CA management - - Everything is done according to what you specify in the module - options, however in order to set up a Taskwarrior client for - synchronisation with a Taskserver instance, you have to transfer - the keys and certificates to the client machine. - - - This is done using - nixos-taskserver user export $orgname $username - which is printing a shell script fragment to stdout which can - either be used verbatim or adjusted to import the user on the - client machine. - - - For example, let’s say you have the following configuration: - - -{ - services.taskserver.enable = true; - services.taskserver.fqdn = "server"; - services.taskserver.listenHost = "::"; - services.taskserver.organisations.my-company.users = [ "alice" ]; -} - - - This creates an organisation called my-company - with the user alice. - - - Now in order to import the alice user to - another machine alicebox, all we need to do is - something like this: - - -$ ssh server nixos-taskserver user export my-company alice | sh - - - Of course, if no SSH daemon is available on the server you can - also copy & paste it directly into a shell. - - - After this step the user should be set up and you can start - synchronising your tasks for the first time with - task sync init on alicebox. - - - Subsequent synchronisation requests merely require the command - task sync after that stage. - -
-
- Manual CA management - - If you set any options within - service.taskserver.pki.manual.*, - nixos-taskserver won’t issue certificates, but - you can still use it for adding or removing user accounts. - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/misc/weechat.nix b/third_party/nixpkgs/nixos/modules/services/misc/weechat.nix index 663a767a0c..338493e3cd 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/weechat.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/weechat.nix @@ -15,7 +15,7 @@ in default = "/var/lib/weechat"; }; sessionName = mkOption { - description = lib.mdDoc "Name of the `screen' session for weechat."; + description = lib.mdDoc "Name of the `screen` session for weechat."; default = "weechat-screen"; type = types.str; }; @@ -59,5 +59,5 @@ in }; }; - meta.doc = ./weechat.xml; + meta.doc = ./weechat.md; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/weechat.xml b/third_party/nixpkgs/nixos/modules/services/misc/weechat.xml deleted file mode 100644 index 83ae171217..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/misc/weechat.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - WeeChat - - WeeChat is a fast and - extensible IRC client. - -
- Basic Usage - - By default, the module creates a - systemd - unit which runs the chat client in a detached - screen - session. - - - This can be done by enabling the weechat - service: - - -{ ... }: - -{ - services.weechat.enable = true; -} - - - The service is managed by a dedicated user named - weechat in the state directory - /var/lib/weechat. - -
-
- Re-attaching to WeeChat - - WeeChat runs in a screen session owned by a dedicated user. To - explicitly allow your another user to attach to this session, the - screenrc needs to be tweaked by adding - multiuser - support: - - -{ - programs.screen.screenrc = '' - multiuser on - acladd normal_user - ''; -} - - - Now, the session can be re-attached like this: - - -screen -x weechat/weechat-screen - - - The session name can be changed using - services.weechat.sessionName. - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-image-renderer.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-image-renderer.nix index 60f6e84c63..7ea17b0756 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-image-renderer.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-image-renderer.nix @@ -108,7 +108,7 @@ in { services.grafana.settings.rendering = mkIf cfg.provisionGrafana { url = "http://localhost:${toString cfg.settings.service.port}/render"; - callback_url = "http://localhost:${toString config.services.grafana.port}"; + callback_url = "http://localhost:${toString config.services.grafana.settings.server.http_port}"; }; services.grafana-image-renderer.chromium = mkDefault pkgs.chromium; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix index 2e7c4fd00b..fdaefbe17f 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix @@ -539,6 +539,6 @@ in }; }; - meta.doc = ./parsedmarc.xml; + meta.doc = ./parsedmarc.md; meta.maintainers = [ lib.maintainers.talyz ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.xml b/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.xml deleted file mode 100644 index 4d9b12c9a4..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - parsedmarc - - parsedmarc - is a service which parses incoming - DMARC reports and - stores or sends them to a downstream service for further analysis. - In combination with Elasticsearch, Grafana and the included Grafana - dashboard, it provides a handy overview of DMARC reports over time. - -
- Basic usage - - A very minimal setup which reads incoming reports from an external - email address and saves them to a local Elasticsearch instance - looks like this: - - -services.parsedmarc = { - enable = true; - settings.imap = { - host = "imap.example.com"; - user = "alice@example.com"; - password = "/path/to/imap_password_file"; - }; - provision.geoIp = false; # Not recommended! -}; - - - Note that GeoIP provisioning is disabled in the example for - simplicity, but should be turned on for fully functional reports. - -
-
- Local mail - - Instead of watching an external inbox, a local inbox can be - automatically provisioned. The recipient’s name is by default set - to dmarc, but can be configured in - services.parsedmarc.provision.localMail.recipientName. - You need to add an MX record pointing to the host. More - concretely: for the example to work, an MX record needs to be set - up for monitoring.example.com and the complete - email address that should be configured in the domain’s dmarc - policy is dmarc@monitoring.example.com. - - -services.parsedmarc = { - enable = true; - provision = { - localMail = { - enable = true; - hostname = monitoring.example.com; - }; - geoIp = false; # Not recommended! - }; -}; - -
-
- Grafana and GeoIP - - The reports can be visualized and summarized with parsedmarc’s - official Grafana dashboard. For all views to work, and for the - data to be complete, GeoIP databases are also required. The - following example shows a basic deployment where the provisioned - Elasticsearch instance is automatically added as a Grafana - datasource, and the dashboard is added to Grafana as well. - - -services.parsedmarc = { - enable = true; - provision = { - localMail = { - enable = true; - hostname = url; - }; - grafana = { - datasource = true; - dashboard = true; - }; - }; -}; - -# Not required, but recommended for full functionality -services.geoipupdate = { - settings = { - AccountID = 000000; - LicenseKey = "/path/to/license_key_file"; - }; -}; - -services.grafana = { - enable = true; - addr = "0.0.0.0"; - domain = url; - rootUrl = "https://" + url; - protocol = "socket"; - security = { - adminUser = "admin"; - adminPasswordFile = "/path/to/admin_password_file"; - secretKeyFile = "/path/to/secret_key_file"; - }; -}; - -services.nginx = { - enable = true; - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - recommendedProxySettings = true; - upstreams.grafana.servers."unix:/${config.services.grafana.socket}" = {}; - virtualHosts.${url} = { - root = config.services.grafana.staticRootPath; - enableACME = true; - forceSSL = true; - locations."/".tryFiles = "$uri @grafana"; - locations."@grafana".proxyPass = "http://grafana"; - }; -}; -users.users.nginx.extraGroups = [ "grafana" ]; - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index f3fbfb149a..fd40dce141 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -64,6 +64,7 @@ let "rspamd" "rtl_433" "script" + "shelly" "snmp" "smartctl" "smokeping" @@ -323,7 +324,7 @@ in ); meta = { - doc = ./exporters.xml; + doc = ./exporters.md; maintainers = [ maintainers.willibutz ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.xml b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.xml deleted file mode 100644 index 0ea95e513f..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.xml +++ /dev/null @@ -1,245 +0,0 @@ - - - Prometheus exporters - - Prometheus exporters provide metrics for the - prometheus monitoring - system. - -
- Configuration - - One of the most common exporters is the - node - exporter, it provides hardware and OS metrics from the host - it’s running on. The exporter could be configured as follows: - - - services.prometheus.exporters.node = { - enable = true; - port = 9100; - enabledCollectors = [ - "logind" - "systemd" - ]; - disabledCollectors = [ - "textfile" - ]; - openFirewall = true; - firewallFilter = "-i br0 -p tcp -m tcp --dport 9100"; - }; - - - It should now serve all metrics from the collectors that are - explicitly enabled and the ones that are - enabled - by default, via http under /metrics. In - this example the firewall should just allow incoming connections - to the exporter’s port on the bridge interface - br0 (this would have to be configured - separately of course). For more information about configuration - see man configuration.nix or search through the - available - options. - - - Prometheus can now be configured to consume the metrics produced - by the exporter: - - - services.prometheus = { - # ... - - scrapeConfigs = [ - { - job_name = "node"; - static_configs = [{ - targets = [ "localhost:${toString config.services.prometheus.exporters.node.port}" ]; - }]; - } - ]; - - # ... - } - -
-
- Adding a new exporter - - To add a new exporter, it has to be packaged first (see - nixpkgs/pkgs/servers/monitoring/prometheus/ for - examples), then a module can be added. The postfix exporter is - used in this example: - - - - - Some default options for all exporters are provided by - nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix: - - - - - enable - - - - - port - - - - - listenAddress - - - - - extraFlags - - - - - openFirewall - - - - - firewallFilter - - - - - user - - - - - group - - - - - - - As there is already a package available, the module can now be - added. This is accomplished by adding a new file to the - nixos/modules/services/monitoring/prometheus/exporters/ - directory, which will be called postfix.nix and contains all - exporter specific options and configuration: - - -# nixpgs/nixos/modules/services/prometheus/exporters/postfix.nix -{ config, lib, pkgs, options }: - -with lib; - -let - # for convenience we define cfg here - cfg = config.services.prometheus.exporters.postfix; -in -{ - port = 9154; # The postfix exporter listens on this port by default - - # `extraOpts` is an attribute set which contains additional options - # (and optional overrides for default options). - # Note that this attribute is optional. - extraOpts = { - telemetryPath = mkOption { - type = types.str; - default = "/metrics"; - description = '' - Path under which to expose metrics. - ''; - }; - logfilePath = mkOption { - type = types.path; - default = /var/log/postfix_exporter_input.log; - example = /var/log/mail.log; - description = '' - Path where Postfix writes log entries. - This file will be truncated by this exporter! - ''; - }; - showqPath = mkOption { - type = types.path; - default = /var/spool/postfix/public/showq; - example = /var/lib/postfix/queue/public/showq; - description = '' - Path at which Postfix places its showq socket. - ''; - }; - }; - - # `serviceOpts` is an attribute set which contains configuration - # for the exporter's systemd service. One of - # `serviceOpts.script` and `serviceOpts.serviceConfig.ExecStart` - # has to be specified here. This will be merged with the default - # service configuration. - # Note that by default 'DynamicUser' is 'true'. - serviceOpts = { - serviceConfig = { - DynamicUser = false; - ExecStart = '' - ${pkgs.prometheus-postfix-exporter}/bin/postfix_exporter \ - --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ - --web.telemetry-path ${cfg.telemetryPath} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; - }; - }; -} - - - - - This should already be enough for the postfix exporter. - Additionally one could now add assertions and conditional - default values. This can be done in the - meta-module that combines all exporter - definitions and generates the submodules: - nixpkgs/nixos/modules/services/prometheus/exporters.nix - - - -
-
- Updating an exporter module - - Should an exporter option change at some point, it is possible to - add information about the change to the exporter definition - similar to nixpkgs/nixos/modules/rename.nix: - - -{ config, lib, pkgs, options }: - -with lib; - -let - cfg = config.services.prometheus.exporters.nginx; -in -{ - port = 9113; - extraOpts = { - # additional module options - # ... - }; - serviceOpts = { - # service configuration - # ... - }; - imports = [ - # 'services.prometheus.exporters.nginx.telemetryEndpoint' -> 'services.prometheus.exporters.nginx.telemetryPath' - (mkRenamedOptionModule [ "telemetryEndpoint" ] [ "telemetryPath" ]) - - # removed option 'services.prometheus.exporters.nginx.insecure' - (mkRemovedOptionModule [ "insecure" ] '' - This option was replaced by 'prometheus.exporters.nginx.sslVerify' which defaults to true. - '') - ({ options.warnings = options.warnings; }) - ]; -} - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/shelly.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/shelly.nix new file mode 100644 index 0000000000..b9cfd1b1e8 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/shelly.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.shelly; +in +{ + port = 9784; + extraOpts = { + metrics-file = mkOption { + type = types.path; + description = lib.mdDoc '' + Path to the JSON file with the metric definitions + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-shelly-exporter}/bin/shelly_exporter \ + -metrics-file ${cfg.metrics-file} \ + -listen-address ${cfg.listenAddress}:${toString cfg.port} + ''; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/tuptime.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/tuptime.nix index d97e408bce..97cc375262 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/tuptime.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/tuptime.nix @@ -54,8 +54,8 @@ in { Type = "oneshot"; User = "_tuptime"; RemainAfterExit = true; - ExecStart = "${pkgs.tuptime}/bin/tuptime -x"; - ExecStop = "${pkgs.tuptime}/bin/tuptime -xg"; + ExecStart = "${pkgs.tuptime}/bin/tuptime -q"; + ExecStop = "${pkgs.tuptime}/bin/tuptime -qg"; }; }; @@ -64,7 +64,7 @@ in { serviceConfig = { Type = "oneshot"; User = "_tuptime"; - ExecStart = "${pkgs.tuptime}/bin/tuptime -x"; + ExecStart = "${pkgs.tuptime}/bin/tuptime -q"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/uptime-kuma.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/uptime-kuma.nix index 3dfbfe3652..886e14b5f6 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/uptime-kuma.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/uptime-kuma.nix @@ -7,6 +7,8 @@ let in { + meta.maintainers = [ lib.maintainers.julienmalka ]; + options = { services.uptime-kuma = { enable = mkEnableOption (mdDoc "Uptime Kuma, this assumes a reverse proxy to be set."); @@ -48,7 +50,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; environment = cfg.settings; - path = lib.mkIf cfg.appriseSupport (with pkgs; [ apprise ]); + path = with pkgs; [ unixtools.ping ] ++ lib.optional cfg.appriseSupport apprise; serviceConfig = { Type = "simple"; StateDirectory = "uptime-kuma"; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/kubo.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/kubo.nix index f323853893..82bf29db28 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/kubo.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/kubo.nix @@ -5,6 +5,23 @@ let settingsFormat = pkgs.formats.json {}; + rawDefaultConfig = lib.importJSON (pkgs.runCommand "kubo-default-config" { + nativeBuildInputs = [ cfg.package ]; + } '' + export IPFS_PATH="$TMPDIR" + ipfs init --empty-repo --profile=${profile} + ipfs --offline config show > "$out" + ''); + + # Remove the PeerID (an attribute of "Identity") of the temporary Kubo repo. + # The "Pinning" section contains the "RemoteServices" section, which would prevent + # the daemon from starting as that setting can't be changed via ipfs config replace. + defaultConfig = builtins.removeAttrs rawDefaultConfig [ "Identity" "Pinning" ]; + + customizedConfig = lib.recursiveUpdate defaultConfig cfg.settings; + + configFile = settingsFormat.generate "kubo-config.json" customizedConfig; + kuboFlags = utils.escapeSystemdExecArgs ( optional cfg.autoMount "--mount" ++ optional cfg.enableGC "--enable-gc" ++ @@ -166,9 +183,9 @@ in }; }; description = lib.mdDoc '' - Attrset of daemon configuration to set using {command}`ipfs config`, every time the daemon starts. + Attrset of daemon configuration. See [https://github.com/ipfs/kubo/blob/master/docs/config.md](https://github.com/ipfs/kubo/blob/master/docs/config.md) for reference. - Keep in mind that this configuration is stateful; i.e., unsetting anything in here does not reset the value to the default! + You can't set `Identity` or `Pinning`. ''; default = { }; example = { @@ -216,6 +233,21 @@ in ###### implementation config = mkIf cfg.enable { + assertions = [ + { + assertion = !builtins.hasAttr "Identity" cfg.settings; + message = '' + You can't set services.kubo.settings.Identity because the ``config replace`` subcommand used at startup does not support modifying any of the Identity settings. + ''; + } + { + assertion = !((builtins.hasAttr "Pinning" cfg.settings) && (builtins.hasAttr "RemoteServices" cfg.settings.Pinning)); + message = '' + You can't set services.kubo.settings.Pinning.RemoteServices because the ``config replace`` subcommand used at startup does not work with it. + ''; + } + ]; + environment.systemPackages = [ cfg.package ]; environment.variables.IPFS_PATH = cfg.dataDir; @@ -267,21 +299,26 @@ in preStart = '' if [[ ! -f "$IPFS_PATH/config" ]]; then - ipfs init ${optionalString cfg.emptyRepo "-e"} --profile=${profile} + ipfs init ${optionalString cfg.emptyRepo "-e"} else # After an unclean shutdown this file may exist which will cause the config command to attempt to talk to the daemon. This will hang forever if systemd is holding our sockets open. rm -vf "$IPFS_PATH/api" '' + optionalString cfg.autoMigrate '' ${pkgs.kubo-migrator}/bin/fs-repo-migrations -to '${cfg.package.repoVersion}' -y '' + '' - ipfs --offline config profile apply ${profile} >/dev/null fi - '' + '' - ipfs --offline config show \ - | ${pkgs.jq}/bin/jq '. * $settings' --argjson settings ${ - escapeShellArg (builtins.toJSON cfg.settings) - } \ - | ipfs --offline config replace - + ipfs --offline config show | + ${pkgs.jq}/bin/jq -s '.[0].Pinning as $Pinning | .[0].Identity as $Identity | .[1] + {$Identity,$Pinning}' - '${configFile}' | + + # This command automatically injects the private key and other secrets from + # the old config file back into the new config file. + # Unfortunately, it doesn't keep the original `Identity.PeerID`, + # so we need `ipfs config show` and jq above. + # See https://github.com/ipfs/kubo/issues/8993 for progress on fixing this problem. + # Kubo also wants a specific version of the original "Pinning.RemoteServices" + # section (redacted by `ipfs config show`), such that that section doesn't + # change when the changes are applied. Whyyyyyy..... + ipfs --offline config replace - ''; serviceConfig = { ExecStart = [ "" "${cfg.package}/bin/ipfs daemon ${kuboFlags}" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.nix index 0d987f12a3..6e2ec1ccaa 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.nix @@ -95,5 +95,5 @@ in users.groups.litestream = {}; }; - meta.doc = ./default.xml; + meta.doc = ./default.md; } diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.xml b/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.xml deleted file mode 100644 index 756899fdb8..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - Litestream - - Litestream is a - standalone streaming replication tool for SQLite. - -
- Configuration - - Litestream service is managed by a dedicated user named - litestream which needs permission to the - database file. Here’s an example config which gives required - permissions to access - grafana - database: - - -{ pkgs, ... }: -{ - users.users.litestream.extraGroups = [ "grafana" ]; - - systemd.services.grafana.serviceConfig.ExecStartPost = "+" + pkgs.writeShellScript "grant-grafana-permissions" '' - timeout=10 - - while [ ! -f /var/lib/grafana/data/grafana.db ]; - do - if [ "$timeout" == 0 ]; then - echo "ERROR: Timeout while waiting for /var/lib/grafana/data/grafana.db." - exit 1 - fi - - sleep 1 - - ((timeout--)) - done - - find /var/lib/grafana -type d -exec chmod -v 775 {} \; - find /var/lib/grafana -type f -exec chmod -v 660 {} \; - ''; - - services.litestream = { - enable = true; - - environmentFile = "/run/secrets/litestream"; - - settings = { - dbs = [ - { - path = "/var/lib/grafana/data/grafana.db"; - replicas = [{ - url = "s3://mybkt.litestream.io/grafana"; - }]; - } - ]; - }; - }; -} - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix b/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix index 3933ed5a23..103f73fdaa 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix @@ -47,7 +47,7 @@ in Whether to run the Avahi daemon, which allows Avahi clients to use Avahi's service discovery facilities and also allows the local machine to advertise its presence and services - (through the mDNS responder implemented by `avahi-daemon'). + (through the mDNS responder implemented by `avahi-daemon`). ''; }; @@ -205,7 +205,7 @@ in default = false; description = lib.mdDoc '' Whether to enable the mDNS NSS (Name Service Switch) plug-in. - Enabling it allows applications to resolve names in the `.local' + Enabling it allows applications to resolve names in the `.local` domain by transparently querying the Avahi daemon. ''; }; @@ -275,6 +275,7 @@ in BusName = "org.freedesktop.Avahi"; Type = "dbus"; ExecStart = "${pkgs.avahi}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf}"; + ConfigurationDirectory = "avahi/services"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/blocky.nix b/third_party/nixpkgs/nixos/modules/services/networking/blocky.nix index 9714485456..30a41fa6a4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/blocky.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/blocky.nix @@ -31,6 +31,7 @@ in serviceConfig = { DynamicUser = true; ExecStart = "${pkgs.blocky}/bin/blocky --config ${configFile}"; + Restart = "on-failure"; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix index ac5d45a65e..9a0b29fbe5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix @@ -33,6 +33,13 @@ let (if !config.networking.useDHCP && enableDHCP then map (i: i.name) (filter (i: i.useDHCP == true) interfaces) else null); + staticIPv6Addresses = map (i: i.name) (filter (i: i.ipv6.addresses != [ ]) interfaces); + + noIPv6rs = concatStringsSep "\n" (map (name: '' + interface ${name} + noipv6rs + '') staticIPv6Addresses); + # Config file adapted from the one that ships with dhcpcd. dhcpcdConf = pkgs.writeText "dhcpcd.conf" '' @@ -75,6 +82,8 @@ let ''} ${cfg.extraConfig} + + ${optionalString config.networking.enableIPv6 noIPv6rs} ''; exitHook = pkgs.writeText "dhcpcd.exit-hook" diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix index c26a6ae265..a06b9573a8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix @@ -311,6 +311,6 @@ in meta = { maintainers = with lib.maintainers; [ pennae ]; - doc = ./firefox-syncserver.xml; + doc = ./firefox-syncserver.md; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.xml b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.xml deleted file mode 100644 index 440922cbba..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - Firefox Sync server - - A storage server for Firefox Sync that you can easily host yourself. - -
- Quickstart - - The absolute minimal configuration for the sync server looks like - this: - - -services.mysql.package = pkgs.mariadb; - -services.firefox-syncserver = { - enable = true; - secrets = builtins.toFile "sync-secrets" '' - SYNC_MASTER_SECRET=this-secret-is-actually-leaked-to-/nix/store - ''; - singleNode = { - enable = true; - hostname = "localhost"; - url = "http://localhost:5000"; - }; -}; - - - This will start a sync server that is only accessible locally. - Once the services is running you can navigate to - about:config in your Firefox profile and set - identity.sync.tokenserver.uri to - http://localhost:5000/1.0/sync/1.5. Your - browser will now use your local sync server for data storage. - - - - This configuration should never be used in production. It is not - encrypted and stores its secrets in a world-readable location. - - -
-
- More detailed setup - - The firefox-syncserver service provides a - number of options to make setting up small deployment easier. - These are grouped under the singleNode element - of the option tree and allow simple configuration of the most - important parameters. - - - Single node setup is split into two kinds of options: those that - affect the sync server itself, and those that affect its - surroundings. Options that affect the sync server are - capacity, which configures how many accounts - may be active on this instance, and url, which - holds the URL under which the sync server can be accessed. The - url can be configured automatically when using - nginx. - - - Options that affect the surroundings of the sync server are - enableNginx, enableTLS and - hostnam. If enableNginx is - set the sync server module will automatically add an nginx virtual - host to the system using hostname as the domain - and set url accordingly. If - enableTLS is set the module will also enable - ACME certificates on the new virtual host and force all - connections to be made via TLS. - - - For actual deployment it is also recommended to store the - secrets file in a secure location. - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/networking/gnunet.nix b/third_party/nixpkgs/nixos/modules/services/networking/gnunet.nix index 9d1c9746f7..301fe021b0 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/gnunet.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/gnunet.nix @@ -124,8 +124,8 @@ in type = types.lines; default = ""; description = lib.mdDoc '' - Additional options that will be copied verbatim in `gnunet.conf'. - See `gnunet.conf(5)' for details. + Additional options that will be copied verbatim in `gnunet.conf`. + See {manpage}`gnunet.conf(5)` for details. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix index 5634120255..a4fd2fd7c8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix @@ -671,6 +671,6 @@ in meta = { maintainers = with lib.maintainers; [ pennae ]; - doc = ./mosquitto.xml; + doc = ./mosquitto.md; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.xml b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.xml deleted file mode 100644 index 91934617c5..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - Mosquitto - - Mosquitto is a MQTT broker often used for IoT or home automation - data transport. - -
- Quickstart - - A minimal configuration for Mosquitto is - - -services.mosquitto = { - enable = true; - listeners = [ { - acl = [ "pattern readwrite #" ]; - omitPasswordAuth = true; - settings.allow_anonymous = true; - } ]; -}; - - - This will start a broker on port 1883, listening on all interfaces - of the machine, allowing read/write access to all topics to any - user without password requirements. - - - User authentication can be configured with the - users key of listeners. A config that gives - full read access to a user monitor and - restricted write access to a user service could - look like - - -services.mosquitto = { - enable = true; - listeners = [ { - users = { - monitor = { - acl = [ "read #" ]; - password = "monitor"; - }; - service = { - acl = [ "write service/#" ]; - password = "service"; - }; - }; - } ]; -}; - - - TLS authentication is configured by setting TLS-related options of - the listener: - - -services.mosquitto = { - enable = true; - listeners = [ { - port = 8883; # port change is not required, but helpful to avoid mistakes - # ... - settings = { - cafile = "/path/to/mqtt.ca.pem"; - certfile = "/path/to/mqtt.pem"; - keyfile = "/path/to/mqtt.key"; - }; - } ]; - -
-
- Configuration - - The Mosquitto configuration has four distinct types of settings: - the global settings of the daemon, listeners, plugins, and - bridges. Bridges and listeners are part of the global - configuration, plugins are part of listeners. Users of the broker - are configured as parts of listeners rather than globally, - allowing configurations in which a given user is only allowed to - log in to the broker using specific listeners (eg to configure an - admin user with full access to all topics, but restricted to - localhost). - - - Almost all options of Mosquitto are available for configuration at - their appropriate levels, some as NixOS options written in camel - case, the remainders under settings with their - exact names in the Mosquitto config file. The exceptions are - acl_file (which is always set according to the - acl attributes of a listener and its users) and - per_listener_settings (which is always set to - true). - -
- Password authentication - - Mosquitto can be run in two modes, with a password file or - without. Each listener has its own password file, and different - listeners may use different password files. Password file - generation can be disabled by setting - omitPasswordAuth = true for a listener; in - this case it is necessary to either set - settings.allow_anonymous = true to allow all - logins, or to configure other authentication methods like TLS - client certificates with - settings.use_identity_as_username = true. - - - The default is to generate a password file for each listener - from the users configured to that listener. Users with no - configured password will not be added to the password file and - thus will not be able to use the broker. - -
-
- ACL format - - Every listener has a Mosquitto acl_file - attached to it. This ACL is configured via two attributes of the - config: - - - - - the acl attribute of the listener - configures pattern ACL entries and topic ACL entries for - anonymous users. Each entry must be prefixed with - pattern or topic to - distinguish between these two cases. - - - - - the acl attribute of every user - configures in the listener configured the ACL for that given - user. Only topic ACLs are supported by Mosquitto in this - setting, so no prefix is required or allowed. - - - - - The default ACL for a listener is empty, disallowing all - accesses from all clients. To configure a completely open ACL, - set acl = [ "pattern readwrite #" ] - in the listener. - -
-
- diff --git a/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix b/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix index 54ee2a0156..b20ec76ddf 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix @@ -516,7 +516,6 @@ in { ${optionalString (!isNull defaults) '' defaults { ${indentLines 2 defaults} - multipath_dir ${cfg.package}/lib/multipath } ''} ${optionalString (!isNull blacklist) '' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nat.nix b/third_party/nixpkgs/nixos/modules/services/networking/nat.nix index a6f403b46f..3afe6fe0a9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nat.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nat.nix @@ -124,7 +124,7 @@ in type = types.listOf types.str; default = [ ]; example = literalExpression ''[ "55.1.2.3" ]''; - description = lib.mdDoc "Public IPs for NAT reflection; for connections to `loopbackip:sourcePort' from the host itself and from other hosts behind NAT"; + description = lib.mdDoc "Public IPs for NAT reflection; for connections to `loopbackip:sourcePort` from the host itself and from other hosts behind NAT"; }; }; }); diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nomad.nix b/third_party/nixpkgs/nixos/modules/services/networking/nomad.nix index c6f0624c8c..b1e5119524 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nomad.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nomad.nix @@ -71,6 +71,17 @@ in ''; }; + credentials = mkOption { + description = lib.mdDoc '' + Credentials envs used to configure nomad secrets. + ''; + type = types.attrsOf types.str; + default = { }; + + example = { + logs_remote_write_password = "/run/keys/nomad_write_password"; + }; + }; settings = mkOption { type = format.type; @@ -148,7 +159,8 @@ in }; in "${cfg.package}/bin/nomad agent -config=/etc/nomad.json -plugin-dir=${pluginsDir}/bin" + - concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths; + concatMapStrings (path: " -config=${path}") cfg.extraSettingsPaths + + concatMapStrings (key: " -config=\${CREDENTIALS_DIRECTORY}/${key}") (lib.attrNames cfg.credentials); KillMode = "process"; KillSignal = "SIGINT"; LimitNOFILE = 65536; @@ -157,6 +169,7 @@ in Restart = "on-failure"; RestartSec = 2; TasksMax = "infinity"; + LoadCredential = lib.mapAttrsToList (key: value: "${key}:${value}") cfg.credentials; } (mkIf cfg.enableDocker { SupplementaryGroups = "docker"; # space-separated string diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix index dc180d4a4f..6c8d7b985d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix @@ -185,7 +185,7 @@ in ProtectSystem = "full"; ProtectHome = true; PrivateTmp = true; - PrivateDevices = true; + PrivateDevices = false; PrivateUsers = false; ProtectHostname = true; ProtectClock = false; @@ -203,7 +203,7 @@ in PrivateMounts = true; # System Call Filtering SystemCallArchitectures = "native"; - SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources" "@clock" "@setuid" "capset" "chown" ]; + SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources" "@clock" "@setuid" "capset" "chown" ] ++ lib.optional pkgs.stdenv.hostPlatform.isAarch64 "fchownat"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/openconnect.nix b/third_party/nixpkgs/nixos/modules/services/networking/openconnect.nix index 5a02bd0722..7f9006053b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/openconnect.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/openconnect.nix @@ -90,6 +90,7 @@ let generateConfig = name: icfg: pkgs.writeText "config" '' interface=${name} + ${optionalString (icfg.protocol != null) "protocol=${icfg.protocol}"} ${optionalString (icfg.user != null) "user=${icfg.user}"} ${optionalString (icfg.passwordFile != null) "passwd-on-stdin"} ${optionalString (icfg.certificate != null) diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix b/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix index f317510258..e9db7f3eab 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix @@ -147,5 +147,5 @@ in { }; meta.maintainers = with lib.maintainers; [ ninjatrappeur ]; - meta.doc = ./pleroma.xml; + meta.doc = ./pleroma.md; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pleroma.xml b/third_party/nixpkgs/nixos/modules/services/networking/pleroma.xml deleted file mode 100644 index 97954f4b95..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/pleroma.xml +++ /dev/null @@ -1,244 +0,0 @@ - - - Pleroma - - Pleroma is a - lightweight activity pub server. - -
- Generating the Pleroma config - - The pleroma_ctl CLI utility will prompt you - some questions and it will generate an initial config file. This - is an example of usage - - -$ mkdir tmp-pleroma -$ cd tmp-pleroma -$ nix-shell -p pleroma-otp -$ pleroma_ctl instance gen --output config.exs --output-psql setup.psql - - - The config.exs file can be further customized - following the instructions on the - upstream - documentation. Many refinements can be applied also after - the service is running. - -
-
- Initializing the database - - First, the Postgresql service must be enabled in the NixOS - configuration - - -services.postgresql = { - enable = true; - package = pkgs.postgresql_13; -}; - - - and activated with the usual - - -$ nixos-rebuild switch - - - Then you can create and seed the database, using the - setup.psql file that you generated in the - previous section, by running - - -$ sudo -u postgres psql -f setup.psql - -
-
- Enabling the Pleroma service locally - - In this section we will enable the Pleroma service only locally, - so its configurations can be improved incrementally. - - - This is an example of configuration, where - option contains - the content of the file config.exs, generated - in the - first section, but with the secrets (database password, - endpoint secret key, salts, etc.) removed. Removing secrets is - important, because otherwise they will be stored publicly in the - Nix store. - - -services.pleroma = { - enable = true; - secretConfigFile = "/var/lib/pleroma/secrets.exs"; - configs = [ - '' - import Config - - config :pleroma, Pleroma.Web.Endpoint, - url: [host: "pleroma.example.net", scheme: "https", port: 443], - http: [ip: {127, 0, 0, 1}, port: 4000] - - config :pleroma, :instance, - name: "Test", - email: "admin@example.net", - notify_email: "admin@example.net", - limit: 5000, - registrations_open: true - - config :pleroma, :media_proxy, - enabled: false, - redirect_on_failure: true - - config :pleroma, Pleroma.Repo, - adapter: Ecto.Adapters.Postgres, - username: "pleroma", - database: "pleroma", - hostname: "localhost" - - # Configure web push notifications - config :web_push_encryption, :vapid_details, - subject: "mailto:admin@example.net" - - # ... TO CONTINUE ... - '' - ]; -}; - - - Secrets must be moved into a file pointed by - , in our - case /var/lib/pleroma/secrets.exs. This file - can be created copying the previously generated - config.exs file and then removing all the - settings, except the secrets. This is an example - - -# Pleroma instance passwords - -import Config - -config :pleroma, Pleroma.Web.Endpoint, - secret_key_base: "<the secret generated by pleroma_ctl>", - signing_salt: "<the secret generated by pleroma_ctl>" - -config :pleroma, Pleroma.Repo, - password: "<the secret generated by pleroma_ctl>" - -# Configure web push notifications -config :web_push_encryption, :vapid_details, - public_key: "<the secret generated by pleroma_ctl>", - private_key: "<the secret generated by pleroma_ctl>" - -# ... TO CONTINUE ... - - - Note that the lines of the same configuration group are comma - separated (i.e. all the lines end with a comma, except the last - one), so when the lines with passwords are added or removed, - commas must be adjusted accordingly. - - - The service can be enabled with the usual - - -$ nixos-rebuild switch - - - The service is accessible only from the local - 127.0.0.1:4000 port. It can be tested using a - port forwarding like this - - -$ ssh -L 4000:localhost:4000 myuser@example.net - - - and then accessing - http://localhost:4000 - from a web browser. - -
-
- Creating the admin user - - After Pleroma service is running, all - Pleroma - administration utilities can be used. In particular an - admin user can be created with - - -$ pleroma_ctl user new <nickname> <email> --admin --moderator --password <password> - -
-
- Configuring Nginx - - In this configuration, Pleroma is listening only on the local port - 4000. Nginx can be configured as a Reverse Proxy, for forwarding - requests from public ports to the Pleroma service. This is an - example of configuration, using - Let’s Encrypt - for the TLS certificates - - -security.acme = { - email = "root@example.net"; - acceptTerms = true; -}; - -services.nginx = { - enable = true; - addSSL = true; - - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; - - recommendedProxySettings = false; - # NOTE: if enabled, the NixOS proxy optimizations will override the Pleroma - # specific settings, and they will enter in conflict. - - virtualHosts = { - "pleroma.example.net" = { - http2 = true; - enableACME = true; - forceSSL = true; - - locations."/" = { - proxyPass = "http://127.0.0.1:4000"; - - extraConfig = '' - etag on; - gzip on; - - add_header 'Access-Control-Allow-Origin' '*' always; - add_header 'Access-Control-Allow-Methods' 'POST, PUT, DELETE, GET, PATCH, OPTIONS' always; - add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, Idempotency-Key' always; - add_header 'Access-Control-Expose-Headers' 'Link, X-RateLimit-Reset, X-RateLimit-Limit, X-RateLimit-Remaining, X-Request-Id' always; - if ($request_method = OPTIONS) { - return 204; - } - add_header X-XSS-Protection "1; mode=block"; - add_header X-Permitted-Cross-Domain-Policies none; - add_header X-Frame-Options DENY; - add_header X-Content-Type-Options nosniff; - add_header Referrer-Policy same-origin; - add_header X-Download-Options noopen; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - - client_max_body_size 16m; - # NOTE: increase if users need to upload very big files - ''; - }; - }; - }; -}; - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix b/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix index 0746bbf184..9f68853f9f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix @@ -905,5 +905,5 @@ in }; - meta.doc = ./prosody.xml; + meta.doc = ./prosody.md; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/prosody.xml b/third_party/nixpkgs/nixos/modules/services/networking/prosody.xml deleted file mode 100644 index 5df046f814..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/prosody.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - Prosody - - Prosody is an - open-source, modern XMPP server. - -
- Basic usage - - A common struggle for most XMPP newcomers is to find the right set - of XMPP Extensions (XEPs) to setup. Forget to activate a few of - those and your XMPP experience might turn into a nightmare! - - - The XMPP community tackles this problem by creating a meta-XEP - listing a decent set of XEPs you should implement. This meta-XEP - is issued every year, the 2020 edition being - XEP-0423. - - - The NixOS Prosody module will implement most of these recommendend - XEPs out of the box. That being said, two components still require - some manual configuration: the - Multi - User Chat (MUC) and the - HTTP - File Upload ones. You’ll need to create a DNS subdomain for - each of those. The current convention is to name your MUC endpoint - conference.example.org and your HTTP upload - domain upload.example.org. - - - A good configuration to start with, including a - Multi - User Chat (MUC) endpoint as well as a - HTTP - File Upload endpoint will look like this: - - -services.prosody = { - enable = true; - admins = [ "root@example.org" ]; - ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; - ssl.key = "/var/lib/acme/example.org/key.pem"; - virtualHosts."example.org" = { - enabled = true; - domain = "example.org"; - ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; - ssl.key = "/var/lib/acme/example.org/key.pem"; - }; - muc = [ { - domain = "conference.example.org"; - } ]; - uploadHttp = { - domain = "upload.example.org"; - }; -}; - -
-
- Let’s Encrypt Configuration - - As you can see in the code snippet from the - previous - section, you’ll need a single TLS certificate covering your - main endpoint, the MUC one as well as the HTTP Upload one. We can - generate such a certificate by leveraging the ACME - extraDomainNames - module option. - - - Provided the setup detailed in the previous section, you’ll need - the following acme configuration to generate a TLS certificate for - the three endponits: - - -security.acme = { - email = "root@example.org"; - acceptTerms = true; - certs = { - "example.org" = { - webroot = "/var/www/example.org"; - email = "root@example.org"; - extraDomainNames = [ "conference.example.org" "upload.example.org" ]; - }; - }; -}; - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/networking/redsocks.nix b/third_party/nixpkgs/nixos/modules/services/networking/redsocks.nix index 45feb1313c..30d6a0a633 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/redsocks.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/redsocks.nix @@ -37,7 +37,7 @@ in - stderr - file:/path/to/file - syslog:FACILITY where FACILITY is any of "daemon", "local0", - etc. + etc. ''; }; @@ -125,6 +125,7 @@ in lib.mdDoc '' Way to disclose client IP to the proxy. - "false": do not disclose + http-connect supports the following ways: - "X-Forwarded-For": add header "X-Forwarded-For: IP" - "Forwarded_ip": add header "Forwarded: for=IP" (see RFC7239) diff --git a/third_party/nixpkgs/nixos/modules/services/networking/rpcbind.nix b/third_party/nixpkgs/nixos/modules/services/networking/rpcbind.nix index 60e78dfec5..63c4859fbd 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/rpcbind.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/rpcbind.nix @@ -14,7 +14,7 @@ with lib; type = types.bool; default = false; description = lib.mdDoc '' - Whether to enable `rpcbind', an ONC RPC directory service + Whether to enable `rpcbind`, an ONC RPC directory service notably used by NFS and NIS, and which can be queried using the rpcinfo(1) command. `rpcbind` is a replacement for `portmap`. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix index 41c4ec2d29..7932bac9ca 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix @@ -40,7 +40,7 @@ in type = types.listOf types.str; description = lib.mdDoc '' List of network interfaces where listening for connections. - When providing the empty list, `[]', lshd listens on all + When providing the empty list, `[]`, lshd listens on all network interfaces. ''; example = [ "localhost" "1.2.3.4:443" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tmate-ssh-server.nix b/third_party/nixpkgs/nixos/modules/services/networking/tmate-ssh-server.nix index f7740b1ddf..ff4ce07733 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tmate-ssh-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tmate-ssh-server.nix @@ -28,7 +28,7 @@ in host = mkOption { type = types.str; description = mdDoc "External host name"; - defaultText = lib.literalExpression "config.networking.domain or config.networking.hostName "; + defaultText = lib.literalExpression "config.networking.domain or config.networking.hostName"; default = if domain == null then config.networking.hostName diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix index 119575bddd..0595e9e6df 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix @@ -121,11 +121,15 @@ let ''} # substitute environment variables - ${pkgs.gawk}/bin/awk '{ - for(varname in ENVIRON) - gsub("@"varname"@", ENVIRON[varname]) - print - }' "${configFile}" > "${finalConfig}" + if [ -f "${configFile}" ]; then + ${pkgs.gawk}/bin/awk '{ + for(varname in ENVIRON) + gsub("@"varname"@", ENVIRON[varname]) + print + }' "${configFile}" > "${finalConfig}" + else + touch "${finalConfig}" + fi iface_args="-s ${optionalString cfg.dbusControlled "-u"} -D${cfg.driver} ${configStr}" diff --git a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix index 3d5cbdd2dc..fd7193154c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix @@ -193,7 +193,7 @@ in { environment.systemPackages = [ cfg.package ]; }); meta = { - doc = ./yggdrasil.xml; + doc = ./yggdrasil.md; maintainers = with lib.maintainers; [ gazally ehmry ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.xml b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.xml deleted file mode 100644 index 39faacbf30..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - Yggdrasil - - Source: - modules/services/networking/yggdrasil/default.nix - - - Upstream documentation: - https://yggdrasil-network.github.io/ - - - Yggdrasil is an early-stage implementation of a fully end-to-end - encrypted, self-arranging IPv6 network. - -
- Configuration -
- Simple ephemeral node - - An annotated example of a simple configuration: - - -{ - services.yggdrasil = { - enable = true; - persistentKeys = false; - # The NixOS module will generate new keys and a new IPv6 address each time - # it is started if persistentKeys is not enabled. - - settings = { - Peers = [ - # Yggdrasil will automatically connect and "peer" with other nodes it - # discovers via link-local multicast announcements. Unless this is the - # case (it probably isn't) a node needs peers within the existing - # network that it can tunnel to. - "tcp://1.2.3.4:1024" - "tcp://1.2.3.5:1024" - # Public peers can be found at - # https://github.com/yggdrasil-network/public-peers - ]; - }; - }; -} - -
-
- Persistent node with prefix - - A node with a fixed address that announces a prefix: - - -let - address = "210:5217:69c0:9afc:1b95:b9f:8718:c3d2"; - prefix = "310:5217:69c0:9afc"; - # taken from the output of "yggdrasilctl getself". -in { - - services.yggdrasil = { - enable = true; - persistentKeys = true; # Maintain a fixed public key and IPv6 address. - settings = { - Peers = [ "tcp://1.2.3.4:1024" "tcp://1.2.3.5:1024" ]; - NodeInfo = { - # This information is visible to the network. - name = config.networking.hostName; - location = "The North Pole"; - }; - }; - }; - - boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; - # Forward traffic under the prefix. - - networking.interfaces.${eth0}.ipv6.addresses = [{ - # Set a 300::/8 address on the local physical device. - address = prefix + "::1"; - prefixLength = 64; - }]; - - services.radvd = { - # Announce the 300::/8 prefix to eth0. - enable = true; - config = '' - interface eth0 - { - AdvSendAdvert on; - prefix ${prefix}::/64 { - AdvOnLink on; - AdvAutonomous on; - }; - route 200::/8 {}; - }; - ''; - }; -} - -
-
- Yggdrasil attached Container - - A NixOS container attached to the Yggdrasil network via a node - running on the host: - - -let - yggPrefix64 = "310:5217:69c0:9afc"; - # Again, taken from the output of "yggdrasilctl getself". -in -{ - boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; - # Enable IPv6 forwarding. - - networking = { - bridges.br0.interfaces = [ ]; - # A bridge only to containers… - - interfaces.br0 = { - # … configured with a prefix address. - ipv6.addresses = [{ - address = "${yggPrefix64}::1"; - prefixLength = 64; - }]; - }; - }; - - containers.foo = { - autoStart = true; - privateNetwork = true; - hostBridge = "br0"; - # Attach the container to the bridge only. - config = { config, pkgs, ... }: { - networking.interfaces.eth0.ipv6 = { - addresses = [{ - # Configure a prefix address. - address = "${yggPrefix64}::2"; - prefixLength = 64; - }]; - routes = [{ - # Configure the prefix route. - address = "200::"; - prefixLength = 7; - via = "${yggPrefix64}::1"; - }]; - }; - - services.httpd.enable = true; - networking.firewall.allowedTCPPorts = [ 80 ]; - }; - }; - -} - -
-
- diff --git a/third_party/nixpkgs/nixos/modules/services/search/meilisearch.nix b/third_party/nixpkgs/nixos/modules/services/search/meilisearch.nix index 9b727b76b1..73567ca0bc 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/meilisearch.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/meilisearch.nix @@ -9,7 +9,7 @@ in { meta.maintainers = with maintainers; [ Br1ght0ne happysalada ]; - meta.doc = ./meilisearch.xml; + meta.doc = ./meilisearch.md; ###### interface diff --git a/third_party/nixpkgs/nixos/modules/services/search/meilisearch.xml b/third_party/nixpkgs/nixos/modules/services/search/meilisearch.xml deleted file mode 100644 index 8bfd64920b..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/search/meilisearch.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - Meilisearch - - Meilisearch is a lightweight, fast and powerful search engine. Think - elastic search with a much smaller footprint. - -
- Quickstart - - the minimum to start meilisearch is - - -services.meilisearch.enable = true; - - - this will start the http server included with meilisearch on port - 7700. - - - test with - curl -X GET 'http://localhost:7700/health' - -
-
- Usage - - you first need to add documents to an index before you can search - for documents. - -
- Add a documents to the <literal>movies</literal> - index - - curl -X POST 'http://127.0.0.1:7700/indexes/movies/documents' --data '[{"id": "123", "title": "Superman"}, {"id": 234, "title": "Batman"}]' - -
-
- Search documents in the <literal>movies</literal> - index - - curl 'http://127.0.0.1:7700/indexes/movies/search' --data '{ "q": "botman" }' - (note the typo is intentional and there to demonstrate the typo - tolerant capabilities) - -
-
-
- Defaults - - - - The default nixos package doesn’t come with the - dashboard, - since the dashboard features makes some assets downloads at - compile time. - - - - - Anonimized Analytics sent to meilisearch are disabled by - default. - - - - - Default deployment is development mode. It doesn’t require a - secret master key. All routes are not protected and - accessible. - - - -
-
- Missing - - - - the snapshot feature is not yet configurable from the module, - it’s just a matter of adding the relevant environment - variables. - - - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix index 6207f9dae9..3c4bcd1ac2 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix @@ -86,7 +86,7 @@ in banaction = mkOption { default = if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport"; - defaultText = literalExpression '' if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport" ''; + defaultText = literalExpression ''if config.networking.nftables.enable then "nftables-multiport" else "iptables-multiport"''; type = types.str; description = lib.mdDoc '' Default banning action (e.g. iptables, iptables-new, iptables-multiport, @@ -98,7 +98,7 @@ in banaction-allports = mkOption { default = if config.networking.nftables.enable then "nftables-allport" else "iptables-allport"; - defaultText = literalExpression '' if config.networking.nftables.enable then "nftables-allport" else "iptables-allport" ''; + defaultText = literalExpression ''if config.networking.nftables.enable then "nftables-allport" else "iptables-allport"''; type = types.str; description = lib.mdDoc '' Default banning action (e.g. iptables, iptables-new, iptables-multiport, diff --git a/third_party/nixpkgs/nixos/modules/services/system/nscd.nix b/third_party/nixpkgs/nixos/modules/services/system/nscd.nix index fdc5190d08..971dffbadc 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/nscd.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/nscd.nix @@ -29,10 +29,11 @@ in enableNsncd = mkOption { type = types.bool; - default = false; + default = true; description = lib.mdDoc '' - Whether to use nsncd instead of nscd. + Whether to use nsncd instead of nscd from glibc. This is a nscd-compatible daemon, that proxies lookups, without any caching. + Using nscd from glibc is discouraged. ''; }; @@ -55,7 +56,10 @@ in config = mkOption { type = types.lines; default = builtins.readFile ./nscd.conf; - description = lib.mdDoc "Configuration to use for Name Service Cache Daemon."; + description = lib.mdDoc '' + Configuration to use for Name Service Cache Daemon. + Only used in case glibc-nscd is used. + ''; }; package = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/magnetico.nix b/third_party/nixpkgs/nixos/modules/services/torrent/magnetico.nix index b813f12051..dc6b4e9aa7 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/magnetico.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/magnetico.nix @@ -144,7 +144,7 @@ in { interface. If unset no authentication will be required. The file must contain user names and password hashes in the format - `username:hash `, one for each line. Usernames must + `username:hash`, one for each line. Usernames must start with a lowecase ([a-z]) ASCII character, might contain non-consecutive underscores except at the end, and consists of small-case a-z characters and digits 0-9. diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix b/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix index 627439e107..64cda7fb67 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix @@ -19,6 +19,15 @@ in { ''; }; + dataPermissions = mkOption { + type = types.str; + default = "0750"; + example = "0755"; + description = lib.mdDoc '' + Unix Permissions in octal on the rtorrent directory. + ''; + }; + downloadDir = mkOption { type = types.str; default = "${cfg.dataDir}/download"; @@ -205,7 +214,7 @@ in { }; }; - tmpfiles.rules = [ "d '${cfg.dataDir}' 0750 ${cfg.user} ${cfg.group} -" ]; + tmpfiles.rules = [ "d '${cfg.dataDir}' ${cfg.dataPermissions} ${cfg.user} ${cfg.group} -" ]; }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix index 47ba53e422..fc482ff32d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix @@ -1082,5 +1082,5 @@ in { }; meta.maintainers = with maintainers; [ mvs ]; - meta.doc = ./akkoma.xml; + meta.doc = ./akkoma.md; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.xml deleted file mode 100644 index 49cbcc911e..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.xml +++ /dev/null @@ -1,398 +0,0 @@ - - - Akkoma - - Akkoma is a - lightweight ActivityPub microblogging server forked from Pleroma. - -
- Service configuration - - The Elixir configuration file required by Akkoma is generated - automatically from - . - Secrets must be included from external files outside of the Nix - store by setting the configuration option to an attribute set - containing the attribute – a string - pointing to the file containing the actual value of the option. - - - For the mandatory configuration settings these secrets will be - generated automatically if the referenced file does not exist - during startup, unless disabled through - . - - - The following configuration binds Akkoma to the Unix socket - /run/akkoma/socket, expecting to be run behind - a HTTP proxy on fediverse.example.com. - - -services.akkoma.enable = true; -services.akkoma.config = { - ":pleroma" = { - ":instance" = { - name = "My Akkoma instance"; - description = "More detailed description"; - email = "admin@example.com"; - registration_open = false; - }; - - "Pleroma.Web.Endpoint" = { - url.host = "fediverse.example.com"; - }; - }; -}; - - - Please refer to the - configuration - cheat sheet for additional configuration options. - -
-
- User management - - After the Akkoma service is running, the administration utility - can be used to - manage - users. In particular an administrative user can be created - with - - -$ pleroma_ctl user new <nickname> <email> --admin --moderator --password <password> - -
-
- Proxy configuration - - Although it is possible to expose Akkoma directly, it is common - practice to operate it behind an HTTP reverse proxy such as nginx. - - -services.akkoma.nginx = { - enableACME = true; - forceSSL = true; -}; - -services.nginx = { - enable = true; - - clientMaxBodySize = "16m"; - recommendedTlsSettings = true; - recommendedOptimisation = true; - recommendedGzipSettings = true; -}; - - - Please refer to for - details on how to provision an SSL/TLS certificate. - -
- Media proxy - - Without the media proxy function, Akkoma does not store any - remote media like pictures or video locally, and clients have to - fetch them directly from the source server. - - -# Enable nginx slice module distributed with Tengine -services.nginx.package = pkgs.tengine; - -# Enable media proxy -services.akkoma.config.":pleroma".":media_proxy" = { - enabled = true; - proxy_opts.redirect_on_failure = true; -}; - -# Adjust the persistent cache size as needed: -# Assuming an average object size of 128 KiB, around 1 MiB -# of memory is required for the key zone per GiB of cache. -# Ensure that the cache directory exists and is writable by nginx. -services.nginx.commonHttpConfig = '' - proxy_cache_path /var/cache/nginx/cache/akkoma-media-cache - levels= keys_zone=akkoma_media_cache:16m max_size=16g - inactive=1y use_temp_path=off; -''; - -services.akkoma.nginx = { - locations."/proxy" = { - proxyPass = "http://unix:/run/akkoma/socket"; - - extraConfig = '' - proxy_cache akkoma_media_cache; - - # Cache objects in slices of 1 MiB - slice 1m; - proxy_cache_key $host$uri$is_args$args$slice_range; - proxy_set_header Range $slice_range; - - # Decouple proxy and upstream responses - proxy_buffering on; - proxy_cache_lock on; - proxy_ignore_client_abort on; - - # Default cache times for various responses - proxy_cache_valid 200 1y; - proxy_cache_valid 206 301 304 1h; - - # Allow serving of stale items - proxy_cache_use_stale error timeout invalid_header updating; - ''; - }; -}; - -
- Prefetch remote media - - The following example enables the - MediaProxyWarmingPolicy MRF policy which - automatically fetches all media associated with a post through - the media proxy, as soon as the post is received by the - instance. - - -services.akkoma.config.":pleroma".":mrf".policies = - map (pkgs.formats.elixirConf { }).lib.mkRaw [ - "Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy" -]; - -
-
- Media previews - - Akkoma can generate previews for media. - - -services.akkoma.config.":pleroma".":media_preview_proxy" = { - enabled = true; - thumbnail_max_width = 1920; - thumbnail_max_height = 1080; -}; - -
-
-
-
- Frontend management - - Akkoma will be deployed with the pleroma-fe and - admin-fe frontends by default. These can be - modified by setting - . - - - The following example overrides the primary frontend’s default - configuration using a custom derivation. - - -services.akkoma.frontends.primary.package = pkgs.runCommand "pleroma-fe" { - config = builtins.toJSON { - expertLevel = 1; - collapseMessageWithSubject = false; - stopGifs = false; - replyVisibility = "following"; - webPushHideIfCW = true; - hideScopeNotice = true; - renderMisskeyMarkdown = false; - hideSiteFavicon = true; - postContentType = "text/markdown"; - showNavShortcuts = false; - }; - nativeBuildInputs = with pkgs; [ jq xorg.lndir ]; - passAsFile = [ "config" ]; -} '' - mkdir $out - lndir ${pkgs.akkoma-frontends.pleroma-fe} $out - - rm $out/static/config.json - jq -s add ${pkgs.akkoma-frontends.pleroma-fe}/static/config.json ${config} \ - >$out/static/config.json -''; - -
-
- Federation policies - - Akkoma comes with a number of modules to police federation with - other ActivityPub instances. The most valuable for typical users - is the - :mrf_simple - module which allows limiting federation based on instance - hostnames. - - - This configuration snippet provides an example on how these can be - used. Choosing an adequate federation policy is not trivial and - entails finding a balance between connectivity to the rest of the - fediverse and providing a pleasant experience to the users of an - instance. - - -services.akkoma.config.":pleroma" = with (pkgs.formats.elixirConf { }).lib; { - ":mrf".policies = map mkRaw [ - "Pleroma.Web.ActivityPub.MRF.SimplePolicy" - ]; - - ":mrf_simple" = { - # Tag all media as sensitive - media_nsfw = mkMap { - "nsfw.weird.kinky" = "Untagged NSFW content"; - }; - - # Reject all activities except deletes - reject = mkMap { - "kiwifarms.cc" = "Persistent harassment of users, no moderation"; - }; - - # Force posts to be visible by followers only - followers_only = mkMap { - "beta.birdsite.live" = "Avoid polluting timelines with Twitter posts"; - }; - }; -}; - -
-
- Upload filters - - This example strips GPS and location metadata from uploads, - deduplicates them and anonymises the the file name. - - -services.akkoma.config.":pleroma"."Pleroma.Upload".filters = - map (pkgs.formats.elixirConf { }).lib.mkRaw [ - "Pleroma.Upload.Filter.Exiftool" - "Pleroma.Upload.Filter.Dedupe" - "Pleroma.Upload.Filter.AnonymizeFilename" - ]; - -
-
- Migration from Pleroma - - Pleroma instances can be migrated to Akkoma either by copying the - database and upload data or by pointing Akkoma to the existing - data. The necessary database migrations are run automatically - during startup of the service. - - - The configuration has to be copy‐edited manually. - - - Depending on the size of the database, the initial migration may - take a long time and exceed the startup timeout of the system - manager. To work around this issue one may adjust the startup - timeout - - or simply run the migrations manually: - - -pleroma_ctl migrate - -
- Copying data - - Copying the Pleroma data instead of re‐using it in place may - permit easier reversion to Pleroma, but allows the two data sets - to diverge. - - - First disable Pleroma and then copy its database and upload - data: - - -# Create a copy of the database -nix-shell -p postgresql --run 'createdb -T pleroma akkoma' - -# Copy upload data -mkdir /var/lib/akkoma -cp -R --reflink=auto /var/lib/pleroma/uploads /var/lib/akkoma/ - - - After the data has been copied, enable the Akkoma service and - verify that the migration has been successful. If no longer - required, the original data may then be deleted: - - -# Delete original database -nix-shell -p postgresql --run 'dropdb pleroma' - -# Delete original Pleroma state -rm -r /var/lib/pleroma - -
-
- Re‐using data - - To re‐use the Pleroma data in place, disable Pleroma and enable - Akkoma, pointing it to the Pleroma database and upload - directory. - - -# Adjust these settings according to the database name and upload directory path used by Pleroma -services.akkoma.config.":pleroma"."Pleroma.Repo".database = "pleroma"; -services.akkoma.config.":pleroma".":instance".upload_dir = "/var/lib/pleroma/uploads"; - - - Please keep in mind that after the Akkoma service has been - started, any migrations applied by Akkoma have to be rolled back - before the database can be used again with Pleroma. This can be - achieved through pleroma_ctl ecto.rollback. - Refer to the - Ecto - SQL documentation for details. - -
-
-
- Advanced deployment options -
- Confinement - - The Akkoma systemd service may be confined to a chroot with - - -services.systemd.akkoma.confinement.enable = true; - - - Confinement of services is not generally supported in NixOS and - therefore disabled by default. Depending on the Akkoma - configuration, the default confinement settings may be - insufficient and lead to subtle errors at run time, requiring - adjustment: - - - Use - - to make packages available in the chroot. - - - - and - - permit access to outside paths through bind mounts. Refer to - systemd.exec5 - for details. - -
-
- Distributed deployment - - Being an Elixir application, Akkoma can be deployed in a - distributed fashion. - - - This requires setting - - and - . - The specifics depend strongly on the deployment environment. For - more information please check the relevant - Erlang - documentation. - -
-
- diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix new file mode 100644 index 0000000000..ffd1085bde --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix @@ -0,0 +1,502 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.cloudlog; + dbFile = let + password = if cfg.database.createLocally + then "''" + else "trim(file_get_contents('${cfg.database.passwordFile}'))"; + in pkgs.writeText "database.php" '' + "", + 'hostname' => '${cfg.database.host}', + 'username' => '${cfg.database.user}', + 'password' => ${password}, + 'database' => '${cfg.database.name}', + 'dbdriver' => 'mysqli', + 'dbprefix' => "", + 'pconnect' => TRUE, + 'db_debug' => (ENVIRONMENT !== 'production'), + 'cache_on' => FALSE, + 'cachedir' => "", + 'char_set' => 'utf8mb4', + 'dbcollat' => 'utf8mb4_general_ci', + 'swap_pre' => "", + 'encrypt' => FALSE, + 'compress' => FALSE, + 'stricton' => FALSE, + 'failover' => array(), + 'save_queries' => TRUE + ); + ''; + configFile = pkgs.writeText "config.php" '' + ${strings.fileContents "${pkgs.cloudlog}/install/config/config.php"} + $config['datadir'] = "${cfg.dataDir}/"; + $config['base_url'] = "${cfg.baseUrl}"; + ${cfg.extraConfig} + ''; + package = pkgs.stdenv.mkDerivation rec { + pname = "cloudlog"; + version = src.version; + src = pkgs.cloudlog; + installPhase = '' + mkdir -p $out + cp -r * $out/ + + ln -s ${configFile} $out/application/config/config.php + ln -s ${dbFile} $out/application/config/database.php + + # link writable directories + for directory in updates uploads backup logbook; do + rm -rf $out/$directory + ln -s ${cfg.dataDir}/$directory $out/$directory + done + + # link writable asset files + for asset in dok sota wwff; do + rm -rf $out/assets/json/$asset.txt + ln -s ${cfg.dataDir}/assets/json/$asset.txt $out/assets/json/$asset.txt + done + ''; + }; +in +{ + options.services.cloudlog = with types; { + enable = mkEnableOption (mdDoc "Whether to enable Cloudlog."); + dataDir = mkOption { + type = str; + default = "/var/lib/cloudlog"; + description = mdDoc "Cloudlog data directory."; + }; + baseUrl = mkOption { + type = str; + default = "http://localhost"; + description = mdDoc "Cloudlog base URL"; + }; + user = mkOption { + type = str; + default = "cloudlog"; + description = mdDoc "User account under which Cloudlog runs."; + }; + database = { + createLocally = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc "Create the database and database user locally."; + }; + host = mkOption { + type = str; + description = mdDoc "MySQL database host"; + default = "localhost"; + }; + name = mkOption { + type = str; + description = mdDoc "MySQL database name."; + default = "cloudlog"; + }; + user = mkOption { + type = str; + description = mdDoc "MySQL user name."; + default = "cloudlog"; + }; + passwordFile = mkOption { + type = nullOr str; + description = mdDoc "MySQL user password file."; + default = null; + }; + }; + poolConfig = mkOption { + type = attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + }; + description = mdDoc '' + Options for Cloudlog's PHP-FPM pool. + ''; + }; + virtualHost = mkOption { + type = nullOr str; + default = "localhost"; + description = mdDoc '' + Name of the nginx virtualhost to use and setup. If null, do not setup + any virtualhost. + ''; + }; + extraConfig = mkOption { + description = mdDoc '' + Any additional text to be appended to the config.php + configuration file. This is a PHP script. For configuration + settings, see . + ''; + default = ""; + type = str; + example = '' + $config['show_time'] = TRUE; + ''; + }; + upload-lotw = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically upload logs to LoTW. If enabled, a systemd + timer will run the log upload task as specified by the interval + option. + ''; + }; + interval = mkOption { + type = str; + default = "daily"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the + time at which the LoTW upload will occur. + ''; + }; + }; + upload-clublog = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically upload logs to Clublog. If enabled, a systemd + timer will run the log upload task as specified by the interval option. + ''; + }; + interval = mkOption { + type = str; + default = "daily"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the time + at which the Clublog upload will occur. + ''; + }; + }; + update-lotw-users = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the list of LoTW users. If enabled, a + systemd timer will run the update task as specified by the interval + option. + ''; + }; + interval = mkOption { + type = str; + default = "weekly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the + time at which the LoTW user update will occur. + ''; + }; + }; + update-dok = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the DOK resource file. If enabled, a + systemd timer will run the update task as specified by the interval option. + ''; + }; + interval = mkOption { + type = str; + default = "monthly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the + time at which the DOK update will occur. + ''; + }; + }; + update-clublog-scp = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the Clublog SCP database. If enabled, + a systemd timer will run the update task as specified by the interval + option. + ''; + }; + interval = mkOption { + type = str; + default = "monthly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the time + at which the Clublog SCP update will occur. + ''; + }; + }; + update-wwff = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the WWFF database. If enabled, a + systemd timer will run the update task as specified by the interval + option. + ''; + }; + interval = mkOption { + type = str; + default = "monthly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the time + at which the WWFF update will occur. + ''; + }; + }; + upload-qrz = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically upload logs to QRZ. If enabled, a systemd + timer will run the update task as specified by the interval option. + ''; + }; + interval = mkOption { + type = str; + default = "daily"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the + time at which the QRZ upload will occur. + ''; + }; + }; + update-sota = { + enable = mkOption { + type = bool; + default = true; + description = mdDoc '' + Whether to periodically update the SOTA database. If enabled, a + systemd timer will run the update task as specified by the interval option. + ''; + }; + interval = mkOption { + type = str; + default = "monthly"; + description = mdDoc '' + Specification (in the format described by systemd.time(7)) of the time + at which the SOTA update will occur. + ''; + }; + }; + }; + config = mkIf cfg.enable { + + assertions = [ + { + assertion = cfg.database.createLocally -> cfg.database.passwordFile == null; + message = "services.cloudlog.database.passwordFile cannot be specified if services.cloudlog.database.createLocally is set to true."; + } + ]; + + services.phpfpm = { + pools.cloudlog = { + inherit (cfg) user; + group = config.services.nginx.group; + settings = { + "listen.owner" = config.services.nginx.user; + "listen.group" = config.services.nginx.group; + } // cfg.poolConfig; + }; + }; + + services.nginx = mkIf (cfg.virtualHost != null) { + enable = true; + virtualHosts = { + "${cfg.virtualHost}" = { + root = "${package}"; + locations."/".tryFiles = "$uri /index.php$is_args$args"; + locations."~ ^/index.php(/|$)".extraConfig = '' + include ${config.services.nginx.package}/conf/fastcgi_params; + include ${pkgs.nginx}/conf/fastcgi.conf; + fastcgi_split_path_info ^(.+\.php)(.+)$; + fastcgi_pass unix:${config.services.phpfpm.pools.cloudlog.socket}; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + ''; + }; + }; + }; + + services.mysql = mkIf cfg.database.createLocally { + enable = true; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [{ + name = cfg.database.user; + ensurePermissions = { + "${cfg.database.name}.*" = "ALL PRIVILEGES"; + }; + }]; + }; + + systemd = { + services = { + cloudlog-setup-database = mkIf cfg.database.createLocally { + description = "Set up cloudlog database"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + wantedBy = [ "phpfpm-cloudlog.service" ]; + after = [ "mysql.service" ]; + script = let + mysql = "${config.services.mysql.package}/bin/mysql"; + in '' + if [ ! -f ${cfg.dataDir}/.dbexists ]; then + ${mysql} ${cfg.database.name} < ${pkgs.cloudlog}/install/assets/install.sql + touch ${cfg.dataDir}/.dbexists + fi + ''; + }; + cloudlog-upload-lotw = { + description = "Upload QSOs to LoTW if certs have been provided"; + enable = cfg.upload-lotw.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/lotw/lotw_upload"; + }; + cloudlog-update-lotw-users = { + description = "Update LOTW Users Database"; + enable = cfg.update-lotw-users.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/lotw/load_users"; + }; + cloudlog-update-dok = { + description = "Update DOK File for autocomplete"; + enable = cfg.update-dok.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_dok"; + }; + cloudlog-update-clublog-scp = { + description = "Update Clublog SCP Database File"; + enable = cfg.update-clublog-scp.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_clublog_scp"; + }; + cloudlog-update-wwff = { + description = "Update WWFF File for autocomplete"; + enable = cfg.update-wwff.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_wwff"; + }; + cloudlog-upload-qrz = { + description = "Upload QSOs to QRZ Logbook"; + enable = cfg.upload-qrz.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/qrz/upload"; + }; + cloudlog-update-sota = { + description = "Update SOTA File for autocomplete"; + enable = cfg.update-sota.enable; + script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_sota"; + }; + }; + timers = { + cloudlog-upload-lotw = { + enable = cfg.upload-lotw.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-upload-lotw.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.upload-lotw.interval; + Persistent = true; + }; + }; + cloudlog-upload-clublog = { + enable = cfg.upload-clublog.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-upload-clublog.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.upload-clublog.interval; + Persistent = true; + }; + }; + cloudlog-update-lotw-users = { + enable = cfg.update-lotw-users.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-lotw-users.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-lotw-users.interval; + Persistent = true; + }; + }; + cloudlog-update-dok = { + enable = cfg.update-dok.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-dok.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-dok.interval; + Persistent = true; + }; + }; + cloudlog-update-clublog-scp = { + enable = cfg.update-clublog-scp.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-clublog-scp.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-clublog-scp.interval; + Persistent = true; + }; + }; + cloudlog-update-wwff = { + enable = cfg.update-wwff.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-wwff.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-wwff.interval; + Persistent = true; + }; + }; + cloudlog-upload-qrz = { + enable = cfg.upload-qrz.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-upload-qrz.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.upload-qrz.interval; + Persistent = true; + }; + }; + cloudlog-update-sota = { + enable = cfg.update-sota.enable; + wantedBy = [ "timers.target" ]; + partOf = [ "cloudlog-update-sota.service" ]; + after = [ "phpfpm-cloudlog.service" ]; + timerConfig = { + OnCalendar = cfg.update-sota.interval; + Persistent = true; + }; + }; + }; + tmpfiles.rules = let + group = config.services.nginx.group; + in [ + "d ${cfg.dataDir} 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/updates 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/uploads 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/backup 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/logbook 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/assets/json 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/assets/qslcard 0750 ${cfg.user} ${group} - -" + ]; + }; + + users.users."${cfg.user}" = { + isSystemUser = true; + group = config.services.nginx.group; + }; + }; + + meta.maintainers = with maintainers; [ melling ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix index b8104ade46..5565a4f45d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix @@ -1080,6 +1080,6 @@ in ]; }; - meta.doc = ./discourse.xml; + meta.doc = ./discourse.md; meta.maintainers = [ lib.maintainers.talyz ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.xml deleted file mode 100644 index a5e8b3656b..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.xml +++ /dev/null @@ -1,331 +0,0 @@ - - - Discourse - - Discourse is a - modern and open source discussion platform. - -
- Basic usage - - A minimal configuration using Let’s Encrypt for TLS certificates - looks like this: - - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; -security.acme.email = "me@example.com"; -security.acme.acceptTerms = true; - - - Provided a proper DNS setup, you’ll be able to connect to the - instance at discourse.example.com and log in - using the credentials provided in - services.discourse.admin. - -
-
- Using a regular TLS certificate - - To set up TLS using a regular certificate and key on file, use the - and - - options: - - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - sslCertificate = "/path/to/ssl_certificate"; - sslCertificateKey = "/path/to/ssl_certificate_key"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; - -
-
- Database access - - Discourse uses PostgreSQL to store most of its data. A database - will automatically be enabled and a database and role created - unless is - changed from its default of null or - - is set to false. - - - External database access can also be configured by setting - , - and - as - appropriate. Note that you need to manually create a database - called discourse (or the name you chose in - ) and allow - the configured database user full access to it. - -
-
- Email - - In addition to the basic setup, you’ll want to configure an SMTP - server Discourse can use to send user registration and password - reset emails, among others. You can also optionally let Discourse - receive email, which enables people to reply to threads and - conversations via email. - - - A basic setup which assumes you want to use your configured - hostname as - email domain can be done like this: - - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - sslCertificate = "/path/to/ssl_certificate"; - sslCertificateKey = "/path/to/ssl_certificate_key"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - mail.outgoing = { - serverAddress = "smtp.emailprovider.com"; - port = 587; - username = "user@emailprovider.com"; - passwordFile = "/path/to/smtp_password_file"; - }; - mail.incoming.enable = true; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; - - - This assumes you have set up an MX record for the address you’ve - set in - hostname - and requires proper SPF, DKIM and DMARC configuration to be done - for the domain you’re sending from, in order for email to be - reliably delivered. - - - If you want to use a different domain for your outgoing email (for - example example.com instead of - discourse.example.com) you should set - - and - - manually. - - - - Setup of TLS for incoming email is currently only configured - automatically when a regular TLS certificate is used, i.e. when - and - are - set. - - -
-
- Additional settings - - Additional site settings and backend settings, for which no - explicit NixOS options are provided, can be set in - and - - respectively. - -
- Site settings - - Site settings are the settings that can be - changed through the Discourse UI. Their - default values can be set using - . - - - Settings are expressed as a Nix attribute set which matches the - structure of the configuration in - config/site_settings.yml. - To find a setting’s path, you only need to care about the first - two levels; i.e. its category (e.g. login) - and name (e.g. invite_only). - - - Settings containing secret data should be set to an attribute - set containing the attribute _secret - a - string pointing to a file containing the value the option should - be set to. See the example. - -
-
- Backend settings - - Settings are expressed as a Nix attribute set which matches the - structure of the configuration in - config/discourse.conf. - Empty parameters can be defined by setting them to - null. - -
-
- Example - - The following example sets the title and description of the - Discourse instance and enables GitHub login in the site - settings, and changes a few request limits in the backend - settings: - - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - sslCertificate = "/path/to/ssl_certificate"; - sslCertificateKey = "/path/to/ssl_certificate_key"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - mail.outgoing = { - serverAddress = "smtp.emailprovider.com"; - port = 587; - username = "user@emailprovider.com"; - passwordFile = "/path/to/smtp_password_file"; - }; - mail.incoming.enable = true; - siteSettings = { - required = { - title = "My Cats"; - site_description = "Discuss My Cats (and be nice plz)"; - }; - login = { - enable_github_logins = true; - github_client_id = "a2f6dfe838cb3206ce20"; - github_client_secret._secret = /run/keys/discourse_github_client_secret; - }; - }; - backendSettings = { - max_reqs_per_ip_per_minute = 300; - max_reqs_per_ip_per_10_seconds = 60; - max_asset_reqs_per_ip_per_10_seconds = 250; - max_reqs_per_ip_mode = "warn+block"; - }; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; - - - In the resulting site settings file, the - login.github_client_secret key will be set to - the contents of the - /run/keys/discourse_github_client_secret - file. - -
-
-
- Plugins - - You can install Discourse plugins using the - option. - Pre-packaged plugins are provided in - <your_discourse_package_here>.plugins. If - you want the full suite of plugins provided through - nixpkgs, you can also set the - option to - pkgs.discourseAllPlugins. - - - Plugins can be built with the - <your_discourse_package_here>.mkDiscoursePlugin - function. Normally, it should suffice to provide a - name and src attribute. If - the plugin has Ruby dependencies, however, they need to be - packaged in accordance with the - Developing - with Ruby section of the Nixpkgs manual and the appropriate - gem options set in bundlerEnvArgs (normally - gemdir is sufficient). A plugin’s Ruby - dependencies are listed in its plugin.rb file - as function calls to gem. To construct the - corresponding Gemfile manually, run - bundle init, then add the - gem lines to it verbatim. - - - Much of the packaging can be done automatically by the - nixpkgs/pkgs/servers/web-apps/discourse/update.py - script - just add the plugin to the plugins - list in the update_plugins function and run the - script: - - -./update.py update-plugins - - - Some plugins provide - site - settings. Their defaults can be configured using - , just like - regular site settings. To find the names of these settings, look - in the config/settings.yml file of the plugin - repo. - - - For example, to add the - discourse-spoiler-alert - and - discourse-solved - plugins, and disable discourse-spoiler-alert by - default: - - -services.discourse = { - enable = true; - hostname = "discourse.example.com"; - sslCertificate = "/path/to/ssl_certificate"; - sslCertificateKey = "/path/to/ssl_certificate_key"; - admin = { - email = "admin@example.com"; - username = "admin"; - fullName = "Administrator"; - passwordFile = "/path/to/password_file"; - }; - mail.outgoing = { - serverAddress = "smtp.emailprovider.com"; - port = 587; - username = "user@emailprovider.com"; - passwordFile = "/path/to/smtp_password_file"; - }; - mail.incoming.enable = true; - plugins = with config.services.discourse.package.plugins; [ - discourse-spoiler-alert - discourse-solved - ]; - siteSettings = { - plugins = { - spoiler_enabled = false; - }; - }; - secretKeyBaseFile = "/path/to/secret_key_base_file"; -}; - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix index 6efc2ccfd3..3bcda3caed 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix @@ -167,6 +167,6 @@ in { meta = { maintainers = with maintainers; [ ma27 ]; - doc = ./grocy.xml; + doc = ./grocy.md; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.xml deleted file mode 100644 index 08de25b4ce..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - Grocy - - Grocy is a web-based - self-hosted groceries & household management solution for your - home. - -
- Basic usage - - A very basic configuration may look like this: - - -{ pkgs, ... }: -{ - services.grocy = { - enable = true; - hostName = "grocy.tld"; - }; -} - - - This configures a simple vhost using - nginx which - listens to grocy.tld with fully configured - ACME/LE (this can be disabled by setting - services.grocy.nginx.enableSSL - to false). After the initial setup the - credentials admin:admin can be used to login. - - - The application’s state is persisted at - /var/lib/grocy/grocy.db in a - sqlite3 database. The migration is applied when - requesting the /-route of the application. - -
-
- Settings - - The configuration for grocy is located at - /etc/grocy/config.php. By default, the - following settings can be defined in the NixOS-configuration: - - -{ pkgs, ... }: -{ - services.grocy.settings = { - # The default currency in the system for invoices etc. - # Please note that exchange rates aren't taken into account, this - # is just the setting for what's shown in the frontend. - currency = "EUR"; - - # The display language (and locale configuration) for grocy. - culture = "de"; - - calendar = { - # Whether or not to show the week-numbers - # in the calendar. - showWeekNumber = true; - - # Index of the first day to be shown in the calendar (0=Sunday, 1=Monday, - # 2=Tuesday and so on). - firstDayOfWeek = 2; - }; - }; -} - - - If you want to alter the configuration file on your own, you can - do this manually with an expression like this: - - -{ lib, ... }: -{ - environment.etc."grocy/config.php".text = lib.mkAfter '' - // Arbitrary PHP code in grocy's configuration file - ''; -} - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix index 90ca3002c5..a7823354ce 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix @@ -950,16 +950,16 @@ in type = types.str; default = ""; description = lib.mdDoc '' - Attribute map for `id'. - Defaults to `NameID' of SAML response. + Attribute map for `id`. + Defaults to `NameID` of SAML response. ''; }; username = mkOption { type = types.str; default = ""; description = lib.mdDoc '' - Attribute map for `username'. - Defaults to `NameID' of SAML response. + Attribute map for `username`. + Defaults to `NameID` of SAML response. ''; }; email = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix index 5b0934b2fb..28be3a3702 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix @@ -451,6 +451,6 @@ in }; }; - meta.doc = ./jitsi-meet.xml; + meta.doc = ./jitsi-meet.md; meta.maintainers = lib.teams.jitsi.members; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.xml deleted file mode 100644 index 4d2d8aa55e..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - Jitsi Meet - - With Jitsi Meet on NixOS you can quickly configure a complete, - private, self-hosted video conferencing solution. - -
- Basic usage - - A minimal configuration using Let’s Encrypt for TLS certificates - looks like this: - - -{ - services.jitsi-meet = { - enable = true; - hostName = "jitsi.example.com"; - }; - services.jitsi-videobridge.openFirewall = true; - networking.firewall.allowedTCPPorts = [ 80 443 ]; - security.acme.email = "me@example.com"; - security.acme.acceptTerms = true; -} - -
-
- Configuration - - Here is the minimal configuration with additional configurations: - - -{ - services.jitsi-meet = { - enable = true; - hostName = "jitsi.example.com"; - config = { - enableWelcomePage = false; - prejoinPageEnabled = true; - defaultLang = "fi"; - }; - interfaceConfig = { - SHOW_JITSI_WATERMARK = false; - SHOW_WATERMARK_FOR_GUESTS = false; - }; - }; - services.jitsi-videobridge.openFirewall = true; - networking.firewall.allowedTCPPorts = [ 80 443 ]; - security.acme.email = "me@example.com"; - security.acme.acceptTerms = true; -} - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix index d52190a286..a7e4fab8ea 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix @@ -674,6 +674,6 @@ in mkIf createLocalMySQL (mkDefault dbPkg); }; - meta.doc = ./keycloak.xml; + meta.doc = ./keycloak.md; meta.maintainers = [ maintainers.talyz ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.xml deleted file mode 100644 index 148782d30f..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - Keycloak - - Keycloak is an - open source identity and access management server with support for - OpenID - Connect, OAUTH - 2.0 and - SAML - 2.0. - -
- Administration - - An administrative user with the username admin - is automatically created in the master realm. - Its initial password can be configured by setting - and - defaults to changeme. The password is not - stored safely and should be changed immediately in the admin - panel. - - - Refer to the - Keycloak - Server Administration Guide for information on how to - administer your Keycloak instance. - -
-
- Database access - - Keycloak can be used with either PostgreSQL, MariaDB or MySQL. - Which one is used can be configured in - . The - selected database will automatically be enabled and a database and - role created unless - is changed - from its default of localhost or - is - set to false. - - - External database access can also be configured by setting - , - , - , - and - as - appropriate. Note that you need to manually create the database - and allow the configured database user full access to it. - - - - must be set to the path to a file containing the password used to - log in to the database. If - and - - are kept at their defaults, the database role - keycloak with that password is provisioned on - the local database instance. - - - - The path should be provided as a string, not a Nix path, since - Nix paths are copied into the world readable Nix store. - - -
-
- Hostname - - The hostname is used to build the public URL used as base for all - frontend requests and must be configured through - . - - - - If you’re migrating an old Wildfly based Keycloak instance and - want to keep compatibility with your current clients, you’ll - likely want to set - - to /auth. See the option description for more - details. - - - - - determines whether Keycloak should force all requests to go - through the frontend URL. By default, Keycloak allows backend - requests to instead use its local hostname or IP address and may - also advertise it to clients through its OpenID Connect Discovery - endpoint. - - - For more information on hostname configuration, see the - Hostname - section of the Keycloak Server Installation and Configuration - Guide. - -
-
- Setting up TLS/SSL - - By default, Keycloak won’t accept unsecured HTTP connections - originating from outside its local network. - - - HTTPS support requires a TLS/SSL certificate and a private key, - both - PEM - formatted. Their paths should be set through - and - . - - - - The paths should be provided as a strings, not a Nix paths, - since Nix paths are copied into the world readable Nix store. - - -
-
- Themes - - You can package custom themes and make them visible to Keycloak - through . See the - Themes - section of the Keycloak Server Development Guide and the - description of the aforementioned NixOS option for more - information. - -
-
- Configuration file settings - - Keycloak server configuration parameters can be set in - . These - correspond directly to options in - conf/keycloak.conf. Some of the most - important parameters are documented as suboptions, the rest can be - found in the - All - configuration section of the Keycloak Server Installation and - Configuration Guide. - - - Options containing secret data should be set to an attribute set - containing the attribute _secret - a string - pointing to a file containing the value the option should be set - to. See the description of - for an example. - -
-
- Example configuration - - A basic configuration with some custom settings could look like - this: - - -services.keycloak = { - enable = true; - settings = { - hostname = "keycloak.example.com"; - hostname-strict-backchannel = true; - }; - initialAdminPassword = "e6Wcm0RrtegMEHl"; # change on first login - sslCertificate = "/run/keys/ssl_cert"; - sslCertificateKey = "/run/keys/ssl_key"; - database.passwordFile = "/run/keys/db_password"; -}; - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix index f2eb6e726b..af0fb38121 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix @@ -6,7 +6,7 @@ let in { meta.maintainers = with maintainers; [ happysalada ]; - meta.doc = ./lemmy.xml; + meta.doc = ./lemmy.md; imports = [ (mkRemovedOptionModule [ "services" "lemmy" "jwtSecretPath" ] "As of v0.13.0, Lemmy auto-generates the JWT secret.") diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.xml deleted file mode 100644 index 114e11f348..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - Lemmy - - Lemmy is a federated alternative to reddit in rust. - -
- Quickstart - - the minimum to start lemmy is - - -services.lemmy = { - enable = true; - settings = { - hostname = "lemmy.union.rocks"; - database.createLocally = true; - }; - caddy.enable = true; -} - - - this will start the backend on port 8536 and the frontend on port - 1234. It will expose your instance with a caddy reverse proxy to - the hostname you’ve provided. Postgres will be initialized on that - same instance automatically. - -
-
- Usage - - On first connection you will be asked to define an admin user. - -
-
- Missing - - - - Exposing with nginx is not implemented yet. - - - - - This has been tested using a local database with a unix socket - connection. Using different database settings will likely - require modifications - - - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix index cc30896c80..1b6e1ac583 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix @@ -94,11 +94,14 @@ let ] else [] ) env)))); - mastodonTootctl = pkgs.writeShellScriptBin "mastodon-tootctl" '' + mastodonTootctl = let + sourceExtraEnv = lib.concatMapStrings (p: "source ${p}\n") cfg.extraEnvFiles; + in pkgs.writeShellScriptBin "mastodon-tootctl" '' set -a export RAILS_ROOT="${cfg.package}" source "${envFile}" source /var/lib/mastodon/.secrets_env + ${sourceExtraEnv} sudo=exec if [[ "$USER" != ${cfg.user} ]]; then @@ -427,6 +430,15 @@ in { ''; }; + extraEnvFiles = lib.mkOption { + type = with lib.types; listOf path; + default = []; + description = lib.mdDoc '' + Extra environment files to pass to all mastodon services. Useful for passing down environemntal secrets. + ''; + example = [ "/etc/mastodon/s3config.env" ]; + }; + automaticMigrations = lib.mkOption { type = lib.types.bool; default = true; @@ -579,7 +591,7 @@ in { }; serviceConfig = { Type = "oneshot"; - EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles; WorkingDirectory = cfg.package; # System Call Filtering SystemCallFilter = [ ("~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ])) "@chown" "pipe" "pipe2" ]; @@ -607,7 +619,7 @@ in { ExecStart = "${cfg.package}/run-streaming.sh"; Restart = "always"; RestartSec = 20; - EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles; WorkingDirectory = cfg.package; # Runtime directory and mode RuntimeDirectory = "mastodon-streaming"; @@ -634,7 +646,7 @@ in { ExecStart = "${cfg.package}/bin/puma -C config/puma.rb"; Restart = "always"; RestartSec = 20; - EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles; WorkingDirectory = cfg.package; # Runtime directory and mode RuntimeDirectory = "mastodon-web"; @@ -662,7 +674,7 @@ in { ExecStart = "${cfg.package}/bin/sidekiq -c ${toString cfg.sidekiqThreads} -r ${cfg.package}"; Restart = "always"; RestartSec = 20; - EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles; WorkingDirectory = cfg.package; # System Call Filtering SystemCallFilter = [ ("~" + lib.concatStringsSep " " systemCallsList) "@chown" "pipe" "pipe2" ]; @@ -675,7 +687,7 @@ in { environment = env; serviceConfig = { Type = "oneshot"; - EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ]; + EnvironmentFile = [ "/var/lib/mastodon/.secrets_env" ] ++ cfg.extraEnvFiles; } // cfgService; script = let olderThanDays = toString cfg.mediaAutoRemove.olderThanDays; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/matomo.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/matomo.nix index 9845106599..eadf8b62b9 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/matomo.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/matomo.nix @@ -325,7 +325,7 @@ in { }; meta = { - doc = ./matomo.xml; + doc = ./matomo.md; maintainers = with lib.maintainers; [ florianjacob ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/matomo.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/matomo.xml deleted file mode 100644 index 30994cc9f1..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/matomo.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - Matomo - - Matomo is a real-time web analytics application. This module - configures php-fpm as backend for Matomo, optionally configuring an - nginx vhost as well. - - - An automatic setup is not suported by Matomo, so you need to - configure Matomo itself in the browser-based Matomo setup. - -
- Database Setup - - You also need to configure a MariaDB or MySQL database and -user - for Matomo yourself, and enter those credentials in your browser. - You can use passwordless database authentication via the - UNIX_SOCKET authentication plugin with the following SQL commands: - - -# For MariaDB -INSTALL PLUGIN unix_socket SONAME 'auth_socket'; -CREATE DATABASE matomo; -CREATE USER 'matomo'@'localhost' IDENTIFIED WITH unix_socket; -GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; - -# For MySQL -INSTALL PLUGIN auth_socket SONAME 'auth_socket.so'; -CREATE DATABASE matomo; -CREATE USER 'matomo'@'localhost' IDENTIFIED WITH auth_socket; -GRANT ALL PRIVILEGES ON matomo.* TO 'matomo'@'localhost'; - - - Then fill in matomo as database user and - database name, and leave the password field blank. This - authentication works by allowing only the - matomo unix user to authenticate as the - matomo database user (without needing a - password), but no other users. For more information on - passwordless login, see - https://mariadb.com/kb/en/mariadb/unix_socket-authentication-plugin/. - - - Of course, you can use password based authentication as well, e.g. - when the database is not on the same host. - -
-
- Archive Processing - - This module comes with the systemd service - matomo-archive-processing.service and a timer - that automatically triggers archive processing every hour. This - means that you can safely - disable - browser triggers for Matomo archiving at - Administration > System > General Settings. - - - With automatic archive processing, you can now also enable to - delete - old visitor logs at - Administration > System > Privacy, but - make sure that you run - systemctl start matomo-archive-processing.service - at least once without errors if you have already collected data - before, so that the reports get archived before the source data - gets deleted. - -
-
- Backup - - You only need to take backups of your MySQL database and the - /var/lib/matomo/config/config.ini.php file. - Use a user in the matomo group or root to - access the file. For more information, see - https://matomo.org/faq/how-to-install/faq_138/. - -
-
- Issues - - - - Matomo will warn you that the JavaScript tracker is not - writable. This is because it’s located in the read-only nix - store. You can safely ignore this, unless you need a plugin - that needs JavaScript tracker access. - - - -
-
- Using other Web Servers than nginx - - You can use other web servers by forwarding calls for - index.php and piwik.php - to the - services.phpfpm.pools.<name>.socket - fastcgi unix socket. You can use the nginx configuration in the - module code as a reference to what else should be configured. - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index 90801e9968..50c2d68c77 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -1146,5 +1146,5 @@ in { } ]); - meta.doc = ./nextcloud.xml; + meta.doc = ./nextcloud.md; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml deleted file mode 100644 index a5ac05723e..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.xml +++ /dev/null @@ -1,333 +0,0 @@ - - - Nextcloud - - Nextcloud is an - open-source, self-hostable cloud platform. The server setup can be - automated using - services.nextcloud. - A desktop client is packaged at - pkgs.nextcloud-client. - - - The current default by NixOS is nextcloud25 which - is also the latest major version available. - -
- Basic usage - - Nextcloud is a PHP-based application which requires an HTTP server - (services.nextcloud - optionally supports - services.nginx) - and a database (it’s recommended to use - services.postgresql). - - - A very basic configuration may look like this: - - -{ pkgs, ... }: -{ - services.nextcloud = { - enable = true; - hostName = "nextcloud.tld"; - config = { - dbtype = "pgsql"; - dbuser = "nextcloud"; - dbhost = "/run/postgresql"; # nextcloud will add /.s.PGSQL.5432 by itself - dbname = "nextcloud"; - adminpassFile = "/path/to/admin-pass-file"; - adminuser = "root"; - }; - }; - - services.postgresql = { - enable = true; - ensureDatabases = [ "nextcloud" ]; - ensureUsers = [ - { name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; - } - ]; - }; - - # ensure that postgres is running *before* running the setup - systemd.services."nextcloud-setup" = { - requires = ["postgresql.service"]; - after = ["postgresql.service"]; - }; - - networking.firewall.allowedTCPPorts = [ 80 443 ]; -} - - - The hostName option is used internally to - configure an HTTP server using - PHP-FPM - and nginx. The config - attribute set is used by the imperative installer and all values - are written to an additional file to ensure that changes can be - applied by changing the module’s options. - - - In case the application serves multiple domains (those are checked - with - $_SERVER['HTTP_HOST']) - it’s needed to add them to - services.nextcloud.config.extraTrustedDomains. - - - Auto updates for Nextcloud apps can be enabled using - services.nextcloud.autoUpdateApps. - -
-
- Common problems - - - - General notes. - Unfortunately Nextcloud appears to be very stateful when it - comes to managing its own configuration. The config file lives - in the home directory of the nextcloud user - (by default - /var/lib/nextcloud/config/config.php) and - is also used to track several states of the application (e.g., - whether installed or not). - - - All configuration parameters are also stored in - /var/lib/nextcloud/config/override.config.php - which is generated by the module and linked from the store to - ensure that all values from config.php - can be modified by the module. However - config.php manages the application’s - state and shouldn’t be touched manually because of that. - - - - Don’t delete config.php! This file - tracks the application’s state and a deletion can cause - unwanted side-effects! - - - - - Don’t rerun - nextcloud-occ maintenance:install! This - command tries to install the application and can cause - unwanted side-effects! - - - - - - Multiple version upgrades. - Nextcloud doesn’t allow to move more than one major-version - forward. E.g., if you’re on v16, you cannot - upgrade to v18, you need to upgrade to - v17 first. This is ensured automatically as - long as the - stateVersion is - declared properly. In that case the oldest version available - (one major behind the one from the previous NixOS release) - will be selected by default and the module will generate a - warning that reminds the user to upgrade to latest Nextcloud - after that deploy. - - - - - Error: Command "upgrade" is not defined. - This error usually occurs if the initial installation - (nextcloud-occ maintenance:install) has - failed. After that, the application is not installed, but the - upgrade is attempted to be executed. Further context can be - found in - NixOS/nixpkgs#111175. - - - First of all, it makes sense to find out what went wrong by - looking at the logs of the installation via - journalctl -u nextcloud-setup and try to - fix the underlying issue. - - - - - If this occurs on an existing setup, - this is most likely because the maintenance mode is - active. It can be deactivated by running - nextcloud-occ maintenance:mode --off. - It’s advisable though to check the logs first on why the - maintenance mode was activated. - - - - - - Only perform the following measures on freshly - installed instances! - - - - A re-run of the installer can be forced by - deleting - /var/lib/nextcloud/config/config.php. - This is the only time advisable because the fresh install - doesn’t have any state that can be lost. In case that - doesn’t help, an entire re-creation can be forced via - rm -rf ~nextcloud/. - - - - - - - Server-side encryption. - Nextcloud supports - server-side - encryption (SSE). This is not an end-to-end encryption, - but can be used to encrypt files that will be persisted to - external storage such as S3. Please note that this won’t work - anymore when using OpenSSL 3 for PHP’s openssl extension - because this is implemented using the legacy cipher RC4. If - is - above 22.05, this is - disabled by default. To turn it on again and for further - information please refer to - . - - - -
-
- Using an alternative webserver as reverse-proxy (e.g. - <literal>httpd</literal>) - - By default, nginx is used as reverse-proxy for - nextcloud. However, it’s possible to use e.g. - httpd by explicitly disabling - nginx using - and fixing the - settings listen.owner & - listen.group in the - corresponding - phpfpm pool. - - - An exemplary configuration may look like this: - - -{ config, lib, pkgs, ... }: { - services.nginx.enable = false; - services.nextcloud = { - enable = true; - hostName = "localhost"; - - /* further, required options */ - }; - services.phpfpm.pools.nextcloud.settings = { - "listen.owner" = config.services.httpd.user; - "listen.group" = config.services.httpd.group; - }; - services.httpd = { - enable = true; - adminAddr = "webmaster@localhost"; - extraModules = [ "proxy_fcgi" ]; - virtualHosts."localhost" = { - documentRoot = config.services.nextcloud.package; - extraConfig = '' - <Directory "${config.services.nextcloud.package}"> - <FilesMatch "\.php$"> - <If "-f %{REQUEST_FILENAME}"> - SetHandler "proxy:unix:${config.services.phpfpm.pools.nextcloud.socket}|fcgi://localhost/" - </If> - </FilesMatch> - <IfModule mod_rewrite.c> - RewriteEngine On - RewriteBase / - RewriteRule ^index\.php$ - [L] - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule . /index.php [L] - </IfModule> - DirectoryIndex index.php - Require all granted - Options +FollowSymLinks - </Directory> - ''; - }; - }; -} - -
-
- Installing Apps and PHP extensions - - Nextcloud apps are installed statefully through the web interface. - Some apps may require extra PHP extensions to be installed. This - can be configured with the - - setting. - - - Alternatively, extra apps can also be declared with the - setting. When - using this setting, apps can no longer be managed statefully - because this can lead to Nextcloud updating apps that are managed - by Nix. If you want automatic updates it is recommended that you - use web interface to install apps. - -
-
- Maintainer information - - As stated in the previous paragraph, we must provide a clean - upgrade-path for Nextcloud since it cannot move more than one - major version forward on a single upgrade. This chapter adds some - notes how Nextcloud updates should be rolled out in the future. - - - While minor and patch-level updates are no problem and can be done - directly in the package-expression (and should be backported to - supported stable branches after that), major-releases should be - added in a new attribute (e.g. Nextcloud - v19.0.0 should be available in - nixpkgs as - pkgs.nextcloud19). To provide simple upgrade - paths it’s generally useful to backport those as well to stable - branches. As long as the package-default isn’t altered, this won’t - break existing setups. After that, the versioning-warning in the - nextcloud-module should be updated to make sure - that the - package-option - selects the latest version on fresh setups. - - - If major-releases will be abandoned by upstream, we should check - first if those are needed in NixOS for a safe upgrade-path before - removing those. In that case we should keep those packages, but - mark them as insecure in an expression like this (in - <nixpkgs/pkgs/servers/nextcloud/default.nix>): - - -/* ... */ -{ - nextcloud17 = generic { - version = "17.0.x"; - sha256 = "0000000000000000000000000000000000000000000000000000"; - eol = true; - }; -} - - - Ideally we should make sure that it’s possible to jump two NixOS - versions forward: i.e. the warnings and the logic in the module - should guard a user to upgrade from a Nextcloud on e.g. 19.09 to a - Nextcloud on 20.09. - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.nix index ad07507ca3..0f13b2ae6d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.nix @@ -5,7 +5,7 @@ let in { meta.maintainers = with maintainers; [ happysalada ]; - meta.doc = ./pict-rs.xml; + meta.doc = ./pict-rs.md; options.services.pict-rs = { enable = mkEnableOption (lib.mdDoc "pict-rs server"); diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.xml deleted file mode 100644 index 3f5900c55f..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.xml +++ /dev/null @@ -1,185 +0,0 @@ - - - Pict-rs - - pict-rs is a a simple image hosting service. - -
- Quickstart - - the minimum to start pict-rs is - - -services.pict-rs.enable = true; - - - this will start the http server on port 8080 by default. - -
-
- Usage - - pict-rs offers the following endpoints: - - - - - POST /image for uploading an image. - Uploaded content must be valid multipart/form-data with an - image array located within the images[] key - - - This endpoint returns the following JSON structure on success - with a 201 Created status - - -{ - "files": [ - { - "delete_token": "JFvFhqJA98", - "file": "lkWZDRvugm.jpg" - }, - { - "delete_token": "kAYy9nk2WK", - "file": "8qFS0QooAn.jpg" - }, - { - "delete_token": "OxRpM3sf0Y", - "file": "1hJaYfGE01.jpg" - } - ], - "msg": "ok" -} - - - - - GET /image/download?url=... Download an - image from a remote server, returning the same JSON payload as - the POST endpoint - - - - - GET /image/original/{file} for getting a - full-resolution image. file here is the - file key from the /image - endpoint’s JSON - - - - - GET /image/details/original/{file} for - getting the details of a full-resolution image. The returned - JSON is structured like so: - - -{ - "width": 800, - "height": 537, - "content_type": "image/webp", - "created_at": [ - 2020, - 345, - 67376, - 394363487 - ] -} - - - - - GET /image/process.{ext}?src={file}&... - get a file with transformations applied. existing - transformations include - - - - - identity=true: apply no changes - - - - - blur={float}: apply a gaussian blur to - the file - - - - - thumbnail={int}: produce a thumbnail of - the image fitting inside an {int} by - {int} square using raw pixel sampling - - - - - resize={int}: produce a thumbnail of - the image fitting inside an {int} by - {int} square using a Lanczos2 filter. - This is slower than sampling but looks a bit better in - some cases - - - - - crop={int-w}x{int-h}: produce a cropped - version of the image with an {int-w} by - {int-h} aspect ratio. The resulting - crop will be centered on the image. Either the width or - height of the image will remain full-size, depending on - the image’s aspect ratio and the requested aspect ratio. - For example, a 1600x900 image cropped with a 1x1 aspect - ratio will become 900x900. A 1600x1100 image cropped with - a 16x9 aspect ratio will become 1600x900. - - - - - Supported ext file extensions include - png, jpg, and - webp - - - An example of usage could be - - -GET /image/process.jpg?src=asdf.png&thumbnail=256&blur=3.0 - - - which would create a 256x256px JPEG thumbnail and blur it - - - - - GET /image/details/process.{ext}?src={file}&... - for getting the details of a processed image. The returned - JSON is the same format as listed for the full-resolution - details endpoint. - - - - - DELETE /image/delete/{delete_token}/{file} - or GET /image/delete/{delete_token}/{file} - to delete a file, where delete_token and - file are from the /image - endpoint’s JSON - - - -
-
- Missing - - - - Configuring the secure-api-key is not included yet. The - envisioned basic use case is consumption on localhost by other - services without exposing the service to the internet. - - - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix index e5dc1b1036..f64254d625 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix @@ -292,5 +292,5 @@ in { }; meta.maintainers = with maintainers; [ ma27 ]; - meta.doc = ./plausible.xml; + meta.doc = ./plausible.md; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.xml deleted file mode 100644 index 39ff004ffd..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - Plausible - - Plausible is a - privacy-friendly alternative to Google analytics. - -
- Basic Usage - - At first, a secret key is needed to be generated. This can be done - with e.g. - - -$ openssl rand -base64 64 - - - After that, plausible can be deployed like - this: - - -{ - services.plausible = { - enable = true; - adminUser = { - # activate is used to skip the email verification of the admin-user that's - # automatically created by plausible. This is only supported if - # postgresql is configured by the module. This is done by default, but - # can be turned off with services.plausible.database.postgres.setup. - activate = true; - email = "admin@localhost"; - passwordFile = "/run/secrets/plausible-admin-pwd"; - }; - server = { - baseUrl = "http://analytics.example.org"; - # secretKeybaseFile is a path to the file which contains the secret generated - # with openssl as described above. - secretKeybaseFile = "/run/secrets/plausible-secret-key-base"; - }; - }; -} - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix index 416ad8556b..d4c987da11 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix @@ -32,8 +32,8 @@ let # Since hard linking directories is not allowed, copying is the next best thing. # copy additional plugin(s), theme(s) and language(s) - ${concatMapStringsSep "\n" (theme: "cp -r ${theme} $out/share/wordpress/wp-content/themes/${theme.name}") cfg.themes} - ${concatMapStringsSep "\n" (plugin: "cp -r ${plugin} $out/share/wordpress/wp-content/plugins/${plugin.name}") cfg.plugins} + ${concatStringsSep "\n" (mapAttrsToList (name: theme: "cp -r ${theme} $out/share/wordpress/wp-content/themes/${name}") cfg.themes)} + ${concatStringsSep "\n" (mapAttrsToList (name: plugin: "cp -r ${plugin} $out/share/wordpress/wp-content/plugins/${name}") cfg.plugins)} ${concatMapStringsSep "\n" (language: "cp -r ${language} $out/share/wordpress/wp-content/languages/") cfg.languages} ''; }; @@ -130,62 +130,45 @@ let }; plugins = mkOption { - type = types.listOf types.path; - default = []; + type = with types; coercedTo + (listOf path) + (l: warn "setting this option with a list is deprecated" + listToAttrs (map (p: nameValuePair (p.name or (throw "${p} does not have a name")) p) l)) + (attrsOf path); + default = {}; description = lib.mdDoc '' - List of path(s) to respective plugin(s) which are copied from the 'plugins' directory. + Path(s) to respective plugin(s) which are copied from the 'plugins' directory. ::: {.note} These plugins need to be packaged before use, see example. ::: ''; example = literalExpression '' - let - # Wordpress plugin 'embed-pdf-viewer' installation example - embedPdfViewerPlugin = pkgs.stdenv.mkDerivation { - name = "embed-pdf-viewer-plugin"; - # Download the theme from the wordpress site - src = pkgs.fetchurl { - url = "https://downloads.wordpress.org/plugin/embed-pdf-viewer.2.0.3.zip"; - sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd"; - }; - # We need unzip to build this package - nativeBuildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory - installPhase = "mkdir -p $out; cp -R * $out/"; - }; - # And then pass this theme to the themes list like this: - in [ embedPdfViewerPlugin ] + { + inherit (pkgs.wordpressPackages.plugins) embed-pdf-viewer-plugin; + } ''; }; themes = mkOption { - type = types.listOf types.path; - default = []; + type = with types; coercedTo + (listOf path) + (l: warn "setting this option with a list is deprecated" + listToAttrs (map (p: nameValuePair (p.name or (throw "${p} does not have a name")) p) l)) + (attrsOf path); + default = { inherit (pkgs.wordpressPackages.themes) twentytwentythree; }; + defaultText = literalExpression "{ inherit (pkgs.wordpressPackages.themes) twentytwentythree; }"; description = lib.mdDoc '' - List of path(s) to respective theme(s) which are copied from the 'theme' directory. + Path(s) to respective theme(s) which are copied from the 'theme' directory. ::: {.note} These themes need to be packaged before use, see example. ::: ''; example = literalExpression '' - let - # Let's package the responsive theme - responsiveTheme = pkgs.stdenv.mkDerivation { - name = "responsive-theme"; - # Download the theme from the wordpress site - src = pkgs.fetchurl { - url = "https://downloads.wordpress.org/theme/responsive.3.14.zip"; - sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3"; - }; - # We need unzip to build this package - nativeBuildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory - installPhase = "mkdir -p $out; cp -R * $out/"; - }; - # And then pass this theme to the themes list like this: - in [ responsiveTheme ] + { + inherit (pkgs.wordpressPackages.themes) responsive-theme; + } ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix index 1c25d865f9..2491c788d6 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix @@ -9,7 +9,7 @@ let in { meta = { - doc = ./garage.xml; + doc = ./garage.md; maintainers = with pkgs.lib.maintainers; [ raitobezarius ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/garage.xml b/third_party/nixpkgs/nixos/modules/services/web-servers/garage.xml deleted file mode 100644 index 6a16b1693d..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/garage.xml +++ /dev/null @@ -1,206 +0,0 @@ - - - Garage - - Garage is - an open-source, self-hostable S3 store, simpler than MinIO, for - geodistributed stores. The server setup can be automated using - services.garage. A - client configured to your local Garage instance is available in the - global environment as garage-manage. - - - The current default by NixOS is garage_0_8 which - is also the latest major version available. - -
- General considerations on upgrades - - Garage provides a cookbook documentation on how to upgrade: - https://garagehq.deuxfleurs.fr/documentation/cookbook/upgrading/ - - - - Garage has two types of upgrades: patch-level upgrades and - minor/major version upgrades. - - - In all cases, you should read the changelog and ideally test the - upgrade on a staging cluster. - - - Checking the health of your cluster can be achieved using - garage-manage repair. - - - - - Until 1.0 is released, patch-level upgrades are considered as - minor version upgrades. Minor version upgrades are considered as - major version upgrades. i.e. 0.6 to 0.7 is a major version - upgrade. - - - - - - Straightforward upgrades (patch-level - upgrades). Upgrades must be performed one by one, - i.e. for each node, stop it, upgrade it : change - stateVersion or - services.garage.package, - restart it if it was not already by switching. - - - - - Multiple version upgrades. - Garage do not provide any guarantee on moving more than one - major-version forward. E.g., if you’re on - 0.7, you cannot upgrade to - 0.9. You need to upgrade to - 0.8 first. As long as - stateVersion is - declared properly, this is enforced automatically. The module - will issue a warning to remind the user to upgrade to latest - Garage after that deploy. - - - -
-
- Advanced upgrades (minor/major version upgrades) - - Here are some baseline instructions to handle advanced upgrades in - Garage, when in doubt, please refer to upstream instructions. - - - - - Disable API and web access to Garage. - - - - - Perform - garage-manage repair --all-nodes --yes tables - and - garage-manage repair --all-nodes --yes blocks. - - - - - Verify the resulting logs and check that data is synced - properly between all nodes. If you have time, do additional - checks (scrub, - block_refs, etc.). - - - - - Check if queues are empty by - garage-manage stats or through monitoring - tools. - - - - - Run systemctl stop garage to stop the - actual Garage version. - - - - - Backup the metadata folder of ALL your nodes, e.g. for a - metadata directory (the default one) in - /var/lib/garage/meta, you can run - pushd /var/lib/garage; tar -acf meta-v0.7.tar.zst meta/; popd. - - - - - Run the offline migration: - nix-shell -p garage_0_8 --run "garage offline-repair --yes", - this can take some time depending on how many objects are - stored in your cluster. - - - - - Bump Garage version in your NixOS configuration, either by - changing - stateVersion or - bumping - services.garage.package, - this should restart Garage automatically. - - - - - Perform - garage-manage repair --all-nodes --yes tables - and - garage-manage repair --all-nodes --yes blocks. - - - - - Wait for a full table sync to run. - - - - - Your upgraded cluster should be in a working state, re-enable API - and web access. - -
-
- Maintainer information - - As stated in the previous paragraph, we must provide a clean - upgrade-path for Garage since it cannot move more than one major - version forward on a single upgrade. This chapter adds some notes - how Garage updates should be rolled out in the future. This is - inspired from how Nextcloud does it. - - - While patch-level updates are no problem and can be done directly - in the package-expression (and should be backported to supported - stable branches after that), major-releases should be added in a - new attribute (e.g. Garage v0.8.0 should be - available in nixpkgs as - pkgs.garage_0_8_0). To provide simple upgrade - paths it’s generally useful to backport those as well to stable - branches. As long as the package-default isn’t altered, this won’t - break existing setups. After that, the versioning-warning in the - garage-module should be updated to make sure - that the - package-option - selects the latest version on fresh setups. - - - If major-releases will be abandoned by upstream, we should check - first if those are needed in NixOS for a safe upgrade-path before - removing those. In that case we shold keep those packages, but - mark them as insecure in an expression like this (in - <nixpkgs/pkgs/tools/filesystem/garage/default.nix>): - - -/* ... */ -{ - garage_0_7_3 = generic { - version = "0.7.3"; - sha256 = "0000000000000000000000000000000000000000000000000000"; - eol = true; - }; -} - - - Ideally we should make sure that it’s possible to jump two NixOS - versions forward: i.e. the warnings and the logic in the module - should guard a user to upgrade from a Garage on e.g. 22.11 to a - Garage on 23.11. - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 6fafae8928..1837ec936c 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -117,7 +117,7 @@ let # used by most other Linux distributions by default. include ${pkgs.mailcap}/etc/nginx/mime.types; # When recommendedOptimisation is disabled nginx fails to start because the mailmap mime.types database - # contains 1026 enries and the default is only 1024. Setting to a higher number to remove the need to + # contains 1026 entries and the default is only 1024. Setting to a higher number to remove the need to # overwrite it because nginx does not allow duplicated settings. types_hash_max_size 4096; @@ -184,25 +184,17 @@ let brotli_window 512k; brotli_min_length 256; brotli_types ${lib.concatStringsSep " " compressMimeTypes}; - brotli_buffers 32 8k; ''} + # https://docs.nginx.com/nginx/admin-guide/web-server/compression/ ${optionalString cfg.recommendedGzipSettings '' gzip on; - gzip_proxied any; - gzip_comp_level 5; - gzip_types - application/atom+xml - application/javascript - application/json - application/xml - application/xml+rss - image/svg+xml - text/css - text/javascript - text/plain - text/xml; + gzip_static on; gzip_vary on; + gzip_comp_level 5; + gzip_min_length 256; + gzip_proxied expired no-cache no-store private auth; + gzip_types ${lib.concatStringsSep " " compressMimeTypes}; ''} ${optionalString cfg.recommendedProxySettings '' @@ -211,6 +203,8 @@ let proxy_send_timeout ${cfg.proxyTimeout}; proxy_read_timeout ${cfg.proxyTimeout}; proxy_http_version 1.1; + # don't let clients close the keep-alive connection to upstream + proxy_set_header "Connection" ""; include ${recommendedProxyConfig}; ''} @@ -288,7 +282,7 @@ let configPath = if cfg.enableReload then "/etc/nginx/nginx.conf" - else finalConfigFile; + else configFile; execCommand = "${cfg.package}/bin/nginx -c '${configPath}'"; @@ -440,38 +434,6 @@ let ); mkCertOwnershipAssertion = import ../../../security/acme/mk-cert-ownership-assertion.nix; - - snakeOilCert = pkgs.runCommand "nginx-config-validate-cert" { nativeBuildInputs = [ pkgs.openssl.bin ]; } '' - mkdir $out - openssl genrsa -des3 -passout pass:xxxxx -out server.pass.key 2048 - openssl rsa -passin pass:xxxxx -in server.pass.key -out $out/server.key - openssl req -new -key $out/server.key -out server.csr \ - -subj "/C=UK/ST=Warwickshire/L=Leamington/O=OrgName/OU=IT Department/CN=example.com" - openssl x509 -req -days 1 -in server.csr -signkey $out/server.key -out $out/server.crt - ''; - validatedConfigFile = pkgs.runCommand "validated-nginx.conf" { nativeBuildInputs = [ cfg.package ]; } '' - # nginx absolutely wants to read the certificates even when told to only validate config, so let's provide fake certs - sed ${configFile} \ - -e "s|ssl_certificate .*;|ssl_certificate ${snakeOilCert}/server.crt;|g" \ - -e "s|ssl_trusted_certificate .*;|ssl_trusted_certificate ${snakeOilCert}/server.crt;|g" \ - -e "s|ssl_certificate_key .*;|ssl_certificate_key ${snakeOilCert}/server.key;|g" \ - > conf - - LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so \ - NIX_REDIRECTS="/etc/resolv.conf=/dev/null" \ - nginx -t -c $(readlink -f ./conf) > out 2>&1 || true - if ! grep -q "syntax is ok" out; then - echo nginx config validation failed. - echo config was ${configFile}. - echo 'in case of false positive, set `services.nginx.validateConfig` to false.' - echo nginx output: - cat out - exit 1 - fi - cp ${configFile} $out - ''; - - finalConfigFile = if cfg.validateConfig then validatedConfigFile else configFile; in { @@ -580,17 +542,6 @@ in ''; }; - validateConfig = mkOption { - # FIXME: re-enable if we can make of the configurations work. - #default = pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform; - default = false; - defaultText = literalExpression "pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform"; - type = types.bool; - description = lib.mdDoc '' - Validate the generated nginx config at build time. The check is not very robust and can be disabled in case of false positives. This is notably the case when cross-compiling or when using `include` with files outside of the store. - ''; - }; - additionalModules = mkOption { default = []; type = types.listOf (types.attrsOf types.anything); @@ -1128,7 +1079,7 @@ in }; environment.etc."nginx/nginx.conf" = mkIf cfg.enableReload { - source = finalConfigFile; + source = configFile; }; # This service waits for all certificates to be available @@ -1147,7 +1098,7 @@ in # certs are updated _after_ config has been reloaded. before = sslTargets; after = sslServices; - restartTriggers = optionals cfg.enableReload [ finalConfigFile ]; + restartTriggers = optionals cfg.enableReload [ configFile ]; # Block reloading if not all certs exist yet. # Happens when config changes add new vhosts/certs. unitConfig.ConditionPathExists = optionals (sslServices != []) (map (certName: certs.${certName}.directory + "/fullchain.pem") dependentCertNames); diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix index a693f3e237..2d8addb0f1 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -109,6 +109,7 @@ in xapp ]; services.cinnamon.apps.enable = mkDefault true; + services.gnome.evolution-data-server.enable = true; services.gnome.glib-networking.enable = true; services.gnome.gnome-keyring.enable = true; services.gvfs.enable = true; @@ -214,7 +215,6 @@ in programs.geary.enable = mkDefault true; programs.gnome-disks.enable = mkDefault true; programs.gnome-terminal.enable = mkDefault true; - programs.evince.enable = mkDefault true; programs.file-roller.enable = mkDefault true; environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [ @@ -232,6 +232,7 @@ in # external apps shipped with linux-mint hexchat gnome-calculator + gnome-calendar gnome-screenshot ] config.environment.cinnamon.excludePackages; }) diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix index dadfb421d3..79b2e7c6ea 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -66,7 +66,7 @@ in { meta = { - doc = ./gnome.xml; + doc = ./gnome.md; maintainers = teams.gnome.members; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.xml b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.xml deleted file mode 100644 index 6613f49eec..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.xml +++ /dev/null @@ -1,261 +0,0 @@ - - - GNOME Desktop - - GNOME provides a simple, yet full-featured desktop environment with - a focus on productivity. Its Mutter compositor supports both Wayland - and X server, and the GNOME Shell user interface is fully - customizable by extensions. - -
- Enabling GNOME - - All of the core apps, optional apps, games, and core developer - tools from GNOME are available. - - - To enable the GNOME desktop use: - - -services.xserver.desktopManager.gnome.enable = true; -services.xserver.displayManager.gdm.enable = true; - - - - While it is not strictly necessary to use GDM as the display - manager with GNOME, it is recommended, as some features such as - screen lock - might - not work without it. - - - - The default applications used in NixOS are very minimal, inspired - by the defaults used in - gnome-build-meta. - -
- GNOME without the apps - - If you’d like to only use the GNOME desktop and not the apps, - you can disable them with: - - -services.gnome.core-utilities.enable = false; - - - and none of them will be installed. - - - If you’d only like to omit a subset of the core utilities, you - can use - . Note - that this mechanism can only exclude core utilities, games and - core developer tools. - -
-
- Disabling GNOME services - - It is also possible to disable many of the - core - services. For example, if you do not need indexing files, - you can disable Tracker with: - - -services.gnome.tracker-miners.enable = false; -services.gnome.tracker.enable = false; - - - Note, however, that doing so is not supported and might break - some applications. Notably, GNOME Music cannot work without - Tracker. - -
-
- GNOME games - - You can install all of the GNOME games with: - - -services.gnome.games.enable = true; - -
-
- GNOME core developer tools - - You can install GNOME core developer tools with: - - -services.gnome.core-developer-tools.enable = true; - -
-
-
- Enabling GNOME Flashback - - GNOME Flashback provides a desktop environment based on the - classic GNOME 2 architecture. You can enable the default GNOME - Flashback session, which uses the Metacity window manager, with: - - -services.xserver.desktopManager.gnome.flashback.enableMetacity = true; - - - It is also possible to create custom sessions that replace - Metacity with a different window manager using - . - - - The following example uses xmonad window - manager: - - -services.xserver.desktopManager.gnome.flashback.customSessions = [ - { - wmName = "xmonad"; - wmLabel = "XMonad"; - wmCommand = "${pkgs.haskellPackages.xmonad}/bin/xmonad"; - enableGnomePanel = false; - } -]; - -
-
- Icons and GTK Themes - - Icon themes and GTK themes don’t require any special option to - install in NixOS. - - - You can add them to - and switch to - them with GNOME Tweaks. If you’d like to do this manually in - dconf, change the values of the following keys: - - -/org/gnome/desktop/interface/gtk-theme -/org/gnome/desktop/interface/icon-theme - - - in dconf-editor - -
-
- Shell Extensions - - Most Shell extensions are packaged under the - gnomeExtensions attribute. Some packages that - include Shell extensions, like gnome.gpaste, - don’t have their extension decoupled under this attribute. - - - You can install them like any other package: - - -environment.systemPackages = [ - gnomeExtensions.dash-to-dock - gnomeExtensions.gsconnect - gnomeExtensions.mpris-indicator-button -]; - - - Unfortunately, we lack a way for these to be managed in a - completely declarative way. So you have to enable them manually - with an Extensions application. It is possible to use a - GSettings - override for this on - org.gnome.shell.enabled-extensions, but that - will only influence the default value. - -
-
- GSettings Overrides - - Majority of software building on the GNOME platform use GLib’s - GSettings - system to manage runtime configuration. For our purposes, the - system consists of XML schemas describing the individual - configuration options, stored in the package, and a settings - backend, where the values of the settings are stored. On NixOS, - like on most Linux distributions, dconf database is used as the - backend. - - - GSettings - vendor overrides can be used to adjust the default values - for settings of the GNOME desktop and apps by replacing the - default values specified in the XML schemas. Using overrides will - allow you to pre-seed user settings before you even start the - session. - - - - Overrides really only change the default values for GSettings - keys so if you or an application changes the setting value, the - value set by the override will be ignored. Until - NixOS’s - dconf module implements changing values, you will either - need to keep that in mind and clear the setting from the backend - using dconf reset command when that happens, - or use the - module - from home-manager. - - - - You can override the default GSettings values using the - - option. - - - Take note that whatever packages you want to override GSettings - for, you need to add them to - . - - - You can use dconf-editor tool to explore which - GSettings you can set. - -
- Example - -services.xserver.desktopManager.gnome = { - extraGSettingsOverrides = '' - # Change default background - [org.gnome.desktop.background] - picture-uri='file://${pkgs.nixos-artwork.wallpapers.mosaic-blue.gnomeFilePath}' - - # Favorite apps in gnome-shell - [org.gnome.shell] - favorite-apps=['org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop'] - ''; - - extraGSettingsOverridePackages = [ - pkgs.gsettings-desktop-schemas # for org.gnome.desktop - pkgs.gnome.gnome-shell # for org.gnome.shell - ]; -}; - -
-
-
- Frequently Asked Questions -
- Can I use LightDM with GNOME? - - Yes you can, and any other display-manager in NixOS. - - - However, it doesn’t work correctly for the Wayland session of - GNOME Shell yet, and won’t be able to lock your screen. - - - See - this - issue. - -
-
- diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix index f5cc2d8187..7791a98965 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -17,7 +17,7 @@ in { meta = { - doc = ./pantheon.xml; + doc = ./pantheon.md; maintainers = teams.pantheon.members; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml deleted file mode 100644 index 0e98b08fb6..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ /dev/null @@ -1,171 +0,0 @@ - - - Pantheon Desktop - - Pantheon is the desktop environment created for the elementary OS - distribution. It is written from scratch in Vala, utilizing GNOME - technologies with GTK and Granite. - -
- Enabling Pantheon - - All of Pantheon is working in NixOS and the applications should be - available, aside from a few - exceptions. - To enable Pantheon, set - - -services.xserver.desktopManager.pantheon.enable = true; - - - This automatically enables LightDM and Pantheon’s LightDM greeter. - If you’d like to disable this, set - - -services.xserver.displayManager.lightdm.greeters.pantheon.enable = false; -services.xserver.displayManager.lightdm.enable = false; - - - but please be aware using Pantheon without LightDM as a display - manager will break screenlocking from the UI. The NixOS module for - Pantheon installs all of Pantheon’s default applications. If you’d - like to not install Pantheon’s apps, set - - -services.pantheon.apps.enable = false; - - - You can also use - to - remove any other app (like elementary-mail). - -
-
- Wingpanel and Switchboard plugins - - Wingpanel and Switchboard work differently than they do in other - distributions, as far as using plugins. You cannot install a - plugin globally (like with - ) to start using it. - You should instead be using the following options: - - - - - - - - - - - - - - - to configure the programs with plugs or indicators. - - - The difference in NixOS is both these programs are patched to load - plugins from a directory that is the value of an environment - variable. All of which is controlled in Nix. If you need to - configure the particular packages manually you can override the - packages like: - - -wingpanel-with-indicators.override { - indicators = [ - pkgs.some-special-indicator - ]; -}; - -switchboard-with-plugs.override { - plugs = [ - pkgs.some-special-plug - ]; -}; - - - please note that, like how the NixOS options describe these as - extra plugins, this would only add to the default plugins included - with the programs. If for some reason you’d like to configure - which plugins to use exactly, both packages have an argument for - this: - - -wingpanel-with-indicators.override { - useDefaultIndicators = false; - indicators = specialListOfIndicators; -}; - -switchboard-with-plugs.override { - useDefaultPlugs = false; - plugs = specialListOfPlugs; -}; - - - this could be most useful for testing a particular plug-in in - isolation. - -
-
- FAQ - - - - I have - switched from a different desktop and Pantheon’s theming looks - messed up. - - - - Open Switchboard and go to: Administration → About → Restore - Default Settings → Restore Settings. This will reset any - dconf settings to their Pantheon defaults. Note this could - reset certain GNOME specific preferences if that desktop was - used prior. - - - - - - I - cannot enable both GNOME and Pantheon. - - - - This is a known - issue - and there is no known workaround. - - - - - - Does AppCenter - work, or is it available? - - - - AppCenter has been available since 20.03. Starting from - 21.11, the Flatpak backend should work so you can install - some Flatpak applications using it. However, due to missing - appstream metadata, the Packagekit backend does not function - currently. See this - issue. - - - If you are using Pantheon, AppCenter should be installed by - default if you have - Flatpak - support enabled. If you also wish to add the - appcenter Flatpak remote: - - -$ flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo - - - - -
- diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index b295b9a109..65b94f61c4 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -365,6 +365,7 @@ in pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ ]; optionalPackages = [ + pkgs.aha # needed by kinfocenter for fwupd support plasma-browser-integration konsole oxygen 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 f74e8efb8f..65f414705f 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 @@ -32,7 +32,7 @@ let usersConf = writeText "users.conf" '' [UserList] - minimum-uid=500 + minimum-uid=1000 hidden-users=${concatStringsSep " " dmcfg.hiddenUsers} hidden-shells=/run/current-system/sw/bin/nologin ''; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/external/external.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/external/external.nix index 7c5455bb47..926cbd2b4b 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/external/external.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/external/external.nix @@ -8,7 +8,7 @@ in { meta = { maintainers = with maintainers; [ cole-h grahamc raitobezarius ]; - doc = ./external.xml; + doc = ./external.md; }; options.boot.loader.external = { diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/external/external.xml b/third_party/nixpkgs/nixos/modules/system/boot/loader/external/external.xml deleted file mode 100644 index 9a392c2744..0000000000 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/external/external.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - External Bootloader Backends - - NixOS has support for several bootloader backends by default: - systemd-boot, grub, uboot, etc. The built-in bootloader backend - support is generic and supports most use cases. Some users may - prefer to create advanced workflows around managing the bootloader - and bootable entries. - - - You can replace the built-in bootloader support with your own - tooling using the external bootloader option. - - - Imagine you have created a new package called FooBoot. FooBoot - provides a program at - ${pkgs.fooboot}/bin/fooboot-install which takes - the system closure’s path as its only argument and configures the - system’s bootloader. - - - You can enable FooBoot like this: - - -{ pkgs, ... }: { - boot.loader.external = { - enable = true; - installHook = "${pkgs.fooboot}/bin/fooboot-install"; - }; -} - -
- Developing Custom Bootloader Backends - - Bootloaders should use - RFC-0125’s - Bootspec format and synthesis tools to identify the key properties - for bootable system generations. - -
- diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script.nix index 908f8b8e8c..4d33ed6b66 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script.nix @@ -8,7 +8,7 @@ let src = ./init-script-builder.sh; isExecutable = true; inherit (pkgs) bash; - inherit (config.nixos.system) distroName; + inherit (config.system.nixos) distroName; path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep]; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index ea3577f138..3e3683211f 100755 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -42,7 +42,7 @@ def system_dir(profile: Optional[str], generation: int, specialisation: Optional else: return d -BOOT_ENTRY = """title @distroName@{profile}{specialisation} +BOOT_ENTRY = """title {title} version Generation {generation} {description} linux {kernel} initrd {initrd} @@ -106,14 +106,29 @@ def describe_generation(generation_dir: str) -> str: return description -def write_entry(profile: Optional[str], generation: int, specialisation: Optional[str], machine_id: str) -> None: +def write_entry(profile: Optional[str], generation: int, specialisation: Optional[str], + machine_id: str, current: bool) -> None: kernel = copy_from_profile(profile, generation, specialisation, "kernel") initrd = copy_from_profile(profile, generation, specialisation, "initrd") + + title = "@distroName@{profile}{specialisation}".format( + profile=" [" + profile + "]" if profile else "", + specialisation=" (%s)" % specialisation if specialisation else "") + try: append_initrd_secrets = profile_path(profile, generation, specialisation, "append-initrd-secrets") subprocess.check_call([append_initrd_secrets, "@efiSysMountPoint@%s" % (initrd)]) except FileNotFoundError: pass + except subprocess.CalledProcessError: + if current: + print("failed to create initrd secrets!", file=sys.stderr) + sys.exit(1) + else: + print("warning: failed to create initrd secrets " + f'for "{title} - Configuration {generation}", an older generation', file=sys.stderr) + print("note: this is normal after having removed " + "or renamed a file in `boot.initrd.secrets`", file=sys.stderr) entry_file = "@efiSysMountPoint@/loader/entries/%s" % ( generation_conf_filename(profile, generation, specialisation)) generation_dir = os.readlink(system_dir(profile, generation, specialisation)) @@ -123,8 +138,7 @@ def write_entry(profile: Optional[str], generation: int, specialisation: Optiona with open("%s/kernel-params" % (generation_dir)) as params_file: kernel_params = kernel_params + params_file.read() with open(tmp_path, 'w') as f: - f.write(BOOT_ENTRY.format(profile=" [" + profile + "]" if profile else "", - specialisation=" (%s)" % specialisation if specialisation else "", + f.write(BOOT_ENTRY.format(title=title, generation=generation, kernel=kernel, initrd=initrd, @@ -228,20 +242,21 @@ def main() -> None: warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning) os.environ["NIXOS_INSTALL_BOOTLOADER"] = "1" + # flags to pass to bootctl install/update + bootctl_flags = [] + + if "@canTouchEfiVariables@" != "1": + bootctl_flags.append("--no-variables") + + if "@graceful@" == "1": + bootctl_flags.append("--graceful") + if os.getenv("NIXOS_INSTALL_BOOTLOADER") == "1": # bootctl uses fopen() with modes "wxe" and fails if the file exists. if os.path.exists("@efiSysMountPoint@/loader/loader.conf"): os.unlink("@efiSysMountPoint@/loader/loader.conf") - flags = [] - - if "@canTouchEfiVariables@" != "1": - flags.append("--no-variables") - - if "@graceful@" == "1": - flags.append("--graceful") - - subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + flags + ["install"]) + subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["install"]) else: # Update bootloader to latest if needed available_out = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[2] @@ -270,7 +285,7 @@ def main() -> None: print("skipping systemd-boot update to %s because of known regression" % available_version) else: print("updating systemd-boot from %s to %s" % (installed_version, available_version)) - subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@", "update"]) + subprocess.check_call(["@systemd@/bin/bootctl", "--esp-path=@efiSysMountPoint@"] + bootctl_flags + ["update"]) mkdir_p("@efiSysMountPoint@/efi/nixos") mkdir_p("@efiSysMountPoint@/loader/entries") @@ -281,10 +296,11 @@ def main() -> None: remove_old_entries(gens) for gen in gens: try: - write_entry(*gen, machine_id) + is_default = os.readlink(system_dir(*gen)) == args.default_config + write_entry(*gen, machine_id, current=is_default) for specialisation in get_specialisations(*gen): - write_entry(*specialisation, machine_id) - if os.readlink(system_dir(*gen)) == args.default_config: + write_entry(*specialisation, machine_id, current=is_default) + if is_default: write_loader_conf(*gen) except OSError as e: profile = f"profile '{gen.profile}'" if gen.profile else "default profile" diff --git a/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix b/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix index 54bb7ea9dd..d751c4462d 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix @@ -7,7 +7,7 @@ with lib; ###### interface options = { - boot.modprobeConfig.enable = mkEnableOption (lib.mdDoc "modprobe config. This is useful for systemds like containers which do not require a kernel.") // { + boot.modprobeConfig.enable = mkEnableOption (lib.mdDoc "modprobe config. This is useful for systems like containers which do not require a kernel") // { default = true; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix b/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix index 9b6472fea4..a1ab709385 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix @@ -146,6 +146,9 @@ in systemd.services.systemd-ask-password-plymouth.wantedBy = [ "multi-user.target" ]; systemd.paths.systemd-ask-password-plymouth.wantedBy = [ "multi-user.target" ]; + # Prevent Plymouth taking over the screen during system updates. + systemd.services.plymouth-start.restartIfChanged = false; + boot.initrd.systemd = { extraBin.plymouth = "${plymouth}/bin/plymouth"; # for the recovery shell storePaths = [ diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/coredump.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/coredump.nix index c2ca973d38..03ef00e568 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/coredump.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/coredump.nix @@ -44,7 +44,21 @@ in { ''; # install provided sysctl snippets - "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; + "sysctl.d/50-coredump.conf".source = + # Fix systemd-coredump error caused by truncation of `kernel.core_pattern` + # when the `systemd` derivation name is too long. This works by substituting + # the path to `systemd` with a symlink that has a constant-length path. + # + # See: https://github.com/NixOS/nixpkgs/issues/213408 + pkgs.substitute { + src = "${systemd}/example/sysctl.d/50-coredump.conf"; + replacements = [ + "--replace" + "${systemd}" + "${pkgs.symlinkJoin { name = "systemd"; paths = [ systemd ]; }}" + ]; + }; + "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix index d30f61146e..620d76aef2 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix @@ -343,9 +343,11 @@ in { system.build = { inherit initialRamdisk; }; boot.initrd.availableKernelModules = [ - "autofs4" # systemd needs this for some features - "tpm-tis" "tpm-crb" # systemd-cryptenroll - ]; + # systemd needs this for some features + "autofs4" + # systemd-cryptenroll + "tpm-tis" + ] ++ lib.optional (pkgs.stdenv.hostPlatform.system != "riscv64-linux") "tpm-crb"; boot.initrd.systemd = { initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package] ++ config.system.fsPackages; diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/envfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/envfs.nix index ef8f655c53..450b805f0f 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/envfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/envfs.nix @@ -35,7 +35,7 @@ in { type = lib.types.package; description = lib.mdDoc "Which package to use for the envfs."; default = pkgs.envfs; - defaultText = lib.mdDoc "pkgs.envfs"; + defaultText = lib.literalExpression "pkgs.envfs"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-options.nix b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-options.nix index 926fe43b0f..3ea4a6cf78 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-options.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-options.nix @@ -28,13 +28,13 @@ in { options = { mount = lib.mkOption { description = lib.mdDoc "Where to mount this dataset."; - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; }; properties = lib.mkOption { description = lib.mdDoc "Properties to set on this dataset."; - type = types.attrsOf types.string; + type = types.attrsOf types.str; default = {}; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/openstack-options.nix b/third_party/nixpkgs/nixos/modules/virtualisation/openstack-options.nix index c71b581b02..52f45de92e 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/openstack-options.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/openstack-options.nix @@ -29,13 +29,13 @@ in options = { mount = lib.mkOption { description = lib.mdDoc "Where to mount this dataset."; - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; }; properties = lib.mkOption { description = lib.mdDoc "Properties to set on this dataset."; - type = types.attrsOf types.string; + type = types.attrsOf types.str; default = { }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index 4520408ca3..06210529eb 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -211,7 +211,7 @@ let '' mkdir $out diskImage=$out/disk.img - ${qemu}/bin/qemu-img create -f qcow2 $diskImage "60M" + ${qemu}/bin/qemu-img create -f qcow2 $diskImage "120M" ${if cfg.useEFIBoot then '' efiVars=$out/efi-vars.fd cp ${cfg.efi.variables} $efiVars @@ -225,7 +225,7 @@ let + " -drive if=pflash,format=raw,unit=1,file=$efiVars"); } '' - # Create a /boot EFI partition with 60M and arbitrary but fixed GUIDs for reproducibility + # Create a /boot EFI partition with 120M and arbitrary but fixed GUIDs for reproducibility ${pkgs.gptfdisk}/bin/sgdisk \ --set-alignment=1 --new=1:34:2047 --change-name=1:BIOSBootPartition --typecode=1:ef02 \ --set-alignment=512 --largest-new=2 --change-name=2:EFISystem --typecode=2:ef00 \ diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 9bf85cd0b9..a041faa8fe 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -126,14 +126,17 @@ in { cfssl = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cfssl.nix {}; charliecloud = handleTest ./charliecloud.nix {}; chromium = (handleTestOn ["aarch64-linux" "x86_64-linux"] ./chromium.nix {}).stable or {}; + chrony-ptp = handleTestOn ["aarch64-linux" "x86_64-linux"] ./chrony-ptp.nix {}; cinnamon = handleTest ./cinnamon.nix {}; cjdns = handleTest ./cjdns.nix {}; clickhouse = handleTest ./clickhouse.nix {}; cloud-init = handleTest ./cloud-init.nix {}; cloud-init-hostname = handleTest ./cloud-init-hostname.nix {}; + cloudlog = handleTest ./cloudlog.nix {}; cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {}; cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {}; collectd = handleTest ./collectd.nix {}; + connman = handleTest ./connman.nix {}; consul = handleTest ./consul.nix {}; containers-bridge = handleTest ./containers-bridge.nix {}; containers-custom-pkgs.nix = handleTest ./containers-custom-pkgs.nix {}; @@ -484,6 +487,7 @@ in { opensmtpd = handleTest ./opensmtpd.nix {}; opensmtpd-rspamd = handleTest ./opensmtpd-rspamd.nix {}; openssh = handleTest ./openssh.nix {}; + octoprint = handleTest ./octoprint.nix {}; openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {}; openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; opentabletdriver = handleTest ./opentabletdriver.nix {}; @@ -749,6 +753,7 @@ in { zigbee2mqtt = handleTest ./zigbee2mqtt.nix {}; zoneminder = handleTest ./zoneminder.nix {}; zookeeper = handleTest ./zookeeper.nix {}; + zram-generator = handleTest ./zram-generator.nix {}; zrepl = handleTest ./zrepl.nix {}; zsh-history = handleTest ./zsh-history.nix {}; } diff --git a/third_party/nixpkgs/nixos/tests/apfs.nix b/third_party/nixpkgs/nixos/tests/apfs.nix index a8841fe930..ac0459b57e 100644 --- a/third_party/nixpkgs/nixos/tests/apfs.nix +++ b/third_party/nixpkgs/nixos/tests/apfs.nix @@ -21,9 +21,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { with subtest("Enable case sensitivity and normalization sensitivity"): machine.succeed( "mkapfs -s -z /dev/vdb", - # Triggers a bug, see https://github.com/linux-apfs/linux-apfs-rw/issues/15 - # "mount -o cknodes,readwrite /dev/vdb /tmp/mnt", - "mount -o readwrite /dev/vdb /tmp/mnt", + "mount -o cknodes,readwrite /dev/vdb /tmp/mnt", "echo 'Hello World 1' > /tmp/mnt/test.txt", "[ ! -f /tmp/mnt/TeSt.TxT ] || false", # Test case sensitivity "echo 'Hello World 1' | diff - /tmp/mnt/test.txt", @@ -36,13 +34,13 @@ import ./make-test-python.nix ({ pkgs, ... }: { with subtest("Disable case sensitivity and normalization sensitivity"): machine.succeed( "mkapfs /dev/vdb", - "mount -o readwrite /dev/vdb /tmp/mnt", + "mount -o cknodes,readwrite /dev/vdb /tmp/mnt", "echo 'bla bla bla' > /tmp/mnt/Test.txt", "echo -n 'Hello World' > /tmp/mnt/test.txt", "echo ' 1' >> /tmp/mnt/TEST.TXT", "umount /tmp/mnt", "apfsck /dev/vdb", - "mount -o readwrite /dev/vdb /tmp/mnt", + "mount -o cknodes,readwrite /dev/vdb /tmp/mnt", "echo 'Hello World 1' | diff - /tmp/mnt/TeSt.TxT", # Test case insensitivity "echo 'Hello World 2' > /tmp/mnt/\u0061\u0301.txt", "echo 'Hello World 2' | diff - /tmp/mnt/\u0061\u0301.txt", diff --git a/third_party/nixpkgs/nixos/tests/ceph-single-node.nix b/third_party/nixpkgs/nixos/tests/ceph-single-node.nix index 4fe5dc59ff..4a5636fac1 100644 --- a/third_party/nixpkgs/nixos/tests/ceph-single-node.nix +++ b/third_party/nixpkgs/nixos/tests/ceph-single-node.nix @@ -181,6 +181,17 @@ let monA.wait_until_succeeds("ceph osd stat | grep -e '3 osds: 3 up[^,]*, 3 in'") monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'") monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") + + # Enable the dashboard and recheck health + monA.succeed( + "ceph mgr module enable dashboard", + "ceph config set mgr mgr/dashboard/ssl false", + # default is 8080 but it's better to be explicit + "ceph config set mgr mgr/dashboard/server_port 8080", + ) + monA.wait_for_open_port(8080) + monA.wait_until_succeeds("curl -q --fail http://localhost:8080") + monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") ''; in { name = "basic-single-node-ceph-cluster"; diff --git a/third_party/nixpkgs/nixos/tests/chrony-ptp.nix b/third_party/nixpkgs/nixos/tests/chrony-ptp.nix new file mode 100644 index 0000000000..b2634a8cfc --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/chrony-ptp.nix @@ -0,0 +1,28 @@ +import ./make-test-python.nix ({ lib, ... }: +{ + name = "chrony-ptp"; + + meta = { + maintainers = with lib.maintainers; [ gkleen ]; + }; + + nodes = { + qemuGuest = { lib, ... }: { + boot.kernelModules = [ "ptp_kvm" ]; + + services.chrony = { + enable = true; + extraConfig = '' + refclock PHC /dev/ptp_kvm poll 2 dpoll -2 offset 0 stratum 3 + ''; + }; + }; + }; + + testScript = '' + start_all() + + qemuGuest.wait_for_unit('multi-user.target') + qemuGuest.succeed('systemctl is-active chronyd.service') + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/cloudlog.nix b/third_party/nixpkgs/nixos/tests/cloudlog.nix new file mode 100644 index 0000000000..c99951c1b2 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/cloudlog.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "cloudlog"; + meta = { + maintainers = with pkgs.lib.maintainers; [ melling ]; + }; + nodes = { + machine = { + services.mysql.package = pkgs.mariadb; + services.cloudlog.enable = true; + }; + }; + testScript = '' + start_all() + machine.wait_for_unit("phpfpm-cloudlog") + machine.wait_for_open_port(80); + machine.wait_until_succeeds("curl -s -L --fail http://localhost | grep 'Login - Cloudlog'") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/connman.nix b/third_party/nixpkgs/nixos/tests/connman.nix new file mode 100644 index 0000000000..348b2a895a --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/connman.nix @@ -0,0 +1,77 @@ +import ./make-test-python.nix ({ pkgs, lib, ...}: +{ + name = "connman"; + meta = with lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + # Router running radvd on VLAN 1 + nodes.router = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + + virtualisation.vlans = [ 1 ]; + + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; + + networking = { + useDHCP = false; + interfaces.eth1.ipv6.addresses = + [ { address = "fd12::1"; prefixLength = 64; } ]; + }; + + services.radvd = { + enable = true; + config = '' + interface eth1 { + AdvSendAdvert on; + AdvManagedFlag on; + AdvOtherConfigFlag on; + prefix fd12::/64 { + AdvAutonomous off; + }; + }; + ''; + }; + }; + + # Client running connman, connected to VLAN 1 + nodes.client = { ... }: { + virtualisation.vlans = [ 1 ]; + + # add a virtual wlan interface + boot.kernelModules = [ "mac80211_hwsim" ]; + boot.extraModprobeConfig = '' + options mac80211_hwsim radios=1 + ''; + + # Note: the overrides are needed because the wifi is + # disabled with mkVMOverride in qemu-vm.nix. + services.connman.enable = lib.mkOverride 0 true; + services.connman.networkInterfaceBlacklist = [ "eth0" ]; + networking.wireless.enable = lib.mkOverride 0 true; + networking.wireless.interfaces = [ "wlan0" ]; + }; + + testScript = + '' + start_all() + + with subtest("Router is ready"): + router.wait_for_unit("radvd.service") + + with subtest("Daemons are running"): + client.wait_for_unit("wpa_supplicant-wlan0.service") + client.wait_for_unit("connman.service") + client.wait_until_succeeds("connmanctl state | grep -q ready") + + with subtest("Wired interface is configured"): + client.wait_until_succeeds("ip -6 route | grep -q fd12::/64") + client.wait_until_succeeds("ping -c 1 fd12::1") + + with subtest("Can set up a wireless access point"): + client.succeed("connmanctl enable wifi") + client.wait_until_succeeds("connmanctl tether wifi on nixos-test reproducibility | grep -q 'Enabled'") + client.wait_until_succeeds("iw wlan0 info | grep -q nixos-test") + ''; +}) + diff --git a/third_party/nixpkgs/nixos/tests/grafana/provision/default.nix b/third_party/nixpkgs/nixos/tests/grafana/provision/default.nix index 1eb927632e..96378452ad 100644 --- a/third_party/nixpkgs/nixos/tests/grafana/provision/default.nix +++ b/third_party/nixpkgs/nixos/tests/grafana/provision/default.nix @@ -22,9 +22,15 @@ let }; }; - systemd.tmpfiles.rules = [ - "L /var/lib/grafana/dashboards/test.json 0700 grafana grafana - ${pkgs.writeText "test.json" (builtins.readFile ./test_dashboard.json)}" - ]; + system.activationScripts.setup-grafana = { + deps = [ "users" ]; + text = '' + mkdir -p /var/lib/grafana/dashboards + chown -R grafana:grafana /var/lib/grafana + chmod 0700 -R /var/lib/grafana/dashboards + cp ${pkgs.writeText "test.json" (builtins.readFile ./test_dashboard.json)} /var/lib/grafana/dashboards/ + ''; + }; }; extraNodeConfs = { diff --git a/third_party/nixpkgs/nixos/tests/installed-tests/fwupd.nix b/third_party/nixpkgs/nixos/tests/installed-tests/fwupd.nix index 65614e2689..c095a50dc8 100644 --- a/third_party/nixpkgs/nixos/tests/installed-tests/fwupd.nix +++ b/third_party/nixpkgs/nixos/tests/installed-tests/fwupd.nix @@ -5,7 +5,7 @@ makeInstalledTest { testConfig = { services.fwupd.enable = true; - services.fwupd.disabledPlugins = lib.mkForce []; # don't disable test plugin + services.fwupd.daemonSettings.DisabledPlugins = lib.mkForce [ ]; # don't disable test plugin services.fwupd.enableTestRemote = true; }; } diff --git a/third_party/nixpkgs/nixos/tests/installer.nix b/third_party/nixpkgs/nixos/tests/installer.nix index 50b85560e1..3adfa979ed 100644 --- a/third_party/nixpkgs/nixos/tests/installer.nix +++ b/third_party/nixpkgs/nixos/tests/installer.nix @@ -51,7 +51,7 @@ let boot.loader.systemd-boot.enable = true; ''} - boot.initrd.secrets."/etc/secret" = /etc/nixos/secret; + boot.initrd.secrets."/etc/secret" = ./secret; users.users.alice = { isNormalUser = true; diff --git a/third_party/nixpkgs/nixos/tests/kernel-generic.nix b/third_party/nixpkgs/nixos/tests/kernel-generic.nix index ae3d47a49b..3e74554de3 100644 --- a/third_party/nixpkgs/nixos/tests/kernel-generic.nix +++ b/third_party/nixpkgs/nixos/tests/kernel-generic.nix @@ -30,7 +30,6 @@ let linux_5_4_hardened linux_5_10_hardened linux_5_15_hardened - linux_6_0_hardened linux_6_1_hardened linux_testing; diff --git a/third_party/nixpkgs/nixos/tests/networking.nix b/third_party/nixpkgs/nixos/tests/networking.nix index 71b82b8712..441d258afc 100644 --- a/third_party/nixpkgs/nixos/tests/networking.nix +++ b/third_party/nixpkgs/nixos/tests/networking.nix @@ -971,6 +971,7 @@ let print(machine.succeed("ip link show dev custom_name")) ''; }; + nodes = { }; # even with disabled networkd, systemd.network.links should work # (as it's handled by udev, not networkd) link = { diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/default.nix b/third_party/nixpkgs/nixos/tests/nextcloud/default.nix index b8d3ba75b5..350486e8c7 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/default.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/default.nix @@ -26,4 +26,4 @@ foldl }; }) { } - [ 24 25 ] + [ 24 25 26 ] diff --git a/third_party/nixpkgs/nixos/tests/nginx.nix b/third_party/nixpkgs/nixos/tests/nginx.nix index 73f1133bd6..d9d073822a 100644 --- a/third_party/nixpkgs/nixos/tests/nginx.nix +++ b/third_party/nixpkgs/nixos/tests/nginx.nix @@ -61,7 +61,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { specialisation.reloadWithErrorsSystem.configuration = { services.nginx.package = pkgs.nginxMainline; - services.nginx.virtualHosts."hello".extraConfig = "access_log /does/not/exist.log;"; + services.nginx.virtualHosts."!@$$(#*%".locations."~@#*$*!)".proxyPass = ";;;"; }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/nscd.nix b/third_party/nixpkgs/nixos/tests/nscd.nix index 1922812ef8..356c6d2e2a 100644 --- a/third_party/nixpkgs/nixos/tests/nscd.nix +++ b/third_party/nixpkgs/nixos/tests/nscd.nix @@ -40,11 +40,12 @@ in }; specialisation = { - withUnscd.configuration = { ... }: { - services.nscd.package = pkgs.unscd; + withGlibcNscd.configuration = { ... }: { + services.nscd.enableNsncd = false; }; - withNsncd.configuration = { ... }: { - services.nscd.enableNsncd = true; + withUnscd.configuration = { ... }: { + services.nscd.enableNsncd = false; + services.nscd.package = pkgs.unscd; }; }; }; @@ -118,6 +119,14 @@ in test_host_lookups() test_nss_myhostname() + with subtest("glibc-nscd"): + machine.succeed('${specialisations}/withGlibcNscd/bin/switch-to-configuration test') + machine.wait_for_unit("default.target") + + test_dynamic_user() + test_host_lookups() + test_nss_myhostname() + with subtest("unscd"): machine.succeed('${specialisations}/withUnscd/bin/switch-to-configuration test') machine.wait_for_unit("default.target") @@ -129,13 +138,5 @@ in # known to fail, unscd doesn't load external NSS modules # test_nss_myhostname() - - with subtest("nsncd"): - machine.succeed('${specialisations}/withNsncd/bin/switch-to-configuration test') - machine.wait_for_unit("default.target") - - test_dynamic_user() - test_host_lookups() - test_nss_myhostname() ''; }) diff --git a/third_party/nixpkgs/nixos/tests/octoprint.nix b/third_party/nixpkgs/nixos/tests/octoprint.nix new file mode 100644 index 0000000000..15a2d677d4 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/octoprint.nix @@ -0,0 +1,61 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + +let + apikey = "testapikey"; +in +{ + name = "octoprint"; + meta.maintainers = with lib.maintainers; [ gador ]; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ jq ]; + services.octoprint = { + enable = true; + extraConfig = { + server = { + firstRun = false; + }; + api = { + enabled = true; + key = apikey; + }; + plugins = { + # these need internet access and pollute the output with connection failed errors + _disabled = [ "softwareupdate" "announcements" "pluginmanager" ]; + }; + }; + }; + }; + + testScript = '' + import json + + @polling_condition + def octoprint_running(): + machine.succeed("pgrep octoprint") + + with subtest("Wait for octoprint service to start"): + machine.wait_for_unit("octoprint.service") + machine.wait_until_succeeds("pgrep octoprint") + + with subtest("Wait for final boot"): + # this appears whe octoprint is almost finished starting + machine.wait_for_file("/var/lib/octoprint/uploads") + + # octoprint takes some time to start. This makes sure we'll retry just in case it takes longer + # retry-all-errors in necessary, since octoprint will report a 404 error when not yet ready + curl_cmd = "curl --retry-all-errors --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 0 \ + --retry-max-time 40 -X GET --header 'X-API-Key: ${apikey}' " + + # used to fail early, in case octoprint first starts and then crashes + with octoprint_running: # type: ignore[union-attr] + with subtest("Check for web interface"): + machine.wait_until_succeeds("curl -s localhost:5000") + + with subtest("Check API"): + version = json.loads(machine.succeed(curl_cmd + "localhost:5000/api/version")) + server = json.loads(machine.succeed(curl_cmd + "localhost:5000/api/server")) + assert version["server"] == str("${pkgs.octoprint.version}") + assert server["safemode"] == None + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/pantheon.nix b/third_party/nixpkgs/nixos/tests/pantheon.nix index 52f85f5c07..0773fc0472 100644 --- a/third_party/nixpkgs/nixos/tests/pantheon.nix +++ b/third_party/nixpkgs/nixos/tests/pantheon.nix @@ -20,8 +20,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : enableOCR = true; testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; - bob = nodes.machine.config.users.users.bob; + user = nodes.machine.users.users.alice; + bob = nodes.machine.users.users.bob; in '' machine.wait_for_unit("display-manager.service") @@ -40,7 +40,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with subtest("Check that logging in has given the user ownership of devices"): machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") - # TODO: DBus API could eliminate this? Pantheon uses Bamf. with subtest("Check if pantheon session components actually start"): machine.wait_until_succeeds("pgrep gala") machine.wait_for_window("gala") @@ -49,6 +48,12 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : machine.wait_until_succeeds("pgrep plank") machine.wait_for_window("plank") + with subtest("Open system settings"): + machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.switchboard >&2 &'") + # Wait for all plugins to be loaded before we check if the window is still there. + machine.sleep(5) + machine.wait_for_window("io.elementary.switchboard") + with subtest("Open elementary terminal"): machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal >&2 &'") machine.wait_for_window("io.elementary.terminal") diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index 5f50a3f87d..82d50da638 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -1060,6 +1060,20 @@ let ''; }; + shelly = { + exporterConfig = { + enable = true; + metrics-file = "${pkgs.writeText "test.json" ''{}''}"; + }; + exporterTest = '' + wait_for_unit("prometheus-shelly-exporter.service") + wait_for_open_port(9784) + wait_until_succeeds( + "curl -sSf 'localhost:9784/metrics'" + ) + ''; + }; + script = { exporterConfig = { enable = true; diff --git a/third_party/nixpkgs/nixos/tests/restic.nix b/third_party/nixpkgs/nixos/tests/restic.nix index 3681c4cf19..42af078386 100644 --- a/third_party/nixpkgs/nixos/tests/restic.nix +++ b/third_party/nixpkgs/nixos/tests/restic.nix @@ -7,17 +7,27 @@ import ./make-test-python.nix ( rcloneRepository = "rclone:local:/tmp/restic-rclone-backup"; backupPrepareCommand = '' - touch /opt/backupPrepareCommand - test ! -e /opt/backupCleanupCommand + touch /tmp/backupPrepareCommand + test ! -e /tmp/backupCleanupCommand ''; backupCleanupCommand = '' - rm /opt/backupPrepareCommand - touch /opt/backupCleanupCommand + rm /tmp/backupPrepareCommand + touch /tmp/backupCleanupCommand ''; + testDir = pkgs.stdenvNoCC.mkDerivation { + name = "test-files-to-backup"; + unpackPhase = "true"; + installPhase = '' + mkdir $out + touch $out/some_file + ''; + }; + passwordFile = "${pkgs.writeText "password" "correcthorsebatterystaple"}"; paths = [ "/opt" ]; + exclude = [ "/opt/excluded_file_*" ]; pruneOpts = [ "--keep-daily 2" "--keep-weekly 1" @@ -38,17 +48,17 @@ import ./make-test-python.nix ( { services.restic.backups = { remotebackup = { - inherit passwordFile paths pruneOpts backupPrepareCommand backupCleanupCommand; + inherit passwordFile paths exclude pruneOpts backupPrepareCommand backupCleanupCommand; repository = remoteRepository; initialize = true; }; remote-from-file-backup = { - inherit passwordFile paths pruneOpts; + inherit passwordFile paths exclude pruneOpts; initialize = true; repositoryFile = pkgs.writeText "repositoryFile" remoteFromFileRepository; }; rclonebackup = { - inherit passwordFile paths pruneOpts; + inherit passwordFile paths exclude pruneOpts; initialize = true; repository = rcloneRepository; rcloneConfig = { @@ -94,16 +104,21 @@ import ./make-test-python.nix ( ) server.succeed( # set up - "mkdir -p /opt", - "touch /opt/some_file", + "cp -rT ${testDir} /opt", + "touch /opt/excluded_file_1 /opt/excluded_file_2", "mkdir -p /tmp/restic-rclone-backup", # test that remotebackup runs custom commands and produces a snapshot "timedatectl set-time '2016-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", '${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + # test that restoring that snapshot produces the same directory + "mkdir /tmp/restore-1", + "${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} restore latest -t /tmp/restore-1", + "diff -ru ${testDir} /tmp/restore-1/opt", + # test that remote-from-file-backup produces a snapshot "systemctl start restic-backups-remote-from-file-backup.service", '${pkgs.restic}/bin/restic -r ${remoteFromFileRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', @@ -120,27 +135,27 @@ import ./make-test-python.nix ( # test that we can create four snapshots in remotebackup and rclonebackup "timedatectl set-time '2017-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-14 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-15 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", "timedatectl set-time '2018-12-16 13:45'", "systemctl start restic-backups-remotebackup.service", - "rm /opt/backupCleanupCommand", + "rm /tmp/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", '${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 4"', diff --git a/third_party/nixpkgs/nixos/tests/stratis/simple.nix b/third_party/nixpkgs/nixos/tests/stratis/simple.nix index 7357d71fc5..543789f59c 100644 --- a/third_party/nixpkgs/nixos/tests/stratis/simple.nix +++ b/third_party/nixpkgs/nixos/tests/stratis/simple.nix @@ -8,7 +8,7 @@ import ../make-test-python.nix ({ pkgs, ... }: nodes.machine = { pkgs, ... }: { services.stratis.enable = true; - virtualisation.emptyDiskImages = [ 1024 1024 1024 1024 ]; + virtualisation.emptyDiskImages = [ 2048 1024 1024 1024 ]; }; testScript = '' diff --git a/third_party/nixpkgs/nixos/tests/systemd-boot.nix b/third_party/nixpkgs/nixos/tests/systemd-boot.nix index 039e6bdd9d..94e269ff37 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-boot.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-boot.nix @@ -101,13 +101,13 @@ in # Replace version inside sd-boot with something older. See magic[] string in systemd src/boot/efi/boot.c machine.succeed( """ - find /boot -iname '*.efi' -print0 | \ + find /boot -iname '*boot*.efi' -print0 | \ xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot 000.0-1-notnixos ####/' '{}' """ ) output = machine.succeed("/run/current-system/bin/switch-to-configuration boot") - assert "updating systemd-boot from (000.0-1-notnixos) to " in output + assert "updating systemd-boot from 000.0-1-notnixos to " in output ''; }; diff --git a/third_party/nixpkgs/nixos/tests/tracee.nix b/third_party/nixpkgs/nixos/tests/tracee.nix index 6ef7e5342b..1609d3abc6 100644 --- a/third_party/nixpkgs/nixos/tests/tracee.nix +++ b/third_party/nixpkgs/nixos/tests/tracee.nix @@ -2,28 +2,33 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "tracee-integration"; nodes = { machine = { config, pkgs, ... }: { - # EventFilters/trace_only_events_from_new_containers requires docker - # podman with docker compat will suffice - virtualisation.podman.enable = true; - virtualisation.podman.dockerCompat = true; + # EventFilters/trace_only_events_from_new_containers and + # Test_EventFilters/trace_only_events_from_"dockerd"_binary_and_contain_it's_pid + # require docker/dockerd + virtualisation.docker.enable = true; environment.systemPackages = [ + # required by Test_EventFilters/trace_events_from_ls_and_which_binary_in_separate_scopes + pkgs.which # build the go integration tests as a binary (pkgs.tracee.overrideAttrs (oa: { pname = oa.pname + "-integration"; - patches = oa.patches or [] ++ [ - # change the prefix from /usr/bin to /run to find nix processes - ../../pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch - ]; + postPatch = oa.postPatch or "" + '' + # prepare tester.sh (which will be embedded in the test binary) + patchShebangs tests/integration/tester.sh + + # fix the test to look at nixos paths for running programs + substituteInPlace tests/integration/integration_test.go \ + --replace "bin=/usr/bin/" "comm=" \ + --replace "/usr/bin/dockerd" "dockerd" \ + --replace "/usr/bin" "/run/current-system/sw/bin" + ''; + nativeBuildInputs = oa.nativeBuildInputs or [ ] ++ [ pkgs.makeWrapper ]; buildPhase = '' runHook preBuild # just build the static lib we need for the go test binary make $makeFlags ''${enableParallelBuilding:+-j$NIX_BUILD_CORES} bpf-core ./dist/btfhub - # remove the /usr/bin prefix to work with the patch above - substituteInPlace tests/integration/integration_test.go \ - --replace "/usr/bin/ls" "ls" - # then compile the tests to be ran later CGO_LDFLAGS="$(pkg-config --libs libbpf)" go test -tags core,ebpf,integration -p 1 -c -o $GOPATH/tracee-integration ./tests/integration/... runHook postBuild @@ -31,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { doCheck = false; installPhase = '' mkdir -p $out/bin - cp $GOPATH/tracee-integration $out/bin + mv $GOPATH/tracee-integration $out/bin/ ''; doInstallCheck = false; })) @@ -40,10 +45,16 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; testScript = '' + machine.wait_for_unit("docker.service") + with subtest("run integration tests"): # EventFilters/trace_only_events_from_new_containers also requires a container called "alpine" - machine.succeed('tar cv -C ${pkgs.pkgsStatic.busybox} . | podman import - alpine --change ENTRYPOINT=sleep') + machine.succeed('tar c -C ${pkgs.pkgsStatic.busybox} . | docker import - alpine --change "ENTRYPOINT [\"sleep\"]"') - print(machine.succeed('TRC_BIN="${pkgs.tracee}" tracee-integration -test.v')) + # Test_EventFilters/trace_event_set_in_a_specific_scope expects to be in a dir that includes "integration" + print(machine.succeed( + 'mkdir /tmp/integration', + 'cd /tmp/integration && tracee-integration -test.v' + )) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/zram-generator.nix b/third_party/nixpkgs/nixos/tests/zram-generator.nix new file mode 100644 index 0000000000..affa081bcc --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/zram-generator.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix { + name = "zram-generator"; + + nodes.machine = { pkgs, ... }: { + environment.etc."systemd/zram-generator.conf".text = '' + [zram0] + zram-size = ram / 2 + ''; + systemd.packages = [ pkgs.zram-generator ]; + systemd.services."systemd-zram-setup@".path = [ pkgs.util-linux ]; # for mkswap + }; + + testScript = '' + machine.wait_for_unit("systemd-zram-setup@zram0.service") + assert "zram0" in machine.succeed("zramctl -n") + assert "zram0" in machine.succeed("swapon --show --noheadings") + ''; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/aaxtomp3/default.nix b/third_party/nixpkgs/pkgs/applications/audio/aaxtomp3/default.nix index 358dfce0d4..59bd228d47 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/aaxtomp3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/aaxtomp3/default.nix @@ -1,31 +1,22 @@ -{ coreutils +{ bash +, bc +, coreutils , fetchFromGitHub , ffmpeg , findutils +, gawk , gnugrep , gnused , jq , lame , lib -, makeWrapper , mediainfo , mp4v2 -, stdenv +, ncurses +, resholve }: -let - runtimeInputs = [ - coreutils - ffmpeg - findutils - gnugrep - gnused - jq - lame - mediainfo - mp4v2 - ]; -in -stdenv.mkDerivation rec { + +resholve.mkDerivation rec { pname = "aaxtomp3"; version = "1.3"; @@ -36,17 +27,48 @@ stdenv.mkDerivation rec { hash = "sha256-7a9ZVvobWH/gPxa3cFiPL+vlu8h1Dxtcq0trm3HzlQg="; }; - dontBuild = false; - - nativeBuildInputs = [ makeWrapper ]; + postPatch = '' + substituteInPlace AAXtoMP3 \ + --replace 'AAXtoMP3' 'aaxtomp3' + substituteInPlace interactiveAAXtoMP3 \ + --replace 'AAXtoMP3' 'aaxtomp3' \ + --replace 'call="./aaxtomp3"' 'call="$AAXTOMP3"' + ''; installPhase = '' - install -Dm755 AAXtoMP3 $out/bin/aaxtomp3 - wrapProgram $out/bin/aaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs} - install -Dm755 interactiveAAXtoMP3 $out/bin/interactiveaaxtomp3 - wrapProgram $out/bin/interactiveaaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs} + install -Dm 755 AAXtoMP3 $out/bin/aaxtomp3 + install -Dm 755 interactiveAAXtoMP3 $out/bin/interactiveaaxtomp3 ''; + solutions.default = { + scripts = [ + "bin/aaxtomp3" + "bin/interactiveaaxtomp3" + ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + bc + coreutils + ffmpeg + findutils + gawk + gnugrep + gnused + jq + lame + mediainfo + mp4v2 + ncurses + ]; + keep."$call" = true; + fix = { + "$AAXTOMP3" = [ "${placeholder "out"}/bin/aaxtomp3" ]; + "$FIND" = [ "find" ]; + "$GREP" = [ "grep" ]; + "$SED" = [ "sed" ]; + }; + }; + meta = with lib; { description = "Convert Audible's .aax filetype to MP3, FLAC, M4A, or OPUS"; homepage = "https://krumpetpirate.github.io/AAXtoMP3"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/aeolus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/aeolus/default.nix index d8ef7d2b4f..df61d38961 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/aeolus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/aeolus/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "aeolus"; - version = "0.9.9"; + version = "0.10.4"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "04y1j36y7vc93bv299vfiawbww4ym6q7avfx8vw6rmxr817zrch3"; + sha256 = "sha256-J9xrd/N4LrvGgi89Yj4ob4ZPUAEchrXJJQ+YVJ29Qhk="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix index f9fedfcc28..5b956e8f59 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ario/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GTK client for MPD (Music player daemon)"; - homepage = "http://ario-player.sourceforge.net/"; + homepage = "https://ario-player.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.garrison ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix index bd5a644857..fa75711ace 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix @@ -6,7 +6,7 @@ , meson , ninja , libmpdclient -, libyamlcpp +, yaml-cpp }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; nativeBuildInputs = [ cmake pkg-config meson ninja ]; - buildInputs = [ libmpdclient libyamlcpp ]; + buildInputs = [ libmpdclient yaml-cpp ]; mesonFlags = [ "-Dunsupported_use_system_yamlcpp=true" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/asunder/default.nix b/third_party/nixpkgs/pkgs/applications/audio/asunder/default.nix index c3cba87e30..d6efada907 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/asunder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/asunder/default.nix @@ -9,8 +9,6 @@ #, aacSupport ? false, TODO: neroAacEnc }: -with lib; - stdenv.mkDerivation rec { version = "2.9.7"; pname = "asunder"; @@ -23,20 +21,20 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libcddb ]; runtimeDeps = - optional mp3Support lame ++ - optional oggSupport vorbis-tools ++ - optional flacSupport flac ++ - optional opusSupport opusTools ++ - optional wavpackSupport wavpack ++ - optional monkeysAudioSupport monkeysAudio ++ + lib.optional mp3Support lame ++ + lib.optional oggSupport vorbis-tools ++ + lib.optional flacSupport flac ++ + lib.optional opusSupport opusTools ++ + lib.optional wavpackSupport wavpack ++ + lib.optional monkeysAudioSupport monkeysAudio ++ [ cdparanoia ]; postInstall = '' wrapProgram "$out/bin/asunder" \ - --prefix PATH : "${makeBinPath runtimeDeps}" + --prefix PATH : "${lib.makeBinPath runtimeDeps}" ''; - meta = { + meta = with lib; { description = "A graphical Audio CD ripper and encoder for Linux"; homepage = "http://littlesvr.ca/asunder/index.php"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix index 44ba848bc2..4a652e1ac4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { pname = "audacity"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Audacity-${version}"; - sha256 = "sha256-0F9+4hyUoKb0UP5t02yws/ErogscvI1nsdnSTpcr53E="; + hash = "sha256-gz2o0Rj4364nJAvJmMQzwIQycoQmqz2/43DBvd3qbho="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index 875daa196d..08e3479119 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "bambootracker"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-OaktEUWWDEW+MYnQkaB8FvkuH29VDXFqBVSTEJ7Sz7A="; + sha256 = "sha256-yubaKTc8NFLxMY0/5c2VubRHgAGOsRlitmXJ1UHzl60="; }; nativeBuildInputs = [ qmake qttools pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix b/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix index 82259d563c..70ef1ebdf6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix @@ -5,8 +5,6 @@ withGtk2 ? true, gtk2 ? null, withGtk3 ? true, gtk3 ? null }: -with lib; - assert withFrontend -> python3Packages ? pyqt5; assert withQt -> qtbase != null; assert withQt -> wrapQtAppsHook != null; @@ -30,13 +28,13 @@ stdenv.mkDerivation rec { pythonPath = with python3Packages; [ rdflib pyliblo - ] ++ optional withFrontend pyqt5; + ] ++ lib.optional withFrontend pyqt5; buildInputs = [ file liblo alsa-lib fluidsynth jack2 libpulseaudio libsndfile - ] ++ optional withQt qtbase - ++ optional withGtk2 gtk2 - ++ optional withGtk3 gtk3; + ] ++ lib.optional withQt qtbase + ++ lib.optional withGtk2 gtk2 + ++ lib.optional withGtk3 gtk3; propagatedBuildInputs = pythonPath; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cavalier/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cavalier/default.nix new file mode 100644 index 0000000000..17fdabc5bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/cavalier/default.nix @@ -0,0 +1,68 @@ +{ lib +, python3 +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gobject-introspection +, glib +, gtk4 +, librsvg +, libadwaita +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +, cava +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cavalier"; + version = "2023.01.29"; + format = "other"; + + src = fetchFromGitHub { + owner = "fsobolev"; + repo = pname; + rev = version; + hash = "sha256-6bvi73cFQHtIyD4d4+mqje0qkmG4wkahZ2ohda5RvRQ="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk4 + librsvg + libadwaita + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + ]; + + # Prevent double wrapping + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH ":" "${lib.makeBinPath [ cava ]}" + ) + ''; + + meta = with lib; { + description = "Audio visualizer based on CAVA with customizable LibAdwaita interface"; + homepage = "https://github.com/fsobolev/cavalier"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/chuck/default.nix b/third_party/nixpkgs/pkgs/applications/audio/chuck/default.nix index bb0e885cd7..a62337d7d5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/chuck/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/chuck/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.4.1.1"; + version = "1.4.2.0"; pname = "chuck"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; - sha256 = "sha256-RFnubxUdpy3N4VJeCv4FMp1hCGNWsWjs/AvDpXApD2M="; + sha256 = "sha256-hIwsC9rYgXWSTFqUufKGqoT0Gnsf4nR4KQ0iSVbj8xg="; }; nativeBuildInputs = [ flex bison which ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/cider/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cider/default.nix index 7deb21bcef..dfbe70194b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cider/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cider/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "cider"; - version = "1.5.7"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/ciderapp/cider-releases/releases/download/v${version}/Cider-${version}.AppImage"; - sha256 = "sha256-fWpt7YxqEDa1U4CwyVZwgbiwe0lrh64v0cJG9pbNMUU="; + sha256 = "sha256-fbeUl+vQpEdP17m3koblKv9z4CRpLNYtVQf7bs8ZP1M="; }; extraInstallCommands = diff --git a/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix index 66c172ff01..6d37e33b5e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cmus/default.nix @@ -39,8 +39,6 @@ #, vtxSupport ? true, libayemu ? null }: -with lib; - assert samplerateSupport -> jackSupport; # vorbis and tremor are mutually exclusive @@ -90,14 +88,6 @@ let #(mkFlag vtxSupport "CONFIG_VTX=y" libayemu) ]; - - clangGCC = runCommand "clang-gcc" {} '' - #! ${stdenv.shell} - mkdir -p $out/bin - ln -s ${stdenv.cc}/bin/clang $out/bin/gcc - ln -s ${stdenv.cc}/bin/clang++ $out/bin/g++ - ''; - in stdenv.mkDerivation rec { @@ -113,16 +103,17 @@ stdenv.mkDerivation rec { patches = [ ./option-debugging.patch ]; - configurePhase = "./configure " + concatStringsSep " " ([ - "prefix=$out" - "CONFIG_WAV=y" - ] ++ concatMap (a: a.flags) opts); - nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ] - ++ lib.optional stdenv.cc.isClang clangGCC ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ] - ++ flatten (concatMap (a: a.deps) opts); + ++ lib.flatten (lib.concatMap (a: a.deps) opts); + + prefixKey = "prefix="; + + configureFlags = [ + "CONFIG_WAV=y" + "HOSTCC=${stdenv.cc.targetPrefix}cc" + ] ++ lib.concatMap (a: a.flags) opts; makeFlags = [ "LD=$(CC)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/crip/default.nix b/third_party/nixpkgs/pkgs/applications/audio/crip/default.nix index d41ebed096..f837ad6603 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/crip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/crip/default.nix @@ -16,8 +16,6 @@ , which }: -with lib; - stdenv.mkDerivation rec { pname = "crip"; version = "3.9"; @@ -29,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perlPackages.perl perlPackages.CDDB_get ]; nativeBuildInputs = [ makeWrapper ]; - toolDeps = makeBinPath [ + toolDeps = lib.makeBinPath [ cdparanoia coreutils eject @@ -46,7 +44,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin/ - for script in ${escapeShellArgs scripts}; do + for script in ${lib.escapeShellArgs scripts}; do cp $script $out/bin/ substituteInPlace $out/bin/$script \ @@ -63,6 +61,6 @@ stdenv.mkDerivation rec { description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files"; license = lib.licenses.gpl1Only; platforms = lib.platforms.linux; - maintainers = [ maintainers.endgame ]; + maintainers = [ lib.maintainers.endgame ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix b/third_party/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix index 53c1340ba2..ffb4821d76 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/csound/csound-manual/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "csound-manual"; - version = "6.17.0"; + version = "6.18.0"; src = fetchFromGitHub { owner = "csound"; repo = "manual"; rev = version; - sha256 = "sha256-8X9Egn/MIwlNDEKUmEEz4Dnw6rGa37jRjYsVEt8ziW8="; + sha256 = "sha256-W8MghqUBr3V7LPgNwU6Ugw16wdK3G37zAPuasMlZ2+I="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix b/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix index dc8ea92ae2..6afddb467d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/csound/default.nix @@ -3,6 +3,7 @@ , AudioUnit , CoreAudio , CoreMIDI +, portaudio , alsa-lib ? null , libpulseaudio ? null , libjack2 ? null @@ -36,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison gettext ]; buildInputs = [ libsndfile libsamplerate boost ] ++ lib.optionals stdenv.isDarwin [ - Accelerate AudioUnit CoreAudio CoreMIDI + Accelerate AudioUnit CoreAudio CoreMIDI portaudio ] ++ lib.optionals stdenv.isLinux (builtins.filter (optional: optional != null) [ alsa-lib libpulseaudio libjack2 liblo ladspa-sdk fluidsynth eigen diff --git a/third_party/nixpkgs/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix b/third_party/nixpkgs/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix new file mode 100644 index 0000000000..5d5c057d72 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchurl, stdenv, unzip, fpc }: + +stdenv.mkDerivation rec { + pname = "dolbybcsoftwaredecode"; + version = "april-2018"; + + src = fetchurl { + url = "mirror://sourceforge/dolbybcsoftwaredecode/April-2018/SourceCode.zip"; + sha256 = "sha256-uLcsRIpwmJlstlGV8I4+/30+D9GDpUt7DOIP/GkXWp4="; + }; + + nativeBuildInputs = [ unzip fpc ]; + buildPhase = '' + fpc DolbyBi64.PP + ''; + installPhase = '' + mkdir -p $out/bin + cp DolbyBi64 $out/bin/ + ''; + + meta = with lib; { + description = "A Dolby B & C software decoder"; + homepage = "https://sourceforge.net/projects/dolbybcsoftwaredecode/"; + maintainers = with maintainers; [ lorenz ]; + + # Project is has source code available, but has no explicit license. + # I asked upstream to assign a license, so maybe this can be free + # in the future, but for now let's play it safe and make it unfree. + license = lib.licenses.unfree; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix b/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix index 731578d04e..151f03797c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dragonfly-reverb"; - version = "3.2.7"; + version = "3.2.8"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "sha256-DJ6J5PuRFDin6PtkNYjIRI1gEVQkKmnZLhnj7L4JtPM="; + sha256 = "sha256-Jz0t9IO3H+guL4NiETCBHSb4rxFTxZRHw2v20yS/wlk="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix b/third_party/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix index 71841a616a..d6f468dbc5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/drumgizmo/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.9.19"; + version = "0.9.20"; pname = "drumgizmo"; src = fetchurl { url = "https://www.drumgizmo.org/releases/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "18x28vhif0c97xz02k22xwqxxig6fi6j0356mlz2vf7vb25z69kl"; + sha256 = "sha256-AF8gQLiB29j963uI84TyNHIC0qwEWOCqmZIUWGq8V2o="; }; configureFlags = [ "--enable-lv2" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/eq10q/default.nix b/third_party/nixpkgs/pkgs/applications/audio/eq10q/default.nix index ba0715eb1d..84c8333d18 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/eq10q/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/eq10q/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { 64 bits floating point internal audio processing. Nice GUI with powerful metering for every plugin. ''; - homepage = "http://eq10q.sourceforge.net/"; + homepage = "https://eq10q.sourceforge.net/"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/espeak/default.nix b/third_party/nixpkgs/pkgs/applications/audio/espeak/default.nix index e5579175bb..2c59068720 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/espeak/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/espeak/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Compact open source software speech synthesizer"; - homepage = "http://espeak.sourceforge.net/"; + homepage = "https://espeak.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/espeak/edit.nix b/third_party/nixpkgs/pkgs/applications/audio/espeak/edit.nix index 2c86a036ce..6c4da056c8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/espeak/edit.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/espeak/edit.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Phoneme editor for espeak"; - homepage = "http://espeak.sourceforge.net/"; + homepage = "https://espeak.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix b/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix index 46b1480be3..c6000c86c6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ++ lib.optional podcastSupport python3.pkgs.feedparser ++ lib.optional wikipediaSupport webkitgtk; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/flac123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/flac123/default.nix index 09c7b44d92..5da071805c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/flac123/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/flac123/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ flac libao libogg popt ]; meta = with lib; { - homepage = "http://flac-tools.sourceforge.net/"; + homepage = "https://flac-tools.sourceforge.net/"; description = "A command-line program for playing FLAC audio files"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix b/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix index 3a78e89717..4564fcccc4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/flacon/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "9.2.0"; + version = "10.0.0"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "sha256-qnjWpsgCRAi09o9O7CBc0R9MN1EpXVmCoxB2npc9qpM="; + sha256 = "sha256-59p5x+d7Vmxx+bdBDxrlf4+NRIdUBuRk+DqohV98XYY="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix index cbed4b3618..df42258700 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "sha256-7SuM7a8IIecAJ83QvJfUba/wArAEXywqL2HwVbeG8H4="; + sha256 = "05lr9f0q4x1kvgfa3xrfmagpwvijv9m1s316aa9figqlkcc5vv4k"; }; nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/fmit/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fmit/default.nix index 7e376c89d3..7fcfeb32fd 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/fmit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/fmit/default.nix @@ -7,8 +7,6 @@ assert alsaSupport -> alsa-lib != null; assert jackSupport -> libjack2 != null; assert portaudioSupport -> portaudio != null; -with lib; - mkDerivation rec { pname = "fmit"; version = "1.2.14"; @@ -22,9 +20,9 @@ mkDerivation rec { nativeBuildInputs = [ qmake itstool wrapQtAppsHook ]; buildInputs = [ fftw qtbase qtmultimedia ] - ++ optionals alsaSupport [ alsa-lib ] - ++ optionals jackSupport [ libjack2 ] - ++ optionals portaudioSupport [ portaudio ]; + ++ lib.optionals alsaSupport [ alsa-lib ] + ++ lib.optionals jackSupport [ libjack2 ] + ++ lib.optionals portaudioSupport [ portaudio ]; postPatch = '' substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}' @@ -32,13 +30,13 @@ mkDerivation rec { preConfigure = '' qmakeFlags="$qmakeFlags \ - CONFIG+=${optionalString alsaSupport "acs_alsa"} \ - CONFIG+=${optionalString jackSupport "acs_jack"} \ - CONFIG+=${optionalString portaudioSupport "acs_portaudio"} \ + CONFIG+=${lib.optionalString alsaSupport "acs_alsa"} \ + CONFIG+=${lib.optionalString jackSupport "acs_jack"} \ + CONFIG+=${lib.optionalString portaudioSupport "acs_portaudio"} \ PREFIXSHORTCUT=$out" ''; - meta = { + meta = with lib; { description = "Free Musical Instrument Tuner"; longDescription = '' FMIT is a graphical utility for tuning musical instruments, with error diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index d4584e191d..886662faf4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.62"; + version = "1.63"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-PHDkCE30sVAFXHjG8d/4ETSDS2KO/j43iMMW0PhCFgI="; + sha256 = "sha256-uDAW97lTeL15PPpR5vlIS371EZ7BBNd86ETPEB8joSU="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/third_party/nixpkgs/pkgs/applications/audio/gjay/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gjay/default.nix index 4bd9c6dcd8..29d6765982 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gjay/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gjay/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Generates playlists such that each song sounds good following the previous song"; - homepage = "http://gjay.sourceforge.net/"; + homepage = "https://gjay.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/gnaural/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gnaural/default.nix index 1cdea4629b..42b28eacc4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gnaural/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gnaural/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Programmable auditory binaural-beat synthesizer"; - homepage = "http://gnaural.sourceforge.net/"; + homepage = "https://gnaural.sourceforge.net/"; maintainers = with maintainers; [ ehmry ]; license = with licenses; [ gpl2Only ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix new file mode 100644 index 0000000000..cf5ac3f8c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/go-musicfox/default.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, clangStdenv +, pkg-config +, alsa-lib +, flac +}: + +# gcc only supports objc on darwin +buildGoModule.override { stdenv = clangStdenv; } rec { + pname = "go-musicfox"; + version = "3.6.1"; + + src = fetchFromGitHub { + owner = "anhoder"; + repo = pname; + rev = "v${version}"; + hash = "sha256-iinEo+HrcNM3gx1iUqe1duRd45PrYgVybRt9NKphwuY="; + }; + + deleteVendor = true; + + vendorHash = "sha256-DbdAEvcspTYMYMvc5IBEUtQAJMW8JZpNi0UA/DvzGFo="; + + subPackages = [ "cmd/musicfox.go" ]; + + ldflags = [ + "-s" + "-w" + "-X go-musicfox/pkg/constants.AppVersion=${version}" + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + alsa-lib + flac + ]; + + meta = with lib; { + description = "Terminal netease cloud music client written in Go"; + homepage = "https://github.com/anhoder/go-musicfox"; + license = licenses.mit; + mainProgram = "musicfox"; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix index 1fb848ae1e..b85aa4c0df 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/goattracker/default.nix @@ -8,12 +8,11 @@ , isStereo ? false }: -with lib; let - pname = "goattracker" + optionalString isStereo "-stereo"; + pname = "goattracker" + lib.optionalString isStereo "-stereo"; desktopItem = makeDesktopItem { name = pname; - desktopName = "GoatTracker 2" + optionalString isStereo " Stereo"; + desktopName = "GoatTracker 2" + lib.optionalString isStereo " Stereo"; genericName = "Music Tracker"; exec = if isStereo then "gt2stereo" @@ -30,7 +29,7 @@ in stdenv.mkDerivation rec { else "2.76"; # normal src = fetchurl { - url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${optionalString isStereo "_Stereo"}.zip"; + url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${lib.optionalString isStereo "_Stereo"}.zip"; sha256 = if isStereo then "1hiig2d152sv9kazwz33i56x1c54h5sh21ipkqnp6qlnwj8x1ksy" # stereo else "0d7a3han4jw4bwiba3j87racswaajgl3pj4sb5lawdqdxicv3dn1"; # normal @@ -63,11 +62,11 @@ in stdenv.mkDerivation rec { meta = { description = "A crossplatform music editor for creating Commodore 64 music. Uses reSID library by Dag Lem and supports alternatively HardSID & CatWeasel devices" - + optionalString isStereo " - Stereo version"; + + lib.optionalString isStereo " - Stereo version"; homepage = "https://cadaver.github.io/tools.html"; downloadPage = "https://sourceforge.net/projects/goattracker2/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix b/third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix index 1f09d99c88..f51daf7081 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/goodvibes/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "goodvibes"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-CE9f0GnXr7wSpp8jyW0ZxGKx16r6tOaObzQXKcy5nPY="; + hash = "sha256-w0nmTYcq2DBHSjQ23zWxT6optyH+lRAMRa210F7XEvE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix index 6db530a2c2..a6164189c1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/gpodder/default.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { gnome.adwaita-icon-theme ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ minimock pytest pytest-httpserver diff --git a/third_party/nixpkgs/pkgs/applications/audio/grandorgue/default.nix b/third_party/nixpkgs/pkgs/applications/audio/grandorgue/default.nix index 5fe2ca2ce6..0bbe0b1f0d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/grandorgue/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/grandorgue/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.9.0-1"; + version = "3.9.5-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-+LWEjoke7f+6f4K4jO9nCG88Mdg9C49+v3FboM9/NkU="; + sha256 = "sha256-5OqTQBOYE6XU3BRiVwXOHrn22bVZzIIeZI8pgsWxhPw="; }; postPatch = '' @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { meta = { description = "Virtual Pipe Organ Software"; - homepage = "https://sourceforge.net/projects/ourorgan"; - license = lib.licenses.gpl2; + homepage = "https://github.com/GrandOrgue/grandorgue"; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.puzzlewolf ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix b/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix index 798af97ab3..684f074b4e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/helvum/default.nix @@ -50,6 +50,9 @@ stdenv.mkDerivation rec { pipewire ]; + # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream + NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + meta = with lib; { description = "A GTK patchbay for pipewire"; homepage = "https://gitlab.freedesktop.org/pipewire/helvum"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/id3v2/default.nix b/third_party/nixpkgs/pkgs/applications/audio/id3v2/default.nix index f6c88bc456..7b8ece0e71 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/id3v2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/id3v2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command line editor for id3v2 tags"; - homepage = "http://id3v2.sourceforge.net/"; + homepage = "https://id3v2.sourceforge.net/"; license = licenses.gpl2Plus; platforms = with platforms; unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/jack-rack/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jack-rack/default.nix index 25ee53d3f4..420c11562e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jack-rack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jack-rack/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { be controlled using the ALSA sequencer. It's phat; it turns your computer into an effects box. ''; - homepage = "http://jack-rack.sourceforge.net/"; + homepage = "https://jack-rack.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.astsmtl ]; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix index d9d7bf19e7..7a1676e787 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, jre }: +{ stdenv, lib, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { pname = "JMusicBot"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib cp $src $out/lib/JMusicBot - makeWrapper ${jre}/bin/java $out/bin/JMusicBot \ + makeWrapper ${jre_headless}/bin/java $out/bin/JMusicBot \ --add-flags "-Xmx1G -Dnogui=true -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -jar $out/lib/JMusicBot" ''; @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; - platforms = platforms.all; + inherit (jre_headless.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/keyfinder/default.nix b/third_party/nixpkgs/pkgs/applications/audio/keyfinder/default.nix index c3667ee57a..24a72501db 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/keyfinder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/keyfinder/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { management, no track suggestions, no media player. Just a fast, efficient workflow tool. ''; - homepage = "http://www.ibrahimshaath.co.uk/keyfinder/"; + homepage = "https://www.ibrahimshaath.co.uk/keyfinder/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/klick/default.nix b/third_party/nixpkgs/pkgs/applications/audio/klick/default.nix index cbe12a486e..7c762adf37 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/klick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/klick/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { prefixKey = "PREFIX="; meta = { - homepage = "http://das.nasophon.de/klick/"; + homepage = "https://das.nasophon.de/klick/"; description = "Advanced command-line metronome for JACK"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ladspa-sdk/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ladspa-sdk/default.nix index 47a36ed1b5..8055683a3f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ladspa-sdk/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl }: + stdenv.mkDerivation rec { pname = "ladspa-sdk"; version = "1.15"; @@ -7,12 +8,27 @@ stdenv.mkDerivation rec { sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2"; }; + sourceRoot = "ladspa_sdk_${version}/src"; + + strictDeps = true; + patchPhase = '' - cd src sed -i 's@/usr/@$(out)/@g' Makefile - sed -i 's@-mkdirhier@mkdir -p@g' Makefile ''; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "CPP=${stdenv.cc.targetPrefix}c++" + ]; + + # The default target also runs tests, which we don't want to do in + # the build phase as it would break cross. + buildFlags = [ "targets" ]; + + # Tests try to create and play a sound file. Playing will fail, but + # it's probably still useful to run the part that creates the file. + doCheck = true; + meta = { description = "The SDK for the LADSPA audio plugin standard"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix index 4d7d70aebd..abeaa7dff4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/littlegptracker/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { channels. Additionally, the program can drive MIDI instruments (with the gp32 and gp2x a custom MIDI interface is required). ''; - homepage = "http://www.littlegptracker.com/"; - downloadPage = "http://www.littlegptracker.com/download.php"; + homepage = "https://www.littlegptracker.com/"; + downloadPage = "https://www.littlegptracker.com/download.php"; license = licenses.bsd3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix index be841577ad..dd00bd1f2c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-GTrcUy10bN9Xj2I7uuGyP82c6NVpnQbXTI85H231yyo="; + sha256 = "sha256-YYrt+FbpY7iEui0aw4Ce94BW1SHDk0OH8gFSzkW2fkw="; }; nativeBuildInputs = [ pkg-config php makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix index 1837cb1074..ed48c12941 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/midi-visualizer/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "MIDIVisualizer"; - version = "6.5"; + version = "7.0"; src = fetchFromGitHub { owner = "kosua20"; repo = pname; rev = "v${version}"; - sha256 = "sha256-thRcRJ88bz3jwu6rKaQxt2MkBSf5Ri1jygkKDguP2eE="; + sha256 = "sha256-wfPSPH+E9cErVvfJZqHttFtjiUYJopM/u6w6NpRHifE="; }; nativeBuildInputs = [ cmake pkg-config makeWrapper]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix b/third_party/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix index 6a5626d98a..0d07663d11 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/midisheetmusic/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation { sha256 = "05c6zskj50g29f51lx8fvgzsi3f31z01zj6ssjjrgr7jfs7ak70p"; }; - checkInputs = (with dotnetPackages; [ NUnitConsole ]); + nativeCheckInputs = (with dotnetPackages; [ NUnitConsole ]); nativeBuildInputs = [ mono makeWrapper ]; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/mmlgui/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mmlgui/default.nix index bf343e101c..90a86b0dfe 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mmlgui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mmlgui/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { Cocoa ]; - checkInputs = [ + nativeCheckInputs = [ cppunit ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix index 717d61a92e..c72fec06cd 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/local.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { python3Packages.uritools ]; - checkInputs = [ + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/podcast.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/podcast.nix index 8a5c4ec2b3..7aacc2f7be 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/podcast.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/podcast.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { python3Packages.uritools ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/subidy.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/subidy.nix index 98d69816b7..b84a14106f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/subidy.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/subidy.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = [ mopidy pythonPackages.py-sonic ]; - checkInputs = with pythonPackages; [ pytestCheckHook ]; + nativeCheckInputs = with pythonPackages; [ pytestCheckHook ]; meta = with lib; { homepage = "https://www.mopidy.com/"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/tidal.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/tidal.nix index 1264e5963a..b470e0489e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/tidal.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/tidal.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { python3Packages.tidalapi ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-mock ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix index 5110d6ace9..99eec81870 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { mopidy ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ vcrpy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mp3gain/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mp3gain/default.nix index ba2a757e09..a0e6a0527f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mp3gain/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mp3gain/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lossless mp3 normalizer with statistical analysis"; - homepage = "http://mp3gain.sourceforge.net/"; + homepage = "https://mp3gain.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ devhell ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mp3val/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mp3val/default.nix index 2435f0cecc..559f04f919 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mp3val/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mp3val/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { also other MPEG versions and layers. The tool is also aware of the most common types of tags (ID3v1, ID3v2, APEv2). ''; - homepage = "http://mp3val.sourceforge.net/index.shtml"; + homepage = "https://mp3val.sourceforge.net/index.shtml"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.devhell ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpc123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpc123/default.nix index e247ebeb2b..9a693c0eaa 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mpc123/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mpc123/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://mpc123.sourceforge.net/"; + homepage = "https://mpc123.sourceforge.net/"; description = "A Musepack (.mpc) audio player"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mpg321/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mpg321/default.nix index 08cfbada93..4a73ddf03c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mpg321/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mpg321/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line MP3 player"; - homepage = "http://mpg321.sourceforge.net/"; + homepage = "https://mpg321.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix b/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix index 571cd16e2a..75cf863fc7 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://munt.sourceforge.net/"; + homepage = "https://munt.sourceforge.net/"; description = "A library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; license = with licenses; [ lgpl21Plus ]; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-qt.nix b/third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-qt.nix index 92488ac587..51501de4a8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-qt.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-qt.nix @@ -63,7 +63,7 @@ mkDerivation rec { ''; meta = with lib; { - homepage = "http://munt.sourceforge.net/"; + homepage = "https://munt.sourceforge.net/"; description = "A synthesizer application built on Qt and libmt32emu"; longDescription = '' mt32emu-qt is a synthesiser application that facilitates both realtime diff --git a/third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-smf2wav.nix index b9e87a3053..517d1b200a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-smf2wav.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/munt/mt32emu-smf2wav.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://munt.sourceforge.net/"; + homepage = "https://munt.sourceforge.net/"; description = "Produces a WAVE file from a Standard MIDI file (SMF)"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix b/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix index add56f99d9..88b5d3b74c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix @@ -5,17 +5,15 @@ let appName = "MuseScore ${builtins.head versionComponents}"; in -with lib; - stdenv.mkDerivation rec { pname = "musescore-darwin"; - version = concatStringsSep "." versionComponents; + version = lib.concatStringsSep "." versionComponents; # The disk image contains the .app and a symlink to /Applications. sourceRoot = "${appName}.app"; src = fetchurl { - url = "https://github.com/musescore/MuseScore/releases/download/v${concatStringsSep "." (take 3 versionComponents)}/MuseScore-${version}.dmg"; + url = "https://github.com/musescore/MuseScore/releases/download/v${lib.concatStringsSep "." (lib.take 3 versionComponents)}/MuseScore-${version}.dmg"; sha256 = "sha256-lHckfhTTrDzaGwlbnZ5w0O1gMPbRmrmgATIGMY517l0="; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix index 38e96c7f09..706a36b532 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix @@ -1,24 +1,25 @@ -{ cmake +{ lib +, stdenv +, cmake , pkg-config -, boost , curl +, asio , fetchFromGitHub , fetchpatch , ffmpeg , gnutls , lame , libev +, game-music-emu , libmicrohttpd , libopenmpt , mpg123 , ncurses -, lib -, stdenv , taglib # Linux Dependencies , alsa-lib , pulseaudio -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd # Darwin Dependencies , Cocoa @@ -27,13 +28,13 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.98.1"; + version = "0.99.4"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "sha256-pnAdlCCqWzR0W8dF9CE48K8yHMVIx3egZlXvibxU18A="; + sha256 = "sha256-GAO3CKtlZF8Ol4K+40lD8n2RtewiHj3f59d5RIatNws="; }; outputs = [ "out" "dev" ]; @@ -44,12 +45,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - boost + asio curl ffmpeg gnutls lame libev + game-music-emu libmicrohttpd libopenmpt mpg123 diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix index 739d0c3c49..870691ae1c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix @@ -12,8 +12,6 @@ , pcreSupport ? false, pcre ? null }: -with lib; - assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { @@ -28,13 +26,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib ncurses libmpdclient boost ] - ++ optional pcreSupport pcre; + ++ lib.optional pcreSupport pcre; nativeBuildInputs = [ meson ninja pkg-config gettext ]; mesonFlags = [ "-Dlirc=disabled" "-Ddocumentation=disabled" - ] ++ optional (!pcreSupport) "-Dregex=disabled"; + ] ++ lib.optional (!pcreSupport) "-Dregex=disabled"; meta = with lib; { description = "Curses-based interface for MPD (music player daemon)"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix b/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix index 3574dc2f5a..0860501c87 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix @@ -2,13 +2,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-6tRd8boVwWc8qGlklYqA/Kp76VOMvtUJlu/G/InvHkA="; + hash = "sha256-tfWimJ9eEFBUxPRVNjgbu8tQNokPbXOxOXO64mFuMfM="; }; # Remove some Electron stuff from package.json diff --git a/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix b/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix index 83cf44853a..357799a112 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/opustags/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ ffmpeg glibcLocales perl ] ++ (with perlPackages; [ ListMoreUtils ]); + nativeCheckInputs = [ ffmpeg glibcLocales perl ] ++ (with perlPackages; [ ListMoreUtils ]); checkPhase = '' export LANG="en_US.UTF-8" diff --git a/third_party/nixpkgs/pkgs/applications/audio/osdlyrics/default.nix b/third_party/nixpkgs/pkgs/applications/audio/osdlyrics/default.nix index ccac797631..3dd43fe304 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/osdlyrics/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/osdlyrics/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "osdlyrics"; - version = "0.5.12"; + version = "0.5.13"; src = fetchFromGitHub { owner = "osdlyrics"; repo = "osdlyrics"; rev = version; - sha256 = "sha256-QGgwxmurdwo0xyq7p+1xditRebv64ewGTvNJI7MUnq4="; + sha256 = "sha256-E4pVXopqQYJW+a5nUf9dMabxJ9nYPu3C2ti8LlY470c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/paulstretch/default.nix b/third_party/nixpkgs/pkgs/applications/audio/paulstretch/default.nix index 1d70100462..5e781a9f51 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/paulstretch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/paulstretch/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { special effects by "spectral smoothing" the sounds. It can transform any sound/music to a texture. ''; - homepage = "http://hypermammut.sourceforge.net/paulstretch/"; + homepage = "https://hypermammut.sourceforge.net/paulstretch/"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix index 308d5b65f3..55ab6261aa 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix @@ -93,14 +93,11 @@ let fetchWithCurlScript { inherit name sha256; script = '' - "''${curl[@]}" --silent --request POST \ + "''${curl[@]}" --silent --request GET \ --cookie cookies \ - --header "modartt-json: request" \ - --header "origin: https://www.modartt.com" \ - --header "content-type: application/json; charset=UTF-8" \ - --header "accept: application/json, text/javascript, */*" \ - --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download -o /dev/null + --header "accept: */*" \ + https://www.modartt.com/ -o /dev/null + json=$( "''${curl[@]}" --silent --request POST \ --cookie cookies \ @@ -109,8 +106,9 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download + https://www.modartt.com/api/0/download ) + url=$(echo $json | ${jq}/bin/jq -r .url) "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" ''; @@ -140,7 +138,7 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data @login.json \ - https://www.modartt.com/json/session + https://www.modartt.com/api/0/session json=$( "''${curl[@]}" --silent --request POST \ @@ -150,10 +148,10 @@ let --header "content-type: application/json; charset=UTF-8" \ --header "accept: application/json, text/javascript, */*" \ --data-raw '{"file": "${name}", "get": "url"}' \ - https://www.modartt.com/json/download + https://www.modartt.com/api/0/download ) - url=$(echo $json | ${jq}/bin/jq -r .url) + url=$(echo $json | ${jq}/bin/jq -r .url) "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" ''; }; @@ -162,20 +160,20 @@ in { # TODO currently can't install more than one because `lame` clashes stage-trial = mkPianoteq rec { name = "stage-trial"; - version = "7.5.4"; + version = "8.0.5"; archdir = "x86-64bit"; src = fetchPianoteqTrial { name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z"; - sha256 = "sha256-ybtq+hjnaQxpLxv2KE0ZcbQXtn5DJJsnMwCmh3rlrIc="; + sha256 = "sha256-9Lo4e1SM1gw2/+TmpDUdZCOQcHEpT/aaG6P80/GRPQY="; }; }; standard-trial = mkPianoteq rec { name = "standard-trial"; - version = "7.5.4"; + version = "8.0.5"; archdir = "x86-64bit"; src = fetchPianoteqTrial { name = "pianoteq_linux_trial_v${versionForFile version}.7z"; - sha256 = "sha256-3a3+SKTEhvDtqK5Kg4E6KiLvn5+j6JN6ntIb72u2bdQ="; + sha256 = "sha256-qxViVIbld8zTMj1+TIfOsIOhmujOGJux2/u2J4hvsqw="; }; }; stage-6 = mkPianoteq rec { diff --git a/third_party/nixpkgs/pkgs/applications/audio/pianotrans/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pianotrans/default.nix new file mode 100644 index 0000000000..89e0716a0a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/pianotrans/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchFromGitHub +, python3 +, ffmpeg +}: + +python3.pkgs.buildPythonApplication rec { + pname = "pianotrans"; + version = "1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "azuwis"; + repo = pname; + rev = "v${version}"; + hash = "sha256-6Otup1Yat1dBZdSoR4lDfpytUQ2RbDXC6ieo835Nw+U="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + piano-transcription-inference + torch + tkinter + ]; + + # Project has no tests + doCheck = false; + + makeWrapperArgs = [ + ''--prefix PATH : "${lib.makeBinPath [ ffmpeg ]}"'' + ]; + + meta = with lib; { + description = "Simple GUI for ByteDance's Piano Transcription with Pedals"; + homepage = "https://github.com/azuwis/pianotrans"; + license = licenses.mit; + maintainers = with maintainers; [ azuwis ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix index fb8bd527aa..519f59a1d8 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.3.03"; + version = "6.3.05"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-Fb16sx+LVoXuiFASeiaYUMoNgZJXqKTBrUHFd2YXEJ0="; + sha256 = "sha256-0e225cmP0CSYjRYNEXi4Oqq9o8XR2N7bNS1X5x+mQKw="; }; configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index e3a2fa0333..b0aa2ae19b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.56"; + version = "1.57"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-NetzlQdhbyClnVQTrHoX9QpVtoj8a8FoDue+uxhgrlA="; + sha256 = "sha256-YUGTcL/k+MbAnB/kcWPEmrGxGF/kSHdIgdBVUqCsDWM="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pyradio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pyradio/default.nix index 8038ef5bf9..74668b03f2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pyradio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pyradio/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.9.32"; + version = "0.9.0"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1lczH8xTZV1XVVByLAGXJbjXd20JUJALIJJ3s9+orxM="; + hash = "sha256-8Kr+DRbkTKvhetIIs4htOHlIXGLpoe+T+0yxjm/JcWk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix b/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix index b57f4a4986..f0dc71aa47 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix @@ -119,7 +119,7 @@ python3.pkgs.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - checkInputs = [ + nativeCheckInputs = [ dbus gdk-pixbuf glibcLocales diff --git a/third_party/nixpkgs/pkgs/applications/audio/r128gain/default.nix b/third_party/nixpkgs/pkgs/applications/audio/r128gain/default.nix index c02ee51266..8cf6871a76 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/r128gain/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/r128gain/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ crcmod ffmpeg-python mutagen tqdm ]; - checkInputs = with python3Packages; [ requests sox ]; + nativeCheckInputs = with python3Packages; [ requests sox ]; # Testing downloads media files for testing, which requires the # sandbox to be disabled. diff --git a/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix b/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix index 178b637978..1d638c01f2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { "-DBUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; doCheck = !stdenv.isAarch64; # single failure that I can't explain preFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix b/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix index 1be3f53dce..44dbff6077 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix @@ -1,15 +1,13 @@ { lib, stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsa-lib , mpg123, releasePath ? null }: -with lib; - # To use the full release version: # 1) Sign into https://backstage.renoise.com and download the release version to some stable location. # 2) Override the releasePath attribute to point to the location of the newly downloaded bundle. # Note: Renoise creates an individual build for each license which screws somewhat with the # use of functions like requireFile as the hash will be different for every user. let - urlVersion = replaceStrings [ "." ] [ "_" ]; + urlVersion = lib.replaceStrings [ "." ] [ "_" ]; in stdenv.mkDerivation rec { @@ -80,7 +78,7 @@ stdenv.mkDerivation rec { description = "Modern tracker-based DAW"; homepage = "https://www.renoise.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; + license = lib.licenses.unfree; maintainers = []; platforms = [ "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/rhvoice/honor_nix_environment.patch b/third_party/nixpkgs/pkgs/applications/audio/rhvoice/honor_nix_environment.patch index fed5a2ea5e..0b2cab3975 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/rhvoice/honor_nix_environment.patch +++ b/third_party/nixpkgs/pkgs/applications/audio/rhvoice/honor_nix_environment.patch @@ -1,5 +1,3 @@ -diff --git a/SConstruct b/SConstruct -index 3ad4d9a..fb02365 100644 --- a/SConstruct +++ b/SConstruct @@ -94,11 +94,8 @@ def CheckWiX(context): @@ -16,13 +14,15 @@ index 3ad4d9a..fb02365 100644 def validate_spd_version(key,val,env): m=re.match(r"^\d+\.\d+",val) -@@ -208,9 +205,9 @@ def create_base_env(user_vars): +@@ -207,10 +204,10 @@ def create_base_env(user_vars): + env_args["LIBS"]=[] env_args["package_name"]="RHVoice" env_args["CPPDEFINES"]=[("RHVOICE","1")] - env=Environment(**env_args) +- env=Environment(**env_args) - if env["dev"]: - env["prefix"]=os.path.abspath("local") - env["RPATH"]=env.Dir("$libdir").abspath ++ env=Environment(ENV = os.environ, **env_args) + env.PrependENVPath("PATH", os.environ["PATH"]) + env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"] + env["RPATH"]=env.Dir("$libdir").abspath diff --git a/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix b/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix index 853613c9a5..fe9f4a835c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { libnotify ] ++ gst_plugins; - checkInputs = [ + nativeCheckInputs = [ check ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix index bcb254ad87..86f5cf83ad 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "22.5"; + version = "23.0"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-a/nYq6Cfbx93jfA6I8it+U0U36dOAFSpRis32spPks4="; + sha256 = "sha256-WnQtXr1IcOpNJBrSvLf2rNu2XPs8JU01LWsQSzvvivA="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix index 1f5bb36a51..8d10b2f2a3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { fmt ]; - checkInputs = [ + nativeCheckInputs = [ parallel ruby supercollider-with-sc3-plugins diff --git a/third_party/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix index 63cb739820..35fb524ab3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sooperlooper/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , which @@ -9,7 +10,7 @@ , libxml2 , libjack2 , libsndfile -, wxGTK30 +, wxGTK32 , libsigcxx , libsamplerate , rubberband @@ -21,15 +22,23 @@ stdenv.mkDerivation rec { pname = "sooperlooper"; - version = "1.7.4"; + version = "1.7.8"; src = fetchFromGitHub { owner = "essej"; repo = "sooperlooper"; - rev = "v${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1jng9bkb7iikad0dy1fkiq9wjjdhh1xi1p0cp2lvnz1dsc4yk6iw"; + rev = "v${version}"; + sha256 = "sha256-Lrsz/UDCgoac63FJ3CaPVaYwvBtzkGQQRLhUi6lUusE="; }; + patches = [ + (fetchpatch { + name = "10-build_with_wx_32.patch"; + url = "https://sources.debian.org/data/main/s/sooperlooper/1.7.8~dfsg0-2/debian/patches/10-build_with_wx_32.patch"; + sha256 = "sha256-NF/w+zgRBNkSTqUJhfH9kQogXSYEF70pCN+loR0hjpg="; + }) + ]; + autoreconfPhase = '' patchShebangs ./autogen.sh ./autogen.sh @@ -47,7 +56,7 @@ stdenv.mkDerivation rec { libxml2 libjack2 libsndfile - wxGTK30 + wxGTK32 libsigcxx libsamplerate rubberband @@ -68,7 +77,7 @@ stdenv.mkDerivation rec { However, this kind of live performance looping tool is most effectively used via hardware (midi footpedals, etc) and the engine can be run standalone on a computer without a monitor. ''; - homepage = "http://essej.net/sooperlooper/"; # https is broken + homepage = "https://sonosaurus.com/sooperlooper/"; license = licenses.gpl2; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix b/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix index c0966e9ab3..208d50a277 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/soundconverter/default.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { python3Packages.pygobject3 ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix new file mode 100644 index 0000000000..b15031a529 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix @@ -0,0 +1,53 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, cmake +, alsa-lib +, dbus +, fontconfig +}: + +rustPlatform.buildRustPackage rec { + pname = "spotify-player"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "aome510"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-bHPWpx8EJibr2kNuzuGAQPZ0DE6qeJwIRYDy+NFS/PQ="; + }; + + cargoSha256 = "sha256-QeQ3PYI5RmbJ+VQ9hLSTXgQXVVoID5zbRqSTrbWzVy8="; + + nativeBuildInputs = [ + pkg-config + cmake + ]; + + buildInputs = [ + openssl + alsa-lib + dbus + fontconfig + ]; + + buildNoDefaultFeatures = true; + + buildFeatures = [ + "rodio-backend" + "media-control" + "image" + "lyric-finder" + ]; + + meta = with lib; { + description = "A command driven spotify player"; + homepage = "https://github.com/aome510/spotify-player"; + mainProgram = "spotify_player"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix index 19b72d1c37..fa63fee800 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { EXECUTABLE = binName; - OPTS = [ "-DLINKALL" ] + OPTS = [ "-DLINKALL" "-DGPIO" ] ++ optional dsdSupport "-DDSD" ++ optional (!faad2Support) "-DNO_FAAD" ++ optional ffmpegSupport "-DFFMPEG" diff --git a/third_party/nixpkgs/pkgs/applications/audio/ssrc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ssrc/default.nix index 1ac1d6658f..d6d776c860 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ssrc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ssrc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; version = version; - homepage = "http://shibatch.sourceforge.net/"; + homepage = "https://shibatch.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/audio/streamripper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/streamripper/default.nix index 6fae14e2b1..a44a77237d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/streamripper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/streamripper/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libogg libvorbis libmad ]; meta = with lib; { - homepage = "http://streamripper.sourceforge.net/"; + homepage = "https://streamripper.sourceforge.net/"; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix index 2386708c55..d469c9689a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix @@ -1,5 +1,5 @@ -{ fetchFromGitLab -, lib +{ lib +, fetchFromGitLab , python3Packages , gobject-introspection , gtk3 @@ -9,8 +9,10 @@ , chromecastSupport ? false , serverSupport ? false , keyringSupport ? true -, notifySupport ? true, libnotify -, networkSupport ? true, networkmanager +, notifySupport ? true +, libnotify +, networkSupport ? true +, networkmanager }: python3Packages.buildPythonApplication rec { @@ -21,8 +23,8 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitLab { owner = "sublime-music"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-n77mTgElwwFaX3WQL8tZzbkPwnsyQ08OW9imSOjpBlg="; + rev = "refs/tags/v${version}"; + hash = "sha256-n77mTgElwwFaX3WQL8tZzbkPwnsyQ08OW9imSOjpBlg="; }; nativeBuildInputs = [ @@ -38,12 +40,21 @@ python3Packages.buildPythonApplication rec { "python-mpv" ]; + postPatch = '' + sed -i "/--cov/d" setup.cfg + sed -i "/--no-cov-on-fail/d" setup.cfg + # https://github.com/sublime-music/sublime-music/pull/370 + # Can be removed in later versions (probably > 0.11.16) + substituteInPlace pyproject.toml \ + --replace 'python-Levenshtein = "^0.12.0"' 'Levenshtein = ">0.12.0"' + ''; + buildInputs = [ gtk3 pango ] - ++ lib.optional notifySupport libnotify - ++ lib.optional networkSupport networkmanager + ++ lib.optional notifySupport libnotify + ++ lib.optional networkSupport networkmanager ; propagatedBuildInputs = with python3Packages; [ @@ -59,21 +70,16 @@ python3Packages.buildPythonApplication rec { requests semver ] - ++ lib.optional chromecastSupport PyChromecast - ++ lib.optional keyringSupport keyring - ++ lib.optional serverSupport bottle + ++ lib.optional chromecastSupport PyChromecast + ++ lib.optional keyringSupport keyring + ++ lib.optional serverSupport bottle ; - postPatch = '' - sed -i "/--cov/d" setup.cfg - sed -i "/--no-cov-on-fail/d" setup.cfg - ''; - # hook for gobject-introspection doesn't like strictDeps # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytest ]; @@ -98,6 +104,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "GTK3 Subsonic/Airsonic client"; homepage = "https://sublimemusic.app/"; + changelog = "https://github.com/sublime-music/sublime-music/blob/v${version}/CHANGELOG.rst"; license = licenses.gpl3Plus; maintainers = with maintainers; [ albakham sumnerevans ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/tap-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tap-plugins/default.nix index 56ff4c0e19..9b6f4efe16 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tap-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tap-plugins/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { TAP Pitch Shifter, TAP Reflector, TAP Reverberator, TAP Rotary Speaker, TAP Scaling Limiter, TAP Sigmoid Booster, TAP Stereo Echo, TAP Tremolo, TAP TubeWarmth, TAP Vibrato. ''; - homepage = "http://tap-plugins.sourceforge.net/ladspa.html"; + homepage = "https://tap-plugins.sourceforge.net/ladspa.html"; license = licenses.gpl3; maintainers = [ maintainers.fps ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix index 8905351da5..93b8d32035 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix @@ -37,11 +37,11 @@ stdenv.mkDerivation rec { pname = "tidal-hifi"; - version = "4.3.1"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "sha256-Q+K8oF1VEsuhmhPH6K3as1+71vCfaKCdzRzCIxtiXvE="; + sha256 = "sha256-6KlcxBV/zHN+ZnvIu1PcKNeS0u7LqhDqAjbXawT5Vv8="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; @@ -109,13 +109,12 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ "''${gappsWrapperArgs[@]}" substituteInPlace $out/share/applications/tidal-hifi.desktop \ - --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" \ - --replace "/usr/share/icons/hicolor/0x0/apps/tidal-hifi.png" "tidal-hifi.png" + --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi" for size in 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps/ convert $out/share/icons/hicolor/0x0/apps/tidal-hifi.png \ - -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/tidal-hifi.png + -resize ''${size}x''${size} $out/share/icons/hicolor/''${size}x''${size}/apps/icon.png done ''; @@ -124,7 +123,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Mastermindzh/tidal-hifi"; changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ alternateved ]; + maintainers = with maintainers; [ qbit ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix b/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix index 5c9f31b750..93922313dd 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix @@ -2,6 +2,8 @@ , fetchzip , lib , wrapGAppsHook +, xdg-utils +, which , alsa-lib , atk , cairo @@ -31,7 +33,11 @@ stdenv.mkDerivation rec { } else throw "Platform not supported"; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ + which + xdg-utils + wrapGAppsHook + ]; buildInputs = with gst_all_1; [ gst-plugins-base @@ -65,8 +71,13 @@ stdenv.mkDerivation rec { mkdir -p $out/bin $out/libexec $out/share/doc cp transcribe $out/libexec cp xschelp.htb readme_gtk.html $out/share/doc - cp -r gtkicons $out/share/icons ln -s $out/share/doc/xschelp.htb $out/libexec + # The script normally installs to the home dir + sed -i -E 's!BIN_DST=.*!BIN_DST=$out!' install-linux.sh + sed -i -e 's!Exec=''${BIN_DST}/transcribe/transcribe!Exec=transcribe!' install-linux.sh + sed -i -e 's!''${BIN_DST}/transcribe!''${BIN_DST}/libexec!' install-linux.sh + rm -f xschelp.htb readme_gtk.html *.so + XDG_DATA_HOME=$out/share bash install-linux.sh -i patchelf \ --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ $out/libexec/transcribe @@ -97,6 +108,7 @@ stdenv.mkDerivation rec { homepage = "https://www.seventhstring.com/xscribe/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; + maintainers = with maintainers; [ iwanb ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/whipper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/whipper/default.nix index e3c4b45224..e92b2f1318 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/whipper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/whipper/default.nix @@ -56,7 +56,7 @@ in python3.pkgs.buildPythonApplication rec { buildInputs = [ libsndfile ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ twisted ] ++ bins; diff --git a/third_party/nixpkgs/pkgs/applications/audio/xmp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/xmp/default.nix index 5f99555d37..6c0d439a0d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/xmp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/xmp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Extended module player"; - homepage = "http://xmp.sourceforge.net/"; + homepage = "https://xmp.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/xsynth-dssi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/xsynth-dssi/default.nix index 87305027e4..e28d773d6e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/xsynth-dssi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { synths) with user interfaces, permitting them to be hosted in-process by audio applications. ''; - homepage = "http://dssi.sourceforge.net/download.html#Xsynth-DSSI"; + homepage = "https://dssi.sourceforge.net/download.html#Xsynth-DSSI"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/yesplaymusic/default.nix b/third_party/nixpkgs/pkgs/applications/audio/yesplaymusic/default.nix new file mode 100644 index 0000000000..aee0d1d192 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/yesplaymusic/default.nix @@ -0,0 +1,120 @@ +{ lib +, stdenv +, fetchurl +, undmg +, dpkg +, autoPatchelfHook +, wrapGAppsHook +, makeWrapper +, alsa-lib +, at-spi2-atk +, cups +, nspr +, nss +, mesa # for libgbm +, xorg +, xdg-utils +, libdrm +, libnotify +, libsecret +, libuuid +, gtk3 +, systemd +}: +let + pname = "yesplaymusic"; + version = "0.4.7"; + + srcs = { + x86_64-linux = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_amd64.deb"; + hash = "sha256-nnnHE2OgIqoz3dC+G0219FVBhvnWivLW1BX6+NYo6Ng="; + }; + aarch64-linux = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_arm64.deb"; + hash = "sha256-+rrhY5iDDt/nYs0Vz5/Ef0sgpsdBKMtb1aVfCZLgRgg="; + }; + x86_64-darwin = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-x64.dmg"; + hash = "sha256-z8CASZRWKlj1g3mhxTMMeR4klTvQ2ReSrL7Rt18qQbM="; + }; + aarch64-darwin = fetchurl { + url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-arm64.dmg"; + hash = "sha256-McYLczudKG4tRNIw/Ws4rht0n4tiKA2M99yKtJbdlY8="; + }; + }; + src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + libraries = [ + alsa-lib + at-spi2-atk + cups + nspr + nss + mesa + xorg.libxshmfence + xorg.libXScrnSaver + xorg.libXtst + xdg-utils + libdrm + libnotify + libsecret + libuuid + gtk3 + ]; + + meta = with lib; { + description = "A good-looking third-party netease cloud music player"; + homepage = "https://github.com/qier222/YesPlayMusic/"; + license = licenses.mit; + maintainers = with maintainers; [ ChaosAttractor ]; + platforms = builtins.attrNames srcs; + }; +in +if stdenv.isDarwin +then stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/Applications + cp -r *.app $out/Applications + ''; +} +else stdenv.mkDerivation { + inherit pname version src meta; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + makeWrapper + ]; + + buildInputs = libraries; + + runtimeDependencies = [ + (lib.getLib systemd) + ]; + + unpackPhase = '' + ${dpkg}/bin/dpkg-deb -x $src . + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r opt $out/opt + cp -r usr/share $out/share + substituteInPlace $out/share/applications/yesplaymusic.desktop \ + --replace "/opt/YesPlayMusic/yesplaymusic" "$out/bin/yesplaymusic" + makeWrapper $out/opt/YesPlayMusic/yesplaymusic $out/bin/yesplaymusic \ + --argv0 "yesplaymusic" \ + --add-flags "$out/opt/YesPlayMusic/resources/app.asar" + + runHook postInstall + ''; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix index 6a7d7a9dc7..ed36ab263a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix @@ -2,11 +2,11 @@ let pname = "youtube-music"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { url = "https://github.com/th-ch/youtube-music/releases/download/v${version}/YouTube-Music-${version}.AppImage"; - sha256 = "sha256-7U+zyLyXMVVMtRAT5yTEUqS3/qP5Kx/Yuu263VcsbAE="; + sha256 = "sha256-o/a+6EKPEcE9waXQK3hxtp7FPqokteoUAt0iOJk8bYw="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix b/third_party/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix index a9d041cfa4..c676e6a774 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://www.zamaudio.com/?p=976"; + homepage = "https://www.zamaudio.com/?p=976"; description = "A collection of LV2/LADSPA/VST/JACK audio plugins by ZamAudio"; license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix index fae337c079..2c8ecfd199 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix @@ -95,7 +95,7 @@ in stdenv.mkDerivation rec { ++ lib.optional (guiModule == "fltk") "-DFLTK_SKIP_OPENGL=ON"; doCheck = true; - checkInputs = [ cxxtest ruby ]; + nativeCheckInputs = [ cxxtest ruby ]; # TODO: Update cmake hook to make it simpler to selectively disable cmake tests: #113829 checkPhase = let diff --git a/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix index d1610516f6..36f554761f 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { pyunifiprotect ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix index ad55ef1ab8..05d3cc8626 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "vorta"; - version = "0.8.9"; + version = "0.8.10"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "refs/tags/v${version}"; - sha256 = "sha256-5RZXHMov3CX0zRprs7sgz0+cGEdESLrg4I2glRnTkcU="; + hash = "sha256-okxZ1kALB5l94ShStAJLfzD37MLhob8MCzhbqfVISkw="; }; nativeBuildInputs = [ wrapQtAppsHook ]; @@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec { ) ''; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytest-qt pytest-mock pytestCheckHook @@ -84,10 +84,11 @@ python3Packages.buildPythonApplication rec { ]; meta = with lib; { - license = licenses.gpl3Only; - homepage = "https://vorta.borgbase.com/"; - maintainers = with maintainers; [ ma27 ]; + changelog = "https://github.com/borgbase/vorta/releases/tag/v0.8.10"; description = "Desktop Backup Client for Borg"; + homepage = "https://vorta.borgbase.com/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ma27 ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix index 68ddcca4a1..7993887be6 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "22.7.6"; + version = "22.10.3"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-nlOIUvFv05uITEw0K+qtgT4zqySJBjTAHu49N9wdqJM="; + sha256 = "sha256-chP5RFqEoZbpSuGHfG/bHlHTe/sZYV2gLvUSHU9A44w="; }; nativeBuildInputs = [ makeWrapper ]; 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 0da9675d25..36bc0ebfb8 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -34,11 +34,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.9.8"; + version = "1.9.9"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "1hwfchwqvflfzpv8n9wvj567a68fa4bch0hi8vk4pzmwxsx4z7g1"; + sha256 = "0jisxzajsc4wfvxabvfzd0x9y1fxzg39fkhap1781q7wyi4ry9kd"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/update.sh b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/update.sh index 393447834b..c65e04e3de 100755 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/update.sh +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/update.sh @@ -7,14 +7,13 @@ version="$(curl -s https://api.github.com/repos/bisq-network/bisq/releases| jq ' 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" +curl https://bisq.network/pubkey/E222AA02.asc | gpg --import gpg --batch --verify signature.asc "$depname" sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$depname") popd diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-knots/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-knots/default.nix index ca998248a6..d1e4194255 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-knots/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-knots/default.nix @@ -23,7 +23,6 @@ , withWallet ? true }: -with lib; stdenv.mkDerivation rec { pname = if withGui then "bitcoin-knots" else "bitcoind-knots"; version = "23.0.knots20220529"; @@ -35,29 +34,29 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ optionals stdenv.isLinux [ util-linux ] - ++ optionals stdenv.isDarwin [ hexdump ] - ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] - ++ optionals withGui [ wrapQtAppsHook ]; + ++ lib.optionals stdenv.isLinux [ util-linux ] + ++ lib.optionals stdenv.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ optionals withWallet [ db48 sqlite ] - ++ optionals withGui [ qrencode qtbase qttools ]; + ++ lib.optionals withWallet [ db48 sqlite ] + ++ lib.optionals withGui [ qrencode qtbase qttools ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] ++ optionals (!withWallet) [ + ] ++ lib.optionals (!withWallet) [ "--disable-wallet" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; @@ -65,7 +64,7 @@ stdenv.mkDerivation rec { [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 - ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; enableParallelBuilding = true; @@ -73,7 +72,7 @@ stdenv.mkDerivation rec { smoke-test = nixosTests.bitcoind-knots; }; - meta = { + meta = with lib; { description = "A derivative of Bitcoin Core with a collection of improvements"; homepage = "https://bitcoinknots.org/"; maintainers = with maintainers; [ prusnak mmahut ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited/default.nix index d019c3f02d..3fbf9615f7 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited/default.nix @@ -3,10 +3,8 @@ , withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null , Foundation, ApplicationServices, AppKit }: -with lib; - stdenv.mkDerivation rec { - pname = "bitcoin" + optionalString (!withGui) "d" + "-unlimited"; + pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-unlimited"; version = "1.10.0.0"; src = fetchFromGitLab { @@ -17,19 +15,19 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config autoreconfHook python3 ] - ++ optionals withGui [ wrapQtAppsHook qttools ]; + ++ lib.optionals withGui [ wrapQtAppsHook qttools ]; buildInputs = [ openssl db48 boost zlib miniupnpc util-linux protobuf libevent ] - ++ optionals withGui [ qtbase qttools qrencode ] - ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; + ++ lib.optionals withGui [ qtbase qttools qrencode ] + ++ lib.optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt5" + ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Peer-to-peer electronic cash system (Unlimited client)"; longDescription= '' Bitcoin is a free open source peer-to-peer electronic cash system that is diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix index 1c69892730..9848339197 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix @@ -23,7 +23,6 @@ , withWallet ? true }: -with lib; let desktop = fetchurl { # c2e5f3e is the last commit when the debian/bitcoin-qt.desktop file was changed @@ -45,16 +44,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ optionals stdenv.isLinux [ util-linux ] - ++ optionals stdenv.isDarwin [ hexdump ] - ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] - ++ optionals withGui [ wrapQtAppsHook ]; + ++ lib.optionals stdenv.isLinux [ util-linux ] + ++ lib.optionals stdenv.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ optionals withWallet [ db48 sqlite ] - ++ optionals withGui [ qrencode qtbase qttools ]; + ++ lib.optionals withWallet [ db48 sqlite ] + ++ lib.optionals withGui [ qrencode qtbase qttools ]; - postInstall = optionalString withGui '' + postInstall = lib.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 @@ -63,17 +62,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] ++ optionals (!withWallet) [ + ] ++ lib.optionals (!withWallet) [ "--disable-wallet" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; @@ -81,7 +80,7 @@ stdenv.mkDerivation rec { [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 - ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; enableParallelBuilding = true; @@ -89,7 +88,7 @@ stdenv.mkDerivation rec { smoke-test = nixosTests.bitcoind; }; - meta = { + meta = with lib; { description = "Peer-to-peer electronic cash system"; longDescription = '' Bitcoin is a free open source peer-to-peer electronic cash system that is diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcdeb/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcdeb/default.nix index 4f8a08333a..f4c00d0085 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcdeb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcdeb/default.nix @@ -5,7 +5,6 @@ , openssl }: -with lib; stdenv.mkDerivation rec { pname = "btcdeb"; version = "unstable-2022-04-03"; @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl ]; - meta = { + meta = with lib; { description = "Bitcoin Script Debugger"; homepage = "https://github.com/bitcoin-core/btcdeb"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix index fb3912ab4d..69004bb73c 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.7.3"; + version = "1.7.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-wjtiircPPQgWg1GGQsesEEeOF+h1+tc591YI0l/JlwQ="; + sha256 = "sha256-xycNt3jzZY2a4hNv3arWLt+EfMqpFVMDHMuzOWnL7aQ="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix index 6b67883226..8a05f8276b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -8,15 +8,15 @@ (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.14"; sha256 = "1k5m6jc585hnkkl019diz2gycfnsv2kx4g4cfs4awlpr42k8s3ph"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.18"; sha256 = "0zpqi8dpk91sqg7njxbs64m9598fmmalcc1w97v60xlhp9afjmdb"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.21"; sha256 = "0qq6ppr5vw4k8hjnz5xp29fc82z32vh6bc389dnr439gw7hmwkp9"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.18"; sha256 = "1w1h6za2mjk04njkw4hny3lx38h2m03gmvwrihj9h2rak7jf2gij"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.24"; sha256 = "0i0lqpxx0gy9zbssjigz0vq0way88x0slyyfijsx4sasrhrbv5qs"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.19"; sha256 = "046vvlxlg8div4a2v6pnxz4iwji93s688jgnvav3hl6c22b9lvs0"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.18"; sha256 = "04lp90rr61p7n39bfmia6jamgr0jjfns9987py64iazi236dl74g"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.20"; sha256 = "1kwyh71zzfij07r6nvcf7k2gdpjdhh90imwh6s255ws13m1fj3sn"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.11"; sha256 = "0zm0b45npacknir6b6a6v717kp3yz8hxv1qy2v65g2zp3ad2wij4"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.14"; sha256 = "1hhznv07bd1f3rn9d1rpg61ln68vqfjg7ypxif9lx4l3vfcj5j04"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.23"; sha256 = "036cggc386448i05s38pnhzs7qqbix6lml7j2zn84gcgk8w741gi"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.14"; sha256 = "1gzqz34lgk42kf86ldi3z0k4m9x91hlkqh6d7rq93nphl57mwqar"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.16"; sha256 = "0l6pnjc6phsacwg145kwsakjpkd44jm1w53y0s166bwzpcdmljq0"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; }) (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) @@ -38,7 +38,7 @@ (fetchNuGet { pname = "HtmlSanitizer"; version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) - (fetchNuGet { pname = "LNURL"; version = "0.0.27"; sha256 = "126rhls5yxxw4i419w59762cq3zmjccjd8x42qmb4nhqmbgybkzm"; }) + (fetchNuGet { pname = "LNURL"; version = "0.0.28"; sha256 = "1fcrq5ib02scz6n4zvmnbvm2aahj6qwwq6wsfix90caqm2c2bq64"; }) (fetchNuGet { pname = "MailKit"; version = "3.3.0"; sha256 = "18l0jkrc4d553kiw4vdjzzpafpvsgjs1n19kjbi8isnhzidmsl4j"; }) (fetchNuGet { pname = "Microsoft.AspNet.SignalR.Client"; version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; }) (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; }) @@ -87,9 +87,9 @@ (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "6.0.0"; sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "6.0.1"; sha256 = "0ra0ldbg09r40jzvfqhpb3h42h80nafvka9hg51dja32k3mxn5gk"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.0"; sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.10"; sha256 = "04xjhi2pmvycx4yam7i3j2l2yjzzbzvxn4i12f00r39j4kkfwqsn"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.5"; sha256 = "1i7zm8ghgxwp655anyfm910qm7rcpvrz48fxjyzw9w63hj4sv6bk"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.10"; sha256 = "1pj4n3c015ils13fwky2rfv5q8xza671ixb54vr479pc7an2fah3"; }) @@ -98,9 +98,9 @@ (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.10"; sha256 = "004f9nshm5jg0g4n9f48phjx90pzmj88qbqyiimzgvwl0qkk870q"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.1.5"; sha256 = "0310pvrwbbqak7k4s32syryqxlkwli8w8bwlpnqmz42svh2302wv"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "2.1.0"; sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "2.1.0"; sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; version = "2.1.0"; sha256 = "0bchsljywcq36si4zs2dcx2gj8x98ww93dh2bx2z6x5ilxyjnfip"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; version = "6.0.0"; sha256 = "18qg1f7yvgvrgsq40cgc1yvpb9av84ma80k3grhvwn1cyam2img6"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.1.10"; sha256 = "0if1g8gj3ngvqf4ddkjhz30p4y2yax8m5vlbrjzgixq80g3apy6d"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) @@ -113,8 +113,9 @@ (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.0.0"; sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.1.0"; sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "2.1.0"; sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; }) - (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.1.0"; sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.0.0"; sha256 = "056wgjcdzvz1qwb26xv6hgxq4xya56qiimhk30v8an8cgsrjk3mc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.1.0"; sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; }) (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; version = "6.0.9"; sha256 = "1g9jsqxaif9z5m228rci54w6cqmg07i0cm618iwa0jibsphx86fk"; }) @@ -156,19 +157,18 @@ (fetchNuGet { pname = "NBitcoin"; version = "5.0.40"; sha256 = "1rqzn84yaww4afagwg8jg1l5qdkvqyjdfcyd5widddqwxabbsjvh"; }) (fetchNuGet { pname = "NBitcoin"; version = "6.0.8"; sha256 = "1f90zyrd35fzx0vgvd83jhd6hczd4037h2k198xiyxj04l4m3wm5"; }) (fetchNuGet { pname = "NBitcoin"; version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.18"; sha256 = "02kkgymdb80cidibrs6qpy1zjwcfbkwv9zqz9s0swf5zp7qvcakn"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.23"; sha256 = "10dy58gq644561svc67pm37rlb44mymbnlfz409dhclmfhmqmd5s"; }) - (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.17"; sha256 = "1rqcfpcs3c7zqlw3fnvnyw3d3mmplg5nsaikm50lnzpl8z3cq936"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.24"; sha256 = "0yc6cgwp2xr2dzjsrkawyh43whixv66nvvq6rh1pi6gi14iaqmfa"; }) + (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.18"; sha256 = "054i15qan5154iy8m13jmhnz1w5rs208i1xhlfnivwiq2v1c2qby"; }) (fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; sha256 = "1sgwradg7jnb4n3chwqfkximj1qhgl3r23p0sifmaa0kql2hlira"; }) - (fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.2"; sha256 = "0a8zy9iasgmr7mqhjrbxa2shnygpp97pbg5qnk7ix50y01k9blyw"; }) + (fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.3"; sha256 = "0lf5qsf5yr5m1fx826mn47l237x5y2wkimv6klc3rvwwc7f10dmm"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) - (fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "1.0.0.2"; sha256 = "08a9l18zkhcfa6f56xqylzvmqjzgxsmgkpm2r3ckvxfyml6w0qyy"; }) - (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; version = "1.0.0.3"; sha256 = "0al0pd4zhjpmn8m208xjmy17cbyab68grzdvzr2lhsckwkl6b1jg"; }) + (fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "2.0.0"; sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; }) + (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; version = "2.0.0"; sha256 = "1cng096r3kb85lf5wjill4yhxx8nv9v0d6ksbn1i1vvdawwl6fkw"; }) (fetchNuGet { pname = "NicolasDorier.RateLimits"; version = "1.2.3"; sha256 = "197cqb0yxd2hfxyikxw53m4lmxh87l9sqrr8xihg1j0knvwzgyyp"; }) - (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; version = "1.0.0.18"; sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b"; }) + (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; version = "2.0.1"; sha256 = "1jiinqj1y8vv78p766asml4bd0k5gwrpl9ksi176h0z7wsj6ilrx"; }) (fetchNuGet { pname = "NLog"; version = "4.7.14"; sha256 = "1pjkxlf20vrh9b8r6wzay1563fdhhxslxb7acdkn5ss8gvd2m23n"; }) (fetchNuGet { pname = "Npgsql"; version = "6.0.7"; sha256 = "0c5zyd9n3597ryzqh9qfisp3wvr7q0krbnl26w2sy33xm4hvls2c"; }) (fetchNuGet { pname = "Npgsql.EntityFrameworkCore.PostgreSQL"; version = "6.0.7"; sha256 = "0gsvjf0vk7anmc889my8x68wpd47bsdgsk1rwbg77rrb9zsf4nxp"; }) diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/default.nix index 1b40e6ddb0..e7b92b268a 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/chia-dev-tools/default.nix @@ -37,12 +37,13 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ (toPythonModule chia) + pytest # required at runtime by the "test" command + pytest-asyncio pytimeparse ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook - pytest-asyncio ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix index bae0fc7988..99fe1595de 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix @@ -64,7 +64,7 @@ let chia = python3Packages.buildPythonApplication rec { zstd ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/digibyte/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/digibyte/default.nix index 90e84db363..4e563d21fa 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/digibyte/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/digibyte/default.nix @@ -15,13 +15,11 @@ , wrapQtAppsHook ? null }: -with lib; - stdenv.mkDerivation rec { pname = "digibyte"; version = "7.17.3"; - name = pname + toString (optional (!withGui) "d") + "-" + version; + name = pname + toString (lib.optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = "digibyte-core"; @@ -34,7 +32,7 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config hexdump - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ wrapQtAppsHook ]; @@ -44,7 +42,7 @@ stdenv.mkDerivation rec { libevent db4 zeromq - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ qtbase qttools protobuf @@ -54,12 +52,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - meta = { + meta = with lib; { description = "DigiByte (DGB) is a rapidly growing decentralized, global blockchain"; homepage = "https://digibyte.io/"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dogecoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/dogecoin/default.nix index 6b6cfaa239..421c2fe667 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/dogecoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/dogecoin/default.nix @@ -6,9 +6,8 @@ , withGui, withUpnp ? true, withUtils ? true, withWallet ? true , withZmq ? true, zeromq, util-linux ? null, Cocoa ? null }: -with lib; stdenv.mkDerivation rec { - pname = "dogecoin" + optionalString (!withGui) "d"; + pname = "dogecoin" + lib.optionalString (!withGui) "d"; version = "1.14.6"; src = fetchFromGitHub { @@ -18,32 +17,32 @@ stdenv.mkDerivation rec { sha256 = "sha256-PmbmmA2Mq07dwB3cI7A9c/ewtu0I+sWvQT39Yekm/sU="; }; - preConfigure = optionalString withGui '' - export LRELEASE=${getDev qttools}/bin/lrelease + preConfigure = lib.optionalString withGui '' + export LRELEASE=${lib.getDev qttools}/bin/lrelease ''; nativeBuildInputs = [ pkg-config autoreconfHook util-linux ] - ++ optionals withGui [ wrapQtAppsHook qttools ]; + ++ lib.optionals withGui [ wrapQtAppsHook qttools ]; buildInputs = [ openssl protobuf boost zlib libevent ] - ++ optionals withGui [ qtbase qrencode ] - ++ optionals withUpnp [ miniupnpc ] - ++ optionals withWallet [ db5 ] - ++ optionals withZmq [ zeromq ] - ++ optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals withGui [ qtbase qrencode ] + ++ lib.optionals withUpnp [ miniupnpc ] + ++ lib.optionals withWallet [ db5 ] + ++ lib.optionals withZmq [ zeromq ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; configureFlags = [ "--with-incompatible-bdb" "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals (!withGui) [ "--with-gui=no" ] - ++ optionals (!withUpnp) [ "--without-miniupnpc" ] - ++ optionals (!withUtils) [ "--without-utils" ] - ++ optionals (!withWallet) [ "--disable-wallet" ] - ++ optionals (!withZmq) [ "--disable-zmq" ]; + ] ++ lib.optionals (!withGui) [ "--with-gui=no" ] + ++ lib.optionals (!withUpnp) [ "--without-miniupnpc" ] + ++ lib.optionals (!withUtils) [ "--without-utils" ] + ++ lib.optionals (!withWallet) [ "--disable-wallet" ] + ++ lib.optionals (!withZmq) [ "--disable-zmq" ]; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Wow, such coin, much shiba, very rich"; longDescription = '' Dogecoin is a decentralized, peer-to-peer digital currency that diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/elements/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/elements/default.nix index 1c02076c57..a39cbc341e 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/elements/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/elements/default.nix @@ -22,7 +22,6 @@ , withWallet ? true }: -with lib; stdenv.mkDerivation rec { pname = if withGui then "elements" else "elementsd"; version = "22.0.2"; @@ -36,24 +35,24 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] - ++ optionals stdenv.isLinux [ util-linux ] - ++ optionals stdenv.isDarwin [ hexdump ] - ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] - ++ optionals withGui [ wrapQtAppsHook ]; + ++ lib.optionals stdenv.isLinux [ util-linux ] + ++ lib.optionals stdenv.isDarwin [ hexdump ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] + ++ lib.optionals withGui [ wrapQtAppsHook ]; buildInputs = [ boost libevent miniupnpc zeromq zlib ] - ++ optionals withWallet [ db48 sqlite ] - ++ optionals withGui [ qrencode qtbase qttools ]; + ++ lib.optionals withWallet [ db48 sqlite ] + ++ lib.optionals withGui [ qrencode qtbase qttools ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--disable-bench" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--disable-tests" "--disable-gui-tests" - ] ++ optionals (!withWallet) [ + ] ++ lib.optionals (!withWallet) [ "--disable-wallet" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -62,7 +61,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/179474 hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "fortify" "stackprotector" ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; @@ -70,11 +69,11 @@ stdenv.mkDerivation rec { [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI. # See also https://github.com/NixOS/nixpkgs/issues/24256 - ++ optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; + ++ lib.optional withGui "QT_PLUGIN_PATH=${qtbase}/${qtbase.qtPluginPrefix}"; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Open Source implementation of advanced blockchain features extending the Bitcoin protocol"; longDescription= '' The Elements blockchain platform is a collection of feature experiments and extensions to the diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix index 3d14ec40f2..e656843536 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "5.0.3"; + version = "5.0.6"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-IDAss4qX39qPyOsPpVg5zU6zq/QV/RTnbHTGVl9UmOA="; + sha256 = "sha256-UiPwvZcdkeFOTMVcUT1Xr5ByrJC+yzodCfi8Br61hjU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix index e81dc1813e..a17bef8cae 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.35.2"; + version = "2.37.0"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hGJ9SeUYACOuypTJmPnrv4f8ujjsUt3dZbwso+94g3M="; + sha256 = "sha256-r/mumt/f0wrOsXyEHo/NX0lJGt8zqXEVNC+9DWDkHAM="; fetchSubmodules = true; }; - vendorSha256 = "sha256-lKzJLRCcyhQIV7y1XxqbvTINLlUwWFnflZgGQHYzBjY="; + vendorSha256 = "sha256-vSJZ1wIx1CiLE04ZBDnQDQqM2v8BBLxw5qbAsixC3/U="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix index 36001a8d6d..bcc25cf246 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/groestlcoin/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; checkFlags = [ "LC_ALL=en_US.UTF-8" ] # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Groestlcoin's GUI. diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix index 5b1d12634d..4f53eaf580 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "haven-cli"; - version = "3.0.3"; + version = "3.0.7"; src = fetchFromGitHub { owner = "haven-protocol-org"; repo = "haven-main"; rev = "v${version}"; - sha256 = "sha256-JbNk1TF0N3tRYGfZfSBFk+t/8GA4yjqP9G6S0ktdur8="; + sha256 = "sha256-HLZ9j75MtF7FkHA4uefkrYp07pVZe1Ac1wny7T0CMpA="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix index afc9c44f01..7a5607d01c 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lighthouse/default.nix @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage rec { "--skip subnet_service::tests::sync_committee_service::subscribe_and_unsubscribe" ]; - checkInputs = [ + nativeCheckInputs = [ nodePackages.ganache ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/litecoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/litecoin/default.nix index d150d73474..3eeeafe8d8 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/litecoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/litecoin/default.nix @@ -9,10 +9,8 @@ , fmt }: -with lib; - mkDerivation rec { - pname = "litecoin" + optionalString (!withGui) "d"; + pname = "litecoin" + lib.optionalString (!withGui) "d"; version = "0.21.2.1"; src = fetchFromGitHub { @@ -25,11 +23,11 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl db48 boost zlib zeromq fmt miniupnpc glib protobuf util-linux libevent ] - ++ optionals stdenv.isDarwin [ AppKit ] - ++ optionals withGui [ qtbase qttools qrencode ]; + ++ lib.optionals stdenv.isDarwin [ AppKit ] + ++ lib.optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ + ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; @@ -40,7 +38,7 @@ mkDerivation rec { ./src/test/test_litecoin ''; - meta = { + meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "A lite version of Bitcoin using scrypt as a proof-of-work algorithm"; longDescription= '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix index 5d8e887209..e9d68b7562 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Compiler and inspector for the miniscript Bitcoin policy language"; longDescription = "Miniscript is a language for writing (a subset of) Bitcoin Scripts in a structured way, enabling analysis, composition, generic signing and more."; - homepage = "http://bitcoin.sipa.be/miniscript/"; + homepage = "https://bitcoin.sipa.be/miniscript/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ RaghavSood jb55 ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix index 5e4b0afd38..08def5dd79 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.54"; + version = "2.3.57"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-WINanMGAlZioD6XP0xK6H+KTlF/NRMAmhylmRV6y2uI="; + sha256 = "sha256-oLkkGdzjyvgIXi0HZiFPCShzbBR8cOgMf1h1Nf1U6Rk="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix index 62aeee0f63..e9b1de7ed9 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -34,8 +34,8 @@ (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.22"; sha256 = "1911mwz23qm9qnlfsm2j6qdkj1l43gjym4di8r50zikfnyd654sx"; }) - (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.17"; sha256 = "1rqcfpcs3c7zqlw3fnvnyw3d3mmplg5nsaikm50lnzpl8z3cq936"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.24"; sha256 = "0yc6cgwp2xr2dzjsrkawyh43whixv66nvvq6rh1pi6gi14iaqmfa"; }) + (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.18"; sha256 = "054i15qan5154iy8m13jmhnz1w5rs208i1xhlfnivwiq2v1c2qby"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix index c55d04b03a..942f0a71cb 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix @@ -14,8 +14,6 @@ , python3 }: -with lib; - stdenv.mkDerivation rec { pname = "particl-core"; version = "23.0.3.0"; @@ -33,7 +31,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-bench" "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals (!doCheck) [ + ] ++ lib.optionals (!doCheck) [ "--enable-tests=no" ]; @@ -42,7 +40,7 @@ stdenv.mkDerivation rec { preCheck = "patchShebangs test"; enableParallelBuilding = true; - meta = { + meta = with lib; { broken = (stdenv.isLinux && stdenv.isAarch64); description = "Privacy-Focused Marketplace & Decentralized Application Platform"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index 1f5636dd41..883514b7da 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -3,20 +3,22 @@ , lib , llvmPackages , protobuf +, rocksdb , rustPlatform , stdenv , writeShellScriptBin , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.36"; + version = "0.9.37"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-HzQFlnn+SPasI0g0DYDCRoFCMVyxlUmEQAobvzRnAW4="; + hash = "sha256-/mgJNjliPUmMkhT/1oiX9+BJHfY3SMsKfFv9HCyWRQQ="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -32,9 +34,9 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-P31GW/1HiaZLF6e8Fq1YnH1ZLhiOhURm8st9a4KRlJU="; + cargoHash = "sha256-o+APFYKgA3zjQSGrkpnyf5LEBBqvZtcfWlzCk6nL02A="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ rustPlatform.bindgenHook ]; @@ -44,6 +46,7 @@ rustPlatform.buildRustPackage rec { ''; PROTOC = "${protobuf}/bin/protoc"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; # NOTE: We don't build the WASM runtimes since this would require a more # complicated rust environment setup and this is only needed for developer diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/solana/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/solana/default.nix index a91d1f3905..4886720218 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/solana/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/solana/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; # all the following are needed for the checkphase - # checkInputs = lib.optionals stdenv.isDarwin [ pkg-config rustfmt ]; + # nativeCheckInputs = lib.optionals stdenv.isDarwin [ pkg-config rustfmt ]; # Needed to get openssl-sys to use pkg-config. # OPENSSL_NO_VENDOR = 1; # OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix index fbbd05be46..8f3fd4b1c8 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "stellar-core"; - version = "19.4.0"; + version = "19.6.0"; src = fetchFromGitHub { owner = "stellar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pgwLCtlj2Ak34KfE+ffIxQ1Z4Epxm3f1Y2aqYOIlLUc="; + sha256 = "sha256-lDefmPZM8ow6t5CpNBxef+9BoT773p5UgeMhgF+em2w="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix index 85041accbc..cf7722238e 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/torq/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "torq"; - version = "0.16.15"; + version = "0.17.3"; src = fetchFromGitHub { owner = "lncapital"; repo = pname; rev = "v${version}"; - hash = "sha256-ibrPq/EC61ssn4072gTNvJg9QO41+aTsU1Hhc6X6NPk="; + hash = "sha256-fqHJZi1NQCrZqsa+N+FVYZ8s9o0D555Sqn5qNlJ1MmI="; }; vendorHash = "sha256-HETN2IMnpxnTyg6bQDpoD0saJu+gKocdEf0VzEi12Gs="; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/vertcoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/vertcoin/default.nix index 87d9a8b64b..90e4dd14a6 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/vertcoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/vertcoin/default.nix @@ -16,13 +16,11 @@ , wrapQtAppsHook ? null }: -with lib; - stdenv.mkDerivation rec { pname = "vertcoin"; version = "0.18.0"; - name = pname + toString (optional (!withGui) "d") + "-" + version; + name = pname + toString (lib.optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = pname + "-project"; @@ -35,7 +33,7 @@ stdenv.mkDerivation rec { autoreconfHook pkg-config hexdump - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ wrapQtAppsHook ]; @@ -46,7 +44,7 @@ stdenv.mkDerivation rec { db4 zeromq gmp - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ qtbase qttools protobuf @@ -56,12 +54,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" - ] ++ optionals withGui [ + ] ++ lib.optionals withGui [ "--with-gui=qt5" "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; - meta = { + meta = with lib; { description = "A digital currency with mining decentralisation and ASIC resistance as a key focus"; homepage = "https://vertcoin.org/"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix index 30edd74d03..c4c8de947f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.2"; + version = "2.0.2.1"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-0DFl+UFxQckRM2qXFqDpKaRQ5sIMUbNj7l3zKPKAOnQ="; + sha256 = "sha256-kvUwWRZZmalJQL65tRNdgTg7ZQHhmIbfmsfHbHBYz7w="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wownero/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wownero/default.nix index 14e17c766d..9c68a094b8 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/wownero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/wownero/default.nix @@ -2,7 +2,6 @@ , readline, libsodium, rapidjson }: -with lib; stdenv.mkDerivation rec { pname = "wownero"; version = "0.8.0.1"; @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { "-DMANUAL_SUBMODULES=ON" ]; - meta = { + meta = with lib; { description = '' A privacy-centric memecoin that was fairly launched on April 1, 2018 with no pre-mine, stealth-mine or ICO diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix index 348f470641..8365ac3b5a 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix @@ -30,8 +30,6 @@ , yelp-tools }: -with lib; - stdenv.mkDerivation rec { pname = "lightdm"; version = "1.32.0"; @@ -69,7 +67,7 @@ stdenv.mkDerivation rec { libxklavier pam polkit - ] ++ optional withQt5 qtbase; + ] ++ lib.optional withQt5 qtbase; patches = [ # Adds option to disable writing dmrc files @@ -96,7 +94,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--disable-tests" "--disable-dmrc" - ] ++ optional withQt5 "--enable-liblightdm-qt5"; + ] ++ lib.optional withQt5 "--enable-liblightdm-qt5"; installFlags = [ "sysconfdir=${placeholder "out"}/etc" @@ -120,7 +118,7 @@ stdenv.mkDerivation rec { }; - meta = { + meta = with lib; { homepage = "https://github.com/canonical/lightdm"; description = "A cross-desktop display manager"; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/editors/aewan/default.nix b/third_party/nixpkgs/pkgs/applications/editors/aewan/default.nix index 8472a91c59..6e817646d9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/aewan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/aewan/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Ascii-art Editor Without A Name"; - homepage = "http://aewan.sourceforge.net/"; + homepage = "https://aewan.sourceforge.net/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; 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 bc74edf526..3d96ebd8de 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -79,7 +79,7 @@ let installPhase = '' cp -r . $out wrapProgram $out/bin/studio.sh \ - --set-default JAVA_HOME "$out/jre" \ + --set-default JAVA_HOME "$out/jbr" \ --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ ${lib.optionalString tiling_wm "--set _JAVA_AWT_WM_NONREPARENTING 1"} \ 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 70d146db32..494a02f304 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -10,16 +10,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2021.3.1.17"; # "Android Studio Dolphin (2021.3.1)" - sha256Hash = "sha256-ia2wzg/6RreJTnv+2xQrH11SxDwXHmpsualaSfd3Vso="; + version = "2022.1.1.19"; # "Android Studio Electric Eel (2022.1.1)" + sha256Hash = "luxE6a2C86JB28ezuIZV49TyE314S1RcNXQnCQamjUA="; }; betaVersion = { - version = "2022.1.1.12"; # "Android Studio Electric Eel (2022.1.1) Beta 2" - sha256Hash = "8iSFPH0PTQkzV1t8bEq7CBtOU8pzdnD/PrpVcgPnO6Q="; + version = "2022.2.1.12"; # "Android Studio Flamingo (2022.2.1) Beta 1" + sha256Hash = "tIgmX9KiRInIupgIXWgg4dMf8bTwkVopOxAO5O1PUAc="; }; latestVersion = { # canary & dev - version = "2022.2.1.2"; # "Android Studio Flamingo (2022.2.1) Canary 2" - sha256Hash = "hlHlgyl9If2LH4aExpElx0rqmWeoFX+qx4w6RRb5e8U="; + version = "2022.3.1.1"; # "Android Studio Girrafe (2022.3.1) Canary 1" + sha256Hash = "I7Zc4DDByUB6XOnk7v+91ccpNI7eX/T4d3vH60ih8ec="; }; in { # Attributes are named by their corresponding release channels diff --git a/third_party/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix index caa1d2ab79..e435e834e7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/bonzomatic/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "bonzomatic"; - version = "2022-02-05"; + version = "2022-08-20"; src = fetchFromGitHub { owner = "Gargaj"; repo = pname; rev = version; - sha256 = "sha256-y0zNluIDxms+Lpg7yBiEJNNyxx5TLaSiWBKXjqXiVJg="; + sha256 = "sha256-AaUMefxQd00O+MAH4OLoyQIXZCRQQbt2ucgt7pVvN24="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/bvi/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bvi/default.nix index ddef846764..e4e41ec732 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/bvi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/bvi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Hex editor with vim style keybindings"; - homepage = "http://bvi.sourceforge.net/download.html"; + homepage = "https://bvi.sourceforge.net/download.html"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux ++ darwin; diff --git a/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix b/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix index 7a1c0af2c6..441b224ef0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/codeblocks/default.nix @@ -2,8 +2,6 @@ , contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook }: -with lib; - stdenv.mkDerivation rec { name = "${pname}-${lib.optionalString contribPlugins "full-"}${version}"; version = "20.03"; @@ -16,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ]; buildInputs = [ wxGTK31 gtk3 ] - ++ optionals contribPlugins [ hunspell gamin boost ]; + ++ lib.optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch @@ -56,16 +54,16 @@ stdenv.mkDerivation rec { }) ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; - configureFlags = [ "--enable-pch=no" ] ++ optionals contribPlugins [ - ("--with-contrib-plugins" + optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman") + postConfigure = lib.optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig"; + configureFlags = [ "--enable-pch=no" ] ++ lib.optionals contribPlugins [ + ("--with-contrib-plugins" + lib.optionalString stdenv.isDarwin "=all,-FileManager,-NassiShneiderman") "--with-boost-libdir=${boost}/lib" ]; - postInstall = optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' ln -s $out/lib/codeblocks/plugins $out/share/codeblocks/plugins ''; - meta = { + meta = with lib; { maintainers = [ maintainers.linquize ]; platforms = platforms.all; description = "The open source, cross platform, free C, C++ and Fortran IDE"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix index de5a961fd1..7773c1e75f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { tar xfvz $src -C $out # Patch binaries. - interpreter=$(echo ${stdenv.cc.libc}/lib/ld-linux*.so.2) + interpreter="$(cat $NIX_BINTOOLS/nix-support/dynamic-linker)" libCairo=$out/eclipse/libcairo-swt.so patchelf --set-interpreter $interpreter $out/eclipse/eclipse [ -f $libCairo ] && patchelf --set-rpath ${lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} $libCairo @@ -58,10 +58,10 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = "http://www.eclipse.org/"; + homepage = "https://www.eclipse.org/"; inherit description; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix index eadd271242..a57a3901f6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix @@ -20,6 +20,11 @@ let buildmonth = "11"; #sometimes differs from release month timestamp = "${year}${buildmonth}231800"; gtk = gtk3; + arch = if stdenv.hostPlatform.isx86_64 then + "x86_64" + else if stdenv.hostPlatform.isAarch64 then + "aarch64" + else throw "don't know what platform suffix for ${stdenv.hostPlatform.system} will be"; in rec { buildEclipse = callPackage ./build-eclipse.nix { @@ -35,8 +40,11 @@ in rec { description = "Eclipse IDE for C/C++ Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-nqqY4dewq1bjeNoZdWvOez+cBti+f9qXshx1eqJ2lB7sGJva5mcR9e+CZTVD0+EtVJ/U+8viJ+E1Veht1ZnqOw=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-nqqY4dewq1bjeNoZdWvOez+cBti+f9qXshx1eqJ2lB7sGJva5mcR9e+CZTVD0+EtVJ/U+8viJ+E1Veht1ZnqOw=="; + aarch64 = "sha512-kmeNH6F8oK72LtrYtiJVLKhy6Q1HwnU+Bh+mpXdXSrfj9KtqzHQkJ0kTnnJkGYLtpi+zyXDwsxzyjh6pPyDRJA=="; + }.${arch}; }; }; @@ -47,8 +55,11 @@ in rec { description = "Eclipse Modeling Tools"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-WU2BJt6GL3ug3yOUOd5y6/AbGLcr2MkCg+QJiNIMkSXvoU9TF6R6oimoGVc3kPZmazRy6WYoes55T3bWrHnO8Q=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-WU2BJt6GL3ug3yOUOd5y6/AbGLcr2MkCg+QJiNIMkSXvoU9TF6R6oimoGVc3kPZmazRy6WYoes55T3bWrHnO8Q=="; + aarch64 = "sha512-F63f2o9u/p7hhrxI+Eu6NiL4sPccIYw876Nnj8mfSZ7bozs1OVNWftZj+xbdLLbr0bVz3WKnt4BHzcLUA6QG7g=="; + }.${arch}; }; }; @@ -59,15 +70,18 @@ in rec { description = "Eclipse Platform ${year}-${month}"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - hash = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw=="; + aarch64 = "sha512-BvUkOdCsjwtscPeuBXG7ZpitOr8EQK5JL8nSGpw/RhhBEFz46nsc7W18l0aYjdzRHh2ie55RylS2PEQELkS/hQ=="; + }.${arch}; }; }; ### Eclipse Scala SDK eclipse-scala-sdk = - buildEclipse.override { jdk = jdk8; gtk = gtk2; } { + (buildEclipse.override { jdk = jdk8; gtk = gtk2; } { name = "eclipse-scala-sdk-4.7.0"; description = "Eclipse IDE for Scala Developers"; src = @@ -75,7 +89,10 @@ in rec { url = "https://downloads.typesafe.com/scalaide-pack/4.7.0-vfinal-oxygen-212-20170929/scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz"; sha256 = "1n5w2a7mh9ajv6fxcas1gpgwb04pdxbr9v5dzr67gsz5bhahq4ya"; }; - }; + }).overrideAttrs(oa: { + # Only download for x86_64 + meta.platforms = [ "x86_64-linux" ]; + }); ### Eclipse SDK @@ -84,8 +101,11 @@ in rec { description = "Eclipse ${year}-${month} Classic"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - hash = "sha512-yH4/K9sBLCUc2EVYwPL0dLql/S3AfaV6fFh7ewAuIb7yHtcsOWMqy/h1hZUlFFg2ykfwDWDDHEK7qfTI0hM7BQ=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-hmdWGteMDt4HhYq+k9twuftalpTzHtGnVVLphZcpJcw+6vJfersciDMaeLRqbCAeFbzJdgzjYo76bpP6FubySw=="; + aarch64 = "sha512-UYp8t7r2RrN3rKN180cWpJyhyO5LVXL8LrTRKJzttUgB7kM1nroTEI3DesBu+Hw4Ynl7eLiBK397rqcpOAfxJw=="; + }.${arch}; }; }; @@ -96,8 +116,11 @@ in rec { description = "Eclipse IDE for Java Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-71mXYVLVnyDjYZbJGBKc0aDPq8sbTxlVZRQq7GlSUDv2fsoNYWYgqYfK7RSED5yoasCfs3HUYr7QowRAKJOnfQ=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-71mXYVLVnyDjYZbJGBKc0aDPq8sbTxlVZRQq7GlSUDv2fsoNYWYgqYfK7RSED5yoasCfs3HUYr7QowRAKJOnfQ=="; + aarch64 = "sha512-KOQ6BZuQJeVpbMQVxF67M3F/KXMmDhmZQBNq0yWM+/8+d0DiBRkwJtqPYsnTqrax8FSunn2yy+CzlfyHSoNvpg=="; + }.${arch}; }; }; @@ -108,8 +131,11 @@ in rec { description = "Eclipse IDE for Enterprise Java and Web Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-55i9YVOa+vKHt72vHIqy9BmKMkg1KaLqMStjTtfaLTH5yP0ei+NTP2XL8IBHOgu0hCEJqYXTq+3I3RQy476etQ=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-55i9YVOa+vKHt72vHIqy9BmKMkg1KaLqMStjTtfaLTH5yP0ei+NTP2XL8IBHOgu0hCEJqYXTq+3I3RQy476etQ=="; + aarch64 = "sha512-iaoTB/Pinoj1weiGBBv0plQ4jGNdFs2JiBG7S/icUoAX5O6jTGAgJvOwh7Nzn+0N6YL6+HPWaV24a6lM43y8Og=="; + }.${arch}; }; }; @@ -120,8 +146,11 @@ in rec { description = "Eclipse IDE for Eclipse Committers and Eclipse Platform Plugin Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha512-zGeynifM0dn1214HEVS7OVtv7xa8asjLzOXh5riJK8c/DWvNrRduHn6o6PGnxYOYVIfC9BzNRAjG1STkWu9j+Q=="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha512-zGeynifM0dn1214HEVS7OVtv7xa8asjLzOXh5riJK8c/DWvNrRduHn6o6PGnxYOYVIfC9BzNRAjG1STkWu9j+Q=="; + aarch64 = "sha512-B866dFJcsTkq+h0RZ61CxXE83TWvCf8ZAbGeIC385PpPR3i/gZnRjN2oRrDP22CNR5XXA+PfXKxqvERhJB5ebA=="; + }.${arch}; }; }; @@ -132,8 +161,11 @@ in rec { description = "Eclipse IDE for RCP and RAP Developers"; src = fetchurl { - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - hash = "sha256-ml76ix0fHuR0KqYWQuTftEBAgq7iaOIyvr8V6WhuzeU="; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; + hash = { + x86_64 = "sha256-ml76ix0fHuR0KqYWQuTftEBAgq7iaOIyvr8V6WhuzeU="; + aarch64 = "sha256-sMB6a3f0fiL6ZentIjJTMi59ZOh7dizXrkMQuIRbds0="; + }.${arch}; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix index 71f9981f46..f21e79c8f3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { (add-hook 'after-init-hook 'session-initialize) */ description = "Small session management for emacs"; - homepage = "http://emacs-session.sourceforge.net/"; + homepage = "https://emacs-session.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix index cd68f0dbf5..feed7ba5b4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/generic.nix @@ -44,7 +44,7 @@ else if withMotif then "motif" else if withAthena then "athena" else "lucid") -, withSystemd ? stdenv.isLinux, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: assert (libXft != null) -> libpng != null; # probably a bug diff --git a/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix b/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix index dc00e09b97..b7cca4ff3e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/featherpad/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "featherpad"; - version = "1.3.1"; + version = "1.3.5"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; - sha256 = "sha256-OLipBhSrXf9lLpSYLwjjOv5AYJDt46MlnEW4YetXZjI="; + sha256 = "sha256-deQDLcymci8x9QvVOfNwroZPvifovxV6+jT9Grl3sxA="; }; nativeBuildInputs = [ cmake pkg-config qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/fte/default.nix b/third_party/nixpkgs/pkgs/applications/editors/fte/default.nix index b4b5e74887..c2b3229d45 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/fte/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/fte/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free text editor for developers"; - homepage = "http://fte.sourceforge.net/"; + homepage = "https://fte.sourceforge.net/"; license = licenses.gpl2; maintainers = [ ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix b/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix index dde5083d9c..5472b28b62 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glow"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 = "0m673xf67q9gjhd98ysh3dvwiqbj6lgsbm20c4zxyz76vdn5k6x8"; + sha256 = "sha256-CI0S9XJtJQClpQvI6iSb5rcHafEUwr2V6+Fq560lRfM="; }; - vendorSha256 = "0ngasfcimizahm80gflxzz3cxz0ir10l62i03l73w8syx4wll0q4"; + vendorHash = "sha256-2QrHBbhJ04r/vPK2m8J2KZSFrREDCc18tlKd7evghBc="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix index bacc629448..337370a6dd 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gnome-builder/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { webkitgtk_5_0 ]; - checkInputs = [ + nativeCheckInputs = [ dbus xvfb-run ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix index 156e8eaac7..573b8cdfee 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gnome-latex/default.nix @@ -21,12 +21,12 @@ }: stdenv.mkDerivation rec { - version = "3.42.0"; + version = "3.44.0"; pname = "gnome-latex"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ASMecEE3WNGu1pYNqhoigfqRNaYFkQuodM7VMn3LhUM="; + sha256 = "iL1TQL0ox+0Bx5ZqOgBzK72QJ3PfWsZZvmrRGAap50Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/howl/default.nix b/third_party/nixpkgs/pkgs/applications/editors/howl/default.nix index 2c959519f4..ff9a300741 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/howl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/howl/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, pkg-config, gtk3, librsvg }: -with lib; - stdenv.mkDerivation rec { pname = "howl"; version = "0.6"; @@ -27,7 +25,7 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - meta = { + meta = with lib; { homepage = "https://howl.io/"; description = "A general purpose, fast and lightweight editor with a keyboard-centric minimalistic user interface"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 3af1c001c0..c04e215b99 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -11,15 +11,13 @@ , vmopts ? null }: -with lib; - let platforms = lib.platforms.linux ++ [ "x86_64-darwin" "aarch64-darwin" ]; ideaPlatforms = [ "x86_64-darwin" "i686-darwin" "i686-linux" "x86_64-linux" "aarch64-darwin" ]; inherit (stdenv.hostPlatform) system; - versions = builtins.fromJSON (readFile (./versions.json)); + versions = builtins.fromJSON (lib.readFile (./versions.json)); versionKey = if stdenv.isLinux then "linux" else system; products = versions.${versionKey} or (throw "Unsupported system: ${system}"); @@ -42,11 +40,11 @@ let maintainers = with maintainers; [ edwtjo mic92 ]; }; }).overrideAttrs (attrs: { - nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ optionals (stdenv.isLinux) [ + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ lib.optionals (stdenv.isLinux) [ autoPatchelfHook patchelf ]; - buildInputs = (attrs.buildInputs or []) ++ optionals (stdenv.isLinux) [ + buildInputs = (attrs.buildInputs or []) ++ lib.optionals (stdenv.isLinux) [ python3 stdenv.cc.cc libdbusmenu @@ -54,7 +52,7 @@ let expat ]; dontAutoPatchelf = true; - postFixup = (attrs.postFixup or "") + optionalString (stdenv.isLinux) '' + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' ( cd $out/clion # bundled cmake does not find libc @@ -64,7 +62,7 @@ let rm -rf bin/gdb/linux ln -s ${gdb} bin/gdb/linux - ls -d $PWD/bin/lldb/linux/lib/python3.8/lib-dynload/* | + ls -d $PWD/bin/lldb/linux/x64/lib/python3.8/lib-dynload/* | xargs patchelf \ --replace-needed libssl.so.10 libssl.so \ --replace-needed libcrypto.so.10 libcrypto.so @@ -217,7 +215,7 @@ let ''; maintainers = with maintainers; [ ]; }; - }).overrideAttrs (finalAttrs: previousAttrs: optionalAttrs cythonSpeedup { + }).overrideAttrs (finalAttrs: previousAttrs: lib.optionalAttrs cythonSpeedup { buildInputs = with python3.pkgs; [ python3 setuptools ]; preInstall = '' echo "compiling cython debug speedups" diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix index f1529b29f9..7443842e7b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix @@ -5,10 +5,8 @@ { pname, product, productShort ? product, version, src, wmClass, jdk, meta, extraLdPath ? [], extraWrapperArgs ? [] }@args: -with lib; - -let loName = toLower productShort; - hiName = toUpper productShort; +let loName = lib.toLower productShort; + hiName = lib.toUpper productShort; vmoptsName = loName + lib.optionalString stdenv.hostPlatform.is64bit "64" + ".vmoptions"; @@ -29,7 +27,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { startupWMClass = wmClass; }; - vmoptsFile = optionalString (vmopts != null) (writeText vmoptsName vmopts); + vmoptsFile = lib.optionalString (vmopts != null) (writeText vmoptsName vmopts); nativeBuildInputs = [ makeWrapper patchelf unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json index 5d54b1150b..b6d4e39f9f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json @@ -3,26 +3,26 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "cd057a0aa96cf5b4216a436136a1002e6f3dc578bcd8a69f98d6908381b03526", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "896e9cc5b908aa51e091201c320f6f08033f9064382e44b107fccc554ed94895", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2.tar.gz", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2022.3.2", - "sha256": "e542111e490fbbc80d3aebcbbc343b29e17bf6766d7b708675618d8e49b6ee83", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2.tar.gz", - "build_number": "223.8214.62" + "version": "2022.3.3", + "sha256": "a5575ff7e80dd4e9390eb64fc54ed4a924403950da0c38da548de3c4bd97b34b", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3.tar.gz", + "build_number": "223.8617.3" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "7bfe02c1b414c2fc095deab35fa40ed29a129bfa76efc3e31a2785f0f37fa778", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "987f6dca9518da262f556ba1a5afe6190cc5c13a6692c194b4f9ee05d4e66318", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56.tar.gz", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", @@ -35,18 +35,18 @@ "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "4c3514642ce6c86e5343cc29b01c06ddc9c55f134bcb6650de5d7d36205799e8", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1.tar.gz", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "02bc35281eb4e1285eeb9d797ec2b31ec7370e320ad0e89f6f1fa704d78ec4bf", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2.tar.gz", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "ce807ba3a776e14f85dbd38f2744fc97e54318561eddd1c265f0d2cacc2565da", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1.tar.gz", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "6fa3aff1c730bb79bf3e2e29edcce6d4cdbccfa631524c6253de518be6b6f3d2", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2.tar.gz", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", @@ -68,26 +68,26 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "b243103f27cfb763106a2f5667d8f201562154755ce9746e81e88c80acd7b316", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "0ae72d1931a6effbeb2329f6e5c35859d933798a494479f066ef0a7b2be6b553", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2.tar.gz", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "8f845077cc0fa3582348ee3d76a69ff001391b3f3d63a9b279b8039fd6e07622", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.tar.gz", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "56430090dd471e106fdc48463027d89de624759f8757248ced9776978854e4f6", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.tar.gz", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2022.3.1", - "sha256": "d785f02e355983c6762248860052a81f75b392e25b585ff5a913aeaa2a2a3010", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.tar.gz", - "build_number": "223.8214.53" + "version": "2022.3.2", + "sha256": "ad853b75bc1e1379593bece3a5fbecec21d1de30263d0d5fef067a352b7d27ef", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.tar.gz", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", @@ -110,26 +110,26 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2022.3.1", - "sha256": "e6246c929e0d0b9340b66dd282572d67db7bf6031d5789f197be8817de54b186", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "482461646f61f355c7fd976e655bf77dadfa545483c6ab47352ff22eb1193e33", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2.dmg", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2022.3.2", - "sha256": "3c91269f04bd6f6df0ae8f2042c029097f56c2ccbc45db95b4f66e87e9d4a320", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2.dmg", - "build_number": "223.8214.62" + "version": "2022.3.3", + "sha256": "e9da8036c7d268368b3f82034389481730cb663b809659b1fa1ab91fd9bdc8cd", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3.dmg", + "build_number": "223.8617.3" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2022.3.1", - "sha256": "4b86b523b02f2df5150bc965bcef7e1a0bf7a7e6d2233a3a2603529a8577dd43", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "26ff68ea27952c1adc651ad5f2fae7ad4ca7b744f70f582bdf1bd4c1d17132f4", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56.dmg", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", @@ -142,18 +142,18 @@ "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2022.3.1", - "sha256": "8ea8b1ceebde397950592708b55f277ca43856b4013f597ccbf385bb75a42c72", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "14b3f587e868adfb132791e17e3b1978a2fb5fd55447eae589c4d95d70c9ace7", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2.dmg", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2022.3.1", - "sha256": "5278cf5ded9464b284fa568f2b453eb5b207a0c75e26354bfb66ef8e96be85e6", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "54d51ba7b65f84545faa7f8fc001b2bce48ef3ddb76006a44de9e95c6b395b8c", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2.dmg", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", @@ -175,26 +175,26 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2022.3.1", - "sha256": "adfb73d85ffb30c2abf715a6c6a0a2ed64a047a3016021a2cb61838457c66a81", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "0a5a396b71533ab7ec77b2f10e08a20a970ac5712cfeb3378728020ec84be416", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2.dmg", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2022.3.1", - "sha256": "2e3bff74a53df74ceee0ac182ffc2f22248317ced0a33f8c0014b1ed504d9650", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "6537fe033c13fb9b06da7583c875b0dc5f20660e5b349edc39bd8fdddffaf0f3", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2.dmg", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2022.3.1", - "sha256": "9d73b21e558db89ac24a406187cb96e506e320ca0154e8db6aeac7ff960c8944", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1.dmg", - "build_number": "223.8214.53" + "version": "2022.3.2", + "sha256": "896dadb76b44bacef79b31619719107f8cf0e729331bda2d6b9f80e8be6dea92", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2.dmg", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", @@ -217,26 +217,26 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "85ee94f4dac126ee2b87ab225f9be6fa828a0c17e067b896f541fd25599411ef", - "url": "https://download.jetbrains.com/cpp/CLion-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "0d3d8ccce520a26781a2d126b887d5a829e97987b728104203528510ff9a4423", + "url": "https://download.jetbrains.com/cpp/CLion-2022.3.2-aarch64.dmg", + "build_number": "223.8617.54" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2022.3.2", - "sha256": "13c8503f190e82b00949b26312873976a10c64dcca036ecc6ce9547b69341658", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.2-aarch64.dmg", - "build_number": "223.8214.62" + "version": "2022.3.3", + "sha256": "ef76c7d61c64f7f0f831ef2774bd908e68d651a20648fc4e63618e24a81be6dd", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.3.3-aarch64.dmg", + "build_number": "223.8617.3" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "555ca346ec41de06223d3a4b5e9247809e07c8339bff0d139b624634c812c8e5", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8214.51-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "776ff0a5f0293cd4b4c29380199757b359e6e195a57b69d2cef73f9cc44ee456", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.8617.56-aarch64.dmg", + "build_number": "223.8617.56" }, "goland": { "update-channel": "GoLand RELEASE", @@ -249,18 +249,18 @@ "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "394478e3f2a2ea1788a5c2ef9c5a9db72531462b4db921483d24a08f7c260a43", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.1-aarch64.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "808fa52e8dceacb8beb6b84705ac44ded04b67d07c1310449d7cd5c7afbdea46", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.3.2-aarch64.dmg", + "build_number": "223.8617.56" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "1e9454c2500e1ec0d490e19d175a30f4441ffd30200a5a1041ecbeff3c66c7e4", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.1-aarch64.dmg", - "build_number": "223.8214.52" + "version": "2022.3.2", + "sha256": "ea6da172fc8f27b7bad5475f0e1fc3359c492885bba8b6de59be727cb7b65284", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.3.2-aarch64.dmg", + "build_number": "223.8617.56" }, "mps": { "update-channel": "MPS RELEASE", @@ -282,26 +282,26 @@ "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "6574cfd20a586fcbdfbac2ea0fa903ea078c1702fd9e5145c33c7c8dc4506388", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "5a0fcb9fdc94896cd5651d9d60fa708596aebe374bc35944b3ff6133f4eb5aae", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.3.2-aarch64.dmg", + "build_number": "223.8617.48" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "640e4088d976820808d4571c8060b473ab6cfde34699d5913ec3c528ca70faac", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.1-aarch64.dmg", - "build_number": "223.8214.51" + "version": "2022.3.2", + "sha256": "3237e19f920880a92712d7a61df5eadd6b8e1652cf97115078289468e17332a4", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.3.2-aarch64.dmg", + "build_number": "223.8617.48" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2022.3.1", - "sha256": "d25ba49504c22e8669b8e15033cb6e944e9948ecbb0394ba4bbd5804f1f6657f", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.1-aarch64.dmg", - "build_number": "223.8214.53" + "version": "2022.3.2", + "sha256": "a680b91d6c909f913317c91b1912b1b822c121d14d78962f7f44f7473e54b5a2", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.3.2-aarch64.dmg", + "build_number": "223.8617.53" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", diff --git a/third_party/nixpkgs/pkgs/applications/editors/jucipp/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jucipp/default.nix index b06c93c103..01ab62c6de 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jucipp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jucipp/default.nix @@ -3,13 +3,11 @@ libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts, gtkmm3, coreutils, glibc, dbus, openssl, libxml2, gnumake, ctags }: -with lib; - stdenv.mkDerivation rec { pname = "juicipp"; version = "1.2.3"; - meta = { + meta = with lib; { homepage = "https://github.com/cppit/jucipp"; description = "A lightweight, platform independent C++-IDE with support for C++11, C++14, and experimental C++17 features depending on libclang version"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix index 3366efb697..77d75eb131 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub }: -with lib; - stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; version = "2022.10.31"; @@ -33,7 +31,7 @@ stdenv.mkDerivation rec { ln -s --relative "$autoload_target" autoload ''; - meta = { + meta = with lib; { homepage = "http://kakoune.org/"; description = "A vim inspired text editor"; license = licenses.publicDomain; diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix index 953c95c472..a37c90fb99 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/generated.nix @@ -1,15 +1,15 @@ # This file has been generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit! { lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: let - packages = ( self: +packages = ( self: { active-window-kak = buildKakounePluginFrom2Nix { pname = "active-window-kak"; - version = "2020-05-13"; + version = "2022-11-14"; src = fetchFromGitHub { owner = "greenfork"; repo = "active-window.kak"; - rev = "988db69cfbb88bd741d089bb43b0be551693e7c1"; + rev = "36bf0364eed856a52cddf274072e9f255902c0ee"; sha256 = "1fv1cp9q212gamf9z2papl5xcl2w31fpcmbgdzbxcxdl1pvfsqp8"; }; meta.homepage = "https://github.com/greenfork/active-window.kak/"; @@ -17,12 +17,12 @@ let auto-pairs-kak = buildKakounePluginFrom2Nix { pname = "auto-pairs-kak"; - version = "2021-03-28"; + version = "2022-03-13"; src = fetchFromGitHub { owner = "alexherbo2"; repo = "auto-pairs.kak"; - rev = "526779a26a5cf5f48e7c4f5c5fecca274968a737"; - sha256 = "0gkhvwxyh8pdfydrj7zkfidk0drrbhvdi1fq3pkzllna3vz8q181"; + rev = "bfdcb8566076f653ec707f86207f83ea75173ce9"; + sha256 = "0vx9msk8wlj8p9qf6yiv9gzrbanb5w245cidnx5cppgld2w842ij"; }; meta.homepage = "https://github.com/alexherbo2/auto-pairs.kak/"; }; @@ -41,48 +41,48 @@ let fzf-kak = buildKakounePluginFrom2Nix { pname = "fzf-kak"; - version = "2021-04-03"; + version = "2022-10-11"; src = fetchFromGitHub { owner = "andreyorst"; repo = "fzf.kak"; - rev = "1b3a3beebbe7134e671fde2ef2f4242b34ae2c60"; - sha256 = "0rsd65zcizbq3isy8576gqw7mcml5ixw84padaz6ndwfif5fv701"; + rev = "6910bfb4c23cac59c17f5b7850f7bd49aba3e5cb"; + sha256 = "1hlals4d9x5i4mwigxjlx4f9xgc9rw15yzvbvc64cminxic2i3i8"; }; meta.homepage = "https://github.com/andreyorst/fzf.kak/"; }; kakboard = buildKakounePluginFrom2Nix { pname = "kakboard"; - version = "2020-05-09"; + version = "2022-04-02"; src = fetchFromGitHub { owner = "lePerdu"; repo = "kakboard"; - rev = "2f13f5cd99591b76ad5cba230815b80138825120"; - sha256 = "1kvnbsv20y09rlnyar87qr0h26i16qsq801krswvxcwhid7ijlvd"; + rev = "5759dcc5af593ff88a7faecc41a8f549ec440771"; + sha256 = "0g8q0rkdnzsfvlibjd1zfcapngfli5aa3qrgmkgdi24n9ad8wzvh"; }; meta.homepage = "https://github.com/lePerdu/kakboard/"; }; kakoune-buffer-switcher = buildKakounePluginFrom2Nix { pname = "kakoune-buffer-switcher"; - version = "2020-12-27"; + version = "2022-09-18"; src = fetchFromGitHub { owner = "occivink"; repo = "kakoune-buffer-switcher"; - rev = "6a27c45db87a23070c34fab36d2f8d812cd002a6"; - sha256 = "1rmwy317908v8p54806m721bpzm8sgygb9abri34537ka6r05y5j"; + rev = "21319aa08e7c9072dcf1a4f2f5583887d701fc37"; + sha256 = "0lnvcb4khw1ywxd369phd2xibsh5f6qc11x5vrla331wr1q7y8j8"; }; meta.homepage = "https://github.com/occivink/kakoune-buffer-switcher/"; }; kakoune-buffers = buildKakounePluginFrom2Nix { pname = "kakoune-buffers"; - version = "2021-04-02"; + version = "2021-11-10"; src = fetchFromGitHub { owner = "Delapouite"; repo = "kakoune-buffers"; - rev = "7832ea7a4528363482f5684f16cbcebcbec0adfd"; - sha256 = "196d36jww6asf5zr03l1rwg49kkv16s2d4zyryb2m3zvy7prf2bb"; + rev = "6b2081f5b7d58c72de319a5cba7bf628b6802881"; + sha256 = "0pbrgydifw2a8yf3ringyqq91fccfv4lm4v8sk5349hbcz6apr4c"; }; meta.homepage = "https://github.com/Delapouite/kakoune-buffers/"; }; @@ -101,12 +101,12 @@ let kakoune-extra-filetypes = buildKakounePluginFrom2Nix { pname = "kakoune-extra-filetypes"; - version = "2021-01-15"; + version = "2021-05-16"; src = fetchFromGitHub { owner = "kakoune-editor"; repo = "kakoune-extra-filetypes"; - rev = "c6f8aaccd8c9cd6b487964c8943416e21fbe7c18"; - sha256 = "1vkff8xbycfgxv8x09cvc79qcg5fdzn2x77mbmifmkq236khrwrg"; + rev = "8ffeec08068edfee42e076c5f6d56a54a498bad2"; + sha256 = "1v87aqfk2jcysbdls3mh2v1yafk1albbinfxsxp11m4nxd2b9agl"; }; meta.homepage = "https://github.com/kakoune-editor/kakoune-extra-filetypes/"; }; @@ -125,24 +125,24 @@ let kakoune-registers = buildKakounePluginFrom2Nix { pname = "kakoune-registers"; - version = "2020-06-19"; + version = "2022-03-01"; src = fetchFromGitHub { owner = "Delapouite"; repo = "kakoune-registers"; - rev = "9531947baecd83c1d4c3bea0adf10f4462f1e120"; - sha256 = "08v9ndghh7wvr8rsrqm05gksk9ai5vnwvw9gwqasbppb48cv4a8c"; + rev = "b8ca8e04ebe50671a937bceccba69c62b68ae8b0"; + sha256 = "0vy5dc6jly5xqcck0vhnmbjxjdy3615b6d329v0b04amzy0hdlck"; }; meta.homepage = "https://github.com/Delapouite/kakoune-registers/"; }; kakoune-vertical-selection = buildKakounePluginFrom2Nix { pname = "kakoune-vertical-selection"; - version = "2019-04-11"; + version = "2022-11-29"; src = fetchFromGitHub { owner = "occivink"; repo = "kakoune-vertical-selection"; - rev = "c420f8b867ce47375fac303886e31623669a42b7"; - sha256 = "13jdyd2j45wvgqvxdzw9zww14ly93bqjb6700zzxj7mkbiff6wsb"; + rev = "227b3fd9643e6e3b9d36fab324081a988c038e21"; + sha256 = "0ygqhlk31ilczpwws28iqya8i1qhnwkb5rw6bn2zqgxj428a1kqj"; }; meta.homepage = "https://github.com/occivink/kakoune-vertical-selection/"; }; @@ -161,24 +161,24 @@ let pandoc-kak = buildKakounePluginFrom2Nix { pname = "pandoc-kak"; - version = "2020-11-30"; + version = "2021-06-29"; src = fetchFromGitHub { owner = "basbebe"; repo = "pandoc.kak"; - rev = "63979f7e08b86d80436bbe2d9dba173a56057b97"; - sha256 = "16pmmnpyxf8r7gpj8g1lwa960nscjmcl52n1a7s6xcqkp9856wxs"; + rev = "e9597e8df58427884161ce27392a9558930832a7"; + sha256 = "1baslidszbybx2ngdkm7wns2m5l27gc0mb3blhhydiav8fcfvc6m"; }; meta.homepage = "https://github.com/basbebe/pandoc.kak/"; }; powerline-kak = buildKakounePluginFrom2Nix { pname = "powerline-kak"; - version = "2021-04-06"; + version = "2022-04-05"; src = fetchFromGitHub { owner = "andreyorst"; repo = "powerline.kak"; - rev = "6fa5ad383f2884f201d6e3ef07a4687c606df525"; - sha256 = "1s7ggjby0bymq48njzhdvkkarmzl44803xv0dlnzrj7q9c3xv27a"; + rev = "c5ef9a845bbd886c73ef00c0efff986e02d5f5d8"; + sha256 = "1lshlnz5xrxzafxmb6w05g2i6nvi49aqyd8852k9l0lmzqryp7l2"; }; meta.homepage = "https://github.com/andreyorst/powerline.kak/"; }; @@ -195,41 +195,41 @@ let meta.homepage = "https://github.com/kakounedotcom/prelude.kak/"; }; - replace-mode-kak = buildKakounePluginFrom2Nix { - pname = "replace-mode-kak"; - version = "2020-10-07"; + smarttab-kak = buildKakounePluginFrom2Nix { + pname = "smarttab-kak"; + version = "2022-04-10"; src = fetchFromGitHub { - owner = "alexherbo2"; - repo = "replace-mode.kak"; - rev = "5f4c73cdbaf5aeb964ee35ad4b9081b233af90c0"; - sha256 = "1cmylx99bm7jwfb4hclb69sdc4n8f29ssyy2byjiw53ni9rnc8q0"; + owner = "andreyorst"; + repo = "smarttab.kak"; + rev = "86ac6599b13617ff938905ba4cdd8225d7eb6a2e"; + sha256 = "1992xwf2aygzfd26lhg3yiy253g0hl1iagj0kq9yhcqg0i5xjcj9"; }; - meta.homepage = "https://github.com/alexherbo2/replace-mode.kak/"; - }; - - sleuth-kak = buildKakounePluginFrom2Nix { - pname = "sleuth-kak"; - version = "2020-11-06"; - src = fetchFromGitHub { - owner = "alexherbo2"; - repo = "sleuth.kak"; - rev = "911db8bd208ad0d289b8fa15a2ac665ff39bd6bd"; - sha256 = "0g41c0038fpmihqva71xl4vfbmvsp13i47gp6fnmaikajpynzc51"; - }; - meta.homepage = "https://github.com/alexherbo2/sleuth.kak/"; + meta.homepage = "https://github.com/andreyorst/smarttab.kak/"; }; tabs-kak = buildKakounePluginFrom2Nix { pname = "tabs-kak"; - version = "2021-04-14"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "enricozb"; repo = "tabs.kak"; - rev = "048f83455ea7c671ab06e9b9578ac25e5de1d6fb"; - sha256 = "0xswpsdf1bj54inl6vf2lzbjkxfc6g0fyv5kd6y9ahlh5irij8z0"; + rev = "1cb19e410a3ef299f7a701fa5bec98c2d9284dac"; + sha256 = "0hxa4mvw1k74vscxkm520c6g7iwcaqh8kj9g4mwy6n5kkvr1drf0"; }; meta.homepage = "https://github.com/enricozb/tabs.kak/"; }; + zig-kak = buildKakounePluginFrom2Nix { + pname = "zig-kak"; + version = "2019-05-06"; + src = fetchFromGitHub { + owner = "adrusi"; + repo = "zig.kak"; + rev = "5a7e84e138324e6b8d140fe384dfe5cc941e26b7"; + sha256 = "1w0nmhsgchjga4by9ch9md3pdc1bwn0p157g6zwnfpj7lnaahsmq"; + }; + meta.homepage = "https://github.com/adrusi/zig.kak/"; + }; + }); in lib.fix' (lib.extends overrides packages) diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names index a6cae7a450..b856308c78 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/kakoune-plugin-names @@ -1,20 +1,20 @@ repo,branch,alias -alexherbo2/auto-pairs.kak,, -alexherbo2/replace-mode.kak,, -alexherbo2/sleuth.kak,, -andreyorst/fzf.kak,, -andreyorst/powerline.kak,, -basbebe/pandoc.kak,, -danr/kakoune-easymotion,, -Delapouite/kakoune-buffers,, -Delapouite/kakoune-registers,, -enricozb/tabs.kak@main,, -greenfork/active-window.kak,, -kakoune-editor/kakoune-extra-filetypes,, -kakounedotcom/connect.kak,, -kakounedotcom/prelude.kak,, -lePerdu/kakboard,, -listentolist/kakoune-rainbow,, -mayjs/openscad.kak,, -occivink/kakoune-buffer-switcher,, -occivink/kakoune-vertical-selection,, +https://github.com/greenfork/active-window.kak/,, +https://github.com/alexherbo2/auto-pairs.kak/,, +https://github.com/kakounedotcom/connect.kak/,, +https://github.com/andreyorst/fzf.kak/,, +https://github.com/lePerdu/kakboard/,, +https://github.com/occivink/kakoune-buffer-switcher/,, +https://github.com/Delapouite/kakoune-buffers/,, +https://github.com/danr/kakoune-easymotion/,, +https://github.com/kakoune-editor/kakoune-extra-filetypes/,, +https://github.com/listentolist/kakoune-rainbow/,, +https://github.com/Delapouite/kakoune-registers/,, +https://github.com/occivink/kakoune-vertical-selection/,, +https://github.com/mayjs/openscad.kak/,, +https://github.com/basbebe/pandoc.kak/,, +https://github.com/andreyorst/powerline.kak/,, +https://github.com/kakounedotcom/prelude.kak/,, +https://github.com/andreyorst/smarttab.kak/,, +https://github.com/enricozb/tabs.kak/,, +https://github.com/adrusi/zig.kak/,, diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py index dd8765db28..49662a0e8e 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/plugins/update.py @@ -42,19 +42,19 @@ HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/ class KakouneEditor(pluginupdate.Editor): - def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): - sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) + def generate_nix(self, plugins: List[Tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]], outfile: str): + sorted_plugins = sorted(plugins, key=lambda v: v[1].name.lower()) with open(outfile, "w+") as f: f.write(HEADER) f.write( """ - { lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: - let - packages = ( self: - {""" +{ lib, buildKakounePluginFrom2Nix, fetchFromGitHub, overrides ? (self: super: {}) }: +let +packages = ( self: +{""" ) - for owner, repo, plugin in sorted_plugins: + for pluginDesc, plugin in sorted_plugins: if plugin.has_submodules: submodule_attr = "\n fetchSubmodules = true;" else: @@ -62,24 +62,19 @@ class KakouneEditor(pluginupdate.Editor): f.write( f""" - {plugin.normalized_name} = buildKakounePluginFrom2Nix {{ - pname = "{plugin.normalized_name}"; - version = "{plugin.version}"; - src = fetchFromGitHub {{ - owner = "{owner}"; - repo = "{repo}"; - rev = "{plugin.commit}"; - sha256 = "{plugin.sha256}";{submodule_attr} - }}; - meta.homepage = "https://github.com/{owner}/{repo}/"; - }}; - """ + {plugin.normalized_name} = buildKakounePluginFrom2Nix {{ + pname = "{plugin.normalized_name}"; + version = "{plugin.version}"; + src = {pluginDesc.repo.as_nix(plugin)}; + meta.homepage = "{pluginDesc.repo.url("")}"; + }}; +""" ) f.write( """ - }); - in lib.fix' (lib.extends overrides packages) - """ +}); +in lib.fix' (lib.extends overrides packages) +""" ) print(f"updated {outfile}") diff --git a/third_party/nixpkgs/pkgs/applications/editors/leafpad/default.nix b/third_party/nixpkgs/pkgs/applications/editors/leafpad/default.nix index 0376e3af6b..d0b38bcd35 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/leafpad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/leafpad/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, intltool, pkg-config, gtk2 }: stdenv.mkDerivation rec { - version = "0.8.18.1"; + version = "0.8.19"; pname = "leafpad"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/leafpad/${pname}-${version}.tar.gz"; - sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; + sha256 = "sha256-B9P3EvTb0KMyUf0d7hTiGv3J+SCQ/HaMEasKxVatvpc="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/lifeograph/default.nix b/third_party/nixpkgs/pkgs/applications/editors/lifeograph/default.nix index 895a9e11d5..099aec1558 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/lifeograph/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/lifeograph/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://lifeograph.sourceforge.net/wiki/Main_Page"; + homepage = "https://lifeograph.sourceforge.net/wiki/Main_Page"; description = "Lifeograph is an off-line and private journal and note taking application"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix index cfb1d17c91..bd80496995 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix @@ -4,8 +4,6 @@ assert enableNls -> (gettext != null); -with lib; - let nixSyntaxHighlight = fetchFromGitHub { owner = "seitz"; @@ -16,14 +14,14 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "7.1"; + version = "7.2"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "V7p1Hpt1GfD23e5QUgLjh8dd3kQMH3qhuTEMw4FAaDY="; + sha256 = "hvNEJ2i9KHPOxpP4PN+AtLRErTzBR2C3Q2FHT8h6RSY="; }; - nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; + nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; buildInputs = [ ncurses ]; outputs = [ "out" "info" ]; @@ -71,7 +69,7 @@ in stdenv.mkDerivation rec { ''; }; - meta = { + meta = with lib; { homepage = "https://www.nano-editor.org/"; description = "A small, user-friendly console text editor"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix index f9da81efb4..23734f3f23 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix @@ -96,7 +96,7 @@ in ]; # extra programs test via `make functionaltest` - checkInputs = [ + nativeCheckInputs = [ fish nodejs pyEnv # for src/clint.py diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix index 6cfcec8f1f..0f3c2359aa 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-remote.nix @@ -30,7 +30,7 @@ with python3.pkgs; buildPythonApplication rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ neovim pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix index 01a9cf9895..fac9b3c309 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix @@ -5,8 +5,6 @@ , python3Packages , callPackage }: -with lib; - neovim: let @@ -32,7 +30,7 @@ let }@args: let - wrapperArgsStr = if isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; + wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; # If configure != {}, we can't generate the rplugin.vim file with e.g # NVIM_SYSTEM_RPLUGIN_MANIFEST *and* NVIM_RPLUGIN_MANIFEST env vars set in @@ -43,7 +41,7 @@ let finalMakeWrapperArgs = [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim" ] ++ [ "--set" "NVIM_SYSTEM_RPLUGIN_MANIFEST" "${placeholder "out"}/rplugin.vim" ] - ++ optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] + ++ lib.optionals wrapRc [ "--add-flags" "-u ${writeText "init.vim" neovimRcContent}" ] ; in assert withPython2 -> throw "Python2 support has been removed from the neovim wrapper, please remove withPython2 and python2Env."; @@ -57,22 +55,22 @@ let substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ --replace 'Name=Neovim' 'Name=Neovim wrapper' '' - + optionalString withPython3 '' + + lib.optionalString withPython3 '' makeWrapper ${python3Env.interpreter} $out/bin/nvim-python3 --unset PYTHONPATH '' - + optionalString (rubyEnv != null) '' + + lib.optionalString (rubyEnv != null) '' ln -s ${rubyEnv}/bin/neovim-ruby-host $out/bin/nvim-ruby '' - + optionalString withNodeJs '' + + lib.optionalString withNodeJs '' ln -s ${nodePackages.neovim}/bin/neovim-node-host $out/bin/nvim-node '' - + optionalString vimAlias '' + + lib.optionalString vimAlias '' ln -s $out/bin/nvim $out/bin/vim '' - + optionalString viAlias '' + + lib.optionalString viAlias '' ln -s $out/bin/nvim $out/bin/vi '' - + optionalString (manifestRc != null) (let + + lib.optionalString (manifestRc != null) (let manifestWrapperArgs = [ "${neovim}/bin/nvim" "${placeholder "out"}/bin/nvim-wrapper" ]; in '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix index bcc959bc20..8f4bcfd672 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = !isCross; - checkInputs = lib.optionals (!isCross) [ dejagnu ]; + nativeCheckInputs = lib.optionals (!isCross) [ dejagnu ]; postInstall = '' moveToOutput share/emacs "$out" diff --git a/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix index 3f560d17e5..2018e1d5e2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.29"; + version = "2.29.3"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gRmSxWAVF61svlZ0/IMTrWCmwin+uPONLBlcJOYcp2w="; + sha256 = "sha256-2qgWJ/bIravil/SuApA7pNXkxS5xUcdFpjVGO/ogDpw="; }; # We have not packaged tests. diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix index 70e6950374..2d8b3c2bb0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix @@ -25,7 +25,7 @@ , makeWrapper , pandoc , llvmPackages -, libyamlcpp +, yaml-cpp , soci , postgresql , nodejs @@ -95,7 +95,7 @@ in openssl R libuuid - libyamlcpp + yaml-cpp soci postgresql ] ++ (if server then [ @@ -206,7 +206,7 @@ in homepage = "https://www.rstudio.com/"; license = licenses.agpl3Only; maintainers = with maintainers; [ ciil cfhammill ]; - mainProgram = "rstudio" + optionalString server "-server"; + mainProgram = "rstudio" + lib.optionalString server "-server"; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix b/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix index 409f99e37a..138c886e76 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.9.10"; + version = "1.9.20"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-FWUrhTTV1TCoBhitopQc469I7SRy4UDKdRLifVKhCCg="; + sha256 = "sha256-rpJ+HBYmGuhxnZbJn59mc+IokBc5834X2uyriIGnsqA="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json index d8fa27e34a..09b5a7665d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json +++ b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json @@ -1,17 +1,13 @@ { - "version": "3.129.0", + "version": "3.142.1", "appimage": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.129.0/standard-notes-3.129.0-linux-x86_64.AppImage", - "hash": "sha512-JLO2jX9Us6BjqmTZIkVyxy2pqFM/eFGpwi6vXicMOgDB0UsgEMTK+Ww+9g+vJ1KbFRFmlt187qkdSNcevQPt7w==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.142.1/standard-notes-3.142.1-linux-x86_64.AppImage", + "hash": "sha512-tf6vk108RMnxk7ZCFIAbWnlTvQqCkU6NtG+JCmMK/oR+/N3T5TDaHyufNJ9yVIh9pZrmaKMHjDUdCUgGc7lIRA==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.129.0/standard-notes-3.129.0-linux-arm64.AppImage", - "hash": "sha512-LGUSRqMrJ+hVHyi/bjI/NkWRVsmY0Kh/wRY9RNJXm0C3dKQSFV8ca4GeY9+VCuJEecR4LGnWp4agS5jPybPP6w==" - }, - "i686-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.129.0/standard-notes-3.129.0-linux-i386.AppImage", - "hash": "sha512-XbQ4hn3QJ61hDC12cK95zsUowbyXPYArHZoRDx5trQ30phtQxtz6nV+pL00m4S9kYeEhsAwk1wXlRq9Ylbz2IA==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.142.1/standard-notes-3.142.1-linux-arm64.AppImage", + "hash": "sha512-wQYeWUDLbthgcWPWcz5TbqR1rk3OkdISr/SsdbbrLIyroAaXppg+7FA/FbPW7wlrksiMKowJ/hAPQz1NIxSRZg==" } } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/update.nix b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/update.nix index 5b8794e9a4..7b5f661660 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/update.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/update.nix @@ -50,6 +50,5 @@ writeScript "update-standardnotes" '' updatePlatform x86_64-linux linux-x86_64 updatePlatform aarch64-linux linux-arm64 - updatePlatform i686-linux linux-i386 setJsonKey .version "$newVersion" '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix b/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix index d859b5c888..73cd6139ba 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-VGP9JVw92rk1yXZDqTKcMzJt8t+T8YAg8zYxFaWxGr4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-TxfpzKAsU/5ble4VzJ+4pokCiyJsdisjmNwWfxOMKzE="; }; nativeBuildInputs = [ copyDesktopItems ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix index f5b79ecdb0..8440d1fd6d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix @@ -11,7 +11,7 @@ , perl , luajit , darwin -, python37 +, python3 }: let @@ -41,7 +41,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config buildSymlinks ]; buildInputs = [ - gettext ncurses cscope luajit ruby tcl perl python37 + gettext ncurses cscope luajit ruby tcl perl python3 ]; patches = [ ./macvim.patch ]; @@ -61,7 +61,7 @@ stdenv.mkDerivation { "--without-local-dir" "--with-luajit" "--with-lua-prefix=${luajit}" - "--with-python3-command=${python37}/bin/python3" + "--with-python3-command=${python3}/bin/python3" "--with-ruby-command=${ruby}/bin/ruby" "--with-tclsh=${tcl}/bin/tclsh" "--with-tlib=ncurses" @@ -159,7 +159,7 @@ stdenv.mkDerivation { libperl=$(dirname $(find ${perl} -name "libperl.dylib")) install_name_tool -add_rpath ${luajit}/lib $exe install_name_tool -add_rpath ${tcl}/lib $exe - install_name_tool -add_rpath ${python37}/lib $exe + install_name_tool -add_rpath ${python3}/lib $exe install_name_tool -add_rpath $libperl $exe install_name_tool -add_rpath ${ruby}/lib $exe diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index bd0299ccdc..4279436804 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-12-30"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "4ba9154caafe707c95d438681da4eb4774380024"; - sha256 = "11c39hjpn9i3d74wqnqczcx9bysgaj3wjkb8y86b312kpi4r2agh"; + rev = "564a64651578164b5c7f2503e306bc436beb88da"; + sha256 = "151w10p8w7ml9v7h18y3zzgbr48ffpxsxj3lnxl8lm44dab76qp1"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -293,12 +293,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2023-01-17"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "8ec6e1b030d933cba9a207a78c2f24333641fb2c"; - sha256 = "1cqhg2mp2qjpi28yq7pj9qlyry9vlyjw30nvwm0sd02pkjal0m0j"; + rev = "d98828169af99624031d8535785a099cdf60d4c3"; + sha256 = "0j3lkz7lbd0naqqp6y2nlk9zawd453m41diia7f0saiyix76r6cp"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,12 +341,12 @@ final: prev: SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2022-11-15"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "8ff0ed105d1403a60e1f79150b8b645a3465b3a0"; - sha256 = "06bddfpmnabhw7q8q459qa55gh3x7xqzb0lq7qpq1i4kg6qsc7ck"; + rev = "fab8e52ec7d67000c8d96028b2d643573a4289b1"; + sha256 = "0kk482si63v67a4086hk9va1lsjqpmbaf71y2cqyrw9vidbmy38g"; }; meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-01-17"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "4c3ff7554d4853b5b6372c9c4a5077076977ceb7"; - sha256 = "003zdwjz7hzvv1p18fd9glqxbd0fc3f7yij05nhbyl1p52jvxaq0"; + rev = "30a64f8590482dcd461123cb66464ff371aeeb84"; + sha256 = "15rzr9p685ylv37amkfv0finnimhzlp2lmzkm8gdqzl0xhsfa2rn"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -559,12 +559,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-01-06"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "69c1dc8b5f3d215d4a0538265b2d257c2ed7a8fa"; - sha256 = "00jr9s90i03zkl076pa0knc0k9dx1xcc98ajlrxw3dkq38kbshiy"; + rev = "116d713f63c7a81663fa53efa10e34649c9479e3"; + sha256 = "1hqlav8h09qffcicxjwzq74rm8b128jav1hgcyjv7jyz7f3fjcw4"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -727,12 +727,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2023-01-04"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "76ce329f419d615f52335e2c18153674a4598276"; - sha256 = "0l4g18d86wibsl4jmnm4kmjrgnk1dfzr2x7xwhx0s2dqkm2g1rqc"; + rev = "a55448018d75817e820c03b21d28a2cd65b7d353"; + sha256 = "1vlbpw4mgkh5rd2mqwjsvz9sxnq5zjci4jddhmnmkilrlgancfg0"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -835,24 +835,24 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2023-01-03"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "c1b5d351ccd8f88fd2729b90ade2ef5d333463de"; - sha256 = "1cwkkg57mga200kyvd9j02xi82mbq95i5nj0lkpc7r2lxds70qbr"; + rev = "065c6d792a2a3aaf67a754ccd46800c8d1964812"; + sha256 = "1y04sfcnzw4hnygbgg91bfsn7jas5xbcsxrhp7766whd22rl6dsh"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; barbecue-nvim = buildVimPluginFrom2Nix { pname = "barbecue.nvim"; - version = "2023-01-11"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "231d6f545afd108330bd515fc69f4cb509c97c0c"; - sha256 = "04blr13rjyjpa47y58d8hlsl6zf7wb8bsiq8q4sl57ygvp6hrz8m"; + rev = "e3db3c4e25f5531bcb74b7951f52e425731433e5"; + sha256 = "0b69g3vr78x4hy5sj354iws43x4mm8qlqwfzl6cbiga16pa659ay"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; @@ -1075,12 +1075,12 @@ final: prev: ccc-nvim = buildVimPluginFrom2Nix { pname = "ccc.nvim"; - version = "2022-12-25"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "4ea096a150fe2636782f6f68b97d3cff7ee28b4f"; - sha256 = "1jb4dd9bg7q2an963fnn2mclpj52bjqvfv6k642757zfasx20x6p"; + rev = "be0a8122fd77efb7b6a0d672bab10417e68fab8b"; + sha256 = "1w7km6b4r3pvnx5g5i4wndj9524klx3g4q9li8xv8z6lhdz27c15"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; @@ -1123,12 +1123,12 @@ final: prev: circles-nvim = buildVimPluginFrom2Nix { pname = "circles.nvim"; - version = "2022-11-28"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "projekt0n"; repo = "circles.nvim"; - rev = "91ae7e0ddf95e1984528cf3129879f4841bcbc82"; - sha256 = "0wmy9h2m4zdqaw7cmg1dz5w8l0x5269is0r8bb3ns7clilrknjhm"; + rev = "06357817f6944de132f0a58ee5c1486e4dcc6dda"; + sha256 = "1rvbz9m02vmjs5dg9yhnzzdr46ck1rqdrc7a94sybj8qvw3l5nq1"; }; meta.homepage = "https://github.com/projekt0n/circles.nvim/"; }; @@ -1303,12 +1303,12 @@ final: prev: cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; - version = "2022-11-23"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "b7c0629e10c8a3a10311aa4ad952d207509d5e67"; - sha256 = "1hs3pying86zbrk3vnrpv4nfa8nl8b2ify5wks8675x5rc9z8iyh"; + rev = "06876deb8b82e2cc6a318f22196c39218f4f59bd"; + sha256 = "1m723a5qrs281n9sghmcgm8cnp9nrjxkaajnlq34bg3s56d32hik"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1399,12 +1399,12 @@ final: prev: cmp-latex-symbols = buildVimPluginFrom2Nix { pname = "cmp-latex-symbols"; - version = "2022-12-08"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "kdheepak"; repo = "cmp-latex-symbols"; - rev = "1ec2e4f47cde6c7ffcebec92cfec58ddc1f6689a"; - sha256 = "093wj6kfln2lsgcijnwjj924lbgld0vhfvx8w0kfhlhpv5fr5dfz"; + rev = "165fb66afdbd016eaa1570e41672c4c557b57124"; + sha256 = "19hrj03b1l6n981h0rjy6y98fach7hj64hh3l787w1wkhq3pirxj"; }; meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; }; @@ -1735,24 +1735,24 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2022-12-24"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "4f8d072df2609219b8d79b67641a9753e3d7fff0"; - sha256 = "1nsv5ag13yzcffq404darfk0vz4sbchj941bcf960znnlynlcya0"; + rev = "5fae5a15497750483e21fc207aa6005f340f02f2"; + sha256 = "1r9jhdxm3y1lpdmwmlk48skihf7jxdm2sxirzyd1kwb88nvn4c3r"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2023-01-17"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "e74d1173689dccde72fdccaabae19cbe93d2f1be"; - sha256 = "0pmx80b4s0nvdz5ps0jrlgrsir00q0s4ighjl7598gfh59ic8jhl"; + rev = "80858aa01d57ed2f93c6bc388bad373810d41a21"; + sha256 = "0rcikmjdhcw39kngx93snpnn0sh780drqnn342gg9ifnysbva3d9"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1795,12 +1795,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-12-25"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "95b43f67147391cf2c69e550bd001b742781d226"; - sha256 = "0rmva45znh39r4rhakk1zmqk9hrgi2d2daw8v1rfv1jd054w3vx1"; + rev = "bbaa1d5d1ff3cbd9d26bb37cfda1a990494c4043"; + sha256 = "116h45vnz98ni60i12f2z6rwz9gkpp1k4ysp1ry0qpjgmb5fcbsy"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1819,12 +1819,12 @@ final: prev: codi-vim = buildVimPluginFrom2Nix { pname = "codi.vim"; - version = "2022-12-02"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "metakirby5"; repo = "codi.vim"; - rev = "6537ba677a0c7c6c796b195f29077b57fad33716"; - sha256 = "01rk4i212zcas64hk3d2a15qvn8rxwlkghzci2cd1n79ywj0q9xd"; + rev = "ab8c5faa867424c79a7d5d3a7f55d3a2528ee9b9"; + sha256 = "0d3rpj31wd5xzwcrnv7rwm54g81s3i4hxs7lcwph8k1j7pb8i1nl"; }; meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; @@ -1951,12 +1951,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2023-01-19"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "c9ce6476e4b481c64d13939c6696043b8e21dd43"; - sha256 = "0mqb300w663xb4yfxkijbn8ixzgj8azgywmhg7qjskds7w8af15z"; + rev = "1528b525d17a98dfc6f7b07aa28672106df9cde7"; + sha256 = "1mv844ijirg9vv8klphrdka3qyji9hvgfqcwf2v2a3c4h2vd78rf"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -2083,48 +2083,48 @@ final: prev: copilot-lua = buildVimPluginFrom2Nix { pname = "copilot.lua"; - version = "2023-01-07"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "5b911f2d8ecccc684c13fdb8af4145cca19dc3cf"; - sha256 = "13ckm0b8hgji4brmfw4dnc0spm8hslx2s4bg0vi8sll5i7vphpdd"; + rev = "bfae743805d5f16fc31f6d3a8f2e46b3f3dbb175"; + sha256 = "1gkb9w1ad8fq6hbvr96p6sp1kzx8vlk0x6wy47mqbliqpxgp3vhr"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPluginFrom2Nix { pname = "copilot.vim"; - version = "2023-01-18"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "8c8416488ef21483dd5d2922ea194c05e9a3baaf"; - sha256 = "08zs24jqwv6z5fih1701wxlpbb2bjp5zlj0incw7vyi87zk2i3va"; + rev = "c7d166ebda265370f38cec374e33f02eeec2f857"; + sha256 = "1j2q62sac9gwcdzgc2cdxvvpxjgxi12sy33p49lk3gh5mlld53ij"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-01-15"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "e8fedcb9fbedc60c8d0f30accdd72b53e998d8af"; - sha256 = "0nqby971cys2a6q81pcp54xc5w5rq9b0z8yw454z0fr8agw0vxvd"; + rev = "53513efa7cc878ae7929ec6a389028effa569441"; + sha256 = "0syix30ag4fda8hzpraijm0v6s64gr4vwz4i9c3lvcwssd4q6dfw"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-01-15"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "c3cc8cfe780449d8773392a741d5b15e7e9fc83c"; - sha256 = "1h8p3zk8xra3rhppzmyv7b8raz3vsb5rs8gmx7yylhpb70rv3l4w"; + rev = "5b9fb4da049d48a1e8872f92c180a3646f610a14"; + sha256 = "0bplxcdv3yxls893myc6a6kpq01wfypw2sgnd61pc8k78xkhmdps"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2143,12 +2143,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-01-17"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "929adacab097dd2c36c797c8f9323886b4439a9c"; - sha256 = "1v49552gmsk5g5aprvzysqf5pqk6im9nkiyyjhns8sgva7gswvpm"; + rev = "b6032a67b53ca92b7bda401ef45284e888c5f4b6"; + sha256 = "1wxwwnbbz25idi4bwqzb9byf44awss97ca1925n5gmxq19g7x1gc"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2179,12 +2179,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2023-01-13"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "707ed7d6f8927a5ec0c241aa793f694f1b05f731"; - sha256 = "1nd7n871vlp5hdgl5xap09kn596rx99i11ccn7nr4abl56q2dp2s"; + rev = "c2e9929c3ac40776c30bc7b328a7dff98756050a"; + sha256 = "1lqxbb6r49afqqc2gfxdim1kr3dww74gg1pbz26s6bqvga1wzf8s"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2287,12 +2287,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2023-01-10"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "f7d623457d6621b25a1292b24e366fae40cb79ab"; - sha256 = "17vwcqajvxhbvifg562zxvzwln0llb3gzyih3k61yssdp5akcfl0"; + rev = "df68a1943ac2f08a73e3284b266ea50e7d381db4"; + sha256 = "1m2c7xqsb5fp41j0sbv7z5w34pi372x21gxifkvhx6znv4l5r9f7"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2661,24 +2661,24 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2023-01-15"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "dbcfd4510d31884d444ec33a4453d0f06ad4a5eb"; - sha256 = "1qcwchka11gaphb36njcwa7qdw4hbp0x36w7mhsdm8p4i5xw3161"; + rev = "5020da900cc5dfd7067f181ee2ebd872ca7c84e8"; + sha256 = "0qxd2wn6q5v60ai222yjhzqkcb9v0dnlr4k2pvn9zqcwhj0qc2py"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2023-01-15"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "5bbcf162d03287296fe393f88da6065db3cf9fd0"; - sha256 = "0lmqvm2sdj5mpq8hd03wyvmxgm6y286f0b7kr820znh1swlky3z1"; + rev = "ab3757c1ea1b84ef59f7dda54f11d10022e0e3b7"; + sha256 = "1rbcf3llcq542533l0cxqf3bwnzk99x76k9yclfdy12zfdcjx4fv"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2757,24 +2757,24 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2023-01-14"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "5064f59094c42911e2ce57e1b59acda546c3905b"; - sha256 = "1gssj61d8lma9kbadmdwgpa3i4343srlfnzjc3br527dhw7ihcqm"; + rev = "c9a87dd0b7b5417c3797332ef06b17733626387f"; + sha256 = "1cjl5gyp2wibhb8d4rwsav62bs0x12n4xjrkmz189rc5dmh1yplw"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; - version = "2023-01-15"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "1953c0f2541446e8a56ba4e2f4477e91e78f6d13"; - sha256 = "0q2mqnag7nv30p511xkrn50jb2w8m8jaw5ryxs3wy1r92mbbbjqc"; + rev = "ee6e91ca09d59043d365bd96a32e989bd75abe84"; + sha256 = "068af4iznkvkafxnyj54clwalmzcywlfxphlzas4psg6qxzcdj13"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; @@ -2843,12 +2843,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2023-01-03"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "62408f6cb189606bc4b16832ada29be3ae33515f"; - sha256 = "18h7mwr9lpsdsdi90vn4nc868g50li27xvylrs2srppfjr7kvl7w"; + rev = "aa97c07ee7b327120e467927c85a57ff1d713754"; + sha256 = "0pr4igijc9n8gwr64x4srgbwg21m6x0bkl2v00ps6iscblfmzzr3"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2975,12 +2975,12 @@ final: prev: firenvim = buildVimPluginFrom2Nix { pname = "firenvim"; - version = "2023-01-09"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "glacambre"; repo = "firenvim"; - rev = "b6be2e074b8f62815a45e31eb0966b4dd5e57810"; - sha256 = "0jhb91wfkz3jr1hxhigb551gg4c0gv8hdj9avyd5kj5lqwmy1j4q"; + rev = "35b34ba566d9d9f6761cde3574f668d505c5137f"; + sha256 = "06lrhk7xladf9vf5d3qk06ffh4fw3s1wzpckwrk285lqz3mqc2gm"; }; meta.homepage = "https://github.com/glacambre/firenvim/"; }; @@ -3084,12 +3084,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-01-19"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "046e4d3491baf664e0eef5231d28beb49333578b"; - sha256 = "1ywp6lfzdx4k1pj6fzxd703zcvwrfkbmcmggds267bjgadrfbbnc"; + rev = "a6f7a1609addb4e57daa6bedc300f77f8d225ab7"; + sha256 = "1rw4r8g4hblmlddbddd5skf5x8i4zaba8ncmzbr26svdmayk1c16"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3192,24 +3192,24 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-01-15"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "292de730ebbd3834e87f864c8c4115dc1035db37"; - sha256 = "068rwvq5q264lpfxgg4gw259rsy4wp6n6bf4877azk19f1b4j0ys"; + rev = "bc7fd1253aff19ae5514fc11b0f947cc4b052a90"; + sha256 = "1maddqgwdxxsp6ar6csbxsvd1ng3i3ybqdy4b2jslj9f8v54znds"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2023-01-16"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "bdf48c282ad2174c25c059b3cdb7956427b07a99"; - sha256 = "0xjbnvyp0qnfnvz0grhyfcmzn7m90v3d3pfqfvivis3x1vws883q"; + rev = "dc71692255b62d1f67dc55c8e51ab1aa467b1d46"; + sha256 = "0h8yq3rxm6dfryjlh57n13bylwg4f4c4skc9z0krgl200v39ard0"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3240,12 +3240,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2023-01-02"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "9e4f5360b69558799c6974ed72248b86d09c6549"; - sha256 = "1pv64p2g385h4awapg99m39r3qipkpwg4rkicvdsc0dsnamqmis3"; + rev = "8abf42d2035374df1c87cb1b26039393c807ddd5"; + sha256 = "1vka4b9qs54wrs2wzk8msbpadc01wc5b1py0zng8hq67dplcg9yx"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -3348,12 +3348,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2023-01-12"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "addd6e174a85fc1c4007ab0b65d77e6555b417bf"; - sha256 = "09gnk8szbdxc26g46hyjw6zb41i9nswz7pxcadmx9x2f0j9sma3m"; + rev = "0d4fe37ba5285171f3729da955955205f3fa945b"; + sha256 = "0bpi4xhpi031sgrkxdqrrl7fk16wdkk1k7ln6b8qyf5vyhkcckfz"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3372,12 +3372,12 @@ final: prev: glance-nvim = buildVimPluginFrom2Nix { pname = "glance.nvim"; - version = "2023-01-10"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "611478d2b36beb3c416c92f77e7c116d7bd25ee6"; - sha256 = "0fhxg27yq2lfwfwgpg2zf28hrb6kfa6nffrm6bzajk192z1zbak0"; + rev = "3b7fbbe4e785bedbdaa1a9573dcd800261a7e32b"; + sha256 = "09jcq6315njcw0khasnv41vi0lscbxk07cajzxqbm5pgjzww26fq"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; @@ -3396,12 +3396,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2023-01-14"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "c88184a0bbd3e32e0274ad8c3782aba718f1053c"; - sha256 = "0b1yqy0j7akgqal1zq8h3zgrk0asvyffxrad81s2wv4r0dcg8csr"; + rev = "c87b1120b618577e64d910a7493a26829044a8a2"; + sha256 = "1i5d249jga0slnwnk6as1zqlc03x8nxd0vbrxr43qg6vw322sj7k"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -3516,24 +3516,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2023-01-14"; + version = "2023-01-22"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "30e9f4b0fa24c25980df1690a8c47c36e40b6673"; - sha256 = "0nzrjrkfvckhzmxpwmn5qr62zfhkidmccfwj7iaaa3f4mi2ya5mb"; + rev = "13b7eb4589d9ab0f388ca51047051f7158c930e5"; + sha256 = "0mivkynl1xl40mk9ppiixk5mk8z70g30i7bm3lwpg02746vyp04v"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2023-01-04"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "e863942494d7c72a7c8d2c54cf651f28fc5a76ab"; - sha256 = "0xh1y64bn274f7rm597gqgqjrra5fafydqcm127ikdiqsa948psy"; + rev = "2e93ac50b3e95d650e62729f8810a005861e77ad"; + sha256 = "0ahgpgjazrwsvqpvsgbgwzhiglzb291d1ww20f8grakdhppvas3h"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3576,35 +3576,35 @@ final: prev: hare-vim = buildVimPluginFrom2Nix { pname = "hare.vim"; - version = "2022-10-10"; + version = "2023-01-30"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "267fb4dac4e8cd4df1d9b57fa587ce718f5fc256"; - sha256 = "1spl17vd8w5k5xgqvmr80fi5samzhxfcqnkmzpqjk2sf5z88k80k"; + rev = "92e8a80edc11ad5df6fdcfccee567515027682eb"; + sha256 = "10fl95n5c2yk8v00hr4r4zbbi4rrdhbz6jg7r86d8jw6qjxl6c1b"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; - version = "2022-11-23"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "21d0d1bfa3000e4384740bfaefa0ebc51c773786"; - sha256 = "16idy8a2ar2gc7kdr888wwlyw4m48kbw2yzflz16fbdg56krb43d"; + rev = "8c0bb0a328e57278f4783bb0e2ea32f296d36db1"; + sha256 = "0w1v0r420m9aqkl4h4wjzhc7am8pf43pbv6g8mkf50x8mgxqyac6"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; haskell-tools-nvim = buildVimPluginFrom2Nix { pname = "haskell-tools.nvim"; - version = "2023-01-18"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "3cc3274f1275a7335b60c8199c43e4c03b5ea210"; - sha256 = "0gfypscwh5zzfk7967h9a7a5cc060ax0wyyxdf3wsiizq9nd89vc"; + rev = "2e63d6336822a3676fdd27b0aa49cb2da08d1b17"; + sha256 = "0v4hc613smq1gry56imfy65cqy5128za4i5zfy1zvh3x1ppbqqvw"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -3645,6 +3645,18 @@ final: prev: meta.homepage = "https://github.com/travitch/hasksyn/"; }; + heirline-nvim = buildVimPluginFrom2Nix { + pname = "heirline.nvim"; + version = "2023-01-30"; + src = fetchFromGitHub { + owner = "rebelot"; + repo = "heirline.nvim"; + rev = "81ceb3025e6c7030c42accc3951dad94f31ff0c8"; + sha256 = "0m8z7k0pw7vmwmw21lcil0iprdb9l9yfx4yjk05h65027j8xhk7c"; + }; + meta.homepage = "https://github.com/rebelot/heirline.nvim/"; + }; + hiPairs = buildVimPluginFrom2Nix { pname = "hiPairs"; version = "2020-12-10"; @@ -3850,12 +3862,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-12-08"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "c4c203c3e8a595bc333abaf168fcb10c13ed5fb7"; - sha256 = "1kanfs0c1rbi23dm0vkmyzg4qkxq18hc2jc2izvyqiklbpi49x06"; + rev = "8299fe7703dfff4b1752aeed271c3b95281a952d"; + sha256 = "1z2rnaa9p62yid89n9pni9jzzdlcdc55i95c67yn5qzxd3h637hi"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -4139,12 +4151,12 @@ final: prev: lazy-nvim = buildVimPluginFrom2Nix { pname = "lazy.nvim"; - version = "2023-01-19"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "75dcd5741d76e09b1a41c771fbc8b010a109b5cb"; - sha256 = "0p0idwnzx0x3v7vsjsk2ld4i61xgpa036cs7h3jdgynssgwdp8yg"; + rev = "3d2dcb2d5ef99106c5ff412da88c6f59a9f8a693"; + sha256 = "0gac6zw7zp53szjd8rfhb5ysgnhrsn01gb759pczmkayp2b2x4fd"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; @@ -4391,12 +4403,12 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2023-01-15"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "937e882c169d572a8a73dfcb71137a264c6369b2"; - sha256 = "00aw82ymjqh729mi38l3nx0fhpp6rciqyqv0ar4g0v1qlq4gyp4l"; + rev = "3aa6c2029499625dc76911cb007e9cd370137f11"; + sha256 = "1pbpssf24zam4py6wg5k2m7hadivlsv25yvm4gxr0cnn79fv5cqp"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; @@ -4475,12 +4487,12 @@ final: prev: lsp-colors-nvim = buildVimPluginFrom2Nix { pname = "lsp-colors.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "lsp-colors.nvim"; - rev = "750d59b643865b906996028147675e9af216ea95"; - sha256 = "1i5qn1npa9zil3xql7yavx3p7w9xa26fz2lxw9ks23mpgdplk9gs"; + rev = "d0b245232aeb197bbd097111d8b69621b0671edb"; + sha256 = "1nvspfsd3x3i5wv8y3a0kvnnl56wha038dblz2d8psrbkghr1fbh"; }; meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; @@ -4499,12 +4511,12 @@ final: prev: lsp-inlayhints-nvim = buildVimPluginFrom2Nix { pname = "lsp-inlayhints.nvim"; - version = "2022-12-05"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "lvimuser"; repo = "lsp-inlayhints.nvim"; - rev = "a28c51a6362e3faa17f67749436cb5c8b55dcc6d"; - sha256 = "1hvn8y1mqd853aa2dm7156g4fvwq21qmmkicsl50czq4mf9vgvd1"; + rev = "84ca3abe8aaecbb5b30ad89e4701d4a9c821b72c"; + sha256 = "0fx0swsagjdng9m9x73wkfqnk464qk63q9wi32rhywllbm7gsflf"; }; meta.homepage = "https://github.com/lvimuser/lsp-inlayhints.nvim/"; }; @@ -4547,12 +4559,12 @@ final: prev: lsp-zero-nvim = buildVimPluginFrom2Nix { pname = "lsp-zero.nvim"; - version = "2023-01-19"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "0b312c34372ec2b0daec722d1b7fad77b84bef5b"; - sha256 = "095n5sq850b66cpbqfbqkz5xzd2klyv5ijknffrbdrx0gwjh561l"; + rev = "42bc5a1081666098a7154532e6ff5e3edc483b39"; + sha256 = "1y6jv9sldap59466v8jivbd5w6xs31anr8iqg3zyapdmr6pwflck"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -4582,12 +4594,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2023-01-17"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "c1e9c2a5d0f0aa73c2544ad958c6f06973235d35"; - sha256 = "0n4pmcmqb7lynx1firq3p1g2z1xjw78b0wlbp7k3ag7ac5gfhzbf"; + rev = "c15369260448d81cb65e5c6965850232ed22fbbc"; + sha256 = "07s83hn47rnvb96fz7h9kxdy9qxmz7h0v23m0ij8c4yhk9z8xyxj"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4654,12 +4666,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2023-01-18"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "af60ac12fa1349dbad479fc1e95d5aea977c0c37"; - sha256 = "17md5a9rr7zrhj5yn45dmjqdx1fyvy92la7z6sfni2zqhl9kar1g"; + rev = "94f192cf5f0a1931b3035c2d8affdebec460968c"; + sha256 = "163zh6pq6a7qxs3yvkrpn5sihrbn1vhmr3jv27p4swkh2x3dn5q8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4727,36 +4739,36 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-01-19"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "5b388c0de30f1605671ebfb9a20a620cda50ffce"; - sha256 = "1c01jacxp96s2xd8w2hvp46ai49lw8dsmv372l8jj6794dqm1bfv"; + rev = "53f3a8bdcb77d4a95b082fd57e12173f353c6c3e"; + sha256 = "0588rpf28fk922nmj44nl5m74a9762g2xx8y72b61k5iwpi2vp3h"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; mason-tool-installer-nvim = buildVimPluginFrom2Nix { pname = "mason-tool-installer.nvim"; - version = "2022-10-29"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "27f61f75a71bb3c2504a17e02b571f79cae43676"; - sha256 = "0zhmffjqssfqjbx69j7ambzr4dz52r4sgl6xhmzf9qxr8xlkhvny"; + rev = "6ca38efeb0406dea8da6c97f61d6f6ef30ab0576"; + sha256 = "0a4h7hmm53qaydnqfrfp7yb4j157da0mvr0ivkm77f270rr2pwg0"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-01-19"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "db162f3f32e54f3a4ee2f03c1ea08a5253a0500a"; - sha256 = "0scz36d4r3iz5d5g4bvxcqs15sqcdz9ry8fhhxrfz5zcsvwlj0wx"; + rev = "07de1d12940a6580c125720d37e26abc318f778a"; + sha256 = "19m2j1kmc0mnzbjyp266dqqgfp2fw1mlzcsc9286ggbbvgisadih"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -4823,12 +4835,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-01-19"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "91017a96693408ef96efe9a2513c6ace0a87dc8d"; - sha256 = "0xhc2npbpz7rhlis9cchda5pg7j5qkfxqb9qjsk86cxga1ma0c8r"; + rev = "8e007cf3ae8db59bd926a9fbaf7f0d25a7fe67ca"; + sha256 = "02pq68d5c3g009qsjsbns0bswg1riq61l8giykhg09r0lbj28zn1"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5183,12 +5195,12 @@ final: prev: neoconf-nvim = buildVimPluginFrom2Nix { pname = "neoconf.nvim"; - version = "2023-01-18"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "699b1c632b72be003ed9996b98ad168b561d9f75"; - sha256 = "0q1i11wc7xqbjkvbz33hp2vfslwnrkq50pq5cvg2f4yjkfv4fvr3"; + rev = "9fb68ebc1b5632b2e3e93ddb5ad1985c75c59fbd"; + sha256 = "0p2n2k28z0qjdsiyxq0frfl7y6lvf96bl5c7w8zk0amvabkh23wf"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; @@ -5207,12 +5219,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-01-18"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "15e9e7c1daa22ce83757cf1c304a038f0549cf47"; - sha256 = "177kpbrngvip2m1r4b8bhhpkqr0zrnpbpaxqy82s4npvb4p9yi33"; + rev = "8fd21037453f4306f500e437c5cbdf6e8b6c2f99"; + sha256 = "0zxac4425677w3pvj5yp7sxllmnj4bhwc6kwwa6c409wvyzrfas2"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5231,12 +5243,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2023-01-12"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "981207efd10425fef82ca09fa8bd22c3ac3e622d"; - sha256 = "16rfvllp4w1d3sph1zdilprp5kfwsc669zaspxnclyk0nyi8cs8b"; + rev = "089d388876a535032ac6a3f80e19420f09e4ddda"; + sha256 = "0h44l14frinh9mcbjps04d0s853pppw0qlwdjkdg5wrfnh975vya"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -5291,12 +5303,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2023-01-16"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "4a9a5fe13cd454692fc4db0b27783cd005e6be56"; - sha256 = "15a8az9xlcc0h0pw7s8kmd4zm5nx7d0q0j4d192d62mkdqc685mh"; + rev = "b977fa0f2069ff71111237df07de2bdeeb2b7079"; + sha256 = "04r5pcdkvm9dgfsyhx0skf8nwyf790myrha7rjkqr9cpr707l6mj"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5351,12 +5363,12 @@ final: prev: neotest = buildVimPluginFrom2Nix { pname = "neotest"; - version = "2023-01-18"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "6676edc3078b8936df989df639900dc9a70dfc8a"; - sha256 = "1rhh775mm7byxcazl63hwdz8yjlz4fghd7yxaysv49s3rbrka1z1"; + rev = "392808a91d6ee28d27cbfb93c9fd9781759b5d00"; + sha256 = "03s8kkj386i77vryss1br3033azmbjhf4wzaqnrm9238951hls5w"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; @@ -5387,12 +5399,12 @@ final: prev: neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; - version = "2021-07-02"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "cloudhead"; repo = "neovim-fuzzy"; - rev = "0bef4e1a81c65fc05d31380dd74454bd67733837"; - sha256 = "02a8ipk341bs6y8mk7nixdkbk1c4jdddsjp1qvqgyyca0shaqsz8"; + rev = "f6a1429bd0ac9953eb1d838ba800e69685fbcac1"; + sha256 = "0d2r8dx9sicf4fjf87ksclsvdvx2f7npjqpscyvycn04wrzvjsaq"; }; meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; @@ -5423,12 +5435,12 @@ final: prev: nerdcommenter = buildVimPluginFrom2Nix { pname = "nerdcommenter"; - version = "2022-11-09"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdcommenter"; - rev = "98cc4a2d64ca67cccbf5b5cf47c682ebadaaff58"; - sha256 = "0s8czq77lsf10b2fsw6mhavirc1ivby1a9c5y49zj9fva876h968"; + rev = "06f6166e5dfcf78eb0d055c21274cafc3927d461"; + sha256 = "0h340y2v4bb1wfqa8015skd7yb694iwqgq3v42mqpcsa3ssnvh70"; }; meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; @@ -5483,24 +5495,24 @@ final: prev: nginx-vim = buildVimPluginFrom2Nix { pname = "nginx.vim"; - version = "2022-12-31"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "chr4"; repo = "nginx.vim"; - rev = "99694458062e4e1d138bd022b10432a05612a2db"; - sha256 = "1ih25dl3zzcp2245vrq3ypii76b3ri73ayv3w8qg7s73j1g1c6p5"; + rev = "8a42e93c9f004fbc5b32bb2e4940107fb7b70a42"; + sha256 = "12dhzglvmpv1b0ynwig224dnilakqkwh4npidmgh5njy2rrqvy9m"; }; meta.homepage = "https://github.com/chr4/nginx.vim/"; }; nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2023-01-18"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "97e66dfaaecdc81f1dd7da00f8d4a6033f3bf6b2"; - sha256 = "01q3qlazc6m39rn67qpz03prrs2x9wqf71xi5s4a82vp53ha1fjv"; + rev = "aa793975d10dda69817190faea84e28eeb176934"; + sha256 = "15ml496n90dd80z4gm09562wzfv8npch3sz0kdv6hjkkgg04p3rw"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5531,12 +5543,12 @@ final: prev: nlsp-settings-nvim = buildVimPluginFrom2Nix { pname = "nlsp-settings.nvim"; - version = "2023-01-19"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "06816026ccce2e8246e952d55ea87ddd26a9d2a4"; - sha256 = "1wmf4f7z537fhnr79ijg05bb198wrl7im56m1phb6naa5fbpr0zc"; + rev = "5541d073b93a404445907e0aec3ebd9cf8914e53"; + sha256 = "0r4bbppp95rdhpz9j24w6smpzv891gk1ja6dis7j4gf3sra57hqy"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; @@ -5567,12 +5579,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2023-01-17"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "16b60455867dec069bf41699d690fa01261b4bf6"; - sha256 = "1fsngf0lf45csr5w6691xkdnkjbmp82xr4q65fnc5p0931q1yl7x"; + rev = "34f7cf628666c6eb0c93fbe8a0490e977ac78b7b"; + sha256 = "0nkk0zji3fdjzjhd5l2lmqb5208mkw08xkgvvxbddsjwgxx3jbg4"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5591,12 +5603,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-12-23"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "418e2507dcff84a7cb993ae4f37697b98e0c92ca"; - sha256 = "0zjlxq8xa7and5952lxz0irklxsrmh7k4bn905ggcd62hbpd5q6v"; + rev = "9824b8511dcb7d89de628d7e9bab5fa65c9d59d1"; + sha256 = "0y6paf8kyj30kkkwi9w2hank27b6f68l0swnly3w6abxfariwnpz"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -5627,24 +5639,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2023-01-16"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "b99e6cb13dc51768abc1c4c8585045a0c0459ef1"; - sha256 = "0fgwi68ks7qalr2nn1pzf3jdzyx5scmziz2dhp3yyw7mc1nq3fi1"; + rev = "d147222a1300901656f3ebd5b95f91732785a329"; + sha256 = "0p2sc3jnkvxax55acizjjna2rh9bnwfrm7z5apyasyzvlixgxxz2"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2023-01-19"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "ef3d4a438f96865e3ae018e33ed30156a955ed00"; - sha256 = "0aq4w4dsnzi31h2qqm2fdqnn9h021l5j1h9qm4xzk7ywa10ikq73"; + rev = "c3e678110d5f31854c6575cf4bda3b82f3d4a884"; + sha256 = "045anxnny6rlfrj18wqqrdy69j0b6qpgiirabjas6hcyh3sjgrx6"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5673,6 +5685,18 @@ final: prev: meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; + nvim-FeMaco-lua = buildVimPluginFrom2Nix { + pname = "nvim-FeMaco.lua"; + version = "2022-10-10"; + src = fetchFromGitHub { + owner = "AckslD"; + repo = "nvim-FeMaco.lua"; + rev = "469465fc1adf8bddc2c9bbe549d38304de95e9f7"; + sha256 = "1rv3ppjfndi27dbg7dsapxacbal1mj2a9dx2vq0yvi2v1gb97b3x"; + }; + meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/"; + }; + nvim-ale-diagnostic = buildVimPluginFrom2Nix { pname = "nvim-ale-diagnostic"; version = "2021-11-06"; @@ -5687,24 +5711,24 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2023-01-08"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "f00eb3b766c370cb34fdabc29c760338ba9e4c6c"; - sha256 = "147s9mq3vlvsf4wzm0x5aiwr374zhi3d6d2b9y52iwndwjvjkh0b"; + rev = "5a3523ddb573804752de6c021c5cb82e267b79ca"; + sha256 = "1s17rmxgnadz6wbcd21x8504ra8crbxf27qjdxh6b4a1g0w75hy1"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2023-01-11"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "cf8252058c8fc486bc565a815083a2eb390f7621"; - sha256 = "1hcj0k8szin32b2ki6mkqwpckinyca8vpwvd3rmaf597qnk0bv5h"; + rev = "d41f301dcd3de51e95d5e1b7737e22a4e1eddd28"; + sha256 = "1dlxa4n0xv5zpkpvw06xvbmcyaghs5byrw9xkpv9m3wqk55x395d"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -5723,12 +5747,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2023-01-17"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "d15b59d7429d45f0b057aa63a0266989adc95715"; - sha256 = "0fsb8ybymxppkbdg45f7vr5vys2nl7b45nw6dprarh8bwp2qnkcr"; + rev = "da1cd2557a16386829a213330e0fd46b61db7632"; + sha256 = "0ws45yilaq9kyssm5s1rj65k0xsiflg8fivjgggb3g3fvr6286p3"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5759,12 +5783,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2023-01-06"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "11a95792a5be0f5a40bab5fc5b670e5b1399a939"; - sha256 = "178r1v9p7mcwg8xgl3jr4ibjsh9wiq0y81mps0nhx8q2dgnx8cyz"; + rev = "e7e2ef7031db8e0cfad7ad9916ec766ddd9dbb3b"; + sha256 = "1jd1x6rg9k5gjwnlfrhmy976xky6sm7335hcz2lpgjapgy7rnyz7"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5867,12 +5891,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2023-01-18"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "c64a6627bb01eb151da96b28091797beaac09536"; - sha256 = "1nf48ns1zfmpizmki9545w4m8ndmkh76aadlmjpzn7y4draq5asf"; + rev = "0e376f00e7fac143e29e1017d2ac2cc3df13d185"; + sha256 = "0xdbvbah2zxy27irc4dn9kz7ga5jv88d0z5vsbdgnqpnvv7gzc1c"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -5903,24 +5927,24 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2023-01-11"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "b80227ea56a48177786904f6322abc8b2dc0bc36"; - sha256 = "11a9jn4m1db2zlkfvwym98h15l46idf14gaddczf1njxhms52nm1"; + rev = "885e958ff9de30cfbc359259eccf28cc493ad46b"; + sha256 = "1j7nbrilk63vdmnr1dp3gdzhdpa2m001jzd6ch6i8j8dzjjnbyss"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2023-01-16"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "191345947a92a5188d791e9786a5b4f205dcaca3"; - sha256 = "05rhpr34qsjczcv5kjd8664629308k3nazd8ksgfrpkjbg0ifjq9"; + rev = "7f7f2af549e72a0b7bddc3b4f827beb027ea8ce3"; + sha256 = "0ljipdw5cbcny6790r85hsfhnf0may6bamf27s3mzabrczayyd1w"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -5987,12 +6011,12 @@ final: prev: nvim-highlight-colors = buildVimPluginFrom2Nix { pname = "nvim-highlight-colors"; - version = "2022-09-28"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "5d20935b99d976ffa0d8226a78a8b2e091f0f699"; - sha256 = "0mqczqcrz2iz0k52k5bglad6rbsr8dddm5mvb1gsihbqp0ijyj85"; + rev = "af051bfe2971fc888d21cdfc59f5444904353b43"; + sha256 = "0xi4546f7qcdmyq04l1rjzyvw7rj9dlhmhskwk1pzq90rnd8xa5w"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; @@ -6011,12 +6035,12 @@ final: prev: nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2023-01-18"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "fc83bd515c21c7912a6b9f97088e0492e923dfe0"; - sha256 = "03wpjgr8ziw9dllngh06l7wkf39vd9z96ivbyhzvdq801v0lyyw7"; + rev = "5e3e9088fba7508cee3612ee50b14dfdd3ab19af"; + sha256 = "1ih4zkb025wvns0bgk3g9ps9krwj5jfzi49qqvg5v3v707ypq2kj"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -6035,12 +6059,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-01-18"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "0a9c88dc0eee8bbe41cac4d3e16475a3c78f1242"; - sha256 = "16ari6m1jj1xvaaf9n118qsdcc30x55r9drf3x2s689h0f3kvj64"; + rev = "beb9101fb4a8a4f2655e691980b4c82a27d2e920"; + sha256 = "1j56xz39wfdxinmzi83qfb6gljnag8a590wvyjg9c8m7ssd0ixw6"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -6095,12 +6119,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2023-01-18"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "edd7bab99613849c8cccddcebece47aabb9e86b8"; - sha256 = "096vjyl6wl1y027pbn81773mjzfahswk4y5aj5b6gg9vwchzyf46"; + rev = "379be679d3c5f80964bc19131554b846dce5d34e"; + sha256 = "019wc4kxdyzpdbjazsy9ji1r0ymgbwx620ghvqw4wdvccyklg5if"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -6119,12 +6143,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2023-01-19"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d228bcf7cd94611929482a09e114a42c41fe81a8"; - sha256 = "0ad4yb1j6pizvy3fa4d9b7lzq5nv2pipb19fg6wz6xv62xymdly6"; + rev = "902d6aa31450d26e11bedcbef8af5b6fe2e1ffe8"; + sha256 = "1hmkm3znqm7c6fi0qai1i424qjm5b9dh9l0srzyy7cax3629yyfr"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -6167,12 +6191,12 @@ final: prev: nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2023-01-14"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "c552c96b837ce8b1318cf3eccbda41a73760cb21"; - sha256 = "1fqi33clnjsyx0fkdajl9vyrpmbdry11dm38nmm5d83a4zyb4qax"; + rev = "0b9c5303b7402ae24971ed2f0e5890fd72505532"; + sha256 = "18r8vhflf9k8rmbw7czv2v7l46144nv7ia3sszhby8p1npd57ld7"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -6191,12 +6215,12 @@ final: prev: nvim-navic = buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2022-12-11"; + version = "2023-01-26"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "7a2b823152fe4de65ee7925b0e32d26ed73bc57c"; - sha256 = "00hsnlbr6s2ljwzl5ayjw1m2bdm4kmypl7xlg2p8l1yjnnsk4dn4"; + rev = "11e08391eeed00effa85ca24ff9d1e0472cbcd6a"; + sha256 = "16nr10lyzq45hm49mh2y6xjk8f59bra1mzgybclz09l9aikzmkhq"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; @@ -6251,12 +6275,12 @@ final: prev: nvim-rename-state = buildVimPluginFrom2Nix { pname = "nvim-rename-state"; - version = "2022-10-16"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "olrtg"; repo = "nvim-rename-state"; - rev = "43f2a8eb313eef767f1a28b69758cd86fc221e65"; - sha256 = "08q5q7l2l4jvw7yh4zddcczwndcajddbaj3zddwc04ykzlh2ks1f"; + rev = "8ba78ea517a605ea1a89bd1ed335886435010882"; + sha256 = "15n1xnip4dzil7fh50s2216wbryzv75jggmz4qabdfv0s6zz67n2"; }; meta.homepage = "https://github.com/olrtg/nvim-rename-state/"; }; @@ -6287,12 +6311,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2023-01-19"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "97df9b3e7da6f9a7325cb5c32649dddc48bb1630"; - sha256 = "188gr37y77l74dlzsp8wgccglx5c67gpdb3fmrn34cbw7id7fj7d"; + rev = "a5580956e2c1841a248fae6ba88e21f72df9f04d"; + sha256 = "1607d7igrhrzhfaypnf20awgi1l32w57i5g1jdz4d5dpch1wi6wn"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -6359,24 +6383,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2023-01-17"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "e8a89db1bbc06510a76fc935754b4e99a3e5e8a7"; - sha256 = "1hhcayk60whd88d3nfhig00qjqx0h3shssl8xvhr7m8lkrkysigb"; + rev = "215b29bfad74518442621b9d0483a621483b066b"; + sha256 = "00rvb70s9wg9vqnsm6a63vakpjyznvpc4yplbmqjqa4dnfwp9kl2"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-01-19"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "42c3a3c51e8fef027655e7facd293aae7c6984bb"; - sha256 = "18sjvl4r02h8s88261kpfw6s084qf4cjhzdrciawhx34b6si9i52"; + rev = "f0e083912ac42e9001e02a89f70269aa0698e9ec"; + sha256 = "0yd2rfy2vsrnnxz0ih8j1f975kww9xcdwzp7241dbdyvy9h7ra7d"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -6419,12 +6443,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2023-01-17"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "2fb97bd6c53d78517d2022a0b84422c18ce5686e"; - sha256 = "0wwzmkkdw3n2agxsclaniblwfjaqwav7vyd5w0fjcqvqjim4jd9d"; + rev = "249d90a84df63f3ffff65fcc06a45d58415672de"; + sha256 = "01wm4gnwimsxgvdhjgn15d23nq6d1304jjvkr1wdjz7xk5g0xvaz"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -6478,12 +6502,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2023-01-09"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "6c38926351372ea87034dec26182b62c835ff3bc"; - sha256 = "1qvpzja9j9hlnafmmsw5bjbbcf2fbn260bmcsmdy7pi17mrd5aha"; + rev = "a421d183ef37dfa13f51a5805bed2381aebf9080"; + sha256 = "0754m29aizcav7ynqflpbv3kzz2n7mw2xx8aliay3slzq18kix8d"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -6562,24 +6586,24 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2023-01-18"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "52b2c9702fb9e219cd4182ed29daee644ec535f6"; - sha256 = "0inw57p02ad644f7fjfwsvk0lap6kpwrriz43kpp2x7wypkj8jxi"; + rev = "7900dc0cd37e7bb5d4175a37c9c4c3dfb94a1f7b"; + sha256 = "1197x2agkc5h97z1hi6pk72sbx397vccpc5xsxc9hrsq5llpx37n"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-01-19"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "f5961e731f641206727eaded197e5879694c35f7"; - sha256 = "1q4wcmdbpx2si4ynq4hldbq2asq16qqwrf0lmcpqrldpziffgdv2"; + rev = "716dd8f9cf1ff2b9cda03497025612ce3c366307"; + sha256 = "14qydwhkr90w2bb1xza44pm2d1iiqmvijqik8qjs122i6z5hc7c6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -6635,12 +6659,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2023-01-18"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "2aeceb0f0700ba57c8248aa36b3a900e58f5820e"; - sha256 = "0nslv7dxsxfjh2xlkh5w10gpi29c65g3mf9m7zyrbj3s0m5pldgg"; + rev = "c3409eca73d2ae334935ca4afdb0428f453ba404"; + sha256 = "1zj4kp8ffhgq9syqh5w7rr5zzb92kvzdkcpf3x0v2d4cwxysd2ji"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -6659,12 +6683,12 @@ final: prev: onenord-nvim = buildVimPluginFrom2Nix { pname = "onenord.nvim"; - version = "2023-01-07"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "b05d57d04445836e6b9235e1937bf0a3ba42506b"; - sha256 = "1n92ajibyz9w1iyyndkjzk6vzk3vz0wam1h39990c7fl4jj74is1"; + rev = "09aab5d7ea230c9c4829e44698020b642e00d840"; + sha256 = "07hrppbj1njnjdyq4v6vxx3nfycr4dx45my23h0ix2kwqhw8f4ad"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -6695,12 +6719,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-12-13"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "dadf56334d2be7d9e8ad1e22c697a6e75f0164b7"; - sha256 = "19bp9mbjldxi2qzsa364rw86zp450zr2ajnnflp2sr0hhdvg620f"; + rev = "7ddbdc0741fdc90f73faa17fb332bc8700acadbf"; + sha256 = "01pf6pi9mm88slf7667np60a7x9zk0rwxz40cyxrfc4d012ivs3a"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -6839,24 +6863,24 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2023-01-15"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "01c27f37a1f067200680cacfb7b96f5ad2fa5cd6"; - sha256 = "13h5w5f9ywigi33g38ij5k24kyyz2nafwhzs5zqn8mngnvh7h0km"; + rev = "c19bcfd6a3681bc876e1b861f6685bfc04972d0d"; + sha256 = "07vhiknf5gfd8rp6ynp9xq3rlc17b1sh322mlhg3976hl62lgs4f"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2023-01-10"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "1c7e3e6b0f4dd5a174fcea9fda8a4d7de593b826"; - sha256 = "12hp9a2q80hg93ynfa97v03fmxqwv4d6f1yb92bi6ih3kbjyjsji"; + rev = "9a0d3bf7b832818c042aaf30f692b081ddd58bd9"; + sha256 = "1xy4hs0pckzbxd249zwg2r0vi94fy9arb966nypw1dx4vxw8072z"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -6900,12 +6924,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence.nvim"; - version = "2022-11-17"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "c1c54758824cbecd4e18065d37191f7666fdd097"; - sha256 = "0j23gdp29xb1rfb7crr5s1xs61wjzrsxwdpv01s79cjnwcvxzgxz"; + rev = "87c857a56b7703f976d3a5ef15967d80508df6e6"; + sha256 = "06cql88anhwnwxmssgbzaxwnx9d88mp04rjbh7cgrzr7pff2x6v6"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -7129,12 +7153,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-01-19"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "ee63338cfb9151018afb243f5af5262c1686b280"; - sha256 = "03fgla400n5mqhpfa3lljzark76ah7n0mzzxfsn5c6m3hxfkvaim"; + rev = "57c32c6b7a211e5a3a5e4ddc4ad2033daff5cf9a"; + sha256 = "0w4gw09b94dhxbbkyl0zhwxl5m370qp8la6frbjcan06bqh85xcv"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -7165,12 +7189,12 @@ final: prev: rest-nvim = buildNeovimPluginFrom2Nix { pname = "rest.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "090e253c114b6d5448bac5869a28a6623c195e3a"; - sha256 = "0qdxm9rcbq78yh0s3cvsbpnjjfd772fhkdrzwg1gc7k8p4ppnm1q"; + rev = "0fdb69f328529b34a2279c14be63b3325dc52740"; + sha256 = "0dn9g6a3lidavw381cd9ckhw3biiq81vypgg4bl5yl6w4avp5nr0"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -7189,12 +7213,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2022-12-08"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "64579c485812867bbd7890a55ca93884beb440b6"; - sha256 = "0yzy3mq7b7hnnb04z45m4r3hcpf11djv5zxhsyk60pnyvlwrdl7k"; + rev = "40b4e0be0231eabc7406168b432d507c6b6332f9"; + sha256 = "1wap2hazm84yzd1x6in6mnglnx67xbavg17k5fqd117biyw8i5ir"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -7249,12 +7273,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2023-01-08"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "df584e84393ef255f5b8cbd709677d6a3a5bf42f"; - sha256 = "1h2p6xdv4bxphn98iwjzk9fh54lh1ff41smp2n0j84inqpl0mygv"; + rev = "b297167d9e01accc9b9afe872ce91e791df2dde0"; + sha256 = "1fwjykp6gaafniflb3816z2nkfkpwa9pkxdcs6l2ka06ngr3xdih"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -7297,12 +7321,12 @@ final: prev: satellite-nvim = buildVimPluginFrom2Nix { pname = "satellite.nvim"; - version = "2023-01-17"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "49b538d095936733062fb2d24f7d6e4cee32a844"; - sha256 = "0v290jk7qkd7ywixmysxbbfz4c2a4gdy5h4488nrfdzpm88alwdr"; + rev = "d522369aa50cf8c0116c952ddc55253c505e8bf7"; + sha256 = "1sbq1akv33sj3apqyw8sc7zpw36cyxk8m1inhmwdwgampzhl9sxc"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -7403,6 +7427,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; + sg-nvim = buildVimPluginFrom2Nix { + pname = "sg.nvim"; + version = "2023-01-30"; + src = fetchFromGitHub { + owner = "tjdevries"; + repo = "sg.nvim"; + rev = "c5e4ab788efeec9453706a4489bcaeaa867aeeb3"; + sha256 = "1yd006gykkxddr57mc0mpfqc817akaaaj2cabih9gbdsm7qy131p"; + }; + meta.homepage = "https://github.com/tjdevries/sg.nvim/"; + }; + shabadou-vim = buildVimPluginFrom2Nix { pname = "shabadou.vim"; version = "2016-07-19"; @@ -7500,14 +7536,26 @@ final: prev: meta.homepage = "https://github.com/norcalli/snippets.nvim/"; }; + solarized-nvim = buildVimPluginFrom2Nix { + pname = "solarized.nvim"; + version = "2022-12-02"; + src = fetchFromGitHub { + owner = "shaunsingh"; + repo = "solarized.nvim"; + rev = "36615f1e4d16b87def801a75132f4aab5944e9fc"; + sha256 = "1nn12zpsgiq9idsa93s04m8l2mpb2aq7f7n11cs2yhv2kbb9krlf"; + }; + meta.homepage = "https://github.com/shaunsingh/solarized.nvim/"; + }; + sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2023-01-14"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "e2e89497f178bec568a0a43cda651f0429ec8ec1"; - sha256 = "0dh5dsn8znhxsdr9plxa2mchlnfbgrvalc5pnz2wdsc2adz37521"; + rev = "c55985d5df53751a44fc532a53bed3be9f3b0d14"; + sha256 = "0jmwsdpmj01g78gkv4cc7l5fxxhxrzlx2lkwmj5r9klkx07fpsrg"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -7635,12 +7683,12 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2022-11-18"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "53cac3fdb5f5e4e63e243232b6eccf3c764ae18a"; - sha256 = "0qp3b6jd6khp8wmc4s8n6sc518p6m44l7f7ln8pr91jz6qh5z30p"; + rev = "93ff5824682ecc874200e338fd8ca9ccd08508f8"; + sha256 = "07wv8shiilibgnp7l0pk9b6qwydwwfvdzdv2vvwn0k0jpaxsjvmy"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; @@ -7791,12 +7839,12 @@ final: prev: swayconfig-vim = buildVimPluginFrom2Nix { pname = "swayconfig.vim"; - version = "2022-10-05"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "jamespeapen"; repo = "swayconfig.vim"; - rev = "30014a34d0ab46f26311f47c1c11ba0b9166f1d5"; - sha256 = "03jw3w80zgmql8ngs8s1j8digwkn7206psklmcnmc1p2drb2d3pf"; + rev = "ce04a8e8c494590382d1b32a20ed3b451d608623"; + sha256 = "0lirihvrx0qn59nbg5s3sh1jgv0v3q4ag7kgvc3r7q9a2fbjg46y"; }; meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/"; }; @@ -7828,12 +7876,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2022-08-29"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "6a3ed24c5631da7a5d418bced57c16b32af7747c"; - sha256 = "0x4jq7z54nj7p4abnaqc2cnldyi7rcl5r444n9jc82i5pmg6ck27"; + rev = "512791925d57a61c545bc303356e8a8f7869763c"; + sha256 = "11c5gr117cad9zw5c8msh7xrk1n02kmyb52vwbrzd0vd0kzy52ia"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -7852,12 +7900,12 @@ final: prev: tabby-nvim = buildVimPluginFrom2Nix { pname = "tabby.nvim"; - version = "2022-12-22"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "187b604da1a6452c700ce21fdf340ffbea956298"; - sha256 = "0b61qmqzl8vqryy58p9688vhxwhfby6qsygi3720hvvgizxk9jka"; + rev = "9065c65138b59ea8182024216a5bbcf0d77baebb"; + sha256 = "0jfgg02l2872ickl3bwsm6xyh5nl5sqgn3yfk9kn45aba3kd7nvm"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -8154,12 +8202,12 @@ final: prev: telescope-manix = buildVimPluginFrom2Nix { pname = "telescope-manix"; - version = "2023-01-14"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "55f73d0743d8597ca9c7bfbebe286e0b5bbe6138"; - sha256 = "1jgl3qb92x4wnkvjwzpqbkcmw22hc4m7nmp1dpj8cy30z5yawg54"; + rev = "66feda7a276366edfc555cb0a7e56b8dd70aadc3"; + sha256 = "1n4ygj3jhgqfg7xrh3hd56x14yqk6rdy3099hy8azbrx40zx0zdw"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -8262,12 +8310,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2023-01-16"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "2f32775405f6706348b71d0bb8a15a22852a61e4"; - sha256 = "166mzzwv95ab8yr4aadr6vy9fp6l64sj2kihhif5qis4k71qshkz"; + rev = "203bf5609137600d73e8ed82703d6b0e320a5f36"; + sha256 = "1h64qyvvnzv7ph49vciv2izv9ws7ds1z9cncrmxs7jwlh3vv10ig"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -8308,6 +8356,18 @@ final: prev: meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; + term-edit-nvim = buildVimPluginFrom2Nix { + pname = "term-edit.nvim"; + version = "2023-01-25"; + src = fetchFromGitHub { + owner = "chomosuke"; + repo = "term-edit.nvim"; + rev = "9efbb3298ce63807750a415a091d7d535ff0a7e8"; + sha256 = "1qb16nnraxg1b9v2hwi8ywzzxgd6p8hxy673d5x561firnfj1zqi"; + }; + meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; + }; + terminus = buildVimPluginFrom2Nix { pname = "terminus"; version = "2021-12-28"; @@ -8442,12 +8502,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "077c59586d9d0726b0696dc5680eb863f4e04bc5"; - sha256 = "1gvglhdwaqrm3anaz7wyq3k1bjikjq7nqrdaszd9nnp3n4yarmhr"; + rev = "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1"; + sha256 = "1k42l9ghpkds2fqxj8f0anlh4gkpiid28zwkhy29k2br21m7q5fq"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -8491,12 +8551,12 @@ final: prev: tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight.nvim"; - version = "2023-01-18"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "4071f7fa984859c5de7a1fd27069b99c3a0d802a"; - sha256 = "0l4ibd0bi2msj2camxls039n6pw008ll50mf5r8888265hmqzkfw"; + rev = "affb21a81e6d7de073378eb86d02864c594104d9"; + sha256 = "0q37ldqajhp46g0ikc3yfnq9bgmghqdb8884rc56sraql9g0nwmi"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -8527,12 +8587,12 @@ final: prev: treesj = buildVimPluginFrom2Nix { pname = "treesj"; - version = "2023-01-18"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "b82c0d235440b44edb077a42179dbcc89a81629e"; - sha256 = "13iw5psvj41axdjyi3pvg7gk5zqhapgyw5k2pkib18hhwb31yxbv"; + rev = "2723d63aed0ca4564565cc2949e0d6d2bc2b8287"; + sha256 = "1bxzww9qxb442ch3i7m4bw58hn3l9lzckr0vnqp9hh55vqh7c3xk"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -8563,12 +8623,12 @@ final: prev: trouble-nvim = buildVimPluginFrom2Nix { pname = "trouble.nvim"; - version = "2023-01-19"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "b2a0afac2c319a481f0f0318963a74d672ba5766"; - sha256 = "0wjhwzk4drm1phvndbkjjcax3q1gmh9akl5i7fwd8635w8dpc9fs"; + rev = "490f7fe6d227f4f7a64f00be8c7dcd7a508ed271"; + sha256 = "1bdhn3y4zs5m66bj009lqyn5spdn36vr8yc04k35xv5434011p0i"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; @@ -8611,12 +8671,12 @@ final: prev: twilight-nvim = buildVimPluginFrom2Nix { pname = "twilight.nvim"; - version = "2023-01-04"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "8bb7fa7b918baab1ca81b977102ddb54afa63512"; - sha256 = "0bqd24cv0mb288qppah5hpmjlik37hbfifgbclfjkkb7irf1va8y"; + rev = "9410252bed96887ca5a86bf16435a3a51a0e6ce5"; + sha256 = "17mw3zqlviz4jsmjfsvddjd60xgkfihc60jv391rinl1w36l79ld"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; @@ -8635,12 +8695,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2022-10-02"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "e99fdf15cd55a4a8e0cb0a80a6810c1867a5c401"; - sha256 = "1ym6myhxq4z9h6nnh1dxvkqc4nbhq500wy4mj494lm2hz6nnhl09"; + rev = "0ad238b1910d447476b2d98f593322c1cdb71285"; + sha256 = "1ii9bb2h45ngy3a9ycqiw6i6vg5lyv59ibidgasg4xirnmsrmk1y"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -8659,12 +8719,12 @@ final: prev: unicode-vim = buildVimPluginFrom2Nix { pname = "unicode.vim"; - version = "2022-09-25"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "4c851a24310fcfb5540a7e2b17c563f1f542e3a2"; - sha256 = "0zgycqvr1z88mjh1xfyvmr00nriwfxk7imvcfqskh9l0wy6z0m52"; + rev = "d4925c55b5d6d57003100b3ce17b82b9e44d161c"; + sha256 = "192ln697rv7m3nk4401p4w75d3afsjlcc5m4hcmf00ci3vimk7mn"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; @@ -8755,12 +8815,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2023-01-16"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "216f15359dd3fe91415b32c62a1122dbe73175fb"; - sha256 = "0kjqw9lawqq7y12nz7wni065wb23z4rnl0wm5wbm1g991ydggc00"; + rev = "13a24c0a09d29db4a1683ef950f929d97c57ef90"; + sha256 = "044s9di41cif3d7ij349v135vnxqhrl10fnagq6lyn364jw3lad1"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -8839,12 +8899,12 @@ final: prev: vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2023-01-06"; + version = "2023-01-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "aa3428b734ddbd0105615832843f619774a6871e"; - sha256 = "0dnv1ixhzrgafd7kqpx8hp0r1snyqfxw80psnbxsr6qcwzawb2da"; + rev = "d55c90d6c9995ccb79d2152564a4939cd84d73e9"; + sha256 = "0vfhjv7jpx15lqd6kf7jds5x5x4x5gj9cbr5rgm0cbbcn2734gji"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; @@ -9091,12 +9151,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2023-01-19"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "31e01612f3b9eef79e6a71d4708b85505f50e255"; - sha256 = "0bvxqjhfizckshw59gkd1g3zx9qvswp0mgjdp80w7y0vsxl0m9rf"; + rev = "18b85395d32e235128b85a059dd60b562f9dbfe1"; + sha256 = "0212cazr83r9n07gmm0rbzp7mq0lh88iwbcqsdza3nw98rqp3i5z"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -9487,12 +9547,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2023-01-16"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "0d630e4aa23315c086e858c1a41ff40e082d0fe7"; - sha256 = "0w8w5w9d23hw5cfa37wnphri42yfri2f11yq4wf6aldrlkg03ral"; + rev = "6a90a1db48569814e73d201c95d90f38ae4aa27f"; + sha256 = "0svshn3g4w86wizxc7nybqgwkbr5nfs454vanr8q1z7ypgqax99h"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9787,12 +9847,12 @@ final: prev: vim-dasht = buildVimPluginFrom2Nix { pname = "vim-dasht"; - version = "2022-12-11"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "sunaku"; repo = "vim-dasht"; - rev = "fe72990f761160c5a8b551dcaa0d3a3927830f52"; - sha256 = "03fxm3p89y3mjr2bqkqb8wy32xvffrnn4pzf2920xrgcpdx41ff9"; + rev = "fcfd4ec32d681745d6c1855097b30b988053fc2f"; + sha256 = "1y97fcmz8lvpj9z0cq46x6m6ac2ck8syfdgyjj62x2m1j40sv63m"; }; meta.homepage = "https://github.com/sunaku/vim-dasht/"; }; @@ -10219,12 +10279,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2022-09-17"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "c880254c0d56a9dba0bfe7bc3a5f99cd15273363"; - sha256 = "1zf2i2z2y2sdnl0yvbrhwg4j9vnz85v4ycplsqvas0kfvc2vcrka"; + rev = "2ba8af2c9682e3560db5b813d10acf3ba3415bc1"; + sha256 = "0rnyk3q6zkd6b9xi5q61jr8885mqx7xz0v7yyxb3y37lrl0wfz66"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -10724,12 +10784,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2023-01-11"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "da80f3877896adcf77f59fb0bf74e9601615d372"; - sha256 = "129r4jrdffy18yklk18gbplgxf7dkngda8cgssf9xfawizyg739v"; + rev = "d6ca7f77eeaf61b3e6ce9f0e5a978d606df44298"; + sha256 = "02sgnp9yr0bdg8r5w24cxdvy01vw2whkh0fx11d9vfg0gqshi2hh"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -10808,12 +10868,12 @@ final: prev: vim-jack-in = buildVimPluginFrom2Nix { pname = "vim-jack-in"; - version = "2022-04-03"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "clojure-vim"; repo = "vim-jack-in"; - rev = "5467e00e26f15680b0a7998f8aa20d5a7dd44cd5"; - sha256 = "1wi379l8d793v6hjx11v0dhgdn8a9ihx64gv51v9wpmjlvp9xbzd"; + rev = "c7f73e6788b5a97ac700f6c1fe09c26ebfa324d0"; + sha256 = "1f95877cgv9mvln6v78sgccwdfgvbaga9wbyckxw8rrbnrikwxam"; }; meta.homepage = "https://github.com/clojure-vim/vim-jack-in/"; }; @@ -11109,12 +11169,12 @@ final: prev: vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2022-05-11"; + version = "2023-01-27"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "244a92ceae63b8c23a74022eaf205b431745fcb6"; - sha256 = "1y56xh4k7zqagsnw86lkm747l1x4i5l95r0jks4j35d1fcmpq81i"; + rev = "6cc9f9ffaaf44b45bd5268f8a541363619bf1b13"; + sha256 = "05j14v41jrjm4p1kbqxgx3n54isv4y93w2iy679jyggrrdzi5m71"; }; meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; @@ -11157,12 +11217,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2023-01-15"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "3244bed52220bee01515eb6dbc7da29a66998fec"; - sha256 = "0rh5pz0m4nbhx8dw2nqvswyapyh9s8racwlqxgykaxlni89m1g23"; + rev = "25337623cf11e2ac9c73dcba1a48b86fe103d887"; + sha256 = "020c8m76yp0ddwln4iajy231ifia2bxvly0b4ibfn5sgnqqf2cxm"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -11578,12 +11638,12 @@ final: prev: vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2022-12-15"; + version = "2023-01-24"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "8d30ed73ce7583b31224ab206ec158f547dd25db"; - sha256 = "041wv3n3w1bfabgwpswwvpc4rsnmib3520cv7rkrvw7dqpywk7dn"; + rev = "4c907ef607810662c42795098d42f23a224fe6e7"; + sha256 = "1355c0kf6g0v0q6sb5xnl8rssm4hjkpkjqwbi9yb0r9sj8z7zx96"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -11962,14 +12022,14 @@ final: prev: vim-prisma = buildVimPluginFrom2Nix { pname = "vim-prisma"; - version = "2020-04-04"; + version = "2023-01-24"; src = fetchFromGitHub { - owner = "pantharshit00"; + owner = "prisma"; repo = "vim-prisma"; - rev = "e91ac5011232e1bd8ea53204db8d01203d5d0f3c"; - sha256 = "0pc203n70g1b0qfvrnfi5sxg2vr9zfw274s9lpgpxmribknpxi86"; + rev = "95c5b25066efb34c75bce78698baa371fe0ee7c2"; + sha256 = "046lpazz44f6b1lcvklaq1jl0sbyiklj6kcv580rrff89511nzsy"; }; - meta.homepage = "https://github.com/pantharshit00/vim-prisma/"; + meta.homepage = "https://github.com/prisma/vim-prisma/"; }; vim-projectionist = buildVimPluginFrom2Nix { @@ -12502,12 +12562,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2023-01-14"; + version = "2023-01-28"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "1049d2425b6d270621b48e110de37d5467a2a621"; - sha256 = "083h0dzi60p9hv2g9daydalrrpzngbw0lgyapbn1xzh3idb0hqhx"; + rev = "8f9eead6c4dfdfee9052d4ea667c1c9d8a396f80"; + sha256 = "1zpffb0f8scgsmpv0y4pbnlp09kv0lgmrn9ss8h53byrqsa14rif"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -12574,12 +12634,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-12-12"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "cb4c112b9e0f224236ee4eab6bf5153406b3f88b"; - sha256 = "1n1m27vvqcik4c9f80d0blqggyh29s8h20jn3v7gy1fx94bi2n2w"; + rev = "6580cf539c33a212f4f5542068a3b4dd2b3ad834"; + sha256 = "1977l3k7crzrr1cc80afnz7cs6bz2y16qn02gz56marc0pn215mx"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -12755,12 +12815,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2023-01-10"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "ca2502545a8c563e15f556d0eb8a59e0f74d2864"; - sha256 = "1ijfdhnsr3dlp5bw3xarp2nxkavab59lnk563gvjcw74889alip9"; + rev = "048f15403d9edfa513a50fafd7b107306c5512e4"; + sha256 = "07vjls2cgrnrqb84vc3g00rc3c65xpvrnxyzwjm1kaprzw70wwmm"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -12875,12 +12935,12 @@ final: prev: vim-tmux-clipboard = buildVimPluginFrom2Nix { pname = "vim-tmux-clipboard"; - version = "2019-04-07"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "roxma"; repo = "vim-tmux-clipboard"; - rev = "47187740b88f9dab213f44678800cc797223808e"; - sha256 = "1a7rpbvb7dgjfnrh95zg2ia6iiz2mz2xps31msb8h14hcj6dsv6y"; + rev = "e1be6608410c260479dc4807ad8c103faf5460d8"; + sha256 = "07a8jj1j8422a8grvp440qbrxmzchqxc3mgmpa7hsyqlkw5fjkj8"; }; meta.homepage = "https://github.com/roxma/vim-tmux-clipboard/"; }; @@ -12935,12 +12995,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2023-01-01"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "86f37afec5cefd75baaebf8900889dabb9789a2c"; - sha256 = "133vfipflvalyp373lmqza5p8dhh2qnnvlh5y2bsxh5abjk1jml1"; + rev = "6be01c509779b1c8a3d1747677a9203419bd11c2"; + sha256 = "17ifpbrcyfs8szdsk3j59916lsbal72mysk4ksgpw0q1paqzk75s"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -13151,12 +13211,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2023-01-10"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "b487cccc0e920e4fdf84f72d2fc1c86ef8dc3bdc"; - sha256 = "13741pp29f2pqr44sslh9fl49aw7a19l3ff78k1qm4i97ms4r0xc"; + rev = "b67957731086466ed5d967cd1dac7f6981603156"; + sha256 = "0s35cx7yxx6rc7qs88c4j0109y7b9lgwd15p0a33pwbwj0h3x6ap"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -13451,12 +13511,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2023-01-04"; + version = "2023-01-31"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "475d75a32e368dbfc700b580b16b351face72129"; - sha256 = "10r0n4dz8r4jbv9j583r77pp25q4yb4zd5gbrb8svxr873fja33n"; + rev = "ecf0c51b07ffedeca054581623bdda0d458e39d2"; + sha256 = "0xvpfsbglr65zjs26slwms9n8ibjy4s93vny2p5s2q5f5mgnlsd7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -13464,12 +13524,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2023-01-19"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c77ec4e15768ffcb97a96d1bf2df1ef58e94acdd"; - sha256 = "0cdc8qs1jyzxphqs11nwib0xxv4lsaiqi7w580jhg7an7w484kn0"; + rev = "b8607084b324ab0c98892ca20f78433904aecef5"; + sha256 = "15n8mfiq8mxcjlp13mv17prdfc59cd2kqjsbk7wg89khhbg81sq3"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -13572,12 +13632,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key.nvim"; - version = "2023-01-12"; + version = "2023-01-23"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "e4fa445065a2bb0bbc3cca85346b67817f28e83e"; - sha256 = "1gj1qkq1zxn9by6zxwg46rplpks51wvv3pmdjh8qr0ldkxk9yavy"; + rev = "684e96c5e8477f1ee9b3f2e9a12d802fd12c5531"; + sha256 = "0kdmv1jkkfcrhrvc6mcdy173cx39mwq5nwq3yni46zgcn5iyxiq3"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -13753,24 +13813,24 @@ final: prev: zen-mode-nvim = buildVimPluginFrom2Nix { pname = "zen-mode.nvim"; - version = "2023-01-04"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "folke"; repo = "zen-mode.nvim"; - rev = "4313a5828e4d48c5f2f135f29d46f769a59dcfdc"; - sha256 = "05wn6p90ymwg0y3941c6v7zpxhkd2zn4xqg2qvvl4wyyhn4rl4wp"; + rev = "136dda65769cee45119f16e4bc3d3f13a7aecb28"; + sha256 = "0bsnvcixvk2vrimbyhxblj9anhig69jwxscyd2l05pp1njpzb424"; }; meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; zenbones-nvim = buildVimPluginFrom2Nix { pname = "zenbones.nvim"; - version = "2023-01-20"; + version = "2023-01-30"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "13ed6d0493a1d5140995c4456ced54d0aa984f6a"; - sha256 = "1k894mxc7v4fp5zr80wbfk18zd5shcfik0j7mv1cs8c950xmahjl"; + rev = "910b8c240c6aaf5263db038db81c538602c766c3"; + sha256 = "1r84wgz4p9zvpnz247xk0svq6r92ir3pgdlsbzf73qjwgph94q7k"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -13849,36 +13909,36 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-01-19"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "e1fc2c3ade0d8872665d7570c493bbd5e11919c7"; - sha256 = "0svhbb1860wsgms9qp03y28p5v2iz9kw5n7sxz5zz7a33dwcrjdk"; + rev = "8769e767f12f5bf0b7d1250ee067088e7054809a"; + sha256 = "1k57sb89abypkiwx94w0dadbg5qc73q5lfragmnvm81hhikdbf5p"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; catppuccin-vim = buildVimPluginFrom2Nix { pname = "catppuccin-vim"; - version = "2022-11-24"; + version = "2023-01-21"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "2f0affc13228f6eac363612a3cce3677fcd0b490"; - sha256 = "0702bpvmyrr5p0r3fd09szsflrvr6qnngvgdws00x4spsq03nl1p"; + rev = "cf186cffa9b3b896b03e94247ac4b56994a09e34"; + sha256 = "17di30zm743sj707z8hg95z2g7687nd1wsxyyn20xy5s3f8lnx0v"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-01-17"; + version = "2023-02-02"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "3419e7614e69be6107b6a6f4a0c4c4bff0da33e2"; - sha256 = "0hmkd8vxb13x96hkc8n3md5rkp04iri2aq2pv44slgrh26kgvw5k"; + rev = "e82eb7f40313a52f80e2e14e6d8b5d014c83b053"; + sha256 = "02p7fvbampijqbkbjfq74hjm7h1ak6p5m6w5pv9askfc4vw0mcnj"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -13921,12 +13981,12 @@ final: prev: lspsaga-nvim-original = buildVimPluginFrom2Nix { pname = "lspsaga-nvim-original"; - version = "2023-01-19"; + version = "2023-02-01"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "ca5bc84ef68f18c6dc99962791f08dbc0163dce8"; - sha256 = "17kl1cwbr92c279jbvl230q98dc7i006hnz2d8lc23xki6ym8zix"; + rev = "f514660f65983d33613bf605bfd0adf583c06a8b"; + sha256 = "1xgkwfacglm3f96mvs5q799h5vxa7a0dsik562jzi20vhgm49x9x"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 5411c58f14..a6ef2653ea 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -1,12 +1,12 @@ # generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py -{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchgit, fetchhg, fetchsvn }: +{ buildGrammar, fetchCrate, fetchFromBitbucket, fetchFromGitHub, fetchFromGitLab, fetchFromGitea, fetchFromGitiles, fetchFromRepoOrCz, fetchFromSourcehut, fetchHex, fetchPypi, fetchgit, fetchhg, fetchsvn }: { ada = buildGrammar { language = "ada"; version = "e9e2ec9"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "briot"; repo = "tree-sitter-ada"; rev = "e9e2ec9d3b6302e9b455901bec00036e29d1c121"; @@ -17,7 +17,7 @@ agda = buildGrammar { language = "agda"; version = "80ea622"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "AusCyberman"; repo = "tree-sitter-agda"; rev = "80ea622cf952a0059e168e5c92a798b2f1925652"; @@ -28,7 +28,7 @@ arduino = buildGrammar { language = "arduino"; version = "c473c09"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; rev = "c473c09f23b13d9404ec5208fad3eddea89d70f8"; @@ -39,7 +39,7 @@ astro = buildGrammar { language = "astro"; version = "a1f66bf"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "virchau13"; repo = "tree-sitter-astro"; rev = "a1f66bf72ed68b87f779bce9a52e5c6521fc867e"; @@ -50,7 +50,7 @@ awk = buildGrammar { language = "awk"; version = "e559793"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; rev = "e559793754c60c2cdf00cbb0409842d75f0a41dc"; @@ -61,7 +61,7 @@ bash = buildGrammar { language = "bash"; version = "4488aa4"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; rev = "4488aa41406547e478636a4fcfd24f5bbc3f2f74"; @@ -71,19 +71,19 @@ }; beancount = buildGrammar { language = "beancount"; - version = "4cbd1f0"; - source = fetchFromGitHub { + version = "c68ffc4"; + src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c"; - hash = "sha256-Uh9/yBYXNKBvdpqNv1kr5eREYmKy3Z/kvaSZQpUl+0U="; + rev = "c68ffc4c6c27eadd81dd56c66f03f4d202d4b2d7"; + hash = "sha256-MJDatUpXJMf3OB8KocA+kJi+mqNKRs7wraq33tCg3/c="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; bibtex = buildGrammar { language = "bibtex"; version = "ccfd77d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-bibtex"; rev = "ccfd77db0ed799b6c22c214fe9d2937f47bc8b34"; @@ -94,7 +94,7 @@ blueprint = buildGrammar { language = "blueprint"; version = "6ef91ca"; - source = fetchFromGitLab { + src = fetchFromGitLab { owner = "gabmus"; repo = "tree-sitter-blueprint"; rev = "6ef91ca8270f0112b9c6d27ecb9966c741a5d103"; @@ -105,7 +105,7 @@ c = buildGrammar { language = "c"; version = "7175a6d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; rev = "7175a6dd5fc1cee660dce6fe23f6043d75af424a"; @@ -115,30 +115,41 @@ }; c_sharp = buildGrammar { language = "c_sharp"; - version = "2574501"; - source = fetchFromGitHub { + version = "a29bac0"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "2574501b475b7ba7bc10d08dd1ff9732d3769662"; - hash = "sha256-bXwGZJ+lYTJyaD7kbQGL6hagpkgqqCsPHBiz9AOXfNc="; + rev = "a29bac0681802139710b4d3875540901504d15cb"; + hash = "sha256-TpOaxR0Do7oGjAZ8IrbXJAP6//Kt7VxhkrWEz7yNiLY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; + capnp = buildGrammar { + language = "capnp"; + version = "740c757"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-capnp"; + rev = "740c757b9585925b1ed27cef7d61ac39b7824304"; + hash = "sha256-0zCSWV3afsEIhN6XavMnn4LrLenjerhdnTfQ/EaL4aA="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-capnp"; + }; clojure = buildGrammar { language = "clojure"; - version = "50468d3"; - source = fetchFromGitHub { + version = "262d6d6"; + src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-clojure"; - rev = "50468d3dc38884caa682800343d9a1d0fda46c9b"; - hash = "sha256-JOqkgsefFp+nvRijPsd+/01w1JsXeW5cNcZNow0ZRyY="; + rev = "262d6d60f39f0f77b3dd08da8ec895bd5a044416"; + hash = "sha256-9+tMkv329FfxYzALxkr6QZBEmJJBKUDBK4RzIsNL7S0="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-clojure"; }; cmake = buildGrammar { language = "cmake"; version = "a322653"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; rev = "a32265307aa2d31941056d69e8b6633e61750b2f"; @@ -149,7 +160,7 @@ comment = buildGrammar { language = "comment"; version = "a37ca37"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-comment"; rev = "a37ca370310ac6f89b6e0ebf2b86b2219780494e"; @@ -160,7 +171,7 @@ commonlisp = buildGrammar { language = "commonlisp"; version = "c7e8149"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-commonlisp"; rev = "c7e814975ab0d0d04333d1f32391c41180c58919"; @@ -171,7 +182,7 @@ cooklang = buildGrammar { language = "cooklang"; version = "5e11341"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "addcninblue"; repo = "tree-sitter-cooklang"; rev = "5e113412aadb78955c27010daa4dbe1d202013cf"; @@ -181,19 +192,19 @@ }; cpp = buildGrammar { language = "cpp"; - version = "2d2c4ae"; - source = fetchFromGitHub { + version = "56cec4c"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1"; - hash = "sha256-BjNWSTpwytOSYw32lYFItNI4t3xw+uJUx/0htYo7aLs="; + rev = "56cec4c2eb5d6af3d2942e69e35db15ae2433740"; + hash = "sha256-CWh5p0tlBQizABjwBRN1VoxeEriOPhTy3lFZI9PjsTA="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; css = buildGrammar { language = "css"; version = "769203d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; rev = "769203d0f9abe1a9a691ac2b9fe4bb4397a73c51"; @@ -203,19 +214,19 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0091006"; - source = fetchFromGitHub { + version = "a02c214"; + src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "0091006d6498ee5647f080ef6c09e5b95e481078"; - hash = "sha256-t1wd32UE2Kz1VkIM4HfFFSDnttdCPGm1xOH9ZP+ATxc="; + rev = "a02c21408c592e6e6856eaabe4727faa97cf8d85"; + hash = "sha256-bgyisXPNZXlvPF0nRPD5LeVhvbTx0TLgnToue9IFHwI="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; d = buildGrammar { language = "d"; version = "c2fbf21"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "CyberShadow"; repo = "tree-sitter-d"; rev = "c2fbf21bd3aa45495fe13247e040ad5815250032"; @@ -227,7 +238,7 @@ dart = buildGrammar { language = "dart"; version = "53485a8"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; rev = "53485a8f301254e19c518aa20c80f1bcf7cf5c62"; @@ -238,7 +249,7 @@ devicetree = buildGrammar { language = "devicetree"; version = "ea30a05"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; rev = "ea30a05d0f0446a96d8b096ad11828ad4f8ad849"; @@ -250,7 +261,7 @@ diff = buildGrammar { language = "diff"; version = "1d63cd4"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-diff"; rev = "1d63cd49529ef3153393cf8f620718b274bba715"; @@ -261,7 +272,7 @@ dockerfile = buildGrammar { language = "dockerfile"; version = "09e316d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; rev = "09e316dba307b869831e9399b11a83bbf0f2a24b"; @@ -272,7 +283,7 @@ dot = buildGrammar { language = "dot"; version = "9ab8555"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "rydesun"; repo = "tree-sitter-dot"; rev = "9ab85550c896d8b294d9b9ca1e30698736f08cea"; @@ -283,7 +294,7 @@ ebnf = buildGrammar { language = "ebnf"; version = "ef241bc"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "RubixDev"; repo = "ebnf"; rev = "ef241bc09f2f105c35f5e4f2ccd8a522dd99071c"; @@ -295,7 +306,7 @@ eex = buildGrammar { language = "eex"; version = "f742f2f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-eex"; rev = "f742f2fe327463335e8671a87c0b9b396905d1d1"; @@ -306,7 +317,7 @@ elixir = buildGrammar { language = "elixir"; version = "b20eaa7"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; rev = "b20eaa75565243c50be5e35e253d8beb58f45d56"; @@ -317,7 +328,7 @@ elm = buildGrammar { language = "elm"; version = "28bb193"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; rev = "28bb193640d916dfaf947912c1413cebb0484841"; @@ -325,10 +336,21 @@ }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; + elsa = buildGrammar { + language = "elsa"; + version = "c83c21c"; + src = fetchFromGitHub { + owner = "glapa-grossklag"; + repo = "tree-sitter-elsa"; + rev = "c83c21c1f8f6b38dfc5bd1392de03a7b05bb78f4"; + hash = "sha256-6PnI58jxuRuluK11/6hjTI24AVq2IQcuIplhvCv10nA="; + }; + meta.homepage = "https://github.com/glapa-grossklag/tree-sitter-elsa"; + }; elvish = buildGrammar { language = "elvish"; version = "f32711e"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ckafi"; repo = "tree-sitter-elvish"; rev = "f32711e31e987fd5c2c002f3daba02f25c68672f"; @@ -339,7 +361,7 @@ embedded_template = buildGrammar { language = "embedded_template"; version = "a130858"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; rev = "a13085849cf69e2401ec44e38cffc3d73f22f3df"; @@ -349,19 +371,19 @@ }; erlang = buildGrammar { language = "erlang"; - version = "a8b8b0e"; - source = fetchFromGitHub { + version = "2422bc9"; + src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "a8b8b0e16c4f5552f5e85af3dec976a5d16af8b9"; - hash = "sha256-6eiRiTTPdMBRsxVHIHYuw0sIfRDvP4pZIEyckoo304Q="; + rev = "2422bc9373094bfa97653ac540e08759f812523c"; + hash = "sha256-DTIA3EP2RQtts6Hl6FThSxN1SwEUbRVJJig8zOUQRCo="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; fennel = buildGrammar { language = "fennel"; version = "5171959"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "travonted"; repo = "tree-sitter-fennel"; rev = "517195970428aacca60891b050aa53eabf4ba78d"; @@ -372,7 +394,7 @@ fish = buildGrammar { language = "fish"; version = "6675b56"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ram02z"; repo = "tree-sitter-fish"; rev = "6675b56266b3f615fb112205b6b83a79315309c4"; @@ -383,7 +405,7 @@ foam = buildGrammar { language = "foam"; version = "c238f4a"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "FoamScience"; repo = "tree-sitter-foam"; rev = "c238f4af9a5723a212cf1a4c9b31dd5c1d5270a2"; @@ -394,7 +416,7 @@ fortran = buildGrammar { language = "fortran"; version = "edcb337"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; rev = "edcb3374f4698aaedf24bc572f6b2f5ef0e89ac7"; @@ -405,7 +427,7 @@ fsh = buildGrammar { language = "fsh"; version = "fa33477"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "mgramigna"; repo = "tree-sitter-fsh"; rev = "fa3347712f7a59ed02ccf508284554689c6cde28"; @@ -416,7 +438,7 @@ fusion = buildGrammar { language = "fusion"; version = "19db2f4"; - source = fetchFromGitLab { + src = fetchFromGitLab { owner = "jirgn"; repo = "tree-sitter-fusion"; rev = "19db2f47ba4c3a0f6238d4ae0e2abfca16e61dd6"; @@ -427,7 +449,7 @@ gdscript = buildGrammar { language = "gdscript"; version = "a8fa839"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; rev = "a8fa839150d05baaf4d5a472520ee71e9b1d8b3c"; @@ -438,7 +460,7 @@ git_rebase = buildGrammar { language = "git_rebase"; version = "127f5b5"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; rev = "127f5b56c1ad3e8a449a7d6e0c7412ead7f7724c"; @@ -449,7 +471,7 @@ gitattributes = buildGrammar { language = "gitattributes"; version = "577a075"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gitattributes"; rev = "577a075d46ea109905c5cb6179809df88da61ce9"; @@ -459,19 +481,19 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "190d288"; - source = fetchFromGitHub { + version = "f71b93f"; + src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "190d288a1746bddb4abe96b597fb7d17b76e5522"; - hash = "sha256-PPdwdUfJ+2TCxVdEvexxGSBMDZmI1GW7eSfc/X3Me7Y="; + rev = "f71b93f399c9c2b315825827c95466e7405ec622"; + hash = "sha256-489Rbi75XbW/IuFLijFThsI+BNXqVY1tVALwMT6yie0="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; gitignore = buildGrammar { language = "gitignore"; version = "f4685bf"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "shunsambongi"; repo = "tree-sitter-gitignore"; rev = "f4685bf11ac466dd278449bcfe5fd014e94aa504"; @@ -483,7 +505,7 @@ gleam = buildGrammar { language = "gleam"; version = "cfcbca3"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "J3RN"; repo = "tree-sitter-gleam"; rev = "cfcbca3f8f734773878e00d7bfcedea98eb10be2"; @@ -494,7 +516,7 @@ glimmer = buildGrammar { language = "glimmer"; version = "c0bfd26"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "alexlafroscia"; repo = "tree-sitter-glimmer"; rev = "c0bfd260cdcbe2976f4633547c218f09f7222a89"; @@ -505,7 +527,7 @@ glsl = buildGrammar { language = "glsl"; version = "e2c2214"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; rev = "e2c2214045de2628b81089b1a739962f59654558"; @@ -516,7 +538,7 @@ go = buildGrammar { language = "go"; version = "64457ea"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; rev = "64457ea6b73ef5422ed1687178d4545c3e91334a"; @@ -527,7 +549,7 @@ godot_resource = buildGrammar { language = "godot_resource"; version = "b6ef076"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-godot-resource"; rev = "b6ef0768711086a86b3297056f9ffb5cc1d77b4a"; @@ -539,7 +561,7 @@ gomod = buildGrammar { language = "gomod"; version = "4a65743"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-go-mod"; rev = "4a65743dbc2bb3094114dd2b43da03c820aa5234"; @@ -550,7 +572,7 @@ gowork = buildGrammar { language = "gowork"; version = "949a8a4"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "omertuc"; repo = "tree-sitter-go-work"; rev = "949a8a470559543857a62102c84700d291fc984c"; @@ -561,7 +583,7 @@ graphql = buildGrammar { language = "graphql"; version = "5e66e96"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "bkegley"; repo = "tree-sitter-graphql"; rev = "5e66e961eee421786bdda8495ed1db045e06b5fe"; @@ -572,7 +594,7 @@ hack = buildGrammar { language = "hack"; version = "b7bd692"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "slackhq"; repo = "tree-sitter-hack"; rev = "b7bd6928532ada34dddb1dece4a158ab62c6e783"; @@ -583,7 +605,7 @@ haskell = buildGrammar { language = "haskell"; version = "aee3725"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; rev = "aee3725d02cf3bca5f307b35dd3a96a97e109b4e"; @@ -594,7 +616,7 @@ hcl = buildGrammar { language = "hcl"; version = "0ff887f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; rev = "0ff887f2a60a147452d52db060de6b42f42f1441"; @@ -605,7 +627,7 @@ heex = buildGrammar { language = "heex"; version = "2e1348c"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-heex"; rev = "2e1348c3cf2c9323e87c2744796cf3f3868aa82a"; @@ -616,7 +638,7 @@ help = buildGrammar { language = "help"; version = "9dee68e"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; rev = "9dee68e3912d16e9878b06e3cd87e21ada3d9029"; @@ -627,7 +649,7 @@ hjson = buildGrammar { language = "hjson"; version = "02fa3b7"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "winston0410"; repo = "tree-sitter-hjson"; rev = "02fa3b79b3ff9a296066da6277adfc3f26cbc9e0"; @@ -637,19 +659,19 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "bd0d463"; - source = fetchFromGitHub { + version = "8e2f090"; + src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "bd0d463d1380816240a8cb1fd747fc0d3fed24aa"; - hash = "sha256-0Dafbn0+8N1MBRyOhiaZBo7KZqm8YpFzg/ZwT3SLq+g="; + rev = "8e2f0907e8d2e17a88a375025e70054bafdaa8b0"; + hash = "sha256-kBSigaBR6uM4E9uHI79gYlxBrN0E5i1zTW8syMPIQdI="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; hocon = buildGrammar { language = "hocon"; version = "c390f10"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "antosha417"; repo = "tree-sitter-hocon"; rev = "c390f10519ae69fdb03b3e5764f5592fb6924bcc"; @@ -660,7 +682,7 @@ html = buildGrammar { language = "html"; version = "29f53d8"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; rev = "29f53d8f4f2335e61bf6418ab8958dac3282077a"; @@ -668,10 +690,21 @@ }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; + htmldjango = buildGrammar { + language = "htmldjango"; + version = "b2dba02"; + src = fetchFromGitHub { + owner = "interdependence"; + repo = "tree-sitter-htmldjango"; + rev = "b2dba02eddab66be669022320273d0dfe1ff923d"; + hash = "sha256-FEsvr9i0Lys8CzDlm2lhdJEAQNnmqRSFjn4I+CcZYM8="; + }; + meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango"; + }; http = buildGrammar { language = "http"; version = "2c6c445"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "rest-nvim"; repo = "tree-sitter-http"; rev = "2c6c44574031263326cb1e51658bbc0c084326e7"; @@ -679,32 +712,43 @@ }; meta.homepage = "https://github.com/rest-nvim/tree-sitter-http"; }; + ini = buildGrammar { + language = "ini"; + version = "1a0ce07"; + src = fetchFromGitHub { + owner = "justinmk"; + repo = "tree-sitter-ini"; + rev = "1a0ce072ebf3afac7d5603d9a95bb7c9a6709b44"; + hash = "sha256-pPtKokpTgjoNzPW4dRkOnyzBBJFeJj3+CW3LbHSKsmU="; + }; + meta.homepage = "https://github.com/justinmk/tree-sitter-ini"; + }; java = buildGrammar { language = "java"; - version = "09d650d"; - source = fetchFromGitHub { + version = "dd597f1"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e"; - hash = "sha256-tGBi6gJJIPpp6oOwmAQdqBD6eaJRBRcYbWtm1BHsgBA="; + rev = "dd597f13eb9bab0c1bccc9aec390e8e6ebf9e0a6"; + hash = "sha256-JeQZ4TMpt6Lfbcfc6m/PzhFZEgTdouasJ3b1sPISy2s="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "7a29d06"; - source = fetchFromGitHub { + version = "15e85e8"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "7a29d06274b7cf87d643212a433d970b73969016"; - hash = "sha256-fMPCHdfHHyg7yNi9LDA35z+WFfPRbctrh38dZV5qZt4="; + rev = "15e85e80b851983fab6b12dce5a535f5a0df0f9c"; + hash = "sha256-2SAJBnY8pmynGqB8OVqHeeAKovskO+C/XiJbLTKSlcM="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; jq = buildGrammar { language = "jq"; version = "13990f5"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "flurie"; repo = "tree-sitter-jq"; rev = "13990f530e8e6709b7978503da9bc8701d366791"; @@ -715,7 +759,7 @@ jsdoc = buildGrammar { language = "jsdoc"; version = "189a6a4"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-jsdoc"; rev = "189a6a4829beb9cdbe837260653b4a3dfb0cc3db"; @@ -726,7 +770,7 @@ json = buildGrammar { language = "json"; version = "7307675"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; rev = "73076754005a460947cafe8e03a8cf5fa4fa2938"; @@ -737,7 +781,7 @@ json5 = buildGrammar { language = "json5"; version = "5dd5cdc"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Joakker"; repo = "tree-sitter-json5"; rev = "5dd5cdc418d9659682556b6adca2dd9ace0ac6d2"; @@ -748,7 +792,7 @@ jsonc = buildGrammar { language = "jsonc"; version = "02b0165"; - source = fetchFromGitLab { + src = fetchFromGitLab { owner = "WhyNotHugo"; repo = "tree-sitter-jsonc"; rev = "02b01653c8a1c198ae7287d566efa86a135b30d5"; @@ -759,7 +803,7 @@ jsonnet = buildGrammar { language = "jsonnet"; version = "505f5bd"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "sourcegraph"; repo = "tree-sitter-jsonnet"; rev = "505f5bd90053ae895aa3d6f2bac8071dd9abd8b2"; @@ -769,30 +813,41 @@ }; julia = buildGrammar { language = "julia"; - version = "0412178"; - source = fetchFromGitHub { + version = "9d36818"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "041217800bf423099015e1654c9a4fdd75310bb1"; - hash = "sha256-DwRU4yqnMFqMIh4mAo9a57SRXhOLTnWKjO6zSaczUNU="; + rev = "9d368185be7e8139f2eda93d8b0acc2a54031718"; + hash = "sha256-6jKiqDo8fSHrUGFIizNSKWoB0CVXJv6b3XfN9YjNLJc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; + kdl = buildGrammar { + language = "kdl"; + version = "f83f394"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-kdl"; + rev = "f83f3943568c7e7b4f5e0de1b04d722223bd4d80"; + hash = "sha256-BakY6V4A2N/ZZCkyr7KU04/DWeGTAkkJua5TyZ6uNW4="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-kdl"; + }; kotlin = buildGrammar { language = "kotlin"; - version = "b953dbd"; - source = fetchFromGitHub { + version = "e463703"; + src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "b953dbdd05257fcb2b64bc4d9c1578fac12e3c28"; - hash = "sha256-xTbRn7bDN6FR9UOzw43RVHIahI/DFjwLGQj3cYoPurY="; + rev = "e4637037a5fe6f25fe66c305669faa0855f35692"; + hash = "sha256-Xoj9RJqtyNtwag5tXRfu5iJpTnajRk1g7ClflBbFZyI="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; lalrpop = buildGrammar { language = "lalrpop"; version = "7744b56"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "traxys"; repo = "tree-sitter-lalrpop"; rev = "7744b56f03ac1e5643fad23c9dd90837fe97291e"; @@ -803,7 +858,7 @@ latex = buildGrammar { language = "latex"; version = "6b7ea83"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; rev = "6b7ea839307670e6bda011f888717d3a882ecc09"; @@ -814,7 +869,7 @@ ledger = buildGrammar { language = "ledger"; version = "47b8971"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "cbarrete"; repo = "tree-sitter-ledger"; rev = "47b8971448ce5e9abac865f450c1b14fb3b6eee9"; @@ -825,7 +880,7 @@ llvm = buildGrammar { language = "llvm"; version = "e9948ed"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "benwilliamgraham"; repo = "tree-sitter-llvm"; rev = "e9948edc41e9e5869af99dddb2b5ff5cc5581af6"; @@ -836,7 +891,7 @@ lua = buildGrammar { language = "lua"; version = "0fc8996"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "MunifTanjim"; repo = "tree-sitter-lua"; rev = "0fc89962b7ff5c7d676b8592c1cbce1ceaa806fd"; @@ -847,7 +902,7 @@ m68k = buildGrammar { language = "m68k"; version = "d097b12"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "grahambates"; repo = "tree-sitter-m68k"; rev = "d097b123f19c6eaba2bf181c05420d88b9fc489d"; @@ -858,7 +913,7 @@ make = buildGrammar { language = "make"; version = "a4b9187"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "alemuller"; repo = "tree-sitter-make"; rev = "a4b9187417d6be349ee5fd4b6e77b4172c6827dd"; @@ -868,24 +923,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "16d0b5e"; - source = fetchFromGitHub { + version = "63cda48"; + src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "16d0b5e54d781150bea1070ffb360d47e6238659"; - hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k="; + rev = "63cda483a37c91eae817f33bc55680f228845566"; + hash = "sha256-1GJsg9R5fDWbbeLWVjLG0vQ2FCg0qiG3NRNEFZm3lqg="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "16d0b5e"; - source = fetchFromGitHub { + version = "63cda48"; + src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "16d0b5e54d781150bea1070ffb360d47e6238659"; - hash = "sha256-Nz9vEOV9yz3Vk8TM41clp6isViHNiko9T9mEq4NA76k="; + rev = "63cda483a37c91eae817f33bc55680f228845566"; + hash = "sha256-1GJsg9R5fDWbbeLWVjLG0vQ2FCg0qiG3NRNEFZm3lqg="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -893,7 +948,7 @@ menhir = buildGrammar { language = "menhir"; version = "db7953a"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Kerl13"; repo = "tree-sitter-menhir"; rev = "db7953acb0d5551f207373c81fa07a57d7b085cb"; @@ -904,7 +959,7 @@ mermaid = buildGrammar { language = "mermaid"; version = "d787c66"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "monaqa"; repo = "tree-sitter-mermaid"; rev = "d787c66276e7e95899230539f556e8b83ee16f6d"; @@ -915,7 +970,7 @@ meson = buildGrammar { language = "meson"; version = "5f3138d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; rev = "5f3138d555aceef976ec9a1d4a3f78e13b31e45f"; @@ -925,19 +980,19 @@ }; nickel = buildGrammar { language = "nickel"; - version = "092e901"; - source = fetchFromGitHub { + version = "d6c7eeb"; + src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "092e90142667482996880044d2c04837d3d1c266"; - hash = "sha256-y0Lx6HdkoC7rOzm8fOfLBUt6672qe7AHe1SI6YY/aHE="; + rev = "d6c7eeb751038f934b5b1aa7ff236376d0235c56"; + hash = "sha256-D/RRwXsWyHMxoU7Z8VVJ6jn7zUFKaKusLT/ofON7sOE="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; ninja = buildGrammar { language = "ninja"; version = "0a95cfd"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "alemuller"; repo = "tree-sitter-ninja"; rev = "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267"; @@ -948,7 +1003,7 @@ nix = buildGrammar { language = "nix"; version = "6b71a81"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "cstrahan"; repo = "tree-sitter-nix"; rev = "6b71a810c0acd49b980c50fc79092561f7cee307"; @@ -959,7 +1014,7 @@ norg = buildGrammar { language = "norg"; version = "6348056"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "nvim-neorg"; repo = "tree-sitter-norg"; rev = "6348056b999f06c2c7f43bb0a5aa7cfde5302712"; @@ -970,7 +1025,7 @@ ocaml = buildGrammar { language = "ocaml"; version = "f1106bf"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; rev = "f1106bf834703f1f2f795da1a3b5f8f40174ffcc"; @@ -982,7 +1037,7 @@ ocaml_interface = buildGrammar { language = "ocaml_interface"; version = "f1106bf"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; rev = "f1106bf834703f1f2f795da1a3b5f8f40174ffcc"; @@ -994,7 +1049,7 @@ ocamllex = buildGrammar { language = "ocamllex"; version = "ac1d595"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "atom-ocaml"; repo = "tree-sitter-ocamllex"; rev = "ac1d5957e719d49bd6acd27439b79843e4daf8ed"; @@ -1006,7 +1061,7 @@ org = buildGrammar { language = "org"; version = "081179c"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "milisims"; repo = "tree-sitter-org"; rev = "081179c52b3e8175af62b9b91dc099d010c38770"; @@ -1017,7 +1072,7 @@ pascal = buildGrammar { language = "pascal"; version = "9e99540"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Isopod"; repo = "tree-sitter-pascal"; rev = "9e995404ddff8319631d72d4b46552e737206912"; @@ -1028,7 +1083,7 @@ perl = buildGrammar { language = "perl"; version = "749d26f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ganezdragon"; repo = "tree-sitter-perl"; rev = "749d26fe13fb131b92e6515416096e572575b981"; @@ -1038,19 +1093,19 @@ }; php = buildGrammar { language = "php"; - version = "47dd353"; - source = fetchFromGitHub { + version = "973694f"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "47dd3532df8204a444dd6eb042135f1e7964f9cb"; - hash = "sha256-YU21aRugPfwlYuj+9xJAFD44Btopnln7QEoxANIlcLs="; + rev = "973694ffcdeebca245b7ecf0d7c4cadd4f41b3c9"; + hash = "sha256-upJ8WwosOe4Xv/H9LUFVUVThLSLS+5Htr71Lyc/ZTJo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; phpdoc = buildGrammar { language = "phpdoc"; version = "2f4d16c"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "claytonrcarter"; repo = "tree-sitter-phpdoc"; rev = "2f4d16c861b5a454b577d057f247f9902d7b47f5"; @@ -1061,7 +1116,7 @@ pioasm = buildGrammar { language = "pioasm"; version = "924aada"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "leo60228"; repo = "tree-sitter-pioasm"; rev = "924aadaf5dea2a6074d72027b064f939acf32e20"; @@ -1069,10 +1124,21 @@ }; meta.homepage = "https://github.com/leo60228/tree-sitter-pioasm"; }; + poe_filter = buildGrammar { + language = "poe_filter"; + version = "80dc101"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-poe-filter"; + rev = "80dc10195e26c72598ed1ab02cdf2d8e4c792e7b"; + hash = "sha256-KDsi8eLrTnZaD9XwyF24edmBNHre3FoTiD7RE/MpvEQ="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter"; + }; prisma = buildGrammar { language = "prisma"; version = "eca2596"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "victorhqc"; repo = "tree-sitter-prisma"; rev = "eca2596a355b1a9952b4f80f8f9caed300a272b5"; @@ -1083,7 +1149,7 @@ proto = buildGrammar { language = "proto"; version = "42d82fa"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "mitchellh"; repo = "tree-sitter-proto"; rev = "42d82fa18f8afe59b5fc0b16c207ee4f84cb185f"; @@ -1093,19 +1159,19 @@ }; pug = buildGrammar { language = "pug"; - version = "148608f"; - source = fetchFromGitHub { + version = "26f6ac8"; + src = fetchFromGitHub { owner = "zealot128"; repo = "tree-sitter-pug"; - rev = "148608f3a88708829ac4e79ff9cb1c4a618e01b7"; - hash = "sha256-wEUJdu+2deObsc54BNPdUyTAR9Eih8hGbWRrwP5bhMk="; + rev = "26f6ac805e11e19c4492089f24aa44fe71be7c1f"; + hash = "sha256-KUIjt8p4B3LrU9vRQGL9Pf3ZYMfdDrazC2kNwTpRAgg="; }; meta.homepage = "https://github.com/zealot128/tree-sitter-pug"; }; python = buildGrammar { language = "python"; version = "9e53981"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; rev = "9e53981ec31b789ee26162ea335de71f02186003"; @@ -1116,7 +1182,7 @@ ql = buildGrammar { language = "ql"; version = "bd08702"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ql"; rev = "bd087020f0d8c183080ca615d38de0ec827aeeaf"; @@ -1127,7 +1193,7 @@ qmljs = buildGrammar { language = "qmljs"; version = "ab75be9"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; rev = "ab75be9750e6f2f804638824d1790034286a830c"; @@ -1138,7 +1204,7 @@ query = buildGrammar { language = "query"; version = "0717de0"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; rev = "0717de07078a20a8608c98ad5f26c208949d0e15"; @@ -1149,7 +1215,7 @@ r = buildGrammar { language = "r"; version = "80efda5"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; rev = "80efda55672d1293aa738f956c7ae384ecdc31b4"; @@ -1160,7 +1226,7 @@ racket = buildGrammar { language = "racket"; version = "dc9c334"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; rev = "dc9c33451fefc2d84d226e55c828adc8a66f2e37"; @@ -1171,7 +1237,7 @@ rasi = buildGrammar { language = "rasi"; version = "5f04634"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Fymyte"; repo = "tree-sitter-rasi"; rev = "5f04634dd4e12de4574c4a3dc9d6d5d4da4a2a1b"; @@ -1182,7 +1248,7 @@ regex = buildGrammar { language = "regex"; version = "e1cfca3"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-regex"; rev = "e1cfca3c79896ff79842f057ea13e529b66af636"; @@ -1193,7 +1259,7 @@ rego = buildGrammar { language = "rego"; version = "b2667c9"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "FallenAngel97"; repo = "tree-sitter-rego"; rev = "b2667c975f07b33be3ceb83bea5cfbad88095866"; @@ -1204,7 +1270,7 @@ rnoweb = buildGrammar { language = "rnoweb"; version = "502c112"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "bamonroe"; repo = "tree-sitter-rnoweb"; rev = "502c1126dc6777f09af5bef16e72a42f75bd081e"; @@ -1215,7 +1281,7 @@ rst = buildGrammar { language = "rst"; version = "25e6328"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-rst"; rev = "25e6328872ac3a764ba8b926aea12719741103f1"; @@ -1226,7 +1292,7 @@ ruby = buildGrammar { language = "ruby"; version = "7a1921b"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; rev = "7a1921bcfd90e3a04c1ad011059087aaf0168dd4"; @@ -1237,7 +1303,7 @@ rust = buildGrammar { language = "rust"; version = "f7fb205"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; rev = "f7fb205c424b0962de59b26b931fe484e1262b35"; @@ -1247,19 +1313,19 @@ }; scala = buildGrammar { language = "scala"; - version = "f6bbf35"; - source = fetchFromGitHub { + version = "628e0aa"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "f6bbf35de41653b409ca9a3537a154f2b095ef64"; - hash = "sha256-GNGD5UIPzpRQbGCp/fcBV6laPRhU5YQGbNiaAGis0CY="; + rev = "628e0aab6c2f7d31cf3b7d730f964d4fd9b340ee"; + hash = "sha256-LbVebyhVPKobPxosLDl21NGGtNlZ5gUhJN6fGX87iak="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; scheme = buildGrammar { language = "scheme"; version = "67b90a3"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; rev = "67b90a365bebf4406af4e5a546d6336de787e135"; @@ -1270,7 +1336,7 @@ scss = buildGrammar { language = "scss"; version = "c478c68"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "serenadeai"; repo = "tree-sitter-scss"; rev = "c478c6868648eff49eb04a4df90d703dc45b312a"; @@ -1281,7 +1347,7 @@ slint = buildGrammar { language = "slint"; version = "0754752"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "jrmoulton"; repo = "tree-sitter-slint"; rev = "07547525cdf4627343dca5891f1743ae45e879bb"; @@ -1292,7 +1358,7 @@ smali = buildGrammar { language = "smali"; version = "d7f535e"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-smali"; rev = "d7f535e176c928d33b0e202dd808ac247cacf2ff"; @@ -1300,10 +1366,21 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-smali"; }; + smithy = buildGrammar { + language = "smithy"; + version = "cf8c7eb"; + src = fetchFromGitHub { + owner = "indoorvivants"; + repo = "tree-sitter-smithy"; + rev = "cf8c7eb9faf7c7049839585eac19c94af231e6a0"; + hash = "sha256-3cqT6+e0uqAtd92M55qSbza1eph8gklGlEGyO9R170w="; + }; + meta.homepage = "https://github.com/indoorvivants/tree-sitter-smithy"; + }; solidity = buildGrammar { language = "solidity"; version = "52ed088"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "YongJieYongJie"; repo = "tree-sitter-solidity"; rev = "52ed0880c0126df2f2c7693f215fe6f38e4a2e0a"; @@ -1314,7 +1391,7 @@ sparql = buildGrammar { language = "sparql"; version = "05f949d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "BonaBeavis"; repo = "tree-sitter-sparql"; rev = "05f949d3c1c15e3261473a244d3ce87777374dec"; @@ -1324,12 +1401,12 @@ }; sql = buildGrammar { language = "sql"; - version = "9d98029"; - source = fetchFromGitHub { + version = "286e10c"; + src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "9d9802991aa1d1bc00eee7713a838dab1eb4f149"; - hash = "sha256-Iy5rqNZem1r++aI7vGITzBSFGjdDLGHFOgBWqIgKZX0="; + rev = "286e10c5bc5d1703ee8f9afb351165a9a6182be1"; + hash = "sha256-sIZ6615ioSz2wzjQLxcMaXKxd17qGR6nFDMxuwOx0Z8="; }; generate = true; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; @@ -1337,7 +1414,7 @@ supercollider = buildGrammar { language = "supercollider"; version = "90c6d9f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "madskjeldgaard"; repo = "tree-sitter-supercollider"; rev = "90c6d9f777d2b8c4ce497c48b5f270a44bcf3ea0"; @@ -1348,7 +1425,7 @@ surface = buildGrammar { language = "surface"; version = "f4586b3"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-surface"; rev = "f4586b35ac8548667a9aaa4eae44456c1f43d032"; @@ -1359,7 +1436,7 @@ svelte = buildGrammar { language = "svelte"; version = "52e122a"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Himujjal"; repo = "tree-sitter-svelte"; rev = "52e122ae68b316d3aa960a0a422d3645ba717f42"; @@ -1370,7 +1447,7 @@ swift = buildGrammar { language = "swift"; version = "0fe0de5"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; rev = "0fe0de56b528cbf24a654c734ca181b48be3831d"; @@ -1382,7 +1459,7 @@ sxhkdrc = buildGrammar { language = "sxhkdrc"; version = "440d5f9"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "RaafatTurki"; repo = "tree-sitter-sxhkdrc"; rev = "440d5f913d9465c9c776a1bd92334d32febcf065"; @@ -1393,7 +1470,7 @@ t32 = buildGrammar { language = "t32"; version = "f8106fc"; - source = fetchFromGitea { + src = fetchFromGitea { domain = "codeberg.org"; owner = "xasc"; repo = "tree-sitter-t32"; @@ -1405,7 +1482,7 @@ teal = buildGrammar { language = "teal"; version = "1ae8c68"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "euclidianAce"; repo = "tree-sitter-teal"; rev = "1ae8c68e90523b26b93af56feb7868fe4214e2b2"; @@ -1417,7 +1494,7 @@ terraform = buildGrammar { language = "terraform"; version = "0ff887f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "MichaHoffmann"; repo = "tree-sitter-hcl"; rev = "0ff887f2a60a147452d52db060de6b42f42f1441"; @@ -1426,10 +1503,21 @@ location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; + thrift = buildGrammar { + language = "thrift"; + version = "634a73f"; + src = fetchFromGitHub { + owner = "duskmoon314"; + repo = "tree-sitter-thrift"; + rev = "634a73fd2c80e169f302917ba665c07ec0b6ff7b"; + hash = "sha256-pB7zd48aonYYKdvD3+35zsD76+F/lqBYveFBxBQISvA="; + }; + meta.homepage = "https://github.com/duskmoon314/tree-sitter-thrift"; + }; tiger = buildGrammar { language = "tiger"; version = "a233ebe"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ambroisie"; repo = "tree-sitter-tiger"; rev = "a233ebe360a73a92c50978e5c4e9e471bc59ff42"; @@ -1439,19 +1527,19 @@ }; tlaplus = buildGrammar { language = "tlaplus"; - version = "7c5452a"; - source = fetchFromGitHub { + version = "6fd16d8"; + src = fetchFromGitHub { owner = "tlaplus-community"; repo = "tree-sitter-tlaplus"; - rev = "7c5452a0720271a349d6174b8778e76b189bebef"; - hash = "sha256-DJIA2gvwWWqTGrC48FZiRZNt048KiQ/4sZxYSnHmlEg="; + rev = "6fd16d8469c6898317423d61738d97e2b3f5caf7"; + hash = "sha256-s5mYc/kPZ4wHhm1ZeC5WBjBfzTFnANPRAZeE8UOVE1I="; }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; todotxt = buildGrammar { language = "todotxt"; version = "0207f6a"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "arnarg"; repo = "tree-sitter-todotxt"; rev = "0207f6a4ab6aeafc4b091914d31d8235049a2578"; @@ -1462,7 +1550,7 @@ toml = buildGrammar { language = "toml"; version = "8bd2056"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ikatyang"; repo = "tree-sitter-toml"; rev = "8bd2056818b21860e3d756b5a58c4f6e05fb744e"; @@ -1472,12 +1560,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "faad909"; - source = fetchFromGitHub { + version = "5d20856"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7"; - hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0="; + rev = "5d20856f34315b068c41edaee2ac8a100081d259"; + hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -1485,7 +1573,7 @@ turtle = buildGrammar { language = "turtle"; version = "085437f"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "BonaBeavis"; repo = "tree-sitter-turtle"; rev = "085437f5cb117703b7f520dd92161140a684f092"; @@ -1496,7 +1584,7 @@ twig = buildGrammar { language = "twig"; version = "2457993"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-twig"; rev = "2457993b13a06dec2706e6a6c3d5b65bb23024b8"; @@ -1506,24 +1594,24 @@ }; typescript = buildGrammar { language = "typescript"; - version = "faad909"; - source = fetchFromGitHub { + version = "5d20856"; + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "faad9094f4061a43d4e9005439e9e85c6541ebe7"; - hash = "sha256-8W/YX2EP3brbDsURZ8YI04KqgLOK6QqXaiFikpwrTV0="; + rev = "5d20856f34315b068c41edaee2ac8a100081d259"; + hash = "sha256-cpOAtfvlffS57BrXaoa2xa9NUYw0AsHxVI8PrcpgZCQ="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; }; v = buildGrammar { language = "v"; - version = "0b03983"; - source = fetchFromGitHub { + version = "7ef1f12"; + src = fetchFromGitHub { owner = "vlang"; repo = "vls"; - rev = "0b039830a33e759f0c9ee978b47ad10b82d37349"; - hash = "sha256-sQxq/tWNN/aWD3ZmNhil45cnjzfy/2AXn2X/NhzvnKk="; + rev = "7ef1f120c1c8950c7a3e1cdffe655bdd7220321b"; + hash = "sha256-2oVvuJsvEgv8J3abkV5ezAt0YdIkNNA4psqrcr4K+jo="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/vls"; @@ -1531,7 +1619,7 @@ vala = buildGrammar { language = "vala"; version = "8f690bf"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "vala-lang"; repo = "tree-sitter-vala"; rev = "8f690bfa639f2b83d1fb938ed3dd98a7ba453e8b"; @@ -1542,7 +1630,7 @@ verilog = buildGrammar { language = "verilog"; version = "4457145"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-verilog"; rev = "4457145e795b363f072463e697dfe2f6973c9a52"; @@ -1553,7 +1641,7 @@ vhs = buildGrammar { language = "vhs"; version = "8a0df32"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; rev = "8a0df32b72a8cf8d3e3e84f16c19e9ba46d3dba5"; @@ -1564,7 +1652,7 @@ vim = buildGrammar { language = "vim"; version = "55ff1b0"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "vigoux"; repo = "tree-sitter-viml"; rev = "55ff1b080c09edeced9b748cf4c16d0b49d17fb9"; @@ -1575,7 +1663,7 @@ vue = buildGrammar { language = "vue"; version = "91fe275"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ikatyang"; repo = "tree-sitter-vue"; rev = "91fe2754796cd8fba5f229505a23fa08f3546c06"; @@ -1586,7 +1674,7 @@ wgsl = buildGrammar { language = "wgsl"; version = "40259f3"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "szebniok"; repo = "tree-sitter-wgsl"; rev = "40259f3c77ea856841a4e0c4c807705f3e4a2b65"; @@ -1597,7 +1685,7 @@ wgsl_bevy = buildGrammar { language = "wgsl_bevy"; version = "7cd38d6"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; rev = "7cd38d6895060b023353e04f7af099ec64add5d1"; @@ -1608,7 +1696,7 @@ yaml = buildGrammar { language = "yaml"; version = "0e36bed"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "ikatyang"; repo = "tree-sitter-yaml"; rev = "0e36bed171768908f331ff7dff9d956bae016efb"; @@ -1619,7 +1707,7 @@ yang = buildGrammar { language = "yang"; version = "2c0e6be"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Hubro"; repo = "tree-sitter-yang"; rev = "2c0e6be8dd4dcb961c345fa35c309ad4f5bd3502"; @@ -1630,7 +1718,7 @@ zig = buildGrammar { language = "zig"; version = "d90d38d"; - source = fetchFromGitHub { + src = fetchFromGitHub { owner = "maxxnino"; repo = "tree-sitter-zig"; rev = "d90d38d28ce8cc27bfea8b4e0c75211e9e2398ca"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 22caf6a171..bacebe9a74 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -4,7 +4,7 @@ self: super: let generatedGrammars = callPackage ./generated.nix { - buildGrammar = callPackage ../../../../../development/tools/parsing/tree-sitter/grammar.nix { }; + inherit (tree-sitter) buildGrammar; }; generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index 6963a82d46..3801009789 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -36,7 +36,7 @@ def generate_grammar(item): generated = f""" {lang} = buildGrammar {{ language = "{lang}"; version = "{rev[:7]}"; - source = """ + src = """ generated += subprocess.check_output(["nurl", url, rev, "--indent=4"], text=True) generated += ";" diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index d02431e8bf..173a9f2eb6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -68,6 +68,9 @@ # nvim-treesitter dependencies , callPackage + # sg.nvim dependencies +, darwin + # sved dependencies , glib , gobject-introspection @@ -484,10 +487,6 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); - gruvbox-nvim = super.gruvbox-nvim.overrideAttrs (old: { - dependencies = with self; [ lush-nvim ]; - }); - himalaya-vim = super.himalaya-vim.overrideAttrs (old: { postPatch = '' substituteInPlace plugin/himalaya.vim \ @@ -506,6 +505,10 @@ self: super: { }; }); + jellybeans-nvim = super.jellybeans-nvim.overrideAttrs (old: { + dependencies = with self; [ lush-nvim ]; + }); + LanguageClient-neovim = let version = "0.1.161"; @@ -744,6 +747,34 @@ self: super: { ]; }); + sg-nvim = super.sg-nvim.overrideAttrs (old: + let + sg-nvim-rust = rustPlatform.buildRustPackage { + pname = "sg-nvim-rust"; + inherit (old) version src; + + cargoHash = "sha256-nm9muH4RC92HdUiytmcW0WNyMQJcIH6dgwjUrwcqq4I="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + cargoBuildFlags = [ "--workspace" ]; + + # tests are broken + doCheck = false; + }; + in + { + dependencies = with self; [ plenary-nvim ]; + postInstall = '' + mkdir -p $out/target/debug + ln -s ${sg-nvim-rust}/{bin,lib}/* $out/target/debug + ''; + }); + skim = buildVimPluginFrom2Nix { pname = "skim"; inherit (skim) version; @@ -1052,7 +1083,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-v9RXW5RSPMotRVR/9ljBJ9VNbrLnSkU3zlEU79Xem28="; + cargoSha256 = "sha256-jpO26OXaYcWirQ5tTKIwlva7dHIfdmnruF4WdwSq0nI="; }; in '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index 2ba8c99151..1cebfd2ddc 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -305,6 +305,7 @@ https://github.com/MrcJkb/haskell-tools.nvim/,HEAD, https://github.com/neovimhaskell/haskell-vim/,, https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD, https://github.com/travitch/hasksyn/,, +https://github.com/rebelot/heirline.nvim/,, https://github.com/Yggdroot/hiPairs/,, https://git.sr.ht/~soywod/himalaya-vim,, https://github.com/mpickering/hlint-refactor-vim/,, @@ -478,6 +479,7 @@ https://github.com/jose-elias-alvarez/null-ls.nvim/,, https://github.com/nacro90/numb.nvim/,, https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,, https://github.com/catppuccin/nvim/,,catppuccin-nvim +https://github.com/AckslD/nvim-FeMaco.lua/,HEAD, https://github.com/nathanmsmith/nvim-ale-diagnostic/,, https://github.com/windwp/nvim-autopairs/,, https://github.com/RRethy/nvim-base16/,, @@ -622,6 +624,7 @@ https://github.com/megaannum/self/,, https://github.com/jaxbot/semantic-highlight.vim/,, https://github.com/numirias/semshi/,, https://github.com/junegunn/seoul256.vim/,, +https://github.com/tjdevries/sg.nvim/,HEAD, https://github.com/osyo-manga/shabadou.vim/,, https://github.com/AndrewRadev/sideways.vim/,, https://github.com/lotabout/skim.vim/,, @@ -630,6 +633,7 @@ https://github.com/kovisoft/slimv/,, https://github.com/gorkunov/smartpairs.vim/,, https://github.com/camspiers/snap/,, https://github.com/norcalli/snippets.nvim/,, +https://github.com/shaunsingh/solarized.nvim/,HEAD, https://github.com/sainnhe/sonokai/,, https://github.com/chikatoike/sourcemap.vim/,, https://github.com/liuchengxu/space-vim/,, @@ -697,6 +701,7 @@ https://github.com/nvim-telescope/telescope.nvim/,, https://github.com/luc-tielen/telescope_hoogle/,HEAD, https://github.com/axelvc/template-string.nvim/,HEAD, https://github.com/jacoborus/tender.vim/,, +https://github.com/chomosuke/term-edit.nvim/,HEAD, https://github.com/wincent/terminus/,, https://github.com/oberblastmeister/termwrapper.nvim/,, https://github.com/ternjs/tern_for_vim/,, diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index 453d1eaaab..9e4548ad0f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -546,8 +546,8 @@ let mktplcRef = { name = "markdown-mermaid"; publisher = "bierner"; - version = "1.14.2"; - sha256 = "RZyAY2d3imnLhm1mLur+wTx/quxrNWYR9PCjC+co1FE="; + version = "1.17.4"; + sha256 = "sha256-jJnALJJc8G4/0L7WMmKSZ7I+7Usmyj+WhufBdSzcEK0="; }; meta = with lib; { license = licenses.mit; @@ -624,8 +624,8 @@ let mktplcRef = { name = "catppuccin-vsc"; publisher = "catppuccin"; - version = "2.2.1"; - sha256 = "sha256-vS+hz3RxG71F5QoO4LQOgOgFh6GQ8QX/+4mMD0KC1kA="; + version = "2.5.0"; + sha256 = "sha256-+dM6MKIjzPdYoRe1DYJ08A+nHHlkTsm+I6CYmnmSRj4="; }; meta = with lib; { description = "Soothing pastel theme for VSCode"; @@ -706,6 +706,22 @@ let }; }; + colejcummins.llvm-syntax-highlighting = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "llvm-syntax-highlighting"; + publisher = "colejcummins"; + version = "0.0.3"; + sha256 = "sha256-D5zLp3ruq0F9UFT9emgOBDLr1tya2Vw52VvCc40TtV0="; + }; + meta = with lib; { + description = "Lightweight syntax highlighting for LLVM IR"; + homepage = "https://github.com/colejcummins/llvm-syntax-highlighting"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=colejcummins.llvm-syntax-highlighting"; + maintainers = with lib.maintainers; [ inclyc ]; + license = licenses.mit; + }; + }; + coolbear.systemd-unit-file = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "coolbear"; @@ -740,8 +756,13 @@ let version = "2.2.6"; sha256 = "sha256-1yZeyLrXuubhKzobWcd00F/CdU824uJDTkB6qlHkJlQ="; }; - meta = { - license = lib.licenses.mit; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; + description = "Integrates ESLint JavaScript into VS Code."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint"; + homepage = "https://github.com/Microsoft/vscode-eslint"; + license = licenses.mit; + maintainers = with maintainers; [ datafoo ]; }; }; @@ -1286,8 +1307,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.56.7152"; - sha256 = "sha256-9WEvTcVY/yMF00GJVj4h57aWhfBYTSatbw10DjjAaAM="; + version = "1.70.8099"; + sha256 = "sha256-+jlLM9UC1DZFBrtiiri4jvpuc/Rf9PcSVP8D8pmQC2s="; }; meta = with lib; { description = "GitHub Copilot uses OpenAI Codex to suggest code and entire functions in real-time right from your editor."; @@ -1330,8 +1351,8 @@ let mktplcRef = { name = "Go"; publisher = "golang"; - version = "0.33.1"; - sha256 = "0dsjxs04dchw1dbzf45ryhxsb5xhalqwy40xw6cngxkp69lhf91g"; + version = "0.37.1"; + sha256 = "sha256-xOiMVUkcgwkMjYfNzFB3Qhfg26jf5nssaTfw0U+sAX0="; }; meta = { license = lib.licenses.mit; @@ -1483,8 +1504,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "9.4.4"; - sha256 = "sha256-EA3OABn80GciNecXwLcorWP7K3+jI+wgujpmvvFcNOA="; + version = "9.5.0"; + sha256 = "sha256-Av4RYnCh0gXQ+uRByl3Can+hvYD8Pc3x0Ec2jDcP6Fk="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; @@ -1499,8 +1520,8 @@ let mktplcRef = { name = "gruvbox"; publisher = "jdinhlife"; - version = "1.5.1"; - sha256 = "sha256-0ghB0E+Wa9W2bNFFiH2Q3pUJ9HV5+JfKohX4cRyevC8="; + version = "1.8.0"; + sha256 = "sha256-P4FbbcRcKWbnC86TSnzQaGn2gHWkDM9I4hj4GiHNPS4="; }; meta = with lib; { description = "Gruvbox Theme"; @@ -1769,8 +1790,8 @@ let mktplcRef = { name = "marp-vscode"; publisher = "marp-team"; - version = "1.5.0"; - sha256 = "0wqsj8rp58vl3nafkjvyw394h5j4jd7d24ra6hkvfpnlzrgv4yhs"; + version = "2.4.1"; + sha256 = "sha256-h59OmFreja9IdFzH2zZaXXh+pnODirL2fPkUmvAgDyA="; }; meta = { license = lib.licenses.mit; @@ -2559,8 +2580,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.14.0"; - sha256 = "sha256-DvcQ0wNmWqmMen7jYVP0tCDz/wdzBb56An+OaD3d4xA="; + version = "2.15.0"; + sha256 = "sha256-YfcO/01nO+92xZEJgYyLYAkqXMqfV/QDkcN9Dnjp5ZA="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -2900,12 +2921,28 @@ let }; }; + vscode-icons-team.vscode-icons = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-icons"; + publisher = "vscode-icons-team"; + version = "12.2.0"; + sha256 = "12s5br0s9n99vjn6chivzdsjb71p0lai6vnif7lv13x497dkw4rz"; + }; + meta = with lib; { + description = "Bring real icons to your Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=vscode-icons-team.vscode-icons"; + homepage = "https://github.com/vscode-icons/vscode-icons"; + license = licenses.mit; + maintainers = with maintainers; [ ggwpaiushtha ]; + }; + }; + vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.24.1"; - sha256 = "00gq6mqqwqipc6d7di2x9mmi1lya11vhkkww9563avchavczb9sv"; + version = "1.24.3"; + sha256 = "sha256-4fPoRBttWVE8Z3e4O6Yrkf04iOu9ElspQFP57HOPVAk="; }; meta = { license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix index 8aa121cbe2..f1ce06b7ca 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-vsliveshare-vsliveshare/default.nix @@ -7,8 +7,6 @@ , desktop-file-utils, xprop, xsel }: -with lib; - let # https://docs.microsoft.com/en-us/visualstudio/liveshare/reference/linux#install-prerequisites-manually libs = [ @@ -118,12 +116,12 @@ in ((vscode-utils.override { stdenv = gccStdenv; }).buildVscodeMarketplaceExtens # which will break when copying over the files. mv dotnet_modules/vsls-agent{,-wrapped} makeWrapper $PWD/dotnet_modules/vsls-agent{-wrapped,} \ - --prefix LD_LIBRARY_PATH : "${makeLibraryPath libs}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}" \ --set LD_PRELOAD $PWD/dotnet_modules/noop-syslog.so \ --set DOTNET_ROOT ${dotnet-sdk_3} ''; - meta = { + meta = with lib; { description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development"; homepage = "https://aka.ms/vsls-docs"; license = licenses.unfree; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/default.nix index f7765e6ceb..0a62a5b02d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/default.nix @@ -12,6 +12,7 @@ , curl , coreutils , gnused +, jq , nix }: @@ -19,8 +20,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2022.19.13351014"; - sha256 = "1562f4b0v76p1wfbljc5zydq7aq7k5hshxzm2v1whb77cjskiw8s"; + version = "2023.1.10091012"; + sha256 = "sha256-JosFv6ngJmw1XRILwTZMVxlGIdWFLFQjj4olfnVwAIM="; }; buildInputs = [ icu ]; @@ -29,7 +30,6 @@ vscode-utils.buildVscodeMarketplaceExtension rec { propagatedBuildInputs = with python3.pkgs; [ debugpy - isort jedi-language-server ]; @@ -57,14 +57,16 @@ vscode-utils.buildVscodeMarketplaceExtension rec { curl coreutils gnused + jq nix ]} api=$(curl -s 'https://marketplace.visualstudio.com/_apis/public/gallery/extensionquery' \ -H 'accept: application/json;api-version=3.0-preview.1' \ -H 'content-type: application/json' \ - --data-raw '{"filters":[{"criteria":[{"filterType":7,"value":"${mktplcRef.publisher}.${mktplcRef.name}"}]}],"flags":512}') - version=$(echo $api | sed -n -E 's|^.*"version":"([0-9.]+)".*$|\1|p') + --data-raw '{"filters":[{"criteria":[{"filterType":7,"value":"${mktplcRef.publisher}.${mktplcRef.name}"}]}],"flags":16}') + # Find the latest version compatible with stable vscode version + version=$(echo $api | jq -r '.results[0].extensions[0].versions | map(select(has("properties"))) | map(select(.properties | map(select(.key == "Microsoft.VisualStudio.Code.Engine")) | .[0].value | test("\\^[0-9.]+$"))) | .[0].version') if [[ $version != ${mktplcRef.version} ]]; then tmp=$(mktemp) diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 6559bc370b..eff075c493 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -19,13 +19,14 @@ let dontPatchELF ? true, dontStrip ? true, nativeBuildInputs ? [], + passthru ? { }, ... }: stdenv.mkDerivation ((removeAttrs a [ "vscodeExtUniqueId" ]) // { name = "vscode-extension-${name}"; - passthru = { + passthru = passthru // { inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/your-editor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/your-editor/default.nix index 094274aa7b..09bc179381 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/your-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1403"; + version = "1503"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-hG0ZRAxWOdFtDgKcDysu89LOdULZmJHLi7grfVjAbwM="; + sha256 = "sha256-tRS01z2SnWTDDUfQxZTWiagQuIULDA4aQ8390ZFBqn0="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix index 404ece153b..12c13bb9ae 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix @@ -5,8 +5,15 @@ , gitUpdater , cmake , python3 +, withDynarec ? stdenv.hostPlatform.isAarch64 +, runCommand +, hello-x86_64 +, box64 }: +# Currently only supported on ARM +assert withDynarec -> stdenv.hostPlatform.isAarch64; + stdenv.mkDerivation rec { pname = "box64"; version = "0.2.0"; @@ -33,49 +40,57 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DNOGIT=1" - ] ++ ( - if stdenv.hostPlatform.system == "aarch64-linux" then - [ - "-DARM_DYNAREC=ON" - ] - else [ - "-DLD80BITS=1" - "-DNOALIGN=1" - ] - ); + "-DNOGIT=ON" + "-DARM_DYNAREC=${if withDynarec then "ON" else "OFF"}" + "-DRV64=${if stdenv.hostPlatform.isRiscV64 then "ON" else "OFF"}" + "-DPPC64LE=${if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then "ON" else "OFF"}" + ] ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + "-DLD80BITS=ON" + "-DNOALIGN=ON" + ]; installPhase = '' runHook preInstall + install -Dm 0755 box64 "$out/bin/box64" + runHook postInstall ''; doCheck = true; - checkPhase = '' - runHook preCheck - ctest - runHook postCheck - ''; - doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck + + echo Checking if it works $out/bin/box64 -v + + echo Checking if Dynarec option was respected + $out/bin/box64 -v | grep ${lib.optionalString (!withDynarec) "-v"} Dynarec + runHook postInstallCheck ''; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; + passthru = { + updateScript = gitUpdater { + rev-prefix = "v"; + }; + tests.hello = runCommand "box64-test-hello" { + nativeBuildInputs = [ box64 hello-x86_64 ]; + } '' + # There is no actual "Hello, world!" with any of the logging enabled, and with all logging disabled it's hard to + # tell what problems the emulator has run into. + BOX64_NOBANNER=0 BOX64_LOG=1 box64 ${hello-x86_64}/bin/hello --version | tee $out + ''; }; meta = with lib; { homepage = "https://box86.org/"; description = "Lets you run x86_64 Linux programs on non-x86_64 Linux systems"; license = licenses.mit; - maintainers = with maintainers; [ gador ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ gador OPNA2608 ]; + platforms = [ "x86_64-linux" "aarch64-linux" "riscv64-linux" "powerpc64le-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix index d2668c473a..202d49c19a 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/craftos-pc/default.nix @@ -14,29 +14,30 @@ }: let + version = "2.7.3"; craftos2-lua = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2-lua"; - rev = "v2.6.6"; - sha256 = "cCXH1GTRqJQ57/6sWIxik366YBx/ii3nzQwx4YpEh1w="; + rev = "v${version}"; + sha256 = "sha256-lMqYfSA3sI7+glRE+eUf03uLfbf7lipmoqgt74FUaJQ="; }; craftos2-rom = fetchFromGitHub { owner = "McJack123"; repo = "craftos2-rom"; - rev = "v2.6.6"; - sha256 = "VzIqvf83k121DxuH5zgZfFS9smipDonyqqhVgj2kgYw="; + rev = "v${version}"; + sha256 = "sha256-t76Yltx7vHNoAAFvNpYLKuwFja4On6M20upmG6w3C1M="; }; in stdenv.mkDerivation rec { pname = "craftos-pc"; - version = "2.6.6"; + inherit version; src = fetchFromGitHub { owner = "MCJack123"; repo = "craftos2"; rev = "v${version}"; - sha256 = "9lpAWYFli3/OBfmu2dQxKi+/TaHaBQNpZsCURvl0h/E="; + sha256 = "sha256-a7oMLfjZUkEWPjxDDywlSW4qLhcQrCXPPY2BEOgiafU="; }; buildInputs = [ patchelf poco openssl SDL2 SDL2_mixer ncurses libpng pngpp libwebp ]; @@ -63,7 +64,7 @@ stdenv.mkDerivation rec { homepage = "https://www.craftos-pc.cc"; license = with licenses; [ mit free ]; platforms = platforms.linux; - maintainers = [ maintainers.siraben ]; + maintainers = with maintainers; [ siraben tomodachi94 ]; mainProgram = "craftos"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dgen-sdl/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dgen-sdl/default.nix index cbcdad4a3c..a501139ff4 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dgen-sdl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dgen-sdl/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://dgen.sourceforge.net/"; + homepage = "https://dgen.sourceforge.net/"; description = "Sega Genesis/Mega Drive emulator"; longDescription = '' DGen/SDL is a free, open source emulator for Sega Genesis/Mega Drive diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/master.nix b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/master.nix index 17a3049ea4..7f68b58214 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/master.nix @@ -23,6 +23,7 @@ , mbedtls_2 , soundtouch , sfml +, minizip-ng , xz , hidapi , fmt_8 @@ -52,13 +53,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-17269"; + version = "5.0-17995"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "48c9c224cf9f82f0f9f2690b7cc6283d7448480c"; - sha256 = "sha256-WC3jukRygZigLx987CzRmOmJ7DeS1atXrMzU98sRzEg="; + rev = "8bad821019721b9b72701b495da95656ace5fea5"; + sha256 = "sha256-uxHzn+tXRBr11OPpZ4ELBw7DTJH4mnqUBOeyPlXNAh8="; fetchSubmodules = true; }; @@ -93,6 +94,7 @@ stdenv.mkDerivation rec { mbedtls_2 soundtouch sfml + minizip-ng xz qtbase fmt_8 @@ -131,12 +133,17 @@ stdenv.mkDerivation rec { ]; qtWrapperArgs = lib.optionals stdenv.isLinux [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [vulkan-loader]}" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" # https://bugs.dolphin-emu.org/issues/11807 # The .desktop file should already set this, but Dolphin may be launched in other ways "--set QT_QPA_PLATFORM xcb" + # https://bugs.dolphin-emu.org/issues/12913 + "--set QT_XCB_NO_XI2 1" ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + # Use nix-provided libraries instead of submodules postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ @@ -183,5 +190,7 @@ stdenv.mkDerivation rec { xfix ivar ]; + # Requires both LLVM and SDK bump + broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/fuse-emulator/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/fuse-emulator/default.nix index 35e28ba55f..91aec6d52e 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/fuse-emulator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/fuse-emulator/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://fuse-emulator.sourceforge.net/"; + homepage = "https://fuse-emulator.sourceforge.net/"; description = "ZX Spectrum emulator"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix index d1573ba596..06ef3d9908 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/melonDS/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}" ]; meta = with lib; { - homepage = "http://melonds.kuribo64.net/"; + homepage = "https://melonds.kuribo64.net/"; description = "Work in progress Nintendo DS emulator"; license = licenses.gpl3Plus; maintainers = with maintainers; [ artemist benley shamilton xfix ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix index b300dc0826..a2664e1264 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix @@ -12,89 +12,92 @@ , makeWrapper , pkg-config , python3 -, qtbase ? null -, qtmultimedia ? null +, qtbase +, qtmultimedia , snappy , vulkan-loader , wayland -, wrapQtAppsHook ? null +, wrapQtAppsHook , zlib +, enableQt ? false , enableVulkan ? true , forceWayland ? false }: let - enableQt = (qtbase != null); - frontend = if enableQt then "Qt" else "SDL and headless"; - vulkanPath = lib.makeLibraryPath [ vulkan-loader ]; - # experimental, see https://github.com/hrydgard/ppsspp/issues/13845 vulkanWayland = enableVulkan && forceWayland; in - # Only SDL front end needs to specify whether to use Wayland - assert forceWayland -> !enableQt; - stdenv.mkDerivation (finalAttrs: { - pname = "ppsspp" - + lib.optionalString enableQt "-qt" - + lib.optionalString (!enableQt) "-sdl" - + lib.optionalString forceWayland "-wayland"; - version = "1.14.4"; +# Only SDL frontend needs to specify whether to use Wayland +assert forceWayland -> !enableQt; +stdenv.mkDerivation (self: { + pname = "ppsspp" + + lib.optionalString enableQt "-qt" + + lib.optionalString (!enableQt) "-sdl" + + lib.optionalString forceWayland "-wayland"; + version = "1.14.4"; - src = fetchFromGitHub { - owner = "hrydgard"; - repo = "ppsspp"; - rev = "v${finalAttrs.version}"; - fetchSubmodules = true; - sha256 = "sha256-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc="; - }; + src = fetchFromGitHub { + owner = "hrydgard"; + repo = "ppsspp"; + rev = "v${self.version}"; + fetchSubmodules = true; + sha256 = "sha256-7xzhN8JIQD4LZg8sQ8rLNYZrW0nCNBfZFgzoKdoWbKc="; + }; - postPatch = '' - substituteInPlace git-version.cmake --replace unknown ${finalAttrs.src.rev} - substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share - ''; + postPatch = '' + substituteInPlace git-version.cmake --replace unknown ${self.src.rev} + substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share + ''; - nativeBuildInputs = [ - cmake - copyDesktopItems - makeWrapper - pkg-config - python3 - wrapQtAppsHook - ]; + nativeBuildInputs = [ + cmake + copyDesktopItems + makeWrapper + pkg-config + python3 + ] ++ lib.optional enableQt wrapQtAppsHook; - buildInputs = [ - SDL2 - ffmpeg - (glew.override { enableEGL = forceWayland; }) - libzip - qtbase - qtmultimedia - snappy - zlib - ] ++ lib.optional enableVulkan vulkan-loader - ++ lib.optionals vulkanWayland [ wayland libffi ]; + buildInputs = [ + SDL2 + ffmpeg + (glew.override { enableEGL = forceWayland; }) + libzip + snappy + zlib + ] ++ lib.optionals enableQt [ + qtbase + qtmultimedia + ] ++ lib.optional enableVulkan vulkan-loader + ++ lib.optionals vulkanWayland [ wayland libffi ]; - cmakeFlags = [ - "-DHEADLESS=${if enableQt then "OFF" else "ON"}" - "-DOpenGL_GL_PREFERENCE=GLVND" - "-DUSE_SYSTEM_FFMPEG=ON" - "-DUSE_SYSTEM_LIBZIP=ON" - "-DUSE_SYSTEM_SNAPPY=ON" - "-DUSE_WAYLAND_WSI=${if vulkanWayland then "ON" else "OFF"}" - "-DUSING_QT_UI=${if enableQt then "ON" else "OFF"}" - ]; + cmakeFlags = [ + "-DHEADLESS=${if enableQt then "OFF" else "ON"}" + "-DOpenGL_GL_PREFERENCE=GLVND" + "-DUSE_SYSTEM_FFMPEG=ON" + "-DUSE_SYSTEM_LIBZIP=ON" + "-DUSE_SYSTEM_SNAPPY=ON" + "-DUSE_WAYLAND_WSI=${if vulkanWayland then "ON" else "OFF"}" + "-DUSING_QT_UI=${if enableQt then "ON" else "OFF"}" + ]; - desktopItems = [(makeDesktopItem { + desktopItems = [ + (makeDesktopItem { desktopName = "PPSSPP"; name = "ppsspp"; exec = "ppsspp"; icon = "ppsspp"; comment = "Play PSP games on your computer"; categories = [ "Game" "Emulator" ]; - })]; + }) + ]; - installPhase = '' + installPhase = let + vulkanPath = lib.makeLibraryPath [ vulkan-loader ]; + in + '' runHook preInstall + mkdir -p $out/share/{applications,ppsspp} '' + (if enableQt then '' install -Dm555 PPSSPPQt $out/bin/ppsspp @@ -108,14 +111,16 @@ in --prefix LD_LIBRARY_PATH : ${vulkanPath} \ '' + "\n" + '' mv assets $out/share/ppsspp + runHook postInstall ''; - meta = with lib; { - homepage = "https://www.ppsspp.org/"; - description = "A HLE Playstation Portable emulator, written in C++ (${frontend})"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; - }; - }) + meta = { + homepage = "https://www.ppsspp.org/"; + description = "A HLE Playstation Portable emulator, written in C++ (" + + (if enableQt then "Qt" else "SDL + headless") + ")"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/punes/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/punes/default.nix index b68b70c0ac..529dce5364 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/punes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/punes/default.nix @@ -1,13 +1,8 @@ -{ mkDerivation -, stdenv +{ stdenv , lib , fetchFromGitHub , fetchpatch -, nix-update-script -, qtbase -, qtsvg -, qttools -, autoreconfHook +, gitUpdater , cmake , pkg-config , ffmpeg @@ -16,41 +11,63 @@ , libX11 , libXrandr , sndio +, qtbase +, qtsvg +, qttools +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "punes"; - version = "0.109"; + version = "0.110"; src = fetchFromGitHub { owner = "punesemu"; repo = "puNES"; rev = "v${version}"; - sha256 = "sha256-6aRtR/d8nhzmpN9QKSZ62jye7qjfO+FpRMCXkX4Yubk="; + sha256 = "sha256-+hL168r40aYUjyLbWFXWk9G2srrrG1TH1gLYMliHftU="; }; - postPatch = '' - substituteInPlace configure.ac \ - --replace '`$PKG_CONFIG --variable=host_bins Qt5Core`/lrelease' '${qttools.dev}/bin/lrelease' - ''; - - nativeBuildInputs = [ autoreconfHook cmake pkg-config qttools ]; - - buildInputs = [ ffmpeg qtbase qtsvg libGLU ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib libX11 libXrandr ] - ++ lib.optionals stdenv.hostPlatform.isBSD [ sndio ]; - - dontUseCmakeConfigure = true; - - enableParallelBuilding = true; - - configureFlags = [ - "--prefix=${placeholder "out"}" - "--without-opengl-nvidia-cg" - "--with-ffmpeg" + patches = [ + # Fixes compilation on aarch64 + # Remove when version > 0.110 + (fetchpatch { + url = "https://github.com/punesemu/puNES/commit/90dd5bc90412bbd199c2716f67a24aa88b24d80f.patch"; + hash = "sha256-/KNpTds4qjwyaTUebWWPlVXfuxVh6M4zOInxUfYztJg="; + }) ]; - passthru.updateScript = nix-update-script { }; + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ + ffmpeg + libGLU + qtbase + qtsvg + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + libX11 + libXrandr + ] ++ lib.optionals stdenv.hostPlatform.isBSD [ + sndio + ]; + + cmakeFlags = [ + "-DENABLE_GIT_INFO=OFF" + "-DENABLE_RELEASE=ON" + "-DENABLE_FFMPEG=ON" + "-DENABLE_OPENGL=ON" + "-DENABLE_QT6_LIBS=${if lib.versionAtLeast qtbase.version "6.0" then "ON" else "OFF"}" + ]; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; meta = with lib; { description = "Qt-based Nintendo Entertainment System emulator and NSF/NSFe Music Player"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/rpcemu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/rpcemu/default.nix new file mode 100644 index 0000000000..9befb172fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/rpcemu/default.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchhg +, qt5 +}: + +let + inherit (qt5) qtbase qtmultimedia wrapQtAppsHook; +in +stdenv.mkDerivation (self: { + pname = "rpcemu"; + version = "0.9.4"; + + src = fetchhg { + url = "http://www.home.marutan.net/hg/rpcemu"; + rev = "release_${self.version}"; + sha256 = "sha256-UyjfTfUpSvJNFPkQWPKppxp/kO0hVGo5cE9RuCU8GJI="; + }; + + nativeBuildInputs = [ + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtmultimedia + ]; + + configurePhase = '' + runHook preConfigure + + cd src/qt5 + qmake + + runHook postConfigure + ''; + + installPhase = '' + runHook preInstall + + cd ../.. + install -Dm755 rpcemu-interpreter -t $out/bin + + runHook postInstall + ''; + + meta = { + homepage = "https://www.marutan.net/rpcemu/index.php"; + description = "Risc PC Emulator"; + longDescription = '' + RPCEmu is an emulator of classic Acorn computer systems, such as the Risc + PC and A7000. It runs on multiple platforms including Windows, Linux and + Mac OS X. + + RPCEmu should be considered Alpha Quality code. It has many known and + unknown bugs, and all files used with it should be well backed up before + using them with RPCEmu. + ''; + license = lib.licenses.gpl2Plus; + maintainers = builtins.attrValues { + inherit (lib.maintainers) AndersonTorres; + }; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix index 4d71e91a63..a97114a07a 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14568-1852b370d"; - rpcs3Version = "0.0.26-14568-1852b370d"; - rpcs3Revision = "1852b370d7a8310de092ca4132464c84192671cb"; - rpcs3Sha256 = "0yqvn5w9b4lxb43lllqch0s1sdj5v274hhbysgblbc7nilzcgsq6"; + rpcs3GitVersion = "14637-c471120a8"; + rpcs3Version = "0.0.26-14637-c471120a8"; + rpcs3Revision = "c471120a80ec6f12cd4489e1a9be073d7d9c96f2"; + rpcs3Sha256 = "1fl7zarxbjaz6mi3lqv55kdwpvjfz8d02qfl0655zihwm6zzdny5"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix index 80dc86643e..3ae67cd713 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ruffle/default.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2022-09-26"; + version = "nightly-2022-12-16"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - sha256 = "sha256-o0geKXODFRPKN4JgW+Sg16uPhBS5rrlMCmFSc9AcNPQ="; + sha256 = "sha256-VOaXn/dJB0AbuZ8owBbUYEPrL/H8DM73MhwhBjxq2Pg="; }; nativeBuildInputs = [ @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { "''${gappsWrapperArgs[@]}" ''; - cargoSha256 = "sha256-erqBuU66k7SGG9ueyYEINjeXbyC7A2I/r1bBqdsJemY="; + cargoSha256 = "sha256-h5qshincT48zYvbNLMXcvxw7Ovupnn9c93lpqY7oNtc="; meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/zsnes/2.x.nix b/third_party/nixpkgs/pkgs/applications/emulators/zsnes/2.x.nix new file mode 100644 index 0000000000..fdb4ad9fa1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/zsnes/2.x.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, SDL +, libGL +, libGLU +, libpng +, nasm +, pkg-config +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "zsnes2"; + version = "2.0.10"; + + src = fetchFromGitHub { + owner = "xyproto"; + repo = "zsnes"; + rev = finalAttrs.version; + hash = "sha256-QFPl3I2nFWMmgQRGxrlt4Vh5N4SygvBLjeFiQpgRr8o="; + }; + + nativeBuildInputs = [ + nasm + pkg-config + ]; + + buildInputs = [ + SDL + libGL + libGLU + libpng + zlib + ]; + + dontConfigure = true; + + NIX_CFLAGS_COMPILE = [ + # Until upstream fixes the issues... + "-Wp,-D_FORTIFY_SOURCE=0" + ]; + + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + postInstall = '' + install -Dm644 linux/zsnes.desktop $out/share/applications/zsnes.desktop + install -Dm644 icons/16x16x32.png $out/share/icons/hicolor/16x16/apps/zsnes.png + install -Dm644 icons/32x32x32.png $out/share/icons/hicolor/32x32/apps/zsnes.png + install -Dm644 icons/48x48x32.png $out/share/icons/hicolor/48x48/apps/zsnes.png + install -Dm644 icons/64x64x32.png $out/share/icons/hicolor/64x64/apps/zsnes.png + ''; + + meta = { + homepage = "https://github.com/xyproto/zsnes"; + description = "A maintained fork of zsnes"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix index dc5f334de5..ca2839709b 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-ruZNHvHBRXRM4h0R571jvasW8rYawq4cn7Hnd9riMnk="; + hash = "sha256-S30/exZsw9Rs/l5Sml/q7dqUIcS55ZxbLFYv+M9Jr6o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix index 7f17077132..f299d9fe3f 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VKesly7Jp1PgukArNKvDGzSRh7DaL3A/Dub3dLR6ET4="; + sha256 = "sha256-KuEuWZSxh04NefkkJBYClnKs+UP7VwlyPElACjNZ5k8="; }; - cargoSha256 = "sha256-7+4SIBnu4R2mbH2nWBX9BmJL1n8t46d1vrMpNaUHAo4="; + cargoSha256 = "sha256-jYDe/3PDGCweNgHb+8i9az7J7BATlRjd3yha0nOc/gc="; nativeBuildInputs = [ pkg-config ]; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { zstd ]; - checkInputs = [ zoxide ]; + nativeCheckInputs = [ zoxide ]; buildFeatures = [ "zstd/pkg-config" ]; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix index 9204aad535..8b54d79622 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix @@ -16,7 +16,6 @@ , libssh2 , openssl , coreutils -, autoreconfHook , autoSignDarwinBinariesHook # updater only @@ -25,23 +24,14 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.28"; + version = "4.8.29"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-6ZTZvppxcumsSkrWIQeSH2qjEuZosFbf5bi867r1OAM="; + sha256 = "sha256-AdijuU9YGAzKW/FyV7UHjR/W/SeptcDpcOx2dUlUCtQ="; }; - patches = [ - # Add support for PERL_FOR_BUILD to fix cross-compilation: - # https://midnight-commander.org/ticket/4399 - (fetchurl { - url = "https://midnight-commander.org/raw-attachment/ticket/4399/0001-configure.ac-introduce-PERL_FOR_BUILD.patch"; - hash = "sha256-i4cbg/pner+yPfgmP04DEIvpNDlM9YDca1TNBdhWhwI="; - }) - ]; - - nativeBuildInputs = [ pkg-config autoreconfHook unzip ] + nativeBuildInputs = [ pkg-config unzip ] # The preFixup hook rewrites the binary, which invaliates the code # signature. Add the fixup hook to sign the output. ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix index 95f85430ba..a192edb0b3 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - checkInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; propagatedBuildInputs = [ less file diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/xfe/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/xfe/default.nix index 92b3fae315..5ac0f5e3ab 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/xfe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/xfe/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "xfe"; - version = "1.44"; + version = "1.45"; src = fetchurl { url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz"; - sha256 = "594c14d185bdfc7e3132aefda7cf4e233625258ca9a1939359944a2c07c030b6"; + sha256 = "sha256-RmvVUzqCsRRwXgC4Yabt46uFHnL0XFWncQfXDG+owDc="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix b/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix index 9ae2d97a3d..51aa407b04 100644 --- a/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix @@ -51,7 +51,7 @@ let inherit version; sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; }; - checkInputs = old.checkInputs ++ (with self; [ + nativeCheckInputs = old.nativeCheckInputs ++ (with self; [ requests ]); disabledTests = old.disabledTests ++ [ diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix index a3d3fda591..1f78d53985 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -73,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.22.14"; + version = "3.22.15"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-VT85cVeKuHQCGQokID9yrbents7ewHK1j7I17oFTvlo="; + hash = "sha256-0hly1yZ7NAcSe84XMwDlcmZPunPcNXYzvAhd0Z5rB0Q="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index 929a40d6da..18603e38ec 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -73,14 +73,14 @@ let six ]; in mkDerivation rec { - version = "3.28.2"; + version = "3.28.3"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-ndwDN/DH+Y+dc8aNa45cSIM8yQUmIWq0jx6xWsZo4rk="; + hash = "sha256-nXauZSC78BX1fcx0SXniwQpRmdSLfoqZ5jlbXeHgRGI="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix index e09de1b250..1f05f8e9fa 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -116,5 +116,25 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; license = licenses.asl20; + knownVulnerabilities = [ + "CVE-2018-16328" + "CVE-2018-16329" + "CVE-2019-13136" + "CVE-2019-17547" + "CVE-2020-25663" + "CVE-2020-27768" + "CVE-2021-3596" + "CVE-2021-3596" + "CVE-2021-3596" + "CVE-2021-3610" + "CVE-2021-20244" + "CVE-2021-20244" + "CVE-2021-20310" + "CVE-2021-20311" + "CVE-2021-20312" + "CVE-2021-20313" + "CVE-2022-0284" + "CVE-2022-2719" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/apngasm/2.nix b/third_party/nixpkgs/pkgs/applications/graphics/apngasm/2.nix index 0313115ddf..81d2915c96 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/apngasm/2.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/apngasm/2.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create highly optimized Animated PNG files from PNG/TGA images"; - homepage = "http://apngasm.sourceforge.net/"; + homepage = "https://apngasm.sourceforge.net/"; license = licenses.zlib; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/autotrace/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/autotrace/default.nix index e3b966353f..502aeddf81 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/autotrace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/autotrace/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://autotrace.sourceforge.net/"; + homepage = "https://autotrace.sourceforge.net/"; description = "Utility for converting bitmap into vector graphics"; platforms = platforms.unix; maintainers = with maintainers; [ hodapp ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix index 0e61da0041..a780fc039a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/azpainter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab -, desktop-file-utils, shared-mime-info +, desktop-file-utils, shared-mime-info, ninja, pkg-config , libiconv , libX11, libXcursor, libXext, libXi , freetype, fontconfig @@ -9,18 +9,20 @@ stdenv.mkDerivation rec { pname = "azpainter"; - version = "3.0.4"; + version = "3.0.6"; src = fetchFromGitLab { owner = "azelpg"; repo = pname; rev = "v${version}"; - hash = "sha256-2gTTF1ti9bO24d75mhwyvJISSgMKdmp+oJVmgzEQHdY="; + hash = "sha256-/shmLdZ4mCBZAeUuqJtCiUjeI8B5f/8dIGPqmXMjZ1I="; }; nativeBuildInputs = [ desktop-file-utils # for update-desktop-database shared-mime-info # for update-mime-info + ninja + pkg-config ]; buildInputs = [ @@ -30,6 +32,10 @@ stdenv.mkDerivation rec { zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + preBuild = '' + cd build + ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/comical/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/comical/default.nix index 095905ff06..00733e8a60 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/comical/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/comical/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; - homepage = "http://comical.sourceforge.net/"; + homepage = "https://comical.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ viric wegank ]; platforms = with lib.platforms; unix; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix index bb157ad18d..f63b3b1709 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/cq-editor/default.nix @@ -37,7 +37,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytest pytest-xvfb pytest-mock diff --git a/third_party/nixpkgs/pkgs/applications/graphics/djview/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/djview/default.nix index 244f0c2764..6386c39ce9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/djview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/djview/default.nix @@ -46,7 +46,7 @@ mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; description = "A portable DjVu viewer (Qt5) and browser (nsdejavu) plugin"; - homepage = "http://djvu.sourceforge.net/djview4.html"; + homepage = "https://djvu.sourceforge.net/djview4.html"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ Anton-Latukha ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/dosage/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/dosage/default.nix index e5e77dccbb..b03073349f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/dosage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/dosage/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0"; }; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook pytest-xdist responses ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index 274c7b00d6..c26b2f46e7 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "20.7.4"; + version = "20.8.10"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "sha256-gmC8s+0eef09wcLE9fBiG82rRPXijRyR1WTlp4gYPq4="; + sha256 = "118e9c9a328c92aeeda3c5925c8d8ed50d0993c07715726447ee720699958626"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix index 09d51db254..76409860ff 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawpile/default.nix @@ -25,7 +25,7 @@ # optional server deps , libmicrohttpd , libsodium -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd ? null # options diff --git a/third_party/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix index 41999239af..8b4411ad04 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix @@ -15,19 +15,19 @@ stdenv.mkDerivation rec { pname = "eyedropper"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "FineFindus"; repo = pname; rev = "v${version}"; - hash = "sha256-sDrMIryVFkjMGHbYvNDmKb1HyJNGb3Hd+muxUJKhogE="; + hash = "sha256-kc/UREQpmw3suA6bYEr9fCIwMzNMrEY9E5qf+rhKsC4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-mztc44hHdqzR3WbG6tkCL38EfgBajRLlpMC8ElpXnlo="; + hash = "sha256-/eas1PObrj9IuDIzlBVbfhEhH8eDyZ7CD871JmAqnyY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix index 70f83e9a2f..428ddc5073 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { --add-flags '--theme=feh' ''; - checkInputs = lib.singleton (perl.withPackages (p: [ p.TestCommand ])); + nativeCheckInputs = lib.singleton (perl.withPackages (p: [ p.TestCommand ])); doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix index 984d67f6ba..80e13fda92 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool to convert Xfig files to other formats"; - homepage = "http://mcj.sourceforge.net/"; + homepage = "https://mcj.sourceforge.net/"; license = licenses.xfig; platforms = platforms.unix; maintainers = with maintainers; [ lesuisse ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fluxus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fluxus/default.nix index 535b177bd7..971ce42c03 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fluxus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fluxus/default.nix @@ -22,26 +22,6 @@ , zlib }: let - libs = [ - alsa-lib - bzip2 - fftw - freeglut - freetype - glew - libjack2 - libGL - libGLU - libjpeg - liblo - libpng - libsndfile - libtiff - ode - openal - openssl - zlib - ]; racket = racket_7_9; in stdenv.mkDerivation rec { @@ -77,7 +57,6 @@ stdenv.mkDerivation rec { "RacketPrefix=${racket}" "RacketInclude=${racket}/include/racket" "RacketLib=${racket}/lib/racket" - "LIBPATH=${lib.makeLibraryPath libs}" "DESTDIR=build" ]; configurePhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fluxus/fix-build.patch b/third_party/nixpkgs/pkgs/applications/graphics/fluxus/fix-build.patch index b19ed9c2cb..b44327520e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fluxus/fix-build.patch +++ b/third_party/nixpkgs/pkgs/applications/graphics/fluxus/fix-build.patch @@ -1,5 +1,10 @@ -diff --git a/SConstruct b/SConstruct -index 32cb644..650333a 100644 +scons does not use os environment by default: + https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html + +nixpkgs' cc-wrapper on the other hand relies on various NIX_* variables +to be passed through like NIX_CFLAGS_COMPILE_BEFORE. + +While at it ported to python3-style print(). --- a/SConstruct +++ b/SConstruct @@ -6,7 +6,7 @@ @@ -11,16 +16,15 @@ index 32cb644..650333a 100644 MajorVersion = "0" MinorVersion = "19" -@@ -225,13 +225,18 @@ if env['PLATFORM'] == 'posix': - ["asound", "alsa/asoundlib.h"], - ["openal", "AL/al.h"]] +@@ -100,6 +100,7 @@ IncludePaths = [ + paranoid = ' -W -Wcast-qual -Wwrite-strings -Wcast-align -Wpointer-arith -Wconversion -Wredundant-decls -Wunreachable-code -Winline -Wlarger-than-256' -+env.Append(ENV={'PATH': ' ' + os.environ['PATH'], }) -+env.Append(LIBPATH=ARGUMENTS.get('LIBPATH', '').split(':')) -+env.Append(CCFLAGS=' ' + os.environ.get('NIX_CFLAGS_COMPILE','')) -+env.Append(CCFLAGS=' -DNULL=0') -+ - ################################################################################ + env = Environment(CCFLAGS = '-ggdb -pipe -Wall -O3 -ffast-math -Wno-unused -fPIC -pthread', ++ ENV = os.environ, + VERSION_NUM = FluxusVersion) + env.MergeFlags(ARGUMENTS.get('CCFLAGS', '').split()) + env.MergeFlags(ARGUMENTS.get('LDFLAGS', '').split()) +@@ -229,9 +230,9 @@ if env['PLATFORM'] == 'posix': # Make sure we have these libraries availible if not GetOption('clean'): @@ -33,7 +37,7 @@ index 32cb644..650333a 100644 # detect ode precision if not GetOption('clean'): try: -@@ -240,27 +245,27 @@ if not GetOption('clean'): +@@ -240,27 +241,27 @@ if not GetOption('clean'): if isinstance(ode_str[0], str): env.MergeFlags(ode_str[0]) except: @@ -65,7 +69,7 @@ index 32cb644..650333a 100644 Exit(1) if not conf.CheckFunc("dInitODE2"): -@@ -334,7 +339,7 @@ if not GetOption('clean'): +@@ -334,7 +335,7 @@ if not GetOption('clean'): ]) if raco_status != 0: @@ -74,7 +78,7 @@ index 32cb644..650333a 100644 Exit(1) -@@ -377,8 +382,8 @@ if not GetOption('clean') and static_modules: +@@ -377,8 +378,8 @@ if not GetOption('clean') and static_modules: app_env['LIBS'].remove("pthread") app_env['LIBS'].remove("dl") @@ -85,7 +89,7 @@ index 32cb644..650333a 100644 # now go through the rest of the libs, removing them from # the environment at the same time -@@ -425,7 +430,7 @@ SConscript(dirs = build_dirs, +@@ -425,7 +426,7 @@ SConscript(dirs = build_dirs, if not GetOption('clean'): helpmap_status = subprocess.call(["racket", "makehelpmap.scm"], cwd="docs/helpmap") if helpmap_status != 0: diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix index bcc504effe..7ed9cc865d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -39,7 +39,7 @@ , soqt , spaceNavSupport ? stdenv.isLinux , swig -, vtk +, vtk_8 , wrapQtAppsHook , wrapGAppsHook , xercesc @@ -97,7 +97,7 @@ mkDerivation rec { shiboken2 soqt swig - vtk + vtk_8 xercesc zlib ] ++ lib.optionals spaceNavSupport [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freepv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/freepv/default.nix index d11798a9b2..c69c9af184 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/freepv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/freepv/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source panorama viewer using GL"; - homepage = "http://freepv.sourceforge.net/"; + homepage = "https://freepv.sourceforge.net/"; license = [ lib.licenses.lgpl21 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gcolor2/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gcolor2/default.nix index 5caa541670..61a41abac5 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gcolor2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gcolor2/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "Simple GTK 2 color selector"; - homepage = "http://gcolor2.sourceforge.net/"; + homepage = "https://gcolor2.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ notthemessiah ]; platforms = with lib.platforms; unix; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gocr/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gocr/default.nix index 21ba4c662c..36bba9eaa4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gocr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gocr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://jocr.sourceforge.net/"; + homepage = "https://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gpicview/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gpicview/default.nix index 06c3b03ae5..f19c0282b1 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gpicview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gpicview/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple and fast image viewer for X"; - homepage = "http://lxde.sourceforge.net/gpicview/"; + homepage = "https://lxde.sourceforge.net/gpicview/"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix index fc686ad1f2..9da51083c5 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gscan2pdf/default.nix @@ -89,7 +89,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" "man" ]; - checkInputs = [ + nativeCheckInputs = [ imagemagick libtiff djvulibre @@ -128,7 +128,7 @@ perlPackages.buildPerlPackage rec { meta = { description = "A GUI to produce PDFs or DjVus from scanned documents"; - homepage = "http://gscan2pdf.sourceforge.net/"; + homepage = "https://gscan2pdf.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ pacien ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index 2bce94d52d..6a31bfd028 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonPackage rec { twisted ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ nose mock httmock diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix index f78a4f6068..30a8a24e3b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/imv/default.nix @@ -11,7 +11,7 @@ , icu , pango , inih -, withWindowSystem ? "all" +, withWindowSystem ? null , xorg , libxkbcommon , libGLU @@ -27,6 +27,12 @@ }: let + # default value of withWindowSystem + withWindowSystem' = + if withWindowSystem != null then withWindowSystem + else if stdenv.isLinux then "all" + else "x11"; + windowSystems = { all = windowSystems.x11 ++ windowSystems.wayland; x11 = [ libGLU xorg.libxcb xorg.libX11 ]; @@ -47,7 +53,7 @@ let in # check that given window system is valid -assert lib.assertOneOf "withWindowSystem" withWindowSystem +assert lib.assertOneOf "withWindowSystem" withWindowSystem' (builtins.attrNames windowSystems); # check that every given backend is valid assert builtins.all @@ -56,18 +62,18 @@ assert builtins.all stdenv.mkDerivation rec { pname = "imv"; - version = "4.3.1"; + version = "4.4.0"; outputs = [ "out" "man" ]; src = fetchFromSourcehut { owner = "~exec64"; repo = "imv"; rev = "v${version}"; - sha256 = "sha256-gMAd8skst72QT4jGFH7aRdWeAd4tf/uQgXhGaM/Dpgc="; + sha256 = "sha256-LLEEbriHzZhAOQivqHqdr6g7lh4uj++ytlme8AfRjf4="; }; mesonFlags = [ - "-Dwindows=${withWindowSystem}" + "-Dwindows=${withWindowSystem'}" "-Dtest=enabled" "-Dman=enabled" ] ++ backendFlags; @@ -87,7 +93,7 @@ stdenv.mkDerivation rec { libxkbcommon pango inih - ] ++ windowSystems."${withWindowSystem}" + ] ++ windowSystems."${withWindowSystem'}" ++ builtins.map (b: backends."${b}") withBackends; postInstall = '' @@ -96,7 +102,7 @@ stdenv.mkDerivation rec { install -Dm644 ../files/imv.desktop $out/share/applications/ ''; - postFixup = lib.optionalString (withWindowSystem == "all") '' + postFixup = lib.optionalString (withWindowSystem' == "all") '' # The `bin/imv` script assumes imv-wayland or imv-x11 in PATH, # so we have to fix those to the binaries we installed into the /nix/store @@ -109,9 +115,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command line image viewer for tiling window managers"; - homepage = "https://github.com/eXeC64/imv"; + homepage = "https://sr.ht/~exec64/imv/"; license = licenses.mit; maintainers = with maintainers; [ rnhmjoj markus1189 ]; platforms = platforms.all; + badPlatforms = platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix index f1bac3dd76..ceab3eaea3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions/applytransforms/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "XWwkuw+Um/cflRWjIeIgQUxJLrk2DLDmx7K+pMWvIlI="; }; - checkInputs = [ + nativeCheckInputs = [ python3.pkgs.inkex python3.pkgs.pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/json-plot/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/json-plot/default.nix index 9b43518a87..39c4b45cd1 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/json-plot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/json-plot/default.nix @@ -1,10 +1,9 @@ { lib , fetchFromGitHub -, buildGoPackage +, fetchpatch +, buildGoModule }: -# upstream is pretty stale, but it still works, so until they merge module -# support we have to use gopath: see sgreben/jp#29 -buildGoPackage rec { +buildGoModule rec { pname = "json-plot"; version = "1.1.12"; @@ -15,7 +14,17 @@ buildGoPackage rec { hash = "sha256-WWARAh/CF3lGli3VLRzAGaCA8xQyryPi8WcuwvdInjk="; }; - goPackagePath = "github.com/sgreben/jp"; + vendorHash = "sha256-EPrlaUHAGATNFv3qgWKGmJdu9EHsV/0DJKEvQck+fWc="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/sgreben/jp/commit/9516fb4d7c5b011071b4063ea8e8e9667e57a777.patch"; + hash = "sha256-Vz5HnStrCpMN1L7dne7JDX5F57up3EBPPf/9hN9opRc="; + }) + ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Dead simple terminal plots from JSON (or CSV) data. Bar charts, line charts, scatter plots, histograms and heatmaps are supported."; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix index 37ad3387f8..91562bb5d4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix @@ -7,24 +7,24 @@ let bgrabitmap = fetchFromGitHub { owner = "bgrabitmap"; repo = "bgrabitmap"; - rev = "v11.2.5"; - sha256 = "0w5pdihsxn039kalkf4cx23j69hz5r09qmhd358h2n74irv1r3x1"; + rev = "v11.5.3"; + sha256 = "sha256-qjBD9TVZQy1tKWHFWkuu6vdLjASzQb3+HRy0FLdd9a8="; }; bgracontrols = fetchFromGitHub { owner = "bgrabitmap"; repo = "bgracontrols"; - rev = "v7.0"; - sha256 = "0qz3cscrc9jvhrix1hbmzhdxv6mxk0mz9azr46canflsydda8fjy"; + rev = "v7.6"; + sha256 = "sha256-btg9DMdYg+C8h0H7MU+uoo2Kb4OeLHoxFYHAv7LbLBA="; }; in stdenv.mkDerivation rec { pname = "lazpaint"; - version = "7.1.5"; + version = "7.2.2"; src = fetchFromGitHub { owner = "bgrabitmap"; repo = "lazpaint"; rev = "v${version}"; - sha256 = "0bpk3rlqzbxvgrxmrzs0hcrgwhsqnpjqv1kdd9cp09knimmksvy5"; + sha256 = "sha256-J6s0GnGJ7twEYW5+B72bB3EX4AYvLnhSPLbdhZWzlkw="; }; nativeBuildInputs = [ lazarus fpc makeWrapper ]; @@ -33,6 +33,10 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + preConfigure = '' + patchShebangs configure + ''; + buildPhase = '' cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap cp -r --no-preserve=mode ${bgracontrols} bgracontrols @@ -47,6 +51,7 @@ in stdenv.mkDerivation rec { installPhase = '' # Reuse existing install script + substituteInPlace Makefile --replace "/bin/bash" $BASH cd lazpaint/release/debian substituteInPlace makedeb.sh --replace "rm -rf" "ls" patchShebangs ./makedeb.sh @@ -64,6 +69,5 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ ]; - broken = true; # 2022-11-16 }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix index c44ff57d18..d0cf9af97d 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; meta = with lib; { - homepage = "http://qtpfsgui.sourceforge.net/"; + homepage = "https://qtpfsgui.sourceforge.net/"; description = "A complete open source solution for HDR photography"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix index f0693cc612..4a9b91d9c7 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://djvu.sourceforge.net/djview4.html"; + homepage = "https://djvu.sourceforge.net/djview4.html"; description = "Black-and-white djvu page encoder and decoder that use interpage information"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.viric ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mtpaint/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/mtpaint/default.nix index 0acc873b39..740f9c7cb1 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/mtpaint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/mtpaint/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Due to its simplicity and lack of dependencies it runs well on GNU/Linux, Windows and older PC hardware. ''; - homepage = "http://mtpaint.sourceforge.net/"; + homepage = "https://mtpaint.sourceforge.net/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.vklquevs ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix index 7f1ba67acc..48cc00d008 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix @@ -74,7 +74,7 @@ in buildPythonApplication rec { pygobject3 ]; - checkInputs = [ + nativeCheckInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix index 9c919273b5..596ae0d07a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ovito/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "ovito"; - version = "3.7.7"; + version = "3.7.11"; src = fetchFromGitLab { owner = "stuko"; repo = "ovito"; rev = "v${version}"; - sha256 = "sha256-wKXnb7ZzWOPPrHj3jOeFazRy0PVqcV/OFeaBs6qgF1I="; + sha256 = "sha256-Z3uwjOYJ7di/LLllbzdKjzUE7m119i03bA8dJPqhxWA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix index dbc5b973fe..0bd1fc20c5 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { #doCheck = true; meta = { - homepage = "http://panotools.sourceforge.net/"; + homepage = "https://panotools.sourceforge.net/"; description = "Free software suite for authoring and displaying virtual reality panoramas"; license = lib.licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix index b6e03baace..9cf2e50ea3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix @@ -2,7 +2,7 @@ , mailcap, libGL, libpulseaudio, alsa-lib, nss, gd, gst_all_1, nspr, expat, fontconfig , dbus, glib, zlib, openssl, libdrm, cups, avahi-compat, xorg, wayland, libudev0-shim # Qt 5 subpackages -, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qtwebkit, qt3d, mlt +, qtbase, qtgamepad, qtserialport, qtserialbus, qtvirtualkeyboard, qtmultimedia, qt3d, mlt }: stdenv.mkDerivation rec { @@ -62,7 +62,6 @@ stdenv.mkDerivation rec { qtserialbus qtvirtualkeyboard qtmultimedia - qtwebkit ] ++ (with xorg; [ libX11 libXdamage diff --git a/third_party/nixpkgs/pkgs/applications/graphics/potrace/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/potrace/default.nix index 9392f27c17..b46c2060ed 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/potrace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/potrace/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.16"; src = fetchurl { - url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz"; + url = "https://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz"; sha256 = "1k3sxgjqq0jnpk9xxys05q32sl5hbf1lbk1gmfxcrmpdgnhli0my"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "http://potrace.sourceforge.net/"; + homepage = "https://potrace.sourceforge.net/"; description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image"; platforms = platforms.unix; maintainers = [ maintainers.pSub ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/potreeconverter/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/potreeconverter/default.nix new file mode 100644 index 0000000000..07fae11408 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/potreeconverter/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, tbb +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "PotreeConverter"; + version = "unstable-2022-08-04"; + + src = fetchFromGitHub { + owner = "potree"; + repo = "PotreeConverter"; + rev = "758bbac98a662de5e57d2280675e11cc76241688"; + sha256 = "sha256-pDdV2/edYhhBWs153hSy1evI3cXD0Xq9nrEsw3JNcH4="; + }; + + buildInputs = [ + boost + tbb + ]; + + nativeBuildInputs = [ + makeWrapper + cmake + ]; + + patchPhase = '' + substituteInPlace ./CMakeLists.txt \ + --replace "find_package(TBB REQUIRED)" "" + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib} + mv liblaszip.so $out/lib + mv PotreeConverter $out/bin + ln -s $out/bin/PotreeConverter $out/bin/potreeconverter + + # Create an empty wrapper, since PotreeConverter segfaults if called via + # $PATH rather than absolute path. An empty wrapper forces an absolute path + # on each invocation + wrapProgram $out/bin/PotreeConverter + + runHook postInstall + ''; + + meta = with lib; { + description = "Create multi res point cloud to use with potree"; + homepage = "https://github.com/potree/PotreeConverter"; + license = licenses.bsd2; + maintainers = with maintainers; [ matthewcroughan ]; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/qiv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/qiv/default.nix index 0075abc0f6..96ec02294f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/qiv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/qiv/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, gtk2, imlib2, file, lcms2, libexif } : stdenv.mkDerivation (rec { - version = "2.3.2"; + version = "2.3.3"; pname = "qiv"; src = fetchurl { url = "https://spiegl.de/qiv/download/${pname}-${version}.tgz"; - sha256 = "1mc0f2nnas4q0d7zc9r6g4z93i32xlx0p9hl4fn5zkyml24a1q28"; + sha256 = "sha256-7whf/eLUiwWzZlk55a4eNZ06OBAI+4J2hPfW/UxTNwQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/xsane.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/xsane.nix index 007483fb5e..cd64c7b8d4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/xsane.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/xsane.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab , sane-backends , sane-frontends , libX11 @@ -10,15 +10,19 @@ , libusb-compat-0_1 , gimpSupport ? false , gimp +, nix-update-script }: stdenv.mkDerivation rec { pname = "xsane"; version = "0.999"; - src = fetchurl { - url = "http://www.xsane.org/download/xsane-${version}.tar.gz"; - sha256 = "0jrb918sfb9jw3vmrz0z7np4q55hgsqqffpixs0ir5nwcwzd50jp"; + src = fetchFromGitLab { + owner = "frontend"; + group = "sane-project"; + repo = pname; + rev = version; + hash = "sha256-oOg94nUsT9LLKnHocY0S5g02Y9a1UazzZAjpEI/s+yM="; }; preConfigure = '' @@ -31,11 +35,13 @@ stdenv.mkDerivation rec { buildInputs = [ libpng libusb-compat-0_1 sane-backends sane-frontends libX11 gtk2 ] ++ lib.optional gimpSupport gimp; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "http://www.sane-project.org/"; description = "Graphical scanning frontend for sane"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ melling ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix index 251dfdef32..a566d9da78 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/shotwell/default.nix @@ -30,7 +30,6 @@ , wrapGAppsHook , gobject-introspection , itstool -, libchamplain , libsecret , gsettings-desktop-schemas , python3 @@ -86,7 +85,6 @@ stdenv.mkDerivation rec { librest gcr gnome.adwaita-icon-theme - libchamplain libsecret ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vkdt/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vkdt/default.nix index 757bf7cb7b..c6acd02a54 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/vkdt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/vkdt/default.nix @@ -23,32 +23,38 @@ stdenv.mkDerivation rec { pname = "vkdt"; - version = "0.5.1"; + version = "0.5.3"; src = fetchurl { url = "https://github.com/hanatos/${pname}/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-IMCS6bJqOzPeAFZyQtjzd1rQ5ugIevqoFUW6Y0w1Pzs="; + sha256 = "sha256-7b9mowMOdA4holdb5zUIqOGkB0/xB6AvJOfxA6IIfRc="; }; - buildInputs = [ - vulkan-headers - vulkan-tools - vulkan-loader - glslang - glfw - libjpeg - pkg-config - rsync - cmake + strictDeps = true; + + nativeBuildInputs = [ clang + cmake + glslang llvm llvmPackages.openmp - pugixml - freetype + pkg-config + rsync + ]; + + buildInputs = [ exiv2 ffmpeg - libvorbis + freetype + glfw + libjpeg libmad + libvorbis + llvmPackages.openmp + pugixml + vulkan-headers + vulkan-loader + vulkan-tools ]; dontUseCmakeConfigure = true; @@ -60,5 +66,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hanatos/vkdt"; license = licenses.bsd2; maintainers = with maintainers; [ paperdigits ]; + platforms = platforms.linux; + broken = stdenv.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/weylus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/weylus/default.nix index 6cef9384e4..0a238e87fa 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/weylus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/weylus/default.nix @@ -14,6 +14,7 @@ , pango , pipewire , cmake +, git , autoconf , libtool , nodePackages @@ -63,6 +64,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ cmake + git nodePackages.typescript makeWrapper ] ++ lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xaos/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xaos/default.nix index 2ba96fda3f..e79f322be5 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xaos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xaos/default.nix @@ -1,32 +1,50 @@ -{ lib, stdenv, fetchurl, aalib, gsl, libpng, libX11, xorgproto, libXext -, libXt, zlib, gettext, intltool, perl }: +{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qttools, wrapQtAppsHook, copyDesktopItems }: -stdenv.mkDerivation rec { +let datapath = "$out/share/XaoS"; +in stdenv.mkDerivation rec { pname = "xaos"; - version = "3.6"; + version = "4.2.1"; + outputs = [ "out" "man" ]; - src = fetchurl { - url = "mirror://sourceforge/xaos/${pname}-${version}.tar.gz"; - sha256 = "15cd1cx1dyygw6g2nhjqq3bsfdj8sj8m4va9n75i0f3ryww3x7wq"; + src = fetchFromGitHub { + owner = "xaos-project"; + repo = pname; + rev = "release-${version}"; + hash = "sha256-JLF8Mz/OHZEEJG/aryKQuJ6B5R8hPJdvln7mbKoqXFU="; }; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ qmake qttools wrapQtAppsHook copyDesktopItems ]; + buildInputs = [ qtbase ]; - nativeBuildInputs = [ intltool ]; - buildInputs = [ - aalib gsl libpng libX11 xorgproto libXext - libXt zlib gettext perl - ]; + QMAKE_LRELEASE = "lrelease"; + DEFINES = [ "USE_OPENGL" "USE_FLOAT128" ]; - preConfigure = '' - sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') - mkdir -p $out/share/locale + postPatch = '' + substituteInPlace src/include/config.h \ + --replace "/usr/share/XaoS" "${datapath}" ''; - meta = { - homepage = "http://xaos.sourceforge.net/"; - description = "Fractal viewer"; + desktopItems = [ "xdg/xaos.desktop" ]; + + installPhase = '' + runHook preInstall + + install -D bin/xaos "$out/bin/xaos" + + mkdir -p "${datapath}" + cp -r tutorial examples catalogs "${datapath}" + + install -D "xdg/${pname}.png" "$out/share/icons/${pname}.png" + + install -D doc/xaos.6 "$man/man6/xaos.6" + runHook postInstall + ''; + + meta = src.meta // { + description = "Real-time interactive fractal zoomer"; + homepage = "https://xaos-project.github.io/"; license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ ehmry ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xournal/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xournal/default.nix index 2372178b97..288f0446b3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xournal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xournal/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://xournal.sourceforge.net/"; + homepage = "https://xournal.sourceforge.net/"; description = "Note-taking application (supposes stylus)"; maintainers = [ maintainers.guibert ]; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/yeetgif/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/yeetgif/default.nix index 84bcdee5b7..d464b56cb2 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/yeetgif/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/yeetgif/default.nix @@ -1,18 +1,29 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, fetchpatch, lib }: -buildGoPackage rec { +buildGoModule rec { pname = "yeetgif"; version = "1.23.6"; - goPackagePath = "github.com/sgreben/yeetgif"; - src = fetchFromGitHub { owner = "sgreben"; repo = pname; rev = version; - sha256 = "05z1ylsra60bb4cvr383g9im94zsph1dgicqbv5p73qgs634ckk7"; + hash = "sha256-Z05GhtEPj3PLXpjF1wK8+pNUY3oDjbwZWQsYlTX14Rc="; }; + deleteVendor = true; + vendorHash = "sha256-LhkOMCuYO4GHezk21SlI2dP1UPmBp4bv2SdNbUQMKsI="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/sgreben/yeetgif/commit/5d2067b9832898c2b1ac51bf6a5f107619038270.patch"; + hash = "sha256-3eyqbpPyuQHjAN5mjQyZo0xY6L683T5Ytyx02II/iU4="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "gif effects CLI. single binary, no dependencies. linux, osx, windows. #1 workplace productivity booster. #yeetgif #eggplant #golang"; homepage = "https://github.com/sgreben/yeetgif"; diff --git a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh index dcea56f16d..a2e90571e9 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh +++ b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.1/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/22.12.2/src -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix b/third_party/nixpkgs/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix index f96e8cf6b6..468e264915 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kdevelop-pg-qt"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1"; + sha256 = "sha256-PVZgTEefjwSuMqUj7pHzB4xxcRfQ3rOelz4iSUy7ZfE="; }; nativeBuildInputs = [ cmake pkg-config extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/krfb.nix b/third_party/nixpkgs/pkgs/applications/kde/krfb.nix index 8262febad7..65213fa15a 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/krfb.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/krfb.nix @@ -3,7 +3,7 @@ , kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet , kwidgetsaddons, kwindowsystem, kxmlgui, kwayland , libvncserver, libXtst, libXdamage -, qtx11extras +, qtx11extras, pipewire, plasma-wayland-protocols, wayland }: mkDerivation { @@ -20,6 +20,9 @@ mkDerivation { kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons kwindowsystem kxmlgui kwayland qtx11extras + pipewire + plasma-wayland-protocols + wayland ]; propagatedBuildInputs = [ kdnssd ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix index 70a00826dc..81ae24b71c 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix @@ -4,1875 +4,1875 @@ { akonadi = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-22.12.1.tar.xz"; - sha256 = "1kb0hf705jqsbv075ja7pfh7yyfnxp5cigcgrdw4i0wh94rr1c3d"; - name = "akonadi-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-22.12.2.tar.xz"; + sha256 = "19cqzpn28xw8g1m9g4z45wh0z2waygx0cbir8yp6xwl78ax9qss1"; + name = "akonadi-22.12.2.tar.xz"; }; }; akonadi-calendar = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-calendar-22.12.1.tar.xz"; - sha256 = "07pk2ivfmf4pcmhafs17bvh63rqq70pybrv9qj2p6lih52a9021g"; - name = "akonadi-calendar-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-calendar-22.12.2.tar.xz"; + sha256 = "0y9dxh3c7044bilky05xhmx15mk3bq1yfpsirn1w6r0pygnrhvgs"; + name = "akonadi-calendar-22.12.2.tar.xz"; }; }; akonadi-calendar-tools = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-calendar-tools-22.12.1.tar.xz"; - sha256 = "144k1isdb805zp6mrmpx8n8xww4kv0xd6kp4cziwnbwm46iipwqa"; - name = "akonadi-calendar-tools-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-calendar-tools-22.12.2.tar.xz"; + sha256 = "12p0702gddh0ssz8hnk0vxklj8bpq3n81qz565i4biifamn0zids"; + name = "akonadi-calendar-tools-22.12.2.tar.xz"; }; }; akonadi-contacts = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-contacts-22.12.1.tar.xz"; - sha256 = "1hzgc1bljjf6ac40fsgv5rgndq7s2hl5kn0hc7lb8vkbaab0zmni"; - name = "akonadi-contacts-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-contacts-22.12.2.tar.xz"; + sha256 = "04q72c7k5jnwh16sxap3wlany5kl1wcxaidwk8s7zyssf4zpri1h"; + name = "akonadi-contacts-22.12.2.tar.xz"; }; }; akonadi-import-wizard = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-import-wizard-22.12.1.tar.xz"; - sha256 = "1hlpsnh2v2f5asi07b46n18rhzqcc176n308503xnpmf33iw6dan"; - name = "akonadi-import-wizard-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-import-wizard-22.12.2.tar.xz"; + sha256 = "1iiagyj1q321vn54azq69fkiqjf1ky01bb2ddd97zzll7z4ly5q0"; + name = "akonadi-import-wizard-22.12.2.tar.xz"; }; }; akonadi-mime = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-mime-22.12.1.tar.xz"; - sha256 = "0gz7xn1pkiidmhiwnha6a9ffkyihv8dxvdym2k8amsvabp08nxa8"; - name = "akonadi-mime-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-mime-22.12.2.tar.xz"; + sha256 = "08d8hd5xxmwf2fxnc4g41almcr76pp6gdx54ndxs3n1s3l31mmip"; + name = "akonadi-mime-22.12.2.tar.xz"; }; }; akonadi-notes = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-notes-22.12.1.tar.xz"; - sha256 = "11m38nc3prfar3430makyg9fa3xc2bflyw99lxbfamvh5sk2miv5"; - name = "akonadi-notes-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-notes-22.12.2.tar.xz"; + sha256 = "1n61acjdhsr7nhy5jr261x4h97a2fcf3hlrig7vin4sjp263ik6f"; + name = "akonadi-notes-22.12.2.tar.xz"; }; }; akonadi-search = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadi-search-22.12.1.tar.xz"; - sha256 = "0hmd6jl3asv4dkicpn05friic61xx0cjz87qznkmknrrlh1hwd8n"; - name = "akonadi-search-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadi-search-22.12.2.tar.xz"; + sha256 = "1zg0sqzw4vgxghp32k3yb5kixh4nivzpx3gacr94f22jq8h2pgny"; + name = "akonadi-search-22.12.2.tar.xz"; }; }; akonadiconsole = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akonadiconsole-22.12.1.tar.xz"; - sha256 = "1jgmds3qy74hwcxqnrg9nyndpdp5g9ys83jkjgbf61xzzw83fvgl"; - name = "akonadiconsole-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akonadiconsole-22.12.2.tar.xz"; + sha256 = "158xgm4z9hk8gzf9z8fnf5mqbryhf6rw3d68195gwfp9i0f3b488"; + name = "akonadiconsole-22.12.2.tar.xz"; }; }; akregator = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/akregator-22.12.1.tar.xz"; - sha256 = "14fm2qcc87wawhskc31np9s3i87bmjwy2blzzl4430l6jpgqv0q7"; - name = "akregator-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/akregator-22.12.2.tar.xz"; + sha256 = "14s2rcfb7p3yyp46lf91a5ssi0bnh5ff2rcq2sd6z9d8yi01vl9s"; + name = "akregator-22.12.2.tar.xz"; }; }; analitza = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/analitza-22.12.1.tar.xz"; - sha256 = "0wjry2ls7fpi6jdcar4wr9ric5vgzbwqgjyjz2xkgd54l9sqbllv"; - name = "analitza-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/analitza-22.12.2.tar.xz"; + sha256 = "07ch3vsaf9dily42gdyvph52rnvbrcrfnmsav5nvs98ymvkqj241"; + name = "analitza-22.12.2.tar.xz"; }; }; ark = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ark-22.12.1.tar.xz"; - sha256 = "033y3dcxxvkbfqq9ncv0wxnyqdkbg988jn500hvkgzg87ddj8317"; - name = "ark-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ark-22.12.2.tar.xz"; + sha256 = "1hsh1anm555b5mckn60cj9p4sdl5h5g2m01k6ia784l2k4zsrvvb"; + name = "ark-22.12.2.tar.xz"; }; }; artikulate = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/artikulate-22.12.1.tar.xz"; - sha256 = "1j7lmvds5lq2g97llszy05khwsjw0ypsay49551pm7awk2hhx38h"; - name = "artikulate-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/artikulate-22.12.2.tar.xz"; + sha256 = "1cvs0v0x2g8048ksrb9xb41bsvm7lq1g30gch1rjdj86vv3ysraa"; + name = "artikulate-22.12.2.tar.xz"; }; }; audiocd-kio = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/audiocd-kio-22.12.1.tar.xz"; - sha256 = "0m6ik4p3pfw8sdmqiac42v4mi4mrgmx7dsj0n4zzpfa7nn4iiaz5"; - name = "audiocd-kio-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/audiocd-kio-22.12.2.tar.xz"; + sha256 = "1z46gk6lnar280chigjbw45l8zsr6majyk1gxd1kfnpyqgfh6pzj"; + name = "audiocd-kio-22.12.2.tar.xz"; }; }; baloo-widgets = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/baloo-widgets-22.12.1.tar.xz"; - sha256 = "1s2a7rsm6y5z0p0cp49bv0868di45qrzrkl7s76cnm56bssyrrnw"; - name = "baloo-widgets-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/baloo-widgets-22.12.2.tar.xz"; + sha256 = "1041m3r4a3dps5br3m4fmg91fg4d0ww6c6yl2qngyh27arc1ashn"; + name = "baloo-widgets-22.12.2.tar.xz"; }; }; blinken = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/blinken-22.12.1.tar.xz"; - sha256 = "1myn9g04dk43gqsahbgqcg5b5vd8yfwaijxyw0pfqllanj7vjlpa"; - name = "blinken-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/blinken-22.12.2.tar.xz"; + sha256 = "0hz6sa3g7d5x388arsawspgbjzkhv0p85fpkmm8px8ysqa5vn189"; + name = "blinken-22.12.2.tar.xz"; }; }; bomber = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/bomber-22.12.1.tar.xz"; - sha256 = "01d07xi012lq9prs3lr68l5v4m0z31ddmm5rdldxzrx6vwf1233l"; - name = "bomber-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/bomber-22.12.2.tar.xz"; + sha256 = "1ipzk0lys8s9wwmb8mrrsi9c7scdak19ggcbazq6dqzb2iqn381m"; + name = "bomber-22.12.2.tar.xz"; }; }; bovo = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/bovo-22.12.1.tar.xz"; - sha256 = "134bcjfd4sz2d96nd4yad9hz72nymphgsdkgm81p7w29dmyk8bz3"; - name = "bovo-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/bovo-22.12.2.tar.xz"; + sha256 = "12j9g84bi4mkj2gw7jdvbmwf8bmgb4l0imxivifn0i1pz2bjaia1"; + name = "bovo-22.12.2.tar.xz"; }; }; calendarsupport = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/calendarsupport-22.12.1.tar.xz"; - sha256 = "1yz95mlqjac9db7v7k953b4zky5369d9yhrr6f2m8950205xdab3"; - name = "calendarsupport-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/calendarsupport-22.12.2.tar.xz"; + sha256 = "172j3n6s06aax5p3r49kj1c5mx1hz1zljbhvkjdrm4fj6kxwl829"; + name = "calendarsupport-22.12.2.tar.xz"; }; }; cantor = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/cantor-22.12.1.tar.xz"; - sha256 = "0yi2pqh2jarcbx979vgbpm415rbpn5p5q3b6n2276mxq6x338hl6"; - name = "cantor-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/cantor-22.12.2.tar.xz"; + sha256 = "0yv8vq6wkybx0qdbkq0d5qm3xzcla80zlppf7wpf7icdvxqa9g76"; + name = "cantor-22.12.2.tar.xz"; }; }; cervisia = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/cervisia-22.12.1.tar.xz"; - sha256 = "0v2shjgc8jpzpll00apv2d6lqp08a277pv674skq4fc770aviaxk"; - name = "cervisia-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/cervisia-22.12.2.tar.xz"; + sha256 = "0dl16s49msf4z59s3y03c552zkpq9b565fg4yan5950587sbpvfg"; + name = "cervisia-22.12.2.tar.xz"; }; }; colord-kde = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/colord-kde-22.12.1.tar.xz"; - sha256 = "0ky3dr60szvg8fq6zlk7gsx997zql6hsfqv8navri3c3nra26r4y"; - name = "colord-kde-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/colord-kde-22.12.2.tar.xz"; + sha256 = "028f50ab0w08zg70ckisjdqnii3xs5hx5zgmhvvvfjgcacdpgvvb"; + name = "colord-kde-22.12.2.tar.xz"; }; }; dolphin = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/dolphin-22.12.1.tar.xz"; - sha256 = "1slcv108h2i5s9i2hlyiskfpmrc0r4awm3riyw0wa3h902h4lsbz"; - name = "dolphin-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/dolphin-22.12.2.tar.xz"; + sha256 = "0gjpvvwpghs7zf8cm1l7y7821459kggh42rc5jv5vybn1v8wzqg0"; + name = "dolphin-22.12.2.tar.xz"; }; }; dolphin-plugins = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/dolphin-plugins-22.12.1.tar.xz"; - sha256 = "03bj0jf92s5xb8nzzrh4wkcwm1zp101yg2r624r20djl8rkysivj"; - name = "dolphin-plugins-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/dolphin-plugins-22.12.2.tar.xz"; + sha256 = "1y2jkx7rq2kb5zsp5r8d3lhfil3p2nr8vfhlfiaqyisqaj138by1"; + name = "dolphin-plugins-22.12.2.tar.xz"; }; }; dragon = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/dragon-22.12.1.tar.xz"; - sha256 = "1rk00h91dhs78h3n97zxj8qxkvs7m94544xhs37qpnm735fdbkv0"; - name = "dragon-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/dragon-22.12.2.tar.xz"; + sha256 = "0qbhhl3kpq0syik17xhsfgfym16mw5nkz83c620dl0n5c65dyva9"; + name = "dragon-22.12.2.tar.xz"; }; }; elisa = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/elisa-22.12.1.tar.xz"; - sha256 = "1ywi1v2pz9gi3qgdrkcxivcx9sc82swckm1ipaf6x4ygbi5g0r5f"; - name = "elisa-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/elisa-22.12.2.tar.xz"; + sha256 = "09kz7k7w6rs419sv6f2z5m5nqz3j3cdlmcn3ig9f5v9hlci1x1sr"; + name = "elisa-22.12.2.tar.xz"; }; }; eventviews = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/eventviews-22.12.1.tar.xz"; - sha256 = "1bvlnaknn3jcjwwx9gfsqhq7vywjqbji3zfrmab4hv4v1bp5hgs9"; - name = "eventviews-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/eventviews-22.12.2.tar.xz"; + sha256 = "127bxj6pnmkppjchv3pr8wqs75hw2nb3jsx3bgmr11zvm2mbivwc"; + name = "eventviews-22.12.2.tar.xz"; }; }; falkon = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/falkon-22.12.1.tar.xz"; - sha256 = "14wngik0hlvj49x0vx2ndyswk3yvh3jc0g21lfrnsvbxsppjvskx"; - name = "falkon-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/falkon-22.12.2.tar.xz"; + sha256 = "1d6xxq18lx57aw20pzrv7mh0rdw84sli04l15ingvxj6crqkha4f"; + name = "falkon-22.12.2.tar.xz"; }; }; ffmpegthumbs = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ffmpegthumbs-22.12.1.tar.xz"; - sha256 = "0xf54rzard24az08mb6z9p23173nxsgmyfkriil5f87k67f7cf28"; - name = "ffmpegthumbs-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ffmpegthumbs-22.12.2.tar.xz"; + sha256 = "0ykmlr4acx0lbg255xmhjva5kb448mmsbb8xq1xm763qbf9xkdrr"; + name = "ffmpegthumbs-22.12.2.tar.xz"; }; }; filelight = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/filelight-22.12.1.tar.xz"; - sha256 = "1ww6h0p0y9phara8m2l6jbwr6vbhi1zid7xdrhfbg0vwz0ql42sz"; - name = "filelight-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/filelight-22.12.2.tar.xz"; + sha256 = "1kapmwhzpsmvs7757lgbm3d7nv7iaarn0vv5w7ndv3aygxf719d7"; + name = "filelight-22.12.2.tar.xz"; }; }; granatier = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/granatier-22.12.1.tar.xz"; - sha256 = "17qjf35dzsykn7l5483ccihzqc4wz9p3bn2l3s5yrgizsrgbir0c"; - name = "granatier-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/granatier-22.12.2.tar.xz"; + sha256 = "1hngcg7zvgra7j26iksipxg635snmx9bpqxiw7r1v6qfk97hq6a7"; + name = "granatier-22.12.2.tar.xz"; }; }; grantlee-editor = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/grantlee-editor-22.12.1.tar.xz"; - sha256 = "11s7kwm0sdcvzf27fx177n2ynklwlkxy8vl4hh42xh9563v9gw67"; - name = "grantlee-editor-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/grantlee-editor-22.12.2.tar.xz"; + sha256 = "0fiyinazfmh82rxr97icfs3qgrzgydczicdghr2i1pb7frpgpxh1"; + name = "grantlee-editor-22.12.2.tar.xz"; }; }; grantleetheme = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/grantleetheme-22.12.1.tar.xz"; - sha256 = "1xx09jaxg6cwn84svh6wkvxx46qv18rk1dr58dfyxgi3vl3nzihp"; - name = "grantleetheme-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/grantleetheme-22.12.2.tar.xz"; + sha256 = "055cff24fbjhlgc5y7501yy3vyfkgqhsqsc10qbfx24xkgbjfb2i"; + name = "grantleetheme-22.12.2.tar.xz"; }; }; gwenview = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/gwenview-22.12.1.tar.xz"; - sha256 = "12i7zri7mxhjfbykb1nhsh5acppcql3gkmjif92qp4f4d7fqrgsb"; - name = "gwenview-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/gwenview-22.12.2.tar.xz"; + sha256 = "1dkggydnnhn8db2crlxnj7jz47rrrllpjqxg158rgf740dnhdhbx"; + name = "gwenview-22.12.2.tar.xz"; }; }; incidenceeditor = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/incidenceeditor-22.12.1.tar.xz"; - sha256 = "1agqkqcksqf992albppijysddyhfgc6l1zxg6qyyvw9iag6p509x"; - name = "incidenceeditor-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/incidenceeditor-22.12.2.tar.xz"; + sha256 = "0qy4kd1gf72mpi3kks1acdcqn625gys4hjy98cfgn6hz3vp7dfcb"; + name = "incidenceeditor-22.12.2.tar.xz"; }; }; itinerary = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/itinerary-22.12.1.tar.xz"; - sha256 = "1fmsfnjywa0vy91dg2z093x36fcv50gc5xp8hqlrjx4q7hqja13n"; - name = "itinerary-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/itinerary-22.12.2.tar.xz"; + sha256 = "13xm73wdwz2fsmmfvikyyq0x98x48j3vzpvijfafj8a1k82zc7g1"; + name = "itinerary-22.12.2.tar.xz"; }; }; juk = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/juk-22.12.1.tar.xz"; - sha256 = "066ll1lbmgy9l9bpv7iw75gknjdb92dbaqpsir0a2j4llj40yym1"; - name = "juk-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/juk-22.12.2.tar.xz"; + sha256 = "1hi1ywbragllsbx2vf0hmv8a0jnnjnq4jinanxrpkpl2h9hj31bf"; + name = "juk-22.12.2.tar.xz"; }; }; k3b = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/k3b-22.12.1.tar.xz"; - sha256 = "0lg8jfgs73j5bfx00g6lbgmmw98l2m5c5g8mkdw5ayr9wg5iwzhl"; - name = "k3b-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/k3b-22.12.2.tar.xz"; + sha256 = "08979ns5mm92x5swphd6cf4jvin3nly65h3vzsr85g1h2vi5hywz"; + name = "k3b-22.12.2.tar.xz"; }; }; kaccounts-integration = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kaccounts-integration-22.12.1.tar.xz"; - sha256 = "0avy1ld72z5sx7nd78lar54x7a7zb7pa7p62bmxyhkmrvvlj6zjk"; - name = "kaccounts-integration-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kaccounts-integration-22.12.2.tar.xz"; + sha256 = "171jz49j565myd3iprhlfxla2pc5rs608w815z84qya8y0s9ji8q"; + name = "kaccounts-integration-22.12.2.tar.xz"; }; }; kaccounts-providers = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kaccounts-providers-22.12.1.tar.xz"; - sha256 = "16acbba803i24psyax9xbb82gs0wqwhpml1hrd3nwkdf7irngdna"; - name = "kaccounts-providers-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kaccounts-providers-22.12.2.tar.xz"; + sha256 = "0pdkhpprbxd6damdzx4zxd32gs0fdy27s9vhfg79hgb9a94ar8p3"; + name = "kaccounts-providers-22.12.2.tar.xz"; }; }; kaddressbook = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kaddressbook-22.12.1.tar.xz"; - sha256 = "100rrb6q63p1qawp9ww9dif06q1f9w02xgfrlhki3xvgdkpfy92r"; - name = "kaddressbook-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kaddressbook-22.12.2.tar.xz"; + sha256 = "1vwxfhjh4dk94aijazfnb25fdjwbd7520a90hg59g5cxrd3yrlqb"; + name = "kaddressbook-22.12.2.tar.xz"; }; }; kajongg = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kajongg-22.12.1.tar.xz"; - sha256 = "0zc08cgpw0pwbjhrs186m4l5rp61gjbqzh4xh9yg24i3k4yn8z6g"; - name = "kajongg-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kajongg-22.12.2.tar.xz"; + sha256 = "1a2ps3vvrh89ryclz4hh072q4mfayys3kgkhp0r9b74yskjln8zv"; + name = "kajongg-22.12.2.tar.xz"; }; }; kalarm = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kalarm-22.12.1.tar.xz"; - sha256 = "11h0a1jgp7p0zkyqfd2vmv24nnv02jfcqw1z1pi6qr0ywgn8ba9i"; - name = "kalarm-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kalarm-22.12.2.tar.xz"; + sha256 = "16aaxl4j1027p3xwrfilgriddr4dlm33vrbhz26w1kdanq7jicp9"; + name = "kalarm-22.12.2.tar.xz"; }; }; kalendar = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kalendar-22.12.1.tar.xz"; - sha256 = "1r4r2pa5p0951vvcvw1gyrs1k41xd4495lb72qkv0nhvvb6lp2aw"; - name = "kalendar-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kalendar-22.12.2.tar.xz"; + sha256 = "13wkxl4cv7h0jaf5c973ppkflfy5h8x4njmkzgg01fkb4zaxdkdy"; + name = "kalendar-22.12.2.tar.xz"; }; }; kalgebra = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kalgebra-22.12.1.tar.xz"; - sha256 = "0iai8anpxb3qxp927vhz294c3qh2h3fn84l5viry7rsi9wkyckwf"; - name = "kalgebra-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kalgebra-22.12.2.tar.xz"; + sha256 = "1c8z2mpk2k737dshsg76bvipd1msf6fbp4zqjm167ar29bn5s52j"; + name = "kalgebra-22.12.2.tar.xz"; }; }; kalzium = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kalzium-22.12.1.tar.xz"; - sha256 = "0jnhhy9xilkafmzbbgxp4l3hx6qsrkkwm7yxf2i7jw5wzax98s1y"; - name = "kalzium-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kalzium-22.12.2.tar.xz"; + sha256 = "0z0brsxh4ivrna0250j76is9slswmpvkj6n3i6vd9j7x5ayh8kr2"; + name = "kalzium-22.12.2.tar.xz"; }; }; kamera = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kamera-22.12.1.tar.xz"; - sha256 = "0sxms7m9mxadf9qcxdlvnrav7lvapgbs3q48c2pydgyszrq54b54"; - name = "kamera-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kamera-22.12.2.tar.xz"; + sha256 = "0i8l0happ7sg6ch4jp1680c4ikqvf99dfj6d3cfi0k35wh828x32"; + name = "kamera-22.12.2.tar.xz"; }; }; kamoso = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kamoso-22.12.1.tar.xz"; - sha256 = "024j6ijmgxkdjavach6qi6n81g728kd3qs6r6kkm36j3cl19xnpf"; - name = "kamoso-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kamoso-22.12.2.tar.xz"; + sha256 = "1x1w0kgf5fh8jj5bha7q5sr7f8q93jr987v40h9h5d4xlj576n7n"; + name = "kamoso-22.12.2.tar.xz"; }; }; kanagram = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kanagram-22.12.1.tar.xz"; - sha256 = "0ir8xa826mvnk8s38mb5p61kfx7hfrxzifacv4hpwn7wqgb37986"; - name = "kanagram-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kanagram-22.12.2.tar.xz"; + sha256 = "0dgialia8qc09y2gv8031m2g2dn5dhfn5zyvrh3yb7p1bviw301c"; + name = "kanagram-22.12.2.tar.xz"; }; }; kapman = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kapman-22.12.1.tar.xz"; - sha256 = "1qjg13vnwdrkfj7p88rlq1b3vhyxsgd7x6amqwd65qhbiiall732"; - name = "kapman-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kapman-22.12.2.tar.xz"; + sha256 = "1xm3bkp0l9if06l0mnfyk5ywmdd8q0vvdwgjy9xm12k06jqkyhgh"; + name = "kapman-22.12.2.tar.xz"; }; }; kapptemplate = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kapptemplate-22.12.1.tar.xz"; - sha256 = "0ixgfv3q6a1qiggr0r1fnl2frdblb602p3g98mh4yj824ssh950y"; - name = "kapptemplate-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kapptemplate-22.12.2.tar.xz"; + sha256 = "0l95qpw7bdj9na5x32glm465rghylxdmjacfc3372k934vm8ckdl"; + name = "kapptemplate-22.12.2.tar.xz"; }; }; kate = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kate-22.12.1.tar.xz"; - sha256 = "0r7smfmdfhsfqr102w5di8xx1smbk5z9q6a9fhlplrdxkfckmw33"; - name = "kate-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kate-22.12.2.tar.xz"; + sha256 = "199c807yj5vliy1aa0iz3ryymr3zxviakdkidr71imz4bq8v3m70"; + name = "kate-22.12.2.tar.xz"; }; }; katomic = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/katomic-22.12.1.tar.xz"; - sha256 = "15sdvyzy36bw6dwj4v2i02qjw7r4m4xfqk16l8sphw67071vppch"; - name = "katomic-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/katomic-22.12.2.tar.xz"; + sha256 = "000d28jl01sn6nil1d57j1iy1flmrv7z6yjc3ci7kjmapi1167mc"; + name = "katomic-22.12.2.tar.xz"; }; }; kbackup = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kbackup-22.12.1.tar.xz"; - sha256 = "12ms38wv9skzn3dbpdqr1b1rrr2skni4k226sh14l8rlh1phrwx3"; - name = "kbackup-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kbackup-22.12.2.tar.xz"; + sha256 = "1vyl303j7fzyay55agisbn5vj73g26hdk8ilnlwm946rg6nrcf67"; + name = "kbackup-22.12.2.tar.xz"; }; }; kblackbox = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kblackbox-22.12.1.tar.xz"; - sha256 = "0fs2gdlzxf0xmbvf7l833w053s9rhib0cb9iqg9l1kb83j2x0nfa"; - name = "kblackbox-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kblackbox-22.12.2.tar.xz"; + sha256 = "17x4rgji7pnnmnq4dl6mhmdsc8csn3wnwap92jg3lc9r04vpfk5h"; + name = "kblackbox-22.12.2.tar.xz"; }; }; kblocks = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kblocks-22.12.1.tar.xz"; - sha256 = "1aq68p5g0khsa3ci6lw1cm2rmrl2lmx7vwyw8idgbpb18b6w211w"; - name = "kblocks-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kblocks-22.12.2.tar.xz"; + sha256 = "1qf1qf3r659ya8rr00pqikdxb69c05s0v8dzk2j8ajnbzc19w8sa"; + name = "kblocks-22.12.2.tar.xz"; }; }; kbounce = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kbounce-22.12.1.tar.xz"; - sha256 = "0w9p2f3x1jmw6l0im4l3grbm2329rrhs1caf60rzdprkk7xpi5v7"; - name = "kbounce-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kbounce-22.12.2.tar.xz"; + sha256 = "1lbdicwnv1zz3jlg4v2yblm2xjxslkb64nq0z94cgfp1nzwavq3n"; + name = "kbounce-22.12.2.tar.xz"; }; }; kbreakout = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kbreakout-22.12.1.tar.xz"; - sha256 = "1x5gda3ilsxbsnwgj7mmf20i5i8bw2nnnf8n5wbhi2sqlh05xmpy"; - name = "kbreakout-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kbreakout-22.12.2.tar.xz"; + sha256 = "0cx2m4hqw39kpzp4y5rsxa1y264q318q5qsbjwcflbnm50fdbjpd"; + name = "kbreakout-22.12.2.tar.xz"; }; }; kbruch = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kbruch-22.12.1.tar.xz"; - sha256 = "1jf4gv7yihfm9djxqxlp90g49zp6j3nxvlgkh3r31ki11a993nha"; - name = "kbruch-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kbruch-22.12.2.tar.xz"; + sha256 = "1rc8kjyipknrraiyq7wabjzm3i00jsjkd75d8qfk50i2sdxm47kv"; + name = "kbruch-22.12.2.tar.xz"; }; }; kcachegrind = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcachegrind-22.12.1.tar.xz"; - sha256 = "01ign21xhl5xypxry5jfmay456m64kmsb5292xqrd91kwk56z3ns"; - name = "kcachegrind-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcachegrind-22.12.2.tar.xz"; + sha256 = "065lp2g5cp2pmisjfb2m2m64f20r1c18vridlp7zdkran5d3fq0k"; + name = "kcachegrind-22.12.2.tar.xz"; }; }; kcalc = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcalc-22.12.1.tar.xz"; - sha256 = "17msfxjzyjiq4lfl4p3kxndgplc8q3ghjbvfx8z09r0a0bqd52wl"; - name = "kcalc-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcalc-22.12.2.tar.xz"; + sha256 = "021njz922hah1bwrq2mqc96fzg0ap59ffa3n5ycgb66jld1vnn3n"; + name = "kcalc-22.12.2.tar.xz"; }; }; kcalutils = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcalutils-22.12.1.tar.xz"; - sha256 = "077k3wppnzvpwwzf4n9r81rm996x750npsri4acn94ff7wp98r0r"; - name = "kcalutils-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcalutils-22.12.2.tar.xz"; + sha256 = "1kd2nci8j76r847jh91pjhpcy386ilg82caq0npq2n64li2lq0dq"; + name = "kcalutils-22.12.2.tar.xz"; }; }; kcharselect = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcharselect-22.12.1.tar.xz"; - sha256 = "0c5hswy8vjsbacac3la6n11rf4hr2g79w96qqha4dgjzzparaf4y"; - name = "kcharselect-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcharselect-22.12.2.tar.xz"; + sha256 = "1zhj2yzapcxi4vjx64k8mxqd45qknsb825s1la0bkbilkgzljg3p"; + name = "kcharselect-22.12.2.tar.xz"; }; }; kcolorchooser = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcolorchooser-22.12.1.tar.xz"; - sha256 = "1kkhp7m69jcskpqrf6maw0b3k5wjfham54iwngyzgznz195cmad4"; - name = "kcolorchooser-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcolorchooser-22.12.2.tar.xz"; + sha256 = "0zysz6z08xsxv0psyma0cym57w6fj9j2np14jka097qp58hpjkzi"; + name = "kcolorchooser-22.12.2.tar.xz"; }; }; kcron = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kcron-22.12.1.tar.xz"; - sha256 = "0i5pnqb39mgllzxqdyp4pa0109i1q59lx3q0b6445r4lbgxmdd8a"; - name = "kcron-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kcron-22.12.2.tar.xz"; + sha256 = "1mnb47igwh3kgy75z0ggizj730wajmc2s6kjxbddc6qj33hlrg1k"; + name = "kcron-22.12.2.tar.xz"; }; }; kde-dev-scripts = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kde-dev-scripts-22.12.1.tar.xz"; - sha256 = "0544cjxk8l1hwfzi93xvs0w6fv47dw2s45r5fdzragna3w8nbh9l"; - name = "kde-dev-scripts-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kde-dev-scripts-22.12.2.tar.xz"; + sha256 = "1sr8ykj8n2h4hg85zbz5x68m7kq9sb84k1d6wrxy67n3lzsklswj"; + name = "kde-dev-scripts-22.12.2.tar.xz"; }; }; kde-dev-utils = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kde-dev-utils-22.12.1.tar.xz"; - sha256 = "0vk9ziz4dim55h93v6bfszr7nanxs6hxap059rmq3y5vd4cv5fys"; - name = "kde-dev-utils-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kde-dev-utils-22.12.2.tar.xz"; + sha256 = "1vq1mfys07513gprlj1vmxhl5ijj2p2dxx4ddj2iwg0i9qapjr25"; + name = "kde-dev-utils-22.12.2.tar.xz"; }; }; kdebugsettings = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdebugsettings-22.12.1.tar.xz"; - sha256 = "0fmxh38vc28hjv7brp5khj8mn3k83rwkyjlm6kfxnnxwyp7h3n0a"; - name = "kdebugsettings-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdebugsettings-22.12.2.tar.xz"; + sha256 = "07zw0icfvqg3ispalkyc5h13kln6mpfzgkirwkgnplksd059wzyv"; + name = "kdebugsettings-22.12.2.tar.xz"; }; }; kdeconnect-kde = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdeconnect-kde-22.12.1.tar.xz"; - sha256 = "17yzqibcbab3h1vy88m7wd52gc76j0g5an8mr2xw7nrjl6q7mfm7"; - name = "kdeconnect-kde-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdeconnect-kde-22.12.2.tar.xz"; + sha256 = "09h0by43jrizq2qcmhcr5jbsvhjkcqrgrblzy9i2r0ihhvlkwg87"; + name = "kdeconnect-kde-22.12.2.tar.xz"; }; }; kdeedu-data = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdeedu-data-22.12.1.tar.xz"; - sha256 = "1rfgpb2fa3ivhcicqdb2yvbslgmpw0k1gyrd76awaigymv9hd7l8"; - name = "kdeedu-data-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdeedu-data-22.12.2.tar.xz"; + sha256 = "1nffvgy2imi1csq9z45v2yf7p7d22k8nh25ciiph2dax9w3qlj81"; + name = "kdeedu-data-22.12.2.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdegraphics-mobipocket-22.12.1.tar.xz"; - sha256 = "13iijl2gagnpx55h65mlvq1g2iy8m2d8w5aj1wx3496nxcj0fyl6"; - name = "kdegraphics-mobipocket-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdegraphics-mobipocket-22.12.2.tar.xz"; + sha256 = "1ly3jv64jdzppnipnzr3chm3s8azwfq1pn94pfxm7hj6p6ywn9fn"; + name = "kdegraphics-mobipocket-22.12.2.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdegraphics-thumbnailers-22.12.1.tar.xz"; - sha256 = "172lv6ysp3b13ks9548iw1s8nw7wi1vxnxsaf97bsirq1by4f42a"; - name = "kdegraphics-thumbnailers-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdegraphics-thumbnailers-22.12.2.tar.xz"; + sha256 = "0rzy6icli31fp5z1l3jvnxgwq3fgfijlb3kfi5ci3d8raddyzf6r"; + name = "kdegraphics-thumbnailers-22.12.2.tar.xz"; }; }; kdenetwork-filesharing = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdenetwork-filesharing-22.12.1.tar.xz"; - sha256 = "0mwczjnj3nsnlsk5y0v26fszs5gfq8g3yki8xgan7hgc14p4ncik"; - name = "kdenetwork-filesharing-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdenetwork-filesharing-22.12.2.tar.xz"; + sha256 = "0z94la60pj8qnsnikr7j297mxhbyd4sdjhyccdix1dxdglskzqpy"; + name = "kdenetwork-filesharing-22.12.2.tar.xz"; }; }; kdenlive = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdenlive-22.12.1.tar.xz"; - sha256 = "1pfp00gkvxmm578fj6a86la1p2iypfgx2j1zk72qdj9kczsnw7mg"; - name = "kdenlive-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdenlive-22.12.2.tar.xz"; + sha256 = "1g5ylks4i1sfpdhzimyvvw6ljawk19b28242zsk8nz9cn8gbr786"; + name = "kdenlive-22.12.2.tar.xz"; }; }; kdepim-addons = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdepim-addons-22.12.1.tar.xz"; - sha256 = "1zxs8n28yl8a1kbm4ndljs4giyj473alkqlzkjgc60cz6g2fq58k"; - name = "kdepim-addons-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdepim-addons-22.12.2.tar.xz"; + sha256 = "059p7bb0rkp1ph7cigyld3777ib3i4likhr3rcr9q843ksbws43m"; + name = "kdepim-addons-22.12.2.tar.xz"; }; }; kdepim-runtime = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdepim-runtime-22.12.1.tar.xz"; - sha256 = "0vghpf5lnl0mfwdac1mghr48bfvqg16az090w6msn0rs77ai1q2s"; - name = "kdepim-runtime-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdepim-runtime-22.12.2.tar.xz"; + sha256 = "16j6w6y0c05w9vni6wa633b6g0j3f7z5algn5y2292zqnfa9apzd"; + name = "kdepim-runtime-22.12.2.tar.xz"; }; }; kdesdk-kio = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdesdk-kio-22.12.1.tar.xz"; - sha256 = "1rzcq0v0faa2ix596c209p108wsrj8p8mnvrgkkz6s5gwswqvi0z"; - name = "kdesdk-kio-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdesdk-kio-22.12.2.tar.xz"; + sha256 = "0nahw5747fcyvgzp0axm8cvhjfnlwjwl1q4020whp95nw9pa5yjz"; + name = "kdesdk-kio-22.12.2.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdesdk-thumbnailers-22.12.1.tar.xz"; - sha256 = "1w09rpri600k6v4z0srw0nfrg0dhqhsvxzj3vmgkksw2rllq7gm2"; - name = "kdesdk-thumbnailers-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdesdk-thumbnailers-22.12.2.tar.xz"; + sha256 = "1d79xrxwi760sfjfbv6pjp2hp7n77r17lm6dyvn9m3i5gakq2njx"; + name = "kdesdk-thumbnailers-22.12.2.tar.xz"; }; }; kdev-php = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdev-php-22.12.1.tar.xz"; - sha256 = "0jna5b9c4ir9x622iivbbz2h6bmp9hbvyxa99h791inpfcgbkxh0"; - name = "kdev-php-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdev-php-22.12.2.tar.xz"; + sha256 = "1ds27qf3dbf4m5i8fp5fljx8z41hmhc2915wwm5cqwpyzzmvvx8d"; + name = "kdev-php-22.12.2.tar.xz"; }; }; kdev-python = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdev-python-22.12.1.tar.xz"; - sha256 = "064897836jgrfwqssk0fkxpc5bw61d41l0wk1qqavzv0bd22ljn8"; - name = "kdev-python-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdev-python-22.12.2.tar.xz"; + sha256 = "0c348lrysz3hnb12763f92xw7p8asihc8qnry4mznk8plzrg4895"; + name = "kdev-python-22.12.2.tar.xz"; }; }; kdevelop = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdevelop-22.12.1.tar.xz"; - sha256 = "0qlhjdaaisjqmf1ss1nwrj8ppqy6z7aq9vzh18sb924y439bnc7k"; - name = "kdevelop-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdevelop-22.12.2.tar.xz"; + sha256 = "1jayqbvwx32n6mskdph2mcxf0azzbyc4qc206hfyf2myn5g5xy2p"; + name = "kdevelop-22.12.2.tar.xz"; }; }; kdf = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdf-22.12.1.tar.xz"; - sha256 = "11hh03mhccwqj141xrpkiz72lg1rwzixr3lsdbkjvx8b7mc2f5rc"; - name = "kdf-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdf-22.12.2.tar.xz"; + sha256 = "0vsy1m7lp7lkqg6pmdl5f351rgpcjdizzvihgc1cr6sr1mw4hsmg"; + name = "kdf-22.12.2.tar.xz"; }; }; kdialog = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdialog-22.12.1.tar.xz"; - sha256 = "1wlmq01a78rw3lkv26wjmbyr56y1k945sdwvl521pz5bzanl2ppa"; - name = "kdialog-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdialog-22.12.2.tar.xz"; + sha256 = "1lr6w8j5c38gzlm9qwbchapgn2bc696w7lz4amxb89ixb45miibj"; + name = "kdialog-22.12.2.tar.xz"; }; }; kdiamond = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kdiamond-22.12.1.tar.xz"; - sha256 = "1b0ybhryxkr2p0vbs03pn70w16cpgbps3n1gmf4iqsg4xh86hhcc"; - name = "kdiamond-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kdiamond-22.12.2.tar.xz"; + sha256 = "14z8gy1yzwx6cqgx5dsrn4wy7vnwg4ynlxpm4zzqnpn0ry1v5ba3"; + name = "kdiamond-22.12.2.tar.xz"; }; }; keditbookmarks = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/keditbookmarks-22.12.1.tar.xz"; - sha256 = "0djcm96hcj7fawyyxg39rnwq01p84c1w7hyrsz6c8cha8875lbr1"; - name = "keditbookmarks-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/keditbookmarks-22.12.2.tar.xz"; + sha256 = "0cgc6biqar78f7q355fcf1ds8zsbzvl24376s5ahgzm8ffcl3m6x"; + name = "keditbookmarks-22.12.2.tar.xz"; }; }; kfind = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kfind-22.12.1.tar.xz"; - sha256 = "1li89qvfj7d6q3m8clk1sgzlwrgki966yvbvsjj6q49c463gjfla"; - name = "kfind-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kfind-22.12.2.tar.xz"; + sha256 = "0p0bgyrxvjryzsr1fwxccv3gdbkbvsdwsc9plq9hq1z2wd078ps4"; + name = "kfind-22.12.2.tar.xz"; }; }; kfloppy = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kfloppy-22.12.1.tar.xz"; - sha256 = "0kxx2h4wxpdjzg4nzfj2ws6vs1jbq1l2r1n1zsllbaj7bxy7rif0"; - name = "kfloppy-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kfloppy-22.12.2.tar.xz"; + sha256 = "0bv9xkn8wdm4kxb379alx3l6l2l3k5ainmjgwafgz2hwgn52369m"; + name = "kfloppy-22.12.2.tar.xz"; }; }; kfourinline = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kfourinline-22.12.1.tar.xz"; - sha256 = "0gag64zbm22mwsqkzip7q2lzwc40vqma6cxlf5m40zxin1p0nk7s"; - name = "kfourinline-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kfourinline-22.12.2.tar.xz"; + sha256 = "1cyvpg07y0q8dh1zl7840qkbppx7ndg52v1z95xwcxvggasmgqj6"; + name = "kfourinline-22.12.2.tar.xz"; }; }; kgeography = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kgeography-22.12.1.tar.xz"; - sha256 = "0xfyvzkzy5pp1321iyyvjy35ayav0adbyfym00np3a0sglpmb007"; - name = "kgeography-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kgeography-22.12.2.tar.xz"; + sha256 = "1qcwdg9qkql7ky9m33fx21d1g6585xbm1z2z179sdsnbcpjmx34c"; + name = "kgeography-22.12.2.tar.xz"; }; }; kget = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kget-22.12.1.tar.xz"; - sha256 = "18z2nsr07m4d9ybi4jdv1hvxnf0cpvbyy39znba7r3psr3q9j9sz"; - name = "kget-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kget-22.12.2.tar.xz"; + sha256 = "00z3h6b5f78cvczapzvbz8q12lr69668n6sryijsv5a2aykimgs7"; + name = "kget-22.12.2.tar.xz"; }; }; kgoldrunner = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kgoldrunner-22.12.1.tar.xz"; - sha256 = "1yrz6iafk01sm4mhjgkz8gsphsaxmrgf0zjjyzqqz4blzhi0fm8w"; - name = "kgoldrunner-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kgoldrunner-22.12.2.tar.xz"; + sha256 = "134dp60a86p1a9rn8svzn8ia2ji7kan7bv53gnis4vgric97dm2v"; + name = "kgoldrunner-22.12.2.tar.xz"; }; }; kgpg = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kgpg-22.12.1.tar.xz"; - sha256 = "081g3ib0cd9zyg7vlkj1c99z1x5a1r3v3ck2f7xhlq1vgh6b610m"; - name = "kgpg-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kgpg-22.12.2.tar.xz"; + sha256 = "02qa3148rkcda21a3n83id1cqkr53y2cilhwlsm52cm5998xr4pd"; + name = "kgpg-22.12.2.tar.xz"; }; }; khangman = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/khangman-22.12.1.tar.xz"; - sha256 = "19yqlin45fwf6n9a94cd3h5101cw50rvxsvcx02y9cm405pdnx6l"; - name = "khangman-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/khangman-22.12.2.tar.xz"; + sha256 = "1iw40hmxylhgla3cf40c67vcf1whgag18jkvlprbw9pap47qn6ql"; + name = "khangman-22.12.2.tar.xz"; }; }; khelpcenter = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/khelpcenter-22.12.1.tar.xz"; - sha256 = "1cwn1mp79lps764vdilrprj99b9vxmqfxz81zk2vsyywnfyq3nly"; - name = "khelpcenter-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/khelpcenter-22.12.2.tar.xz"; + sha256 = "1xjmyw92711y5sfdc37q9al6y70css1h914nyn400m93pijl15kp"; + name = "khelpcenter-22.12.2.tar.xz"; }; }; kidentitymanagement = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kidentitymanagement-22.12.1.tar.xz"; - sha256 = "0zvp52kmg9mmgfjw01il0j9656gqi854i3dvir0djhqrqfv8ivb0"; - name = "kidentitymanagement-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kidentitymanagement-22.12.2.tar.xz"; + sha256 = "08021m509msn4sp7l89lrki0bzqdpnjmix3shg2y86pa7sq3r55h"; + name = "kidentitymanagement-22.12.2.tar.xz"; }; }; kig = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kig-22.12.1.tar.xz"; - sha256 = "1mcb98r6j5byvx6bi2rhr3d6c9xdkf9cwnz2wy3v69xsi29var80"; - name = "kig-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kig-22.12.2.tar.xz"; + sha256 = "0r7wl2vpg38hyvx865kdfx39yjjijnyd4cyriq82vj6h4s60lkfh"; + name = "kig-22.12.2.tar.xz"; }; }; kigo = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kigo-22.12.1.tar.xz"; - sha256 = "1nl0i1qdbfpjp1vmy71zwa6f2yp9vlzvfdfb4rdsqdz23x4irbzg"; - name = "kigo-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kigo-22.12.2.tar.xz"; + sha256 = "1wh929p33iq38yw1836zz1hhaz4wyr0834chx9x6zps0f4qbn6f7"; + name = "kigo-22.12.2.tar.xz"; }; }; killbots = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/killbots-22.12.1.tar.xz"; - sha256 = "0lmd3cr087jjd4h557rsbjqr15j47wwr2is7vv4l3idl3hn3izak"; - name = "killbots-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/killbots-22.12.2.tar.xz"; + sha256 = "1kx4c6gaijfxr7ylazlpr07bbby43fk6x3kgv0n9d9d87fkqwigr"; + name = "killbots-22.12.2.tar.xz"; }; }; kimagemapeditor = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kimagemapeditor-22.12.1.tar.xz"; - sha256 = "1shpkn79ag1invsmizz9amz5sbphpasp2a9l86mkzm8bwsrqjihb"; - name = "kimagemapeditor-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kimagemapeditor-22.12.2.tar.xz"; + sha256 = "01kmvlir5p3ip7rylvd9j9xg7zdp6b8f8i5b5qn9d5d220p2n59j"; + name = "kimagemapeditor-22.12.2.tar.xz"; }; }; kimap = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kimap-22.12.1.tar.xz"; - sha256 = "03fgi82l8zq1r13akvchlymlzc2ivxhw9br75i5j93v3jvfhindx"; - name = "kimap-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kimap-22.12.2.tar.xz"; + sha256 = "03qxfybh8wp5pyyympqhzndbv0dxfj141wh7imwazgvhq5hxy1ia"; + name = "kimap-22.12.2.tar.xz"; }; }; kio-extras = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kio-extras-22.12.1.tar.xz"; - sha256 = "0g1is8hgy9zjzm7l3msg6shcjvrl0x6wf5gji0c34hkrr5axd0gv"; - name = "kio-extras-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kio-extras-22.12.2.tar.xz"; + sha256 = "1420kwhff103h57ii60z23m9w2nr2yqys23faa39b59kg4bx01na"; + name = "kio-extras-22.12.2.tar.xz"; }; }; kio-gdrive = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kio-gdrive-22.12.1.tar.xz"; - sha256 = "1p3q17c7f6i7q5k3k5rxckl1wdr8bs9z9v8zz2jwnky3licfhgk8"; - name = "kio-gdrive-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kio-gdrive-22.12.2.tar.xz"; + sha256 = "00vfrfd9j5qp6g71a4yz0sqckw2rgwd6l16agqkbvb7adiyhwlax"; + name = "kio-gdrive-22.12.2.tar.xz"; }; }; kio-zeroconf = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kio-zeroconf-22.12.1.tar.xz"; - sha256 = "0qhl2yygs2bs56nd3ybwhcd4ry0qls2qzhh3lb8y9xqiakz669sn"; - name = "kio-zeroconf-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kio-zeroconf-22.12.2.tar.xz"; + sha256 = "13rbxds754yc7c7pa52am29ynv01dh7v9rl24znnckr674kw532d"; + name = "kio-zeroconf-22.12.2.tar.xz"; }; }; kipi-plugins = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kipi-plugins-22.12.1.tar.xz"; - sha256 = "1jgjnc0svjyq3ffgiksxcxk140lk3bligh8501jv5q7sy6flcwba"; - name = "kipi-plugins-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kipi-plugins-22.12.2.tar.xz"; + sha256 = "09nk8fg97gjbrv7facdns64i65q0as592wfng8fc1ayr897rlf3i"; + name = "kipi-plugins-22.12.2.tar.xz"; }; }; kirigami-gallery = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kirigami-gallery-22.12.1.tar.xz"; - sha256 = "1drbqhcjx6ilqj49y8pghg94hwdwnj08wfl33j9ssn59wh6s282h"; - name = "kirigami-gallery-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kirigami-gallery-22.12.2.tar.xz"; + sha256 = "0rx9dvimwb9wyxvamcmx2pndzm4gi23nz7lfsdk21vs61swhff03"; + name = "kirigami-gallery-22.12.2.tar.xz"; }; }; kiriki = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kiriki-22.12.1.tar.xz"; - sha256 = "1ad71h5fy6c5826hhdfbzr4x9gbl5z28vqwc9kjhyjvl9x24h264"; - name = "kiriki-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kiriki-22.12.2.tar.xz"; + sha256 = "1pvadk48qbc1qbzmdvn70zpr4idvabgw4gddccslgpx1kh1mv6lq"; + name = "kiriki-22.12.2.tar.xz"; }; }; kiten = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kiten-22.12.1.tar.xz"; - sha256 = "0cz5whrmzj6yflqw5cfvazmdf66qcgm1wz94h8f283nnglc4vz49"; - name = "kiten-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kiten-22.12.2.tar.xz"; + sha256 = "0x7f820r6ql19zrfgmgka4766ni2qp2jrwz3qpz1fidkcxrifnhr"; + name = "kiten-22.12.2.tar.xz"; }; }; kitinerary = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kitinerary-22.12.1.tar.xz"; - sha256 = "0i9mbfm5f57hac9rj50474ck05hrdv4m2qdaqi4jm2dr737wmigh"; - name = "kitinerary-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kitinerary-22.12.2.tar.xz"; + sha256 = "0773yb328msavm0azlmpfq9f3fnajcnwwz1njw1zxrgcmknx002h"; + name = "kitinerary-22.12.2.tar.xz"; }; }; kjumpingcube = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kjumpingcube-22.12.1.tar.xz"; - sha256 = "0cyq25cmcirw7kx6yln1nn0l5va9q7a8ngcldggknlnpap3y5m4q"; - name = "kjumpingcube-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kjumpingcube-22.12.2.tar.xz"; + sha256 = "07vcf7n61izfzfpmci82v00k2sbqlj9lpir730cxiq4nxh4z7jqx"; + name = "kjumpingcube-22.12.2.tar.xz"; }; }; kldap = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kldap-22.12.1.tar.xz"; - sha256 = "1dyn01jxlh5qidlnhd989c88id6vxfazn9flhlhsklgcaywf73y8"; - name = "kldap-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kldap-22.12.2.tar.xz"; + sha256 = "08ij0iv5pk2j7zbnf2dwq20jqcxbmbw8gkpyk45bsw4wv840kspc"; + name = "kldap-22.12.2.tar.xz"; }; }; kleopatra = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kleopatra-22.12.1.tar.xz"; - sha256 = "0vg311c1qbvbajb0n46fhy90yafq5rgrh107z172snbvd1v42bj9"; - name = "kleopatra-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kleopatra-22.12.2.tar.xz"; + sha256 = "1rk0jpab600hfkw35zj2zv5bi1avix61xjxfwywzh5ql1kyv0cka"; + name = "kleopatra-22.12.2.tar.xz"; }; }; klettres = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/klettres-22.12.1.tar.xz"; - sha256 = "1jad7waik1agaih98x9bm6apmm6plz9kpsy3zfcll80vl0p6g8vs"; - name = "klettres-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/klettres-22.12.2.tar.xz"; + sha256 = "1cp8w8fy85ij434nrl6ksivd8dw0nkz3vhwhwmwalrx2pj7h6dpa"; + name = "klettres-22.12.2.tar.xz"; }; }; klickety = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/klickety-22.12.1.tar.xz"; - sha256 = "004hj4dbwxy9yyjcgc8awjwc45x9gsh5jfs5w8261l0qj4zinj8l"; - name = "klickety-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/klickety-22.12.2.tar.xz"; + sha256 = "0zq33801das6l9ph3f20mcx5wfrz10yms11v1dvwnzsjszb4mxb9"; + name = "klickety-22.12.2.tar.xz"; }; }; klines = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/klines-22.12.1.tar.xz"; - sha256 = "0jsb5842qmi0ll23x6rmmiv91zwyijnvmq6bvk9fs66i0fczgkj7"; - name = "klines-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/klines-22.12.2.tar.xz"; + sha256 = "18p7hls5pns5n6asdm4ccm6540qin8n7w4sbmlhrq2qqk07csq3z"; + name = "klines-22.12.2.tar.xz"; }; }; kmag = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmag-22.12.1.tar.xz"; - sha256 = "09vq93jab8hv918fabz3i50311n6vglpig5nrgdzv72mvy5y86bk"; - name = "kmag-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmag-22.12.2.tar.xz"; + sha256 = "11ar70m4b4s2n30rw7b5a0r4bkasraxqcfzfbafyzh2bk51166m6"; + name = "kmag-22.12.2.tar.xz"; }; }; kmahjongg = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmahjongg-22.12.1.tar.xz"; - sha256 = "0103p982wih0niqpzk464m2nwyfxinzl783qj7liwavrgsv1fkfy"; - name = "kmahjongg-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmahjongg-22.12.2.tar.xz"; + sha256 = "1snkxbdsvc0nzqknsgq7cg42imz9ay43ddxxqzf7d47fqsvwac4f"; + name = "kmahjongg-22.12.2.tar.xz"; }; }; kmail = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmail-22.12.1.tar.xz"; - sha256 = "02qgsyxs4y37ry2xwwc2x541l4l7gfbhq1gmankn1gp6128p9zhi"; - name = "kmail-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmail-22.12.2.tar.xz"; + sha256 = "0cj56i27bkxmnl26r20dp7s9qzihp3nlwhznj2nz1xzk6dri6fhb"; + name = "kmail-22.12.2.tar.xz"; }; }; kmail-account-wizard = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmail-account-wizard-22.12.1.tar.xz"; - sha256 = "0ncwmhz69fja35fg90a7q8m1vv94cbxapr5n69vgb4xlypf9sd38"; - name = "kmail-account-wizard-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmail-account-wizard-22.12.2.tar.xz"; + sha256 = "1ldypandladx520qhbrkasqb775i3ld1jnq8h2cm7549zm8rdjxj"; + name = "kmail-account-wizard-22.12.2.tar.xz"; }; }; kmailtransport = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmailtransport-22.12.1.tar.xz"; - sha256 = "19b6hhgdvnh23v5yl6rz6c0i742lavmmx1xkkkza69ha0nfaphw2"; - name = "kmailtransport-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmailtransport-22.12.2.tar.xz"; + sha256 = "0x34fhn12prrc4l01yiwar0kvjr8mbyg7p1sjqvq1gz7pjqflyfa"; + name = "kmailtransport-22.12.2.tar.xz"; }; }; kmbox = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmbox-22.12.1.tar.xz"; - sha256 = "1g01n0nvvjpds8bh8zg2r97s3xddhcvlxs6hvb2m7xck0x0w0rnq"; - name = "kmbox-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmbox-22.12.2.tar.xz"; + sha256 = "1xk44ndglf15fipd9hpqviv2j46linj41lprj5x84w9i3lxcflrf"; + name = "kmbox-22.12.2.tar.xz"; }; }; kmime = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmime-22.12.1.tar.xz"; - sha256 = "196sipqw1w4v3va4qy3y4369hyd6zgi8w36fqfkismc1z5lbhhi5"; - name = "kmime-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmime-22.12.2.tar.xz"; + sha256 = "1i3cfdh79wnmkrgidfbvgc3mdn3b8cfchy2zlkj1kbigx06l8cbc"; + name = "kmime-22.12.2.tar.xz"; }; }; kmines = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmines-22.12.1.tar.xz"; - sha256 = "1n0wbgxjah0n2mik4x1fkb1n3bq7zkkiklj2qn7l64qszdxjmzq4"; - name = "kmines-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmines-22.12.2.tar.xz"; + sha256 = "0n2nzx6b0fn9kkqiyavnijjgks7jgfpv4smzqrm55jskwcni9vry"; + name = "kmines-22.12.2.tar.xz"; }; }; kmix = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmix-22.12.1.tar.xz"; - sha256 = "00nq47v6h452wymj5bv3h0ava8wx1vg3w5kc43bnw7rfgh1ikpm9"; - name = "kmix-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmix-22.12.2.tar.xz"; + sha256 = "170rdwm18ld4khy3zck8d2936026cc90r1d37y0f70lw4p37lwpm"; + name = "kmix-22.12.2.tar.xz"; }; }; kmousetool = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmousetool-22.12.1.tar.xz"; - sha256 = "0z7ph40zld45pzyyh8naczqzvccra7rjcy9d12phcdmii2x05njw"; - name = "kmousetool-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmousetool-22.12.2.tar.xz"; + sha256 = "0pl0203zl989wjzpqg6rjqhr8k1fw22r7cw3plvbq2sgl1rlk7i2"; + name = "kmousetool-22.12.2.tar.xz"; }; }; kmouth = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmouth-22.12.1.tar.xz"; - sha256 = "0gkq6m3ylcghqsdwv8i8372dsia8cd61s8jfwnw94v41zbi5l6md"; - name = "kmouth-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmouth-22.12.2.tar.xz"; + sha256 = "0cx3lnx9909d630ccv6ln9sahgvpcxrpf56xm77rrrx1a8b7483l"; + name = "kmouth-22.12.2.tar.xz"; }; }; kmplot = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kmplot-22.12.1.tar.xz"; - sha256 = "0vvqh5nikfd4lx90c41va6y66iad4dgzcgp1kxwshwlzlkpnd783"; - name = "kmplot-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kmplot-22.12.2.tar.xz"; + sha256 = "0nb937war0ss0r4a2hp99qf4y9ac5cp8xfm0abnibsa9fykj9lsa"; + name = "kmplot-22.12.2.tar.xz"; }; }; knavalbattle = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/knavalbattle-22.12.1.tar.xz"; - sha256 = "195vqwp3k7dpgkbg43pl5y7vlm6858y1p6wqdz54dam1gcg7185g"; - name = "knavalbattle-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/knavalbattle-22.12.2.tar.xz"; + sha256 = "0nkkdzysmhn1a7yadzsd829xpsl3aqmizm5rb8yadspfv2kkf6pb"; + name = "knavalbattle-22.12.2.tar.xz"; }; }; knetwalk = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/knetwalk-22.12.1.tar.xz"; - sha256 = "0jf2jk1i3awww6yalb6k5p4c31d323m4f6dj76r5nnalpj81jkiv"; - name = "knetwalk-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/knetwalk-22.12.2.tar.xz"; + sha256 = "1a4gv5pb8j2jfavwz2f0qh022ng84ib4851rfzx2piky6wajpx8f"; + name = "knetwalk-22.12.2.tar.xz"; }; }; knights = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/knights-22.12.1.tar.xz"; - sha256 = "106kq9ahr000nnakiq9n8by06qq2av4pnlh23y4n0z52rbhq866w"; - name = "knights-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/knights-22.12.2.tar.xz"; + sha256 = "1l1igm2fvz9aw2hmpb30cajppdnszhpqya7w980m3snm2br8b45b"; + name = "knights-22.12.2.tar.xz"; }; }; knotes = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/knotes-22.12.1.tar.xz"; - sha256 = "180g0j1fhhixm4qm61whbik3z1pvijw33v2pb4jjzzhbxn439xcm"; - name = "knotes-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/knotes-22.12.2.tar.xz"; + sha256 = "073az341ycmrls3mv9m0rr1d8jps0yrsp62sawirk6sqy18i4ngw"; + name = "knotes-22.12.2.tar.xz"; }; }; kolf = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kolf-22.12.1.tar.xz"; - sha256 = "1v5xkjh6xdfmll7bcqsv1218bvr6q3z3ac1367gd824bcxv5j5np"; - name = "kolf-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kolf-22.12.2.tar.xz"; + sha256 = "08kz6gc6dx0v1ldaa518z1sz1n4dilsik2w8f9rggbl6p1ry53bj"; + name = "kolf-22.12.2.tar.xz"; }; }; kollision = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kollision-22.12.1.tar.xz"; - sha256 = "0ksq4inaq5a74jxxhsajwxnpgr7wnjgpm70kj0layxvryqjlzmkj"; - name = "kollision-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kollision-22.12.2.tar.xz"; + sha256 = "0pkz2lv9pwal4dy9y8bi5vwbp8x9z69g3n9vhwbxc4fv9hcqndnm"; + name = "kollision-22.12.2.tar.xz"; }; }; kolourpaint = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kolourpaint-22.12.1.tar.xz"; - sha256 = "0m1p1xdi8ax8zanqgmyqndzz1bngz4bxdv4lxjx4nqimgjjrbmj8"; - name = "kolourpaint-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kolourpaint-22.12.2.tar.xz"; + sha256 = "07zpc8fxlvm49v53cprz7syj59d73733vi3372gbmzir03q3xcw0"; + name = "kolourpaint-22.12.2.tar.xz"; }; }; kompare = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kompare-22.12.1.tar.xz"; - sha256 = "0g6qw3ajgb71rj99f2sni64i7sqdq586i71pj66pj18kx51m4zsn"; - name = "kompare-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kompare-22.12.2.tar.xz"; + sha256 = "14hyp72942alzrqzpv7mig3m4sgh4iivsnvnh1yacd9y4y1sdapy"; + name = "kompare-22.12.2.tar.xz"; }; }; konqueror = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/konqueror-22.12.1.tar.xz"; - sha256 = "1nyhrnl0ry5439r75974fy7mks78knxs6m8zg8y24glbmjnb1d0m"; - name = "konqueror-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/konqueror-22.12.2.tar.xz"; + sha256 = "1k3vf7sh21iy2v8j8bqxl83nnlpxisj14b6mbi1ldxxgsh6vzyly"; + name = "konqueror-22.12.2.tar.xz"; }; }; konquest = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/konquest-22.12.1.tar.xz"; - sha256 = "0nmrxylx1spvp9m3xwy9xgw2nxrv4k68zanr7q7cxlc95wlxdrk6"; - name = "konquest-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/konquest-22.12.2.tar.xz"; + sha256 = "1haa4zcfsgm25fcr20nvrr5pmy0ynz261q70qj722qh3ljz8cvgy"; + name = "konquest-22.12.2.tar.xz"; }; }; konsole = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/konsole-22.12.1.tar.xz"; - sha256 = "1jyfl6ibcpxphgh5by3501vk519fkvr5y9jhl1wzx6dh4vw7zh9l"; - name = "konsole-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/konsole-22.12.2.tar.xz"; + sha256 = "0d9lqq373vxw0fi54ipfll5qi7dz5ylaa7053csnfp26dmmhky9j"; + name = "konsole-22.12.2.tar.xz"; }; }; kontact = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kontact-22.12.1.tar.xz"; - sha256 = "1m943xcg4csjvcfm9py7h7cr3f2k3xvlidr75ri4sbwnhkl7494k"; - name = "kontact-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kontact-22.12.2.tar.xz"; + sha256 = "11l7zd12yfqw66lak5bvacz7fc6ahv5820vkfx8iacynvm43x94f"; + name = "kontact-22.12.2.tar.xz"; }; }; kontactinterface = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kontactinterface-22.12.1.tar.xz"; - sha256 = "13l44jm0rfin0vbm4znjn25igfmgkifi993qcq5pq6fy96cj2g8l"; - name = "kontactinterface-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kontactinterface-22.12.2.tar.xz"; + sha256 = "0yxpz4az4988yvjxy6za93ayiz8w6q61cqpgi48az2q74kc99qik"; + name = "kontactinterface-22.12.2.tar.xz"; }; }; kontrast = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kontrast-22.12.1.tar.xz"; - sha256 = "0vbqxn73p4d0wlv70gv39pz72lrwc92png14vfwi3ka23751mqai"; - name = "kontrast-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kontrast-22.12.2.tar.xz"; + sha256 = "1x8y26g9iy2hmiyadl3w22c5k3jwh9l59747px1nm7rjzsf11hf7"; + name = "kontrast-22.12.2.tar.xz"; }; }; konversation = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/konversation-22.12.1.tar.xz"; - sha256 = "12246dlhwak7hxj2p2i1wksijqx0a8iwrk7qyh1543hcjm4mkyyv"; - name = "konversation-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/konversation-22.12.2.tar.xz"; + sha256 = "1w12ld2xmncz2bmcsf9k5hxmd2djczbm7y8sh86f512km94m8dzg"; + name = "konversation-22.12.2.tar.xz"; }; }; kopeninghours = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kopeninghours-22.12.1.tar.xz"; - sha256 = "198m55gwvv5ig28hibk7gib6wj7rxahngw6ryshqgr0yhrir1bha"; - name = "kopeninghours-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kopeninghours-22.12.2.tar.xz"; + sha256 = "10bc9a0nljj345cgwpw676mcybp4mffzl4d6kfhc3qvcypagbnw7"; + name = "kopeninghours-22.12.2.tar.xz"; }; }; kopete = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kopete-22.12.1.tar.xz"; - sha256 = "0x7ya19n2wfd7h4h71sqa9kp02qh2sc0r8wy9njjn6basc6cj7yd"; - name = "kopete-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kopete-22.12.2.tar.xz"; + sha256 = "0ans8fi0x3n8p13qw6ylviv952zf4i1zwa0m0qb0saqq11my0c1d"; + name = "kopete-22.12.2.tar.xz"; }; }; korganizer = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/korganizer-22.12.1.tar.xz"; - sha256 = "11gqa0bxpwra5ml8yb7pp7x4jbn3rndi8c66jhmi89gb33qyfnzh"; - name = "korganizer-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/korganizer-22.12.2.tar.xz"; + sha256 = "0gvplwpvrm0ylx75sig9khwpqz5gq7q7qlyjx37r9apd3jgjxmyd"; + name = "korganizer-22.12.2.tar.xz"; }; }; kosmindoormap = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kosmindoormap-22.12.1.tar.xz"; - sha256 = "1fb7hbndys6yji6xmdi6qildzr5s5wknr3mzckjc093sqb5q1dv2"; - name = "kosmindoormap-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kosmindoormap-22.12.2.tar.xz"; + sha256 = "1nn5jafz2v262kwf45cgcy4hh8r7sccmzm36kjfinsbcjqci1vfq"; + name = "kosmindoormap-22.12.2.tar.xz"; }; }; kpat = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpat-22.12.1.tar.xz"; - sha256 = "0c0sr0lyskhqvyrhjb4x1hwpp4b5d1kxc6lnxz9w2qlgng8mr73l"; - name = "kpat-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpat-22.12.2.tar.xz"; + sha256 = "0qm6xizw8978xwysb0n120nqv4b1m5paw0hakw2v2sv5kn10mrns"; + name = "kpat-22.12.2.tar.xz"; }; }; kpimtextedit = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpimtextedit-22.12.1.tar.xz"; - sha256 = "10r1gmsqf2bd2f0x3x0nwdzwyp3b6zg32fq0jkgwd1j1zyxipmaf"; - name = "kpimtextedit-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpimtextedit-22.12.2.tar.xz"; + sha256 = "1g08j89dfw3444chndqmn9jwpr07k279rry10sd45l8rv77kdwdf"; + name = "kpimtextedit-22.12.2.tar.xz"; }; }; kpkpass = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpkpass-22.12.1.tar.xz"; - sha256 = "1hp5d7yzklyi9fy1d3dn39xiaxrhvxskchdrpjs83q91l8c49750"; - name = "kpkpass-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpkpass-22.12.2.tar.xz"; + sha256 = "1a8jgqyiv721plglvwsn7yj8zwh4rdz33g68qc23ka6g39s05nqn"; + name = "kpkpass-22.12.2.tar.xz"; }; }; kpmcore = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpmcore-22.12.1.tar.xz"; - sha256 = "13dpp7fm2750qbnwrp4rpj9kp9skpqkpq5jkj1s40b6267v7p7b4"; - name = "kpmcore-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpmcore-22.12.2.tar.xz"; + sha256 = "1a7clvrqm7mn4qqxq9qba9lbvsj6y717xzdx8cwhkfkv1wwi92xj"; + name = "kpmcore-22.12.2.tar.xz"; }; }; kpublictransport = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kpublictransport-22.12.1.tar.xz"; - sha256 = "1f8imxkdayyp8p30ld80jl5v2wlnajmxl03cysx016lckqzds60l"; - name = "kpublictransport-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kpublictransport-22.12.2.tar.xz"; + sha256 = "1r1hrnc17jkdd73qi9hr2f94f1ca19w1vf4hvc51hnzfmf71blqk"; + name = "kpublictransport-22.12.2.tar.xz"; }; }; kqtquickcharts = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kqtquickcharts-22.12.1.tar.xz"; - sha256 = "1ys904z1c104zyi1184xj63nzhpgwraakmsgw6wfbfxpw6sjy293"; - name = "kqtquickcharts-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kqtquickcharts-22.12.2.tar.xz"; + sha256 = "0m2zapifyi7lxidnhiwic3gp0sz8b5mvhxkz098zzbyygfs8pzwr"; + name = "kqtquickcharts-22.12.2.tar.xz"; }; }; krdc = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/krdc-22.12.1.tar.xz"; - sha256 = "1d8lm41i7mwcg5xd9hl9p32kajxz8iv26696f33z9kb5lhh8wv26"; - name = "krdc-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/krdc-22.12.2.tar.xz"; + sha256 = "1nalhjx4gjr783vbdf9rq5b7ix4af20sxnq446qmkcj923m5rlpy"; + name = "krdc-22.12.2.tar.xz"; }; }; kreversi = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kreversi-22.12.1.tar.xz"; - sha256 = "1aq7qnnmpkkb41znzxvhbfnxr0c60irlirkw7jv2jf7rqlqhahls"; - name = "kreversi-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kreversi-22.12.2.tar.xz"; + sha256 = "0hsf6xkhradd5yy22rj338550h4ls058wzx820qbz3is0l7yh515"; + name = "kreversi-22.12.2.tar.xz"; }; }; krfb = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/krfb-22.12.1.tar.xz"; - sha256 = "04bjybi15bar21334q9zpscw626fih5vnh1ndrz0q95sgyrcpd4z"; - name = "krfb-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/krfb-22.12.2.tar.xz"; + sha256 = "1fxzk5xrg57g84pwd23ibzmp587ly1l8i415mn5kiqkrvqb7i82i"; + name = "krfb-22.12.2.tar.xz"; }; }; kross-interpreters = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kross-interpreters-22.12.1.tar.xz"; - sha256 = "1h97d5gn63r34h9hhn37zmwri1z63c1h30ridahqn45sn2pqigz7"; - name = "kross-interpreters-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kross-interpreters-22.12.2.tar.xz"; + sha256 = "18i86hh9rcjmmx8j30k5z8k6i56qk6rh1nyz2z8zzlcdmnzcnv36"; + name = "kross-interpreters-22.12.2.tar.xz"; }; }; kruler = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kruler-22.12.1.tar.xz"; - sha256 = "18mp51hpqkc9wiwv1zdnx99xjjz58rvk7camz6fj8n4ns1j5q2g1"; - name = "kruler-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kruler-22.12.2.tar.xz"; + sha256 = "0pspihnp7bbmb26jzj6d616j8xmly65cs1h4w6mj5727pnprb4hf"; + name = "kruler-22.12.2.tar.xz"; }; }; ksanecore = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksanecore-22.12.1.tar.xz"; - sha256 = "0cx4n1hdbdfwd86b29risbgg2fijyvjcf29k3qky9gk1c7cfil5d"; - name = "ksanecore-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksanecore-22.12.2.tar.xz"; + sha256 = "133j2q1dm3lxyq10aflaxbjaprzcg875hpfk59z0214cfgnln6hy"; + name = "ksanecore-22.12.2.tar.xz"; }; }; kshisen = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kshisen-22.12.1.tar.xz"; - sha256 = "0phzfzvy8g5dcid92pbx288ix6ri3b9jx6slbqm2wv4p3r96l6hl"; - name = "kshisen-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kshisen-22.12.2.tar.xz"; + sha256 = "0siqribywssqkzjglb3vzizibjzxv8rgizjqbzxsf9frvm9pwc8d"; + name = "kshisen-22.12.2.tar.xz"; }; }; ksirk = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksirk-22.12.1.tar.xz"; - sha256 = "13ykkkygs0xaxd907xq3a9di61p7pnxdggsfmfpz8zk5xawavx2q"; - name = "ksirk-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksirk-22.12.2.tar.xz"; + sha256 = "0i79iiaxqy0w2ikqx503vkdpf6ipwvhkcghhy8rmcqhvc8d1mglq"; + name = "ksirk-22.12.2.tar.xz"; }; }; ksmtp = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksmtp-22.12.1.tar.xz"; - sha256 = "0vbwp2r90fxkmw51fjvphigqjj9lhk0dprb2wnfi9ik08iqc1dk7"; - name = "ksmtp-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksmtp-22.12.2.tar.xz"; + sha256 = "0d04n4i18zglmmdghbzqg75h7qpi19562mgch9aff7jdavx4w582"; + name = "ksmtp-22.12.2.tar.xz"; }; }; ksnakeduel = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksnakeduel-22.12.1.tar.xz"; - sha256 = "16pismxhrygwcbsricmli91sj86w623wkmbblns3yjw7bxy6gg2m"; - name = "ksnakeduel-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksnakeduel-22.12.2.tar.xz"; + sha256 = "08wcqi4cwsb2icf40skkkzhvvpr2gshmjaa33al23b4fmmjbfxyq"; + name = "ksnakeduel-22.12.2.tar.xz"; }; }; kspaceduel = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kspaceduel-22.12.1.tar.xz"; - sha256 = "0qlc3a05ppny6y2kzxqx817qcjmy5zal78bhhxlykn5l4m8hlis4"; - name = "kspaceduel-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kspaceduel-22.12.2.tar.xz"; + sha256 = "0ky59mrph08gpqs2yb6ykxb527qfaj6qgz5hs417a0bripjrznrm"; + name = "kspaceduel-22.12.2.tar.xz"; }; }; ksquares = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksquares-22.12.1.tar.xz"; - sha256 = "1z52c6m7lx9vg8v7kxnblcpag9l3m0r97rv87s7m2g2d3rw4rfib"; - name = "ksquares-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksquares-22.12.2.tar.xz"; + sha256 = "1dxnhqr671mb2drzz1ybvg5iqm2sy3b6vmal0xyfda29zfs1pvia"; + name = "ksquares-22.12.2.tar.xz"; }; }; ksudoku = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksudoku-22.12.1.tar.xz"; - sha256 = "00zylx2gla7c264csyix9z8k1h5zy2l0s9mrb2fds0i7i70gwcsw"; - name = "ksudoku-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksudoku-22.12.2.tar.xz"; + sha256 = "13s44cq0bz0r914ybll8p2f5jr9nfdvz4jx0inc2wzx58rcf6xw9"; + name = "ksudoku-22.12.2.tar.xz"; }; }; ksystemlog = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ksystemlog-22.12.1.tar.xz"; - sha256 = "0y7xjf8z8myg3yv7rcdrqj15hj74vibn6myhspb2cn300z617rhr"; - name = "ksystemlog-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ksystemlog-22.12.2.tar.xz"; + sha256 = "10ax7x6qy7wnnf4pjazjqw43dp8y8lycibqv3sxqqykwkvvfhmyi"; + name = "ksystemlog-22.12.2.tar.xz"; }; }; kteatime = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kteatime-22.12.1.tar.xz"; - sha256 = "0w7kvvs5w6zhahr1gq8gqv5sljfnp1bwznjammvc1hnqy1f4pj3n"; - name = "kteatime-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kteatime-22.12.2.tar.xz"; + sha256 = "1pa58lmp7gv8vm34b1pypv4m5rw8xlw6iydbsq0j6g2xlwjypx6f"; + name = "kteatime-22.12.2.tar.xz"; }; }; ktimer = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktimer-22.12.1.tar.xz"; - sha256 = "0mid32qr2jgn048vsv7j1jljxzwa87lfh0ybxp94c29z2nkxbxnp"; - name = "ktimer-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktimer-22.12.2.tar.xz"; + sha256 = "1hmg5hni3yqyrz7p1nm54gr14p2iz7q9yr803sh8k5f60xmr58j4"; + name = "ktimer-22.12.2.tar.xz"; }; }; ktnef = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktnef-22.12.1.tar.xz"; - sha256 = "0pcl7iaq1ipab5gg60w9wczkj8q7mnk62na2kajbgrmaw61slnj0"; - name = "ktnef-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktnef-22.12.2.tar.xz"; + sha256 = "03rjdpavqvhipla84lr9x9fq5jmx7zvfnngzldn94acra2806sbj"; + name = "ktnef-22.12.2.tar.xz"; }; }; ktorrent = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktorrent-22.12.1.tar.xz"; - sha256 = "093dc7gd9g05v78l5xq3c4k6kqx3x6c5n4w24mzq88x9ilf19jfw"; - name = "ktorrent-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktorrent-22.12.2.tar.xz"; + sha256 = "008676q9v9psyb0jdkmbj7zbmp6y1mjn3ihbx4zmxv3swzd95dgz"; + name = "ktorrent-22.12.2.tar.xz"; }; }; ktouch = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktouch-22.12.1.tar.xz"; - sha256 = "1zw6fkf8kcf1wc63bnc3f2i1ahq7y5vr3068yf49rxvd6dkmwxaw"; - name = "ktouch-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktouch-22.12.2.tar.xz"; + sha256 = "1f50wm5xqdyk5v15k144dq15schb3l5xfpawqv38n0r16jj3ql1b"; + name = "ktouch-22.12.2.tar.xz"; }; }; ktp-accounts-kcm = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-accounts-kcm-22.12.1.tar.xz"; - sha256 = "00sc1jwrqwvia9mylb1xizq0nvkb2zzh72vh9ycpxbxc59x3jdpa"; - name = "ktp-accounts-kcm-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-accounts-kcm-22.12.2.tar.xz"; + sha256 = "1lcchdhxj9xba2l8sqv6xhan1559asncy753idy95lzbk10algqf"; + name = "ktp-accounts-kcm-22.12.2.tar.xz"; }; }; ktp-approver = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-approver-22.12.1.tar.xz"; - sha256 = "1s26y6wmn1m65rk8v1hd511qk21ll52p62hqp39gy4k2wivs1w5y"; - name = "ktp-approver-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-approver-22.12.2.tar.xz"; + sha256 = "1696p98aarmi8lf9n4pzv6rhpbdzn6gs5ci5ms2ypazv1a6jsi3v"; + name = "ktp-approver-22.12.2.tar.xz"; }; }; ktp-auth-handler = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-auth-handler-22.12.1.tar.xz"; - sha256 = "0qcklfnr5nm8c5x5p52nyjkkl2xjw5jzsnn5wsav8bzcm7pfrvp8"; - name = "ktp-auth-handler-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-auth-handler-22.12.2.tar.xz"; + sha256 = "033g8ail8qkv34g1h2ns9wyp64qmz59v1180n83bc9k3jzsnrk2q"; + name = "ktp-auth-handler-22.12.2.tar.xz"; }; }; ktp-call-ui = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-call-ui-22.12.1.tar.xz"; - sha256 = "1v60czwgiad0psas4ky7psyba75bxlg1xry26qrh3xp0r67a2gg3"; - name = "ktp-call-ui-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-call-ui-22.12.2.tar.xz"; + sha256 = "030rzda1l5vir1hcahdirh5n3d49c74m1ijag3cxjip7mv39q7mq"; + name = "ktp-call-ui-22.12.2.tar.xz"; }; }; ktp-common-internals = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-common-internals-22.12.1.tar.xz"; - sha256 = "0j48s6dk8a0925c84iwwk9j3vyw5lnx7mc9jfwaw523qi3pdhc60"; - name = "ktp-common-internals-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-common-internals-22.12.2.tar.xz"; + sha256 = "1d9kzlbf28gprncw98ldwd32cvi4gpi5njb281z5fn1z8m2q6qxl"; + name = "ktp-common-internals-22.12.2.tar.xz"; }; }; ktp-contact-list = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-contact-list-22.12.1.tar.xz"; - sha256 = "09dhr3vclymbkhl1zcd1gqpln5gdb6x4pa3as9gygqfiginnzbqc"; - name = "ktp-contact-list-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-contact-list-22.12.2.tar.xz"; + sha256 = "1xwx74870gqgamb5j6mnngc9l4vyjplnhi7bjf0ik7srg1lq4f34"; + name = "ktp-contact-list-22.12.2.tar.xz"; }; }; ktp-contact-runner = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-contact-runner-22.12.1.tar.xz"; - sha256 = "0d8fj2lf2h1bi36mv2yakc1nz8wmqd2znjx4vjmj7cf49jpr9jlk"; - name = "ktp-contact-runner-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-contact-runner-22.12.2.tar.xz"; + sha256 = "13j9vjdscdm5ljkqi4hy2kghz5w2r6lha78chyyzg3yjdrwayqp5"; + name = "ktp-contact-runner-22.12.2.tar.xz"; }; }; ktp-desktop-applets = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-desktop-applets-22.12.1.tar.xz"; - sha256 = "1wiwflsavbq971mrycn2qrb5xngd6kmph0xwmxj001r3vj6wmxvx"; - name = "ktp-desktop-applets-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-desktop-applets-22.12.2.tar.xz"; + sha256 = "1dxb0n8lq9d31yqrhx5jrqxj9j69x5qq5yq89lfipjz3xmqvws84"; + name = "ktp-desktop-applets-22.12.2.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-filetransfer-handler-22.12.1.tar.xz"; - sha256 = "0wklr4k2ybbpla0ybnqcj8ms46r14v47ldgy6pkba3lcvydn7zs3"; - name = "ktp-filetransfer-handler-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-filetransfer-handler-22.12.2.tar.xz"; + sha256 = "0dqp2rzld67qlxxj85bi331jn8m6rc7mdd851h3396j6cz6g8bm5"; + name = "ktp-filetransfer-handler-22.12.2.tar.xz"; }; }; ktp-kded-module = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-kded-module-22.12.1.tar.xz"; - sha256 = "123kvzn2cp2gkpgs3wqigzdmxval39jr0xwwr9mrfnbsdyf9cqs1"; - name = "ktp-kded-module-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-kded-module-22.12.2.tar.xz"; + sha256 = "0bpvmf9a9hkiz5f482fnc4qf0imys82ax5iz0rz32blp5j8cydil"; + name = "ktp-kded-module-22.12.2.tar.xz"; }; }; ktp-send-file = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-send-file-22.12.1.tar.xz"; - sha256 = "190gv19fzarj9mm8xp282sqag85hpam9sjiggcixqzcdmwp509z0"; - name = "ktp-send-file-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-send-file-22.12.2.tar.xz"; + sha256 = "0alfkv94s2zxxsxcm67dxvw3j9r5qj8wcn5w40wrp8qw93wigddy"; + name = "ktp-send-file-22.12.2.tar.xz"; }; }; ktp-text-ui = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktp-text-ui-22.12.1.tar.xz"; - sha256 = "1zdxjf2qvi4cg0hk9x9dv91gay4sqpp6h92vy8pi2fids98b5qa6"; - name = "ktp-text-ui-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktp-text-ui-22.12.2.tar.xz"; + sha256 = "0ryvi9qsi9bh6c1jjpq69bpgzshp3qi1ap7m9xar8icjbih3nllh"; + name = "ktp-text-ui-22.12.2.tar.xz"; }; }; ktuberling = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/ktuberling-22.12.1.tar.xz"; - sha256 = "0y7rf74pqd9cjh59w5hz59lixzx8l3qxaaqjyrbrrhal90yxq1g7"; - name = "ktuberling-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/ktuberling-22.12.2.tar.xz"; + sha256 = "13ks4ai28mb3fhjz2nvlwpb1997pp95l7bdw851i9d3lp2rr8bgn"; + name = "ktuberling-22.12.2.tar.xz"; }; }; kturtle = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kturtle-22.12.1.tar.xz"; - sha256 = "0w3kki02z0hhldalyf08nnvplska10v7d01bkgx5syrlnq9rvafb"; - name = "kturtle-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kturtle-22.12.2.tar.xz"; + sha256 = "18zcq2y48l7nzg20bv8kx370s4rfwl6xix452p6bhbbik7msfr85"; + name = "kturtle-22.12.2.tar.xz"; }; }; kubrick = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kubrick-22.12.1.tar.xz"; - sha256 = "0azr8j3070j6h7c3alkb559i2b8zb4kvazn6dqavj9bpwmymlpnk"; - name = "kubrick-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kubrick-22.12.2.tar.xz"; + sha256 = "02npa6jlzy73zn10kl6nnglagwpzbynk3m6q4a92897xmlzsx537"; + name = "kubrick-22.12.2.tar.xz"; }; }; kwalletmanager = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kwalletmanager-22.12.1.tar.xz"; - sha256 = "0anas3gnkhk1zinjjpixmlcj00bl2q3s5xb21mk1b4wzyz15w20g"; - name = "kwalletmanager-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kwalletmanager-22.12.2.tar.xz"; + sha256 = "1khbxnzciyi4l5dv6xkk5pjw1qk2wbn6l5n8v01azwkllh7wps4q"; + name = "kwalletmanager-22.12.2.tar.xz"; }; }; kwave = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kwave-22.12.1.tar.xz"; - sha256 = "0cvlyrhfw7mc58c25y9cic6c39jc42h3kygdy0v1fp8bg93xzzg3"; - name = "kwave-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kwave-22.12.2.tar.xz"; + sha256 = "0fz23sxn7yp5qvahyjp3ifl7fp7wm18jv20p0fiaq6xsj1q6nf2r"; + name = "kwave-22.12.2.tar.xz"; }; }; kwordquiz = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/kwordquiz-22.12.1.tar.xz"; - sha256 = "1xzs0rkmk1mnlss31qhcbwmm6ss9f7my64wsiyfp67rchz9gbl31"; - name = "kwordquiz-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/kwordquiz-22.12.2.tar.xz"; + sha256 = "0jadvh00pxjy9bzs2kvn3raywl569rva1n9pa3v0jjgpaa6pkck8"; + name = "kwordquiz-22.12.2.tar.xz"; }; }; libgravatar = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libgravatar-22.12.1.tar.xz"; - sha256 = "0dpvcw5793fsmr23zvnwn2kr194bq880pb3xpq77z9b00yhm6i26"; - name = "libgravatar-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libgravatar-22.12.2.tar.xz"; + sha256 = "1paxv6x8sqzm8xhhnv7f2llk3vyyg9nir2fkdly1gi6b9nl1649q"; + name = "libgravatar-22.12.2.tar.xz"; }; }; libkcddb = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkcddb-22.12.1.tar.xz"; - sha256 = "0w6d2qn4xzxywqj3khbzz3g9lgq5bvimvwqjs1p7i6hak5y4aa0f"; - name = "libkcddb-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkcddb-22.12.2.tar.xz"; + sha256 = "1z04y7ybyfpdzapa0i27w5ryymqfbk7p96ifkhmzf79xvl04g805"; + name = "libkcddb-22.12.2.tar.xz"; }; }; libkcompactdisc = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkcompactdisc-22.12.1.tar.xz"; - sha256 = "1lv94pzyyh90ga18flky096jdbjnf2rl1wn0p17w4lqlhm2n6d40"; - name = "libkcompactdisc-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkcompactdisc-22.12.2.tar.xz"; + sha256 = "169hbqyxy7nhddv3428ynv487fga2yz1m89cj9gjyhpj07pv3df4"; + name = "libkcompactdisc-22.12.2.tar.xz"; }; }; libkdcraw = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkdcraw-22.12.1.tar.xz"; - sha256 = "1sv5mkpf9r7vicyn7kxiaa7ykr81c39hnzh45in95m3ygy9p22lb"; - name = "libkdcraw-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkdcraw-22.12.2.tar.xz"; + sha256 = "11pnbbavviiryyia0ciyfrdhby4f76j988jd91s2hbg2pwh0l1hz"; + name = "libkdcraw-22.12.2.tar.xz"; }; }; libkdegames = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkdegames-22.12.1.tar.xz"; - sha256 = "0agyf6zvr24h550jagpngndmag6xmkjc7m0qmc9mjjk2yg6ildcm"; - name = "libkdegames-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkdegames-22.12.2.tar.xz"; + sha256 = "1x5bi4r6lsxrc68swvrapmszb1hi041aim5pkkp96mka3s97ybrz"; + name = "libkdegames-22.12.2.tar.xz"; }; }; libkdepim = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkdepim-22.12.1.tar.xz"; - sha256 = "1n6v9k1gwgvwjw0fqyj4vq9hw5kzy75dl3h6fmh4cyww9hjrjibl"; - name = "libkdepim-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkdepim-22.12.2.tar.xz"; + sha256 = "1c3bry6z9qi3fhybv018rbrwy4an5km94gygb5jyrkfgpdy94w7h"; + name = "libkdepim-22.12.2.tar.xz"; }; }; libkeduvocdocument = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkeduvocdocument-22.12.1.tar.xz"; - sha256 = "08svz6c2w9lyax0x6gj8zxikz3nzna0r2l1s41b3bhpjs3y3jkf4"; - name = "libkeduvocdocument-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkeduvocdocument-22.12.2.tar.xz"; + sha256 = "1ndzfyf7fn0saska59gvwhidq81arxnxx28ji66fdy7kvbr4a1bg"; + name = "libkeduvocdocument-22.12.2.tar.xz"; }; }; libkexiv2 = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkexiv2-22.12.1.tar.xz"; - sha256 = "1rxrw0m3wxdjzlc0plh0l0qpia6ipbx562m5dq9b9w2ppyxk8213"; - name = "libkexiv2-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkexiv2-22.12.2.tar.xz"; + sha256 = "0034lcsgcfdlkmz6vghxbbsvw3cr32hv6vh9hffz033j2035vc8l"; + name = "libkexiv2-22.12.2.tar.xz"; }; }; libkgapi = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkgapi-22.12.1.tar.xz"; - sha256 = "0i6ip7vrgvfzx27mjr2hyny6yfi622b5q0gp7kpzs95gnfc2f60i"; - name = "libkgapi-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkgapi-22.12.2.tar.xz"; + sha256 = "1n418dsic6jshqahby5drcngd72z6wg23fa9f1wi3h64z76qdddz"; + name = "libkgapi-22.12.2.tar.xz"; }; }; libkipi = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkipi-22.12.1.tar.xz"; - sha256 = "01xyglfzlk6aczxqcg51yx723p6i0m6d91kwixbj0nzkmjaafza2"; - name = "libkipi-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkipi-22.12.2.tar.xz"; + sha256 = "05vrh94vhklyq7bvpfd9wj54hs48zhbn2z17ln75snvzans7mjq9"; + name = "libkipi-22.12.2.tar.xz"; }; }; libkleo = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkleo-22.12.1.tar.xz"; - sha256 = "13flblvkglj25af4jhn9qd0w2krmmmc9icgrppxi8cnlrjyb579y"; - name = "libkleo-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkleo-22.12.2.tar.xz"; + sha256 = "10w14qvflqc9cx5wrgapgyidnj43ik6dl6s36y2k2qw691a3jrrx"; + name = "libkleo-22.12.2.tar.xz"; }; }; libkmahjongg = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkmahjongg-22.12.1.tar.xz"; - sha256 = "1x64iv0c0b1hpn0aj6scq1dz22w95fr1ikq317zvb3vff6wwrbwm"; - name = "libkmahjongg-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkmahjongg-22.12.2.tar.xz"; + sha256 = "0h09d2zb2lihwvr18vl77k5bl64zrpp5wn2nlf1czwkafna83pzy"; + name = "libkmahjongg-22.12.2.tar.xz"; }; }; libkomparediff2 = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libkomparediff2-22.12.1.tar.xz"; - sha256 = "16bs5ifvprwjk0gkgp3vgqn2mgvzjkv4gm338xn58ziiisk0wq0m"; - name = "libkomparediff2-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libkomparediff2-22.12.2.tar.xz"; + sha256 = "1gwc1dga01f8s2gapngw6zrvns3ks5sdkga0hmv5hrxi2zyx7vm3"; + name = "libkomparediff2-22.12.2.tar.xz"; }; }; libksane = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libksane-22.12.1.tar.xz"; - sha256 = "03kp3jq6y8ia2jshxrq74knazmb2v7i8q5pjv2w11v3gl5m9j0kw"; - name = "libksane-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libksane-22.12.2.tar.xz"; + sha256 = "0xj7vc2hnzgg0z14nh1z5ik4fqkszxjvvjh68qn64xrsf57g4994"; + name = "libksane-22.12.2.tar.xz"; }; }; libksieve = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libksieve-22.12.1.tar.xz"; - sha256 = "0wc505rphvywvixclh17abqla6nnyx8i8j4aysisfzjxkfwi1lsk"; - name = "libksieve-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libksieve-22.12.2.tar.xz"; + sha256 = "16507jn2zzvcg4a4ka870q716m696j1sbjfgnsh46vdy71zkxnrr"; + name = "libksieve-22.12.2.tar.xz"; }; }; libktorrent = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/libktorrent-22.12.1.tar.xz"; - sha256 = "14kk8r67v6wssijqlj6p8sah89cxjgn8420pj4m0cvb4bhkf3vjd"; - name = "libktorrent-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/libktorrent-22.12.2.tar.xz"; + sha256 = "15npc4n6p5s9z472ww3j8hxbmnvsdjp032zl4004794gwi7iph0r"; + name = "libktorrent-22.12.2.tar.xz"; }; }; lokalize = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/lokalize-22.12.1.tar.xz"; - sha256 = "1mkqk6azf2253z0ifj9y0wf8wdbxwhvn4k659cy3hcdfzd9a73nd"; - name = "lokalize-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/lokalize-22.12.2.tar.xz"; + sha256 = "1fmi1szwif5absg3czzjzh28nwa6k9j332gsi39c9jrznrkfsmyr"; + name = "lokalize-22.12.2.tar.xz"; }; }; lskat = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/lskat-22.12.1.tar.xz"; - sha256 = "0srx44k6zlsskl2mh0xrprxzhfm98ywlvc1br8l639vvr5mx2ms9"; - name = "lskat-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/lskat-22.12.2.tar.xz"; + sha256 = "1199glblbi2hbkyr2bd67v7ybsd9qpbmj9nbyswdis9gmk4jd0fp"; + name = "lskat-22.12.2.tar.xz"; }; }; mailcommon = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/mailcommon-22.12.1.tar.xz"; - sha256 = "009cgafhq26nqf1km4lcmypw1y0dig06wmy9rby4pis1f3ikvg5w"; - name = "mailcommon-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/mailcommon-22.12.2.tar.xz"; + sha256 = "171p4s5mfsa9lib6yk4jinircsz4rgry1x517ixxp8j5y7gm06b7"; + name = "mailcommon-22.12.2.tar.xz"; }; }; mailimporter = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/mailimporter-22.12.1.tar.xz"; - sha256 = "1cgpxavsla32081mynmc4jj6xyg1ahwvqpwvllzdgw060m190r5n"; - name = "mailimporter-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/mailimporter-22.12.2.tar.xz"; + sha256 = "1mvbvj7h476a3s2nxgzwbpsv48l53h6gvlkwa9lpj0llsl3xzc4z"; + name = "mailimporter-22.12.2.tar.xz"; }; }; marble = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/marble-22.12.1.tar.xz"; - sha256 = "1hhsfzcqg7pzj02j56zgz0n36ps7y8rkpnpbnn14c8l1xvic9x2v"; - name = "marble-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/marble-22.12.2.tar.xz"; + sha256 = "0fnsxpa75h2s5ak5ydv6v1wpsdxgkq7aqa2ywb65fl2w7knnm6pd"; + name = "marble-22.12.2.tar.xz"; }; }; markdownpart = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/markdownpart-22.12.1.tar.xz"; - sha256 = "1c8hacz0rqgawmvg2vk0m9sbz14s9z4h0fxxbism1pn3xs7nxdhm"; - name = "markdownpart-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/markdownpart-22.12.2.tar.xz"; + sha256 = "1w1p8q7rzbmw6q16nawiz2pzi1hgz3bsw6gzccwlpz76gsqrlfpy"; + name = "markdownpart-22.12.2.tar.xz"; }; }; mbox-importer = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/mbox-importer-22.12.1.tar.xz"; - sha256 = "1wy46bkm69hpv2rl0mcq1xdklr54clnqvskadny58pj8g9krjcnr"; - name = "mbox-importer-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/mbox-importer-22.12.2.tar.xz"; + sha256 = "00lccs9jm02j2rr5ia8wamx6y220z8ix5mjn8c3i6gampybv0446"; + name = "mbox-importer-22.12.2.tar.xz"; }; }; messagelib = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/messagelib-22.12.1.tar.xz"; - sha256 = "09w2n3wvs5fdbq5nbr9fdigjsxqrsi2dx6zxpgd9jf1m1bmcfd7y"; - name = "messagelib-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/messagelib-22.12.2.tar.xz"; + sha256 = "11c199q82w16nkx9mwswzg83lj4mv06vnv9dm4gqsg5rk7vf3jsz"; + name = "messagelib-22.12.2.tar.xz"; }; }; minuet = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/minuet-22.12.1.tar.xz"; - sha256 = "0zyrbccs2knzj19gh9ykqcyn5j8z9lxnwy15lb2f7h95hqqkn1xy"; - name = "minuet-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/minuet-22.12.2.tar.xz"; + sha256 = "1j9n7wqmvw27zwmk0ayl7jlr2i9wmd25b84m7pa9vhm34kgi1cc3"; + name = "minuet-22.12.2.tar.xz"; }; }; okular = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/okular-22.12.1.tar.xz"; - sha256 = "0w0agchkh0fszhvshqkvxs4z0i3q1vnaijqkzm119y1pjwynfkaw"; - name = "okular-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/okular-22.12.2.tar.xz"; + sha256 = "0l0iakc8zyj8xnv70hwf9kp1h0ayai7hffwi06p6v6nk5f0wnbjw"; + name = "okular-22.12.2.tar.xz"; }; }; palapeli = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/palapeli-22.12.1.tar.xz"; - sha256 = "0r26nlh26f0wwwg19ppq99ljsb0mfpi034h4g7fix5cq5ps0nyk5"; - name = "palapeli-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/palapeli-22.12.2.tar.xz"; + sha256 = "19s05d7v1x06ywcdfz5ch61nm4igj1493h9v3vkvp9ky4q6asspi"; + name = "palapeli-22.12.2.tar.xz"; }; }; parley = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/parley-22.12.1.tar.xz"; - sha256 = "02gqylb3liynnjq1vl67y3zkcadnpixaz3zlfx7j8zxz2p2zlxlb"; - name = "parley-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/parley-22.12.2.tar.xz"; + sha256 = "0sdls4f31k99p3ls3ibg0qqcrgq6c3lf8wmllcj4xaps84y1ar5k"; + name = "parley-22.12.2.tar.xz"; }; }; partitionmanager = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/partitionmanager-22.12.1.tar.xz"; - sha256 = "06ja3qnxshcg0hxczh6z6wc76dcsm41in8np07ch4l13d6nkpqpj"; - name = "partitionmanager-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/partitionmanager-22.12.2.tar.xz"; + sha256 = "1l3nkk4jbzz4kmv1ibyzji5milnjjnpbq9xblazd8y52knqlaqk0"; + name = "partitionmanager-22.12.2.tar.xz"; }; }; picmi = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/picmi-22.12.1.tar.xz"; - sha256 = "06bhkxqhwmk7hpmcsn0s9bql4anlk260dz63g6bcx4c93ln01ypq"; - name = "picmi-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/picmi-22.12.2.tar.xz"; + sha256 = "0dhqln0y366jrf5xs9q6ml8cc4rzi3brcaww96i4zhs707xiv8bb"; + name = "picmi-22.12.2.tar.xz"; }; }; pim-data-exporter = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/pim-data-exporter-22.12.1.tar.xz"; - sha256 = "1cijyd6qscghppcspimdc7kdvv4la6mbk57z9sj5agx2i05xsda6"; - name = "pim-data-exporter-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/pim-data-exporter-22.12.2.tar.xz"; + sha256 = "11qxbvrdcfhfbvnnc7f5v6vmfx04vkavwam60q39bvm5y1qyhnq3"; + name = "pim-data-exporter-22.12.2.tar.xz"; }; }; pim-sieve-editor = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/pim-sieve-editor-22.12.1.tar.xz"; - sha256 = "1nx1vahgxr175fplm4rv7frlr53fqn50xmfsaph42idi7nnqcrl4"; - name = "pim-sieve-editor-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/pim-sieve-editor-22.12.2.tar.xz"; + sha256 = "0d2hsrp53wv1vzrijnqzx1faz1aqfdkx020v6l132haywz1f44jh"; + name = "pim-sieve-editor-22.12.2.tar.xz"; }; }; pimcommon = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/pimcommon-22.12.1.tar.xz"; - sha256 = "128nqsxw275zi6dn3v1pnip9nhraz6pqjlzklkqm5qljfs5z6wk1"; - name = "pimcommon-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/pimcommon-22.12.2.tar.xz"; + sha256 = "1d2m256kd8lyv165jvswqw91wkkhxgpxf73hfw1rlwzvdlpyy5qd"; + name = "pimcommon-22.12.2.tar.xz"; }; }; poxml = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/poxml-22.12.1.tar.xz"; - sha256 = "0rs0bl0vg8qjaxgxbhlv90rgc7y13xg47j9k6v1q1v0gz07l8ms6"; - name = "poxml-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/poxml-22.12.2.tar.xz"; + sha256 = "0n3y1208ffya4p1lbbyj2g2g1mcw63h27wihxijax3iyp6lv6wwx"; + name = "poxml-22.12.2.tar.xz"; }; }; print-manager = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/print-manager-22.12.1.tar.xz"; - sha256 = "09y1x6if1cxsb6xh9b9alfxrfpnzymm71v6hjc0b13jalg7bha1b"; - name = "print-manager-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/print-manager-22.12.2.tar.xz"; + sha256 = "1w1jrqvw10brn7gcpkzcq5618wcjbl9lqplr9nw5h2ag31b8gzhs"; + name = "print-manager-22.12.2.tar.xz"; }; }; rocs = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/rocs-22.12.1.tar.xz"; - sha256 = "032jd0r7wyl33y24wnb95vz70kciyw132ph355ln6vrkkymmfy7w"; - name = "rocs-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/rocs-22.12.2.tar.xz"; + sha256 = "0xjxb1hgcyglnycywgq529sh5722chdngmby5cm4bhcjnmysr3vh"; + name = "rocs-22.12.2.tar.xz"; }; }; signon-kwallet-extension = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/signon-kwallet-extension-22.12.1.tar.xz"; - sha256 = "1pvm1046mp0dlal9ffr455yhvv0689c4iaiv2vkdz7p2lf3745wh"; - name = "signon-kwallet-extension-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/signon-kwallet-extension-22.12.2.tar.xz"; + sha256 = "1b7dhmpycdvvz269kphbddk9xrbhnq3d51mjxvp4aahziyqvjhr2"; + name = "signon-kwallet-extension-22.12.2.tar.xz"; }; }; skanlite = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/skanlite-22.12.1.tar.xz"; - sha256 = "1j00z785ajqj61qsdbq7pwnw5pjsfkqpk52s7li2kkmikmfhqsq8"; - name = "skanlite-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/skanlite-22.12.2.tar.xz"; + sha256 = "17jjx74syb2j7lrqjwfpym3wlk9cq5adgpf539k4zkszxhcqd4i0"; + name = "skanlite-22.12.2.tar.xz"; }; }; skanpage = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/skanpage-22.12.1.tar.xz"; - sha256 = "0wnkw2ybd4x35c1jfx6rmdj4iz4gh9bpfdc5ydri790l7c2zz1w4"; - name = "skanpage-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/skanpage-22.12.2.tar.xz"; + sha256 = "0ylh3grlfl77my135lszlz53fbhxvwyazf5aanhj33ryqwwyy925"; + name = "skanpage-22.12.2.tar.xz"; }; }; spectacle = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/spectacle-22.12.1.tar.xz"; - sha256 = "05pihywsbml6ncvzd9wih9bm0bwdxvlps9678vai9rdxks7apa78"; - name = "spectacle-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/spectacle-22.12.2.tar.xz"; + sha256 = "1gsz3wsir41a8ncyjlmfk8313c88x215myqgs3917wsb9f8x358j"; + name = "spectacle-22.12.2.tar.xz"; }; }; step = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/step-22.12.1.tar.xz"; - sha256 = "1k8s8cyfz895sx5b0w4a71nrsx89zkxk7c8a8fr6jxybgf9gnxz2"; - name = "step-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/step-22.12.2.tar.xz"; + sha256 = "056lhpnfjayv6qnng0g6pbr91zqhj0vzk2k87kj7k6snbhbvfm1w"; + name = "step-22.12.2.tar.xz"; }; }; svgpart = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/svgpart-22.12.1.tar.xz"; - sha256 = "08ffgwm7s8r8yc6j956j08y8dikmgssv0h0xlmk6wlxl0bryb4fr"; - name = "svgpart-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/svgpart-22.12.2.tar.xz"; + sha256 = "0c3b3l86a1di6k6jjf359hdrdxpyxj2fif7kci41y1ig4hipra4x"; + name = "svgpart-22.12.2.tar.xz"; }; }; sweeper = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/sweeper-22.12.1.tar.xz"; - sha256 = "0an6md9nk8sv2bmjcvghjxydpdz0rf4bhianym22gzsyxxi0bccj"; - name = "sweeper-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/sweeper-22.12.2.tar.xz"; + sha256 = "0mj3vhlhjm768zqi0fzs1zwcm566gpr23d36pl436y0rb3d9fm2c"; + name = "sweeper-22.12.2.tar.xz"; }; }; umbrello = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/umbrello-22.12.1.tar.xz"; - sha256 = "1d72808jwgjwzjkj5kw7wvkfvk05x8w0x2abzsbzhl9qf06jgn1h"; - name = "umbrello-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/umbrello-22.12.2.tar.xz"; + sha256 = "0l5rpi7nmky2q2rcnq66jx7g1wra2a21b2dq0hpnjn1f9fskxa97"; + name = "umbrello-22.12.2.tar.xz"; }; }; yakuake = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/yakuake-22.12.1.tar.xz"; - sha256 = "0qh48y2jj7lxn0lqyff5s93s4csyw12da6jcixbmcmnm3z33p09l"; - name = "yakuake-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/yakuake-22.12.2.tar.xz"; + sha256 = "07av7ikj70kj4xwjml2him4lin76gqzs3zrrz2w7q75m6m9qqzpj"; + name = "yakuake-22.12.2.tar.xz"; }; }; zanshin = { - version = "22.12.1"; + version = "22.12.2"; src = fetchurl { - url = "${mirror}/stable/release-service/22.12.1/src/zanshin-22.12.1.tar.xz"; - sha256 = "002smc57r54fs4c2ngk8k20wjjk3khmyfpjlw6hmxbn1hnzl609w"; - name = "zanshin-22.12.1.tar.xz"; + url = "${mirror}/stable/release-service/22.12.2/src/zanshin-22.12.2.tar.xz"; + sha256 = "18df7by60w5vcjy330y10pnzg3xar8i6273q9zba81qkvpvqkwn2"; + name = "zanshin-22.12.2.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix index d0ace35400..145f1ef4fd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.12.0"; + version = "2.13.1"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-WCu1/5dewsjVMyFo+BaAgCOcK08Fe3ldJhDzCl8B+2M=" "zip"; - i686-linux = fetch "linux_386" "sha256-eRNX7+IF9v3JzXxwp5WshqYOC5/uizniWOKSc3q2yL8=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-wvhWwcDufwvh8Isx4QpyyHEJ+3yU7f/0a4r5Itns68c=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-ZOU4huC1FUj0ZiqIgs+4tU8t/w5VVD/UiWGVFHS50sw=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-Zuy9ZQY5kzRgcGfzkndGr30koR8Z8cvEfCs+n+/P2zM=" "zip"; + i686-linux = fetch "linux_386" "sha256-MlUSL8+O7sDG1cSfJvw+nEC7d1N6Bb2By1fw2ooZQfc=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-EwUqjn3QKwTYqiYvm6vAsHnEcWHaRGJ2WzJ9OHP1XWM=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-Mag2UG5IhikxV0aA/OhA9Aauuytx9shUKlrGhXMjqTM=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index 72ec759626..ec699d6689 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "archisteamfarm"; # nixpkgs-update: no auto update - version = "5.4.0.3"; + version = "5.4.1.11"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-+S0nvgiMxSUQI/TzAMES6bAix1iudj1+EkOcXO+6igE="; + sha256 = "sha256-t4azVZVvAJmCCsg/2o+ZWroEmCLfdPYn2iWwVwdhIZw="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; @@ -57,6 +57,8 @@ buildDotnetModule rec { --output $out/lib/${pname}/plugins/$1 --configuration Release \ -p:TargetLatestRuntimePatch=false -p:UseAppHost=false --no-restore } + + buildPlugin ArchiSteamFarm.OfficialPlugins.ItemsMatcher buildPlugin ArchiSteamFarm.OfficialPlugins.SteamTokenDumper ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 7841028bf3..4b177bf581 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -61,8 +61,7 @@ (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "6.0.0-rc.1.21452.15"; sha256 = "0c3vnaag8gxlxij77n18m3hawpjkjjamsnq5kfjz5cvc7sfg3fwh"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "6.0.0-rc.1.21452.15"; sha256 = "1xyx358w4fqzxr9cy358agnm86rjijbnvikiqlngz2msgmldxi2z"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.0"; sha256 = "17lm9gvz48ay8xxrjacxjsknnva8i939prg26z6fq3svgcy0nc30"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.1"; sha256 = "0bf68gq6mc6kzri4zi8ydc0xrazqwqg38bhbpjpj90zmqc28kari"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) @@ -72,19 +71,14 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.0"; sha256 = "1l1q2zi2091ac2cbynpsj0c8vff074y4c3vcnm4q7js1wv08jwld"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.0"; sha256 = "0dl81q9k7jaymxpg995nsicjz1b1cs481a12c4znxkpjkddqa82b"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.0"; sha256 = "1ip6gadn54k59nrz2l3a62rrxh2ldni33v9vkxlgcjg99sj2dyy4"; }) - (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; sha256 = "0s68wf9yphm4hni9p6kwfk0mjld85f4hkrs93qbk5lzf6vv3kba1"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.1"; sha256 = "1n9ilq8n5rhyxcri06njkxb0h2818dbmzddwd2rrvav91647m2s4"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.2.10"; sha256 = "0w6c55n30w6imm0rjafl2sg0x8vf9852xmil9dzqb4h36cs7v6y6"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.2.10"; sha256 = "0j5p3p5a0pr3rmzg7va21z3w0lb929zqj5xcdd81iys5vvh1hjiw"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.2"; sha256 = "1pzn95nhmprfvchwshyy87jifzjpvdny21b5yhkqafr150nxlz77"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.2"; sha256 = "1yiwi0hi8pn9dv90vz1yw13izap8dv13asxvr9axcliis0ad5iaq"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) @@ -92,53 +86,12 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.1.0"; sha256 = "0z6z405cy2knvg7c9fgg0bc9721ccc1ga23sh8d430a6lr3mznxr"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.0"; sha256 = "0bnyp44vnwbgiw8p0qab1zzmgxg66dsypbs3hv8415wb08b5vxvp"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.0"; sha256 = "06dcv75g902x0q7swkmb58c5lb0rn3m7w178vs5dha3w9xy2nxkc"; }) + (fetchNuGet { pname = "NLog"; version = "5.1.1"; sha256 = "19m1ivp1cxz1ghlvysrxdhxlj7kzya9m7j812c3ssnxrfrr1077z"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.2.1"; sha256 = "1z9ayqag1xncn4cs0cz27gxa5cqk6caq5fd81bczlj4sqff7ah4p"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.2.1"; sha256 = "10y03374lza6cjsi01xmql1v6hcjf6x2r7wfnnckzhzs70x2hhnl"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.4.0"; sha256 = "1jkgjnkjcb6dif0lzn7whjwwdd4fi6mzkmkdx8sfmv5cffzq4fvk"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.4.0"; sha256 = "0d01dpl4bcnrxqxyxcx0jhh9v375fqhva9w0siadj5y6m15h1sl5"; }) @@ -146,91 +99,21 @@ (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.4.0"; sha256 = "1wccx8ig2xc6xcfh774m5z34w6jn0hjffiwc5sq9yl63zkv01vnn"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.4.0"; sha256 = "1k58j6lfqcgrl5f7dw0xnbq6w5bvr42a9fc44vwbzl52kzjdlnh2"; }) (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.4.0"; sha256 = "1rxgf0hbkkzywh8z7asky2rrh1gpnrr514v1aj5vnmh49sa31kiz"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) (fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; }) (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; sha256 = "1cxrp0sk5b2gihhkn503iz8fa99k860js2qyzjpsw9rn547pdkny"; }) (fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; sha256 = "1nbyn42xys0kv247jf45r748av6fp8kp27f1582lfhnj2n8290rp"; }) (fetchNuGet { pname = "System.Composition.Hosting"; version = "7.0.0"; sha256 = "0wqbjxgggskfn45ilvg86grqci3zx9xj34r5sradca4mqqc90n7f"; }) (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; sha256 = "1p9xpqzx42s8cdizv6nh15hcjvl2km0rwby66nfkj4cb472l339s"; }) (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; sha256 = "0syz7y6wgnxxgjvfqgymn9mnaa5fjy1qp06qnsvh3agr9mvcv779"; }) - (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) - (fetchNuGet { pname = "System.Diagnostics.TextWriterTraceListener"; version = "4.3.0"; sha256 = "09db74f36wkwg30f7v7zhz1yhkyrnl5v6bdwljq1jdfgzcfch7c3"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) - (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Formatters"; version = "4.3.0"; sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) - (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; sha256 = "15s9s6hsj9bz0nzw41mxbqdjgjd71w2djqbv0aj413gfi9amybk9"; }) - (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) (fetchNuGet { pname = "zxcvbn-core"; version = "7.0.92"; sha256 = "1pbi0n3za8zsnkbvq19njy4h4hy12a6rv4rknf4a2m1kdhxb3cgx"; }) ] diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/update.sh b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/update.sh index 08a1a09d6e..857474c483 100755 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/update.sh +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/update.sh @@ -16,7 +16,7 @@ if [[ "$new_version" == "$old_version" ]]; then fi asf_path=$PWD -push ../../../.. +pushd ../../../.. if [[ "${1:-}" != "--deps-only" ]]; then update-source-version ArchiSteamFarm "$new_version" diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index f7990138ca..2d9b681a2e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -11,8 +11,8 @@ let repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "c348d6897324aac1d899a977f9c7d467ea934796"; - sha256 = "1nvglb1wahz20my29jhi3j7824d12pdqf0xfpymnganzfkpj9zjk"; + rev = "a4617d145756f6dcf1f5729e5a60689aa484403b"; + sha256 = "178ip280bqyqd36rka9g2jx7b7wdf3zh56sahg53yxr55zwq5bcp"; }; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix index ae30221f87..6ee3318e15 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix @@ -22,22 +22,22 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.20.1" = { + "@babel/compat-data-7.20.5" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.1.tgz"; - sha512 = "EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ=="; - }; - }; - "@babel/core-7.20.5" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; version = "7.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz"; - sha512 = "UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz"; + sha512 = "KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g=="; + }; + }; + "@babel/core-7.20.7" = { + name = "_at_babel_slash_core"; + packageName = "@babel/core"; + version = "7.20.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/core/-/core-7.20.7.tgz"; + sha512 = "t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw=="; }; }; "@babel/eslint-parser-7.19.1" = { @@ -49,13 +49,13 @@ let sha512 = "AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ=="; }; }; - "@babel/generator-7.20.5" = { + "@babel/generator-7.20.7" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.20.5"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz"; - sha512 = "jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz"; + sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -76,13 +76,13 @@ let sha512 = "KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw=="; }; }; - "@babel/helper-compilation-targets-7.20.0" = { + "@babel/helper-compilation-targets-7.20.7" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.20.0"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz"; - sha512 = "0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz"; + sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; }; }; "@babel/helper-create-class-features-plugin-7.18.6" = { @@ -166,13 +166,13 @@ let sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.20.2" = { + "@babel/helper-module-transforms-7.20.7" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.20.2"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz"; - sha512 = "zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz"; + sha512 = "FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA=="; }; }; "@babel/helper-optimise-call-expression-7.18.6" = { @@ -274,13 +274,13 @@ let sha512 = "95NLBP59VWdfK2lyLKe6eTMq9xg+yWKzxzxbJ1wcYNi1Auz200+83fMDADjRxBvc2QQor5zja2yTQzXGhk2GtQ=="; }; }; - "@babel/helpers-7.20.6" = { + "@babel/helpers-7.20.7" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.20.6"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz"; - sha512 = "Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz"; + sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; }; }; "@babel/highlight-7.18.6" = { @@ -292,13 +292,13 @@ let sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.20.5" = { + "@babel/parser-7.20.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.5"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz"; - sha512 = "r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz"; + sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -904,31 +904,31 @@ let sha512 = "/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg=="; }; }; - "@babel/template-7.18.10" = { + "@babel/template-7.20.7" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.18.10"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"; - sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz"; + sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.20.5" = { + "@babel/traverse-7.20.7" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.20.5"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz"; - sha512 = "WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.7.tgz"; + sha512 = "xueOL5+ZKX2dJbg8z8o4f4uTRTqGDRjilva9D1hiRlayJbTY8jBRL+Ph67IeRTIE439/VifHk+Z4g0SwRtQE0A=="; }; }; - "@babel/types-7.20.5" = { + "@babel/types-7.20.7" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.20.5"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz"; - sha512 = "c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz"; + sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; }; }; "@discoveryjs/json-ext-0.5.5" = { @@ -940,13 +940,13 @@ let sha512 = "6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA=="; }; }; - "@eslint/eslintrc-1.3.3" = { + "@eslint/eslintrc-1.4.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz"; - sha512 = "uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz"; + sha512 = "7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A=="; }; }; "@fortawesome/fontawesome-common-types-6.2.1" = { @@ -994,13 +994,13 @@ let sha512 = "tUmO92PFHbLOplitjHNBVGMJm6S57vp16tBXJVPKSI/6CfjrgLycqKxEpC6f7qsOqUdoXs5nIv4HLUfrOMHzuw=="; }; }; - "@humanwhocodes/config-array-0.11.6" = { + "@humanwhocodes/config-array-0.11.8" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.11.6"; + version = "0.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.6.tgz"; - sha512 = "jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz"; + sha512 = "UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g=="; }; }; "@humanwhocodes/module-importer-1.0.1" = { @@ -1606,6 +1606,15 @@ let sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; }; }; + "ajv-8.11.2" = { + name = "ajv"; + packageName = "ajv"; + version = "8.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz"; + sha512 = "E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg=="; + }; + }; "ajv-8.8.1" = { name = "ajv"; packageName = "ajv"; @@ -1768,22 +1777,22 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "axios-0.27.2" = { + "axios-1.2.2" = { name = "axios"; packageName = "axios"; - version = "0.27.2"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"; - sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; + url = "https://registry.npmjs.org/axios/-/axios-1.2.2.tgz"; + sha512 = "bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q=="; }; }; - "babel-loader-8.3.0" = { + "babel-loader-9.1.0" = { name = "babel-loader"; packageName = "babel-loader"; - version = "8.3.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz"; - sha512 = "H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q=="; + url = "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.0.tgz"; + sha512 = "Antt61KJPinUMwHwIIz9T5zfMgevnfZkEVWYDWlG888fgdvRRGD0JTuf/fFozQnfT+uq64sk1bmdHDy/mOEWnA=="; }; }; "babel-plugin-polyfill-corejs2-0.3.3" = { @@ -2290,13 +2299,13 @@ let sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; }; - "css-loader-6.7.2" = { + "css-loader-6.7.3" = { name = "css-loader"; packageName = "css-loader"; - version = "6.7.2"; + version = "6.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.2.tgz"; - sha512 = "oqGbbVcBJkm8QwmnNzrFrWTnudnRZC+1eXikLJl0n4ljcfotgRifpg2a1lKy8jTrc4/d9A/ap1GFq1jDKG7J+Q=="; + url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz"; + sha512 = "qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ=="; }; }; "css-select-4.1.3" = { @@ -2704,13 +2713,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.28.0" = { + "eslint-8.30.0" = { name = "eslint"; packageName = "eslint"; - version = "8.28.0"; + version = "8.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz"; - sha512 = "S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz"; + sha512 = "MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ=="; }; }; "eslint-config-airbnb-base-15.0.0" = { @@ -3073,13 +3082,13 @@ let sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; }; }; - "follow-redirects-1.14.9" = { + "follow-redirects-1.15.2" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.9"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz"; - sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"; + sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; }; "form-data-4.0.0" = { @@ -3235,22 +3244,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-13.15.0" = { + "globals-13.19.0" = { name = "globals"; packageName = "globals"; - version = "13.15.0"; + version = "13.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz"; - sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; - }; - }; - "globals-13.18.0" = { - name = "globals"; - packageName = "globals"; - version = "13.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz"; - sha512 = "/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A=="; + url = "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz"; + sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ=="; }; }; "globby-13.1.1" = { @@ -4027,13 +4027,13 @@ let sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; - "json5-2.2.1" = { + "json5-2.2.2" = { name = "json5"; packageName = "json5"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz"; + sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; }; }; "kind-of-6.0.3" = { @@ -4108,15 +4108,6 @@ let sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; }; }; - "loader-utils-2.0.3" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz"; - sha512 = "THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A=="; - }; - }; "locate-path-2.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -4198,6 +4189,15 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; + "lru-cache-5.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -5035,6 +5035,15 @@ let sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; + "proxy-from-env-1.1.0" = { + name = "proxy-from-env"; + packageName = "proxy-from-env"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz"; + sha512 = "D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="; + }; + }; "pseudomap-1.0.2" = { name = "pseudomap"; packageName = "pseudomap"; @@ -5350,13 +5359,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.56.1" = { + "sass-1.57.1" = { name = "sass"; packageName = "sass"; - version = "1.56.1"; + version = "1.57.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.56.1.tgz"; - sha512 = "VpEyKpyBPCxE7qGDtOcdJ6fFbcpOM+Emu7uZLxVrkX8KVU/Dp5UF7WLvzqRuUhB6mqqQt1xffLoG+AndxTZrCQ=="; + url = "https://registry.npmjs.org/sass/-/sass-1.57.1.tgz"; + sha512 = "O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw=="; }; }; "sass-loader-13.2.0" = { @@ -5368,15 +5377,6 @@ let sha512 = "JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg=="; }; }; - "schema-utils-2.7.1" = { - name = "schema-utils"; - packageName = "schema-utils"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz"; - sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; - }; - }; "schema-utils-3.0.0" = { name = "schema-utils"; packageName = "schema-utils"; @@ -6331,6 +6331,15 @@ let sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; }; + "yallist-3.1.1" = { + name = "yallist"; + packageName = "yallist"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + }; "yallist-4.0.0" = { name = "yallist"; packageName = "yallist"; @@ -6358,11 +6367,11 @@ let dependencies = [ sources."@ampproject/remapping-2.1.1" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.1" - (sources."@babel/core-7.20.5" // { + sources."@babel/compat-data-7.20.5" + (sources."@babel/core-7.20.7" // { dependencies = [ sources."debug-4.3.4" - sources."json5-2.2.1" + sources."json5-2.2.2" sources."ms-2.1.2" sources."semver-6.3.0" ]; @@ -6373,12 +6382,14 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.20.5" + sources."@babel/generator-7.20.7" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.6" - (sources."@babel/helper-compilation-targets-7.20.0" // { + (sources."@babel/helper-compilation-targets-7.20.7" // { dependencies = [ + sources."lru-cache-5.1.1" sources."semver-6.3.0" + sources."yallist-3.1.1" ]; }) sources."@babel/helper-create-class-features-plugin-7.18.6" @@ -6396,7 +6407,7 @@ let sources."@babel/helper-hoist-variables-7.18.6" sources."@babel/helper-member-expression-to-functions-7.18.9" sources."@babel/helper-module-imports-7.18.6" - sources."@babel/helper-module-transforms-7.20.2" + sources."@babel/helper-module-transforms-7.20.7" sources."@babel/helper-optimise-call-expression-7.18.6" sources."@babel/helper-plugin-utils-7.20.2" sources."@babel/helper-remap-async-to-generator-7.18.9" @@ -6408,9 +6419,9 @@ let sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.18.10" - sources."@babel/helpers-7.20.6" + sources."@babel/helpers-7.20.7" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.5" + sources."@babel/parser-7.20.7" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" sources."@babel/plugin-proposal-async-generator-functions-7.20.1" @@ -6482,19 +6493,19 @@ let }) sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.14.6" - sources."@babel/template-7.18.10" - (sources."@babel/traverse-7.20.5" // { + sources."@babel/template-7.20.7" + (sources."@babel/traverse-7.20.7" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.20.5" + sources."@babel/types-7.20.7" sources."@discoveryjs/json-ext-0.5.5" - (sources."@eslint/eslintrc-1.3.3" // { + (sources."@eslint/eslintrc-1.4.0" // { dependencies = [ sources."debug-4.3.3" - sources."globals-13.15.0" + sources."globals-13.19.0" sources."ms-2.1.2" ]; }) @@ -6503,7 +6514,7 @@ let sources."@fortawesome/free-brands-svg-icons-6.2.1" sources."@fortawesome/free-solid-svg-icons-6.2.1" sources."@fortawesome/vue-fontawesome-2.0.9" - (sources."@humanwhocodes/config-array-0.11.6" // { + (sources."@humanwhocodes/config-array-0.11.8" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -6609,12 +6620,13 @@ let ]; }) sources."asynckit-0.4.0" - sources."axios-0.27.2" - (sources."babel-loader-8.3.0" // { + sources."axios-1.2.2" + (sources."babel-loader-9.1.0" // { dependencies = [ - sources."json5-2.2.1" - sources."loader-utils-2.0.3" - sources."schema-utils-2.7.1" + sources."ajv-8.11.2" + sources."ajv-keywords-5.1.0" + sources."json-schema-traverse-1.0.0" + sources."schema-utils-4.0.0" ]; }) (sources."babel-plugin-polyfill-corejs2-0.3.3" // { @@ -6692,7 +6704,7 @@ let sources."core-js-compat-3.25.1" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" - sources."css-loader-6.7.2" + sources."css-loader-6.7.3" sources."css-select-4.1.3" sources."css-what-5.1.0" sources."cssesc-3.0.0" @@ -6752,7 +6764,7 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.28.0" // { + (sources."eslint-8.30.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6764,7 +6776,7 @@ let sources."estraverse-5.3.0" sources."find-up-5.0.0" sources."glob-parent-6.0.2" - sources."globals-13.18.0" + sources."globals-13.19.0" sources."has-flag-4.0.0" sources."is-path-inside-3.0.3" sources."locate-path-6.0.0" @@ -6871,7 +6883,7 @@ let sources."flat-5.0.2" sources."flat-cache-3.0.4" sources."flatted-3.2.4" - sources."follow-redirects-1.14.9" + sources."follow-redirects-1.15.2" sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" @@ -7149,6 +7161,7 @@ let sources."ipaddr.js-1.9.1" ]; }) + sources."proxy-from-env-1.1.0" sources."pseudomap-1.0.2" sources."punycode-2.1.1" sources."qs-6.9.7" @@ -7188,7 +7201,7 @@ let sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sass-1.56.1" + sources."sass-1.57.1" sources."sass-loader-13.2.0" sources."schema-utils-3.1.1" sources."select-hose-2.0.0" diff --git a/third_party/nixpkgs/pkgs/applications/misc/ablog/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ablog/default.nix index e578caad52..48541402d4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ablog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ablog/default.nix @@ -6,11 +6,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "ablog"; - version = "0.10.29"; + version = "0.10.33"; src = fetchPypi { inherit pname version; - sha256 = "sha256-q2zoXCmnzzjXSBGFKzondOQRz7CjZp0wCiXxbgpXHIA="; + sha256 = "sha256-vCkLX64aPAem0QvKI1iUNAHWEJZlAOIb1DA9U7xPJkU="; }; propagatedBuildInputs = [ @@ -21,7 +21,7 @@ buildPythonApplication rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix b/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix index 0862453d03..59af845e29 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/audio/sox/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sample Rate Converter for audio"; - homepage = "http://sox.sourceforge.net/"; + homepage = "https://sox.sourceforge.net/"; maintainers = with maintainers; [ marcweber ]; license = if enableAMR then licenses.unfree else licenses.gpl2Plus; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/wavrsocvt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/audio/wavrsocvt/default.nix index 10aac715b4..c9f97c5602 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.0.2.0"; src = fetchurl { - url = "http://bricxcc.sourceforge.net/wavrsocvt.tgz"; + url = "https://bricxcc.sourceforge.net/wavrsocvt.tgz"; sha256 = "15qlvdfwbiclljj7075ycm78yzqahzrgl4ky8pymix5179acm05h"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation { supported sample rates in the standard NXT firmware). You can then upload these with e.g. nxt-python. ''; - homepage = "http://bricxcc.sourceforge.net/"; + homepage = "https://bricxcc.sourceforge.net/"; license = licenses.mpl11; maintainers = with maintainers; [ leenaars ]; platforms = with platforms; linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix index eb773b3c81..8758e5fe92 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "AusweisApp2"; - version = "1.26.1"; + version = "1.26.2"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = version; - sha256 = "sha256-Q+ZWnbYH80FMazKB1iSTh9cuYvuPom+qDjMZvC1gUoY="; + hash = "sha256-jN4xKgdNO+LyDy+ySM13M5YCaijDq8zAxS+x4Io1ThE="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/authenticator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/authenticator/default.nix index 735355107e..5fb336d8de 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/authenticator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/authenticator/default.nix @@ -69,11 +69,16 @@ stdenv.mkDerivation rec { zbar ]; + # https://gitlab.gnome.org/World/Authenticator/-/issues/362 + preBuild = '' + export BINDGEN_EXTRA_CLANG_ARGS="$BINDGEN_EXTRA_CLANG_ARGS -DPW_ENABLE_DEPRECATED" + ''; + meta = { description = "Two-factor authentication code generator for GNOME"; homepage = "https://gitlab.gnome.org/World/Authenticator"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ dotlambda ]; + maintainers = with lib.maintainers; [ austinbutler ]; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix index 2b6cd7049a..e5514f736c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "authy"; # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version' - version = "2.2.1"; - rev = "11"; + version = "2.2.2"; + rev = "12"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; - sha256 = "sha256-/a0pMXVd7mEp7oaN2mBIJv5uOv1zQ3gvfgiz1XL9ZmM="; + sha256 = "sha256-vSbqT2s5lLEU1SSDaC+sS6qt446iSKYUgKudO5WMOu4="; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix index 3789870949..1618bf746c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.6.2"; + version = "1.6.4"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-3T0vpyAw21u2+csqaz3Yf10G8IQRDyjReedIo+I4fvw="; + sha256 = "sha256-Z5j5tSIF3AZiZjkFFtyyi3hMqWMXtf6ont2CQ/FSEjk="; }; buildInputs = [ libnotify glib ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/bitwarden-menu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bitwarden-menu/default.nix new file mode 100644 index 0000000000..95ec2826a5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/bitwarden-menu/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonApplication +, fetchPypi +, pynput +, xdg +}: + +buildPythonApplication rec { + pname = "bitwarden-menu"; + version = "0.4.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-OC+MHEiUU6bDT2wSSDtu0KnwDwBpbLTBta0xjfuzlOI="; + }; + + propagatedBuildInputs = [ + pynput + xdg + ]; + + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/firecat53/bitwarden-menu/releases/tag/v${version}"; + description = "Dmenu/Rofi frontend for managing Bitwarden vaults. Uses the Bitwarden CLI tool to interact with the Bitwarden database."; + homepage = "https://github.com/firecat53/bitwarden-menu"; + license = licenses.mit; + maintainers = [ maintainers.rodrgz ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 9724ad9536..4290978426 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -16,7 +16,6 @@ , embree, gmp, libharu }: -with lib; let python = python310Packages.python; optix = fetchzip { @@ -38,7 +37,7 @@ stdenv.mkDerivation rec { patches = lib.optional stdenv.isDarwin ./darwin.patch; nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev ] - ++ optionals cudaSupport [ addOpenGLRunpath ]; + ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; buildInputs = [ boost ffmpeg gettext glew ilmbase freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp @@ -63,10 +62,10 @@ stdenv.mkDerivation rec { else [ llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL ]) - ++ optional jackaudioSupport libjack2 - ++ optional cudaSupport cudaPackages.cudatoolkit - ++ optional colladaSupport opencollada - ++ optional spaceNavSupport libspnav; + ++ lib.optional jackaudioSupport libjack2 + ++ lib.optional cudaSupport cudaPackages.cudatoolkit + ++ lib.optional colladaSupport opencollada + ++ lib.optional spaceNavSupport libspnav; pythonPath = with python310Packages; [ numpy requests ]; postPatch = '' @@ -118,16 +117,16 @@ stdenv.mkDerivation rec { "-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" ] - ++ optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ "-DWITH_CYCLES_OSL=OFF" # requires LLVM "-DWITH_OPENVDB=OFF" # OpenVDB currently doesn't build on darwin "-DLIBDIR=/does-not-exist" ] # Clang doesn't support "-export-dynamic" - ++ optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" - ++ optional jackaudioSupport "-DWITH_JACK=ON" - ++ optionals cudaSupport [ + ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" + ++ lib.optional jackaudioSupport "-DWITH_JACK=ON" + ++ lib.optionals cudaSupport [ "-DWITH_CYCLES_CUDA_BINARIES=ON" "-DWITH_CYCLES_DEVICE_OPTIX=ON" "-DOPTIX_ROOT_DIR=${optix}" @@ -137,7 +136,7 @@ stdenv.mkDerivation rec { # Since some dependencies are built with gcc 6, we need gcc 6's # libstdc++ in our RPATH. Sigh. - NIX_LDFLAGS = optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib"; + NIX_LDFLAGS = lib.optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib"; blenderExecutable = placeholder "out" + (if stdenv.isDarwin then "/Applications/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); @@ -154,7 +153,7 @@ stdenv.mkDerivation rec { # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be # found. See the explanation in libglvnd. - postFixup = optionalString cudaSupport '' + postFixup = lib.optionalString cudaSupport '' for program in $out/bin/blender $out/bin/.blender-wrapped; do isELF "$program" || continue addOpenGLRunpath "$program" diff --git a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix index e39612f9ee..7fcd3e3748 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix @@ -26,15 +26,16 @@ , vkbasalt-cli , vmtouch }: + python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "2022.12.14.1"; + version = "50.2"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; rev = version; - sha256 = "sha256-hoWyXCP7/0m8akUGBJyuF2yQcRKR8C7MDBLUdPdtBgE="; + sha256 = "sha256-+r/r3vExnvYQIicKAEmwZ+eRSep6kWte5k7gu9jC67w="; }; patches = [ ./vulkan_icd.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix b/third_party/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix index 43923c99ea..34036894d6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix @@ -52,6 +52,7 @@ let fhsEnv = { gst_all_1.gst-plugins-good gst_all_1.gst-plugins-ugly gst_all_1.gst-plugins-bad + gst_all_1.gst-libav libgphoto2 libjpeg_turbo libkrb5 @@ -91,10 +92,7 @@ let fhsEnv = { ++ extraLibraries pkgs; profile = '' - # Remove if merged https://github.com/bottlesdevs/Bottles/pull/2415 - export BOTTLES_USE_SYSTEM_GSTREAMER=1 - # Dirty hack, may be related with https://github.com/NixOS/nixpkgs/issues/148007 - export GST_PLUGIN_PATH=${ lib.makeSearchPath "lib/gstreamer-1.0" (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) } + export GST_PLUGIN_PATH=/usr/lib32/gstreamer-1.0:/usr/lib64/gstreamer-1.0 ''; }; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix b/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix index 702440c32b..249288c77c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix @@ -28,7 +28,7 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "sha256-7piJK1hz9h6EWiU/q5MAS1PSvHFxnW7rZBKxq+wda1c="; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest pytest-vcr diff --git a/third_party/nixpkgs/pkgs/applications/misc/calcoo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calcoo/default.nix index 4af71bae65..b0fc6da5eb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calcoo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calcoo/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://calcoo.sourceforge.net/"; + homepage = "https://calcoo.sourceforge.net/"; description = "RPN and algebraic scientific calculator"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix index d596a24446..0ca80417df 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clight/clightd.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "clightd"; - version = "5.6"; + version = "5.7"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clightd"; rev = version; - sha256 = "sha256-PxYOI/2ZOz3JSGCPIXfm3WfGZ19D8JhhdNS3FVuXus8="; + sha256 = "sha256-4daM6Z67d52v2LmzqSZ6RSAHznyZNEqvAdWCuVFi0Kw="; }; # dbus-1.pc has datadir=/etc diff --git a/third_party/nixpkgs/pkgs/applications/misc/clight/default.nix b/third_party/nixpkgs/pkgs/applications/misc/clight/default.nix index 3592de5f1c..4ca37673fe 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/clight/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/clight/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clight"; - version = "4.8"; + version = "4.9"; src = fetchFromGitHub { owner = "FedeDP"; repo = "Clight"; rev = version; - sha256 = "sha256-nDI5Rq1iPVkj25HRpxmS9zxNDUy+9YsSwbZnEwYt86E="; + sha256 = "sha256-m1oKjyy7fMK6mIf5FRuWCbfAM8qlHXRR/rwHsCZADiY="; }; # dbus-1.pc has datadir=/etc diff --git a/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix index 1401a7a8df..55bca8aa80 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix @@ -67,7 +67,7 @@ buildPythonApplication rec { pango ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix index d79de578ca..954d16ce3e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix @@ -1,42 +1,45 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake +, ninja , extra-cmake-modules , qtbase -, qtscript +, qtsvg +, qttools +, qtdeclarative , libXfixes , libXtst -, qtx11extras -, knotifications , qtwayland , wayland -, fetchpatch +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "CopyQ"; - version = "6.3.2"; + version = "6.4.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - hash = "sha256-Ge/TD9Llq4YTAqaL9LBEsgNI9qrf2jLDt7q2ZTI9rmE="; + hash = "sha256-HpWzIABzg0oJqzIehIGpeATLs3ZlmLgtRKaiMIUNAFI="; }; nativeBuildInputs = [ cmake + ninja extra-cmake-modules + wrapQtAppsHook ]; buildInputs = [ qtbase - qtscript + qtsvg + qttools + qtdeclarative libXfixes libXtst - qtx11extras - knotifications qtwayland wayland ]; @@ -46,13 +49,14 @@ mkDerivation rec { --replace copyq "$out/bin/copyq" ''; + cmakeFlags = [ "-DWITH_QT6=ON" ]; + meta = with lib; { homepage = "https://hluk.github.io/CopyQ"; description = "Clipboard Manager with Advanced Features"; license = licenses.gpl3Only; maintainers = with maintainers; [ artturin ]; # NOTE: CopyQ supports windows and osx, but I cannot test these. - # OSX build requires QT5. platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix index 408838a0a2..fb3e149bc8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cotp/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { name = "cotp"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-SbS+ch7/45kZb49jW2mnRWQruLrfrNfeZFqEPHQKGUg="; + hash = "sha256-DIb/lgJxwg+QuqzN/0YoUV1iZwRqh6PAN0KRK7TbWDs="; }; - cargoHash = "sha256-2lIR3K4/hr4XSmNGFd/dhwoFOtEB9KSnUrZkcaCyc9k="; + cargoHash = "sha256-uvH4mdI8ya/MJJngXQ98oXjG7JjUdvPwIzvJrdwlOEE="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix index 13386699ec..343848e673 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix @@ -20,7 +20,7 @@ in pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ attrs beautifulsoup4 configargparse keyring pyasn1 requests six urllib3 ]; - checkInputs = with pythonPackages; [ pytest mock ]; + nativeCheckInputs = with pythonPackages; [ pytest mock ]; postPatch = '' substituteInPlace requirements.txt \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix index 4da0af251d..7ec4522678 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "crow-translate"; - version = "2.10.1"; + version = "2.10.3"; src = fetchzip { url = "https://github.com/${pname}/${pname}/releases/download/${version}/${pname}-${version}-source.tar.gz"; - hash = "sha256-xRXNT/IybcynS5S71XFFsx3PoLXDBcKuz81ybxoVtV4="; + hash = "sha256-K6mYzR4EIBHd0w/6Dpx4ldX4iDFszmfSLT6jNTfJlDQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix index 5f7f101ad6..3912e8d221 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "2.6.1"; + version = "3.0.1"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-ZXqe+696dNYTkNidEA+s5QQ7Euu7WOdl0EMLU5pKdOY="; + sha256 = "sha256-UPphXaxq/Hnt1U3J+lgwa0lp3vX1B/Ou8eqD9rHe3sw="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index d69073d710..3f613041ff 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -5,19 +5,19 @@ buildGoModule rec { pname = "dasel"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-7JGafJE9nwZ95bOWUyVw2uWA2LltE9HxolHGYU079to="; + sha256 = "sha256-27tQEWnirDhqYt5smRFwADa9wKXSk6yXR8+mXvJVtYI="; }; vendorHash = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE="; ldflags = [ - "-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}" + "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" ]; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/databricks-sql-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/databricks-sql-cli/default.nix index 61191374b6..be798894ba 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/databricks-sql-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/databricks-sql-cli/default.nix @@ -53,7 +53,7 @@ buildPythonApplication rec { click ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "CLI for querying Databricks SQL"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbx/default.nix index 517b24597a..cbcebae312 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dbx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dbx/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { watchdog ] ++ typer.optional-dependencies.all; - checkInputs = [ + nativeCheckInputs = [ git ] ++ (with python3.pkgs; [ pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/applications/misc/dotfiles/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dotfiles/default.nix index b62d154feb..86a6cebc27 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dotfiles/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dotfiles/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { # No tests in archive doCheck = false; - checkInputs = with python3Packages; [ pytest ]; + nativeCheckInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = with python3Packages; [ click ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix index 60a26b7088..c485375137 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dupeguru/default.nix @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { "NO_VENV=1" ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix index 452c1edc99..0644471c5f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electron-cash/default.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { --replace "(share_dir" "(\"share\"" ''; - checkInputs = with python3Packages; [ pytest ]; + nativeCheckInputs = with python3Packages; [ pytest ]; checkPhase = '' unset HOME diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix index f4e6ad3feb..5cae20d831 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -20,7 +20,7 @@ }: let - version = "4.3.3"; + version = "4.3.4"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -37,7 +37,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-40GfOKBTAi8RAsAVrG9rv1Jr5IqM+1yro6YYRsSULxw="; + sha256 = "sha256-0xYGTCk+Sk7LP+E9r2Y7UJZsfbobLe6Yb+x5ZRCN40Y="; postFetch = '' mv $out ./all @@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-NPXGfbEjT9l88ZnGbDcE3+oGxThTzW7YfesBzssGsbc="; + sha256 = "sha256-+Z4NZK/unFN6mxCuMleHBxAoD+U1PzVk3/ZnZRmOOxo="; }; postUnpack = '' @@ -117,7 +117,7 @@ python3.pkgs.buildPythonApplication { wrapQtApp $out/bin/electrum ''; - checkInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; pytestFlagsArray = [ "electrum/tests" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix index 5029581ac8..abb88796dd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix @@ -109,7 +109,7 @@ python3.pkgs.buildPythonApplication { wrapQtApp $out/bin/electrum-ltc ''; - checkInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; pytestFlagsArray = [ "electrum_ltc/tests" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/update.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/update.nix index 247fabe389..7a0fb8fd3e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/update.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/update.nix @@ -10,8 +10,6 @@ , nix }: -with lib; - let downloadPageUrl = "https://download.electrum.org"; @@ -23,7 +21,7 @@ writeScript "update-electrum" '' set -eu -o pipefail -export PATH=${makeBinPath [ +export PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl @@ -50,7 +48,7 @@ sigFile=$srcFile.asc export GNUPGHOME=$PWD/gnupg mkdir -m 700 -p "$GNUPGHOME" -gpg --batch --recv-keys ${concatStringsSep " " (map (x: "'${x}'") signingKeys)} +gpg --batch --recv-keys ${lib.concatStringsSep " " (map (x: "'${x}'") signingKeys)} gpg --batch --verify "$sigFile" "$srcFile" sha256=$(nix-prefetch-url --type sha256 "file://$PWD/$srcFile") diff --git a/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix index 7ff20b16d7..56f8be698f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/elogind/default.nix @@ -25,8 +25,6 @@ , enableSystemd ? false }: -with lib; - stdenv.mkDerivation rec { pname = "elogind"; version = "246.10"; @@ -72,7 +70,7 @@ stdenv.mkDerivation rec { "-Dsysconfdir=${placeholder "out"}/etc" ]; - meta = { + meta = with lib; { homepage = "https://github.com/elogind/elogind"; description = ''The systemd project's "logind", extracted to a standalone package''; platforms = platforms.linux; # probably more diff --git a/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix index a50c4e4270..54a3a2ed14 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage { pname = "faircamp"; - version = "unstable-2022-10-08"; + version = "unstable-2022-12-28"; # TODO when switching to a stable release, use fetchFromGitea and add a # version test. Meanwhile, fetchgit is used to make unstableGitUpdater work. src = fetchgit { url = "https://codeberg.org/simonrepp/faircamp.git"; - rev = "630415985127298bf82bfc210d2fc8b214758db1"; - sha256 = "sha256-4pzDey0iV7LtHI0rbbcCjjuTaFt0CR88Vl0B1RU96v0="; + rev = "c77fd779cea6daecbac9a9beea65c1dc1ac56bc4"; + sha256 = "sha256-Tl3T/IoBIhYCNDEYT6cV1UyksDkoEDydBjYM9yzT4VQ="; }; - cargoHash = "sha256-GgWxxKHLGtsSGVbhli6HTfUu4TmbY4J9N7UA7AOzUkc="; + cargoHash = "sha256-20rtE8+LLDz97yvk0gKoUielsGZXEEOu2pfShf2WvHA="; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix index b2c5dfe2cc..781bdfcb90 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/feedbackd/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { "-Dintrospection=${if (stdenv.buildPlatform == stdenv.hostPlatform) then "enabled" else "disabled"}" ]; - checkInputs = [ + nativeCheckInputs = [ dbus ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix index b92110f99d..27e3ea0ace 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.21.1"; + version = "1.23.0"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-TahXPbZy7eoSJ/U2wL6GaMM8F6zypf7EU91JVWlevQg="; + sha256 = "sha256-SAyR7SeMFh2twLr8QqKzALlMFLv/oAfySN5+cSNALis="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/freemind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/freemind/default.nix index b87c43226e..ff84ecdf55 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/freemind/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/freemind/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mind-mapping software"; - homepage = "http://freemind.sourceforge.net/wiki/index.php/Main_Page"; + homepage = "https://freemind.sourceforge.net/wiki/index.php/Main_Page"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gImageReader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gImageReader/default.nix index f570a04430..4e215f30fc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gImageReader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gImageReader/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "gImageReader"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner= "manisandro"; repo = "gImageReader"; rev = "v${version}"; - sha256 = "sha256-lJ4wPLxVN3NERnru8vLreiWMEUip6xeCXAfoT8DcfiQ="; + sha256 = "sha256-vW4FbviMHBiJ3rwJY/yS7JDOoCT72nGV6jEeo+k6ylU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 41dab24db3..4da566bcfc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.24.4"; + version = "1.24.5"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-g+nbHpbo6O4zoDJm6MRwCXY9pM73NV7RKR59s+8LM10="; + sha256 = "sha256-P71JiGI9PpWMAlgk5TwQa/h3AUEZSEZ6/MahY+IIy9M="; }; propagatedBuildInputs = [ @@ -16,7 +16,7 @@ buildPythonApplication rec { yt-dlp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gammu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gammu/default.nix index 8a33ba3ea3..78d5e01021 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gammu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gammu/default.nix @@ -4,8 +4,6 @@ , postgresSupport ? false, postgresql ? null }: -with lib; - stdenv.mkDerivation rec { pname = "gammu"; version = "1.42.0"; @@ -31,10 +29,10 @@ stdenv.mkDerivation rec { strictDeps = true; buildInputs = [ bash bluez libusb1 curl gettext sqlite libiconv ] - ++ optionals dbiSupport [ libdbi libdbiDrivers ] - ++ optionals postgresSupport [ postgresql ]; + ++ lib.optionals dbiSupport [ libdbi libdbiDrivers ] + ++ lib.optionals postgresSupport [ postgresql ]; - meta = { + meta = with lib; { homepage = "https://wammu.eu/gammu/"; description = "Command line utility and library to control mobile phones"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix index f2692243db..2f244e20e1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix @@ -1,7 +1,5 @@ { lib, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, perlPackages, rtmpdump}: -with lib; - perlPackages.buildPerlPackage rec { pname = "get_iplayer"; version = "3.27"; @@ -26,11 +24,11 @@ perlPackages.buildPerlPackage rec { installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin - wrapProgram $out/bin/get_iplayer --suffix PATH : ${makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 ''; - meta = { + meta = with lib; { description = "Downloads TV and radio from BBC iPlayer"; license = licenses.gpl3Plus; homepage = "https://squarepenguin.co.uk/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix b/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix index 591f26abbc..841aeca589 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/girara/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config gettext check dbus ]; buildInputs = [ libintl libiconv json_c ]; propagatedBuildInputs = [ glib gtk ]; - checkInputs = [ xvfb-run ]; + nativeCheckInputs = [ xvfb-run ]; doCheck = !stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/applications/misc/glom/default.nix b/third_party/nixpkgs/pkgs/applications/misc/glom/default.nix index 47d56288ed..363e6fadee 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/glom/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/glom/default.nix @@ -28,7 +28,7 @@ , isocodes , gtksourceview , gtksourceviewmm -, postgresql +, postgresql_11 , gobject-introspection , yelp-tools , wrapGAppsHook @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { python3.pkgs.pygobject3 gtksourceview gtksourceviewmm - postgresql # for pg_config + postgresql_11 # for pg_config ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-firmware/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gnome-firmware/default.nix index 2aebbf5194..6d46727d5a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gnome-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gnome-firmware/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation rec { pname = "gnome-firmware"; - version = "42.2"; + version = "43.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "gnome-firmware"; rev = version; - sha256 = "L0R2lXU69I6NI7Srq5s+8N9261Ic8B7FVaaXNjz2Ll0="; + sha256 = "9QS6X1Cm9/wToQ8hnGNn3VytSCpZI8StZ3+vf0/wbAw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch index f8f725f7f6..f410d0f18b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/0001-Fix-building-with-bison-3.7.patch @@ -1,24 +1,5 @@ -From 8befa137776786829508f23dd33ab37e2b95a895 Mon Sep 17 00:00:00 2001 -From: Poncho -Date: Mon, 7 Sep 2020 09:39:49 +0200 -Subject: [PATCH] Fix building with bison 3.7 - -Bison 3.7 changes how header files are included [1][2], in that instead of -copying and inserting the contents of a file, the file itself is included -(by default as '"basename.h"'). - -[1] https://lists.gnu.org/archive/html/info-gnu/2020-07/msg00006.html -[2] https://www.gnu.org/software/bison/manual/html_node/_0025define-Summary.html - -Close: https://github.com/GoldenCheetah/GoldenCheetah/issues/3586 ---- - src/Core/DataFilter.y | 3 +++ - src/Core/RideDB.y | 2 ++ - src/FileIO/JsonRideFile.y | 3 +++ - 3 files changed, 8 insertions(+) - diff --git a/src/Core/DataFilter.y b/src/Core/DataFilter.y -index 7c5e481b0..142e80a5c 100644 +index 30070f131..15f746a10 100644 --- a/src/Core/DataFilter.y +++ b/src/Core/DataFilter.y @@ -49,6 +49,9 @@ extern Leaf *DataFilterroot; // root node for parsed statement @@ -28,8 +9,8 @@ index 7c5e481b0..142e80a5c 100644 +// generated by the scanner +%define api.header.include {"DataFilter_yacc.h"} + - // Symbol can be meta or metric name - %token SYMBOL PYTHON + // Symbol can be meta, metric, variable or function name + %token SYMBOL PYTHON diff --git a/src/Core/RideDB.y b/src/Core/RideDB.y index d6da086bd..f2001e23c 100644 @@ -58,6 +39,21 @@ index 2cbbef9fc..d5c77a779 100644 %pure-parser %lex-param { void *scanner } %parse-param { struct JsonContext *jc } --- -2.34.1 - +diff --git a/src/gcconfig.pri.in b/src/gcconfig.pri.in +index a280bbb6b..07e543372 100644 +--- a/src/gcconfig.pri.in ++++ b/src/gcconfig.pri.in +@@ -75,10 +75,10 @@ + + # Let us know where flex and bison are installed. + # You may need to specify the full path if things don't work. +-#QMAKE_LEX = flex +-#QMAKE_YACC = bison ++QMAKE_LEX = flex ++QMAKE_YACC = bison + # If you are using bison 3.7 or higher, uncomment the line below +-#QMAKE_MOVE = cp ++QMAKE_MOVE = cp + # If you're compiling with nmake and VC then you + # will likely also use win_flex and win_bison + # so uncomment below diff --git a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix index 7f796a2bb0..ee25c5e8cc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, fetchpatch, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas -, bison, flex, zlib, qmake, makeDesktopItem, makeWrapper +, bison, flex, zlib, qmake, makeDesktopItem, wrapQtAppsHook }: let @@ -16,13 +16,13 @@ let }; in mkDerivation rec { pname = "golden-cheetah"; - version = "3.6-DEV2111"; + version = "3.6-RC3"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; - rev = "v${version}"; - sha256 = "17sk89szvaq31bcv6rgfn1bbw132k7w8zlalfb3ayflavdxbk6sa"; + rev = "refs/tags/v${version}"; + hash = "sha256-/LGVDeWJZZXy5r5WxElDuxUagpA/RIwHGRbkcdO8IrE="; }; buildInputs = [ @@ -39,7 +39,7 @@ in mkDerivation rec { gsl blas ]; - nativeBuildInputs = [ flex makeWrapper qmake bison ]; + nativeBuildInputs = [ flex wrapQtAppsHook qmake bison ]; patches = [ # allow building with bison 3.7 @@ -55,11 +55,10 @@ in mkDerivation rec { preConfigure = '' cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri - echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri - echo 'LIBUSB_INSTALL = ${libusb-compat-0_1}' >> src/gcconfig.pri - echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri - echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri - sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local + sed -i 's,^#QMAKE_LRELEASE.*,QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease,' src/gcconfig.pri + sed -i 's,^#LIBUSB_INSTALL.*,LIBUSB_INSTALL = ${libusb-compat-0_1},' src/gcconfig.pri + sed -i 's,^#LIBUSB_INCLUDE.*,LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include,' src/gcconfig.pri + sed -i 's,^#LIBUSB_LIBS.*,LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb,' src/gcconfig.pri ''; installPhase = '' @@ -76,7 +75,7 @@ in mkDerivation rec { meta = with lib; { description = "Performance software for cyclists, runners and triathletes"; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ adamcstephens ]; license = licenses.gpl2Plus; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix index d7ba62f28c..888672b5fa 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ++ lib.optional withGUI qtserialport ++ lib.optional (withGUI && withMapPreview) qtwebengine; - checkInputs = [ libxml2 which ]; + nativeCheckInputs = [ libxml2 which ]; preConfigure = lib.optionalString withGUI '' lrelease gui/*.ts gui/coretool/*.ts diff --git a/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix index 051fee4f6f..59f71a3f88 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.6.1"; + version = "3.6.2"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-lr3ffyAL8LBj7mt4EmN2Kq2pxvW4P7zd66gU9X4qzJw="; + sha256 = "sha256-c7uwXqmMrWDYZ9CpGuVoo1e5yWHsoNd0zihZKdCTg7E="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix index a225c15a4d..73bc11d494 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/giantswarm/gsctl/buildinfo.Version=${version}" ]; - checkInputs = [ + nativeCheckInputs = [ kubectl ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix index b622d9f19c..53344338bd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gtk2fontsel/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { Font selection tool similar to xfontsel implemented using GTK 2. Trivial, but useful nonetheless. ''; - homepage = "http://gtk2fontsel.sourceforge.net/"; + homepage = "https://gtk2fontsel.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/gtk2fontsel/"; license = licenses.gpl2; maintainers = [ maintainers.prikhi ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix b/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix index 695706cefc..aa9b530dee 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix @@ -52,7 +52,7 @@ buildPythonApplication rec { # will fail without pre-seeded config files doCheck = false; - checkInputs = [ unittestCheckHook mock ]; + nativeCheckInputs = [ unittestCheckHook mock ]; unittestFlagsArray = [ "-s" "tests" "-v" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hovercraft/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hovercraft/default.nix index 5a03cfe23b..ccb597db62 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hovercraft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hovercraft/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { sha256 = "0k0gjlqjz424rymcfdjpj6a71ppblfls5f8y2hd800d1as4im8az"; }; - checkInputs = [ manuel ]; + nativeCheckInputs = [ manuel ]; propagatedBuildInputs = [ setuptools docutils lxml svg-path pygments watchdog ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/html5validator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/html5validator/default.nix index 657996d1da..71ba3dcf10 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/html5validator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/html5validator/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ openjdk ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = "PATH=$PATH:$out/bin nosetests"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/huggle/default.nix b/third_party/nixpkgs/pkgs/applications/misc/huggle/default.nix index 85c65a0eeb..327457a017 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/huggle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/huggle/default.nix @@ -8,7 +8,7 @@ , unzip , wrapQtAppsHook , qtwebengine -, libyamlcpp +, yaml-cpp , libirc }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { which cmake ]; - buildInputs = [ ncurses libyamlcpp qtwebengine libirc ]; + buildInputs = [ ncurses yaml-cpp qtwebengine libirc ]; patches = [ ./00-remove-third-party.patch ./01-extensions.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/imag/default.nix b/third_party/nixpkgs/pkgs/applications/misc/imag/default.nix index acc03f59a7..d923dc9bfe 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/imag/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/imag/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles pkg-config rustPlatform.bindgenHook ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - checkInputs = [ gitMinimal util-linuxMinimal ]; + nativeCheckInputs = [ gitMinimal util-linuxMinimal ]; cargoSha256 = "1vnrc72g2271i2p847z30kplxmdpi60n3dzpw0s7dahg33g14ai6"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jiten/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jiten/default.nix index efd28fabae..7a3326bc8d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jiten/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jiten/default.nix @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pcre sqlite ]; propagatedBuildInputs = with python3.pkgs; [ click flask kanjidraw ]; - checkInputs = [ nodejs ]; + nativeCheckInputs = [ nodejs ]; preBuild = '' export JITEN_VERSION=${version} # override `git describe` diff --git a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix index 9890ea9ad8..360c97d4a2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18622"; + version = "18646"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-AtV7Lj+z1GOCEl8xUaumYcN848pMsLIfMGmBXved6WU="; + hash = "sha256-nncN1cGpuVy4O3JeH56iQfwZGM5/xs3U/V+gVZbChOE="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-q3Kr0YWe6Jm6wO6h7fMANKLCWKfU0zDpBZjRH662eSg="; + hash = "sha256-ihBEOl6WnIaA7x40D2HTdVIDb30BYnhlh0sQrbNA/SU="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix index 141db33e8b..985ce9c1d1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "jrnl"; - version = "3.0"; + version = "3.3"; format = "pyproject"; src = fetchFromGitHub { owner = "jrnl-org"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-wyN7dlAbQwqvES8qEJ4Zo+fDMM/Lh9tNjf215Ywop10="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-e2w0E8t6s0OWx2ROme2GdyzWhmCc6hnMfSdLTZqt3bg="; }; nativeBuildInputs = with python3.pkgs; [ @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { rich ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-bdd pytest-xdist pytestCheckHook @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"' + --replace 'rich = "^12.2.0"' 'rich = ">=12.2.0, <14.0.0"' ''; preCheck = '' @@ -66,6 +66,6 @@ python3.pkgs.buildPythonApplication rec { description = "Simple command line journal application that stores your journal in a plain text file"; homepage = "https://jrnl.sh/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ zalakain ]; + maintainers = with maintainers; [ bryanasdev000 zalakain ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix index b001b50c40..0bb01c3871 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/k2pdfopt/default.nix @@ -8,8 +8,6 @@ , enableTesseract ? true, leptonica, tesseract4 }: -with lib; - # k2pdfopt is a pain to package. It requires modified versions of mupdf, # leptonica, and tesseract. Instead of shipping patches for these upstream # packages, k2pdfopt includes just the modified source files for these @@ -140,12 +138,12 @@ in stdenv.mkDerivation rec { }; in [ zlib libpng ] ++ - optional enableGSL gsl ++ - optional enableGhostScript ghostscript ++ - optional enableMuPDF mupdf_modded ++ - optional enableDJVU djvulibre ++ - optional enableGOCR gocr ++ - optionals enableTesseract [ leptonica_modded tesseract_modded ]; + lib.optional enableGSL gsl ++ + lib.optional enableGhostScript ghostscript ++ + lib.optional enableMuPDF mupdf_modded ++ + lib.optional enableDJVU djvulibre ++ + lib.optional enableGOCR gocr ++ + lib.optionals enableTesseract [ leptonica_modded tesseract_modded ]; dontUseCmakeBuildDir = true; @@ -157,7 +155,7 @@ in stdenv.mkDerivation rec { install -D -m 755 k2pdfopt $out/bin/k2pdfopt ''; - preFixup = optionalString enableTesseract '' + preFixup = lib.optionalString enableTesseract '' wrapProgram $out/bin/k2pdfopt --set-default TESSDATA_PREFIX ${tesseract4}/share/tessdata ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix index be28d1185d..69092b3acd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.25"; + version = "1.2.26"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "sha256-yBUvePVbNDLYL1d6cNrLBn6+/p1agVzSx29JB3EZ5Fk="; + sha256 = "sha256-/Unxl9Vh9pEWjO89sSviGGPFzUwxdb1mbOfpTFTyRL0="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/kaufkauflist/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kaufkauflist/default.nix new file mode 100644 index 0000000000..283f386574 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/kaufkauflist/default.nix @@ -0,0 +1,51 @@ +{ lib, buildPackages, buildGoModule, fetchFromGitHub, esbuild, buildNpmPackage, fetchFromGitea }: + +let + esbuild' = buildPackages.esbuild.override { + buildGoModule = args: buildPackages.buildGoModule (args // rec { + version = "0.16.15"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-iTAtPHjrBvHweSIiAbkkbBLgjF3v68jipJEzc0I4G04="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + }; +in buildNpmPackage rec { + pname = "kaufkauflist"; + version = "1.0.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "annaaurora"; + repo = "kaufkauflist"; + rev = "v${version}"; + hash = "sha256-feqk2FUs3lcnIgyPzhsow+xO9u7l9+9eZEk9jxRlpG4="; + }; + + npmDepsHash = "sha256-lSnGLK7+ac/wEpAxlpkZS/kgr9F+8WK+nRjCzkrPJt0="; + + ESBUILD_BINARY_PATH = "${lib.getExe esbuild'}"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/kaufkauflist $out/share/pocketbase + cp -vr build/* $out/share/kaufkauflist/ + cp -v pb_schema.json $out/share/pocketbase/ + + runHook postInstall + ''; + + # Uncomment this when nix-update-script supports Gitea. + #passthru.updateScript = nix-update-script { }; + + meta = with lib; { + homepage = "https://codeberg.org/annaaurora/kaufkauflist"; + description = "A to-do list for shopping or other use cases"; + license = licenses.mit; + maintainers = with maintainers; [ annaaurora ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix b/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix index 2cdaf78c02..bf386c116d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepassx/community.nix @@ -37,8 +37,6 @@ , nixosTests }: -with lib; - stdenv.mkDerivation rec { pname = "keepassxc"; version = "2.7.4"; @@ -50,13 +48,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-amedKK9nplLVJTldeabN3/c+g/QesrdH+qx+rba2/4s="; }; - NIX_CFLAGS_COMPILE = optionalString stdenv.cc.isClang [ + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang [ "-Wno-old-style-cast" "-Wno-error" "-D__BIG_ENDIAN__=${if stdenv.isBigEndian then "1" else "0"}" ]; - NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-rpath ${libargon2}/lib"; patches = [ ./darwin.patch @@ -67,13 +65,13 @@ stdenv.mkDerivation rec { "-DWITH_GUI_TESTS=ON" "-DWITH_XC_UPDATECHECK=OFF" ] - ++ (optional (!withKeePassX11) "-DWITH_XC_X11=OFF") - ++ (optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON") - ++ (optional (withKeePassYubiKey && stdenv.isLinux) "-DWITH_XC_YUBIKEY=ON") - ++ (optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") - ++ (optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") - ++ (optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") - ++ (optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); + ++ (lib.optional (!withKeePassX11) "-DWITH_XC_X11=OFF") + ++ (lib.optional (withKeePassFDOSecrets && stdenv.isLinux) "-DWITH_XC_FDOSECRETS=ON") + ++ (lib.optional (withKeePassYubiKey && stdenv.isLinux) "-DWITH_XC_YUBIKEY=ON") + ++ (lib.optional withKeePassBrowser "-DWITH_XC_BROWSER=ON") + ++ (lib.optional withKeePassKeeShare "-DWITH_XC_KEESHARE=ON") + ++ (lib.optional withKeePassNetworking "-DWITH_XC_NETWORKING=ON") + ++ (lib.optional withKeePassSSHAgent "-DWITH_XC_SSHAGENT=ON"); doCheck = true; checkPhase = '' @@ -112,14 +110,14 @@ stdenv.mkDerivation rec { readline zlib ] - ++ optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication - ++ optional stdenv.isDarwin qtmacextras - ++ optional stdenv.isLinux libusb1 - ++ optional withKeePassX11 qtx11extras; + ++ lib.optional (stdenv.isDarwin && withKeePassTouchID) darwin.apple_sdk.frameworks.LocalAuthentication + ++ lib.optional stdenv.isDarwin qtmacextras + ++ lib.optional stdenv.isLinux libusb1 + ++ lib.optional withKeePassX11 qtx11extras; passthru.tests = nixosTests.keepassxc; - meta = { + meta = with lib; { description = "Offline password manager with many features."; longDescription = '' A community fork of KeePassX, which is itself a port of KeePass Password Safe. diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepmenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepmenu/default.nix index d169e19a19..8cdbd69912 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepmenu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepmenu/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { pynput ]; - checkInputs = [ xvfb-run ]; + nativeCheckInputs = [ xvfb-run ]; checkPhase = '' xvfb-run python setup.py test ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix index c2162b6f0c..2c8a31acc1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keystore-explorer/default.nix @@ -1,11 +1,11 @@ { fetchzip, lib, stdenv, jdk, runtimeShell, glib, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "5.5.1"; + version = "5.5.2"; pname = "keystore-explorer"; src = fetchzip { url = "https://github.com/kaikramer/keystore-explorer/releases/download/v${version}/kse-${lib.replaceStrings ["."] [""] version}.zip"; - sha256 = "2C/LkUUuef30PkN7HL0CtcNOjR5uNo9XaCiTatv5hgA="; + sha256 = "sha256-mDi/TSYumCg2hAnMOI2QpdAOSlDMpdJPqzatFotAqUk="; }; # glib is necessary so file dialogs don't hang. diff --git a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix index 1a2184833a..18952865eb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { urwid ]; - checkInputs = with python3.pkgs;[ + nativeCheckInputs = with python3.pkgs;[ freezegun hypothesis packaging diff --git a/third_party/nixpkgs/pkgs/applications/misc/kiwix/lib.nix b/third_party/nixpkgs/pkgs/applications/misc/kiwix/lib.nix index 84fede08f3..144d83f6c1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kiwix/lib.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kiwix/lib.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { pugixml ]; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/lukesmithxyz-bible/kjv.nix b/third_party/nixpkgs/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/misc/lukesmithxyz-bible/kjv.nix rename to third_party/nixpkgs/pkgs/applications/misc/kjv/lukesmithxyz-kjv.nix diff --git a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix index 3ab41da354..0386b25ee4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.27.11"; + version = "0.28.3"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-w3ag+TPUrjPbPIy6N4HPsfraOyoHqBbvjwB1M6+qh60="; + hash = "sha256-keC+QLV/iEEGFDdy/Vt2pCr55qbqQzcx3HokdDi+xSU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/kord/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kord/default.nix new file mode 100644 index 0000000000..d42025a643 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/kord/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, alsa-lib +}: + +rustPlatform.buildRustPackage rec { + pname = "kord"; + version = "0.4.2"; + + # kord depends on nightly features + RUSTC_BOOTSTRAP = 1; + + src = fetchFromGitHub { + owner = "twitchax"; + repo = "kord"; + rev = "v${version}"; + sha256 = "sha256-B/UwnbzXI3ER8IMOVtn0ErVqFrkZXKoL+l7ll1AlzDg="; + }; + + cargoHash = "sha256-xhWSycTe72HW3E9meTo4wjOCHDcNq6fUPT6nqHoW9vE="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ alsa-lib ]; + + meta = with lib; { + description = "A music theory binary and library for Rust"; + homepage = "https://github.com/twitchax/kord"; + maintainers = with maintainers; [ kidsan ]; + license = with licenses; [ mit ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix index ea855f3d30..9a9db9d70f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix @@ -2,8 +2,8 @@ , stdenv , fetchurl , appimageTools +, appimage-run , makeWrapper -, electron , git }: @@ -30,30 +30,23 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/share/${pname} $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} + mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/${pname}/resources/app/icons + cp -a ${appimageContents}/resources/app/icons/logseq.png $out/share/${pname}/resources/app/icons/logseq.png cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop - # remove the `git` in `dugite` because we want the `git` in `nixpkgs` - chmod +w -R $out/share/${pname}/resources/app/node_modules/dugite/git - chmod +w $out/share/${pname}/resources/app/node_modules/dugite - rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git - chmod -w $out/share/${pname}/resources/app/node_modules/dugite + # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs + makeWrapper ${appimage-run}/bin/appimage-run $out/bin/logseq \ + --set "LOCAL_GIT_DIRECTORY" ${git} \ + --add-flags ${src} + # Make the desktop entry run the app using appimage-run substituteInPlace $out/share/applications/${pname}.desktop \ - --replace Exec=Logseq Exec=${pname} \ + --replace Exec=Logseq "Exec=$out/bin/logseq" \ --replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png runHook postInstall ''; - postFixup = '' - # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs - makeWrapper ${electron}/bin/electron $out/bin/${pname} \ - --set "LOCAL_GIT_DIRECTORY" ${git} \ - --add-flags $out/share/${pname}/resources/app - ''; - passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix index c67ec4cc27..d476024553 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/default.nix @@ -123,7 +123,7 @@ buildPythonApplication rec { --replace "'libmagic.so.1'" "'${lib.getLib file}/lib/libmagic.so.1'" ''; - checkInputs = [ xvfb-run nose2 flake8 ] ++ requiredTools; + nativeCheckInputs = [ xvfb-run nose2 flake8 ] ++ requiredTools; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/applications/misc/madonctl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/madonctl/default.nix index 141bdac87d..b9a1c0fd53 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/madonctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/madonctl/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "McKael"; repo = "madonctl"; rev = "v${version}"; - sha256 = "sha256-mo185EKjLkiujAKcAFM1XqkXWvcfYbnv+r3dF9ywaf8="; + hash = "sha256-mo185EKjLkiujAKcAFM1XqkXWvcfYbnv+r3dF9ywaf8="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/makeself/default.nix b/third_party/nixpkgs/pkgs/applications/misc/makeself/default.nix index 342700e678..bd197395e8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/makeself/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/makeself/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # when running these tests inside build, based on free disk space. doCheck = false; checkTarget = "test"; - checkInputs = [ which zstd pbzip2 ]; + nativeCheckInputs = [ which zstd pbzip2 ]; installPhase = '' mkdir -p $out/{bin,share/{${pname}-${version},man/man1}} diff --git a/third_party/nixpkgs/pkgs/applications/misc/mangal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mangal/default.nix index b443c16601..26e735039b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mangal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mangal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mangal"; - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { owner = "metafates"; repo = pname; rev = "v${version}"; - hash = "sha256-T0QoHqL07J4Fb95qluYPb0yZYwdr7vDNLlrp7zPhtrA="; + hash = "sha256-nbJdePlzZFM2ihbvFIMKyYZ9C0uKjU3TE5VLduLvtKE="; }; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mbutil/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mbutil/default.nix index b108d1a564..69b61afaee 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mbutil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mbutil/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "06d62r89h026asaa4ryzb23m86j0cmbvy54kf4zl5f35sgiha45z"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = "nosetests"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/meerk40t/default.nix b/third_party/nixpkgs/pkgs/applications/misc/meerk40t/default.nix index 276cf79988..a3b5b591f6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/meerk40t/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/meerk40t/default.nix @@ -46,7 +46,7 @@ buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix b/third_party/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix index 39849f6827..efa10faf2a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.3.1"; + version = "2.4.0"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-nH2BsfXFwBdu7/YH2OuG90HxYgiuqKJqMC4p0PRlgPw="; + hash = "sha256-/Zi82ri61cQHt1D8DjeVHTSeEn9ubQJD931kP0ffiOs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix index c33e0d6a57..743c92407e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { gtk3 ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ glibcLocales pytest tox diff --git a/third_party/nixpkgs/pkgs/applications/misc/mnamer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mnamer/default.nix index cad389bf0b..e928e631c0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mnamer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mnamer/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { ./update_hack.patch ]; - checkInputs = [ python3Packages.pytestCheckHook ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; # disable test that fail (networking, etc) disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix index f714b026a8..1525fb86f8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.55.0"; + version = "1.00.1"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-up78503+YqUB2fR9B6W6plYksTJzTj5pkmFJ5eL/mLY="; + sha256 = "sha256-oENMr3d2vFisEFl7gYBQQ0XRBeogAYOfBE5th463laI="; }; outputs = [ "out" "udev" ]; 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 51e1a15b47..51cd4df77b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "moonlight-embedded"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "sha256-YZEPm+k0YzJB8OQAiFUOPc0QR2C0AkSgpNYdoh8jX8E="; + sha256 = "sha256-TUS0eTlQA7O59EvJHrQkqDQexv84ucza6kE4t98AGPs="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mozphab/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mozphab/default.nix index d78d880c2e..82cf9b3d95 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mozphab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mozphab/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ git mercurial patch diff --git a/third_party/nixpkgs/pkgs/applications/misc/mps-youtube/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mps-youtube/default.nix deleted file mode 100644 index b1118cfc59..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/mps-youtube/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, python3Packages, fetchFromGitHub }: - -with python3Packages; - -buildPythonApplication rec { - pname = "mps-youtube"; - version = "unstable-2020-01-28"; - - src = fetchFromGitHub { - owner = "mps-youtube"; - repo = "mps-youtube"; - rev = "b808697133ec2ad7654953232d1e841b20aa7cc3"; - sha256 = "0lqprlpc0v092xqkjc0cc395ag45lijwgd34dpg2jy6i0f2szywv"; - }; - - propagatedBuildInputs = [ pafy ]; - - # disabled due to error in loading unittest - # don't know how to make test from: - doCheck = false; - - # before check create a directory and redirect XDG_CONFIG_HOME to it - preCheck = '' - mkdir -p check-phase - export XDG_CONFIG_HOME=$(pwd)/check-phase - ''; - - meta = with lib; { - description = "Terminal based YouTube player and downloader"; - homepage = "https://github.com/mps-youtube/mps-youtube"; - license = licenses.gpl3; - maintainers = with maintainers; [ koral odi ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/mu-repo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mu-repo/default.nix index 9da761c588..ff07856e0e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mu-repo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mu-repo/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ git ]; - checkInputs = [ pytestCheckHook git ]; + nativeCheckInputs = [ pytestCheckHook git ]; passthru.tests.version = testers.testVersion { package = mu-repo; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix index bc6a481708..935a9582fc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix @@ -140,8 +140,13 @@ in stdenv.mkDerivation rec { patchShebangs tools/get_wb_version.sh ''; - # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + NIX_CFLAGS_COMPILE = toString ([ + # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated + "-Wno-error=deprecated-declarations" + ] ++ lib.optionals stdenv.isAarch64 [ + # error: narrowing conversion of '-1' from 'int' to 'char' + "-Wno-error=narrowing" + ]); cmakeFlags = [ "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" diff --git a/third_party/nixpkgs/pkgs/applications/misc/nanoblogger/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nanoblogger/default.nix index 0ae63d210e..102991f002 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nanoblogger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nanoblogger/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Small weblog engine written in Bash for the command line"; - homepage = "http://nanoblogger.sourceforge.net/"; + homepage = "https://nanoblogger.sourceforge.net/"; license = lib.licenses.gpl2; mainProgram = "nb"; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/misc/navipowm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/navipowm/default.nix index 6527a4f574..4ae3cdeebd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/navipowm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/navipowm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; meta = { - homepage = "http://navipowm.sourceforge.net/"; + homepage = "https://navipowm.sourceforge.net/"; description = "Car navigation system"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix index dbc57794ee..2f0286a5c2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/neo4j-desktop/default.nix @@ -1,12 +1,12 @@ { appimageTools, lib, fetchurl }: let pname = "neo4j-desktop"; - version = "1.4.12"; + version = "1.5.6"; name = "${pname}-${version}"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/dist.neo4j.org/${pname}/linux-offline/${name}-x86_64.AppImage"; - hash = "sha256-CfdXus9Zj6Tx6wAXpV2tRdqvJqowgE+NIL04v3fwtJE="; + hash = "sha256-0/jS1LaaIam6w7RbLXSKXiXlpocZMTMuTZvFRU4qypg="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix index 28e736b008..e124671e84 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nwg-bar"; - version = "unstable-2021-09-23"; + version = "0.1.0"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; - rev = "7dd7df3cd9a9e78fe477e88e0f3cb97309d50ff5"; - sha256 = "sha256-piysF19WDjb/EGI9MBepYrOrQL9C1fsoq05AP8CYN58="; + rev = "v${version}"; + sha256 = "sha256-3uDEmIrfvUD/QGwgFYYWQUeYq35XJdpSVL9nHBl11kY="; }; patches = [ ./fix-paths.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix index ff0127c106..23edd6e274 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.3.0"; + version = "0.3.8"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o69ZCtIT0jh4QnlspiAh58aA61aFkkKu0FdmscHLMIk="; + sha256 = "sha256-34C0JmsPuDqR3QGmGf14naGOu9xPtPbpdWUvkbilkqs="; }; - vendorSha256 = "sha256-Twipdrt3XZVrzJvElEGbKaJRMnop8fIFMFnriPTSS14="; + vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs="; buildInputs = [ cairo gobject-introspection gtk3 gtk-layer-shell ]; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix index 24deebce17..34600bb351 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nwg-launchers"; - version = "0.6.3"; + version = "0.7.1.1"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QWDYy0TBxoYxfRAOtAEVM8wsPUi2SnzMXsu38guAURU="; + sha256 = "sha256-+waoJHU/QrVH7o9qfwdvFTFJzTGLcV9CeYPn3XHEAkM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 51841f9852..45ca034b74 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -2,7 +2,7 @@ , fetchurl , lib , makeWrapper -, electron_18 +, electron_21 , makeDesktopItem , graphicsmagick , writeScript @@ -50,7 +50,7 @@ let installPhase = '' runHook preInstall mkdir -p $out/bin - makeWrapper ${electron_18}/bin/electron $out/bin/obsidian \ + makeWrapper ${electron_21}/bin/electron $out/bin/obsidian \ --add-flags $out/share/obsidian/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" install -m 444 -D resources/app.asar $out/share/obsidian/app.asar diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix index 46d513a36b..12d0a5e38f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -5,6 +5,7 @@ , python3 , substituteAll , nix-update-script +, nixosTests # To include additional plugins, pass them here as an overlay. , packageOverrides ? self: super: { } }: @@ -14,6 +15,21 @@ let self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ( [ + ( + # with version 3 of flask-limiter octoprint 1.8.6 fails to start with + # TypeError: Limiter.__init__() got multiple values for argument 'key_func' + self: super: { + flask-limiter = super.flask-limiter.overridePythonAttrs (oldAttrs: rec { + version = "2.6.2"; + src = fetchFromGitHub { + owner = "alisaifee"; + repo = "flask-limiter"; + rev = version; + sha256 = "sha256-eWOdJ7m3cY08ASN/X+7ILJK99iLJJwCY8294fwJiDew="; + }; + }); + } + ) # Built-in dependency ( self: super: { @@ -66,6 +82,10 @@ let # requires octoprint itself during tests doCheck = false; + postPatch = '' + substituteInPlace octoprint_pi_support/__init__.py \ + --replace /usr/bin/vcgencmd ${self.pkgs.libraspberrypi}/bin/vcgencmd + ''; }; } ) @@ -136,7 +156,7 @@ let py.pkgs.appdirs ]; - checkInputs = with self; [ + nativeCheckInputs = with self; [ ddt mock pytestCheckHook @@ -202,6 +222,9 @@ let passthru = { python = self.python; updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) octoprint; + }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix index fba1c0b0f5..472af0caf4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/onboard/default.nix @@ -93,7 +93,7 @@ python3.pkgs.buildPythonApplication rec { dconf ]; - checkInputs = [ + nativeCheckInputs = [ # for Onboard.SpellChecker.aspell_cmd doctests (aspellWithDicts (dicts: with dicts; [ en ])) diff --git a/third_party/nixpkgs/pkgs/applications/misc/openlp/lib.nix b/third_party/nixpkgs/pkgs/applications/misc/openlp/lib.nix index 9e8440a4c8..4a61ab6537 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openlp/lib.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openlp/lib.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { # # See also https://discourse.nixos.org/t/qt-plugin-path-unset-in-test-phase/ - #checkInputs = [ mock nose ]; + #nativeCheckInputs = [ mock nose ]; nativeBuildInputs = [ qt5.qttools ]; propagatedBuildInputs = [ alembic diff --git a/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix b/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix index 29cdac6b8d..d88c4f549d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "43.0"; + version = "43.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "HKdaAMSoUSoJ5KJuszn615RNHtQayjL3D2lickQhglA="; + sha256 = "9ljgSc4WknO4Q0aBBCTW9QkpHwXX7MOnegPZEqo+aEA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix index 625f1cb26a..bbd8aaaa84 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.11.24-3"; + version = "2023.01.25-3"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-4RW7/sCtOXxA8n0Jx4ksNGRg7r8ErujmyzbnA1pi6ng="; + sha256 = "sha256-4nlD/GFOoBOCXVWtC7i6SUquEbob5++GyagZOTznygU="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix b/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix index a1f119f683..ffb62dd6c1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/orpie/default.nix @@ -4,7 +4,7 @@ ocamlPackages.buildDunePackage rec { pname = "orpie"; version = "1.6.1"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "pelzlpj"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix index f9f880050e..ef31ed2f03 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/osm2xmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, libyamlcpp, boost } : +{ lib, stdenv, fetchFromGitHub, libroxml, proj_7, yaml-cpp_0_3, boost } : stdenv.mkDerivation rec { pname = "osm2xmap"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; - buildInputs = [ libroxml proj_7 libyamlcpp boost ]; + buildInputs = [ libroxml proj_7 yaml-cpp_0_3 boost ]; meta = with lib; { homepage = "https://github.com/sembruk/osm2xmap"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix b/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix index a2f2a676ab..00d157eb25 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "sha256-xedunFzar44o+b/45isXWacDcC81wWkxgGwnpLPH/n0="; + sha256 = "sha256-xV/1LFby0L/o648XEQQ9gS9/eHssWhMIG7R1E8bfIDU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix index c06713c98a..ec1ea90cd4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "overmind"; - version = "2.3.0"; + version = "2.4.0"; nativeBuildInputs = [ makeWrapper ]; @@ -14,10 +14,10 @@ buildGoModule rec { owner = "DarthSim"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vmmSsg0JneMseFCcx/no2x/Ghppmyiod8ZAIb4JWW9I="; + sha256 = "sha256-cpsTytV1TbvdR7XUKkp4GPD1qyt1qnmY6qOsge01swE="; }; - vendorSha256 = "sha256-QIKyLknPvmt8yiUCSCIqha8h9ozDGeQnKSM9Vwus0uY="; + vendorHash = "sha256-ndgnFBGtVFc++h+EnA37aY9+zNsO5GDrTECA4TEWPN4="; meta = with lib; { homepage = "https://github.com/DarthSim/overmind"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/oversteer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oversteer/default.nix new file mode 100644 index 0000000000..87c49c2cf7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/oversteer/default.nix @@ -0,0 +1,76 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, python3, python3Packages +, meson, cmake, ninja, udev, appstream, appstream-glib, desktop-file-utils, gtk3 +, wrapGAppsHook, gobject-introspection, bash, }: +let + python = python3.withPackages (p: + with p; [ + pygobject3 + pyudev + pyxdg + evdev + matplotlib + scipy + gtk3 + pygobject3 + ]); + + version = "0.7.2"; +in stdenv.mkDerivation { + inherit version; + + pname = "oversteer"; + + src = fetchFromGitHub { + owner = "berarma"; + repo = "oversteer"; + rev = version; + sha256 = "sha256-9MWRb0NXUbB8c+pH0mjUzsz849PmEjsZMhQr4wsmlKI="; + }; + + buildInputs = [ bash gtk3 ]; + + nativeBuildInputs = [ + pkg-config + gettext + python + wrapGAppsHook + gobject-introspection + meson + udev + ninja + appstream + appstream-glib + desktop-file-utils + ]; + + dontUseCmakeConfigure = true; + + propagatedBuildInputs = [ python gtk3 python3Packages.pygobject3 ]; + + mesonFlags = [ + "--prefix" + (placeholder "out") + "-Dudev_rules_dir=${placeholder "out"}/lib/udev/rules.d/" + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" + ) + ''; + + postInstall = '' + substituteInPlace $out/lib/udev/rules.d/* \ + --replace /bin/sh ${bash}/bin/sh + ''; + + patches = [ ./fix-install-dir.patch ]; + + meta = with lib; { + homepage = "https://github.com/berarma/oversteer"; + description = "Steering Wheel Manager for Linux"; + license = licenses.gpl3; + maintainers = [ maintainers.srounce ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/oversteer/fix-install-dir.patch b/third_party/nixpkgs/pkgs/applications/misc/oversteer/fix-install-dir.patch new file mode 100644 index 0000000000..0d5fdec689 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/oversteer/fix-install-dir.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index 239acf9..6a06c83 100644 +--- a/meson.build ++++ b/meson.build +@@ -8,7 +8,7 @@ pymod = import('python') + prefix = get_option('prefix') + pkgdatadir = join_paths(prefix, get_option('datadir'), meson.project_name()) + py_installation = pymod.find_installation(get_option('python')) +-py_path = py_installation.get_path('purelib') ++py_path = py_installation.get_install_dir() + + python3_required_modules = ['gi', 'pyudev', 'xdg', 'evdev', 'gettext', 'matplotlib', 'scipy', 'numpy'] + foreach p : python3_required_modules diff --git a/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix index 3d6e42bd62..56490754e1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.1.11"; + version = "0.2.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-O4fVEYstDkVHn7fBVOGu1ok9K9xiO9uLx0+vb6qMZoA="; + sha256 = "sha256-CsfzQN7n/LsNIivJShDG02cHwPktkXl/0udBSPz0i2U="; }; - cargoHash = "sha256-LSMAE24E8Is/ejUE/2vogP0GmpF+9oO2pJoQOZ8OfU8="; + cargoHash = "sha256-FSuhG+ZSQzwj1YB3xs3A1uFWPhwK8FIfVfUY9V/J2Z8="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix b/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix index b41b5ffb88..bce7760759 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix @@ -11,22 +11,27 @@ , openssl , pkg-config , zeromq +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Foundation; +in stdenv.mkDerivation rec { pname = "p2pool"; - version = "2.4"; + version = "2.7"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-En2ogxAD61w7DRTsCGIp6fEP/cC2A+pTYIbjeJ1MktY="; + sha256 = "sha256-j3SVwat/LGw/iGcyNn8acR29Ob/WXDKyeCfDTsH+gxA="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libuv zeromq libsodium gss hwloc openssl curl ]; + buildInputs = [ libuv zeromq libsodium gss hwloc openssl curl ] + ++ lib.optionals stdenv.isDarwin [ Foundation ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/misc/parsec/bin.nix b/third_party/nixpkgs/pkgs/applications/misc/parsec/bin.nix index b15ee2644a..7aae31152f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/parsec/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/parsec/bin.nix @@ -12,11 +12,11 @@ stdenvNoCC.mkDerivation { pname = "parsec-bin"; - version = "150_28"; + version = "150_86e"; src = fetchurl { - url = "https://web.archive.org/web/20220622215230id_/https://builds.parsecgaming.com/package/parsec-linux.deb"; - sha256 = "1hfdzjd8qiksv336m4s4ban004vhv00cv2j461gc6zrp37s0fwhc"; + url = "https://web.archive.org/web/20230124210253/https://builds.parsecgaming.com/package/parsec-linux.deb"; + sha256 = "sha256-wwBy86TdrHaH9ia40yh24yd5G84WTXREihR+9I6o6uU="; }; unpackPhase = '' @@ -76,6 +76,7 @@ stdenvNoCC.mkDerivation { meta = with lib; { homepage = "https://parsecgaming.com/"; + changelog = "https://parsec.app/changelog"; description = "Remote streaming service client"; license = licenses.unfree; maintainers = with maintainers; [ arcnmx ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix index d7ac4fa21e..1ce8511b27 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { secretstorage ]; - checkInputs = + nativeCheckInputs = let ps = python3.pkgs; in @@ -71,6 +71,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/mdellweg/pass_secret_service/"; license = lib.licenses.gpl3Only; platforms = lib.platforms.all; + mainProgram = "pass_secret_service"; maintainers = with lib.maintainers; [ jluttine aidalgol ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix index 237e229fc5..96cc51fceb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pgmodeler/default.nix @@ -1,28 +1,30 @@ { lib +, stdenv , fetchFromGitHub +, wrapQtAppsHook , pkg-config , qmake -, mkDerivation +, qtwayland , qtsvg , postgresql }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.0.0-beta1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-5ZIzxo2UvE+aKznF9ZLYFg5z3JkYCB+9rGdVDJl14Hw="; + sha256 = "sha256-Lim9iQYdmulwZEIayoBGoAmQ7rysTEEof5iXy3kfKXs="; }; - nativeBuildInputs = [ pkg-config qmake ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ]; # todo: libpq would suffice here. Unfortunately this won't work, if one uses only postgresql.lib here. - buildInputs = [ postgresql qtsvg ]; + buildInputs = [ postgresql qtsvg qtwayland ]; meta = with lib; { description = "A database modeling tool for PostgreSQL"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/phockup/default.nix b/third_party/nixpkgs/pkgs/applications/misc/phockup/default.nix index f93c2b78c4..7db0690da8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/phockup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/phockup/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "phockup"; - version = "1.7.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "ivandokov"; repo = "phockup"; rev = version; - sha256 = "sha256-Ho9aZjBvSwFMur2NubhP4olPN31SNTEdQGCUV7nX0uE="; + sha256 = "sha256-ge34Iv/+B0xdrSNc7w3nZJw0DHBUvuh2k/I8v/RRg10="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/plover/default.nix b/third_party/nixpkgs/pkgs/applications/misc/plover/default.nix index eadd7672be..3f4e82d2e4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/plover/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/plover/default.nix @@ -25,7 +25,7 @@ # sed on many of the platforms Plover builds for postPatch = "sed -i /PyQt5/d setup.cfg"; - checkInputs = [ pytest mock ]; + nativeCheckInputs = [ pytest mock ]; propagatedBuildInputs = [ babel pyqt5 xlib pyserial appdirs wcwidth setuptools ]; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix index c795e7f763..62c6ed0f4a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "pokemon-colorscripts-mac"; - version = "stable=2021-08-10"; + version = "stable-2021-08-10"; src = fetchFromGitHub { owner = "nuke-dash"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/polychromatic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/polychromatic/default.nix index 42143cbc97..f940f5a4af 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/polychromatic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/polychromatic/default.nix @@ -20,14 +20,14 @@ python3Packages.buildPythonApplication rec { name = "polychromatic"; - version = "0.7.3"; + version = "0.8.0"; format = "other"; src = fetchFromGitHub { owner = "polychromatic"; repo = "polychromatic"; rev = "v${version}"; - sha256 = "sha256-H++kQ3Fxw56avEsSE1ctu5p0s50s0eQ+jL5zXS3AA94="; + sha256 = "sha256-ym2pcGUWM5zCUx/lYs+WECj+wbyBtWnx04W/NRXNKlw="; }; postPatch = '' @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace scripts/build-styles.sh \ --replace '$(which sassc 2>/dev/null)' '${sassc}/bin/sassc' \ --replace '$(which sass 2>/dev/null)' '${sassc}/bin/sass' - substituteInPlace pylib/common.py \ + substituteInPlace polychromatic/paths.py \ --replace "/usr/share/polychromatic" "$out/share/polychromatic" ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pomodoro/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pomodoro/default.nix new file mode 100644 index 0000000000..d180c8e436 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/pomodoro/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, Foundation }: + +rustPlatform.buildRustPackage rec { + pname = "pomodoro"; + version = "unstable-2021-06-18"; + + src = fetchFromGitHub { + owner = "SanderJSA"; + repo = "Pomodoro"; + rev = "c833b9551ed0b09e311cdb369cc8226c5b9cac6a"; + sha256 = "sha256-ZA1q1YVJcdSUF9NTikyT3vrRnqbsu5plzRI2gMu+qnQ="; + }; + + cargoSha256 = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4="; + buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; + + meta = with lib; { + description = "A simple CLI pomodoro timer using desktop notifications written in Rust"; + homepage = "https://github.com/SanderJSA/Pomodoro"; + license = licenses.mit; + maintainers = with maintainers; [ annaaurora ]; + # error: redefinition of module 'ObjectiveC' + broken = stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix b/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix index 8ec18a8748..b45854a6d1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix @@ -32,7 +32,7 @@ let inherit version; sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; }; - checkInputs = old.checkInputs ++ (with self; [ + nativeCheckInputs = old.nativeCheckInputs ++ (with self; [ requests ]); doCheck = false; @@ -81,7 +81,7 @@ let # however `click-7` is needed by the older flask we need here. Since it's just # for the test-suite apparently, let's skip it for now. Mako = super.Mako.overridePythonAttrs (lib.const { - checkInputs = []; + nativeCheckInputs = []; doCheck = false; }); }; @@ -119,7 +119,7 @@ python3'.pkgs.buildPythonPackage rec { passthru.tests = { inherit (nixosTests) privacyidea; }; - checkInputs = with python3'.pkgs; [ openssl mock pytestCheckHook responses testfixtures ]; + nativeCheckInputs = with python3'.pkgs; [ openssl mock pytestCheckHook responses testfixtures ]; preCheck = "export HOME=$(mktemp -d)"; postCheck = "unset HOME"; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix b/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix index 36e95ee8f0..f71841c1af 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "0.29.7"; + version = "0.40.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-gVXil6Gc65/6VMuONfVyxU6SSV0vCbJKXDvtG4a+pbU="; + hash = "sha256-8gyALVW+ort76r/zevWAhZlJ/fg5DBmwUNvjZ21wWKY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-fL12Rx/0TF2jjciSHgfIDfrqdQxxm2JiGfgO3Dgz81M="; + vendorHash = "sha256-rbGKFZY9YEcBAFFxG6v3xaVLQxVoqIehN0LgINku3Xo="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix index 697d1a096e..c0a1e7e021 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix @@ -26,12 +26,11 @@ , openvdb , pcre , qhull -, systemd , tbb , wxGTK31 , xorg , fetchpatch -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: let wxGTK-prusa = wxGTK31.overrideAttrs (old: rec { @@ -82,7 +81,7 @@ stdenv.mkDerivation rec { xorg.libX11 ] ++ lib.optionals withSystemd [ systemd - ] ++ checkInputs; + ] ++ nativeCheckInputs; patches = [ # Fix detection of TBB, see https://github.com/prusa3d/PrusaSlicer/issues/6355 @@ -103,7 +102,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; separateDebugInfo = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pure-maps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pure-maps/default.nix index 793e5291d5..0220778277 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pure-maps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pure-maps/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "pure-maps"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "rinigus"; repo = "pure-maps"; rev = version; - hash = "sha256-ZPW2hNnaRfv5aTXqku7hPShN0leOuVEJ3T/OOTzwgXQ="; + hash = "sha256-07Jk5ufYbBAa/UY1B0IoyuOAVt15rGCxCRXu3OeYyWU="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pyditz/cerberus.nix b/third_party/nixpkgs/pkgs/applications/misc/pyditz/cerberus.nix index 0e473c6a1b..4da032bafe 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pyditz/cerberus.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pyditz/cerberus.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1pxzr8sfm2hc5s96m9k044i44nwkva70n0ypr6a35v73zn891cx5"; }; - checkInputs = [ pytest-runner pytest ]; + nativeCheckInputs = [ pytest-runner pytest ]; meta = with lib; { homepage = "http://python-cerberus.org/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pyditz/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pyditz/default.nix index d986c13b84..fe3bf0c521 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pyditz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pyditz/default.nix @@ -15,7 +15,7 @@ in buildPythonApplication rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ pyyaml six jinja2 cerberus_1_1 ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { homepage = "https://pythonhosted.org/pyditz/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix index 675df5d5ba..f51f53e9b7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pytrainer/default.nix @@ -63,7 +63,7 @@ in python.pkgs.buildPythonApplication rec { "--prefix" "PATH" ":" (lib.makeBinPath [ perl gpsbabel ]) ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales perl xvfb-run diff --git a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix index 0fc2697848..dcf941cf03 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.27.6.11"; + version = "3.27.8.7"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-FfbHedJgzZdUpamLL2Wz2P8glaC/IVYCGZQk9EEc83k="; + sha256 = "sha256-GWDDZzFDOR96ZpmNDUuE+S9zTMVSYFNJKp8z/Cx3hec="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch b/third_party/nixpkgs/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch deleted file mode 100644 index 1fbf5ec3f1..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/qpdfview/qpdfview-qt515-compat.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix compatibility with Qt 5.15. - -Patch copied from upstream source repository: - -https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 - ---- a/sources/model.h 2017-04-19 21:01:25 +0000 -+++ b/sources/model.h 2020-06-09 06:24:11 +0000 -@@ -24,6 +24,7 @@ - #define DOCUMENTMODEL_H - - #include -+#include - #include - #include - #include - diff --git a/third_party/nixpkgs/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index d6ec124f74..64baaf5d1b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "remarkable-mouse"; - version = "7.0.3"; + version = "7.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e6xJBZmWXAPOHNNUMOGLjbe3QmvW0SRwfMNJVZsM3gw="; + sha256 = "sha256-82P9tE3jiUlKBGZCiWDoL+9VJ06Bc+If+aMfcEEU90U="; }; propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix index d19d27153f..9616790ba7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix @@ -2,11 +2,11 @@ appimageTools.wrapType2 rec { pname = "remnote"; - version = "1.7.6"; + version = "1.8.52"; src = fetchurl { url = "https://download.remnote.io/RemNote-${version}.AppImage"; - sha256 = "sha256-yRUpLev/Fr3mOamkFgevArv2UoXgV4e6zlyv7FaQ4RM="; + sha256 = "sha256-0t4i/4dlZ1tv4kz8eD5cjIuhx0lT8dQbh+bpjqAfqTE="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/river-tag-overlay/default.nix b/third_party/nixpkgs/pkgs/applications/misc/river-tag-overlay/default.nix new file mode 100644 index 0000000000..4aa2a3c59a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/river-tag-overlay/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromSourcehut, nixos, wayland, pixman, pkg-config }: + +stdenv.mkDerivation rec { + pname = "river-tag-overlay"; + version = "1.0.0"; + + src = fetchFromSourcehut { + owner = "~leon_plickat"; + repo = pname; + rev = "v${version}"; + hash = "sha256-hLyXdLi/ldvwPJ1oQQsH5wgflQJuXu6vhYw/qdKAV9E="; + }; + + buildInputs = [ pixman wayland ]; + nativeBuildInputs = [ pkg-config ]; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "PREFIX=" + ]; + + meta = with lib; { + description = "A pop-up showing tag status"; + homepage = "https://sr.ht/~leon_plickat/river-tag-overlay"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ edrex ]; + platforms = platforms.linux; + broken = stdenv.isAarch64; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/rm-improved/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rm-improved/default.nix index c35fa3dc88..be5fb63444 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rm-improved/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rm-improved/default.nix @@ -1,7 +1,5 @@ { fetchFromGitHub, rustPlatform, lib }: -with lib; - rustPlatform.buildRustPackage rec { pname = "rm-improved"; version = "0.13.0"; @@ -15,7 +13,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0d065xia4mwdhxkiqfg7pic6scfzipzmsvvx7l6l97w62lzpiqx3"; }; - meta = { + meta = with lib; { description = "Replacement for rm with focus on safety, ergonomics and performance"; homepage = "https://github.com/nivekuil/rip"; maintainers = with maintainers; [ nils-degroot ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/seatd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/seatd/default.nix index 8c10219903..f9a7cc928e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/seatd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/seatd/default.nix @@ -5,7 +5,7 @@ , pkg-config , scdoc , stdenv -, systemdSupport ? stdenv.isLinux, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix index fb0a19dbb4..5bf957ec7c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { setuptools # needs pkg_resources ]; - checkInputs = [ + nativeCheckInputs = [ ffmpeg ] ++ (with python3.pkgs; [ pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix index 6c809ef2af..df2c7b77ae 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix @@ -62,8 +62,9 @@ stdenv.mkDerivation (finalAttrs: { cp pdf_viewer/keys_user.config sioyek.app/Contents/MacOS/ cp tutorial.pdf sioyek.app/Contents/MacOS/ - mkdir -p $out/Applications + mkdir -p $out/Applications $out/bin cp -r sioyek.app $out/Applications + ln -s $out/Applications/sioyek.app/Contents/MacOS/sioyek $out/bin/sioyek '' else '' install -Dm644 tutorial.pdf $out/share/tutorial.pdf cp -r pdf_viewer/shaders $out/share/ diff --git a/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix b/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix index cedd870173..c6c73115eb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-K8VsqaNUPxh3/Yddy6DFiOyjRuZ6r6bU456Pm31A1og="; }; - checkInputs = [ + nativeCheckInputs = [ bash go ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/slstatus/default.nix b/third_party/nixpkgs/pkgs/applications/misc/slstatus/default.nix index 5badb7f1b3..9c96cb2444 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/slstatus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/slstatus/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchgit, pkg-config, writeText, libX11, conf ? null, patches ? [] }: -with lib; - stdenv.mkDerivation rec { pname = "slstatus"; version = "unstable-2019-02-16"; @@ -12,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0kayyhpmppybhwndxgabw48wsk9v8x9xdb05xrly9szkw3jbvgw4"; }; - configFile = optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); + preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; inherit patches; @@ -24,7 +22,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with lib; { homepage = "https://tools.suckless.org/slstatus/"; description = "status monitor for window managers that use WM_NAME like dwm"; license = licenses.isc; diff --git a/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix index 697d13c8c0..990aedbc71 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/spacenav-cube-example/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://spacenav.sourceforge.net/"; + homepage = "https://spacenav.sourceforge.net/"; description = "An example application to test the spacenavd driver"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix index 48eb65d8e1..acd1337a66 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.14.3"; + version = "2.16.1"; src = fetchFromGitHub { owner = "spicetify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7bCl8VfkMhoTBnr+O+oBYQeSV2sRwlP/qUkNkYerZdU="; + sha256 = "sha256-Pq8HjmWSfBgieSJejrlw+FiRdq9NxryYPcw++Pdjsuk="; }; vendorSha256 = "sha256-E2Q+mXojMb8E0zSnaCOl9xp5QLeYcuTXjhcp3Hc8gH4="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/spnavcfg/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spnavcfg/default.nix index fcd4630e80..6424204c46 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/spnavcfg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/spnavcfg/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { - homepage = "http://spacenav.sourceforge.net/"; + homepage = "https://spacenav.sourceforge.net/"; description = "Interactive configuration GUI for space navigator input devices"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix index f91c7e7b32..21ac1939f4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix @@ -79,7 +79,7 @@ python3Packages.buildPythonApplication rec { xlib ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run python3Packages.pytest python3Packages.hypothesis-auto 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 d8af8fe07c..e4409d1ac7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "surface-control"; - version = "0.4.3-1"; + version = "0.4.3-2"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bqrp/XS4OJIRW2ChHnf9gMh/TgCPUEb9fP2soeT1Qe4="; + sha256 = "sha256-QgkUxT5Ae0agvalZl1ie+1LwxgaTzMrKpQY3KkpWwG4="; }; - cargoSha256 = "sha256-TWXK36cN8WuqfrMX7ybO2lnNiGnSKmfK6QGWMBM1y0o="; + cargoSha256 = "sha256-LPcN5xWOrl+MYVDKRIAlJoDepSSE9LTEN4fUS7bPS2U="; nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ udev ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 1afb5117a4..9738b273de 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-keyboard-configurator"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "pop-os"; repo = "keyboard-configurator"; rev = "v${version}"; - sha256 = "sha256-N7faWyM2KExnKr6foO6KIxkFD/pGzw9RJDnADwK/fYU="; + sha256 = "sha256-/RIpnbwLoNDdts18qhYqc8lDqsPoA5GW6z7LaZc5dos="; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { udev ]; - cargoSha256 = "sha256-h5kqm3ZyqzJhTjBcuOvaHkwPvF1xerN2eEDFwZAah6g="; + cargoSha256 = "sha256-hxHWfxNGmpX4mWj1ozOhhOyZI9J3aQzv3yvWFst81aU="; meta = with lib; { description = "Keyboard configuration application for System76 keyboards and laptops"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix index 767d0c768d..a15b0a4ab7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/default.nix @@ -118,7 +118,7 @@ python.pkgs.pythonPackages.buildPythonPackage rec { runHook postInstall ''; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ pytestCheckHook pytest-django pytest-factoryboy diff --git a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix index 4d3baf3fea..765462d78a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix @@ -5,19 +5,21 @@ buildGoModule rec { pname = "ticker"; - version = "4.5.4"; + version = "4.5.5"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-2Q+5EVeF8kXO4RogQIQHafV0AKIEKBFGqt27Vkanwss="; + rev = "refs/tags/v${version}"; + hash = "sha256-7FSyW71NWmWmBNQ5QUqMJ4x9WLXpm0kvvjdjzx1yk/M="; }; - vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; + vendorHash = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; ldflags = [ - "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" + "-s" + "-w" + "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" ]; # Tests require internet @@ -26,6 +28,7 @@ buildGoModule rec { meta = with lib; { description = "Terminal stock ticker with live updates and position tracking"; homepage = "https://github.com/achannarasappa/ticker"; + changelog = "https://github.com/achannarasappa/ticker/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ siraben ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tippecanoe/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tippecanoe/default.nix index f896d4c698..eebe42890d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tippecanoe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tippecanoe/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.17.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-GQPex+NX1DDOBWs/tBUsCtIWZ/+jxeblTRQEvfS2WuA="; + hash = "sha256-FWdAMIAoj3/+SQLIan++UpmWH1o3v92FsDw//b5RorM="; }; buildInputs = [ sqlite zlib ]; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix b/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix index e7a693b4ca..50e8a2ea10 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/todoist-electron/default.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron_21}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/tofi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tofi/default.nix index 947b5c336b..9438201d45 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tofi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tofi/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "tofi"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "philj56"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KLHZrfoQ6x3EeKWo/TMp30rEIqdq16i8YLr4zFHbnSc="; + sha256 = "sha256-HhkXypRGerWWHrR4maR3AtayWSy5qhl/LYwBHWGKboU="; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix index 91427c7cbb..6f6151d1ea 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-qZk42zGHWpeN5rZPFw7xAmDIvhPzqTePU3If+p/L98c="; }; - checkInputs = with python3Packages; [ pytest ]; + nativeCheckInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = with python3Packages; [ requests beautifulsoup4 future wcwidth urwid psycopg2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/topydo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/topydo/default.nix index 7667b4103d..a20e3e2650 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/topydo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/topydo/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { watchdog ]; - checkInputs = [ unittestCheckHook mock freezegun pylint ]; + nativeCheckInputs = [ unittestCheckHook mock freezegun pylint ]; # Skip test that has been reported multiple times upstream without result: # bram85/topydo#271, bram85/topydo#274. diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuhi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tuhi/default.nix index 4cc925d3bf..641723016a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tuhi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tuhi/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { gtk3 gobject-introspection glib ]; - checkInputs = with python3Packages; [ flake8 pytest ]; + nativeCheckInputs = with python3Packages; [ flake8 pytest ]; propagatedBuildInputs = with python3Packages; [ svgwrite pyxdg pycairo pygobject3 setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuir/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tuir/default.nix index fb1a85b1e4..d4188829d4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tuir/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tuir/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { py.test ''; - checkInputs = [ coverage coveralls docopt mock pylint pytest vcrpy ]; + nativeCheckInputs = [ coverage coveralls docopt mock pylint pytest vcrpy ]; propagatedBuildInputs = [ beautifulsoup4 decorator kitchen requests six ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix index b5e23f15b0..16d091aa7b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "1.0.34"; + version = "2.0.1"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-AnuPTv9W+2yDcM803DZaNIn4S7A78JEv6S8pA18whVA="; + sha256 = "sha256-AtwwLRZx9O8IWPFgFI/ZK0tbeshEmaKpTQxA1PepnWM="; }; - vendorHash = "sha256-go7eZHhrQ1ZcLOn56a3Azn3eRyAesAkgLabPbwzKtds="; + vendorHash = "sha256-gPF4XrUqDDJCCY1zrUr3AXDG0uoADR8LBxRP4yolcug="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix b/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix index d5d4b766e7..91ad479f45 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix @@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix index a67ba0eff7..527db967b9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ulauncher/default.nix @@ -62,7 +62,7 @@ python3Packages.buildPythonApplication rec { websocket-client ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ mock pytest pytest-mock diff --git a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix index 95c3153eeb..4911556086 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.13.5"; + version = "0.13.8"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-Tsv2nUlxu/nUsupQgYn1CAy/mrwq14OEFZErgO34thU="; + hash = "sha256-oNsA9VM6MN2czeZSTFGvmCWX0T3iVaAhQk1mVRyKgWw="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-Zd8/1i9YwVoOoJ1NG5gMGB781IbNBL5lfkrSwYNn9Hg="; + vendorHash = "sha256-LG5gTHXB1ItDZFbTBHyZGHZLaSYb8wekIHkahTMXzkk="; proxyVendor = true; # Exclude broken impala & hive driver diff --git a/third_party/nixpkgs/pkgs/applications/misc/veracrypt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/veracrypt/default.nix index 2897bb996c..9f36d6bfa3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/veracrypt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/veracrypt/default.nix @@ -14,14 +14,12 @@ , btrfs-progs }: -with lib; - stdenv.mkDerivation rec { pname = "veracrypt"; version = "1.25.9"; src = fetchurl { - url = "https://launchpad.net/${pname}/trunk/${toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; + url = "https://launchpad.net/${pname}/trunk/${lib.toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; sha256 = "sha256-drbhgYS8IaQdKUn/Y9ch1JBUpxbO/zpL13tcNRC3lK8="; }; @@ -54,7 +52,7 @@ stdenv.mkDerivation rec { --replace "Icon=veracrypt" "Icon=veracrypt.xpm" ''; - meta = { + meta = with lib; { description = "Free Open-Source filesystem on-the-fly encryption"; homepage = "https://www.veracrypt.fr/"; license = with licenses; [ asl20 /* and */ unfree /* TrueCrypt License version 3.0 */ ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix index 36a7285b3d..6e9909d38a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -71,7 +71,7 @@ buildPythonApplication rec { ] ++ lib.optionals withPcap [ dpkt dnslib ] ++ lib.optional withXclip xclip; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/vit/default.nix b/third_party/nixpkgs/pkgs/applications/misc/vit/default.nix index 890a69f3b1..529c809806 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/vit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/vit/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { urwid ]; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; makeWrapperArgs = [ "--suffix" "PATH" ":" "${taskwarrior}/bin" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix index 64c9c13d8c..d22c9a9088 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ++ optional upowerSupport upower ++ optional wireplumberSupport wireplumber; - checkInputs = [ catch2_3 ]; + nativeCheckInputs = [ catch2_3 ]; doCheck = runTests; mesonFlags = (lib.mapAttrsToList diff --git a/third_party/nixpkgs/pkgs/applications/misc/whalebird/default.nix b/third_party/nixpkgs/pkgs/applications/misc/whalebird/default.nix index 1de667f132..472f7ad42a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/whalebird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/whalebird/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "whalebird"; - version = "4.6.5"; + version = "4.7.4"; src = let downloads = "https://github.com/h3poteto/whalebird-desktop/releases/download/${version}"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { if stdenv.system == "x86_64-linux" then fetchurl { url = downloads + "/Whalebird-${version}-linux-x64.tar.bz2"; - sha256 = "sha256-WeZnWEwRbZEnYkLwWf6EC3ZbwI+Cr59czdKxxG/Lhn0="; + sha256 = "sha256-jRtlnKlrh6If9wy3FqVBtctQO3rZJRwceUWAPmieT4A="; } else if stdenv.system == "aarch64-linux" then fetchurl { url = downloads + "/Whalebird-${version}-linux-arm64.tar.bz2"; - sha256 = "sha256-5iKVP7zOci5X+EhnfJx5cZ5RiqZKz1pFLDUwZncynUc="; + sha256 = "sha256-gWCBH2zfhJdJ3XUAxvZ0+gBHye5uYCUgX1BDEoaruxY="; } else throw "Whalebird is not supported for ${stdenv.system}"; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { # Necessary steps to find the tray icon asar extract opt/Whalebird/resources/app.asar "$TMP/work" substituteInPlace $TMP/work/dist/electron/main.js \ - --replace "Ao,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" + --replace "qt,\"tray_icon.png\"" "\"$out/opt/Whalebird/resources/build/icons/tray_icon.png\"" asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" opt/Whalebird/resources/app.asar runHook postBuild diff --git a/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix b/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix index 1f5ee3ccfe..1f9c048e71 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "writefreely"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "writeas"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qYceijC/u8G9vr7uhApWWyWD9P65pLJCTjePEvh+oXA="; + sha256 = "sha256-GnuqYgiwXdKM+os5RzuUYe9ADOhZaxou5dD7GCEE1Ns="; }; - vendorSha256 = "sha256-CBPvtc3K9hr1oEmC+yUe3kPSWx20k6eMRqoxsf3NfCE="; + vendorSha256 = "sha256-IBer+8FP+IWWJPnaugr8zzQA9mSVFzP0Nofgl/PhtzQ="; nativeBuildInputs = [ go-bindata ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xcruiser/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xcruiser/default.nix index d57eb48781..7e3a391eb5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xcruiser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xcruiser/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It constructs a virtually 3-D formed universe from a directory tree and allows you to "cruise" within a visualized filesystem. ''; - homepage = "http://xcruiser.sourceforge.net/"; + homepage = "https://xcruiser.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = with platforms; linux; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix index c9af439b44..538bf3507a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.18.0-mo1"; + version = "6.18.1-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-Ma5wXaQBAVWJsL2wVOHxQ2aSAG9wOywk/abtUi03JvY="; + sha256 = "sha256-ZHSDJLZ+5WTqJwSWT05VuN7VAK/aD0dimVFiZ39IWvg="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix index 678b8968aa..0b1aa7eb91 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xplr/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "sayanarijit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b3TdhziXPytHitilMBkr6OGaI+CBI3w4qcTIkQtOAjs="; + sha256 = "sha256-iPcxDNtwWnvFljZw052aw/ekCahyFBNt/zbUAdaWJA8="; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "sha256-pdXLuogkz5q4+B/y/alA900OHVGBT8W6BR7I2aH8IaA="; + cargoSha256 = "sha256-Sn7ZcNdmMDQJHn99iTJX9c3uVhaGpRvEgdoJFmIUgeU="; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xsuspender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xsuspender/default.nix index d6790759ba..b47bbef018 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xsuspender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xsuspender/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config , glib, libwnck, procps }: -with lib; - stdenv.mkDerivation rec { pname = "xsuspender"; version = "1.3"; @@ -21,10 +19,10 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/xsuspender \ - --prefix PATH : "${makeBinPath [ procps ]}" + --prefix PATH : "${lib.makeBinPath [ procps ]}" ''; - meta = { + meta = with lib; { description = "Auto-suspend inactive X11 applications"; homepage = "https://kernc.github.io/xsuspender/"; license = licenses.wtfpl; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ydict/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ydict/default.nix index 9440c23681..078d6abccf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ydict/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ydict/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +, makeWrapper +, mpg123 +}: buildGoModule rec { pname = "ydict"; @@ -13,16 +18,26 @@ buildGoModule rec { vendorSha256 = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs="; - ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X=main.Version=${version}" + ]; + + nativeBuildInputs = [ makeWrapper ]; + + preFixup = '' + wrapProgram $out/bin/${pname} \ + --prefix PATH ":" "${lib.makeBinPath [ mpg123 ]}"; + ''; # has no tests doCheck = false; meta = with lib; { - description = "A command-line Chinese dictionary"; + description = "Yet another command-line Youdao Chinese dictionary"; homepage = "https://github.com/TimothyYe/ydict"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ zendo ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix new file mode 100644 index 0000000000..f217c7b0e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix @@ -0,0 +1,48 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "yewtube"; + version = "2.9.0"; + + src = fetchFromGitHub { + owner = "iamtalhaasghar"; + repo = "yewtube"; + rev = "v${version}"; + hash = "sha256-8GL2ZvRHtnnLZ07nQk3irJUj+XLL+pyUUA+JJPICPRA="; + }; + + postPatch = '' + # Don't try to detect the version at runtime with pip + substituteInPlace mps_youtube/__init__.py \ + --replace "from pip._vendor import pkg_resources" "" \ + --replace "__version__ =" "__version__ = '${version}' #" + # https://github.com/iamtalhaasghar/yewtube/pull/105 + sed -ie '/pyreadline/d' requirements.txt + ''; + + propagatedBuildInputs = with python3Packages; [ + pyperclip + requests + youtube-search-python + yt-dlp + ]; + + checkInputs = with python3Packages; [ + pytestCheckHook + dbus-python + pygobject3 + ]; + + preCheck = '' + export XDG_CONFIG_HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "mps_youtube" ]; + + meta = with lib; { + description = "Terminal based YouTube player and downloader, forked from mps-youtube"; + homepage = "https://github.com/iamtalhaasghar/yewtube"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz koral ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix index 6b58dd1caf..bac11b6899 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix @@ -6,6 +6,7 @@ , pcre2 , gnome , makeWrapper +, removeReferencesTo }: let vendorHashes = { @@ -64,16 +65,25 @@ flutter.mkFlutterApp rec { substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \ --replace "@EXEC_PATH/authenticator" "$out/bin/yubioath-flutter" \ --replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png" + + # Remove unnecessary references to Flutter. + remove-references-to -t ${flutter.unwrapped} $out/app/data/flutter_assets/shaders/ink_sparkle.frag ''; nativeBuildInputs = [ makeWrapper + removeReferencesTo ]; buildInputs = [ pcre2 ]; + disallowedReferences = [ + flutter + flutter.unwrapped + ]; + meta = with lib; { description = "Yubico Authenticator for Desktop"; homepage = "https://github.com/Yubico/yubioath-flutter"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix index 29140b04dd..84015ba4a3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/core/default.nix @@ -6,8 +6,6 @@ , gtk-mac-integration }: -with lib; - stdenv.mkDerivation rec { pname = "zathura"; version = "0.5.2"; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { "-Dsynctex=enabled" # Make sure tests are enabled for doCheck "-Dtests=enabled" - ] ++ optional (!stdenv.isLinux) "-Dseccomp=disabled"; + ] ++ lib.optional (!stdenv.isLinux) "-Dseccomp=disabled"; nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils python3.pkgs.sphinx @@ -38,12 +36,12 @@ stdenv.mkDerivation rec { buildInputs = [ gtk girara libintl sqlite glib file librsvg texlive.bin.core - ] ++ optional stdenv.isLinux libseccomp - ++ optional stdenv.isDarwin gtk-mac-integration; + ] ++ lib.optional stdenv.isLinux libseccomp + ++ lib.optional stdenv.isDarwin gtk-mac-integration; doCheck = !stdenv.isDarwin; - meta = { + meta = with lib; { homepage = "https://git.pwmt.org/pwmt/zathura"; description = "A core component for zathura PDF viewer"; license = licenses.zlib; diff --git a/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix index 0840aad4f2..0cf50c96ad 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "zine"; - version = "0.9.0"; + version = "0.10.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-Z47BkBTKdzfjBJKjelJFu0tOU5bdjhLviDQ2fJQAlXE="; + sha256 = "sha256-hkBQ9WaWJrDhGAt35yueINutc7sAMbgbr8Iw5h0Ey4I="; }; - cargoSha256 = "sha256-sEIuilAjPZupSJojAu5DLtgToLCgMJKlJXWIAGcLeCQ="; + cargoSha256 = "sha256-rY7WHgd5wyx7TUgJamzre8HjeI0BRtaM14V3doCkfVY="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/networking/alpnpass/default.nix b/third_party/nixpkgs/pkgs/applications/networking/alpnpass/default.nix index 5cc0ac1cf0..1d24c80287 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/alpnpass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/alpnpass/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-hNZqGTV17rFSKLhZzNqH2E4SSb6Jhk7YQ4TN0HnE+9g="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; meta = with lib; { description = "Inspect the plaintext payload inside of proxied TLS connections"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix index c50e672d07..f776c2c038 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix @@ -38,7 +38,7 @@ , xorg , zlib }: -with lib; + let deps = [ alsa-lib @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { version = "6.0.3"; src = fetchurl { - url = "https://bin.appgate-sdp.com/${versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; + url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; sha256 = "sha256-UDyVPoQM78CKVWXgr08An77QTiFVmRNHwQPGaj1jAIM="; }; @@ -134,16 +134,16 @@ stdenv.mkDerivation rec { --replace "/etc/appgate.conf" "$out/etc/appgate.conf" wrapProgram $out/opt/appgate/service/createdump \ - --set LD_LIBRARY_PATH "${makeLibraryPath [ stdenv.cc.cc ]}" + --set LD_LIBRARY_PATH "${lib.makeLibraryPath [ stdenv.cc.cc ]}" wrapProgram $out/opt/appgate/appgate-driver \ - --prefix PATH : ${makeBinPath [ iproute2 networkmanager dnsmasq ]} \ + --prefix PATH : ${lib.makeBinPath [ iproute2 networkmanager dnsmasq ]} \ --set LD_LIBRARY_PATH $out/opt/appgate/service # make xdg-open overrideable at runtime makeWrapper $out/opt/appgate/Appgate $out/bin/appgate \ - --suffix PATH : ${makeBinPath [ xdg-utils ]} \ - --set LD_LIBRARY_PATH $out/opt/appgate:${makeLibraryPath deps} + --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ + --set LD_LIBRARY_PATH $out/opt/appgate:${lib.makeLibraryPath deps} wrapProgram $out/opt/appgate/linux/set_dns --set PYTHONPATH $PYTHONPATH ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix new file mode 100644 index 0000000000..b1b3a57819 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix @@ -0,0 +1,45 @@ +{ IOKit +, buildGoModule +, fetchFromGitHub +, fetchpatch +, lib +, stdenv +}: + +buildGoModule rec { + pname = "avalanchego"; + version = "1.9.7"; + + src = fetchFromGitHub { + owner = "ava-labs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7WiIw2k0ZNm6jFHIiJlKuWFdEhb11qGVot1B50Za/GY="; + }; + + vendorHash = "sha256-2ezrasgGkMqr+dUF+TfsM5cevLGAFMyq9FlMxzKola8="; + # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 + proxyVendor = true; + + buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + + subPackages = [ "main" ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/ava-labs/avalanchego/version.GitCommit=${version}" + ]; + + postInstall = '' + mv $out/bin/{main,${pname}} + ''; + + meta = with lib; { + description = "Go implementation of an Avalanche node"; + homepage = "https://github.com/ava-labs/avalanchego"; + changelog = "https://github.com/ava-labs/avalanchego/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ urandom ]; + }; +} 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 dc171a99bc..7a05c9f9b1 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.46.144"; + version = "1.47.186"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-RivuyMPrqBXeTENrH4wApqHglPAZHVXMd863Wlh+EHY="; + sha256 = "sha256-47LkjcC+fEE+cn2m434+9fQ+N2yZSc1eF0gDO7jGfPI="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix index ca52cf94d8..2f39e82f3b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix @@ -3,8 +3,6 @@ , enableWideVine, ungoogled }: -with lib; - mkChromiumDerivation (base: rec { name = "chromium-browser"; packageName = "chromium"; @@ -76,7 +74,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google" - + optionalString ungoogled ", with dependencies on Google web services removed"; + + lib.optionalString ungoogled ", with dependencies on Google web services removed"; longDescription = '' Chromium is an open source web browser from Google that aims to build a safer, faster, and more stable way for all Internet users to experience @@ -86,11 +84,11 @@ mkChromiumDerivation (base: rec { homepage = if ungoogled then "https://github.com/Eloston/ungoogled-chromium" else "https://www.chromium.org/"; - maintainers = with maintainers; if ungoogled + maintainers = with lib.maintainers; if ungoogled then [ squalus primeos michaeladler ] else [ primeos thefloweringash ]; - license = if enableWideVine then licenses.unfree else licenses.bsd3; - platforms = platforms.linux; + license = if enableWideVine then lib.licenses.unfree else lib.licenses.bsd3; + platforms = lib.platforms.linux; mainProgram = "chromium"; hydraPlatforms = if (channel == "stable" || channel == "ungoogled-chromium") then ["aarch64-linux" "x86_64-linux"] 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 50cbc80e0c..aea178a3af 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -45,14 +45,12 @@ , ungoogled ? false, ungoogled-chromium # Optional dependencies: , libgcrypt ? null # cupsSupport -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd }: buildFun: -with lib; - let python3WithPackages = python3.withPackages(ps: with ps; [ ply jinja2 setuptools @@ -75,16 +73,16 @@ let let # Serialize Nix types into GN types according to this document: # https://source.chromium.org/gn/gn/+/master:docs/language.md - mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; + mkGnString = value: "\"${lib.escape ["\"" "$" "\\"] value}\""; sanitize = value: if value == true then "true" else if value == false then "false" - else if isList value then "[${concatMapStringsSep ", " sanitize value}]" - else if isInt value then toString value - else if isString value then mkGnString value + else if lib.isList value then "[${lib.concatMapStringsSep ", " sanitize value}]" + else if lib.isInt value then toString value + else if lib.isString value then mkGnString value else throw "Unsupported type for GN value `${value}'."; toFlag = key: value: "${key}=${sanitize value}"; - in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); + in attrs: lib.concatStringsSep " " (lib.attrValues (lib.mapAttrs toFlag attrs)); # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py gnSystemLibraries = [ @@ -151,9 +149,9 @@ let libdrm wayland mesa.drivers libxkbcommon curl libepoxy - ] ++ optional systemdSupport systemd - ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional pulseSupport libpulseaudio; + ] ++ lib.optional systemdSupport systemd + ++ lib.optionals cupsSupport [ libgcrypt cups ] + ++ lib.optional pulseSupport libpulseaudio; patches = [ # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): @@ -237,10 +235,10 @@ let # Allow building against system libraries in official builds sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py - '' + optionalString stdenv.isAarch64 '' + '' + lib.optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' - '' + optionalString ungoogled '' + '' + lib.optionalString ungoogled '' ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors" ${ungoogler}/utils/patches.py . ${ungoogler}/patches ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz . @@ -260,8 +258,6 @@ let host_toolchain = "//build/toolchain/linux/unbundle:default"; # Don't build against a sysroot image downloaded from Cloud Storage: use_sysroot = false; - # The default value is hardcoded instead of using pkg-config: - system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner"; # Because we use a different toolchain / compiler version: treat_warnings_as_errors = false; # We aren't compiling with Chrome's Clang (would enable Chrome-specific @@ -295,20 +291,23 @@ let chrome_pgo_phase = 0; clang_base_path = "${llvmPackages.clang}"; use_qt = false; + } // lib.optionalAttrs (!chromiumVersionAtLeast "110") { # The default has changed to false. We'll build with libwayland from # Nixpkgs for now but might want to eventually use the bundled libwayland # as well to avoid incompatibilities (if this continues to be a problem # from time to time): use_system_libwayland = true; - } // optionalAttrs proprietaryCodecs { + # The default value is hardcoded instead of using pkg-config: + system_wayland_scanner_path = "${wayland.bin}/bin/wayland-scanner"; + } // lib.optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; enable_hangout_services_extension = true; ffmpeg_branding = "Chrome"; - } // optionalAttrs pulseSupport { + } // lib.optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; - } // optionalAttrs ungoogled (importTOML ./ungoogled-flags.toml) + } // lib.optionalAttrs ungoogled (lib.importTOML ./ungoogled-flags.toml) // (extraAttrs.gnFlags or {})); configurePhase = '' @@ -317,7 +316,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" ${python3}/bin/python3 build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} - ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt + ${gnChromium}/bin/gn gen --args=${lib.escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1 @@ -342,7 +341,7 @@ let ''; targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; - in concatStringsSep "\n" commands; + in lib.concatStringsSep "\n" commands; postFixup = '' # Make sure that libGLESv2 is found by dlopen (if using EGL). 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 89357423ab..e12667c94f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "109.0.5414.74", - "sha256": "0pcfaj3n3rjk4va9g0ajlsv1719kdhqcnjdd4piinqxb4qy27vgd", - "sha256bin64": "1qfp9li90p2d6asy60v12h7r4025l01yf3dzcdyihvr0la3bhdrx", + "version": "109.0.5414.119", + "sha256": "0bdyb14v12izxkldq27jx532p0bid3wdwfpd1mwm7jqswxgfzkfb", + "sha256bin64": "0iap6i4zmflp4fsj16knwdp03gixsdkbys0scbvvzs3fzy2r5zkx", "deps": { "gn": { "version": "2022-11-10", @@ -12,16 +12,16 @@ } }, "chromedriver": { - "version": "109.0.5414.25", - "sha256_linux": "1gybh9nyc2j96ics1898qkrn1aajb2gpjb8l6b2p0hs24iqhjilg", - "sha256_darwin": "1w3sz9sxjkir2wwkzjx870qq04xzf9z7b59m953w33mkfm6zvz71", - "sha256_darwin_aarch64": "1qfg22glac44y5pdzscm2yr6wjnhm7p7pkiadblky27fp13dpyv0" + "version": "109.0.5414.74", + "sha256_linux": "1mhnw4maixwfhrz3r3mhpr9bl9hn7cvr2ji6y6ai32hxa1ix9m6f", + "sha256_darwin": "0w46xd05m7irfxqsfnjwgd2v65c9vgnh8awaknqgh02wmdgx3nm0", + "sha256_darwin_aarch64": "0amb2kd4cq4clir9gqr1b1mdy46m8nwzka227xxjd2i14vwzckb0" } }, "beta": { - "version": "110.0.5481.30", - "sha256": "03r2mpnrw9p188lajf69lpd94rcgj5a9hs2nlf01f0czl6nij0bx", - "sha256bin64": "0bpv4qgbbi8651x5mp8qyqxlxqm5x9csml1yi3789f7d40hs4vj9", + "version": "110.0.5481.52", + "sha256": "09khb67xl1b2caw0j9lmv6a9iyms9sprn2r7wsgqzjn9dzd9wwcq", + "sha256bin64": "0dv9fxwqn50hl06y7zfqby8hd9lwqwk2q3856fygbn82qppkbl4r", "deps": { "gn": { "version": "2022-12-12", @@ -32,9 +32,9 @@ } }, "dev": { - "version": "111.0.5532.2", - "sha256": "0aaxfi4f88s1cfzyhngmsmb84awy85xjy6a8pk3bfamssgxj0981", - "sha256bin64": "1jjmqi27qwbnmcfq043gxws31v47yfkzs7jk7mxzzxbaqj7v3wf6", + "version": "111.0.5562.0", + "sha256": "0aviz1cjm00lya530n0wyqn85d3idzn3bbp8065ygvfawqcf163j", + "sha256bin64": "0azkcvbl645c9ph4vn4502qbgfcb7zbs4ycy3q73nj5al642absm", "deps": { "gn": { "version": "2022-12-12", @@ -45,8 +45,8 @@ } }, "ungoogled-chromium": { - "version": "109.0.5414.87", - "sha256": "1nhqbl4070n3f3j9867j78k8vig69i8m0k0s17z5axqv2qkn76k8", + "version": "109.0.5414.120", + "sha256": "1yvfd0a7zfz4x00f83irrs6hy15wn85mrbbm7mk5wy4gjwg5zyrj", "sha256bin64": null, "deps": { "gn": { @@ -56,8 +56,8 @@ "sha256": "02621c9nqpr4pwcapy31x36l5kbyd0vdgd0wdaxj5p8hrxk67d6b" }, "ungoogled-patches": { - "rev": "109.0.5414.87-1", - "sha256": "0lq0zk21qfm8wvi0fl0gnjm0wnk29dsi8b9qphldwysgla8y8m3j" + "rev": "109.0.5414.120-1", + "sha256": "0hq48lsjl7da8rdq129mc7cd0z5ykqbaf1sbhhs1d10dzm5zs4p3" } } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix index 138af6cc51..7bf6fdfe0b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-9OEi4UF/4/IRtccJou3QuevQzWjA6PuU5IVlT7qqGZ0="; + sha256 = "sha256-4+V1j78sjs3/6SnVLO34jCcNuegpZan8Ykd8Gy0vc3k="; }; buildInputs = [ @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { "--enable-nntp" "--enable-256-colors" "--enable-true-color" + "--with-brotli" "--with-lzma" "--with-libev" "--with-terminfo" diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 79afc0ac17..72767f7430 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "109.0b9"; + version = "110.0b8"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ach/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ach/firefox-110.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "b948a55f78d7b3a84abc982f2b98ed587111a9e00c4ed170058d1a85bb439374"; + sha256 = "ed485ff5d4df09a247e5325f7119f18a60dd089561bfbba4fd0defcbc74e49d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/af/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/af/firefox-110.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "4d228b9199b9d4a1741196925c17d83a7d32e14556878a7d73cd108197a7c762"; + sha256 = "a8998faee88db140727fb4d38e00ae105afbdd5dfbf995ee840eecb77f5b4fc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/an/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/an/firefox-110.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "7f0986afc8a5bfe255014e47ed9e2bb7b92ce07941eae599b28a0acc6d3fe54e"; + sha256 = "04161f5668253852b91d873fec38b0a55576e0055af214e6fe452b6e58fea228"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ar/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ar/firefox-110.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8e016f41a7e3ed8b56c93593fce6f947903d292eafd72d5ca6518fbd2afb8bcc"; + sha256 = "a86e49d7960cb2662cae59e681338140be1296ae14691b3cdaf349166ed2189f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ast/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ast/firefox-110.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0ec22faedfdaa353bb17ea80b3d467fb126b0e85f2c1a0b99907b89d6b56da07"; + sha256 = "942b97bd1fafe71995f3d17bcc5d651e67fdfe292b65e617bb204d119e0744d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/az/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/az/firefox-110.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "03661f5d49915da64adf9b0b5fdd1612c3b718b91610586159936c5c365cc906"; + sha256 = "4e1054551c830ac7d14f2f6286a3eec6f054c4a7a7fd26a3860c010bf5459d98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/be/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/be/firefox-110.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "90ec691576893aecef562eeae9b0c1bdbefdfa6cad6aed8bae8a69aceed96079"; + sha256 = "0308d8776afc25f9ce0791d406289ef8e1909f88ae0cb7c91f9e6116ae1afb6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/bg/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/bg/firefox-110.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "a009214ab8dba8ebb423b6cd6a06551f21fd6786ab1ea1f8d3c2ff985ec6e4e1"; + sha256 = "3236f9eb8c7ebd860c4629b46dacbcc9f72cd4d2af3dd7930fbe79eaa6f76e65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/bn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/bn/firefox-110.0b8.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "0e6fa43647b071edf3deb6ecf3866919e81fa2fbfa96e4192393e7161730c853"; + sha256 = "6dd832f1ba0119e3b2e84b34ca0a7af0aea2f3615aa4c5f10fa6d52e27ca25e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/br/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/br/firefox-110.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f039c42dec5c42a823d87c9e75080625574c6b39d2f77c639f7c9acb0b8fe00a"; + sha256 = "39dc415cb13964a73598df7e8852c04eb68093704bc368842918c7651d469571"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/bs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/bs/firefox-110.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "0e05f64d31c83b932d64a9deda1f96316140f554a5394d0af3e128f3ba1ec4f6"; + sha256 = "f550885ad47858803262cc56a01ff94ca98dbe70ef647d45ef07704d320aeb10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ca-valencia/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ca-valencia/firefox-110.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "684bbc73582247a088d318148f5af484b005ef8b976cc0b9964cd661e9d1a797"; + sha256 = "35bedf1be1a9666deee43f1fba4b5d929997b68626d0cd5d34f1f874bdfc145b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ca/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ca/firefox-110.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "c457bab76716e4bb2ae68ba65bdee46a4bf158e63c8ea48706426cff947bd689"; + sha256 = "50e3be2fc9c0ee6d81fc21e93f500007e660eb465a4efdfc1182ab3f361db9f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/cak/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/cak/firefox-110.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "35f0afc76c474c1441d53f6c0efde1cfa81082a14d4376bb793a54ca7f336e15"; + sha256 = "f76a35618b17552eb7ba1f4c221ac2c1b279f39a23b90a3c801a214bdb6a90ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/cs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/cs/firefox-110.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "07b58e331695a32ad0aec8a2ebcde5d188687735024ea324e2ca93c6211bc465"; + sha256 = "dac3d9822d05821535aa87c013e64bd11fe7bfb241817bb4943fb9476794327b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/cy/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/cy/firefox-110.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "54160bb1974a1a96e7ea857dc3becc2b09983ae49776e22458b4f7bfc6e29dd7"; + sha256 = "2a93da71a12b78c55c125c8a71a3b5e5c9785ddbef1eb57bda0ff6c7c2f4fa90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/da/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/da/firefox-110.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "65ad803f63edd0ee806f06f18f4d2c18c1c906057a212c56f8884844e5347f2b"; + sha256 = "9b63c1ff561acf270ceba10907371f63fd3ec5104fa9fd723c41cc88d207d860"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/de/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/de/firefox-110.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "82e167ce22d058d86cde56ad0b3d9fc309f85a535846451d9816e009b78c40b5"; + sha256 = "b85d11c9fe7af3b3913f772aeeca37bbae95bc4bcaa9d9e2e711025b861a0713"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/dsb/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/dsb/firefox-110.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8c69525da6122eda1ff2444bd7338fd14d8294a656fee2619832a66342a9c971"; + sha256 = "9a54cd55fe019b5f902aa9f6e21dc03629c35cc7acf8112b98b77881df88c894"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/el/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/el/firefox-110.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "09a0576ccdb7e9388a8d1b107e93df85cb070fcefce70edc7ff0e42f0ad705bf"; + sha256 = "a659eca2a2bb201ff27e989ba748abffc1bd44ddf6c69312c8829a91887d9e3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/en-CA/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/en-CA/firefox-110.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "9ed6cb1595ac81b78f0aa80eb0a71043ae564071a81b23f0f685c9c27a7b4d47"; + sha256 = "45e5b039f0e2b425d1051af5bde8a447b1f738b3dcf0c2321043af28d370ff1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/en-GB/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/en-GB/firefox-110.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "18e07a151303426b4439ff475e0fe9893d281318ceda35203be77d14c841fa5b"; + sha256 = "f53fed0d18ece63d2e94840ae1023d261b07a3556a4fbb8d4e2c8c4fad016b86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/en-US/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/en-US/firefox-110.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "42666b7ce609193259d3e8dec2552afdab0d5986159760480801152967751c3e"; + sha256 = "230b771a572ca8bcd9e85dda0a967bdfa504664222e9ade51839b5c22735e7c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/eo/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/eo/firefox-110.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "ba38a011874ad940dbc8d1ffb6f691eb3fb4f14e15d0c707929af82b55c676cf"; + sha256 = "1d171c124c45b2c22f4d64a51366f1840f2b72117d0ef65fa33a4b44623a88cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-AR/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/es-AR/firefox-110.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "593cae822d499c7afde80ffb3503489f5292b4c69f6e14da82e264d920b06ebc"; + sha256 = "eb7d67d7cf5460d8830e9c3ec6ddc4724857d94f15e809cbf02a26d7d9fcd6d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-CL/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/es-CL/firefox-110.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "eed80c73022ac75364b95556f72177462c381fcdcc66f4e9d2a9cc202e6d22a8"; + sha256 = "55a45cb18fb2f2aa61de068629a1770dd37096ddb9424fa83031354c1e3a6f46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-ES/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/es-ES/firefox-110.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "20c4e5cd93c63117d472d982df1282212fe8ff894ad90bd7ba32c2fcf43afc9c"; + sha256 = "3dfa2760508777cb93b44650bb6f1a70de2d10c3ec43e7350e901794fcae4f4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/es-MX/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/es-MX/firefox-110.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "437680ccf9a74365dbef29f1414920f0bea138e7628d1eac1fc3a774d667173a"; + sha256 = "39875c88fce55c54aa8f323b9530472dcafbc6c1f93fb8061f61c90b866d74b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/et/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/et/firefox-110.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "6952c27c55ef99c82c99b684ba56919f053d6a4fdfca929c0251259f92ce3b01"; + sha256 = "e041c7c050ab3aa3360e8f7a47552ac7e9e8f74367169227d2b1985cb1f4f611"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/eu/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/eu/firefox-110.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "9bdb71d4663e2ddfdf1d48965fd6657f905bb939f14910c7675a36743ac6c52e"; + sha256 = "60327e88db690ff8851da6979929b88a272f2bffa22b131ab47c69e7b508020a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fa/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/fa/firefox-110.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "7d6fe01c0be2fb3d2f4370a7388db7e9081483697e5a1e3a4daedf58c4e86881"; + sha256 = "91657f9b44d1ca43bcf9b11fbe3426ad352e98945936439d3db33486d664ee29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ff/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ff/firefox-110.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "3ecba2eb326f8ab4b60bd1d338c70a10d96f193dfa8a580ce1981f4e478ed66e"; + sha256 = "ea713dd820cfae67ee4af92c2e5b1561e638631043790e7e11ec8ec95f7dee8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fi/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/fi/firefox-110.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "2faf7574da2d14635dcec25ac9ed9af011d587a41cfdca710162233453019918"; + sha256 = "cac98b1458dad786bc5260771ecf9c434c3458fbfc0325b528bb268736b02276"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/fr/firefox-110.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "934a037d582e5a54a7abced26eb13378b44bf7d17c40634c1bbb7ea96d077703"; + sha256 = "8433f80253931ddf0c76ae09536da4d4f2d6fda042228f6c2421e3dba684ec8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/fy-NL/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/fy-NL/firefox-110.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "068a82e5be65d8260450b28f09444d6272d657c36cbf8b5fb60400be79c14233"; + sha256 = "e4291c6245d3f6f7d3eab0614e690eda1e6fa1880776cc7cafbc1e892ae67dea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ga-IE/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ga-IE/firefox-110.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "63577e9e3696105c7d2d3290510c2732d002930cbfe4ede75513e3cb4d9ec26a"; + sha256 = "db193e8f7bc6ca08d80d30c4062afd4d64063da93360a5be48b359c572733b83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gd/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/gd/firefox-110.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "663373cb3a0d15ffb883ac0018f3d50af393986ffde005028a5c599524f4f25e"; + sha256 = "5f11dc3c2d447d4307979e1fa684847770eb7737931998523b78e96cc8750c7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/gl/firefox-110.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "48e0c828735a0fa9802eed9e49629d8cb95407c3608db18b25d6adf60d3e8e7e"; + sha256 = "61d21f0c5f0c0b281f53f83833f419f3e2791dd0a642f7f91740f86d13b58c12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/gn/firefox-110.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "da30951c841bd55f3a6cf5ec0226b900b9b0db4b1217278ff87bf15f61dcbdcb"; + sha256 = "7f3eae32a8b0ebe89af9f456c90390c0ebcfab855be960c120ad65f2ac871f66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/gu-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/gu-IN/firefox-110.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "c5a3b0697142ea33df51451177992a10a4ab5d1b44ae53838b50f7be9e4d8d24"; + sha256 = "3c8b5dfb00e7395de9bd7a47122e51ac98f568d58a604079de736550bddd770d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/he/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/he/firefox-110.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "196a01669604ff24673cf986d3abe0f925553f46af63dc70d2dfed097cb11e8c"; + sha256 = "f1d1eced9c70c17f82db231531127a76b7b9ae2d7cf7c8db6d5a367f284e56c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hi-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hi-IN/firefox-110.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "dd386d0889f1a2cdc2604faf7cb41a93b377dfcca220c1e0c46dfc3a1f17c378"; + sha256 = "240c6757b39796b47360927418b25346bdda14c68581811e61870c0e775d2a14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hr/firefox-110.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "1b2b58f0492c890b988164dafca86311de1e94ef6e429ecc2e998353eb042da1"; + sha256 = "ef9d90acbcd8a8e6351864030078d648c4a5149646c262a03c8f6c1de19afc93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hsb/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hsb/firefox-110.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "66431f173a0b5864650a45266f75df36d21f36915e0986d2496181ce0586a9dd"; + sha256 = "9c8c7bc9437e58984a42ce622722cf52bc23c10f3394c698c939f7bf1c6cee4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hu/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hu/firefox-110.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "38d281c815cff7d248c132613c24bb99e7bd20ac19f53aff525fdd39da08e5ba"; + sha256 = "f4a42365f10144bdfa293e064c6f2a8a93344649b0b7d1ca29b6aa1cd928d282"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/hy-AM/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/hy-AM/firefox-110.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "57310d44addb0911ef0d8e7d4c038f9758d51909fb4a9e4e82883a8a70c76075"; + sha256 = "767e6e39c11252a7ed5604c79385e8ffd6e72ed59ee7013188b75a868c280f12"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ia/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ia/firefox-110.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "17371ff0b7d5140dcda675f877eba8b7ba83eca4f189bd7d60700bdca5de37f1"; + sha256 = "4a948be5f55b0dbd64574e53fa058ac1e37c3ebd07b2c7b31bca9a4df9ec729f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/id/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/id/firefox-110.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "a41418278b8d8e6a222d0566448d0c330d025edb9926edb6539c5a21fb91140f"; + sha256 = "172d6b7f6471b30ecec9928be73e86e6cb4c700d7b0f036754675a955a07233b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/is/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/is/firefox-110.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "772075ad183f5a6914561f69f9ee8d09972af6f05017282255386791f31200e7"; + sha256 = "82dfe1ea54cf9dcc0a3c3bea2538f2c7bb2c9a8120361ca718160e2cc5faabdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/it/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/it/firefox-110.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "cbc0a9a027bfc8f0e6b184f9614d3d38fd18a13459d3f5b5b7f60105d6ee963c"; + sha256 = "5ee0de017187bae620553ee7d387e0a7fbdd828007f509b2799e5b4a42529e7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ja/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ja/firefox-110.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "8a3729c31bf4e24044a3b1186ecae173a964f2aa8a7631cd6e3abdded7d0b824"; + sha256 = "e1c4d3b19caea149985ad839c5a5eefae61fe489825363a7dc600158aa393ca6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ka/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ka/firefox-110.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "0e2e1c2854bf995321533457ae0fd2832f0b0546c6dc48cfa52c628d5d657928"; + sha256 = "066acc56597a25502041628781ab9cb1d9ae8b28cb34d20651c7a5b37f7cbbbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/kab/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/kab/firefox-110.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "b1ac75c09a4478caa7511c35df3f91f45d3c8047d5dabeade6f29edddbf6ea7d"; + sha256 = "f1f851d0d5e2a4b4dc4c6e1e8cef8bf0536a0d87c149fa0a7f5634494e253e02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/kk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/kk/firefox-110.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4ddd63e75296b907e1518d099da9334545e8d12e19c63e757f0c4a4b504b8e2b"; + sha256 = "e49afedbdf6e979aac6f76d25564d48fadc2a7042715edff107752da20d54951"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/km/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/km/firefox-110.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "84f17f62677718f562ab88948ad3778da1a43c41b8b55210a493cf66f3f0f90d"; + sha256 = "626802d920890971e7e70865dc8cf02848eac285bd11c7905c76f1b8d3d45c47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/kn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/kn/firefox-110.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "5aa037120a0f3060460e04d0eb2d20fbb280f55de268b6cdc0aaceafd6c3791c"; + sha256 = "f4a3c4730fe26412fbec6280059ee60dcb14dcc120c34bc866e63f2b59337ab9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ko/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ko/firefox-110.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "7f30d2f69dac635c5424e8b9077eebb1dadc0e56a45f9641160d4ab396669e7b"; + sha256 = "a86e103fa646e69806c3e602a3377daefb29e0b522293b919fdd480d6cdf12b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/lij/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/lij/firefox-110.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "8d0f18632e52509377261d8c2e818d7db39b0fcbabcbf7d192f6e7d4a276cd88"; + sha256 = "001967897e7d43ccb814aa3da320f06ab92d7dd152b0d174fc5d7f37c49f4bbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/lt/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/lt/firefox-110.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "652d793fae33d4ab5f4928bc3110eb8a3efa785212f37987df12c3a70f1c5632"; + sha256 = "78030269b2fe5f151a0236112e0ecd4b43b61d577171e9b0544b2ac60be5869d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/lv/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/lv/firefox-110.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "c26444347b52d226f125bd079fe3669bd931eda59e4734859140ad527f907bbf"; + sha256 = "b944ab8296cedb7cbb405b1db330e9011064dbf4353a2f3bb1741d21cff312ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/mk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/mk/firefox-110.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "086fb00bcab4ebbc59aa3b703c3e52f2456d0312d33980e1d19c041d8cd84b22"; + sha256 = "d28f87dd4e040dee024e384c686fda5ed1bb5bca8807581e094a9bfa7a763ddb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/mr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/mr/firefox-110.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "83d9fb93e771c8b70fd3a00c401ce2fbefe0b7ce353622615790d56a9eb723c5"; + sha256 = "0cba8c59d778577b8ca9d2d7bec95d57dafe90470867b7ad0675bec1fecb4b90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ms/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ms/firefox-110.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "ee1db3faa7d2b7d082b025f93961d7081bb13da59d024d8e6019ccae25b702ce"; + sha256 = "989c7785d91d2fce8a37f0e79ec1e047397b2bf3addf8859fb742426c5279038"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/my/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/my/firefox-110.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "dfa95a578db544259328fd04596a3259d807f949bc91aa8b795556b17dafc204"; + sha256 = "730c8d4ff818e03dbfd88f2e9a8ee131dc5144ee6b753fcfde2825c8cfb309c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/nb-NO/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/nb-NO/firefox-110.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d7938fcc2cb97e530aeb061e4426aa73a3b1e180053d208644354df351058733"; + sha256 = "32219c5b17363f0e7cb5a6b762bef28cc8af7aff7f0f7a3558510884505077d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ne-NP/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ne-NP/firefox-110.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "b24984604d50e957451dac478147b5ea1805510c2333d42d8e3434c5fce06215"; + sha256 = "e8cc257a762c8b62fd00a640104d115416f1be3841b304acc6c4dd25a3145aa0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/nl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/nl/firefox-110.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "7f391dc89c6bbeecdcca4f7fe214f3711f97ab2796ac21e82c785e33eeb5f6e1"; + sha256 = "b4535c4b7683ad89368c2a156d580d94ce678e858e34f56b2d2eddd4326cddc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/nn-NO/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/nn-NO/firefox-110.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4a041204cb01998b671a5cac77c468a72149d02d018ec1f5ace7ad9e0132c655"; + sha256 = "0ebad9a365e2f7da6119dd821e8cb4c26abd939c942e4bfb451ca9ce93cab68f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/oc/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/oc/firefox-110.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "2b1152fdb3af68d9faa76d9c6d3d8fede128bf1688fd69a50b98b7bc0300ac67"; + sha256 = "c66df579bf6b9f23a87937d544f10f5b5a165e18205b8ceceae100a01074c1e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pa-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/pa-IN/firefox-110.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "d185ddb3497ae946fe87b808f843db7acf8645833ef3b54ea948197acb3f3885"; + sha256 = "1a60b5aed38933f2d5898f4ce502057c8f3f5207cb133709ec10ec4f4f7016db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/pl/firefox-110.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "163119ad361e157566be68baf959b62ecee6de303348a8466818826de9b25e64"; + sha256 = "bc52ce2b2189763296d891259dc131f7a3be3287eb4e615d13ba01083ccec7fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pt-BR/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/pt-BR/firefox-110.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "ff99006fbc8266a69c270cecb50c56dda5d891517ea9b137b0c76ed288d04f02"; + sha256 = "257045f51d0f3b78b86b8657add634acd67a9f7eb40ee21e41c475df28ffe19c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/pt-PT/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/pt-PT/firefox-110.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2674cfaf4febe771a9a00d292503dc18a296e29b42eacef4ce4e78107190bd1f"; + sha256 = "bdfd19bbbc264bb69ee68f0c07e10fe65a0333305d9e2c22fd0015343b9b8993"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/rm/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/rm/firefox-110.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "830700c530eef545dee9f7badcd49671c3a0d97581deabea5c909e46950056cf"; + sha256 = "0a80709da5676bc49758d0adb791c6e663dda5326600926be4059c03fa241e1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ro/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ro/firefox-110.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "864d7cbfde7574d2bd737c40695142f3e40219c0154962b18284cf3d5a2c2427"; + sha256 = "58c6b48d460c424662a82ebaa48a655af938b84f30e27e4bf8b6e4481e3eebd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ru/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ru/firefox-110.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "32f3ad6dcfb15e3fd4c6a98ba231e302f8fb71c6edd29b4d820ca93a161ed126"; + sha256 = "a85d28c3f4671380a39be21bd9c1c8eacc7677aacca05ce6951bc58dc38c1940"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sco/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sco/firefox-110.0b8.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "29ec16d715e6272e282df71f4a95738bd3cf0f2060c991665540d77eba73f65c"; + sha256 = "a4157c14e1f35b6603a3abf50ae2a03c368ae37cd9e36f5b72607481523b3305"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/si/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/si/firefox-110.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3adb3fbe6a22d63a9c78b30025c5d938b078327d20c1267dfa43fd5204e81c8c"; + sha256 = "da52abc50cd0aaf67f3daf9f78b87415015f2133eb2879713f97d360f0ba633d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sk/firefox-110.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "fd2c585fc89c3a7bdad4bb9a14071f6316371482e6c69c916b4c6ecb45b8af18"; + sha256 = "f82fcd00aa59756ee7e11d3a003c871dad71b651b3aee51d40dee250358db070"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sl/firefox-110.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "37f12d5dc272bd897670882400b74e23dbf5905a874ec3c0d0fad971cbdae5ae"; + sha256 = "e682fac35628626e6d99b32c7ac08fa768b27e27e9ed6ab0ca054d6a337015c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/son/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/son/firefox-110.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "6161d139b125a0c5af7b06c1b17f95dd9847b06eed4b256d94a1dee5ea62df74"; + sha256 = "901abf7cb8189875fc23556d0599ec56467ead6d01f7132be2cd7ad8ae0342bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sq/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sq/firefox-110.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "be76d77a806f97e566ffcf1bcea54dc502d1447d34811ea47b9decd7bc49a243"; + sha256 = "9a0401842eac013a5618b00fce32a048ae401dd7b02e5237207987799bc80ad2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sr/firefox-110.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "bf9cb5c2d17a00351ea9cb5918625bf4c97ae2497c4452c6c214988e6c1f701f"; + sha256 = "753ef3fdc0bb3c538c2fe65db2c3db27184e0430c8d3ef78248e68e1706cbc54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/sv-SE/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/sv-SE/firefox-110.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a551c2dd59af31bd26129a4260ad8c2e79c1af2d2983a5119a6524ab2a56d11e"; + sha256 = "2977dc95a24581051f4f0234ad4cb21bb5742af5933313442d5f3f4c2f869550"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/szl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/szl/firefox-110.0b8.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "5bf1dc480db4aef779d2ff6c5fb05170bace4154661928384039d3d34b058c3f"; + sha256 = "4c58983a77e3485edb8d2035391ea9d098196f1e19dc1ad070f7f77ddb5c0f97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ta/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ta/firefox-110.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "90679166c06545d56b086a33eea9882b36e86ff4208be6bbbe469e7aaf651e79"; + sha256 = "1204336c6feb2ef3c116a043151715f05d0498a1a85a0b008dcc3e4e378ff6ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/te/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/te/firefox-110.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "55005551552b1d516db54a0fb27e59f58c478204745355bf249938661ac356ef"; + sha256 = "214d936d334f0ad7d7a0a417b9c73cdfd38e6ba72dd8fd17e80eb45bb1216b06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/th/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/th/firefox-110.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "9f2f26564759d6a97a9315c367301fece20b809363deb64c32e97819ae38157b"; + sha256 = "aeee496b32287f98880594bb07ad217e6cd90184a3f8615c01f77c5321055fd9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/tl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/tl/firefox-110.0b8.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9054a8d512665615a66d9855cc69fdf168508b1bd226237d088eea8dcf004a06"; + sha256 = "242b207f636b7c25e6f6b3de964ee47eedae9380b764b05324ba633c93c93a81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/tr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/tr/firefox-110.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b90beedd15614b07c24702875e56d2648c6b703fa19bb0a1785282c6034af068"; + sha256 = "bf8122a581172b5cd97160899b253bdb9f6c67a37dbe9a7285117092adf68c94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/trs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/trs/firefox-110.0b8.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "40e41ad2dcf06f8143f5b7f27a0e20d7fe32a01e99dcf1d44e183bddb2f81131"; + sha256 = "7995c69237e99c42101c1ace2d9a591e099192a8b8a5c2779a1764541d279f1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/uk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/uk/firefox-110.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "923a92d67ba1beae95e8af40f734be94dc48aa052672e21e051295d2a04ead60"; + sha256 = "65db0c950d4626ccfbd9d9129cdf7a5baaabe9f37d78eaf58dd14c459d7be4a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/ur/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/ur/firefox-110.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "2316371eb6946ec9e108d391a45455cecd38d7795e26133c37b4172ea1977fde"; + sha256 = "107e8e0f224a67b3bd69dd6f956dd8887fb475e02326ede21c408cb0a44f07a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/uz/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/uz/firefox-110.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "5d32a7c3165d177b2986534c133dc376a6c588febd0abe69b111c09a4d990f75"; + sha256 = "fbca32000d6cdc39d447341e08d2ad587e1545e1f7dbc28dc2efa13b47a31210"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/vi/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/vi/firefox-110.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "fb02c22efce62374a11450a08dd344e0ab1a0ddd74060a79c39a6246668ca5e2"; + sha256 = "78364adb4b166b0ad5852b8f8eb3d7c3f0a38eb7a58866e4f12754c4e8ecc265"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/xh/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/xh/firefox-110.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "dd91b4dcfc2e067f299b066345960af90d57eb3bd7523b8680b155f285287ff6"; + sha256 = "4e9290326419205d52a588a9f44f2d53693e6b987c01842fcda7e708d77d7984"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/zh-CN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/zh-CN/firefox-110.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "52ef6c7d5c1ac6f63033d9d2d36ccab1c28029d1d0150dc6cb6eaaf90e8b984e"; + sha256 = "4f5bba83fb22c21922680469a484a9c2a2d2bcdd070e998dbe36785a880d756f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-x86_64/zh-TW/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-x86_64/zh-TW/firefox-110.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "29272c5953ffb2a6726c7da9c73b86ff64094628504270a45f3619f8cbe45f48"; + sha256 = "ba932bce9c5920395e154703522b0752ccd666ff111f7cb822cb27bc17941a3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ach/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ach/firefox-110.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "c283396e76a59a009a06b28f8e9f71b2dea929f7fbe3111cc59f75d1e986f6aa"; + sha256 = "ec500c8c4c8fec8635279c5423d322e621766f56772a4e5a63dc34bcbe3d61ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/af/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/af/firefox-110.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "64e8e61908f821b4157e33ff06e763b89c66e8482d4526c11711957133de7205"; + sha256 = "8810a1cefe5545a7dafe58174421ba9d631d22ae49462544637cfe167a97d2bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/an/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/an/firefox-110.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "bce6d2f4afe2aa8210f495b438786d73c647e2e54625d9cfdc4a93bfa1d4d922"; + sha256 = "d8bfc06a0fc67ce4c84b339a28177ff7066f72f5cb77b37922170e073ac74e99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ar/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ar/firefox-110.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8d1c08f96238565a2c78e626b5e3916897a2b7146eee6cbcb7fd7a54862e2e5c"; + sha256 = "ec6674a2241852a443d0d22d34eb094c0de075e7d255f9bb026251dfa6aee85e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ast/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ast/firefox-110.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "fb02bce602d5122aabf80daaee3a790b90cd1ce553a871ea6e44da4d2283e882"; + sha256 = "70b5050c81b7f0c1045e868c87925f1d0526cc3b133c15ef9edaade6ef7f50aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/az/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/az/firefox-110.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "e021af60171b998c37d531c082df022a2c0cf99acb841c2c7235ece8093137c1"; + sha256 = "1eba11cd825d691b0bfdc71e4e7f017d3b52992c5fc1a7db89a85cf6b8723680"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/be/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/be/firefox-110.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "ad2130cad5b7d216ca6b06be19f8ba906e1d44f30ccb9675656a972e93797618"; + sha256 = "9e604836e097c1b5412fa4acab74b650881590c3430c1b822d5b1f7f6edb4e9d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/bg/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/bg/firefox-110.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "cab9bea6be83af82ae2d293e03db5164081f438fa026067ee26b1748c89d2eb3"; + sha256 = "4e756271ec8af70d67ceddb75962de3d398bb183e28fbb8b18f77c92d453b6e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/bn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/bn/firefox-110.0b8.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "cbb0ba2805be954bb894a35bb6e119643992d8bbd7fb4933773c119de73225a9"; + sha256 = "089315934a955fd48f4a546eeec9a74ac483a742dc1456c4bb078f927a1a990b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/br/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/br/firefox-110.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f8c07354ffb8c865dafa1828e62ee7c0a1e89b1c9e8203e871660368ed68d0e9"; + sha256 = "0448de8755a6d48e012224db25acfe11c20b6f41e7b39935cba9501ff513037f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/bs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/bs/firefox-110.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "11a71957066c42418902ea53687303844f9451218768551b23fc3828e74170ba"; + sha256 = "2c749a81052756da521076a67fc0ae06f110e80278de0588b252354667fc85b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ca-valencia/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ca-valencia/firefox-110.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "61e8f1b65322fce46cde4d9208c88008578e017c94c1eb5f91630f95b4acd521"; + sha256 = "784fb8bf6a32caf67052c653924b9fa51fad94d3177f8f8f29c6c210324e6f84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ca/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ca/firefox-110.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d2a6295eb35514e2bd289f280fab59148b18f349a6ef0d7d4cbe69247b6c89d4"; + sha256 = "9133696b439986db2a1fe79359c341b9868dc44a2167e8a4f645942753f562b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/cak/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/cak/firefox-110.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "336c24aaa28ab1accf2f3ae9195a3ac753f2c3a2ceb3378d04822e866979b530"; + sha256 = "2b7a3a15e6c2326420b3e82ab0e126370b9a88ca32e96d99b47238857cf57c4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/cs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/cs/firefox-110.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "2d81cca9b20dc40358d4b6b482440bd803ad3e3282197ce8e8b46c046fb22fa9"; + sha256 = "51bf4a01e29710079536bf4000368f1087f707a1916c20ee2d5d14644fed6e2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/cy/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/cy/firefox-110.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "8359257b1a67702cd150922f2e27bfc409ddd54ef66f736449c9317c96bc9056"; + sha256 = "5b5073c00de486045e38232f680ffbd49ed21a378b0d7ed7814e00b908e59596"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/da/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/da/firefox-110.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "09b338b9d805571611dffe140f950ed5451d1abe9c0b43d2c5b8a3cf2f454adf"; + sha256 = "aa786c2c368d7d51888e85703b19cb5c12c70d55452922d3b68945366c0ad5be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/de/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/de/firefox-110.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1ef1a33e292e27f75604ab017fdcbd57fd91e6b63070b83dbb11048575bf7015"; + sha256 = "f5e3e08881fe08da2177b6906b76a0885cadae8b1d02591185f0f702ceb4d12d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/dsb/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/dsb/firefox-110.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "937742961306039bffd669c360e5bd3813530ba1eaec3d463b5d7507208caef7"; + sha256 = "182669ab7334a9b5e74dd8f922a69e010f3db2a2d0ebde4c318176d4c66cdaf1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/el/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/el/firefox-110.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "eadd17f96c9a20914740700436720c7383ea040cfd49dbee313c9f63cd543e9c"; + sha256 = "664bd97d14219f58ef767e7beb1b4795d85be49814ae56db8780829511dd4b60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/en-CA/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/en-CA/firefox-110.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "246c8c7e12287762e824227396c310295ca44af147102d434bcdadb34a674868"; + sha256 = "fc6b10b31e9d8228c0fa89c226efd8d0fee9e170251369bc096e86a98a2cfffe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/en-GB/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/en-GB/firefox-110.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "1bc4b65e27ac9ed36670cb30f906125e5ed6416f1e74cce4c27ad66174e268dc"; + sha256 = "e2b5a1fbdeef06d94f2abff9c1e9fa5e5772ba1e3cef31839d47240b1201faed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/en-US/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/en-US/firefox-110.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "f2f74d4ccaa6d1836cfe35f2066600811669afa661e75923f5efa463f6419b35"; + sha256 = "26b6bdf7f5b184f5878622c22861b37299cf2ef720056ea452a0ab1daaacb2a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/eo/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/eo/firefox-110.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "03aea5c221f43a03266bfb6dcfa47b1adab597781a7eeb76d97a38addbe01e7e"; + sha256 = "307ba5a4477a1234d0bc3f73c6e8e28692212c5d7f58203e4e336100f9d0498d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-AR/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/es-AR/firefox-110.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "f33ae2b6c29d3b2d0c3654511791acd8af5d5510b32b5d88cd43986a190f1dfa"; + sha256 = "a35b01a8569d34b627bb3a9a24e670f865fdc33d0606f1b0eab9e8c1b7f73601"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-CL/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/es-CL/firefox-110.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "cad86c57d5bf9b8e29da7b445f2ceb6bfbaaf4cd4d4f10fc17cf636251f96ab8"; + sha256 = "6910b74dec7071a2b33b2bd09f5ae61bdee7b77030287d243de90b7f4e326c22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-ES/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/es-ES/firefox-110.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "fa77b1256964d833ef2441f7d96849e0b71e3fe46018433798099878c04f0309"; + sha256 = "be75ed4c9c6572d92bdde9dab331854eadd07fd5321792c65665a207fd3c5904"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/es-MX/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/es-MX/firefox-110.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "f89936ecc46e466ce51523551fa36e56b9d5fb60869b36f0df50e558897ab35c"; + sha256 = "ff98f40124d28f441215fd19199f2b99b7ed2370842af1045add334c3cf5825c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/et/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/et/firefox-110.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "03c8b27bd364f62a76f1c77ea440a5c2e15b7a9fcb494fb2472fec3f9c3ddadc"; + sha256 = "65158799c952aeff6e72ff675f6fb69b8fd981b8315bb45d0712326ee973b543"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/eu/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/eu/firefox-110.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b830123c80c92dbcc6068fb119255558c33781d7a6455cb5632f1d881cc283b6"; + sha256 = "1d1cc6139aada38bc8c5bad570e7722165eee34081140e97cb3f726ee07b322d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fa/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/fa/firefox-110.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ab9b9cb6040d1f2cb8c383f54b86c16e4f3bf0c43fd81e69b926061eea752942"; + sha256 = "1771265328653411950394f9688078816b1cf518a8adcdf5c086d18008af39c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ff/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ff/firefox-110.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "5d35b634780ff8a467cee0a5c9d6a629a82e445822f60d1dac150d4f40af8164"; + sha256 = "b0602ea788eb7804f749ca088850f4832c58b52fc3527b42db121a90a8b5e757"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fi/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/fi/firefox-110.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "dfea0b395fcfa9b6bb20c00fc3522cfa0f52dc398b3344090a2f717fb5305b74"; + sha256 = "3ddc1726866b9c20eaf5e59e55ffdc0f1ffe335b072637feab1e37fa75c71245"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/fr/firefox-110.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "f75c35f0ed8cbd6c45c93774f5031b0555465473fa85a3b12501b3e91701cbd8"; + sha256 = "738c5902dcb0cdab1f8e3a12243a8276dd1a5df34c9b6014b2373bc3a5c307f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/fy-NL/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/fy-NL/firefox-110.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "4fae4df1046e30117ebcab39f930f2b5e4e4e702a8a786b39d840725885be2e1"; + sha256 = "701139fed71032ba9e0f039deebd51c0b212e656c19c377f081398d29a04262f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ga-IE/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ga-IE/firefox-110.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "2853ab5a94565fa23097331c3c2ca491b7aac8c52a921a07e3c62fb45ddcfedf"; + sha256 = "449b503b56a53ed10bb6d48721be494a983884e0544a80d95433cf621d31cdc4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gd/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/gd/firefox-110.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "d4249520b4ad65de6914342ef8fcb37b3d7f5e9a4d1de333a280156735d89fbf"; + sha256 = "8105073ef11ed62c347d2720d095b3a2faad65e11a50c6dd7c8b1d06c381eb7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/gl/firefox-110.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "193cc568dc201ac86e66c6badb73dff2f00479900fbf3e1f3df0a29c46f7ac5d"; + sha256 = "faf007e32a4dc925d7695754c426f3660acc08ca772597648735b0c8d92e80a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/gn/firefox-110.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "288aa3ab090e369696f87f2d266b55b6b604611d48de5b0323a8dcf6b8131081"; + sha256 = "52fb45eeba6446a8fe23f976acda920a5167e8d6396c0e364dab906addff9e52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/gu-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/gu-IN/firefox-110.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "8751c272912bd68d0ba4a4329e31848916794171e76ecf1ec480d9bba87143a8"; + sha256 = "7a4e841acc56dfbc34cce46ff8dbc0e24cec260b8567486dce7480b60af60982"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/he/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/he/firefox-110.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "6263e6a44cffe19c7b3ac15f4c2ec024a9c4ddd6713607db80789fc5f4ef77ec"; + sha256 = "da7e501b8c1593cb3dee96b10f822615cfe58351d8f058228fd9af4e861d3a5d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hi-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hi-IN/firefox-110.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "8d42e30626c4a2921bdda59511ec26adf9f7fdd669df49c75dfd32ec09203bd9"; + sha256 = "83dfe9cc2116c5fa780dcc6709a81325ff23314b726ed7b3f02fbca5621d1ba6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hr/firefox-110.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "9f145d7adc51f2b266d67ec5774451d04727fe86070fbcd7d78c869c4121618e"; + sha256 = "10f68c3e7672f6d021861eb4041d546663d6095ababca87e60734e9cfd09ab19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hsb/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hsb/firefox-110.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "366403587328bcd5f6554513d0884deebc305597f2f294238afb16c2db4c0bd2"; + sha256 = "18266c49bf2ef7b383e69d2f12a4866b34b592c6650c8468104d2c3274d6bbc2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hu/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hu/firefox-110.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5d0cc99b99d43a7ab939cca744b92826d5199b2000a32c5cf34a65341043fa1c"; + sha256 = "a67efddc94b7045c34e500322ae9138c60dece5df38b1c73c8a806a49c51bdc6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/hy-AM/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/hy-AM/firefox-110.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "cb5f333b84d36446104a72bd49caec3d43e202464694f9e78337d3e607e1f4a3"; + sha256 = "3c3cd679598a1ee33cb85552cca8da37805e28bcbac18a1954c44479332027dd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ia/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ia/firefox-110.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "ad48fd8343c13624284798179424c2b954740e165c86b62f8c0555a27445e955"; + sha256 = "e3a4b3fff1ac65e6c5013b33acf92bdc9a5d73be588969ae911ee57fc156bec9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/id/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/id/firefox-110.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "3729410ceae83654259e8c1f9af7aa6bc1cfa8c96d44a981ca0555b915b54cbb"; + sha256 = "c21dbdd5fba0f80ec211c2d678c97c45c15d4c38c7a9ef2df3ebe419cbc159d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/is/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/is/firefox-110.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "b16f8b5d8188167a676f9a4356d7b8fe3430d495957a5b5ee38505752e08aeb7"; + sha256 = "c0c4999106db151910a9092959c0e1cb1792f4feb1c06e391209ba27e59e50cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/it/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/it/firefox-110.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "366dc68de5e29e5ce6777ab654a67c25fbf5681ee42b3cfff68dfc4119d65dd7"; + sha256 = "1f4f9d9f2501e024e1556a81f86dadc53a15aa87ba2afd18e24c671f097bfc28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ja/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ja/firefox-110.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "7ee29129e13769d3ef0b4491c24c3dfff8f483d6f56d1e8ab7524c64579be466"; + sha256 = "0418505229d99088fff72c145a9dbb54f893033dfd0688e4cfdca5d166a9b1dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ka/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ka/firefox-110.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "1e1a51f53eed441d028eb880a364da796746c2d95951d521820480ba3af19cbd"; + sha256 = "cb2799206f8ebeac345dd3cf9cec63ffaab369c191b056816f86024eace0cdab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/kab/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/kab/firefox-110.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "b97d20a23d560195218be01ea0ba5e54ffc01d0a297e920b755ea8e717c3b819"; + sha256 = "8ae745f6130fd0be975662f1ca2f73693b2e6eef28495b154f1e45cfc029650a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/kk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/kk/firefox-110.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "7fc9e69c16e0c01a31b4e9cc6c7542891537bb3e0033297e6792b4962c540a71"; + sha256 = "184448dc29505c50a9e8c0bcf0974c5a02cd91fce5fae168b7bbb8743b552a8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/km/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/km/firefox-110.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "6ca48c5868342eeb3ebad49a36e5e478df83b44a5fa0a5fec3ccc9efb6213207"; + sha256 = "b2e8732b0f85aec1cce3c17b7a01805d7fb63852dd2940ab16557e42f11e4eb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/kn/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/kn/firefox-110.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "62c44308be90402c05e573103acd768e93439ae1c058610282838677c553e564"; + sha256 = "504ae6d4df7241c99f36a59fc8d9fda35afd42a73e5871968e29a8cd052a7f4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ko/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ko/firefox-110.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2cbe9806e77b05098177fb3e700f74f489395cfb6894737643ddaa820b4cc6b8"; + sha256 = "06d8be7f8a727115819bc49fefe0a2a362f0598cb01bed17424c9a964b305cdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/lij/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/lij/firefox-110.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "6ae2818eacd6353ce0104a41e1a02487bcc852ae650079f17b9c3d24bfa32246"; + sha256 = "489089ee5f413ab46c69a9981625f5f07aa95ea1ba06fafcb8e9d14047255af6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/lt/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/lt/firefox-110.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "7d5f0a3b857e3b4927f79f6467efb05d362df1849fb696918ff498b0ec5ec493"; + sha256 = "fe86a88921f10d76c0ed8ac1c0b4ac56406b9c8c09a9c212ba8f20f0be879418"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/lv/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/lv/firefox-110.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "5972f0d493c1048f81c3d2e771543649685c436699733e010ca0352720441652"; + sha256 = "845c7bf589cac1dd0d292d573d939fbad9462f980a9d2d8390132a8dabfef0b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/mk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/mk/firefox-110.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "8b926b986211014b183c2b431a601cff6d41546d0c52164d800590377ca33ffe"; + sha256 = "573f1e0fcd6053c64957a87fb9f5f5a48a3ee266eb712c9b09157ed690df0a18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/mr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/mr/firefox-110.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "0db18d1f1b5603160d310bb71037586cd3f850ce547551588715323b8a4591e0"; + sha256 = "9b7ea4b5f67ca110ba1586d2abbb506a832988e6a278b83ea6620fb0e0c7dac7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ms/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ms/firefox-110.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "6d29e0e308485c5b9ccc561c1ff73dcdd3449d5ec172e87eaa1d4c6414ea562f"; + sha256 = "e4c035196bba510e0b0caf699c24683b44219a4d51ac9dfcfe7874afdeb4f91f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/my/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/my/firefox-110.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "69e7e315a8910daa7325007b5deb83cf43fb29ffac66d7e0a8e3eb8a372d771c"; + sha256 = "be04fcc80b42505922d564dcc71f59ad18977e8bcaedfdb051b0037650685abb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/nb-NO/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/nb-NO/firefox-110.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "f1cedc730d9a71fafd39268f343ede8c4e09f4c70e6f3798e4cc6a62e20bac38"; + sha256 = "4b97136ee0f64b4e0978871b8618e5a59f390a1cdf14a857d7c3d0474278e747"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ne-NP/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ne-NP/firefox-110.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8d04cad68f00675081fa86461b638e566a3e93b113ec824d147ff858d0488f75"; + sha256 = "e1d3c4ff0d67c3f927e1846678d687f9b1fcacf2c810a228a263385d0844d151"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/nl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/nl/firefox-110.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "da982c4645969987b5233313f867cc0201db446c38ef6fd3e3dddd1c21cfea6e"; + sha256 = "8532106ddc363e24b76fa2d8326f88e98da2bafe588badef3b29658526aebfc1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/nn-NO/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/nn-NO/firefox-110.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ae24268f96885e4b5153a8ada3cf66bb7059ef006d54c3c69a6cf6a9599bceca"; + sha256 = "a2e289e59aa8ea7213b771cc1c249406b28cfbf1624efa06bd700b15f40bf9e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/oc/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/oc/firefox-110.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "f764ebc811b12637c081483260f091421afee5af636689b4c99e41c5e8482767"; + sha256 = "fcad2ca73437f84d8e500e329da800bd15f5758b99ac896cfa1d7eb2525a141f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pa-IN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/pa-IN/firefox-110.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "2d4ac283513a21017f8cdd1a2e7d2914dc1f6b44bd7d1f3cb692d897283fc491"; + sha256 = "ee61ee0a16045d0919407758261f749ab6d4a612439521166dfce0e9208f6cb0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/pl/firefox-110.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "385e1993424817038268e41b4c82e5b7676977bbe66f15cadb4de94e02a17d7a"; + sha256 = "7bc34d9a72a0c9197bce9730262dcb9a254a40c27641022e854a37daf9756b39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pt-BR/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/pt-BR/firefox-110.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "0e43c68826c2d2e86122f610465a71de7ddf86d4e87e438639c28816c6e7215a"; + sha256 = "7b3344c25a5ac842d565525dcf8e771da15c30fb936721c469e739b18f9dfdec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/pt-PT/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/pt-PT/firefox-110.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "6129db67a61679e1836b09e515481ba64d1c8e4fc81df7216749282a071243f3"; + sha256 = "ac1024a1f0183960116b604f2d2a7abfb321f91aedcdf67d3ae9befe2b49051a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/rm/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/rm/firefox-110.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "9964cd8d26a4e828d383f179337ad64c7d757f9765adfd8a79b4e7f3b644570c"; + sha256 = "bd90d0110d0c5f1273f3d82b38e5690dfe7eec8dbfa29f9ce7627d75c495c968"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ro/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ro/firefox-110.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "f7586714053c133eb2acd5a299354ff919bfdf1a6e92804df130959140979ace"; + sha256 = "26f09bd30df370c65327728cda50206df8a0b9bb50d1273c81249cfaebae37e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ru/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ru/firefox-110.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "33e547e99de3cd5ed363ee9e66c54fddcb52af677b21f2ff8929e3c42732e0ba"; + sha256 = "0f9b03dff8c002b7a56c6d7f125d411652a6c1b00eecf317454f936cb887e4f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sco/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sco/firefox-110.0b8.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "df707abfcabef24d9af77f658b8e01627c69bf242fa57d258cc6d390e858c9e4"; + sha256 = "a7d2e6266a1e15a3b6e4bc851963ac7b2ccb181eb83a4fe4e83e99a56804aa3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/si/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/si/firefox-110.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "1959ec07d6db26b4f0846588ec074d24b5543285186fceb32ecbe057acc1b245"; + sha256 = "6452b61aa8acde4d2a0bb82f8070357309a4a963a4aada36fe5460055a9bedf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sk/firefox-110.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a9c235d177001657460acb0adacc3a7d8b30fabefb96680f09002562c9d78718"; + sha256 = "37f801f1c9a0f020ce9729c70788024f0e71b62ae8860c3b301d95bebb89efcb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sl/firefox-110.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "da573b4345abf16f193984c5480083c13a65fe2ccb72be245f92e4852dc9a7b1"; + sha256 = "0afbacd201d903aa3341477450977c1a233f2843c43e77d7a73393c34b342c62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/son/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/son/firefox-110.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "147060d1b9dd3c4c0a31e67303cd08b38caba1b495d2c33e172b1b0480993871"; + sha256 = "21c132be9a28d7c18d3045182d47a541b0af37c6306f8c08b8b4d28a6d3835f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sq/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sq/firefox-110.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "411c287d77eb774e52ca4bb528852ce4c38f86c5147c322371633277436e5c66"; + sha256 = "74d545cb511311c0d2648b994a79c5f63bf1ae6044638180117c38c6575dc882"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sr/firefox-110.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d62d2956beb460c1c6a07429ca18dda1b470d93eecc5bf233712b399155dc670"; + sha256 = "4e3d14eef5f10d9cc6d25c840d26445f1a26a3c558265093b76ebfe00e05f2f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/sv-SE/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/sv-SE/firefox-110.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "e22d8628bf6cb94f139efdd16fe52bef13179611943c047e5802d46ba396e9e5"; + sha256 = "f8e98568cf4f5ed59ed662b2829354ebd7e9dc40bcceae5a5992257c125819b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/szl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/szl/firefox-110.0b8.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "60f54f251a528e69d9de932a1aa9af16b29c118b021fb6578a6d679f19f35d24"; + sha256 = "a9727f8f1cca9aac9b608cfde33775fe1418ff9aab7fdc5229dca68c17314b14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ta/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ta/firefox-110.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "cd521c26658fb537c36f21283e28be09b79198733c2c10b44a0e8e5a56630d5e"; + sha256 = "8803d98769b0b634825374db86d63ed7d12936a57c62f77cf86599f8448ccb90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/te/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/te/firefox-110.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "93d8363e822e23ea4afe3c649fe92b958f9066d7fc7789f604af99b6f435d693"; + sha256 = "649cbbefc93e18871782a8134005b4ca6f89066ac0ac65f43e489f00535d6a5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/th/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/th/firefox-110.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "bb0d863cf8bbd3bc03d5e4f51af437c5a55736f347998ee1be1e5c0a115d3ce9"; + sha256 = "6b9a1e53671ab8a67bbffe421c1304fd754edd7b8c30aa73876ac88947c3d72a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/tl/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/tl/firefox-110.0b8.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "66ae66674078504c2d67a5405c407076eab99fea1d5eca0bf4567bf3aa822e15"; + sha256 = "f79832e73b7d7cd9e34f258ba2b449e91882e0eaad368a8130d5a1e10ab0d3e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/tr/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/tr/firefox-110.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "1c0b9d7368c4f9cb61d713d677408482219febc302ec4d8317e20d5f1d1075e6"; + sha256 = "b7472eb28a207448fbd3be48fa0a33fe1a495d3f10c49a90a1a53c37b5efddc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/trs/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/trs/firefox-110.0b8.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "67fae3d8b9a6759f0bee55b97a8846afda2281e94c9ea35f9de9eb427d5398aa"; + sha256 = "a2ae5913f10775ff99cb5408a5ee06ff4e95711b7b57bbd605c1720d5111e5cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/uk/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/uk/firefox-110.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "330897b83e0aaab964f0ddf3a07240ed2e4e5f9dd59595b2b3462c258981cab7"; + sha256 = "15837064ff0328a52221e64061e565999132dfa06543e21aede2fe86f74ec4f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/ur/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/ur/firefox-110.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "6eebf5cccd785a0eb3d14fccb756cc6b9653dc01f3e48c6a1e4956d4329d1d4b"; + sha256 = "d04154c2e0de0c36f8408cdb5c479ffaf7c19208b6c1208a0b302d915375aada"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/uz/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/uz/firefox-110.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "97b82f8be3b0450646a7fb68c6b5cc9812e3618a1f4a26a339b7e9f672cee114"; + sha256 = "503ed687154d63d05a033cbe420171661d815011f7373fa32928f9c4d28e0a87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/vi/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/vi/firefox-110.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "28b48033d6e698b643783433b948e8033d06322a6f164facd3bc6dec64e967aa"; + sha256 = "ffc193551227f39463e25085cceabd6000bc4754929fa9071862339c9b8f0c97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/xh/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/xh/firefox-110.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "dea53c99e972e709483027174697536f300b1debeea03b653189be61b860a668"; + sha256 = "a32c9c7ceb2c38d2151ebcf4af15a613066f2965205eec3270aa42853a7ef341"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/zh-CN/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/zh-CN/firefox-110.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "dec3dcb0645e170ca312c38f8d91c6f5391316158ad6c0ac2b9eff1d34ff7788"; + sha256 = "aa3f165da56c9ee61d2c48939b07e6aa854e674571ef2dd27c83d508aadba869"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0b9/linux-i686/zh-TW/firefox-109.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/110.0b8/linux-i686/zh-TW/firefox-110.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ea01a8b6dc57617d3006b5f24a21206da765abf93eabec4afa50dbad1f7f9b95"; + sha256 = "a697c3f1a075269589ff8c66387489c14b83fa3c4e3d773f9bedd9abb32caf59"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index d2d4ea9e74..65ea6cf6cd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "109.0b6"; + version = "110.0b7"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ach/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ach/firefox-110.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "8963843b90eaab67194c344a3c5dc329de16725869917ce03d9be64ae31813fe"; + sha256 = "3149d7d688edaaa71d2655c36eb2b36b114ca81ec9592148e277bbd553525f6d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/af/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/af/firefox-110.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "16cb8d7b81535243792110635cdbaf664bc87bb72971a641d54fa140d8a8d513"; + sha256 = "3216a774f492dba8ad2def4d7796154615ebe3c09ee1fefc784936bb32b2153f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/an/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/an/firefox-110.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "413cb55e1107a3ce4819d8821a8b7280acda3dc88ca5141b6f9a2710ba3f54cd"; + sha256 = "4fc5ef9bb0326b1a42a78383744a310d0ef27e063b525c9b0e7eae05c2ba8fe0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ar/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ar/firefox-110.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "87c15a4bd1de2f9ec72a04f09a2c71298df771571d7cdbe2dee0c2c7709fe8da"; + sha256 = "624004bac8804d4ea1a0ba64b85b69af2273ebf47e9d073cf45db5fe6b4a130e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ast/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ast/firefox-110.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "e7f36b517c1988c49309d4c1748d784393d7435f4654f0dc4e157348e2a326c8"; + sha256 = "bea272fea8ee71e259b7174e70992727c96fe2cdb463c6b6f45f49d7d630aefc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/az/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/az/firefox-110.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "43ed16939646c715d86507c597130a2f22f519c3a8ccae479abf249c8ceb1612"; + sha256 = "8e8a635f6c4748044d195ef00196900b7164e8bfcf698012c7468fec41e05b4a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/be/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/be/firefox-110.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "5dd9975563073a441b2ea4255c09b06c5a51b91312423850f06dfc1d25465894"; + sha256 = "de80218b6ede880e43a7710df08bba343f0038134a5209b363f2b48ff67679e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/bg/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/bg/firefox-110.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "0606249c7bda6d890b921202b4b276ff5cd713e67aa7d232def6d69d80d1a7a6"; + sha256 = "21719f7c5400b6c5e3ec23ae0a357528536c536f129fed2ca6d50dcb52661924"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/bn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/bn/firefox-110.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a543c108fe17795c6873c48d7547a8600709d7cf11844311e6c8b488597f72a3"; + sha256 = "ef194e6f20d6c7ff9ca6e93178cb9ec7ef3f192b277f762b8d21c9d0348bece8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/br/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/br/firefox-110.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "3182406fdbed589a24ebd100331f9fe39e0f802e807ff269aecb9940fa7017ed"; + sha256 = "c9e83011d1af6fa4cd16b25862e07e976a9b92d8b20488c53b7c6dced269bbc1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/bs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/bs/firefox-110.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "5e2f2ea112fca3ad70daf614ce8f5353376a858dbb827dbafcc9cca58e8cd73b"; + sha256 = "2fac9965eedc5ce6846833e3d9ae93075e4526b71a9acd2cc0a77c859bf2fa2e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ca-valencia/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ca-valencia/firefox-110.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "ca020b62eb8191aedb3beb209edd37f9e048389d1189008c119cac3e516d1851"; + sha256 = "803b7d18d184f988b0c53ba50da1c454f95fddc397a8a1ce78e99bfdea318c90"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ca/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ca/firefox-110.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "64230635ad1bb9a5ca8d701bb20b0cfe0f906f5c346bfef84f477a2f9f7ec792"; + sha256 = "5c85412de3767eb33b1f81402e99079617cb392f064cfea512a1f0932129ca4f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/cak/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/cak/firefox-110.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "8eb27b956da7c692ce11a478651e70e414b0e13db2da2d7dfede0bbd36bcd12c"; + sha256 = "c7ce5177bc827fa356e95e75a66c7cb57785766a43618abda8b27c74ba669635"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/cs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/cs/firefox-110.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "d2a3a2e9834f439d942a779cc3b025bb725a353db6a040b0fc243f0c61beac1d"; + sha256 = "1c87e5cbeba84d10e26b8cb2260a575bd3a09d164305e79df79fd2e5ddf3de58"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/cy/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/cy/firefox-110.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0b10019898be0886cc759df75f15021dd07cecb08c7d30ec0dc9af73183c3c51"; + sha256 = "05b6e4f546d8fb277fc01e75aa13935a58fc4f5dbf7d03e9e101e5261d0c4914"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/da/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/da/firefox-110.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "8b32aac9e98c68e8d229efceeeb341a7d6eeb1ddf2d37b84bc05f30ae1bee695"; + sha256 = "50e0e667231225f9b39f8bc3f5d17a2417ea92c0deda485f47d8fc5ad7291f66"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/de/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/de/firefox-110.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "28342c1f3324b66d350516dd1c06487050b52f8a2152a5f8601421bcd702bdf9"; + sha256 = "afdd6408e18915ace3b4568ef374303200c0871564badf7ac835b853dfd62b35"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/dsb/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/dsb/firefox-110.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "80733097438a7f694c6fc8d79a93416496b4e845070de648fad06a61bceacd2e"; + sha256 = "fc3e13183ab8fea4e71881009894bd11919bde6a7d9590c7e8289a90d9105628"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/el/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/el/firefox-110.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "2dd8fe5726a3fb43796d4608c7a3ce076e47cceeb75c98ab8ffc6dcdeabfc139"; + sha256 = "92f0b82a06bc42c765b7197d81f9f74083d3f52a651afe326c5621f0efe6d6ae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/en-CA/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/en-CA/firefox-110.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "ad62b030296da6049848ea83ec10cc05657099a8bccbfdba95c4268e97623988"; + sha256 = "2d99cd7f37d2f7b9929ed20b2013abc654006d6e6bfb6f063b0108e08300813e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/en-GB/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/en-GB/firefox-110.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "52940c1002c0e5cc29712a9b430a209c24c9d5b4dede131c955237299ccb9e74"; + sha256 = "dd768a7a686e9233e1fefefb7c049974784241663b4e2a729898549aa5070122"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/en-US/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/en-US/firefox-110.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d033dc84fb3f054865fd0f2497af4a60fde033f9a42c4ed6130f5fea048437fe"; + sha256 = "aa7fdfff2c520bc78cc0e7a0a34bb4ab830a7f5332807398d10176e014dab24e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/eo/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/eo/firefox-110.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "dc55d45ad8c22b5ab4290cdce6ac1f648ae2f48ddfaf9255a6e3cf1a1c42f1f9"; + sha256 = "f89d84d6b39c04849a281e90dce354a0ad2ad0a39900a4bb4d9e991e361800de"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/es-AR/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/es-AR/firefox-110.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "28bef42268819cc8ab4ca0edd643bf444d92c76795be944ea20361fc293cef62"; + sha256 = "87150f4958159ce9913faa9cf333648aa5ed5d52d64fd1ae91d79e7b06d1f65d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/es-CL/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/es-CL/firefox-110.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "948f601cf86e04af37c3587a1b62c6d91e49483fcb2c1af142007d1de864bba7"; + sha256 = "a6bc24603b2e2aef5277aeadbe639407ffdf5da7d75af871976f7984ba6dd775"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/es-ES/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/es-ES/firefox-110.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c3aca3a4eb8731f30559df8137a58288a31449f708356659fcda97b8a1d24050"; + sha256 = "039549d1b0f4d17acfb7d2b62a54dfcf161ff880420ff6f6df59631922df9b69"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/es-MX/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/es-MX/firefox-110.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e32d31832d542933f6caf10bddce23841ab181e1d74d9c2ba1aff069ed47c4e9"; + sha256 = "57ccc2d1bcacd0c1cee697d02b2333ac8ae9022caf39869b89435eb9e9247dd3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/et/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/et/firefox-110.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "ae9af0467dfadfc5f3d25ac79b41bdc1d52b329819c9115cd086c52651fb3931"; + sha256 = "9a1479cfa6e246ece5e4093076378536b6838ba656efadec744ed7b0883ff78c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/eu/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/eu/firefox-110.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "6db620908bdc5844d4c448e1e5bb8a91994eefce9636a7e1513bdaf44e822862"; + sha256 = "78305f9504cb89c3ecea1c0b235cf0d3df5dc15853863b31b446660f6c300eb6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/fa/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/fa/firefox-110.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "8b064dabe1f7476413343bdd4f043f2af5b4b1ba69a9aa87241befd2b8983465"; + sha256 = "39adfd21e57256ae8befcd7f39e9628695fda08a57fed972dd623d7e0759d9de"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ff/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ff/firefox-110.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "c37f319437ecafb75eb864d903ea670c4047af96944eb6163a69a71f0570c7da"; + sha256 = "11c2d2fc7262ad9074d4842ffe0b0981e78cdcbd34d658bafd61457fb5b8cdb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/fi/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/fi/firefox-110.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "6e67ee392b95554d0b554fdc4f090fdffbfcff008c1d8fc5f6eb4c07ade3a936"; + sha256 = "ec2a6eb8266c5f8ce56056a322478d308411c7cfeecfb0e6528f3464bd6dfa41"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/fr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/fr/firefox-110.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d1752fa0522b713d4da15e3697f7446e20a73cd7af221c6ade0266767cca8258"; + sha256 = "7b1fbe6a9becf5c4fa27a4c74672f8408e1028998a609febfc82568b0a0fce1f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/fy-NL/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/fy-NL/firefox-110.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "7ee4a7d70d4d247e1b87d01e609bf354569792d8dc82c7fad32caa1bd010fc1c"; + sha256 = "d9be3385f0bae85c481d48a3246856ad160e5ea932e4f9ad763db98a4af1fa06"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ga-IE/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ga-IE/firefox-110.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "b129e94f5170cb9bcd2610f3bf8ee70033d703448d4c7387668d2d5b86fc5eb7"; + sha256 = "16fd254951cdb916cc7db0eeb64c14a291f8e4fea9fa4d936bb99cc4f5263e6e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/gd/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/gd/firefox-110.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "2d84c1337cf1f86ad663ffa0b6d476409535d0c44ec9888757104543217c50a2"; + sha256 = "037939f4a9be6bd265e7abb5d85e571e4c7a49334bcd932d279f17654a4f106a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/gl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/gl/firefox-110.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "42c42d4852f59a7801e2ae8417697e57afb595f7eaffeb1129a5fff7471be895"; + sha256 = "8ea3531f711c78066bd79768bc2f8ee2cbf3974b5d2a6a15ad61cdd488a42798"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/gn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/gn/firefox-110.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ae4dca721ff5d36cc7606e47e49c58ae6571102db45d08c69e08cb78a8a8f44e"; + sha256 = "d0d8a5776190ed28b92dc2429ae75ac6a25d48bb8217732c7fc246b94acf68e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/gu-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/gu-IN/firefox-110.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "d502ef5aa86adb6faf1ed511983cadf5263e405d38b622ade74fb54e5cb95bc7"; + sha256 = "9997dbcffcf81c275302d8e8b5d025962c71b6a9c75fe7bc507b101eea260d98"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/he/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/he/firefox-110.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "44dcf29064071af9b9e60af405ca846ad22f3222d809bc7b92dbc9a3985c9d54"; + sha256 = "0b5eefce3516e6d5b7ab572a0940ad5c8ef1c8528582d182ef56d8320ef4a99c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hi-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/hi-IN/firefox-110.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "9ecd5fbc6fbecc142a69893bae5a54d819f13ffc01881a3bed6d99c258a13664"; + sha256 = "6b1905b83a7afa4c7269d7bf88351c26c9081945090cbb497869809d91be574b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/hr/firefox-110.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "cf5189fa145a5a7166a4350402e2c490a5a816dcb85bdec60cc87b7f10d5fa04"; + sha256 = "324e55f1b4fedaf1d20dd9acc13727e51d6735c377ce58237eec51ca4c937ccd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hsb/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/hsb/firefox-110.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "6fa4c9ecc43f2fba816197ce103221cd224bd0d50b742768ee57c7a14cd8665c"; + sha256 = "4bf345897057ca2e215e53a50d79e45418da68c67090bfa1734d0dc43f4beede"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hu/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/hu/firefox-110.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2b9f0b7910f859f63748721c7eb556154e3679ac1e02cc265dcecbe387b35e07"; + sha256 = "eed32aa30eb35a074c9dd00576af9c4c2015c0487a02c0b66ea8db3095bc59ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/hy-AM/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/hy-AM/firefox-110.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f3f41e9fb027a08c42092175e6a32888e2b4add89b8f73bc77e672563479cbc2"; + sha256 = "320f41e8de475f5957ba9547cf844ac571bad1ac6f991ce4f5ad87cdc26bf9dc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ia/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ia/firefox-110.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "c652cfeb05449620b7e2a578e93c6112ca0cb9e086271048c2eb1190ae6ead02"; + sha256 = "1e4348f56ec630f3969dcf4aef3ab263cf58fe449314928e5a4963f6c7ebfae4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/id/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/id/firefox-110.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "37fb22407e5c1b6df25bb7a607472331d5b8e5b961a2c7feec3db712b3f3a692"; + sha256 = "6c54eee1ae9a361d49c6302c3a710fbbf0da51bfc54967134392c58eaaa9372f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/is/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/is/firefox-110.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1a8ce80a4948b714c1a6c8d5dc23d59273c31190efbcb7ba483c63302b0032cd"; + sha256 = "8f40d12a2782845eb9b0565f1237e9b86eb750efdd420c1a7f1cd17d76e67d2e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/it/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/it/firefox-110.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "0f9efbb387cc609792ccd89ac53855b32482723f8e383fc1ac27a00968317382"; + sha256 = "d81c438b5ce1a124ebc4a935bab22a06fb4b664bf50c6158fd75878f111fecb5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ja/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ja/firefox-110.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "b1e6a24e6b35dcf65c92b995615e60c7c5b48e66634343d8c56338e18c0525ff"; + sha256 = "6f20bb1b75b13acaf35a626d843842a804fd6a749020076dd783a2ebb8adf7f0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ka/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ka/firefox-110.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "d145b1b2592a1173c8cb897d886cddcbd63c4e718adffcd21d280c57ca331b0a"; + sha256 = "3ee2d13788a24bc9ad60f3f85eec6b11ee82bdde223903b73ae681ad5a0c8216"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/kab/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/kab/firefox-110.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "52d6a3ad3d11ae3ea5a913c2c6b0d9277b4996ca9e6f91344bc0462f35cad436"; + sha256 = "a42be81f1df3a2d18818bfc8654cb9cacf7602bab964509392d62439b3f67adb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/kk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/kk/firefox-110.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "54c95d0948df3631a23442220afb2ced0533b7ac1a5432dbd1bf71ee43153749"; + sha256 = "24f29b0b78df615942c6984e160e9cee60552efbe9246ed290b6a01922b0116d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/km/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/km/firefox-110.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "ec449661503444aff1fc173a5cf24916107ec08aa33a03f264ece19f772246c3"; + sha256 = "02cd6c8124331512fa7f57b9d165e1a189a1eb92923b0f0264fdb6c1b2d4b753"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/kn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/kn/firefox-110.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "93ff15cf17fd99ba549ea5a23613722cef18b0794b5990880141833dad532f6f"; + sha256 = "6fb11c1f5883f215cbccd22ab61f0acb72ca6860e93918d61f351ce1566e98ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ko/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ko/firefox-110.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "cb2751c4f9314dbecf34618fae4fce13a2f2065c7826b3d597db161654f23bf9"; + sha256 = "dce0fded8256a5061fb335cf42821cbbe198078390f7d417a33be03979f52b67"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/lij/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/lij/firefox-110.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "b74a6706e4fc8d95aafff6fb2c0ecd9460a834e6742384c08ad338127cb3e563"; + sha256 = "22ef4a8396ba5b3ed4eb9da028ec8652ed9999f42e2c5c6b409e7fdc45d17e96"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/lt/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/lt/firefox-110.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4eff1a8f24110849032a35b1475fc6bff13113a770151f647c2f58040341b6b7"; + sha256 = "55f9842ad40c137e70e306c8270435d5c22ea83c611e6151890e5cd2166f1b1c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/lv/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/lv/firefox-110.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b7ae8f49d245ff94ac594d4ce764fb89072122e7b3995e5f55819e0225a0516f"; + sha256 = "c92b0d98c2a7ca81ca4f5f16d9a387a62e0992cd65707a3a529d8683541f298a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/mk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/mk/firefox-110.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "3fd85290cddbf2b6fac943cfa1bbf3517f9d9322c0bdd46eeb927379469af392"; + sha256 = "110f76a05dc366e50342be5e503d64112d2798ebb92267ef6aeabd18a23ff826"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/mr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/mr/firefox-110.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "807f5e9a7676c89072385f788bc2386cebb8df5913d0a531650cdbd4ef32cca9"; + sha256 = "85623b9e9d69d7ed501752ec9b5863f8bb8390f4f53d7ceaf1497cf442e6978a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ms/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ms/firefox-110.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "68f563f9815aa96fc12534f7d1809e529d9f87da9e2ad4e4f416cbefe9e43994"; + sha256 = "80b135385d8f622ab9639fdbdd119717d7a1c5fc105469cab07ac31f82a2e9d0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/my/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/my/firefox-110.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "7b0a6bf57faf08ff121b8478ff682ab17930039b903883cdcee0c65dedaa3e37"; + sha256 = "ab6967da3bc7028ab82b57a41469488a74394b7fa914a52c2e7dfc6c5edd08d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/nb-NO/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/nb-NO/firefox-110.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "81415ed3aca0d2fee858f17f6fffe5473f696df80cadb3dc2ffe31cadf605bcb"; + sha256 = "cd22536cc93a47c78d41a3ee78415a3f57dab757c61719d31a70b172fef093c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ne-NP/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ne-NP/firefox-110.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "477254383468b5c027db5eafae857127009a53c370e207f178a35c9c788cd679"; + sha256 = "ee9b171561f09e52fb595135234803d95822772b722da5867cdc41ca43c8d03a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/nl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/nl/firefox-110.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "903c504704a727f64310999512fef8573cc9aff0aeb6ab3ccb2f05aa6b073e9b"; + sha256 = "efc83b8b16496033943ae70f5c572319cac9d86c826eb64889f2b824e1c0aa9e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/nn-NO/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/nn-NO/firefox-110.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "5c76822f248c4e654fe98f93ed3a92cd05c7843aaa1826d8ab1d443f845e1433"; + sha256 = "e74a0ca78df08e63ddb3162e71a22cab7200d5f317cd2eb936305e17b053ffd5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/oc/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/oc/firefox-110.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "9540a86d41ca55c71dfd3eb700d51cc6e98810e41c83cbe4cef5fe32067449d8"; + sha256 = "2ff7f6e219be38177895ebc30a511286d645120728caf4157b2d5fc03c4882f1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/pa-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/pa-IN/firefox-110.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "0e93716de0e1c5237f699824f50424b4af74a0da2c1475be42323b18478ffcf0"; + sha256 = "bbe935ee5a13b42e6bea6575f54930f44c8ff2d7e62f9ab4391baeda26bffed5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/pl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/pl/firefox-110.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "0506596bf6e04c4416c4cfde7ef6a0c066d0e2a8e008f2280319a2127dacd5c3"; + sha256 = "ce270a34203fa987a312c96c462a414ff65da9564b01598f1183b7f920bb9216"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/pt-BR/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/pt-BR/firefox-110.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "9bf1c8d46c5cf5f87825d124b8dd5bd4833a0a733a380843d3c31aefee7d0898"; + sha256 = "a082bb58d53c57d4728d49207e606ea3b79cba8e57541e098f867f8bfb76d6a7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/pt-PT/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/pt-PT/firefox-110.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "80e5a37922cb7de806331d39f3ce9b316a3311f7b29082736da594c9d577b3f5"; + sha256 = "ac696b2b104a3995b1b0f29425347c4d47277d0bd2786180ac4d6ef1f9f7cbf1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/rm/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/rm/firefox-110.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "17624a24e93845efe04a5478c88c8db4a3dab1b1adf36e08cab4b74c7d1be077"; + sha256 = "54841eed47416b836be393bb625152bcc1267cfeecb2bcfae8e67b012505b31c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ro/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ro/firefox-110.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "6396edc2baaef91581257501fdd066c4303596d82b72037e3a4cb6ae6c688c85"; + sha256 = "f074ef2c5155ddd0562a3bc8afe3a3562e247b805dc71c1e45436f54025c25ea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ru/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ru/firefox-110.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "58239fcd06b3f24a6a333a5fefd05f3c61db175b66e4444317dadb767c3abf6c"; + sha256 = "cd16f9972b4e748f8f2a42acdcd2bd3d81d642b7261764a1f49e26b60933c180"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sco/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/sco/firefox-110.0b7.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "bb04339afed59eb0672a2009616c1cd155328b169ed4eb8d2a2062575a42f10e"; + sha256 = "2c612a1f2305384f4caf6b37ba57057a7fd9efff5d5bfd5d0d760c2baefe55c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/si/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/si/firefox-110.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "4a0b83beaebbff9ed0734d72cc5cc57f1b0633145a22729f75925e7c2a85daa3"; + sha256 = "9abd847f93124ebdd50479ad38317fb8087a85a9add2d4e44ddb6f2a765207c5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/sk/firefox-110.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "205ff3dd21f368c47f5bc93f1630162b985a81b744bc6641caabe71b8824d8dc"; + sha256 = "a2c001910dc0e2d8b3d864e7cd23691ef13f7bcac15fe08599f38533951815d4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/sl/firefox-110.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "289dac2addf1f9ceecfc97e25f206b2f4b8792042c6eb712fec897eb7413e909"; + sha256 = "212f7dc19d62f8ae4b49eacfe87c2d3cba87da91b88cbf6e8bc4dad05b3ecc4e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/son/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/son/firefox-110.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "d1d4567e68f6eec483ac938dba9bb2de1bcad451132e38da48af711fec6041dc"; + sha256 = "ff6b3e368980b4325ec0e02948e0aef6aa86cc4dd5d454a5d6a2c50a790d3382"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sq/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/sq/firefox-110.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e5b19462f11933671f59144eaff72b1cdd87e59c40dcbdb21d39e16b6c771eb1"; + sha256 = "8e343437ba5a4f030b629882b73a0c23b2141f4ef5be0917444cfd9caf53edda"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/sr/firefox-110.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7295466d7bb5e04a439b6155b7cc79a96111c9951bb4cc9f51babfb4786c74b3"; + sha256 = "65da36df28fa13643773c1fe0338d63731e61c33fce38b4f5fd90e2793c6e210"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/sv-SE/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/sv-SE/firefox-110.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "9342438f3d48f87aefc41eab6bb317a9328f3ce25e180ada327fd6752e67411b"; + sha256 = "19c7a44a670daa2ef9167105858ed0a1a7e03cd9cd2bb5caa3fd6d048d91f2df"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/szl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/szl/firefox-110.0b7.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "7ff03a1c8c542462ce4e67196f55ff8378dc649baf3ab9cc9cb79d307fde9cd5"; + sha256 = "d808d96a5fbbaf1a9dd72b2fde9bcded5759032fe272817fd5525d30e666acd9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ta/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ta/firefox-110.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ff7cc22bab69027967927c2aa3174c536fae4a5ae2b232962e6a77dccfde4a45"; + sha256 = "fce003993a6d3b45b041271a33272f3fd8aa954ad150a96295013a9943da97bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/te/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/te/firefox-110.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "366306f278a5930b4389ae70e81a35095204ac50a650602e7160a609d6d272c0"; + sha256 = "26e7d6c2df59f608d29763eaec24aa6f66c1f393f4b578c4e31fbc0b66d74872"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/th/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/th/firefox-110.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "de68926b8a6feea9b0d84869811230ac800205fc541061dd1e2f5cfabf6e23cc"; + sha256 = "e78b62b3a74aa1a6edc65786376cbc69ffcee57550f7bc01aa6eb1f3348e8049"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/tl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/tl/firefox-110.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "02e81afe57f3fab02d7886fbe3fb3b38a37707635abe358ec77f4c46313e778b"; + sha256 = "d9e4e1a157bf0950b4f0e4a4bc65e0133712c7808bcd82bb7c2363b22f84f928"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/tr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/tr/firefox-110.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "1725ab0df146f01457025c118d7bd74a5105060ee6c54ac05251c63793dd7b86"; + sha256 = "60faecf8397c5636f408f7179be02cdd4608def2f6e2255d0a6b4d4adf691255"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/trs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/trs/firefox-110.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "72c41adcacb9b4071f40a36246357ec3c4377d5a3f1265de7a6c2bd4a5bfe7fd"; + sha256 = "2482b5c2a1ffa5d0c4bc0c4d94aa2570fffaca5882ca5d2dfab32f4adc999c7a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/uk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/uk/firefox-110.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "60f226b017022fbae92d3238fbbc66b5b80a8a428cffc680bee7380bb492d13a"; + sha256 = "3cae3562bc6b215886c829ced2f7983bd86c2b471e6816a4df4898ec1bdbe938"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/ur/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/ur/firefox-110.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "18eab55243a30490ee84cc1cf7eff37141e5a9c31872b51bef84db5f33cb0885"; + sha256 = "77ba86200000852daf8530168ca4769679003a81688c044a5a44e817a3bdb573"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/uz/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/uz/firefox-110.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "abd767b20dd0a1e442dde976f2389293244c0ed4025ab7c6b82eaa81e615ef7b"; + sha256 = "911da79e7cf5d63a35c7410a0a18143d919109e0dc2823fd9caa88cb3b2c4589"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/vi/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/vi/firefox-110.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8058c7c336213fe1b6ee419960a1df4c7651830a911bd4ab0d799f4e5d2f70be"; + sha256 = "9273b464a55cf3b4b8997bc54225e951a94f969ff83273316082102111e9b7e0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/xh/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/xh/firefox-110.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "2943e6f92b1951bc63ad45a78a852012537b29fe7ca59137d56a724be9159357"; + sha256 = "2c94b9461dde096ec4fc73eb3c024613ae57d17fb97220feec5a9de827d1e19b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/zh-CN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/zh-CN/firefox-110.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "8b111607dfedc130e31e9d51dd72e9eb3be947565ee3bfcfc91c07da792af928"; + sha256 = "c150000b9739aa32e3f5b9ed256550a0b91d14ddd6a3f88913171a263a11a843"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-x86_64/zh-TW/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-x86_64/zh-TW/firefox-110.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8ec2ad39e4e8db4d50d9ed2a24361bea76ffbcf38dd9521e235b0fafb45d3947"; + sha256 = "7b704fbf8e7d3569c5cb7f7c2bc1548781c6d4d3acb50a4750c155dae8b610cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ach/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ach/firefox-110.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "0dbbc46496169ca1331d87b87b8148502123dd9b909ddf41bfd6c94a8deb506e"; + sha256 = "4eb5efe5af863bd2106879a9f4deccf254adfa7b6231299fa9491d44013c898d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/af/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/af/firefox-110.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "8179eb2c61535118b859204023a421a0a4bc85e43f07bbfe93aaac439ca9b4bd"; + sha256 = "3b3362676e978b5521dbf251a51816d5fd9bc3ac0fb68c672d54442b38118789"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/an/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/an/firefox-110.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ecf07700fce298ac673acf886067ecb1cd4b7e9b58d870176c474c80ffebb988"; + sha256 = "41fd6dd1881cc260e63cd26ea1621a0d8d16702d6955a9bd918f3b05835b8342"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ar/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ar/firefox-110.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "da4b1e9fc735cbb3887b7601ae87ff426bf2d97cff5aeeb4da5f53e7e8ce849b"; + sha256 = "ac82d5b42a9a48f6266d5a9d2db48793b77261735d11ed5c6d106cbf85b2e4c5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ast/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ast/firefox-110.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "11f6cfb00f3acddc7daf988c59dbe8fa09533ddcafcf17434f85d6d963b38f2a"; + sha256 = "1c980a29e760a669fcf41585cee43398761103703bf7548efb666affee3288d3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/az/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/az/firefox-110.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "c94c20828469c9c00c39d6f3d5d20ae97a5b00e40be2b0381aa9d6978a05b4a8"; + sha256 = "f3fdfd74aaa5d02ac96d6fc2071a2dbec5a424f1263dd3d406e520033c811b88"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/be/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/be/firefox-110.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "3ff50dbed1d2e136b06e9e057c21b8f7072017d46f3c0211fc8df913eabf8eff"; + sha256 = "5c878775746f8897754de3a5742ef3b88e743bc59ffb8f073ca43fe85d3c3733"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/bg/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/bg/firefox-110.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "2392ab96c9f4acda6aab08b9269e311128174688f4468c17f32f174cc53fc0b3"; + sha256 = "2485924a0a2dad6a43e59b3c59b833000806770a4c170c9c9fe8818b9e9456a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/bn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/bn/firefox-110.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "242d6d3bf76674906a199fda2f630c39d1c64827b951abec417b9a88b6c1a051"; + sha256 = "7ec788d014d24984c4a91740ab210d306dca6bd991b21f000a7ec62eb2922730"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/br/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/br/firefox-110.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "73596148b62699f7f9b5a9f799d16f725b98356c4f41939a1eb947826729a7c6"; + sha256 = "c3abadb8c90f5def1f1ac66a1f57f8cb72142b5bde767f4310aabdb9b19b2af8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/bs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/bs/firefox-110.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "f48258de891f463e7ab0b8d99e9d90e350cc59f84429b78cdd998ccf4655150e"; + sha256 = "dbcf629d2bd023a16ffda05a3068c78bc0aaae9c16d23bdd46dde5ed3623102c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ca-valencia/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ca-valencia/firefox-110.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "2bfde9ad05bd74543d661f6a46f226cf2dfe6fe142f9e93710031612e9db1f78"; + sha256 = "fe6eee93d3f1299dd39c1cfb7f71b56ebfe76ff565679e24e78e9df48c15a05c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ca/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ca/firefox-110.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "ab33f070d3824655165ae73982896a07e14a09621f45fc4bef08a9ffc900f6e9"; + sha256 = "8b6beb770bf10e37e28f7fba3f13cadefddc54ab461f79158cac3dbcc4c6d189"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/cak/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/cak/firefox-110.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "a573be6a12bc57f26b0ac9fe64049dde38378253fd12e4e74d873a74945388cf"; + sha256 = "4835a7f7e0c2aac5e7cc515b438f4ec8eef747e8eab43be27329d769111397df"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/cs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/cs/firefox-110.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1fd4304eab350c9e4429cd89f291ac82cb26f445433e5f4eae30c880f9219d7c"; + sha256 = "5fbd0659bcf911f4227dbfac889f02515b2108e59c246b16bda3bb80855cd21b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/cy/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/cy/firefox-110.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4d9fea847c16fd2c3b13c9d5572bd4fc9adbebff3024a16c0d1bb6a75aa33139"; + sha256 = "3c20e9871614b0173a44f8f1d1c797de2ba1065c5ffde4881fbb46b7bdbc2229"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/da/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/da/firefox-110.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d775a720ee867d28739baeb48b4ad1da55b6068cb4e635255b03d31fc49000bd"; + sha256 = "4af7481914a29c321ae5ef1f6b1a1b72bdb62e0ca595f35f051a3968e0662580"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/de/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/de/firefox-110.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b6fedcc823112d5641453e5a7c2702aed141430be299568158b345882299556f"; + sha256 = "04ed988e98f93a3938f03151e6df9594def3c406473974993223f907077fae18"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/dsb/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/dsb/firefox-110.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "32430f2fede1c15a0940a3d6793ce62c2e1a8a588556fc037f6abadbfca9b793"; + sha256 = "c44401b4ff9bcf06c41723de20278848c1945051fc8ddfd7031bdc3d08a27470"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/el/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/el/firefox-110.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "474aee143ae3bb9428f37b58d3956eda03290c66d32b9506f072c080e8947d49"; + sha256 = "41fb2592795c60fbb9af77e880e97a61055e9380b01d1bb7def76a1058bb741b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/en-CA/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/en-CA/firefox-110.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "118ff11e80902624afe7fb0d4f8b813a0c8bccb0aaa18816349f160f5a4db034"; + sha256 = "a549401e7357a0dc505342183a8c0f20a220e034565888d76e63998523c21944"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/en-GB/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/en-GB/firefox-110.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "13308c1285c9c7b2242b569c5f7a234af7014b938506827c6ba16c5a74f154e1"; + sha256 = "a73359b22d92c21c439745b1d7b7c11dd562e9391873e1f6413280aca9fbfcaa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/en-US/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/en-US/firefox-110.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "68ada04e8720d492ea0e3e47a7bdcf9f6409e02ed4000eaf3819baf66dc15097"; + sha256 = "8f7876555697b4f853924848cec86c480fcc7d6374df5173a14d4694d0a26f24"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/eo/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/eo/firefox-110.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "797788a6ac192906e877361d16a9834521a4c3d82fedec15507358b56b3f8bed"; + sha256 = "fe9d258c7795bc543e32df33fc1db4f39eaaad543fc6c06620de2c86317564dd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/es-AR/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/es-AR/firefox-110.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "323763965eb1bf68b80591e39737899bad295115950f4ebbd180b4eb4c3dfa03"; + sha256 = "35b687901ea7499b9d91e14e13549d4269db4ff11aa1c3a4cf7a0b169c781e40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/es-CL/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/es-CL/firefox-110.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "b63e6d8cacf9e5025b91bd3ee5be53ddf32e51d1dda68685411a7b744306f97b"; + sha256 = "fee072e0890c5ce4e88b2ca385177182bca52f21a9e5689c4886a08734c09844"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/es-ES/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/es-ES/firefox-110.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "2b26b1ec4a83966fb9fd0e205dc232e523a2e5279bdd28b108742f67f29401ef"; + sha256 = "9b23c740a58ac3a621d6afefa825c4698d263222a31997b0d1463c13b8a88f18"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/es-MX/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/es-MX/firefox-110.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "6e752d3752fc37dca4263da817f8ba2d48df30548bae78fb51f77336687f5080"; + sha256 = "976be15d7cbd1e6dbbc21cff035b1ba79755c1c7b08878acf73b611d179b58a5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/et/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/et/firefox-110.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "086778327dcf24bcec7488444d647f670d71493a61415fbfd54b9eb14319d376"; + sha256 = "f5aa192deb8f4063888c4539568a1cfe14ac5efbb39890be0f626a44184527ee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/eu/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/eu/firefox-110.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "767667b8919b4e93f08cc61dd7c9fee38cfb8e0f2762c6f7b8d1cec924fdfbbd"; + sha256 = "27a6412ffef8191fe49f91f46981bef4eaafdba51af751b68ca784f425181572"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/fa/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/fa/firefox-110.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "b100933c810cb7aeedf37c8f91a701e2c7a54678807cc10dcdc7e39619c0183f"; + sha256 = "ffa4e932d63aa0609de12194b97e9812eeda9d9995e85cc3571bf22307b551c6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ff/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ff/firefox-110.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "1b435af69429797ff657cd798874cde9e27fce62db2bebeb84ed34e11ccd9cf4"; + sha256 = "e1bc2f4df952a0bcdbd94acd5a4ba9a147ea0625b43f1c2c2516c2033c493a0f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/fi/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/fi/firefox-110.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ceb39147a069a997655b92cf62ce2cf3f737b9fe7f6330dc125a4397cfc13f81"; + sha256 = "f7b426f07cad206f4ebfed3f7572415659328f91b2a892c79849a95391ed07b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/fr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/fr/firefox-110.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bdd9d494c1243180553dd4ac5e07bdf0111a5c4eaf5414cac109e3f381d5043e"; + sha256 = "4724ccf94bec086fd5fd66368b03cc20c9ea07859113c9ae3d36a15aa9fb5fb2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/fy-NL/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/fy-NL/firefox-110.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "dcf1d2de6e6f7e3073f13a4ec35e8fab7b17e3c2eb16b884ae8f54cb65ad9fd2"; + sha256 = "13643cf94fa7ae3ba5fbd44a7d4f7e4d05f0512711f14e7eaa1387ab49a99cf8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ga-IE/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ga-IE/firefox-110.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fd68b5c0bf263cf853672055eb6f5c0c2ae47020c9e7abae94eacc272c710627"; + sha256 = "f91a4493c6155e6f087158ce4b426fe131cacb558ea7ea0e5ce6eff162735f9d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/gd/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/gd/firefox-110.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2aa6a04126d84aea6827ec1d3e2334067dfdf85e916d859c89b19fe067aecbab"; + sha256 = "41a9ef5fa0b2744fb6b92e14e85cd5dc4f44a7c7ce8af98a1a3a918d61dd0deb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/gl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/gl/firefox-110.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a2b35efa90e5660fad92264baed540bb26983eb80c4d5c546da4dc1101f75160"; + sha256 = "788f9d3b57ba76f4910e0d36e6fc85e8fc1db04f5522fe166b3c835281a3d1fa"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/gn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/gn/firefox-110.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "bba1a62addb6f7822fff493b10f2dd2de8eceba78fbc8381493bf2916a37fa1b"; + sha256 = "3dd1a7503e4586da4564ec849abc92e2804967ccfa24c2ac97ed0a950ab8d437"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/gu-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/gu-IN/firefox-110.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "c5ab20cb7bd45a6eef11f9306e3677498a2b7e4576c2a684aea28438077a3ad3"; + sha256 = "3e8e2b6845220caf1b55627e3015dc9b730ab5e3b83c89404a99b7360f635667"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/he/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/he/firefox-110.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "1065459c93318f644e0f014b670d31951a64c4ea5387cea0ccbe078a14951d21"; + sha256 = "bb10af6a2bb65524549d49f4d9ae997f5e76b9fb7319a7c799d40024c9668103"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hi-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/hi-IN/firefox-110.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "7a7654d985ad1c43b65e7ac0a61bbf91365de50cdfa63dcb93f0d76f2a3b6c5d"; + sha256 = "81007114b51ca5609b6e396bb1beb50f4aeb34932996e6af43f2f06081a75a7c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/hr/firefox-110.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "70ffea6fbea09b8509e3cb4d14ffde3e868842038bc0ce92d84b4b64218f59df"; + sha256 = "35b3a5ad77dd74429626d25b8f103f5ebb4e2d6f820f127cd4dd5f1f3935be80"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hsb/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/hsb/firefox-110.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "9b6458f322a22c995d8fded291d3c29343bcac02a4fe05d5869b40b6ec0441da"; + sha256 = "d1e58940ef2a555d4da136faa65f107ed14f2da90581b5a347222f836fdfb484"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hu/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/hu/firefox-110.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "8f39e43afd357795606b02843ecdae313c12aed788ad1f584bee761dce19cdf9"; + sha256 = "4a14463ba65c108f9db55af7722c33a41d3bc818a90006ec0dc8c0a137d8fc8b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/hy-AM/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/hy-AM/firefox-110.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "635ec02dadceed704593eaf0d758ca2ae4280348d61e022c120c2a55e504b04d"; + sha256 = "6b23bd00965e7e2bb456c82f66dc931b93b30aff9f32cbecc548a86c12003577"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ia/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ia/firefox-110.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a579662d968ef168fd09e3ff1e6bf590b29972cfcb204530493cef77b3afc640"; + sha256 = "9b021296624e5a73a039d7eb41e6d8c67d0b29d391ec91f2729f572fa626eb62"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/id/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/id/firefox-110.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "d3daff6b081caeb14ef1a520618d4b30735de82fcc5769b3f2a78b145a62e84a"; + sha256 = "453984cebaa6bb6324bcad3f89816207b113280525e6c551a1f457a66d471b2c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/is/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/is/firefox-110.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "9780325e6860ee71e93ab3c2f7340aaee8c113c90608ed15ba44a572b32ecd25"; + sha256 = "136d6a2f17693569b2b1169b4afa7e4bd073b85758993a82a8807f47aa3c0eb7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/it/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/it/firefox-110.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "f5dcd00febcb098b7e658aa0bf5dd716adb7ed62e3c6db3cd27e47b3653f12b4"; + sha256 = "b68387a725f930a3c8714620a80046f4ad13334046bfe186e5499139e95bd919"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ja/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ja/firefox-110.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "9d01e50c9a868a3e1784a56c98d46e5d73300045f1c87da01bca0afcb13edc56"; + sha256 = "b46a39f4b36bdea5f1084d2c8b61d75aa717e6926c7f343348dc22199b141fd1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ka/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ka/firefox-110.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "36b53fbc7de3a55a76592992406c64a255015ad093dc0ba8826552a2ba05922b"; + sha256 = "25a44788f981a713b66155e17ec3226dc3c7514a1edf4be02659bd43caf7fefc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/kab/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/kab/firefox-110.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2dfe85e6b60acdba2d1bf546067e6d8a64cb04c6c99669cba2ae9f2bcb684532"; + sha256 = "d795e5d2396f24d43f1c24ebe18c1561d391d2859e7bdc6759f65cbab97cc3f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/kk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/kk/firefox-110.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a7de228d5430ab08cfd385c9418493ca581c1aac9aa542427937e43a25f189a6"; + sha256 = "e5bbb12d574c7d6460ebc0d704d0fcf47fc034fbf76e7ecb0780479777490a94"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/km/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/km/firefox-110.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "3f3d4ab4fe2cff4d92e2bdebfc3b01d8b4ceb80579d3d46a7a1644bb90c0f642"; + sha256 = "db19e45151808183201a5526d788d72929f46ad958ab20d87a29792eaf67e104"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/kn/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/kn/firefox-110.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "752470af2f3069040921a7704873e2a41053f8fe874d80cc432822b386fb4666"; + sha256 = "0efce05c5b640d5772a212b82a949c2c64842e85f42c31f3d79b87572afc5e03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ko/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ko/firefox-110.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "8b765dd21952d49205198ab32d6989b67c8342c634d67c7913795991948a539e"; + sha256 = "c83f3d9920ed08763c3a0fed2069e29db4c6bb0f476e78792cf9fdedfac32456"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/lij/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/lij/firefox-110.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "1184c8a41414f8a92ffe8811259086e49b20e324302670680c1b6fa445ca8466"; + sha256 = "96269f1e5ba3753fb49794ec4823283491b4abdb0626a6580b5b3f1efab2c069"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/lt/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/lt/firefox-110.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "078263d1a8c1ec76281be089f949d022991b44ff6ce3d03f79e6e10f1153d4d4"; + sha256 = "71a277cc9fd8a61ba3dddad764b0c6a7fda5dfb6bf2177f8cc75ee3ffacd9786"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/lv/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/lv/firefox-110.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "550d4c73f19efb8aa8d435e9bf651395e1bfba2e34a11190100a9ffe3e35894d"; + sha256 = "86bf2b8b65f515bf58790f2bc30a632cf8a4751f264ec0259b869dc0813dc4ec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/mk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/mk/firefox-110.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "b1ce6af31d2016ee7b91bae37f0592234c897d684b5b74a3c75e42a400d3bb16"; + sha256 = "2caee54fdddb3f4874d808ee7610d64dce438deeec4f030e1675bd1133e8acd8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/mr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/mr/firefox-110.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "a5a5dbda6d557bfc66cb46573e39ed758f7393bf35eefc70859eb8f1a682706b"; + sha256 = "253d3ff0c4e244a10346eda07d63adc380cbea72fa052a17dbfa8af61a517af9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ms/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ms/firefox-110.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "69967991a118fab3ac407dbf8349c6e3cfd2aa6dd1f858bcbc647ad2aeef45ac"; + sha256 = "3936c9f4900488d31203057214c6c0121f65495686c099971cc6f3cf7a368735"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/my/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/my/firefox-110.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "528572edf884be725b14b65f9d7fd549d2efd3d78a4242c4605b73ac8dd922d2"; + sha256 = "04fe1a0361b7eda1b28fcfdf98a581f4a0e248a6db647bbf404589e398eac64a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/nb-NO/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/nb-NO/firefox-110.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6b1819f52a09603e9e8dacc25445cb635e96f08f3563e01c52b5df1397fe32b9"; + sha256 = "41639bb0cbcbff85f2fec3318eefd8b0d643550a1adee4782d5a904372786732"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ne-NP/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ne-NP/firefox-110.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "645c35f6fbb637de6ba1b9e0bb6d71cee1cb0ce1f9132544109f9beb4ffbc304"; + sha256 = "a9f41809ee0526fdb322e1313ce7dfc23118f277c3db3a1e10bf27cd3c47b722"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/nl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/nl/firefox-110.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "64eddb4cb43d45a46b9df2354661367f75dc91047b3f02e520ea1c3f4ed9f6a0"; + sha256 = "09320d70bfa669efe7871cd494b233e2b9fff320077e1304558c3039890884ae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/nn-NO/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/nn-NO/firefox-110.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "800cba266513ce66af2be977ea8747e3b90975c9b7e1decafb214f981188af13"; + sha256 = "737dccedbfbc9d2310a7e6870518a2f77e2b17d69da19a8929df3cd1b7f666b2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/oc/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/oc/firefox-110.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "3f6833e565b05198efe714c25fa80383913e03f94a8e805c1797efe891c259f6"; + sha256 = "0ffa6b471aa356d9380ed5795f4e2b5e47a766d64679c985fe59ab913b14863d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/pa-IN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/pa-IN/firefox-110.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "86fda421422504b638c88d67c8b19b060e741299db7dfc474a547dab8f21f28f"; + sha256 = "c99a8c9ab9033455acb3eadca94cfc5c15efdc458172944802a39918c94f3651"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/pl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/pl/firefox-110.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "1acf4380cd83c082b83dfdda747dc4b5091bd32cf381d224bd29fe11b9c9accb"; + sha256 = "6a9d49716621fb5a04182614265e6dc9c8b52618eaad4498a10b6188f35785b9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/pt-BR/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/pt-BR/firefox-110.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "15f21f70c4ed36bf02c1b29ee7d7d93a30b6775627ec842e02aec4e78b2aa0f8"; + sha256 = "dfcf1c15fc3376da4bcb18d404e3330ad1d04a1307bdf8b5731b2bfbdaf11e1e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/pt-PT/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/pt-PT/firefox-110.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "974f7fb72b6ea6198afcd74f7cda3e2018cee088a001dc08e880e1c4366c7be7"; + sha256 = "ebbcfad6776276ad0459e41dfd15dc5ef4ce2d099ca8aa0d5c992c833224ea20"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/rm/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/rm/firefox-110.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "7489ea896e1f7612e94527302ef02b8e9e9e7c7d2fd98776e4c05eefa1671395"; + sha256 = "0924391109336ee501cf1abf1a5c6b1776ade3ba61fba15f0b4e16fb1db996b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ro/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ro/firefox-110.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "cbe47e14f2305db969c326e95fddd088a38e2d8c198c8ad90ad8a28b06588265"; + sha256 = "ac1ba842e7f9cdf86f5d9b469b8621d683e7a5716f05871b761520a8bb3fdfee"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ru/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ru/firefox-110.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "66bf47f2b2972fcb089569c3064e394b77ed737dc2d97b76d3a4718484539bda"; + sha256 = "d298dfe0e446e438d900e2501a9efe70c55f843d9590bdb4f65e3486807bb7e4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sco/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/sco/firefox-110.0b7.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "5b122c5d227f617b6b4a0508d454a5fdf32a4338644ef905718c003a0e8913f7"; + sha256 = "85c4ae41383c4686c3ccdb143e789414785189c24dd1aaf52ba0c8b69cc65862"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/si/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/si/firefox-110.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "d68852c3d719dee2f1d8655826667dfda650ba227950e7678834593c8acf3f83"; + sha256 = "f57401bb72a03b9e7676ed6839ba07eac65201a7c368122d3174bb17abd0052f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/sk/firefox-110.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "c8c3153072d63fe00494690fea7c55ef6c04911cdbf2473135d00c65edf2550b"; + sha256 = "790ba626a5276bf13314ead2f8134809d254d2daa471cbb7139e79d2638f862c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/sl/firefox-110.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "fb7f97a2edd3100fb3124bf19a6ba31836343cbfe4db5c3a60a97617e700d5ee"; + sha256 = "c3fe71c0e08a4ec80384d32d04de91a6717f397d4a16ab357d2e160be39e62ef"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/son/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/son/firefox-110.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "8e78110ed2cfaffd2ba7d4dfae9b2dcd59106d3d4c763dc6ec95b50938a2ce1e"; + sha256 = "c43f935f36a13d4405e84888849fa65a74db46170e7d70e8168513f0ed5a1293"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sq/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/sq/firefox-110.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "b72e721424df588e738882088168c129d71e04148197cf2736a55f077215e2d7"; + sha256 = "a32fdc9295de5af65212232afc12a5551353bbe883603bfcb3b7455b5d724bc4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/sr/firefox-110.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "2bc67362e7e4baabc9d12bd8f7683f6a8201b74dbbff83b5d3f0035c4dcbd011"; + sha256 = "7ac06bd3e9d87d765f741329dd6123d61905150a895b08391ea9a721b688416f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/sv-SE/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/sv-SE/firefox-110.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "62137df0a8f5f28d5415a65141a9ef9fb3334f428ceff2d0cc2368e2ebe46d62"; + sha256 = "f9b8c7b4498bb7878501a792a9e74a02426afa487df60bc69fe61b3e241c2e68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/szl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/szl/firefox-110.0b7.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "167ae2dd7d0449253fd59f208169d2895c7d204b47b3a712fed65c0a0396bb44"; + sha256 = "7a0ee765684a3a4b5ca72852980e5aa17b502e0536a89f22bd7f8606e9baa42d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ta/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ta/firefox-110.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "700133f0cbce4d2f8e576de2b87097374e24a21ab0ff73d79cc1fc07e10d9e13"; + sha256 = "b8e5e6f76501cf0e6d25df0d567bac8a59da80ab2958f49e4183deaf5f500480"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/te/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/te/firefox-110.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "019f6c7822d8a65d552f9276d481d44194da2b6b6c4d86489208cc540f8420e0"; + sha256 = "af0b910c67ed734fa20d5a4259218352735cac6b8284d5b6a64ffa74d04b96b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/th/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/th/firefox-110.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "a41701983d698ae7f02a99854e3c40a2c8943ee1ca3f28712367e13152baa7ba"; + sha256 = "10df84e1903cf7fb703bc590cf27b670a4778562190914f7d0f4df3894bc6dd5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/tl/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/tl/firefox-110.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "6c28b7be19776c338d600d6ccc1f51821d3a28fd11719feb4cb2f591aff9b298"; + sha256 = "49fdfafee4020a914ab5edbe2b64b907b4195679a065f1c9bf53d4ac2ba10be1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/tr/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/tr/firefox-110.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "8290ab47a1dcfd32ef7824f05852b6004328faeca4f0ce8e2164ed69e2f2b9fe"; + sha256 = "5a266bd815e3c8569d263951bd91b0ee0383ff2157289ee8df4eeaca938bccbd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/trs/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/trs/firefox-110.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "ed11eebd2d048bba7a1671e9b43dc09da712d7535d8ee010dbda5874292abf15"; + sha256 = "2eda65562b714f7700f6628c254fbcc526fc938f3d147eccdc2154e42f22dee7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/uk/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/uk/firefox-110.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "22e0597f170fc9ce9dafdaf0f1f200171f1794f4cc488b3481ac73f2de4e8fd3"; + sha256 = "8541334d7bcf99959d944eaa7263000f502b1ed2d0a1b52dff91481cf01c1460"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/ur/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/ur/firefox-110.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "1204d370ff90ad47e376f4e49c090a72c00e75f3966163aa5d8522f92490cd32"; + sha256 = "dc0eb2f604c869b45c247f65f62b5f7c5982f5ec7e4a6f55b901d5ded0f92b03"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/uz/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/uz/firefox-110.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "12043a8e7803af1e49a6546b104a79d652e2e703f3f704e2530bcbe315a26d9e"; + sha256 = "8ee65711e182478c360e988b9d1cbb8636d737d961817f1bfb2f2dedd38a36e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/vi/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/vi/firefox-110.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ea306e85e24d3b34093a894c813b2524d7f2200ff09fc2c26c815e244720e7ff"; + sha256 = "32b9654813638160541512f03befb998416ad142a0f12d50bc02d75b646d88d7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/xh/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/xh/firefox-110.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "34c4063edd0bcec3850e0fc15e9d948863ea3b34689738f90ee5a7796b296baa"; + sha256 = "5317f9ada8234ff2bb305c8536d7aeb6b38f6047e8ef7907f1e01d60773e084b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/zh-CN/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/zh-CN/firefox-110.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "5980c6f932f2336980f8fc613f065949336df40cbf1ce92bb2f8f9c04dec41e8"; + sha256 = "20768d5d4943847fcbe4c8e549af0d03383c4ad20909b60421afba97fd3b5446"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/109.0b6/linux-i686/zh-TW/firefox-109.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/110.0b7/linux-i686/zh-TW/firefox-110.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "8e726dae987f0ae4793757f763268b1d375e69f324ff5e9ac5dec2367e1cc3cf"; + sha256 = "ed538524665e72125b820c4eefb5fed8983f84f42d7be65bea7c3915d9779002"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 5996ef9363..d0ea4a8b49 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "109.0"; + version = "109.0.1"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ach/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ach/firefox-109.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "062f6070782a197d5509b8bc046db13f72260eb45f78a3a33b166c29af2c6438"; + sha256 = "08fb9040a6681d54863c2ac8c8ad48abbcfd5b410c8e404dbc20f425a69ae8d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/af/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/af/firefox-109.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "56fb07597494f85547b279e65222263d103ac2bc78901c3722c59f12d769c47c"; + sha256 = "20635ad665612d861c0db1f65a9b1136709e88ed689d2e2679b0560d66462df2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/an/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/an/firefox-109.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "ad460c6b6b64401562359f6ac7664dae5c87bc51ff5b5f9db95b117ec41b77d2"; + sha256 = "8c9cfd7259112727f149ae26af915e6fae9e35f0946ad052c348bc491d712651"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ar/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ar/firefox-109.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bdc967b1d2da7e49f0313710a2062a62ffd14a0e3ab8613049909c9a07a3980a"; + sha256 = "0541aaa6c8c01ad265309d5cb2a8ff886456b9fdfe2d91c86ca7fca2eca4ad5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ast/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ast/firefox-109.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b44fe9c2a93d68fd6a20e9f6000eb81635d9bcf78b0f97c526e3e7f216b2e249"; + sha256 = "0cf0e3dbd210aaf5c86620e71ae692ff2afe70fc4c23ff74bbad6f2543f1747f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/az/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/az/firefox-109.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "d9f78c078b1d34928ed6c18a3c0413c6f079979545a381e001a851cc792f75fb"; + sha256 = "d241210ca9644a4bb285019b1b0df189d741330b45796b33f0ec304f2a994781"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/be/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/be/firefox-109.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "87f5fa2f8560d9f68d8d4d77d16fb3bfb20287c87769065625cd319941cede8f"; + sha256 = "1b6dee177af6899f90e37155a778db6a574aaed5bda9b17d447506d33ded9e68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bg/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/bg/firefox-109.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "106d7c1fa3d37b16eaff03503e03dac0bc503d56ce49fc3718417ca3bfe1ab85"; + sha256 = "312ef6862bed28d9e7f1672d9614542c977c03dee68823b879087281fa294e8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/bn/firefox-109.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "bc9be31ae2e0c36417df8c86d85f69e22c17ea1b193b214f75137de31fef6aee"; + sha256 = "a3678a881c81a74f443796662d98f516a9c38067864d14064cc8386055d88684"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/br/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/br/firefox-109.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "664fff02c73dd60df2c49ebdc4cdea3a09e999f956dcaef502561dc33f6b4ac2"; + sha256 = "3f022392be45e43edc220c4b27c027f80a157af237e94c5ca3bc201f1e43e581"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/bs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/bs/firefox-109.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "547a8e9b82c014ac7098a1eda0900cd3725f5fb185d66ba2beceda1d97e79fa8"; + sha256 = "1eddb9e5fc279d5a265829ede15e09a7f254cff0a669457486f8c350a3709753"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ca-valencia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ca-valencia/firefox-109.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "b995776faa868cd21b1dd7c8bc2e8e6f17a7c9f032c63c3c259b967d3192ea4c"; + sha256 = "7ec65537c9b3a2432a5ee6b4491c36bc4735d0953c47fae62306e4701353a698"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ca/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ca/firefox-109.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4adbf820fb10f4982294840549ce98e87ec2d65e5b2c693e6d05c0c330167d8b"; + sha256 = "e726e7df71d65170fa9fee98de05aa5b5b6d1a3192bf0aa49f76a5a8fa2fc0ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cak/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/cak/firefox-109.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b6d11e53a0163e23e3d6519d411b63476cb4cba693df7b41214ca60c813bc575"; + sha256 = "2722c5eed7b3e017cd8c0a626ee41190e0b9ec44692a1cd8fda1d27cf741acde"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/cs/firefox-109.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4163fb90255d52d860c17f72f7787642c6ff054c169aa6f2e9c6293e0cde109f"; + sha256 = "fa2b9278c64974f8ed61b58ddec23c7893d6b473ebd29ae900f45076944cd484"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/cy/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/cy/firefox-109.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "dac9739e42d38bbca3627591aa2bfbc6655dcc2347a6696d96f040362f56fe68"; + sha256 = "ad6b74b20d7b4ccf7bc858133fe0f35fd7239d4eb09aee310c75828c20face8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/da/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/da/firefox-109.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "793ad841ed9da31087e42363878af022fff237a6281a711736a70e732b588de4"; + sha256 = "e8a0fba66e139ef6632b845d6c7ede425a28ac18afd916e0ff4fd89aef313578"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/de/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/de/firefox-109.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "e408d6f72760e031122fec82f3d8dc21b622128650f1fc8ff811c3c696e3c48e"; + sha256 = "1688dcf426f9349a0a89e010dfe73ae6e42d590695b8955a257ff1acaf5ec95c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/dsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/dsb/firefox-109.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "ed4e02c2c324ed25cac1d6cc654d62b5b22670be82dbb3e415783af0e7a7feec"; + sha256 = "36c8e7c90e7e418ca96a2a09f85ab78e45ea733369c2f1125bd100179bada452"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/el/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/el/firefox-109.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "3396a7d6d938cc7793bc876e313dd6f57c60042f93883f7bd3bbd79ef97e7e3f"; + sha256 = "5753c87b6676e2a21169ebc4748765f6a26bef8bc739a33da6421be6e0f916a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-CA/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/en-CA/firefox-109.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "40eb2e205a353daec0e0f07f12633c2aba09cee6372e8e3ed78cceed96611cba"; + sha256 = "5438c21484a9de673508f8d63fd61bcc58a3703fc1b1cdecdcaf30f8eac8d844"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-GB/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/en-GB/firefox-109.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "947b937d27c138ebf79377f17ac9cb5fe89bb59abe123a45ca1c050d13e439ee"; + sha256 = "bd19d96501d872f004b8226acc929e41fb4ae4120b287dc3504e1f0c6f733e8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/en-US/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/en-US/firefox-109.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f19775cc6adecc529003ba0239bd46e94ca70a866f19b071a367905184f6d4f2"; + sha256 = "487a18ecbb0b3b91e402b55424f429d2e4e6127696ee48bb0e60ce7f9879d581"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/eo/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/eo/firefox-109.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "6a868b2c8d4d544d69c8d3544927b2ed5f478d14d38f00854ef7d7fe3c1b29b0"; + sha256 = "a1f6f5b424d026f4e59f51a0e5669bff1bba225100673e12595ac263509ffee1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-AR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-AR/firefox-109.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "81d80d069e36f108191f1072392b438ea5eca11205b9a50d6fb1d2f550c569cf"; + sha256 = "5aded9fbe24aaf8944fc193e507cf267e964e935ead5a628d6d8638c18caa02c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-CL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-CL/firefox-109.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "57e2647d0d3b5e3e7b593a0cbb260b1927475cb7ec1f401b0f39e772aaf76570"; + sha256 = "bda21832e8f1a05266000cd730a7698f99507e536a1690b3b69387640999e3b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-ES/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-ES/firefox-109.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "6958018e306b9d64a2f23db4f2ff9cb111123573e6bdcacb8789221dee7e269e"; + sha256 = "23b8e0f6fadd1523123993469c4919188166b2ecf97cd63c36fae816ee50ebe0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/es-MX/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/es-MX/firefox-109.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "bc69b78e261368d51034daee9d374e38241e228102889710b59af48afe0c9aec"; + sha256 = "c8ec680aace4a11ef6eb921466ca449d6f9f6cdc5f90ab35bd4d65a650f0322d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/et/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/et/firefox-109.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "7746ef524a271ed1095c1352b4da1edfc65a66a7f14fb164d90771fd5622d1d5"; + sha256 = "c80e1e1b9c608c9757b25ac2482ddef919fd0a6130fc11122cd9d8d975b015f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/eu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/eu/firefox-109.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "321e106491e39a0cbb9f0221a11db8cca1792d3f6135fc52766dc7e4a1adc243"; + sha256 = "e74d5916170b90af04e27cdc1a12ad0cb4037bbf56944d41089c58fc5d731a7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fa/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fa/firefox-109.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "23adbcfc211c0c16a23c5cbd89e0d42845c566a5c3736e82d2a5ff67ac0b6e11"; + sha256 = "4d22b6c6e8e197a431b7250f864837aff3538f094fd8c58179e92d00e3f52575"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ff/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ff/firefox-109.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "3c7205f0be5a6018c7fd80bab737233d3c73f9013f2cfe819f4ef9633a264c7d"; + sha256 = "9569f1ec1d42b743daf74d671e42cba98cdad204ab4ca1c2c69c5c20b73e3292"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fi/firefox-109.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "11ce6ca3943c70c8d4f66fc600ad0fa16486739894c5e0621b660067daf06f25"; + sha256 = "3b4dee8164333a13591ef238d7e33dd111f5da53975ae3cf3f70d1ad852f9eb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fr/firefox-109.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "3f39b2aa077f059c63901f530d54bea442dec7ad28cecda60571f9266b48e63a"; + sha256 = "4731923d8ec31c32e9d563e991ff4cdef6b36925a482b2b0dac43aa3ca17e1ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/fy-NL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/fy-NL/firefox-109.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "9240fcf0840dc078a9076082dabb46bc16ff02e37de948e9176b6301b4b95bb3"; + sha256 = "ed36d87989fdbab969463b439a6a82a15fbf5c986942d92bef634722127b77f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ga-IE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ga-IE/firefox-109.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "92e6e5a5b1635aedf7be819e0ff31746e9b3b18ea1f7c37dc149f78d806c466b"; + sha256 = "49b9d7741cda331568cf660151173b67b09e2bb559c4c8b5398100573629bfe6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gd/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gd/firefox-109.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ff0607125dc57c5c5dffd89dfadfda99ac9a4274c4db2fd69f99bdf238bdef12"; + sha256 = "c4523729d1a51b91322fef8b8d0d7709ffd3dbc74da6ecc019c3e19d1b5e5fa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gl/firefox-109.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b1555fe9a0fd4fd9cf0d492628f88390bed5e1f97ef7debd8ef9fbd934bb2e48"; + sha256 = "2e989f3a162c52deaaf66e3631b33a275b906c402d2ab9025bba99ed1d76735e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gn/firefox-109.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "61cf8d06dc696fff4d2702c9e051e2b6139b74befe8531320898112e6791e350"; + sha256 = "aeae4daa675292d4a578d56bfa0771b02f17166747f377e2205e07ad6e11cc87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/gu-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/gu-IN/firefox-109.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3d81bfc292238dd2f47562f97f5712520d3d48dee7a87f97214015920885c44c"; + sha256 = "215e062675cc04c904f1f91b539c1653ba5585c030446429b63913d92b3c72b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/he/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/he/firefox-109.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "f7f8650b94144ac7aca761df3f89f817b58f514f711c42c4d4f56b7a5ab0f028"; + sha256 = "9c48fc2af47849bbaa958f839b25889159265b4575d286d28d2c67382fd7c2a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hi-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hi-IN/firefox-109.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "67d8a5d54a07a27d0929d2a1f71780b7d80c44bb5e0ff6e5ffb05f10f112d5f0"; + sha256 = "b57213ad87c537626022504065209f7ba561bdfd7eef621e49d47db28cbc35d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hr/firefox-109.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "856bcf27f0c2b0c01b91898624836a24fc649e8dea105c3d3d86da14d18a9f68"; + sha256 = "49682e92d31ecd5c3690c30f756f719acb959440853abb3d42d6e87a98e8d9f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hsb/firefox-109.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3843d0d353d7514af25c16509584ecc317233d69b02ce542961797143ef92417"; + sha256 = "c1971514830d0c2ab026044cbbfcad679f82c612b2dc4d36604b9c6cdb8298bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hu/firefox-109.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0e3b6e9849ff77d992868f02fddc44f88da5c15025ffa060a77eec6cf9fe9224"; + sha256 = "a63eab963d13bde89cd6f52f5f7a35946d9a32572c6a7201ca7466a679ca1dcc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/hy-AM/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/hy-AM/firefox-109.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "5b506130d90add811cfd56f8fee26348aac2d6f93a2807a47126afc5472628b3"; + sha256 = "c563456845b5413fcfe160f23ad0d6c6d92c540a7896c6d6e39ebb61af0d6295"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ia/firefox-109.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "98859afffcbdc36a712fd6cb8cbd4bc12e9b61948fd5b4cee719656973326f42"; + sha256 = "f9af71feb2085290fbe2f3de3dfc11bee0d0ac49348268675a5f7bbbbce00357"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/id/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/id/firefox-109.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "98b6fe2329be9c4fc275980672f31ae9d61483d7e2ef850856ebd3fc6e90fa10"; + sha256 = "9996428d29e3705cf35e060f860660778b69e726cdc57e2734a42d449c43ed4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/is/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/is/firefox-109.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "0f699d8558b08864174fa7aaf5beb0ad01cda7362b9cc86594283ef9ca4b0138"; + sha256 = "a57421ce14cb264da4d8bed35dc3d0f742a15870d65548c7617fcad67a3f50cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/it/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/it/firefox-109.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "2c113a10dd45abd677a7abb2b1c64a574d19845c71761e65d44870ae2f593c5c"; + sha256 = "e2f537e79f258b6ecc03715bd18565c18c10332f836ae8582e6ddbdb567e96fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ja/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ja/firefox-109.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a6d1ee0307afbf5fcb6f0ec0c899a2ea1ba67cf548f98c2d508d54c72a88e7d5"; + sha256 = "757ae63ab1d7aef781b24fdcd779aa84722a4dc0b52c35e7938158dce2b56fa5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ka/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ka/firefox-109.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "7edbcda348b7d51378320d7681d591930cd963c00fcc2b80c22e4902cb30787c"; + sha256 = "ab985686cf54f50b6cb69e63d121a71c2aacfc4b1c4c22d197e0b6b4d24fd404"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kab/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/kab/firefox-109.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "74aada0320298c54f607b3096a607fffc8aa7de0015b353cffc1e3b27582c4cc"; + sha256 = "e423f60a7c486422a4583dea6f454c8f43ed67cc3ebada7ee614465a5dde2871"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/kk/firefox-109.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4188205963323b35fc89ba17e0fccefe3df50810d7954201a973262f303f5ce2"; + sha256 = "d79b6d73f0c01ba881ff6ab63a243955ffc60428ab6f3ebe1d8ac2890bfd81f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/km/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/km/firefox-109.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "f1a92901fb0c7835ef9112f53f4109b6b82dbd0a571fcf021e791a12f38f6a93"; + sha256 = "afa093cbcacccf5e93b4305cf4cd6ce80b2183e11501d7fded6ed71b8dd61779"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/kn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/kn/firefox-109.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "47a348c1e5590ba65773fc586d95516c108eebd44a597875a76a4b8d32a4e075"; + sha256 = "9bda025646837a816c5374e09ee0f6b8b3fa4401adfbb4c79bd37b9b004c1388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ko/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ko/firefox-109.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "ec61b0e9f07146b797a7f224fb83a1e50751b875be0331dade5386eb916fd3ef"; + sha256 = "3f56db587b78bcf927df9f7308f4eaff8087bbb6008bb7dbc63e7cdcf4727c86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lij/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/lij/firefox-109.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "2652857e6007ddbb127aeed33fe6a4bdba8ed44888aafe764b81e8e150511bc3"; + sha256 = "75da1688b606f59513e21ab86775fc8cb35ce84e09bc042c6486848489e022ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lt/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/lt/firefox-109.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "9163745ad65e5be8d030eae894c6f9d27960abe6203649f3f18add16cbd298a9"; + sha256 = "232bfb865f1c25c8848bd8699b91e2bce6832ea82ae2e2ae647f43a83c828232"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/lv/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/lv/firefox-109.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "87ab351a62968471dd16fa4949f0e8fe269223ae03511c03e99b4abe03d6df72"; + sha256 = "d4834008c21d312286d6b9757bc2b61497d987451245445919aefa4a1ab91be6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/mk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/mk/firefox-109.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "533a3f586cc7c4ca38d4fc8c88c16b9595d859e8d3972387677b55cee603aec1"; + sha256 = "102169bdffa3fbb210d372844caff0fd010511fcafbae16b89453751ad9f7228"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/mr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/mr/firefox-109.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "298f5d07eea30a8dfa5e16b08151c459f72e24a0c17d6a2f8baa842483a78ee6"; + sha256 = "af85561d4db729c04b973f8c74bac790275913586c0cf5284e243c0ddcf45ad1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ms/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ms/firefox-109.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "07802a9e8c4d9ca8e2a83eecf29979d1c3123ba5f0c280017d0030696477e605"; + sha256 = "e98ff53a524ba73184bc395c25ce110ae915846a44e0ba8d8a6c594d5da33bd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/my/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/my/firefox-109.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "077ad784cbcd2a3663e4c614deaf921d66681ec5b21d5c5e759fb074de17b259"; + sha256 = "82ef41b18753d8c2203fbaf3cceb0d1bd179004113db40079a75488b3fb7217f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nb-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/nb-NO/firefox-109.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "51d7c62bef495e4ff9e6261fd15001539a104041716d4a97f3195ecae479b233"; + sha256 = "daddf9f5e0e9eb654af24dc2abb210cae97e37faac8af56746f1d28f5dddffd6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ne-NP/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ne-NP/firefox-109.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "2fcb5b5b2c7deaa17ec65878243345fcebb26b38b8d267ee3881f366829f86da"; + sha256 = "f1b97800986e546fac4c08576469651ef0c0f6e8729b34ec5b1876208c788876"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/nl/firefox-109.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4412f358192301406602aecf7341e64ae1e4909b4a0e80701fd73c0a561ba092"; + sha256 = "30d2badf5c909890877c35dd1a397ee7947546bc97867a1369572070c3c421db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/nn-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/nn-NO/firefox-109.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "8116120da4d557d412100fe5029cc338073f5070d90cdb3e0f9b49242f66c668"; + sha256 = "378bd3b106f63e5ed28ed150f83befb1ed0624dc6d977a56ca70d7b53999489e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/oc/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/oc/firefox-109.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "6e4115e51ec23a42ccb7f6f10caac0040d72d4448141cac68ae8f24b1ad90504"; + sha256 = "bb6eda0d45cd29e1438034a1f62422da500ff8db12790eb140fad34fb504dc22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pa-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pa-IN/firefox-109.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "640c20ccdeded7f2a25ea0ab72214a4b6f4aa2d937de24853886653684d26b8f"; + sha256 = "9537fc5b350222c8a44da6387902cd7c18ed1d9a0dd45f65ca996819cc88ef21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pl/firefox-109.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "9ac0462dbb62901a5678bda5360b417a56bbe74003e912323ed1a29661cff1b1"; + sha256 = "622adb3bafab1594166856363d317d9259050c935bc6b2aa6298b664b9a8e80f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pt-BR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pt-BR/firefox-109.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "593fbf46826fb0726b25cf1469129d7c3db274e2137966e49c904ee27109e0bd"; + sha256 = "cbcdaa340edcf86abc9997c7bbc8eac879e7ffc93d9351fb1ae2c133cbdeb56e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/pt-PT/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/pt-PT/firefox-109.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "b96d176444864c0a4814936fa5b0d67fee05739339a5ac01d76735bcee9aeb92"; + sha256 = "d5662ca239edbeb332308465d16cab2371da282dfbc750657ef3edf80030bc4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/rm/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/rm/firefox-109.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "93d375449f6f70b4043790cc66377559d85c5c6039570701e8435cbc76038e72"; + sha256 = "50db6ee90b2197bdd6a24a18722ec645844898ed0fc1551a22a0837a2ae98402"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ro/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ro/firefox-109.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "fd032aed6dcf2afee5185c68e4661077b12fff708ce47147b8b297886525fb9d"; + sha256 = "6a8c6b76ab243da8317d1f1ce26c4d325b8a415098028f6162dc3523e78c0f32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ru/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ru/firefox-109.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "828c606c289b7ce94417626cdf114fed256a0cb247b3f06c46152db777324805"; + sha256 = "7d026e34d5bf90bb68e6f14b6954f1b7f9ec132d6a11507236fe9951301d7ba2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sco/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sco/firefox-109.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "0a400cefa3363f357c53ede79d9538fe01ee03b1e6d1a6c9ae67b3ad32207ca7"; + sha256 = "457fe129188f2abcbb6cd1fde7fed8947b5ce3367bcbde11a6308ba9f769bb81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/si/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/si/firefox-109.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "e414f9004ee3ea08c7f7b39817188fe3e3dec51b2cc258b2a8ea28cf273097e3"; + sha256 = "bbd6af1251c794090d01a0a07fccb648b8b4e210f9991a3d2937d1e663e99df8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sk/firefox-109.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "97da979bde015cf37c7eb45c78e3abdcf7ca7d92b56c322982d8574c1652b9f9"; + sha256 = "ff93a35e6be55c2a05e061d3b2c8e738a1f408d2876436c168421eabbbd9d40f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sl/firefox-109.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "016347c5c91e3ff2ceb53782121d8cefa2913464b3876d351cba418bdfe2b30b"; + sha256 = "81dded9e76f3a95d5182dcd106671bf864c33221f83b90c338aa16c72b7edd7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/son/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/son/firefox-109.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "7a82c207a3ad9b1a23e3885d94c7844714a59e74ca8441894da6e3873184cc46"; + sha256 = "d70271b8199efc1507c08eaaf96b06523dc9bd6689a3884ac556b0e3a252ca60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sq/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sq/firefox-109.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e89444502f35cba552f7ba907fe2ab0aefc9e32cfc9f1d1c826242b131c0a1df"; + sha256 = "4a264563aaa4cea44e54ab9ebc528dcbc241e41e0a12d3f256b2bc15a365965e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sr/firefox-109.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0d6ac85cd35ee3dff23a7f0d1b973acda106516ef81d6b6e1fc7b6065a61c03e"; + sha256 = "ad119b58327106fcd2154b56952d746add490f77a146c7b7beb44310eabdfa80"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/sv-SE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/sv-SE/firefox-109.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "617d72496a921013702ac3a72c6fbedb8fcb1da2a07f674c7ecfe984816fd783"; + sha256 = "34a6c91de77b89a781335c3e56326fe84fa214e7d847d6450eda76cba8479de8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/szl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/szl/firefox-109.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "44bb46f6e244f9ea94458ad84dd37545f4d5ddf3b1d7c345e61f256a1a9c8a6a"; + sha256 = "ef83c2facb462e2d02f568bb4f01817715a5df53d8ce248a222d11744e863f65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ta/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ta/firefox-109.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7a36826a160d9de16d87a18dcbd7ac8106dca32d584d79a3eb8c0ba93a06c345"; + sha256 = "a01a5ac21e4089c0a7e2c4853166f6f48f7e14d4a6a28b13231bb9afda951809"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/te/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/te/firefox-109.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "34fd96347fa0ccda294a2194a4da6f570fe04f3afb19f99369c150273be59fa0"; + sha256 = "a565cec206c2f692e704b7c7264147ce45452c82d541132a422e4a3224cbdcfe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/th/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/th/firefox-109.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "13e4cb908566d2a0a928df5832f704e4f5d9159bf187b919de05e2ef7dbab6ea"; + sha256 = "3144b8ee44c820a09197c45c4e40918283c8a7ea98c4a77f46b827cd2ea15820"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/tl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/tl/firefox-109.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "67c3fa7c129d81b16ebbbe422361406f63160f5eb0a896237bc2f2b0b2f314aa"; + sha256 = "dad4a9b1658f4eadf87ecf14156c19767294e7ce3fc9ec265d2d11cace33ab3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/tr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/tr/firefox-109.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bba8a0982c65fec9dfc86bc8103b01f5a120c199bcb22ecf904106c270686d40"; + sha256 = "1659934b3db55eb38c5a40201b111ef4e86b7ef4d2dad3e9e4528ea28101ab4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/trs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/trs/firefox-109.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "452654c105453ff942cbb5a893b411d494fe51cd96a08aaf7a034b12859dfdd3"; + sha256 = "9393d4ac66d6f4f23426f7432febee1498373dc6ef3b9395316a9c2fcb9b915e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/uk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/uk/firefox-109.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "8f4f152b50df0a968fcaf0d9275b5dcf05efa98133133797874cbdeef1fb6b48"; + sha256 = "22f8886296e49d947f33f984688af663c9cf13a7afc473976e9975cdd70e67f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/ur/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/ur/firefox-109.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "152ae600ea8afc8314eef375436eca52045f0db788ba19142f07f330a4a13445"; + sha256 = "883271dde81dc06893d76d65b394e639ed74bada7233ddfec015c5a9c76bb9f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/uz/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/uz/firefox-109.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ad7863d60cd8cbdb5eba0eed7d982db15e92a426ea2e403cb002c71b14cf540a"; + sha256 = "bf71ae490fcd0c1e03044308e0322b993238e679d1b33f2214ccf40bf03d9075"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/vi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/vi/firefox-109.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "32cee9d8f484735a3bad323b2a37fb2fc55dad88a4a493eef777473b56aff922"; + sha256 = "07ab60fbc7a9422e37e2a606962b4f52d047a346d1560e7d88a28c58766a1cff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/xh/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/xh/firefox-109.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "00a6d3877213685e35d175df3684b3024a3e0fbc7b284b1cff8ea25a1ee4cb00"; + sha256 = "55a4700c96ff4b73643422a480546201580a0cbd8314434f3a0064f992ee29a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/zh-CN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/zh-CN/firefox-109.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "75241d745d714ee885d73c802900be3606d236aa08683b4ec56887b918555a2a"; + sha256 = "645c75f0f4a39370966c959bb81bdc1f512b5c10be7d66081dfbafb978ad2851"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-x86_64/zh-TW/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-x86_64/zh-TW/firefox-109.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c0ecc79ebb0a989ee976f5c2c9fba5c4d63bf65706635663e2cb83667f7b8a38"; + sha256 = "91f28d74e5c626b0e2f540aa2b0a0232a9f27786a296f4bd2b4d72d7faf09b22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ach/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ach/firefox-109.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "319dcfcd2957576f02bfd28a192daf0ce87bea110c782890c4f1c7dec05d591e"; + sha256 = "7c3b5a5fd67548a8d56faeaef023f34eb7a7853e2d9f18628c9588672b9d608f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/af/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/af/firefox-109.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "14214ec48f3aef6381b3a55827d589505236fd9120df43486a39775aaaeba43d"; + sha256 = "2f3221f6718981b341655d62913f7413b75d41721ab002f3bb885dad4c40f1e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/an/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/an/firefox-109.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "5694505371af1b4589abc4038f7cefe2650b9eb78ef546db83f886ef3ccd6a77"; + sha256 = "7d573fa13a00c255c5c449521162ed85c733e9648c0bf929556bb97436cc12d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ar/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ar/firefox-109.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ad21038b033aa55b7c520712f4aab50471deecc681454c7a1cc97f7604444878"; + sha256 = "a544d38f3c4693413ff3498dd6a89766154974087f966da061a9a42785e85682"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ast/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ast/firefox-109.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "7f7ea232c8249535b4f1a4f0443627f115740a39755c43e3b296da494c1705ef"; + sha256 = "325b3237da08fc1a637c0409bdb43161781c1fb7ebc811fc3a477372b34eba63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/az/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/az/firefox-109.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "a37020472cd15d7ecff01ab0a732d26557a3ee665465c54f1e6d623a213f3685"; + sha256 = "ec6800b785fa3b8f4b7c2ec0bd4fd7d06e265408a12ed791ef6198b0c1786255"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/be/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/be/firefox-109.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "dd7b9fd2d267b503171d3894c238db5cbbbb003bcde623700abd8ce0d81fb8a7"; + sha256 = "aff9ef285a2b08bb3e516c30b85c6479d935cf40c998ce88c5410de077e42723"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bg/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/bg/firefox-109.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "c4de3366f58998129beb1def4283fb28bc3b90464a090e3f71198862a8b4af7c"; + sha256 = "a27357ac9c019efa327406f1919eaeb1fa5a8686094026935283df4dac50e96e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/bn/firefox-109.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "30e97ca633178bdd4ef10103c5b7795b0f7f5bc97cd3b3d4e2fd01138ad79fb0"; + sha256 = "1642db7e385512fbd963b48bdb38a1780cb5d4be98e30727d6d2df751fe262ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/br/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/br/firefox-109.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f4ed775564c26f45ec26fa7d1b440b30cca17849f144031929cbe1526f7c630b"; + sha256 = "9bd3bb35f392512f77013068b3bd61eafcc08fcc2716fcc13a996b54f8881469"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/bs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/bs/firefox-109.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "d568367dfa066d2b5eb7ab920fd16f0a66de02468cc548df8883baab27ba4e5c"; + sha256 = "8fce6f5edbe7996f8d31478b276d6e80b556a01913a158d403b8790262e26bbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ca-valencia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ca-valencia/firefox-109.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b33df0c70b943f857df218064db9f20ca21381f1217322dbfe4e6fd4f2902d95"; + sha256 = "fd8fa093fdae77f9ed588543d7bbf00b1369ba5e469199cdaac2bea990be8d5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ca/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ca/firefox-109.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "78b1e2ed95ac41994e35e94d3df2a61306e24268be86c587f6a7cadb5c62b65e"; + sha256 = "5e479179164485d1e4580dd9f25257067e4ee30ce00790f722f61024c5cc0e8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cak/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/cak/firefox-109.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "2b9210305ad57917402d0a1eabfb188b70f582c44fbc67b84d09d1c23e18988a"; + sha256 = "00dcc222d9bb3a2e68ecb8b61e04471f03e03df7e171b03c390487a66745bea7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/cs/firefox-109.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9e4ce61151c0ca0610c83d734bb619d4dce26d40efcf6efb54e42d467a5ae2f1"; + sha256 = "62a42f71706a8f02b2165603ad9ad0f6191fa4e2278ac2a09d8337ae1ae809a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/cy/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/cy/firefox-109.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "5cb9864ef458ef304b7a6b40ad71d8131f1ff3c3a215cfeca4e811e14b362927"; + sha256 = "36afec95e09e29150ac3d6f2e75e451541ae5e223d438a3c3917473ad7d3c8a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/da/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/da/firefox-109.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "0e6ea695300e68b8b6385e6a5e4022e645133ea1205c7d902ce898d59c913cc9"; + sha256 = "03f36a41a0fb306c26da2b9da19ecfaef4b78b7891dcfa23f7d95a334cb7fc39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/de/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/de/firefox-109.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "8ff84702ee8f877d9628d96d828e51e7e9cd333307df8ddb2bbf58d5d8805b78"; + sha256 = "d9c4c368d31690be710648d41253481bb2f9e590d10bd8729a06a0c00b1427cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/dsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/dsb/firefox-109.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "efe721496f5d5567d7ac62d19b0510814c20b6e503c15c1740d50e7fb1a41d44"; + sha256 = "3177bc793f513a2e6a52d8d8a5dd45f0cb41257e524da9e89e292664dbff8cc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/el/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/el/firefox-109.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "95a87e1447dccf05fbab815dcebeaa213501a81c8dca244a2f63a1da300cc22a"; + sha256 = "b25dbabf9ef58de514edc92130f6ff733aa6a0d3b4b2f70e3b72c54a74a37ab2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-CA/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/en-CA/firefox-109.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a1d3e2f468c8c0776151a7776d6201e39beb37ff845825b1a031b2cf1a04a0da"; + sha256 = "0232243fd6bac40efd17f71295f79b172119ae58d277f3d8726df0fb7913afca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-GB/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/en-GB/firefox-109.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "0952eb1ac27fa387678f1d9f6e64a718462652d823bd630ccb1ef39f26369270"; + sha256 = "4ecd5a129e40b9938f4c245616558e61f49c602f9257dc32417af0685d097ed3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/en-US/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/en-US/firefox-109.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "793fbbb013c18956806e9e5d1f67de94a649c3cd8d10b3a75bd388b87ddae916"; + sha256 = "4a960f440dd688eace3d4ea57d80b53ab9272e22688e08d773a3f5f7b9d53af7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/eo/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/eo/firefox-109.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "0cbe5fa5f994171a57ac84a4edb9d63adec71bb13709256c99e2b259458eadbc"; + sha256 = "07f66bd4e09b5fa459a29bb5576818437bd5e7d059504e9b0ac8eade2045d263"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-AR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-AR/firefox-109.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e6b717709cf8cc3a5dab27b0c1b9082f6d71da77faabeb13248574790a42e1fa"; + sha256 = "4d4cda4d1e4d189704f3ff43ccb247dd5d6b05ac4d74cf7cd957d0f25b2c8c5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-CL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-CL/firefox-109.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "e2c6016a7e50035e8478fb0eadedd67801f0ded948171fc13586ac46d49bc914"; + sha256 = "48a18cadb63917659697f99872c40dd77c09e62d4687e5e15cb8b791d4c0a2a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-ES/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-ES/firefox-109.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "2c41f6d48b07e054514aba80b3a396b70316f0fefff8c31301e5f44e3de74209"; + sha256 = "9e73d300963872b32ab69c42277ca0451c9e0df0ec3c7d7ad1ecc47232cd4388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/es-MX/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/es-MX/firefox-109.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b51ed9a76071d56cace6e7aece52efeeefa26dc26e1233fc0e2ad64317c9f4ad"; + sha256 = "2b1a4c7a40a62801e1c5b8592186abf407c4e9c7ce868263b478bc8fb352a001"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/et/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/et/firefox-109.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "8094ece309d8c55bf9432425f2a79f29eee565f7d6dc8080986b088007cfdda5"; + sha256 = "5d0296cfd5a62003b90a8b20baa8bed8edac5a0bcc093b7b99f96db02541bc46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/eu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/eu/firefox-109.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "07ed9c2af5a7e5ce0452e4fa4da38daf3d20f5f4f6f059dcfb4ac3b7ffc657b8"; + sha256 = "0b89fb09487f3ecfeddd6cee16ba4547f0a80e4afd25028b08298507977e76e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fa/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fa/firefox-109.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "0dc870f5bcd2e3411fa6006aed8e2b295d99f6e47e7a3e4a88860d7001401b5a"; + sha256 = "09d98823bb9d81314668c05ef061bb2c4f576476ed74ce58f268f02f3375f58c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ff/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ff/firefox-109.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "c319ac17fba19833d16c96f848e0a1e6ddf717922648a7d3776524dc94140b88"; + sha256 = "ef929810e9b4294e8aa7f3768adecdb79634edca060e028536e61cd4f90b2445"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fi/firefox-109.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "98e907dd0d23b45c5f8360e39642e9df062d6c89cb84dea1cd62f70dae2d4d62"; + sha256 = "fd6564352704bdba7f329a70c940514f3b060d3bab75ca7e5a6198858db8c79a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fr/firefox-109.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7b56c5b71df91ed86b10a66a30d24ae02ae84d75972ce367c288a27b171082b6"; + sha256 = "e1b30692bb0dd98adb3e3f057e988d88ef671bfe84316b7003e465a7d5dcb007"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/fy-NL/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/fy-NL/firefox-109.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "5edaf14de80f9cdcceea8e2f291425a74f714bac482fd83d046ffab6e5ff4530"; + sha256 = "16bc416044cc23ec59a08216f1c18f9d027e141a96f05782eb46d96d799c2b19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ga-IE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ga-IE/firefox-109.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "ea2815b2ed95be115252e25d0a1893a5d9f6865c16e7b8f0acdb6f05e9447f9d"; + sha256 = "64a13f28131b37f84f37b82a0d07371228a20b0f9c8a1e228c47a8d5dbf0e730"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gd/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gd/firefox-109.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "c4da99ff08acd9f6af5975223f8fdc675fca53138b1dd089ce1e5d98641624a2"; + sha256 = "6fb5531c93043ea2c11b029d13e88fb8eb4f1c95263c1fc324a3d8b7f545262e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gl/firefox-109.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "e77e5c5e23dd7cfe8d6310b30c4a1e3302ce0d8e5a7ea332eacf5f8735107ff9"; + sha256 = "15bb2baabedb79fd3bab8dce240ce2d0c88f6eb986ae467d1ee8e43ffd077195"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gn/firefox-109.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "97fec0c7a9caa8f598ee28b149e8010f39d649c7beffccaeab56757c0d4312d5"; + sha256 = "48d50a8cc2bc3608c447b7744093166d4c2f740e8c519d9b6f3931e1021875d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/gu-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/gu-IN/firefox-109.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "7d303a03ec303693f627604e3b419d949a8cf7f903ae813d18c2c5449d9480ac"; + sha256 = "e6e4f86dc0b65e3238f613c68432ba9b4768224bf834c471fb064213cdcffd9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/he/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/he/firefox-109.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "7f64f45a8654aaf4fd8b29f980b01d0746d205baf498734416667cee3ac3e70c"; + sha256 = "e45ddc3357d75000afbf65b850531e23ad5563234e457007cfd1992fa4efc114"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hi-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hi-IN/firefox-109.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "17446de5dbf9c6fdf7b7967f36c329ffeef97faa1fc4c2fdb64f932da30c759c"; + sha256 = "2b37c00298ce599143e2639dbc245b5f558349438d7e1f282dfc299720842588"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hr/firefox-109.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "2059f6e3a10f0bc2f1cff8179d294c75476dbe21b31c5830a7da933a7cd60bb7"; + sha256 = "456d75b5ce6fd21c0d5177904d82d960a7258039184bf7ba8e0c71a783d4b601"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hsb/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hsb/firefox-109.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "273f47c51638cd3f7dbce9678b52e6a99fba46502bc56587a0eec1b1cbc858ff"; + sha256 = "c9e835676d1eab60932b2dac810c25fddb61aca134eeb1fb842fb7f3e1ebcf25"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hu/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hu/firefox-109.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "d00e86d775419bb5ac5e9016dd839d41dd8fc9ac73cbef71ac01e9f40b1fd752"; + sha256 = "4706f3eaf40cf7eb4ecc6f6efcd64cd76cb1228bedd9286b4cc9235ebcec7ec6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/hy-AM/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/hy-AM/firefox-109.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e8e877347b98c65294ab695f1074995aa54067b97ab655dcb794b66bff84b7df"; + sha256 = "bec66380c9ed8d132d84cd68c01989fcbd48afb881d8616017c603dcb7e176fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ia/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ia/firefox-109.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "0cdf2c81a5dc30155c67ae1decf3f36377e732f2a8b0529554241a16e9e7a125"; + sha256 = "dac076b82ed64857f048383c427776354c75bbe14a8f2ba4aa62978546cd6901"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/id/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/id/firefox-109.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "92604c3f8e4691bfde59cc9f2f22cb1828d0de5efd5ce58bd2e140016116cfb2"; + sha256 = "c41633c777da109384ab97049b0058fc5783359ac414674eb929fd19bf2d625c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/is/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/is/firefox-109.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d4cd9389342f390786d4045dfff5e81d6a06cbc3d008c3d0e7fe38ad285111c6"; + sha256 = "1c86162d0ed17742cb3c51c39cc6526ca4bac5f9dae9b3091d8fb4b9f62450fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/it/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/it/firefox-109.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "c8d102823192b2b4ebed1b587c87067738227392df6629f865f5294070018c45"; + sha256 = "88619c601a1e5cd2a63adb00f3f1383b7dfb59bbad526209fdf563c1a7c74fe1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ja/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ja/firefox-109.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e00c6bc9778d92618ed4349f8006667d249f2d621496a7002853ec51064c0b6c"; + sha256 = "3dab393bc047ec868e18ef3088787ff3fad07979ff629b5b673f0ffad4e84bf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ka/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ka/firefox-109.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "c0116995e70225b71ca02ace86a571944fe998a748ae6e0c628a2e2525c3d4a6"; + sha256 = "1f646449054056c528aa04722c0945b008c72471b2b6a7000afdb54e9e14a51d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kab/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/kab/firefox-109.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "c6c4a7a503ff8c136b7c0dff132b3ae63326aa8c4271dd85f8c10f09755d7c23"; + sha256 = "2ee51ba2291b12549cab7fde5007205927465ee592ecd15158b5cd0c5c071391"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/kk/firefox-109.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "d5b185c6676eb01aa6c10e2b604d385cd2bab24ad19a8f561606b46cae1d90c5"; + sha256 = "bc761d52486af47d637f2a982de38481db245f98d48fbd0c3710f7282e5eb0cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/km/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/km/firefox-109.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "2e3565182881dab53c55af1f02f09fb77f2c60949f7a7c7fa5d43dd69f3d47b9"; + sha256 = "ff584ebbf260a5907d47533d03a844b11852e2a66e1873cbb9f97488dcf26805"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/kn/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/kn/firefox-109.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "696ad3222dd83d3e5f2351a6b062fde5e6f756403593a37396f95de5db3f6aa2"; + sha256 = "205c2a232c468cd00096f9b3e0e37ee6cd6cab2a89c64fc5e7090892129a2ce1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ko/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ko/firefox-109.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "fe249e81f407cf7bfffd6bd13d828bfddb805a5ce06a0ee8ea7cb1e9273011cd"; + sha256 = "b8d262276c6f67bde4bda7dde9f44fc9d663408df85b3be836da03b9c923a551"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lij/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/lij/firefox-109.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "a1f8cba2592421e82d4d5a13052d2f48bc3217d91d68cd7699182c40a42c49a4"; + sha256 = "fc8c42a338cf8074d77acaa967e5c470b813da87c9790eafe7aa36bda676cba8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lt/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/lt/firefox-109.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "56810f8dcfaf802e9d93f23294d713fd867c48cfd9baf1400a93e0c9dbe09b6e"; + sha256 = "2eaedf0027937f9f3de113d0f9a819a09d001c24458a4006c7d78f5581e151ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/lv/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/lv/firefox-109.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "47d4b1517b101e62e4aa1e39da57ce53792e024fd0ea2ab06e06182cc83636ed"; + sha256 = "c2bfe7e376deac1df14f29a6c06c6ad80249f3b1d1e08855299ef96f3f8d9790"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/mk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/mk/firefox-109.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "95644ffb52b917a82b5cfa3a15fa8540f310342fbf840aad367f7b7ba2eb2865"; + sha256 = "fc681082b2c0d73e2fe8c8aebe648dca6c172c31bf0319d7fcd26af6cbb67467"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/mr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/mr/firefox-109.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "5dd79eef34d39d828e0bde386b0a7bc2e34ff65b6e2c84c19c50affd560be86f"; + sha256 = "03703982fd431a087d1b2a4584862f9c45784d1809ea21121f495afea2b9951f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ms/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ms/firefox-109.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "1c34352dd995aa5593826ec6509a9a571fef56c7cc5492091037797a264c9079"; + sha256 = "fb41c14f3f8f6050a874475a4619834e91a93e18694117d97164cf8d65929f2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/my/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/my/firefox-109.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "b6a8f8c5ad88ecb6225f7f1a084d207773cf55cfad23ab75bda3b6de2e1a5b8a"; + sha256 = "d28d4ab28a45abf6e430ec2ed014e73606dbe4ea54318995565efe0722725188"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nb-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/nb-NO/firefox-109.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "2bf5f1181ee86090e75679a08e361556facf8c07b06501e8f3c6029798b3334c"; + sha256 = "d7cda4dca1b8ed107174b1ec8486f04741161c5e95eac55f291a0d6376c83bc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ne-NP/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ne-NP/firefox-109.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "3021f8bf36270a7bc708ed790d628ea624daca8f0023d5abdfb5843b83b0573a"; + sha256 = "5562fee4fea2956a346bcb23c2c2340cd16a816ef3f8a874d259e1f6a6f70ff6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/nl/firefox-109.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f1928dfca113a782f085890bf9dfafaa9baaef79ed8162ceccd6c90cf38990b7"; + sha256 = "2c9feee4d1c3079232768c9c8ca2e841e7c26685ad4b9dd609d3eabe478d8154"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/nn-NO/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/nn-NO/firefox-109.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "fcc01179902449f16d6724179378d8d8c251fa4dabec4ca78506b750bf7a157f"; + sha256 = "9d48f0a887015ffd0c75db18e0e2e79aaad177cc114797758cec33f33f08861c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/oc/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/oc/firefox-109.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "ad48b0b59681fcd32ec5d889c4ccd12c9015a446077baf18516b038d4267ca55"; + sha256 = "59cea9cc6edd8d6e92741bf8201cd135d3218ba1020579f6a6325e2e1697fd92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pa-IN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pa-IN/firefox-109.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "44e54441e9d082a44eb1b1e3a29d65d75658afbf3b4b04fbea427c4d621fb630"; + sha256 = "bfe9329826c927d22e3fab539e2564c72958c91330dfb036bcaa6784e2882864"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pl/firefox-109.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "fbd8bef9474e6bff05cea3d434b48caacf24b7d74fb7289372cd0ce4d6b3455d"; + sha256 = "da8f8f87f49efcd6512b28a5dcefd0e7910e704ebb79b7c88810933e135239b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pt-BR/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pt-BR/firefox-109.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "dcb42a3248e7bdfd6de2325f0aa287e94f6a78705fb8d42d0b94213df4aafd7d"; + sha256 = "221ba38616c0a5e10d91a39e58f194aef13b5bc3afdd07e3261dc3dae168b77c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/pt-PT/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/pt-PT/firefox-109.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "95f41a8bd3c7954664fbb42a23d5f5022e36a853d2152ce268f32fb08bc25566"; + sha256 = "0fa1e27f38f32d2ce835924b9b6e2987ea506bc440c7ed5268c5010b34882d99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/rm/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/rm/firefox-109.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "8164d8494080384dc4f78823b777e3d2b8a09b163d5e7847304b7edcf421b94b"; + sha256 = "83f4a241f541b08f1340cf474128546a4a0f3962c419f227f060b30e8ec70315"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ro/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ro/firefox-109.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "28269a8aa45459cb0774d1ec859bab026075bc7353f4363b4808c12dac731c35"; + sha256 = "8922ab444d2f439dc96c1cff06142171922dec180ba81aa3d286afb53c635953"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ru/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ru/firefox-109.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c1f3f0fd7ad91593ed1ceb34d54225e3c1c16f57017c5a406bd1b91b6f9e321f"; + sha256 = "22be977b6c5e9f0ca73292fd36183412b2a98bbe44f7e5edeb9be5bf85951631"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sco/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sco/firefox-109.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "9724c6631121e21d9488fcbaa4ae86ea521b5a61dbb0de2e26bf6af9a9b7c68b"; + sha256 = "91274de4fa273cc4ec05ae8b40be5367ed280d8e64b1cd68db604ec13360ad2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/si/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/si/firefox-109.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "33ff8d8ffd16893f068772c98c115389b0a4286d390709495a811dcef01fb8a8"; + sha256 = "489d874123773bf5f3e94746e4c7242d73742dafded32a07c20bb91c7e544328"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sk/firefox-109.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "cc34d8293b7166eb96ab4d96cb9bba7e5aa7d4f15f04ddf2d34704c207f48949"; + sha256 = "66f1e39014a6c246572daa6f0c6a3230862e7274b5a32213c7397643caec8130"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sl/firefox-109.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "1cec19b6eba4aad9aa75ea747bb750333b9a0f335adc125eeef95e5b6fa767be"; + sha256 = "ad7bdce055f140497dc79bc67107d5e6f99dd292f09446304dd49d0dbb039d03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/son/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/son/firefox-109.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "6b4765482ac58f176a52643df225df8b3458003e14a47cbf18cbb36c7e1f34f6"; + sha256 = "db3da11990c0f401a72122c162cbe371c65d9b07a42e781251f082dc2b99b0d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sq/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sq/firefox-109.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "817fc0345699467e3f4fb1fdbd850361c66ff5c82aaf93ea9a33d1075f72632b"; + sha256 = "55b73a202acbb180073e8cb583100391e63d4d41516f1f241547dd72c9d64ca4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sr/firefox-109.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "708c949b5f1bb394b493b990bdf1da3cf9bfebcaa6aba549bcd5858b20e8c1f8"; + sha256 = "d79e42379228bd7d8c67bfbb475e0865aede6e8cd3a5c630f961507c3ec9162a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/sv-SE/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/sv-SE/firefox-109.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "39c2407ff8b0bc638ab884faa1f6d86bfe071fb143a63fb81229e5312142213b"; + sha256 = "83af8bc35f47c7f51872d6a50f1df6cc329418ebf4c756cf894afbe544ce2018"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/szl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/szl/firefox-109.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "15fd363256e36bdfab2bad4d1544c191d74a8d4d4a180c9a7d12b5e64a0f0d8f"; + sha256 = "09bc6aa2ec127f5ac9c04cf83b2e760b17439c8ffd3d2b904149b759e8a1c5f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ta/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ta/firefox-109.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "548693e96ac123f33e12c3016dd7b0e7fbb9f3a403dab9682d4498a6d82a00ee"; + sha256 = "f1aec8972ce8baf6e0b6c88bac92651a266bcb2e2bb5b57dbf91ef88c0999681"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/te/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/te/firefox-109.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e01a856488bf18c4d345db891909fe8813649f463bbf1171c2099de03556ba7a"; + sha256 = "23cca1765464d740d409e8fbad0909b969db9028581ca8c079be7df671e25216"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/th/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/th/firefox-109.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "c2320b7f67f35778049023cbef382b208b68a0e18ab133fd806b4081a8c49a3a"; + sha256 = "01826ca896e4e8ab9aae14c9b68532339a10c908d469e66be9dfb44f850c4ae9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/tl/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/tl/firefox-109.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "ca5fae50ed972e07a340fd575ff72fb6908e1cf5810e3302fe6de286f2354040"; + sha256 = "aa52050e375977f6dc3c09fd91afc5f2383015990cc5c2d2891fd354b2e214c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/tr/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/tr/firefox-109.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "b8d9d4c422db8378d3df478dace847e2ce9c7c7a9250fb9f7f10dc3890f33dba"; + sha256 = "96362f9c7f919676e715ba7d4a20266e4e534c75bf5b4dec87ef49585a3e5e46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/trs/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/trs/firefox-109.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b40b8f0c453b6ac332b8869491fa201ef015aeac0d1675dd75e4cdffcb8c406c"; + sha256 = "00ede759629983fc674a728a3f8c39b7b42bf132398b9077b623282809321f6c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/uk/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/uk/firefox-109.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "d0fcdf9bc345bb37906805c123b9f262b14624cf19ff2f25714246d0330818cf"; + sha256 = "054de96778b01b75459f1e391326dadbab5eabbc1ee2f0a464bb27b34ce15619"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/ur/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/ur/firefox-109.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "e5a34fc5bf63aa6e5ce478204dfd5f598b7ae1af64a52b9b07803b6ab49ece5c"; + sha256 = "eb9d0ace110b7b5f0ba6ecf0e3d2acf90ccc0c5c8af88625f9ecf0aa4e010ffd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/uz/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/uz/firefox-109.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "dfd51f2d04a3cd1686a7e07860c39d01fe351d8dca6a6952386fd453b8cbc08d"; + sha256 = "d8a3429895051133ed8b93e7af9294340ca23b3570729fda4dc8127715898407"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/vi/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/vi/firefox-109.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "338973416fc1724a46ea35725620f0fab14a816914b6d5e1ab6da8cf3edd6733"; + sha256 = "a1180810cd4cbd14a2de895735505c8d7f98fb167bc874816eaf0817bbc98388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/xh/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/xh/firefox-109.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "8bdb1fb5e397edc1a66d74306cbaf3eb9ef6bdc547ee77543d9615438f6630a4"; + sha256 = "c9cc91a22984dab35e254e5b2d299df311be6a55cd4f27cd49e68f668bf673d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/zh-CN/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/zh-CN/firefox-109.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9f9a94fd32c7ab92f2ccf149ee6f3422d159151b48451b245eebd5fcf46d1632"; + sha256 = "ffdd75e46d51f3287aee918e06c5ea389ae9e5fa8b642abf66c5041f0d3b2c5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/109.0/linux-i686/zh-TW/firefox-109.0.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/109.0.1/linux-i686/zh-TW/firefox-109.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "a0b5b5d3774fe3d2717271fdaac2fca1723e20340af4ee93e90e8fe32a8eb6a5"; + sha256 = "fc8848b76084c6df1c4e4932ec8f4f0d14d2bb565bb87dc30b3b759fe90d0924"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index e8deb9fcd9..948b321724 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -471,6 +471,7 @@ buildStdenv.mkDerivation ({ separateDebugInfo = enableDebugSymbols; enableParallelBuilding = true; + # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; # tests were disabled in configureFlags @@ -524,7 +525,7 @@ buildStdenv.mkDerivation ({ fi # Extract the debug info. - header "separating debug info from $i (build ID $id)" + echo "separating debug info from $i (build ID $id)" mkdir -p "$dst/''${id:0:2}" $OBJCOPY --only-keep-debug "$i" "$dst/''${id:0:2}/''${id:2}.debug" diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index de0ac8eb7a..6340a0a14e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = buildMozillaMach rec { pname = "firefox"; - version = "109.0"; + version = "109.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7"; + sha512 = "58b21449a16a794152888f50e7fe9488c28739a7e067729acdc1de9f2e8384e6316cffdfe89f690f0d211189668d940825b4f8a26b8100468ae120772df99d72"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 378fe1f403..06bd49facb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -15,6 +15,7 @@ , pciutils , sndio , libjack2 +, speechd }: ## configurability of the wrapper itself @@ -82,6 +83,7 @@ let ++ lib.optional sndioSupport sndio ++ lib.optional jackSupport libjack2 ++ lib.optional smartcardSupport opensc + ++ lib.optional (cfg.speechSynthesisSupport or false) speechd ++ pkcs11Modules; gtk_modules = [ libcanberra-gtk3 ]; 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 82d6107d11..01cd54cf8e 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 @@ -47,8 +47,6 @@ , addOpenGLRunpath }: -with lib; - let opusWithCustomModes = libopus.override { withCustomModes = true; @@ -68,8 +66,8 @@ let bzip2 libcap at-spi2-atk at-spi2-core libkrb5 libdrm libglvnd mesa coreutils libxkbcommon pipewire wayland - ] ++ optional pulseSupport libpulseaudio - ++ optional libvaSupport libva + ] ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional libvaSupport libva ++ [ gtk3 ]; suffix = if channel != "stable" then "-" + channel else ""; @@ -99,8 +97,8 @@ in stdenv.mkDerivation { tar xf data.tar.xz ''; - rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps; - binpath = makeBinPath deps; + rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps; + binpath = lib.makeBinPath deps; installPhase = '' runHook preInstall @@ -149,7 +147,7 @@ in stdenv.mkDerivation { --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \ --set CHROME_WRAPPER "google-chrome-$dist" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --add-flags ${escapeShellArg commandLineArgs} + --add-flags ${lib.escapeShellArg commandLineArgs} for elf in $out/share/google/$appname/{chrome,chrome-sandbox,${crashpadHandlerBinary},nacl_helper}; do patchelf --set-rpath $rpath $elf @@ -159,7 +157,7 @@ in stdenv.mkDerivation { runHook postInstall ''; - meta = { + meta = with lib; { description = "A freeware web browser developed by Google"; homepage = "https://www.google.com/chrome/browser/"; license = licenses.unfree; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix index 92afe2f4ba..2de8192150 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/opera/default.nix @@ -41,27 +41,30 @@ , at-spi2-core , autoPatchelfHook , wrapGAppsHook +, qt5 +, proprietaryCodecs ? false +, vivaldi-ffmpeg-codecs }: let - mirror = "https://get.geo.opera.com/pub/opera/desktop"; - -in stdenv.mkDerivation rec { - +in +stdenv.mkDerivation rec { pname = "opera"; - version = "90.0.4480.84"; + version = "94.0.4606.54"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "sha256-GMcBTY3Ab8lYWv1IPdCeKPZwbY19NPHYmK7ATzvq0cg="; + hash = "sha256-IMWIkJHKaE7n5Rll4ZExE6PQB9a2fz0hLx4vckbROgk="; }; - unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; + unpackPhase = "dpkg-deb -x $src ."; nativeBuildInputs = [ + dpkg autoPatchelfHook wrapGAppsHook + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -115,16 +118,22 @@ in stdenv.mkDerivation rec { # "Illegal instruction (core dumped)" gtk3 gtk4 + ] ++ lib.optional proprietaryCodecs [ + vivaldi-ffmpeg-codecs ]; + dontWrapQtApps = true; + installPhase = '' - mkdir -p $out - cp -r . $out/ + mkdir -p $out/bin + cp -r usr $out + cp -r usr/share $out/share + ln -s $out/usr/bin/opera $out/bin/opera ''; meta = with lib; { homepage = "https://www.opera.com"; - description = "Web browser"; + description = "Faster, safer and smarter web browser"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; 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 9efa3e79dc..2101306e42 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -45,7 +45,7 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "31.4.2"; + version = "32.0.0"; src = fetchFromGitea { domain = "repo.palemoon.org"; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { repo = "Pale-Moon"; rev = "${version}_Release"; fetchSubmodules = true; - sha256 = "sha256-vJhjQfsa05fFNL24tUBHfKoKZG2aLXp5xBdUqqGDtAE="; + sha256 = "sha256-0N63Xo8cRIHwEXkT8eeot0DgZU7aPirmVq/iHJjlGRw="; }; nativeBuildInputs = [ 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 56bf61aa03..43865f051b 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 @@ -53,10 +53,8 @@ , extraPrefs ? "" }: -with lib; - let - libPath = makeLibraryPath libPkgs; + libPath = lib.makeLibraryPath libPkgs; libPkgs = [ atk @@ -78,13 +76,13 @@ let stdenv.cc.libc zlib ] - ++ optionals pulseaudioSupport [ libpulseaudio ] - ++ optionals mediaSupport [ + ++ lib.optionals pulseaudioSupport [ libpulseaudio ] + ++ lib.optionals mediaSupport [ ffmpeg ]; # Library search path for the fte transport - fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; + fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source version = "11.5.8"; @@ -156,7 +154,7 @@ stdenv.mkDerivation rec { libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor # apulse uses a non-standard library path. For now special-case it. - ${optionalString (audioSupport && !pulseaudioSupport) '' + ${lib.optionalString (audioSupport && !pulseaudioSupport) '' libPath=${apulse}/lib/apulse:$libPath ''} @@ -224,7 +222,7 @@ stdenv.mkDerivation rec { clearPref("security.sandbox.content.write_path_whitelist"); ''} - ${optionalString (extraPrefs != "") '' + ${lib.optionalString (extraPrefs != "") '' ${extraPrefs} ''} EOF @@ -251,14 +249,14 @@ stdenv.mkDerivation rec { GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6 EOF - WRAPPER_LD_PRELOAD=${optionalString useHardenedMalloc + WRAPPER_LD_PRELOAD=${lib.optionalString useHardenedMalloc "${graphene-hardened-malloc}/lib/libhardened_malloc.so"} - WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ + WRAPPER_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [ gnome.adwaita-icon-theme shared-mime-info ]} - WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ + WRAPPER_XDG_DATA_DIRS+=":"${lib.concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ glib gsettings-desktop-schemas gtk3 @@ -270,7 +268,7 @@ stdenv.mkDerivation rec { #! ${runtimeShell} set -o errexit -o nounset - PATH=${makeBinPath [ coreutils ]} + PATH=${lib.makeBinPath [ coreutils ]} export LC_ALL=C export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive @@ -317,7 +315,7 @@ stdenv.mkDerivation rec { : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}" - ${optionalString pulseaudioSupport '' + ${lib.optionalString pulseaudioSupport '' # Figure out some envvars for pulseaudio : "\''${PULSE_SERVER:=\$XDG_RUNTIME_DIR/pulse/native}" : "\''${PULSE_COOKIE:=\$XDG_CONFIG_HOME/pulse/cookie}" 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 ec1e55e338..644f7e734b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -21,11 +21,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.6.2867.58"; + version = "5.6.2867.62"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_amd64.deb"; - sha256 = "sha256-eRHQaKztf66o9FoCNSRyXS5Ht6d51GTilNO5DxItUCw="; + sha256 = "sha256-p5okCdvEBurL1UgqLMBhCd4caPbiOA1WZrI9TC5j6og="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix index 898c3febc1..1f53c184b3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { LIBS = lib.optionalString x11Support "-lX11"; meta = with lib; { - homepage = "http://w3m.sourceforge.net/"; + homepage = "https://w3m.sourceforge.net/"; description = "A text-mode web browser"; maintainers = with maintainers; [ cstrahan anthonyroussel ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/webmacs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/webmacs/default.nix index 7dbb6a3c53..de3c1cfdcd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/webmacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/webmacs/default.nix @@ -27,7 +27,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ python3Packages.pytest #python3Packages.pytest-xvfb #python3Packages.pytest-qt diff --git a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix index ab81254c71..557754ac50 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "43.0"; + version = "43.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-fvG9N6HuuO8BMH8MJRquMSe1oEPNmX/pzsJX5yzs1CY="; + hash = "sha256-gHlhbQGtdIjKLMAkTxfc2QOjvNUPGKKL+OK8/vm0Oac="; }; outputs = [ "out" "devdoc" ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { sofia_sip ]; - checkInputs = [ + nativeCheckInputs = [ dbus xvfb-run ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix b/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix index 71fe5b97b8..0afe9466b4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circumflex"; - version = "2.6"; + version = "2.8"; src = fetchFromGitHub { owner = "bensadeh"; repo = "circumflex"; rev = version; - hash = "sha256-pcY2PXiOazKAi8mAAbmftXDae01fcUw/u9JPOHQVclI="; + hash = "sha256-knN+T/dmIwHLqT3MJBjQhGlSeAu0lE2ZOv6tLqkcwS0="; }; - vendorHash = "sha256-rF1Hu4Pf9AF2MTx4GAPmzSn0M38uTxPS1bsAkO23SdI="; + vendorHash = "sha256-Xwek2xlvdGO6C/T0a96RGuMcX7jCbvntEYBf10tvmAo="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflare-dyndns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflare-dyndns/default.nix index c1a9309ca4..7f11ec2570 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflare-dyndns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflare-dyndns/default.nix @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { requests ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/acorn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/acorn/default.nix index ce0f07f9ec..cc79ae5d59 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/acorn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/acorn/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "acorn"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "acorn-io"; repo = pname; rev = "v${version}"; - hash = "sha256-IzjCYVQ9RhuAmgloue421F43ARviaHW7mTkLhLW/VPM="; + hash = "sha256-9+jI3GBRuX06+aN8C8C3K72kKtQVwmfAwhYLViuERxk="; }; - vendorHash = "sha256-z2ya/CgH9AcxHe73Yt9XWbJqH4OrZWt0bRDsna5hYeo="; + vendorHash = "sha256-t/q94B+ihcHh/XFHs1Z9yQTwoFKv/nkhIDykymGNA2w="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index ab2d1bd3d3..6d13063bd0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -22,7 +22,7 @@ let hash = "sha256-wchj5KjhTmhc4XVW0sRFCcyx5W9am8TNAIhej3WFWXU="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; excludedPackages = [ "./example" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index fedf499d48..41fe5cb960 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.4.10"; + version = "0.4.11"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-DUWJDWqB+jyp3/2/eFP1ss2grNtrvUuvGWK0FYTXObc="; + sha256 = "sha256-0y7WP6v1DrAyK9p9cVME9RpNH1ZY0NNMtjHhmPT68kQ="; }; - vendorHash = "sha256-4ylOLnpvz/aQIoxVz2z69Rq/x2UG91yMmtSHyquvNq0="; + vendorHash = "sha256-KkklEcxk6pNbxSkomh3LqlK8jgpGC/pZMBkJgXMUi8E="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index aaa07c0af8..b028512dd7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.5.6"; + version = "2.5.9"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-R00HW4jh6zohMoli9aomPCK/svzWSUi9fcRFvevMhyU="; + sha256 = "sha256-RZ3bcuJmUUnucD2lhfxLU8vbrorVUowF8hAW9NGSmbI="; }; proxyVendor = true; # darwin/linux hash mismatch diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix index 9b0d76a5ac..34bbcd0a1d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.56"; + version = "0.8.59"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-iU0/ovnclq/jwhi1d6zY4tz56ZB7FT0Mbpi2tEjb9QI="; + sha256 = "sha256-uvvxlU5c5MNYVqu0btL4xpjyvb/fDbFPGWkIzru84Z8="; }; CGO_ENABLED = 0; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-DsLW5l7TxlXRFZDhtRfq5YqVT3XR7EZGNIoPiksHNck="; + vendorHash = "sha256-WQsnBBx05wXKDS7h3bhipTqZTQLxRjVLObuMNUfAiTk="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix index ee0b82c0b6..ba99106c09 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atlantis"; - version = "0.22.2"; + version = "0.22.3"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "sha256-na/RYFl3g7/jOtmCeG/xQcmvDdxUqD17SLzdxJ0bYN4="; + sha256 = "sha256-A/FT9t5Z+Iw1mVwS3d5Cc86A9e6jVbEtmEWroVUhhtw="; }; - vendorHash = "sha256-Gg6HxL2ptCE0hXG/dCuaxcnO16htLNPsuH4QAgCQa64="; + vendorHash = "sha256-KUkh5yx+v5g0N4yIpgpt3i+uCtOtR0Jvf2PFQcGWtm8="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix index bd3672b997..2fbbc9ad1d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.41"; + version = "1.0.45"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-dvbxxW+UyTA+EzBV6g9JRao8D6ZE5hhXLX4q/mmPIQg="; + sha256 = "sha256-wYZC4eEvxvHgtb0l+kpP2msQgt8InJu59lgS5cwGxRI="; }; - vendorSha256 = "sha256-gBVSpjoAfbxlJnlrFrsBupJgVQ59sh1ipOry0Mgppig="; + vendorHash = "sha256-42ZTPl4kI+dgr78s9WvLFchQU9uvkMkkio53REjvpbw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix index fb755ac679..69862bd515 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-NmTMpTaekUTSMnIFn5e1DnuHehJLM5YToY+QK0hnvXk="; + hash = "sha256-O/InVEWSqdcfqchVMYetZ3RCOxgEjQ9XvnKpOIjV2zE="; }; - vendorSha256 = "sha256-0C3tQgmu7YQgHyXh8lIYTrLFksCvFQp0uvIhQRuqbYM="; + vendorHash = "sha256-0C3tQgmu7YQgHyXh8lIYTrLFksCvFQp0uvIhQRuqbYM="; subPackages = [ "cmd/clusterctl" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/crc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/crc/default.nix index 825b203393..ed4e2b0583 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/crc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/crc/default.nix @@ -10,15 +10,15 @@ }: let - openShiftVersion = "4.11.13"; + openShiftVersion = "4.11.18"; okdVersion = "4.11.0-0.okd-2022-11-05-030711"; podmanVersion = "4.2.0"; writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; in buildGoModule rec { - version = "2.11.0"; + version = "2.12.0"; pname = "crc"; - gitCommit = "a5f90a25abcacd4aa334490f0d204329abeaa691"; + gitCommit = "ea98bb41e24ad81a319d0aa6c6e1286bc1334c1b"; modRoot = "cmd/crc"; src = fetchFromGitHub { @@ -63,6 +63,7 @@ buildGoModule rec { crc version ''; }; + passthru.updateScript = ./update.sh; meta = with lib; { description = "Manages a local OpenShift 4.x cluster or a Podman VM optimized for testing and development purposes"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix index 0c9d90cd8a..c90c93f206 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/driftctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "driftctl"; - version = "0.38.1"; + version = "0.38.2"; src = fetchFromGitHub { owner = "snyk"; repo = "driftctl"; rev = "v${version}"; - sha256 = "sha256-etH/92Nhl5ZkmBeDtgFN0pLUOzgWhd3lClW4+zXYPr4="; + sha256 = "sha256-PPzoZypTP3yrgU50Uv7yBNCc2nAa84quCTWjxyq9h/c="; }; - vendorSha256 = "sha256-tvl0VlMUD7rVlB/OjyptYyllx6brX+ycGTp4In9yEvE="; + vendorHash = "sha256-XVEXWBVqYoAlK4DP0GdWqJDcLy9WxCaUdNbVESJ9zoM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index 97fff7f9bb..4aeb491410 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -65,7 +65,7 @@ in buildGoModule rec { ''; homepage = "https://fluxcd.io"; license = licenses.asl20; - maintainers = with maintainers; [ bryanasdev000 jlesquembre ]; + maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ]; mainProgram = "flux"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix index 57f507ba60..5c47c602c3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.13.2"; + version = "1.13.4"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-sCtRNdQRSPpIBSwtQMoetKmFLYUe3w1esogdkLqTHbk="; + hash = "sha256-eyfMWum1fZUq4iF77Q+0FP2Rdq2P+xK0au3ytN8MS+k="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorHash = "sha256-Lpc/fzOJLIyI2O5DP8K/LBYg6ZA1ixristercAM5VUQ="; + vendorHash = "sha256-sQv6g0Xgs+6jgxacWJwE3dK3GimfiPHly0Z0rvdKNE4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix index ddc254adc9..fb268db181 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.16.0"; + version = "3.16.1"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-84Lxix2UFEW9XymKMxFaAwZfPepPn4MjKaz8jXfB9AI="; + sha256 = "sha256-QhAmedSDBi1aRNmp4LR5Xv4HMzcextzT67g9nxN4eko="; }; - vendorHash = "sha256-dzzgHda1kW2V9u9x/A9oYhpvTpUDa2DVZA/sHrieiWo="; + vendorHash = "sha256-bVgYj0e/z57sIvVZXAzLkKqKLa0Pe0CT57Vc7Df1oWE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix index e6e5e6c1ce..a78950dde0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hubble/default.nix @@ -39,7 +39,7 @@ buildGoModule rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = (stdenv.isLinux && stdenv.isAarch64); description = "Network, Service & Security Observability for Kubernetes using eBPF"; license = licenses.asl20; homepage = "https://github.com/cilium/hubble/"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index 4459921045..74f54d28d5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -25,8 +25,6 @@ , pkgsBuildBuild }: -with lib; - # k3s is a kinda weird derivation. One of the main points of k3s is the # simplicity of it being one binary that can perform several tasks. # However, when you have a good package manager (like nix), that doesn't @@ -47,10 +45,10 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.26.0+k3s2"; # k3s git tag - k3sCommit = "f0ec6a4c127b2c671b271974a2f21783f0e3c525"; # k3s git commit at the above version - k3sRepoSha256 = "0yc2k45s321hjir3c2wabqihk96wbjxp274dpbh9kv3471j89lkm"; - k3sVendorSha256 = "sha256-ptC39SgzCA4CULA+VmcMGlPG8KsLRbWlVI/jQrrF/RU="; + k3sVersion = "1.26.1+k3s1"; # k3s git tag + k3sCommit = "f10af367c3c96863c081ada4018e94e085c9404d"; # k3s git commit at the above version + k3sRepoSha256 = "13h20yb9gyrclhv2r0vv7fnsr73i06686rm6r0pcvy72hw26i848"; + k3sVendorSha256 = "sha256-WvkuXHG6NM9eScuu7qG3HDZbBPAJ6xVPz3RRuAxP994="; # nix generated by update.sh # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/d71ab6317e22dd34673faa307a412a37a16767f6/scripts/download#L29-L32 @@ -67,17 +65,17 @@ let k3sCNISha256 = "14mb3zsqibj1sn338gjmsyksbm0mxv9p016dij7zidccx2rzn6nl"; # taken from ./scripts/version.sh VERSION_CONTAINERD - containerdVersion = "1.6.14-k3s1"; - containerdSha256 = "01zs2xbpmww6hdh248px4dlh1n7xy9gzj2b8afyfmv3c2m2alf5p"; + containerdVersion = "1.6.15-k3s1"; + containerdSha256 = "1bzmryqqdpmxl4471wda5q9hqjlgzcmsbwxcwd2ap34qx27my1qd"; # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag criCtlVersion = "1.26.0-rc.0-k3s1"; - baseMeta = { + baseMeta = with lib; { description = "A lightweight Kubernetes distribution"; license = licenses.asl20; homepage = "https://k3s.io"; - maintainers = with maintainers; [ euank mic92 ]; + maintainers = with maintainers; [ euank mic92 superherointj ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index de9dd27b52..141a17e34e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.26.7"; + version = "0.27.0"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-TshUQJIwGSqVP+YUJvSHSczvnvzr1kX761oIbfQzVzw="; + sha256 = "sha256-optEMGB6izGlpcq2AJOY4lTt8igYBilE0Bg8KxE8AsU="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { tags = [ "netgo" ]; - vendorSha256 = "sha256-W0yU5rMUuO2JtKRZpexsCqIUy3h+2hSDRcq/lp0UHX8="; + vendorHash = "sha256-57JrBmund2hwcgqWkLos/h1EOgZQb9HfKUf1BX0MYGQ="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix index bf35eac948..b01dac8dc1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/karmor/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "karmor"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-xVYhZT4yqbSmxGH5DaarXzrGYMS1BuTaQ2T+huWYLBw="; + hash = "sha256-toN/pIvmmMwIARhY1i/2nmrC5ZVyTR7pttqkyXNuMaE="; }; - vendorHash = "sha256-rlvAQ99/3+3VotyYAR2TgWG8ZdTKUT2XRv4hTF+QFpI="; + vendorHash = "sha256-TE+VPOhkTPqQTapxAcJzlQzRZfmb1J4pAWUKiTGLnZE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix index c7d14748e8..7e7bba1d37 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-capacity"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "robscott"; repo = pname; - sha256 = "sha256-+1qewL8N3WTS7GW6fpL2+RPbFQQ/3DDMgShtBi+lRtg="; + sha256 = "sha256-lNpUOA6O9sOBugYp9fDklKo6U2E0nKz1ORr3qO2tibg="; }; - vendorSha256 = "sha256-sMobdarMMktf34LbQnyZ6sgbfiJhWxWSQR0F+4x5J58="; + vendorHash = "sha256-qfSya42wZEmJCC7o8zJQEv0BWrxTuBT2Jzcq/AfI+OE="; meta = with lib; { description = diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix index 2b88d1ddd2..cb349e0c56 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-router"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J/wQyrEEdBki8bq1Qesgu4Kqj2w33zzvEEOecFdiGak="; + sha256 = "sha256-aO72wvq31kue75IKfEByhKxUwSSGGmPLzHDBSvTChTM="; }; vendorSha256 = "sha256-+3uTIaXuiwbU0fUgn2th4RNDQ5gCDi3ntPMu92S+mXc="; 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 df1e6ab788..c2818505a8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-UTzQyr5N8CButeLKYZs9a8hAV/cezVfLLQ7b4YJQzXU="; + hash = "sha256-AT7BrLVe5sSqAnQyhrkDktxVhuh1e0o5eB8oWWVbL8Q="; }; - vendorHash = "sha256-VvCM0aBk0SnnXVPZRvEGcb1Bl4Uunbc4u1KzukYMGqA="; + vendorHash = "sha256-wxKEywUs5ezeOlIRT2k3C4G0XaX6h1ORt9/G6+FzVic="; subPackages = ["cmd"]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix index 031fa0c21b..995125d250 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "kubectl-node-shell"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "kvaps"; repo = "kubectl-node-shell"; rev = "v${version}"; - sha256 = "sha256-dAsNgvHgquXdb2HhLDYLk9IALneKkOxQxKb7BD90+1E="; + sha256 = "sha256-TCd/VipsUT/h88CevqCLUUjN7wAJKYxxq63IpEF2P1Y="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix index af41b7ba9d..d1807d1c6e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-MVvhXvf/R7Cku8S4zbs1MlH4NuEwkxCsbbc2ASCF67c="; + sha256 = "sha256-i8kv/YzEWAFQJwIkwot2huIEAZYMUGQqSak4nUMRjn4="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix index 0197fe79c7..45f0ee66f6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.24"; + version = "0.0.25"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xHMUS08gtfN72sMkGZ+2Cazgkd2HgvHSKqugYg+j1So="; + sha256 = "sha256-28snlCqvQ0aF7DHjeHWyjOYuy2wHd2EqEDqmst9MQLc="; }; vendorSha256 = "sha256-mjIB0ITf296yDQJP46EI6pLYkZfyU3yzD9iwP0iIXvQ="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix index 65db0b689a..3d569d4bdc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.5.4"; + version = "1.5.6"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-s94o2/wInWMWbJcq8cpEbJYHL6vpD3Vurl/rOigzQRk="; + hash = "sha256-u0ievi2Zj5kerTQWhNPkT3HFdLYVwHOigkvWk6Zc3go="; }; vendorHash = "sha256-Y4eivDchnN2rtQWjFY3cFiJXRfj48UfVUKM/OLuWXGA="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix index 94441c960c..eb098b2c6c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-HJZrE0fHlyOTQF9EqdrtQNmaHlrMA2RwNg4P7B2lYI0="; + sha256 = "sha256-vIqmE9U/0WGIaTpy8NfUadIkaTdN8YKqvRLQ/69NgBE="; }; - vendorSha256 = "sha256-9hWX6INN5HWXyeFQRjkqr+BsGv56lInVYacvT6Imahw="; + vendorHash = "sha256-K/Cw7Sh/2OqTbWQPEsoQbj/ejyaXcLxFT8Rg5Ore5DE="; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix index da452e9769..a97054a907 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-KssClU/jWdBH29TFhCeui6mN6t6IJlIKM3LzaWdPG7Q="; + sha256 = "sha256-okQJBZLIFujHg5Tn/AbCox8mRrump/GjYjyQzkJAtFg="; }; - vendorSha256 = "sha256-58+MJMn687wh9c25qtwGQdy4uGcZN3T2bWK/cvxlLvQ="; + vendorHash = "sha256-Nzef+cfC4Fosm1e1Whpz/BrGqRlcbD0NpyST8V1iwiU="; subPackages = [ "cmd/kubeseal" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix index d23669bb1f..cae6540e39 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "kuttl"; - version = "0.14.0"; + version = "0.15.0"; cli = "kubectl-kuttl"; src = fetchFromGitHub { owner = "kudobuilder"; repo = "kuttl"; rev = "v${version}"; - sha256 = "sha256-xQS7qCUTM3X4SpUZfxKHb08poJ2W52R7+TNe4BFL5sY="; + sha256 = "sha256-u+j1ulM6B238qXvLMJZwLqglr9CGk81MsnBYiNiZVJQ="; }; - vendorSha256 = "sha256-u8Ezk78CrAhSeeMVXj09/Hiegtx+ZNKlr/Fg0O7+iOY="; + vendorHash = "sha256-taJAQPa0EA0Ph9OpCs7jzLqBV61kVstZrWyNEYc/GBk="; subPackages = [ "cmd/kubectl-kuttl" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix index afee16bf8f..07d9c360de 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "levant"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "levant"; rev = "v${version}"; - sha256 = "sha256-ujybD4nSHC/w2Pfu43eSO6rNJjXFAvc81T05icWFvbs="; + sha256 = "sha256-UI8PVvTqk8D4S9kq3sgxrm8dkRokpgkLyTN6pzUXNV0="; }; - vendorSha256 = "sha256-pKxj0qz7adSuPpiXu4+2KBO3JZu8zZ8ycPF5LosF4T8="; + vendorSha256 = "sha256-MzKttGfuIg0Pp/iz68EpXuk4I+tFozhIabKlsWuvJ48="; # The tests try to connect to a Nomad cluster. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 997b52434b..e05e7847cf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.28.0"; + version = "1.29.0"; - vendorSha256 = "sha256-CyIpzwSYHbv96UoQ/SZXOl6v3xn3pvT39ZO+RpVHU5I="; + vendorHash = "sha256-wRCSUDzz+1e4/ijwAnIM8a/AlnNNdVkiz3WO4Nhuy+M="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-Gn/RXZedID0sh5qTcBNg7GeLtI1JZYKXEWg2RZGXlDw="; + sha256 = "sha256-rdcMgL7bzdlxrelui+V1APJik0v/4YyUqj9QlMRq1nI="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; 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 e508ee0006..bc57c87b2f 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 = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i178AN8LDm1SmCx3G8uLmW1+/F3B8DQsrkawSBoefGw="; + hash = "sha256-6AXki9/gJVlHpA3iSS1GqkLWaUqE0c+X8alWdMyCFiU="; }; - vendorSha256 = "sha256-0EWrFc55I3EmrAmmIYdsYtvO6xqDHbo5Uo6XC+NezZI="; + vendorHash = "sha256-28Wt9uQ7+PEWe+RaNv4HLz7HQbO7hXlX3O7s9SooLu8="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix index 9933e80566..705b10753c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,55 +1,52 @@ { lib , buildGoModule , fetchFromGitHub -, libkrb5 -, git +, gpgme , installShellFiles , testers , openshift }: - buildGoModule rec { pname = "openshift"; - version = "4.11.0"; - gitCommit = "20dd77d5"; + version = "4.12.0"; + gitCommit = "854f807"; src = fetchFromGitHub { owner = "openshift"; repo = "oc"; - rev = "20dd77d5c889f86b05e2bdd182853ae702852c63"; - sha256 = "wqLo/CKGzeMDJUoI9PUEjJER5hSPu+FmUCJLPZ9PJuw="; + rev = "854f807d8a84dde710c062a5281bca5bc07cb562"; + hash = "sha256-GH3LjAeMIHmFbJoKGoeeNteP4Ma2+kIC5rAxObdziKg="; }; - vendorSha256 = null; + vendorHash = null; - buildInputs = [ libkrb5 ]; + buildInputs = [ gpgme ]; nativeBuildInputs = [ installShellFiles ]; - patchPhase = '' - patchShebangs ./hack - ''; + ldflags = [ + "-s" + "-w" + "-X github.com/openshift/oc/pkg/version.commitFromGit=${gitCommit}" + "-X github.com/openshift/oc/pkg/version.versionFromGit=v${version}" + ]; - buildPhase = '' - # Openshift build require this variables to be set - # unless there is a .git folder which is not the case with fetchFromGitHub - export SOURCE_GIT_COMMIT=${gitCommit} - export SOURCE_GIT_TAG=v${version} - export SOURCE_GIT_TREE_STATE=clean - - make all - ''; - - installPhase = '' - mkdir -p $out/bin - cp oc $out/bin + doCheck = false; + postInstall = '' + # Install man pages. mkdir -p man - ./genman man oc + $out/bin/genman man oc installManPage man/*.1 - installShellCompletion --bash contrib/completions/bash/* - installShellCompletion --zsh contrib/completions/zsh/* + # Remove unwanted tooling. + rm $out/bin/clicheck $out/bin/gendocs $out/bin/genman + + # Install shell completions. + installShellCompletion --cmd oc \ + --bash <($out/bin/oc completion bash) \ + --fish <($out/bin/oc completion fish) \ + --zsh <($out/bin/oc completion zsh) ''; passthru.tests.version = testers.testVersion { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix index a7544e50b3..ce363080f4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.4.2"; + version = "2.4.4"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-IzZBs6g6MQKofhMIdLr7ty7HzwF+SoyzCJ6RDMHt0mo="; + hash = "sha256-53VUZHA+yURikVtcXXa/fZqwAqwjukBKS4NQEBBoHew="; }; - vendorHash = "sha256-j7zg0vIhdYbzyi4owdVEF4XyUNwGds6J01+3k5K90Yg="; + vendorHash = "sha256-k6ODl+whgeeyd8XaOjTDjxfShpOztirjq/Tg98YP8Hs="; subPackages = [ "src/server/cmd/pachctl" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix index 32ce4d74a3..10c9c6be68 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix @@ -2,18 +2,18 @@ buildGoModule rec{ pname = "pinniped"; - version = "0.20.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-JKZij9f6zlBzbYolxz03R5j95zKELVmEhX+QRTxF/cc="; + sha256 = "sha256-gi6uFJFP3hdHJqH9y7Q8tUGRJECPHxbajU5BJeBcJzo="; }; subPackages = "cmd/pinniped"; - vendorSha256 = "sha256-szv/B7LG/In0j6MT6KCnuUfaCnK7RsJOLeuOtJ/ig9w="; + vendorHash = "sha256-4N8HtBeGeu22Go63dV0WBdbheXylButu+M9vZL7qOcU="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix index 8fc55abe92..c9af58b1a8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.11.0"; + version = "5.12.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-eyJ81i9kTuojBuo/rwfgnl3BRpiTnKst0SnL+oWfSWQ="; + sha256 = "sha256-WE/XWNBy5p8PEQ11s8nmW+HoVEkQB9cKoj5ZS8Suvs8="; }; - vendorSha256 = "sha256-QH/mKq7QydYvUHZIPjoBWy015Sghh30VdEWu76KZdPE="; + vendorHash = "sha256-F5Vh9wPd53bifLStk6wEwidPZvOjN87jn4RxJbSuW4o="; ldflags = [ "-w" "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix index 0d76b62a8e..b19b93e48f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rke"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-H5T7Hr6/YL93lbCLOxfQ+Kmv3C+FS074418mHhBV3Bs="; + hash = "sha256-4aT9SguxN7oaewnrxme1nCFfaQytSJ9Aeb0WEQACtUA="; }; vendorHash = "sha256-zV1lrJhzrUAcEk6jYLCFrHcYw3CZart46qXErCTjZyQ="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix index e30a1214c3..3312f95702 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix @@ -12,8 +12,6 @@ , R }: -with lib; - let spark = { pname, version, sha256, extraMeta ? {} }: stdenv.mkDerivation rec { @@ -26,7 +24,7 @@ let nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jdk python3Packages.python ] ++ extraPythonPackages - ++ optional RSupport R; + ++ lib.optional RSupport R; untarDir = "${pname}-${version}"; installPhase = '' @@ -38,12 +36,12 @@ let cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF export JAVA_HOME="${jdk}" export SPARK_HOME="$out/lib/${untarDir}" - '' + optionalString hadoopSupport '' + '' + lib.optionalString hadoopSupport '' export SPARK_DIST_CLASSPATH=$(${hadoop}/bin/hadoop classpath) '' + '' export PYSPARK_PYTHON="${python3Packages.python}/bin/${python3Packages.python.executable}" export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH" - ${optionalString RSupport '' + ${lib.optionalString RSupport '' export SPARKR_R_SHELL="${R}/bin/R" export PATH="\$PATH:${R}/bin"''} EOF @@ -64,10 +62,10 @@ let meta = { description = "Apache Spark is a fast and general engine for large-scale data processing"; homepage = "https://spark.apache.org/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; platforms = lib.platforms.all; - maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ]; + maintainers = with lib.maintainers; [ thoughtpolice offline kamilchm illustris ]; } // extraMeta; }; in 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 e20a5ebd1a..3b25ecaa31 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.15.10"; + version = "0.15.11"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SuOfRLCEASgiLsy0xeuA1z55+vSMb4VGZuk+OVLSWJA="; + sha256 = "sha256-HgMGwumLL0z3l1/UEoJleoKsErFvznddFc9mJuco9fA="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-uTDeYzq8XyjHHXfPQzN/ipHfqsPweedKhQQ8CkvqKIM="; + vendorSha256 = "sha256-WThZpum6sEYyDkwGKo3onMLy6hpmMJ/o6+5olX5nEjk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix index 255ec944c8..0d0d0ab084 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-o037LemAZhsHVIfAU0yVoNNbJ6g8ehlA4lFLN78Q8dY="; + hash = "sha256-tkgWrNew0dLBPQ2G96RdFoFDyPm4nOwgkkH/3DpBnRg="; }; - vendorHash = "sha256-HPuVDfVxbHbNaCRg/D4VeW0finbFB4eageiAzoax1wk="; + vendorHash = "sha256-mFuXRMIzEf4bx9jnQlFwFBpBDVXQ99jz2OGojp1EEh0="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix index 010527121e..29727e0a69 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-exPFlcbku51Bs/YISRyjl8iwLYRVS9ltRQPpd/QpnWk="; + sha256 = "sha256-RZLmbf9ginMbFAaUKL5mK5HIYQslP8Vu8zdh1OJ1P1Y="; }; - vendorSha256 = "sha256-eo4B2p5Yo1r5jro49mSetp9AFYhcTXbyy7wGuaFwbb0="; + vendorHash = "sha256-g9e0NesI7WdaTHZ57XRlo8as3IWAFlFW4nkyf6+kd40="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporalite/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporalite/default.nix index 8a4d53797f..a842a89628 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporalite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporalite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "temporalite"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "temporalio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rLEkWg5LNVb7i/2IARKGuP9ugaVJA9pwYbKLm0QLmOc="; + sha256 = "sha256-IEB9AFEt8U2zXYfbChfL/UH1rNSLPnfS396/cPE8UdE="; }; - vendorSha256 = "sha256-vjuwh/HRRYfB6J49rfJxif12nYPnbBodWF9hTiGygS8="; + vendorSha256 = "sha256-w86/XCMRGBmXM+oQ5+0qiX0fdwiKXvsmEkApuRLUOiA="; subPackages = [ "cmd/temporalite" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix index 590abb80ac..c10b43e1f8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { semver ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index b934ba3cd2..c698212db5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,14 +1,14 @@ { "aci": { "deleteVendor": true, - "hash": "sha256-Y2cNp2BuPEH5wAEwaMVSBgKoHrcy6d4eOlsGPqAxmoU=", + "hash": "sha256-vTDuSZjO3ZHCUBaIYB7fvXvBPYywGJy307x2rCejOzk=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "proxyVendor": true, "repo": "terraform-provider-aci", - "rev": "v2.5.2", + "rev": "v2.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-AB+uj4hQIYMVQHhw1cISB2TotNO8rw1iU0/gP096CoE=" + "vendorHash": "sha256-dEnQa1GaYrx2jxsRSJWlMmy1hGsXACsp+5PtGmSDL6E=" }, "acme": { "hash": "sha256-fK34A45plTqtOYGbq8CAtFnyMYOvdOKFycY7X5ZlRRY=", @@ -75,22 +75,22 @@ "vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M=" }, "argocd": { - "hash": "sha256-8gyNJrRmrLev53dmMMjpZ3COTwPg5FYaxYBgkrdAWXo=", + "hash": "sha256-FDI/kmgTWVhxJcy3ss8VABntOXJAIDIcz4cB6WtJd2Y=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v4.2.0", + "rev": "v4.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-U88K2CZcN7xh1rPmkZpbRWgj3+lPKN7hkB9T60jR1JQ=" + "vendorHash": "sha256-99PwwxVHfRGC0QCQGhifRzqWFOHZ1R7Ge2ou7OjiggQ=" }, "auth0": { - "hash": "sha256-BlMYx6Ockk8YpiA0wCu2tBwhUIznFJ9b4knSeKA6M/g=", + "hash": "sha256-3iB/Vcv6Vzs9teulhu0npl6IuIJRsKy8FkBcIPTKw8A=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v0.42.0", + "rev": "v0.43.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-OhtomdRIjKxELnSQGbZvrHAE1ag4VAyuSOMrZvZ5q0s=" + "vendorHash": "sha256-pRbhgukYRn0Ej0v/ANKZ3gtkmfL8qo1E6F/fKDNf/Iw=" }, "avi": { "hash": "sha256-0FcdVd7EGVHZ0iRonoGfjwYgXpJtUhqX5i925Ejhv54=", @@ -112,13 +112,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-J+x3D7EpV/Kzp98AuhK8pqR26xhItG+JyfkHKc+2IA0=", + "hash": "sha256-jZYeMQW2DTGE/KyUJYGFPHGjFUGgfl11kE1jucZ5sH4=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v4.51.0", + "rev": "v4.52.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-iL03vDNHPQTAbTRoEutRtQllFgD1wn7qFleuZ4n99q8=" + "vendorHash": "sha256-/6RbqOh5/Fpn25woV/AzmkTs1qnIo+sl3fKQxCtVZHQ=" }, "azuread": { "hash": "sha256-Byr6AJ1kP6fBxBCD8vLxQD5tz8fI3Z1fcCa0rXS9rhs=", @@ -130,11 +130,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-gWB1pZSv/lv5ZedPQIbcis5QA3g8JTIFeADh+Qte/rk=", + "hash": "sha256-eDlRnJUo561edblydjBGePJzMFRqtEqKnS+8HOhKGdA=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.39.1", + "rev": "v3.41.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -158,20 +158,20 @@ "vendorHash": "sha256-3PLBs8LSE5JPtrhmdx+jQsnCrfZQQEUGA7wnf9M72yY=" }, "bigip": { - "hash": "sha256-VntKiBTQxe8lKV8Bb3A0moA/EUzyQQ7CInPjKJL4iBQ=", + "hash": "sha256-nlk3ckrLNtPQ9s8uQ2jvARinPVF+A2T0IUY2rBcUFDk=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.16.1", + "rev": "v1.16.2", "spdx": "MPL-2.0", "vendorHash": null }, "bitbucket": { - "hash": "sha256-i9Ka0RoHWcrctgJIusQyySirLSXVbD9MFJ6gljzgSl4=", + "hash": "sha256-4uwMg2DXd7T4WqdfwcZHtsPMTTCqrwSngh01DYW5yko=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.29.1", + "rev": "v2.30.0", "spdx": "MPL-2.0", "vendorHash": "sha256-foMmZbNPLww1MN4UZwuynBDgt2w40aMqVINRw//Q0d0=" }, @@ -213,22 +213,22 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-S4iXhss4ASM4FJdBgElH/3IwpPFjUMy57BXG7C7p5+0=", + "hash": "sha256-xua8ZJjc+y6bzF/I2N752Cv22XAXvOjrH9Du1TdipM0=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.22.1", + "rev": "v1.23.0", "spdx": "MPL-2.0", "vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ=" }, "cloudflare": { - "hash": "sha256-X7rNVMl5K/Z0w/N6+5fuODjR08gF9s3jQ1HqCo3b1WU=", + "hash": "sha256-Y48H7P69ORr8U0yXf1HEBqh//oOmWn3Uj8GQ12PsV/M=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.32.0", + "rev": "v3.33.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-7X2T3C775Nq5jc7n41nBREUsOa+EYmBsfBJM5YIo9xI=" + "vendorHash": "sha256-3JH+4ExREL3vtq6CiQN0G0x08ScrzOf2pTAnsWcGgq8=" }, "cloudfoundry": { "hash": "sha256-/Zxj9cous0SjYxeDo+8/u61pqDwMGt/UsS/OC1oSR2U=", @@ -304,11 +304,11 @@ "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=" }, "digitalocean": { - "hash": "sha256-l/p2HStjvxF6UB1SnY3EoGjC/3t5FdlC6LMk7jn11KI=", + "hash": "sha256-ZTt/lfHWD9G/SbZ7mLKPjJAsva5bgRqvvX8Lh1Ci+ts=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.25.2", + "rev": "v2.26.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -368,11 +368,11 @@ "vendorHash": "sha256-NLvw606QxUwCDViLbR5LjoWGZnk48/zG0NownEATYKM=" }, "exoscale": { - "hash": "sha256-F1tYiEy9eQ7GcgVPNfe6Jy6hXEWdFHGXA6esAnOgiQE=", + "hash": "sha256-48msmXj7SFmi5TA0/QYm66oIETymWi5ayF+yExyp+hk=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.43.0", + "rev": "v0.44.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -424,40 +424,40 @@ "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-xv15HZLQAgibmWgMLcn32DeMl0jQSRbbh00YU18ASPg=", + "hash": "sha256-o/kJwByQDXgbazZPoYW4YeV7BK4Bb3pwQhnWMhW4klE=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.15.0", + "rev": "v5.16.0", "spdx": "MIT", "vendorHash": null }, "gitlab": { - "hash": "sha256-RCN4CRFffg1rhyNACo/5ebVzbvsUXf6otDRuxlF8RoM=", + "hash": "sha256-bCF6BLuzjUZToZKerfsGcav4DD6AWwOrlELxQKygHv4=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v15.7.1", + "rev": "v15.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-7XiZP51K/S5Al+VNJw4NcqzkMeqs2iSHCOlNAI4+id4=" + "vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE=" }, "google": { - "hash": "sha256-/UgxXHucsrt960zLQiPruqJLxjFriTrNKjeI1gNEWys=", + "hash": "sha256-yxw+LtrBhfZlTVh36o3uUdt3zGo7VLTjk5Cc8xoqhio=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.49.0", + "rev": "v4.51.0", "spdx": "MPL-2.0", "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, "google-beta": { - "hash": "sha256-EGwErLYIL0OEIZJQgQizJqqAsZwn1ewPOqAEyg4tC7Q=", + "hash": "sha256-KQxIi9EF59FTcWoiE5oTZx+lVV+Pb+PH0QIz02PztN4=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.49.0", + "rev": "v4.51.0", "spdx": "MPL-2.0", "vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o=" }, @@ -471,13 +471,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-cEoen5f/FmO241mvXBCs0lzsppybQCACaNYUWT597lU=", + "hash": "sha256-K1Pal5Fn6KxIlmcnOW6SNPdOzT9JExwhVRFDVTbaTug=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v1.33.0", + "rev": "v1.34.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Eb4J8udIAj7M+72//Pgc4jXhpZ1md1lnh4sKboXVObg=" + "vendorHash": "sha256-fTc0cNo/ZWUo2tORzDKSDjFsXYIMz+a2+Zsx4fzd3ic=" }, "gridscale": { "hash": "sha256-ahYCrjrJPEItGyqbHYtgkIH/RzMyxBQkebSAyd8gwYo=", @@ -544,11 +544,11 @@ "vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=" }, "huaweicloud": { - "hash": "sha256-GLAU/8GTo6XvNXLTu7fUUshW/b3NQyJkD/mdC+Dm3H8=", + "hash": "sha256-8H9DgpZukJ6K78H6YITPgWai8lPPb8O1tITRTl/azHw=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.44.0", + "rev": "v1.44.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -571,13 +571,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-DvJow7KDyv1wGBw0QIQQ4MoLgQIT8+Cf6fjc7w4W7Ds=", + "hash": "sha256-Qdb5HpamjCNGlqSf3etFv0++Skrk/jm6UVBFsKGU+jw=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.49.0", + "rev": "v1.50.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Vt1AKXJ8KRoDESFvUeZPTjUFm7gwP/Uji4hyU16GhjY=" + "vendorHash": "sha256-JkmfZ9yz3r26j1SHIwnyNA+nYWAy4DoaWEMfFUTzD3Y=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -643,11 +643,11 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-aKGcKmnlYxNS7SrFW2SouRQUXYy339qHrDtQMXGD4DE=", + "hash": "sha256-mjxFKCUmXg9CPz/ZZWPr1F8DSUadNroEEwvJgwHYk5s=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.16.1", + "rev": "v2.17.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -734,22 +734,22 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "minio": { - "hash": "sha256-QMaK/c4Rv7rChiVVGY8JizqTfLY98HwONyu5qU/LPGQ=", + "hash": "sha256-dfbmjl5gqffSE1sg5QEwzzbMXoL4bEKSFxU1bEdSMPs=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v1.10.0", + "rev": "v1.11.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-w/1eNrXK4Zpt80J1FidnhMAD0lhSskHMt/hrdrgfSYw=" + "vendorHash": "sha256-M2MlZNS4o1/GhQYiI72JVuhgfbNwa5ERFJjhB3nTpmE=" }, "mongodbatlas": { - "hash": "sha256-jYEeJoMqYo5BCsr8pZlowwUPdW/QrCoHiSpDrEGK9QQ=", + "hash": "sha256-OR9bvtg3DoJ4hFP/iqzQ1cFwWZYrUrzykN6sycd0Z6o=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.7.0", + "rev": "v1.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-9m+eukHaSdSstWBtjxpgYkgyQVXx0jmKfEz3D9YROO4=" + "vendorHash": "sha256-cvTIFjKYrIohRjUTxGOxgla2t/elj3Aw79kbVdaQbrY=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", @@ -816,22 +816,22 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-nky2PxHA9TznFh6IGrx3UvOuwrGPnQID04qlDQ4/rm4=", + "hash": "sha256-L8y00f+57hndpVevliJ2kNqpGeNR2Jv/FHbqkAUIRMI=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.104.0", + "rev": "v4.105.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-+aHlFu49BxdFqrVCEIEqpg+o2i4d5F1uZipc//Qipaw=", + "hash": "sha256-wKs5XRyyCda6pljtuo8ukAQl5ZZxeDSyt0CQWe8eXqY=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.40.0", + "rev": "v3.41.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-XwQTtOsg1rktv/Oc+eTJ+Jr+BJvLEQPCaRSeXdXxWB0=" + "vendorHash": "sha256-KWSHVI51YHHF3HXpyd1WB5Za721ak+cFhwDIfvC/ax4=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -843,11 +843,11 @@ "vendorHash": null }, "opennebula": { - "hash": "sha256-+EbEVwgo2HWmVhff7u5ohSJW8wuxK1kvWfvRWRwIP4o=", + "hash": "sha256-r8z5rpSvjNSDuvcRLtnOUFnBFFNAlcvfCbmW6LLHP5E=", "homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula", "owner": "OpenNebula", "repo": "terraform-provider-opennebula", - "rev": "v1.1.0", + "rev": "v1.1.1", "spdx": "MPL-2.0", "vendorHash": "sha256-zKtBDnvlQHe+q0OZUMUGu1gNsx2wIrIoArtJrt0VaBk=" }, @@ -861,20 +861,20 @@ "vendorHash": "sha256-hHwFm+gSMjN4YQEFd/dd50G0uZsxzqi21tHDf4mPBLY=" }, "opentelekomcloud": { - "hash": "sha256-brODSqSwZXy3B/F5jqPz1h5UJ2hNncG7tIpICJjoBW4=", + "hash": "sha256-D2RPpG1RE+bM7rVvmItczpRExMXK0RaKfJsnifvXRTs=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.32.2", + "rev": "v1.32.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-p01ZIAt8cUv/UklRnMu+TTmfEw8jdde9C4nUJrhA7wE=" + "vendorHash": "sha256-49ViIxICpvWgpv+uY0NTDvXGJthjH6aT38COfS+AOaQ=" }, "opsgenie": { - "hash": "sha256-6lbJyBppfRqqmYpPgyzUTvnvHPSWjE3SJULqliZ2iUI=", + "hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.18", + "rev": "v0.6.20", "spdx": "MPL-2.0", "vendorHash": null }, @@ -888,11 +888,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-0gEuIvgiFntP7dHmpkB3IRGMrAI8JbWG0zxiyNdFAiM=", + "hash": "sha256-utbV/EVSYIln0ruf4qis9rbKifx/DUct3tDOTUO22N0=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.9.2", + "rev": "v2.9.3", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1014,13 +1014,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-qzLP+IGZU5bms8zjtcUg9rApZW2+TCF7KrtqSQvr3lw=", + "hash": "sha256-9cGF/uyC/sqCx7Y9aEawkKVJvHE8siGgWRWWf4ok3B0=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v6.20.0", + "rev": "v6.22.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-zIF5NA5kHXEr3aUleWrCYg8PZTKnrFubaRlALnbTLHQ=" + "vendorHash": "sha256-Iue8P14x8P0lMa85goSF1D5mEeXw6dH1atJQhgbnZ6Y=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", @@ -1032,11 +1032,11 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-QikYp81omjlSckr/2oXCmAqiJlcMWuR120z86fP/zkE=", + "hash": "sha256-cocHU3xdlSAyBeOI5yLEo3j/ErfPwFIkkWgF4JB43fY=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.55.1", + "rev": "v0.56.2", "spdx": "MIT", "vendorHash": "sha256-ulgTRY8qQ5oXONkwYtffRl1QMNnbvyn0zYiYqqvwrUU=" }, @@ -1050,13 +1050,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-lRElAmLXm6SqZlxT6gD1HwhdjfGest1Bic7T1MCLAK4=", + "hash": "sha256-UivENbjPajJdH9PwHznMP+cLXBJ8C38wgHS2IqyoqRk=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.95.1", + "rev": "v1.97.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-vW+1tH+3bT70RrHOTKemM23e0EoX3AO5AMXOAuyyKPA=" + "vendorHash": "sha256-iQLZpSa1gJ4z2/r1Om9vFrcKP5ik7kcx+rNVZLhmSBc=" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", @@ -1104,13 +1104,13 @@ "vendorHash": null }, "tfe": { - "hash": "sha256-YhsAKyD3YYYWfxIHcAgMxdQc//0WQvXTsa+fVhSCG6U=", + "hash": "sha256-eFyRa4T+CqIeOcEYj4DQP6ypR7AROYrGDYuYSqBfKr0=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.41.0", + "rev": "v0.42.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-LgCS7W6mGGlX4vEhlPYL+Wo/urHv7aiopXWEBoEyL1c=" + "vendorHash": "sha256-bhAoNJSbrpAzw0qCKIm84h6tFqUWT0JeBs1gJpPeJdU=" }, "thunder": { "hash": "sha256-fXvwBOIW3/76V3O9t25wff0oGViqSaSB2VgMdItXyn4=", @@ -1250,13 +1250,13 @@ "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=" }, "yandex": { - "hash": "sha256-g3BdCQKBuxrTn/sScJtRMyL2EoiOF5MpMXMM6I++dEg=", + "hash": "sha256-aBWcxC6mHM/3GOjnN/Qi0DNoZjehh5i3C2+XRZ2Igdo=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "proxyVendor": true, "repo": "terraform-provider-yandex", - "rev": "v0.84.0", + "rev": "v0.85.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-q9Rs2yJtI7MVqBcd9wwtyqR9PzmVkhKatbRRZwFm3po=" + "vendorHash": "sha256-eLCFnBGAvH0ZEzOb5xVCY0Yy4U5V407AhpGSFpa9t7I=" } } 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 920c687176..bfe3411571 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.42.7"; + version = "0.43.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WbvRqXzqPBBhJU2ELgNC2jHnOYxmR7dZ1ynA8ObWdxU="; + hash = "sha256-GOYSFhKfe8+9YBNyfCEUDCMssH9cXZi1S/KJTqPgBhY="; }; - vendorHash = "sha256-ByFn2j2m5dON0No6mt1QiYm4vMRSymS5Tezaws9B9c4="; + vendorHash = "sha256-niU6DGKNhSV+nm+8jIP//AItBu5eWTasyeL/ADvY2zA="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index 339564f52a..19aaa36c7e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.30.9"; + version = "0.30.13"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vZthFaIsgpZ2aap9kRSH//AHHnOpekPIkwpz9Tt0lI4="; + sha256 = "sha256-W67aQIXp2TOtZuccjQUGC9gNtvdyUNWuU7VM2LOFkCg="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix index 2d24365466..84edb644af 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PkayQ1sLjnA+1Xatgs0EvZTCTfWV5uoYYtnKX8OAwYQ="; + sha256 = "sha256-7yyOpF/eIeJinTe0sHPWLLBUbKYDhphmW8qkOdYOdXM="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix index 271d82f4d8..ae56b05bd9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "1.2.195"; + version = "1.2.198"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-rNhCZO4Axeuc5jEAndjma7/jnst1kDNdtb/h/jD2rtE="; + hash = "sha256-fJDcVqHVN+2KXoqFCTACDevFtOllEGDMcQO/oDb6GMI="; }; vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk="; @@ -64,6 +64,10 @@ buildGoModule rec { integration/suites \ pkg/true_git/*test.go \ test/e2e + '' + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + # Remove failing tests. + rm -rf \ + cmd/werf/docs/replacers/kubectl/kubectl_test.go '' + lib.optionalString (CGO_ENABLED == 0) '' # A workaround for osusergo. export USER=nixbld diff --git a/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix index f13d3d321a..2229ed38bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = !stdenv.isDarwin; # check-dnstap.sh failing on Darwin - checkInputs = [ + nativeCheckInputs = [ cbor-diag cddl diffutils diff --git a/third_party/nixpkgs/pkgs/applications/networking/davmail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/davmail/default.nix index 68a14207e2..5826c94f4b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/davmail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/davmail/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; - homepage = "http://davmail.sourceforge.net/"; + homepage = "https://davmail.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/networking/diswall/default.nix b/third_party/nixpkgs/pkgs/applications/networking/diswall/default.nix index 6b3b7f2843..0a8ac44564 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/diswall/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/diswall/default.nix @@ -1,17 +1,24 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, darwin }: +let + inherit (darwin.apple_sdk.frameworks) Security; +in rustPlatform.buildRustPackage rec { pname = "diswall"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "dis-works"; repo = "diswall-rs"; rev = "v${version}"; - sha256 = "sha256-zT8RRg+Ver7dYtJL9htrZ8nXoD0V7IvdIqHTKDmbZ7c="; + sha256 = "sha256-3FTqT3IL48lYmGoB9u76RQSgZPbaq7IkOyQjyxwpkWA="; }; - cargoSha256 = "sha256-N+w1OiCy3scahFdYI49GpL301t1qNd/X4fdLMoQE/2s="; + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; + + cargoSha256 = "sha256-sb6s4Oc3W+I9DB0SGyZINxyWHCSpkakiEeQUatEpeEU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index 6012ed489b..7adcfc8a9a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.23.0"; + version = "3.25.0"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eIFrVeaNJcYSzMHo5I2g0isdkz/VZmw5mPTSBtdUgzM="; + sha256 = "sha256-XH9o1DTwG5ne5TZDgsS4HfC5WqLXc16JtjkKQtiE8z0="; }; - vendorSha256 = "sha256-fVxzPYyMihxcwWEey5b5mhiRkoSPK4ZOqzYg7zSj0zM="; + vendorSha256 = "sha256-iVyLNPvmzkI46Cp0SgbxK6xIQspJjpYjqPf3mOMoZvU="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/drive/default.nix b/third_party/nixpkgs/pkgs/applications/networking/drive/default.nix index ad1a0c9a53..576133e650 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/drive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/drive/default.nix @@ -1,25 +1,35 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "drive"; - version = "0.3.8.1"; - - goPackagePath = "github.com/odeke-em/drive"; - subPackages = [ "cmd/drive" ]; + version = "0.4.0"; src = fetchFromGitHub { owner = "odeke-em"; repo = "drive"; rev = "v${version}"; - sha256 = "1b9cgc148rg5irg4jas10zv9i2km75x1zin25hld340dmpjcpi82"; + hash = "sha256-mNOeOB0Tn5eqULFJZuE18PvLoHtnspv4AElmgEQKXcU="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-F/ikdr7UCVlNv2yiEemyB7eIkYi3mX+rJvSfX488RFc="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/odeke-em/drive/commit/0fb4bb2cf83a7293d9a33b00f8fc07e1c8dd8b7c.patch"; + hash = "sha256-4PxsgfufhTfmy/7N5QahIhmRa0rb2eUDXJ66pYb6jFg="; + }) + ]; + + subPackages = [ "cmd/drive" ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://github.com/odeke-em/drive"; description = "Google Drive client for the commandline"; license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/drive/deps.nix b/third_party/nixpkgs/pkgs/applications/networking/drive/deps.nix deleted file mode 100644 index ca132288bd..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/drive/deps.nix +++ /dev/null @@ -1,192 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "7450882a75c8d2600748666d1ed16e0a5afa532d"; - sha256 = "1hl2lsf9m1imdszf5mww4h6qrcjfdjghwh6l2kqsy85d32vbkjgd"; - }; - } - { - goPackagePath = "github.com/boltdb/bolt"; - fetch = { - type = "git"; - url = "https://github.com/boltdb/bolt"; - rev = "074dffcc83e9f421e261526d297cd93f22a34080"; - sha256 = "1kkmsby74n9czqx4mvng9x1cvnm4qgjl3dp6b4mfmg2b00fwbqnv"; - }; - } - { - goPackagePath = "github.com/cheggaaa/pb"; - fetch = { - type = "git"; - url = "https://github.com/cheggaaa/pb"; - rev = "ad4efe000aa550bb54918c06ebbadc0ff17687b9"; - sha256 = "0w6dl2s0vzb64q85yfy1hd5z2fq2vzwygiwl65is6hwa4vkc7hi3"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8"; - sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5"; - }; - } - { - goPackagePath = "github.com/odeke-em/cache"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/cache"; - rev = "baf8e436bc97557118cb0bf118ab8ac6aeeda381"; - sha256 = "00nvrnp40w4m1ld89k3s3gwi9qcfjxwi8hnp62zggnvqqyc4fyz1"; - }; - } - { - goPackagePath = "github.com/odeke-em/cli-spinner"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/cli-spinner"; - rev = "610063bb4aeef25f7645b3e6080456655ec0fb33"; - sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c"; - }; - } - { - goPackagePath = "github.com/odeke-em/command"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/command"; - rev = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561"; - sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62"; - }; - } - { - goPackagePath = "github.com/odeke-em/exponential-backoff"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/exponential-backoff"; - rev = "96e25d36ae36ad09ac02cbfe653b44c4043a8e09"; - sha256 = "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6"; - }; - } - { - goPackagePath = "github.com/odeke-em/extractor"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/extractor"; - rev = "801861aedb854c7ac5e1329e9713023e9dc2b4d4"; - sha256 = "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1"; - }; - } - { - goPackagePath = "github.com/odeke-em/go-utils"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/go-utils"; - rev = "d915395a7a46a9fe73d93f4daeff5953eeac5ef2"; - sha256 = "0c1z4vmz69vxak8ldw4qjcgwia5ph969gj80az7a3824gia7zhbh"; - }; - } - { - goPackagePath = "github.com/odeke-em/go-uuid"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/go-uuid"; - rev = "b211d769a9aaba5b2b8bdbab5de3c227116f3c39"; - sha256 = "086l4xmwkjl5qcylcb5iwy9ksk9k5g43xwfbkcgvmhpz5mq3wmz2"; - }; - } - { - goPackagePath = "github.com/odeke-em/log"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/log"; - rev = "cad53c4565a0b0304577bd13f3862350bdc5f907"; - sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w"; - }; - } - { - goPackagePath = "github.com/odeke-em/meddler"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/meddler"; - rev = "d2b51d2b40e786ab5f810d85e65b96404cf33570"; - sha256 = "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x"; - }; - } - { - goPackagePath = "github.com/odeke-em/pretty-words"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/pretty-words"; - rev = "9d37a7fcb4ae6f94b288d371938482994458cecb"; - sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl"; - }; - } - { - goPackagePath = "github.com/odeke-em/semalim"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/semalim"; - rev = "9c88bf5f9156ed06ec5110a705d41b8580fd96f7"; - sha256 = "0nq93dcl84cmlvg31rdk281ndlc2452zlh5s7i40hasi0z0kmn1k"; - }; - } - { - goPackagePath = "github.com/odeke-em/statos"; - fetch = { - type = "git"; - url = "https://github.com/odeke-em/statos"; - rev = "6f7e4db337bc11fc46d9b0456a93836cbbfe5141"; - sha256 = "1lijz3cxqxd78sl0nzfgvs675dg7q99jqwvhgisnk9n84ic4ffzj"; - }; - } - { - goPackagePath = "github.com/skratchdot/open-golang"; - fetch = { - type = "git"; - url = "https://github.com/skratchdot/open-golang"; - rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c"; - sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3"; - sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "6acef71eb69611914f7a30939ea9f6e194c78172"; - sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "1e695b1c8febf17aad3bfa7bf0a819ef94b98ad5"; - sha256 = "1sfgrc63jwslczkld7bsfipw1jm1rn06228dx0vc5gggd52155ys"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "eb84d1a029af1654777e7ba65c979085305c3e38"; - sha256 = "0ldmzcx5lxa81lcr39djcvyhd0ls11jlswj5877rinq3505ayf5l"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/applications/networking/droopy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/droopy/default.nix index e6dca02dac..47298fb4db 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/droopy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/droopy/default.nix @@ -1,7 +1,5 @@ { stdenv, lib, fetchFromGitHub, wrapPython, fetchpatch }: -with lib; - stdenv.mkDerivation { pname = "droopy"; version = "20160830"; @@ -32,7 +30,7 @@ stdenv.mkDerivation { wrapPythonPrograms ''; - meta = { + meta = with lib; { description = "Mini Web server that let others upload files to your computer"; homepage = "http://stackp.online.fr/droopy"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 07854f48fc..5ee8db44cc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { json-logging setuptools ]; - checkInputs = with python3Packages; [ bottle mock pytest-console-scripts pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ bottle mock pytest-console-scripts pytestCheckHook ]; disabledTests = [ # dnswanip connects to an external server to discover the diff --git a/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix b/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix index 032238d399..54d0b862b8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix @@ -44,7 +44,7 @@ in python3.pkgs.buildPythonApplication rec { webtest ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/goeland/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/goeland/default.nix index 946e145a57..4c82bcdd31 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/goeland/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "goeland"; - version = "0.12.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "slurdge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-R3ZkGTq0g90DkflLXr2MUBIv5Qspi3OM+sdDGqJYjyw="; + sha256 = "sha256-MD8wdXOZ8Kmun8AYv/zlRKwgAcGu2A349Xr8d7SVX4s="; }; - vendorSha256 = "sha256-iljGBe8c6dqEHRpMN5cz7wmminejoiXXDKuQDazDztA="; + vendorHash = "sha256-BErLmtzgVqDKLFAnKugDBwj3Vgm8rM6BfWcMOhu4SWY="; ldflags = [ "-s" @@ -23,14 +23,15 @@ buildGoModule rec { ]; meta = with lib; { - description = "An alternative to RSS2Email written in golang with many filters."; + description = "An alternative to rss2email written in golang with many filters"; longDescription = '' - Goeland excels at creating beautiful emails from RSS, - tailored for daily or weekly digest. It include a number of + Goeland excels at creating beautiful emails from RSS feeds, + tailored for daily or weekly digest. It includes a number of filters that can transform the RSS content along the way. - It can also consume other sources, such as a Imgur tag. + It can also consume other sources, such as Imgur tags. ''; homepage = "https://github.com/slurdge/goeland"; + changelog = "https://github.com/slurdge/goeland/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = [ maintainers.sweenu ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix index 5d5e8615a8..fafda428fe 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -17,23 +17,24 @@ , glib-networking , librsvg , gst_all_1 +, gitUpdater }: stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - sha256 = "sha256-ms0CVYSYccRuiLBZ+lEEyMH0Zhti5sMM49XuEUe9sKw="; + sha256 = "sha256-civHj8a5LYV3XaAjSJBdn15+8sdO/yLlWBXCNW56plA="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${finalAttrs.pname}-${finalAttrs.version}"; src = finalAttrs.src; - sha256 = "sha256-QbjXjdKMjGwXQ3DoyAJN1SxnHjVeAk140j1me/iWlZQ="; + sha256 = "sha256-vgqyFdc1m53SYqnYE6JLp1/tK7rFrohYOT/BTO6fUI0="; }; patches = [ @@ -87,6 +88,10 @@ stdenv.mkDerivation (finalAttrs: { gst-plugins-bad ]); + passthru.updateScript = gitUpdater { + rev-prefix = "v."; + }; + meta = with lib; { description = "A modern feed reader designed for the GNOME desktop"; homepage = "https://gitlab.com/news-flash/news_flash_gtk"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix index 08dcc091b9..132fe7f627 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -7,7 +7,7 @@ buildPythonApplication rec { version = "3.14"; propagatedBuildInputs = [ feedparser html2text ]; - checkInputs = [ beautifulsoup4 ]; + nativeCheckInputs = [ beautifulsoup4 ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index e94c981e48..f1225f87ee 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "4.2.4"; + version = "4.3.1"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-6JRANTUbHyMAuA7lhAQtlgJIW6l39XNUtKQMVN6FHJU="; + sha256 = "sha256-hfUtxPGPhPC2VgGLLIaYHlEMpXHAPZ5fkLL0glhyQcY="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix index cd020e2bd7..1cd83cda77 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ libmrss ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - checkInputs = [ cppcheck ]; + nativeCheckInputs = [ cppcheck ]; postPatch = '' substituteInPlace Makefile --replace -liconv_hook "" diff --git a/third_party/nixpkgs/pkgs/applications/networking/flent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flent/default.nix index 008579ea54..8da9a49f90 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flent/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { python.pkgs.pyqt5 python.pkgs.qtpy ]; - checkInputs = [ + nativeCheckInputs = [ python.pkgs.mock xvfb-run ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix index 6a8bed0c92..f14433b6c1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.5.17"; + version = "3.5.21"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-7r/3rB0TI/sRTi69+tx24dGjETBhX0KS1Arhg8aeoCk="; + hash = "sha256-VVZvr0h98bWJW9FNFr3/pw7pSqF62hCnr6iv9xSzXf8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix index 5ef5feb3a1..49bc342724 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix @@ -14,13 +14,13 @@ gcc12Stdenv.mkDerivation rec { pname = "freefilesync"; - version = "11.29"; + version = "12.0"; src = fetchFromGitHub { owner = "hkneptune"; repo = "FreeFileSync"; rev = "v${version}"; - sha256 = "sha256-UQ+CWqtcTwMGUTn6t3N+BkXs4qxddZtxDjcq7nz5F6U="; + hash = "sha256-7vdhSEh43mpVbrzJzt005EkwoXfknYnAC+FZIAZF020="; }; # Patches from ROSA Linux diff --git a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix index 49f2aaa37e..287e83ffa0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.61.0"; + version = "3.62.2"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - hash = "sha256-Cv7w5NolICaHsy7Wsf/NhELVs1vc0W308Cuy6pLimfc="; + hash = "sha256-p2cJY1yg6kdPaR9sYLGRM0rzB57xksB8NGUEuqtzjBI="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/gdrive/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gdrive/default.nix index b62bda3c46..20ef4e682c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gdrive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gdrive/default.nix @@ -1,24 +1,34 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "gdrive"; - version = "2.1.0"; - rev = version; - - goPackagePath = "github.com/prasmussen/gdrive"; + version = "2.1.1"; src = fetchFromGitHub { - owner = "prasmussen"; - repo = "gdrive"; - sha256 = "0ywm4gdmrqzb1a99vg66a641r74p7lglavcpgkm6cc2gdwzjjfg7"; - inherit rev; + owner = "prasmussen"; + repo = "gdrive"; + rev = version; + hash = "sha256-2dJmGFHfGSroucn4WgiV2NExBs5wtMDe2kX1jDBwbRs="; }; + deleteVendor = true; + vendorHash = "sha256-sHNP1YwnZYu0UfgLx5+gxJmesY8Brt7rr9cptlyk9Bk="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/prasmussen/gdrive/pull/585/commits/faa6fc3dc104236900caa75eb22e9ed2e5ecad42.patch"; + hash = "sha256-W8o2ZfhQFJISHfPavjx9sw5UB6xOZ7qRW4L0bHNddS8="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { - homepage = "https://github.com/prasmussen/gdrive"; + homepage = "https://github.com/prasmussen/gdrive"; description = "A command line utility for interacting with Google Drive"; - platforms = platforms.unix; - license = licenses.mit; + license = licenses.mit; + platforms = platforms.unix; maintainers = [ maintainers.rzetterberg ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/go-graft/default.nix b/third_party/nixpkgs/pkgs/applications/networking/go-graft/default.nix index 7e268e27f1..88319182a6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/go-graft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/go-graft/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "go-graft"; - version = "0.2.15"; + version = "0.2.16"; src = fetchFromGitHub { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-INoJcb6XUMvT1E56hC3BGK3Ax+v4jSRpZV12zpjYfMA="; + sha256 = "sha256-zdOcQ/+WXS7pDfnvYdb/FDjMT3yJdwnS8DoH2MIDcDs="; }; CGO_ENABLED = 0; ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ]; - vendorSha256 = "sha256-kKIekANzLY2TYFyII1/BkKkqPYgmHB9xEfAVhJyI8FI="; + vendorHash = "sha256-kx94B1XIXWJOY9Y69lNb/sHWVjsuFuOXrdtJFJrUuAs="; subPackages = [ "." ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 2367f847d1..81062c1eb7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { }; doCheck = true; - checkInputs = [ ounit2 ]; + nativeCheckInputs = [ ounit2 ]; buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix index 49b88c9fd6..a44f3f555d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ids/suricata/default.nix @@ -150,7 +150,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free and open source, mature, fast and robust network threat detection engine"; - homepage = "https://suricata-ids.org"; + homepage = "https://suricata.io"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ magenbluten ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix index bfe7ca2fcb..0c43ffbeea 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -4,6 +4,7 @@ , autoPatchelfHook , dpkg , makeWrapper +, wrapGAppsHook , alsa-lib , at-spi2-atk , at-spi2-core @@ -53,7 +54,9 @@ stdenv.mkDerivation rec { }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; + nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook ]; + + dontWrapGApps = true; buildInputs = [ alsa-lib @@ -109,6 +112,8 @@ stdenv.mkDerivation rec { # Wrap the startup command makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \ + "''${gappsWrapperArgs[@]}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ "''${gappsWrapperArgs[@]}" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 4450eefa6e..6badb7cda7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -1,6 +1,5 @@ { lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: -with lib; stdenv.mkDerivation rec { pname = "bitlbee-discord"; version = "0.4.3"; @@ -21,7 +20,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with lib; { description = "Bitlbee plugin for Discord"; homepage = "https://github.com/sm00th/bitlbee-discord"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index abd50868e0..3e09a6aa25 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -1,6 +1,5 @@ { lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: -with lib; stdenv.mkDerivation rec { pname = "bitlbee-mastodon"; version = "1.4.5"; @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { export BITLBEE_DATADIR=$out/share/bitlbee ''; - meta = { + meta = with lib; { description = "Bitlbee plugin for Mastodon"; homepage = "https://alexschroeder.ch/cgit/bitlbee-mastodon/about"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 580af6e2e0..441963f57d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -1,6 +1,5 @@ { lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, libgcrypt }: -with lib; stdenv.mkDerivation rec { version = "1.4.2"; pname = "bitlbee-steam"; @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with lib; { description = "Steam protocol plugin for BitlBee"; homepage = "https://github.com/jgeboski/bitlbee-steam"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index de8c4dc102..99ce3f8811 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -3,7 +3,6 @@ , enablePam ? false, pam ? null }: -with lib; stdenv.mkDerivation rec { pname = "bitlbee"; version = "3.6"; @@ -13,11 +12,11 @@ stdenv.mkDerivation rec { sha256 = "0zhhcbcr59sx9h4maf8zamzv2waya7sbsl7w74gbyilvy93dw5cz"; }; - nativeBuildInputs = [ pkg-config ] ++ optional doCheck check; + nativeBuildInputs = [ pkg-config ] ++ lib.optional doCheck check; buildInputs = [ gnutls libotr python3 ] - ++ optional enableLibPurple pidgin - ++ optional enablePam pam; + ++ lib.optional enableLibPurple pidgin + ++ lib.optional enablePam pam; propagatedBuildInputs = [ glib ]; @@ -25,8 +24,8 @@ stdenv.mkDerivation rec { "--otr=1" "--ssl=gnutls" "--pidfile=/var/lib/bitlbee/bitlbee.pid" - ] ++ optional enableLibPurple "--purple=1" - ++ optional enablePam "--pam=1"; + ] ++ lib.optional enableLibPurple "--purple=1" + ++ lib.optional enablePam "--pam=1"; patches = [ # This should be dropped once the issue is fixed upstream. @@ -46,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "IRC instant messaging gateway"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix index 997882bbc8..f750f7f9d6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee/plugins.nix @@ -1,7 +1,5 @@ { lib, runCommandLocal, bitlbee }: -with lib; - plugins: runCommandLocal "bitlbee-plugins" { inherit plugins; buildInputs = [ bitlbee plugins ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix index 67edd3d1b2..8613a2585e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/briar-desktop/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "briar-desktop"; - version = "0.3.1-beta"; + version = "0.4.0-beta"; src = fetchurl { - url = "https://desktop.briarproject.org/jars/linux/0.3.1-beta/briar-desktop-linux-0.3.1-beta.jar"; - sha256 = "841dc198101e6e8aa6b5ab6bd6b80e9c6b2593cb88bc3b2592f947baf963389d"; + url = "https://desktop.briarproject.org/jars/linux/${version}/briar-desktop-linux-${version}.jar"; + hash = "sha256-7zeIWsdPvROHGaf5igodlZss6Gow3kp6PX+QAzmxMnw="; }; dontUnpack = true; @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://code.briarproject.org/briar/briar-desktop"; license = licenses.gpl3; maintainers = with maintainers; [ onny ]; - platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix index 78178f0021..2e4dc6dbb5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "http://www.centerim.org/"; + homepage = "https://www.centerim.org/"; description = "Fork of CenterICQ, a curses instant messaging program"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index e637881d96..f1fc991770 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -1,17 +1,17 @@ -{ mkDerivation, stdenv, lib, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }: +{ stdenv, lib, cmake, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qtimageformats, qttools, boost, openssl, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "chatterino2"; - version = "2.3.5"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ozfLLoNUN+1SPXbMNbF1V5sdZgPZEA/J3xXzJP9D3uI="; + sha256 = "sha256-6t7Or2heyV0B5zdWZpN80iADe52faNVlIEZYtcixpZo="; fetchSubmodules = true; }; - nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; - buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl ]; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" mv bin/chatterino.app "$out/Applications/" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index d0679a07e0..142bd5e382 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { name = "cinny-desktop"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb"; - sha256 = "sha256-siEAIZ9cCIJZTkeZkvT5yrPjRGoOl7vjU98AUrhgJNw="; + sha256 = "sha256-ibUXNGgc23ndTqQKD0np5EH1T3xipVAmETbIy7akqkg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix index e9ae455658..807444696f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - hash = "sha256-Q6f24LRYCxdgAguUVl7jf7srkd2L1IptiBgHJQq2dHE="; + hash = "sha256-BqxEZgI9uxoUpl/CJ2jSWjNIpfP2N392C4h/muBlhZY="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index bd3d75bd66..3d9fc7627b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,7 +1,7 @@ { lib , buildNpmPackage , copyDesktopItems -, electron_18 +, electron_22 , buildGoModule , esbuild , fetchFromGitHub @@ -21,17 +21,17 @@ let libdeltachat' = libdeltachat.overrideAttrs (old: rec { - version = "1.106.0"; + version = "1.107.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-S53ghVFb1qDI7MVNbc2ZlHqDN4VRBFQJCJg2J+w0erc="; + hash = "sha256-fjiS7GZy1BLgmxu4LFOWgucORcVx+9KleQcga+hRkSY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${old.pname}-${version}"; - hash = "sha256-k4j814Ao7FAyd0w1nH2fuX1cJKjBkhPw0CVZqNU7Hqs="; + hash = "sha256-7XhSI/C0GEmsaL0UupvufB1bfPGbzSQJH720Y4/Do3o="; }; }); esbuild' = esbuild.override { @@ -48,16 +48,16 @@ let }; in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.34.2"; + version = "1.34.3"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-XOGfKa0eGVZKKKC0Pm2kw48XWWcrxCyDdYzCSKp+wco="; + hash = "sha256-6WZJD8lMsk1WNguMkXygBCTVpOzNkNuVZJ3Ygv6VBkM="; }; - npmDepsHash = "sha256-ZMXXBDVT5rHTzHOrKAUAezL/1UTMdzbBllG69kxg55M="; + npmDepsHash = "sha256-B91yQ/xi8+uyOllqYR7lZTfLBpJvZat1cIIJk9TkM/c="; nativeBuildInputs = [ makeWrapper @@ -105,7 +105,7 @@ in buildNpmPackage rec { $out/lib/node_modules/deltachat-desktop/html-dist/fonts done - makeWrapper ${electron_18}/bin/electron $out/bin/deltachat \ + makeWrapper ${electron_22}/bin/electron $out/bin/deltachat \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \ --add-flags $out/lib/node_modules/deltachat-desktop @@ -129,8 +129,6 @@ in buildNpmPackage rec { ]; }); - passthru.updateScript = ./update.sh; - meta = with lib; { description = "Email-based instant messaging for Desktop"; homepage = "https://github.com/deltachat/deltachat-desktop"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh deleted file mode 100755 index f31279cf4f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh +++ /dev/null @@ -1,32 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch prefetch-npm-deps - -set -euo pipefail -cd "$(dirname "$0")" - -owner=deltachat -repo=deltachat-desktop -nixpkgs=../../../../.. - -rev=$( - curl -s "https://api.github.com/repos/$owner/$repo/releases" | - jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output -) -ver=$(echo "$rev" | sed 's/^v//') -old_ver=$(tac default.nix | sed -n 's/.*\bversion = "\(.*\)".*/\1/p' | head -1) -if [ "$ver" = "$old_ver" ]; then - echo "Up to date: $ver" - exit -fi -echo "$old_ver -> $ver" - -hash=$(nix-prefetch -f "$nixpkgs" deltachat-desktop --rev "$rev") -tac default.nix \ - | sed -e "0,/version = \".*\"/s//version = \"$ver\"/" \ - -e "0,/hash = \".*\"/s//hash = \"${hash//\//\\/}\"/" \ - | tac \ - | sponge default.nix - -src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link) -hash=$(prefetch-npm-deps $src/package-lock.json) -sed -i "s,npmDepsHash = \".*\",npmDepsHash = \"$hash\"," default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix index 72e546286b..5a65b43a8a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -75,6 +75,9 @@ stdenv.mkDerivation rec { cmakeFlags = ["-DBUILD_TESTS=yes"]; + # Undefined symbols for architecture arm64: "_gpg_strerror" + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lgpg-error"; + doCheck = true; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix index 50ca9a3a0f..95f1625f1a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openasar"; - version = "unstable-2022-12-11"; + version = "unstable-2023-01-13"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "0b1d4685cb2c94f42441fc616eb24e69eda04647"; - hash = "sha256-cRYXgVgA5B9MaDGJIACJYjFNDAMajReKud0akiGBR4Q="; + rev = "40b27dd1b8dd48277207db1b165c220c3441484c"; + hash = "sha256-tDJxcnbX0REu8DX+bQ7i4JzvLl6lRyB7+/dnAJI18Ss="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json index 64a164c9b0..ccb7ecd153 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.11.17", - "desktopSrcHash": "VB7p/ThiwphcCd3loSwQ61TthR2ji0nX6l32Jrgv/NE=", - "desktopYarnHash": "15jsznsqxvi1bs26pmb7zfrybl071k3g3g6i0pm34mzs2r9nvrii", - "webSrcHash": "YeXsDyyoQnWNDnfx/7fMHooi48ST+LiA5ACy0gBnQaQ=", - "webYarnHash": "1zniyg869glhajcmcgq34qwmhb4jq2hbjqhhz6a79p892yx97chp" + "version": "1.11.22", + "desktopSrcHash": "UJesD6cshsf/NK2ZTzOtAUfH+8JcGP9oCLFhkgfM0E0=", + "desktopYarnHash": "0bq24rjf63rkq3jphv7raqaz2fnibmj41z905k5f3l4ln835ndfv", + "webSrcHash": "B2clSJgKkjvQdIXQgi3bBPaVTDKOjeNBOvkAtcPOkFI=", + "webYarnHash": "182fh1ayh1y98kbg4mn8fxqvljs19b02j4ivvjszm55dcpwfp1df" } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh index b02e1d0223..976b6cb0ba 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/update.sh @@ -1,9 +1,6 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github -# FIXME should fix itself on the next release -> remove the warning if that's the case -echo "WARNING: on the last update, the yarn.lock had to be patched. Please be careful when updating the hashes!" - if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the element packages." echo "Usage: $0 [git release tag]" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix index 035d8bad26..091bbf66e3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -56,7 +56,7 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ] ++ extraPythonPackages python3.pkgs; - checkInputs = [ xvfb-run dbus ]; + nativeCheckInputs = [ xvfb-run dbus ]; checkPhase = '' xvfb-run dbus-run-session \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix index 131ca7b913..715560c6e1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix @@ -21,7 +21,7 @@ , libnatpmp , libpulseaudio , libupnp -, libyamlcpp +, yaml-cpp , msgpack , opendht-jami , openssl @@ -62,7 +62,7 @@ stdenv.mkDerivation { libnatpmp libpulseaudio libupnp - libyamlcpp + yaml-cpp msgpack opendht-jami openssl diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix index 73d386b379..2869401b59 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { pname = "linphone-desktop"; - version = "4.4.10"; + version = "5.0.8"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-V3vycO0kV6RTFZWi6uiCFSNfLq/09dBfyLk/5zw3kRA="; + hash = "sha256-e/0yGHtOHMgPhaF5xELodKS9/v/mbnT3ZpE12lXAocU="; }; patches = [ @@ -54,7 +54,7 @@ mkDerivation rec { postPatch = '' echo "project(linphoneqt VERSION ${version})" >linphone-app/linphoneqt_version.cmake substituteInPlace linphone-app/src/app/AppController.cpp \ - --replace "LINPHONE_QT_GIT_VERSION" "\"${version}\"" + --replace "APPLICATION_SEMVER" "\"${version}\"" ''; # TODO: After linphone-desktop and liblinphone split into separate packages, diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix index 680833ca2e..e6b3d84c7b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, mkDerivation , fetchFromGitHub , cmake , asciidoc @@ -26,12 +25,13 @@ , qttools , re2 , spdlog +, wrapQtAppsHook , voipSupport ? true , gst_all_1 , libnice }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "nheko"; version = "0.11.1"; @@ -47,6 +47,7 @@ mkDerivation rec { cmake lmdbxx pkg-config + wrapQtAppsHook ]; buildInputs = [ @@ -82,6 +83,9 @@ mkDerivation rec { "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389 ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + preFixup = lib.optionalString voipSupport '' # add gstreamer plugins path to the wrapper qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 49114903a5..10d2cb87f8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { pydbus ]; - checkInputs = [ + nativeCheckInputs = [ pytest faker pytest-aiohttp diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix index f5d2479bda..2023997aa8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -9,11 +9,11 @@ let unwrapped = stdenv.mkDerivation rec { pname = "pidgin"; - version = "2.14.10"; + version = "2.14.12"; src = fetchurl { url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2"; - sha256 = "sha256-RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA="; + sha256 = "sha256-KwUka+IIYF7buTrp7cB5WD1EniqXENttNI0X9ZAgpLc="; }; nativeBuildInputs = [ makeWrapper intltool ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix index bd8c492ff2..7d83dcf2d2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -46,7 +46,7 @@ buildPythonApplication rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix index e97b6c5b3f..04c2fa27e5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - sha256 = "sha256-o2ydZodmMAYeU0IiczKNlzY2hgTJbzyJWO/cZSTfAuM="; + sha256 = "sha256-NvsrWkdINrQV7V9SLfjtlN+obgQb0u8d/QgjGpZ+fpc="; }; desktopItem = (makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix index 58cd952edb..5dcb220507 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchgit, libtoxcore , conf ? null }: -with lib; - let - configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); + configFile = lib.optionalString (conf!=null) (builtins.toFile "config.h" conf); in stdenv.mkDerivation { pname = "ratox"; @@ -22,12 +20,12 @@ in stdenv.mkDerivation { substituteInPlace config.mk \ --replace '-lsodium -lopus -lvpx ' "" - ${optionalString (conf!=null) "cp ${configFile} config.def.h"} + ${lib.optionalString (conf!=null) "cp ${configFile} config.def.h"} ''; makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with lib; { description = "FIFO based tox client"; homepage = "http://ratox.2f30.org/"; license = licenses.isc; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index 6d2d79c6c7..bb7c49c310 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -8,12 +8,12 @@ }: let - version = "1.10.3"; + version = "1.10.4"; pname = "session-desktop"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "sha256-I9YyzfI8EqH8LZe5E5BnD9lGPAdQo++l3yRClfN7+pY="; + sha256 = "sha256-pSVTfZvjqWVgx3FAbIJO6e26GHZbhZBppxEptEuozQo="; }; appimage = appimageTools.wrapType2 { inherit version pname src; 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 307a11055e..1fba61b8b0 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 @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.2.0"; - hash = "sha256-auOcMlwKPj5rsnlhK34sYe4JxlHCjb3e2ye8Cs12Qtc="; + version = "6.3.0"; + hash = "sha256-Mg7znebHiREC9QI5T7bWT4QXL8biDVBp0Z6Jgeid/gY="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.2.0-beta.2"; - hash = "sha256-NVwX2xG8QGVjENy6fSA13WQyTlYuF5frcS3asDDg4Ik="; + version = "6.4.0-beta.1"; + hash = "sha256-GR7RWFT20i5dx6XYrp73inCOQ2Hj2UjSXf5jmjfDKMU="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index ee1d6b8aed..e6116c9b42 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { --replace "/opt/${dir}/${pname}" $out/bin/${pname} autoPatchelf --no-recurse -- "$out/lib/${dir}/" - patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc-x64.node" + patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node" ''; # Tests if the application launches and waits for "Link your phone to Signal Desktop": diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 446c483f5b..904e47695d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20230109-1"; + version = "20230128-1"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-wPx1W0eaQHpA/jcZ+A7YFL5FwPqz12j/jPgxa1JeEM8="; + sha256 = "sha256-wYhftShCL9XozK0c7OLijqzveDvEvv9stpw+6CQND/Y="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 58c6501a1f..6e3a9e54f0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -65,8 +65,6 @@ , MetalKit }: -with lib; - let tg_owt = callPackage ./tg_owt.nix { abseil-cpp = abseil-cpp.override { @@ -99,14 +97,14 @@ stdenv.mkDerivation rec { ./shortcuts-binary-path.patch ]; - postPatch = optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i "13i#import " Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm substituteInPlace Telegram/CMakeLists.txt \ --replace 'COMMAND iconutil' 'COMMAND png2icns' \ @@ -122,7 +120,7 @@ stdenv.mkDerivation rec { python3 wrapQtAppsHook removeReferencesTo - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ # to build bundled libdispatch clang extra-cmake-modules @@ -143,7 +141,7 @@ stdenv.mkDerivation rec { rnnoise tg_owt microsoft_gsl - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ kwayland alsa-lib libpulseaudio @@ -151,7 +149,7 @@ stdenv.mkDerivation rec { glibmm jemalloc wayland - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ Cocoa CoreFoundation CoreServices @@ -192,7 +190,7 @@ stdenv.mkDerivation rec { "-DDESKTOP_APP_QT6=OFF" ]; - installPhase = optionalString stdenv.isDarwin '' + installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications cp -r Kotatogram.app $out/Applications ln -s $out/Applications/Kotatogram.app/Contents/MacOS $out/bin @@ -209,7 +207,7 @@ stdenv.mkDerivation rec { inherit tg_owt; }; - meta = { + meta = with lib; { description = "Kotatogram – experimental Telegram Desktop fork"; longDescription = '' Unofficial desktop client for the Telegram messenger, based on Telegram Desktop. diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index 7346d2071e..bd2f9e4b3f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -6,7 +6,7 @@ , ninja , yasm , libjpeg -, openssl +, openssl_1_1 , libopus , ffmpeg_4 , protobuf @@ -70,7 +70,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ libjpeg - openssl + openssl_1_1 libopus ffmpeg_4 protobuf diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix index 435268cdf6..73c71d294c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -1,7 +1,5 @@ { stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk, makeWrapper }: -with lib; - stdenv.mkDerivation { pname = "${kotatogram-desktop.pname}-with-webkit"; version = kotatogram-desktop.version; @@ -15,9 +13,9 @@ stdenv.mkDerivation { mkdir -p $out/bin makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \ --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ webkitgtk ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk ]} ''; meta = kotatogram-desktop.meta // { - platforms = platforms.linux; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 343e9069bc..a8b762ab7e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config libxslt python3 ]; buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls ]; - checkInputs = [ dbus ]; + nativeCheckInputs = [ dbus ]; configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix index c368c049da..cb6e8152ca 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { future ]; - checkInputs = with py.pkgs; [ + nativeCheckInputs = with py.pkgs; [ mock pytest coverage diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix index 4392f58799..7fee1f5c3a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; meta = with lib; { description = "Lightweight Tox client"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix index cf6410def0..1190a35c69 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -3,8 +3,6 @@ , xorg }: -with lib; - let bits = "x86_64"; @@ -19,7 +17,7 @@ let categories = [ "Network" ]; }; - tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; + tarball = "Wavebox_${lib.replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; in stdenv.mkDerivation { pname = "wavebox"; @@ -40,7 +38,7 @@ in stdenv.mkDerivation { alsa-lib gtk3 nss ]; - runtimeDependencies = [ (getLib udev) libnotify ]; + runtimeDependencies = [ (lib.getLib udev) libnotify ]; installPhase = '' mkdir -p $out/bin $out/opt/wavebox diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix new file mode 100644 index 0000000000..d032057203 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -0,0 +1,81 @@ +{ lib, stdenv, buildNpmPackage, fetchFromGitHub, copyDesktopItems +, python3, pipewire, libpulseaudio, xdg-utils, electron_22, makeDesktopItem }: + +buildNpmPackage rec { + name = "webcord"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "SpacingBat3"; + repo = "WebCord"; + rev = "v${version}"; + sha256 = "sha256-Buu7eKmI0UGV/9Kfj+urmDcjBtR9HSwW+mlHaYhfUa4="; + }; + + npmDepsHash = "sha256-PeoOoEljbkHynjZwocCWCTyYvIvSE1gQiABUzIiXEdM="; + + nativeBuildInputs = [ + copyDesktopItems + python3 + ]; + + libPath = lib.makeLibraryPath [ + pipewire + libpulseaudio + ]; + + binPath = lib.makeBinPath [ + xdg-utils + ]; + + # npm install will error when electron tries to download its binary + # we don't need it anyways since we wrap the program with our nixpkgs electron + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + # remove husky commit hooks, errors and aren't needed for packaging + postPatch = '' + rm -rf .husky + ''; + + # override installPhase so we can copy the only folders that matter + installPhase = '' + runHook preInstall + + # Remove dev deps that aren't necessary for running the app + npm prune --omit=dev + + mkdir -p $out/lib/node_modules/webcord + cp -r app node_modules sources package.json $out/lib/node_modules/webcord/ + + install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png + + makeWrapper '${electron_22}/bin/electron' $out/bin/webcord \ + --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \ + --prefix PATH : "${binPath}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \ + --add-flags $out/lib/node_modules/webcord/ + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "webcord"; + exec = "webcord"; + icon = "webcord"; + desktopName = "WebCord"; + comment = meta.description; + categories = [ "Network" "InstantMessaging" ]; + }) + ]; + + meta = with lib; { + description = "A Discord and Fosscord electron-based client implemented without Discord API"; + homepage = "https://github.com/SpacingBat3/WebCord"; + downloadPage = "https://github.com/SpacingBat3/WebCord/releases"; + changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ huantian ]; + platforms = electron_22.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index b889211390..d18761689e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -30,6 +30,7 @@ , libxkbcommon , udev , zlib +, libkrb5 # Runtime , coreutils , pciutils @@ -47,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.13.4.14461"; - versions.x86_64-darwin = "5.13.4.14461"; - versions.x86_64-linux = "5.13.4.711"; + versions.aarch64-darwin = "5.13.6.14918"; + versions.x86_64-darwin = "5.13.6.14918"; + versions.x86_64-linux = "5.13.5.431"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-gNlY7Cocv6t406o1biZj6UAiP5fwF+g/G2P2uN5bF7I="; + hash = "sha256-QY9z1bTKtL32HE4XWnBIvCNmDF+3x5N9BdfqJA+24fA="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-T5s8ERMNkdvIzsBq8ZtOUKu084/8uBjIoYgopkM09cI="; + hash = "sha256-eSPKzxDPXCbME0eTTDlfsI5KM5qRm79JTtnGJvpiS98="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-sQk5fS/bS7e0T0IJ7+UB956XmCAbeMYfS8BVwncpoy0="; + hash = "sha256-R0IMV/+R7AGFy/ZvNyyvIBv10t1x1U1X6jdHoo6UHKY="; }; }; @@ -102,10 +103,13 @@ let xorg.libxshmfence xorg.xcbutilimage xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm xorg.libXfixes xorg.libXtst udev zlib + libkrb5 ] ++ lib.optional (pulseaudioSupport) libpulseaudio); in diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix index cf48ba4420..931f951583 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { zulip ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales ] ++ (with python3.pkgs; [ pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix index 43bc47b17a..996677f8a1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.0.4"; + version = "1.0.5"; - vendorSha256 = "sha256-krjTtH8C1SGhaKMCtsbA2S9ognImof6mwD+vJ/qbyrM="; + vendorHash = "sha256-sLCgPXyOiGaigcVuwUU4+Lmb7SjopWKhCReBzrZyuRs="; src = fetchFromGitHub { owner = "ipfs-cluster"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "sha256-LdcCGUbrS6te03y8R7XJJOcG1j6uU0v8uEMeUHLeidg="; + hash = "sha256-c0COSf4ktFxkPJwzq/0RyG1JvNUvhdWpeRlrbAirGec="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix index 30aac1cb11..186f1a7402 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix @@ -2,8 +2,6 @@ , nixosTests }: -with lib; - perlPackages.buildPerlPackage rec { pname = "convos"; version = "7.02"; @@ -16,7 +14,7 @@ perlPackages.buildPerlPackage rec { }; nativeBuildInputs = [ makeWrapper ] - ++ optionals stdenv.isDarwin [ shortenPerlShebang ]; + ++ lib.optionals stdenv.isDarwin [ shortenPerlShebang ]; buildInputs = with perlPackages; [ CryptPassphrase CryptPassphraseArgon2 CryptPassphraseBcrypt @@ -29,7 +27,7 @@ perlPackages.buildPerlPackage rec { propagatedBuildInputs = [ openssl ]; - checkInputs = with perlPackages; [ TestDeep ]; + nativeCheckInputs = with perlPackages; [ TestDeep ]; postPatch = '' patchShebangs script/convos @@ -79,7 +77,7 @@ perlPackages.buildPerlPackage rec { ln -s $AUTO_SHARE_PATH/public/asset $out/asset cp -vR templates $out/templates cp cpanfile $out/cpanfile - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/convos '' + '' wrapProgram $out/bin/convos --set MOJO_HOME $out @@ -91,6 +89,6 @@ perlPackages.buildPerlPackage rec { homepage = "https://convos.chat"; description = "Convos is the simplest way to use IRC in your browser"; license = lib.licenses.artistic2; - maintainers = with maintainers; [ sgo ]; + maintainers = with lib.maintainers; [ sgo ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/jmeter/default.nix b/third_party/nixpkgs/pkgs/applications/networking/jmeter/default.nix index 935c4ae571..22cacdd01c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/jmeter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/jmeter/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; #NoClassDefFoundError: org/apache/logging/log4j/Level for tests - checkInputs = [ coreutils ]; + nativeCheckInputs = [ coreutils ]; installCheckPhase = '' $out/bin/jmeter --version 2>&1 | grep -q "${version}" diff --git a/third_party/nixpkgs/pkgs/applications/networking/jnetmap/default.nix b/third_party/nixpkgs/pkgs/applications/networking/jnetmap/default.nix index 2a686fdd8b..8aea49decb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/jnetmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/jnetmap/default.nix @@ -2,11 +2,12 @@ stdenv.mkDerivation rec { pname = "jnetmap"; - version = "0.5.4"; + version = "0.5.5"; + versionSuffix = "-703"; src = fetchurl { - url = "mirror://sourceforge/project/jnetmap/jNetMap%20${version}/jNetMap-${version}.jar"; - sha256 = "0nxsfa600jhazwbabxmr9j37mhwysp0fyrvczhv3f1smiy8rjanl"; + url = "mirror://sourceforge/project/jnetmap/jNetMap%20${version}/jNetMap-${version}${versionSuffix}.jar"; + sha256 = "sha256-e4Ssm2Sq/v1YZ7ZudAqgQ7Cz2ffwWbSmLFoKhaZvTPg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -15,12 +16,16 @@ stdenv.mkDerivation rec { dontUnpack = true; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" mkdir -p "$out/lib" cp "${src}" "$out/lib/jnetmap.jar" makeWrapper "${jre}/bin/java" "$out/bin/jnetmap" \ --add-flags "-jar \"$out/lib/jnetmap.jar\"" + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix b/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix index 22ea41ec43..e280b73900 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "2.9.35"; + version = "2.9.38"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-tRuT4freMDtFjmZuBV9WD9jQFUat8QAias5d+AN7IVo="; + sha256 = "sha256-QTO6MHiFx3nDXDaaVy7rCiR0ttBXt5oAw94/ZDTICOM="; }; - vendorSha256 = "sha256-2MevXSjjwXDjmiMhiZyv45a3OgDrliVcvHbXGRIOu1s="; + vendorHash = "sha256-QOu1azw3OUWaz7MRFGZ5CGX4bVegbFYp76/XpesnaUM="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix index d0050f7375..bc27b91a97 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/afew/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { python3Packages.setuptools python3Packages.notmuch chardet dkimpy ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ freezegun notmuch ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alot/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alot/default.nix index 889b893ea9..471b603f26 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/alot/default.nix @@ -47,7 +47,7 @@ with python3.pkgs; buildPythonApplication rec { urwidtrees ]; - checkInputs = [ + nativeCheckInputs = [ future gawk gnupg diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix index f896cc4386..bc5b692501 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -52,8 +52,6 @@ , enablePluginVcalendar ? true, libical }: -with lib; - let pythonPkgs = with python3.pkgs; [ python3 wrapPython pygobject3 ]; @@ -130,7 +128,7 @@ in stdenv.mkDerivation rec { buildInputs = [ curl gsettings-desktop-schemas glib-networking gtk3 ] - ++ concatMap (f: optionals f.enabled f.deps) (filter (f: f ? deps) features) + ++ lib.concatMap (f: lib.optionals f.enabled f.deps) (lib.filter (f: f ? deps) features) ; configureFlags = @@ -141,7 +139,7 @@ in stdenv.mkDerivation rec { "--disable-gdata-plugin" # Complains about missing libgdata, even when provided ] ++ - (map (feature: map (flag: strings.enableFeature feature.enabled flag) feature.flags) features); + (map (feature: map (flag: lib.strings.enableFeature feature.enabled flag) feature.flags) features); enableParallelBuilding = true; @@ -155,7 +153,7 @@ in stdenv.mkDerivation rec { cp claws-mail.desktop $out/share/applications ''; - meta = { + meta = with lib; { description = "The user-friendly, lightweight, and fast email client"; homepage = "https://www.claws-mail.org/"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix index e9e5fb5f70..43590c9d33 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple command line tool to check for new messages"; - homepage = "http://mailcheck.sourceforge.net/"; + homepage = "https://mailcheck.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ kovirobi ]; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix index e3da77531a..285fbdf357 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch; - checkInputs = [ file ]; + nativeCheckInputs = [ file ]; buildFeatures = lib.optionals withNotmuch [ "notmuch" ]; 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 e2dfcdc318..d7de9e971e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3"); checkTarget = "test"; - checkInputs = [ + nativeCheckInputs = [ which dtach openssl bash gdb man emacs ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 1e2d5c031d..90b7dbd28d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -4,8 +4,6 @@ assert gpgSupport -> gpgme != null; assert sslSupport -> openssl != null; -with lib; - stdenv.mkDerivation rec { pname = "sylpheed"; version = "3.7.0"; @@ -33,17 +31,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ] - ++ optionals gpgSupport [ gpgme ] - ++ optionals sslSupport [ openssl ] - ++ optionals stdenv.isDarwin [ Foundation ]; + ++ lib.optionals gpgSupport [ gpgme ] + ++ lib.optionals sslSupport [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Foundation ]; - configureFlags = optional gpgSupport "--enable-gpgme" - ++ optional sslSupport "--enable-ssl"; + configureFlags = lib.optional gpgSupport "--enable-gpgme" + ++ lib.optional sslSupport "--enable-ssl"; # Undefined symbols for architecture arm64: "_OBJC_CLASS_$_NSAutoreleasePool" NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework Foundation"; - meta = { + meta = with lib; { homepage = "https://sylpheed.sraoss.jp/en/"; description = "Lightweight and user-friendly e-mail client"; maintainers = with maintainers; [ eelco ]; 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 ed5c9843f2..d15b0d1d93 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "102.6.1"; + version = "102.7.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/af/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/af/thunderbird-102.7.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "417eb44163275bceea7251e544499f56056a16aa3defe97f9f26df0abaa8fe8b"; + sha256 = "f9c8f7fa943232b5e89a6200587c7b5294b216f581712e55936aa7354b0397a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ar/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ar/thunderbird-102.7.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9717df3c3020d2b6814eb8ce99eafa62f71f56cbe0d7515044b7ff88c763cf44"; + sha256 = "47cb5d16d4d3f4efe335a4d699e0dbd2b2e56c86d114aee36a0ef7a3187579e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ast/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ast/thunderbird-102.7.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "b6984f90666a29a922e098635504786716c38c0cafe243b5a1d43b64af64d0ee"; + sha256 = "3b958523d341048b0a29262d767139399904d2ee7c7de05a49ddd9974af81fad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/be/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/be/thunderbird-102.7.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d9060ad38fc5da77c9c709dbc498ce656d20668b16d2c811dc400bf9170aceee"; + sha256 = "38eb2f42f730ce040619cb71272a947820fa65a2ef8ffd24bf98c8dbf7796657"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/bg/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/bg/thunderbird-102.7.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "936c52b46c7671a3328e6ebdd9d0ff0e61e761efc0210f0c470893072d04d7a8"; + sha256 = "2b73de9089e1a61145b085e49c86c59ff9dc1069b81f9636755c606132df2169"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/br/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/br/thunderbird-102.7.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "5c82a79835dd1f94b54113c9982e01c1a5cbce09c89a8ca5783407669de35665"; + sha256 = "a9da8b7c88b7c588c1cbc3622fd02a263cd9655a46df5adb64149ef30ba8274c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ca/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ca/thunderbird-102.7.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "4461d13cef193613c490eb3194e4a49c8273cd18a6802450c1bec7a239ff3236"; + sha256 = "51552344dd81b36d06994232e04ff15b3f06657a9acb678fe1b187521074f65f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cak/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/cak/thunderbird-102.7.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "3382850dab21c32bf31b1ba10474a2cb017c16af5d3fc3697fe15dc39ccd9b40"; + sha256 = "5f67ae6e0697e2142f20adc6016c1bab8f418d4ff155b4ac2bc35b5ce93b0f97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cs/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/cs/thunderbird-102.7.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "1d9f24e160547e4af0d6420b443e2c36762a13bfe7a0c552162fac05c08d8b1b"; + sha256 = "b96b1a2dfbd4489710863fce3315b46d6a08ef94639a45b72e8304a22de93fba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/cy/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/cy/thunderbird-102.7.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "dcb3a9894021d08f31dc9b5eb14bff17bd4e0ae8009c9f65b444c1ff0aca4d91"; + sha256 = "113d5a113db16cf247d313c927229bbeb905d7e234f36b023b0d5bfbb70a53bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/da/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/da/thunderbird-102.7.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "0fed9e8faebbeadbeae53aa06a773b412d45adafde237742b93dfd9196c9e9e4"; + sha256 = "05d4ac5b3cc699ab0b1ce05310fdc855eb6914d163ce52f0dd136abb6d3f129c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/de/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/de/thunderbird-102.7.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "dd9a22884495c0d1ebb18fd7721688a2e14917684bc176c90578c8008d3836e8"; + sha256 = "9cd6557e6b12b6697b0adc9211aee9210854a2b346d93e492b59cabecc51b072"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/dsb/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/dsb/thunderbird-102.7.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2a84bf4e6862346bd03a05be6fdbeeb79347890294ec6f93809bedfa089005dd"; + sha256 = "d10d1d4acbd505f9432d8e3ea1710020ef7e0859f9f31a54c9cf14d7f91bc383"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/el/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/el/thunderbird-102.7.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "f758bd822941145ba0da6e296f12264329a30c3f1cb5b8ce16f9887ad89caf8b"; + sha256 = "651a6e1f5e49569ad65af74de39186629bb878d8a530286bcbe77feb55d5e89f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-CA/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/en-CA/thunderbird-102.7.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "4f0edd405507b23fac31461f9511f35aacd096d92a4b598801f021ac5d3021a8"; + sha256 = "ac29efcadcdbb2e90c3fd93ab1583968753861e64ad76c929635c61c60b7d862"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-GB/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/en-GB/thunderbird-102.7.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "15443e7ed39849346c562a67a673fb4bd39e05f8bf616fd7170e9352ea4b5404"; + sha256 = "d312ca0e8549ab802d5e1f8ffcbaa67fefdf100745959d0eb3c28a9245386e60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/en-US/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/en-US/thunderbird-102.7.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "501c5f0c97e89d5b5fb066b5f480cc3598a1bdc86dfc32482d3bf2c453ed29c3"; + sha256 = "a78cc228245bef172c7c75b884d4e4cc01858ff781e8c98d7f5f58c538d1dadf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-AR/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/es-AR/thunderbird-102.7.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "c228716b6c6bf78efdbfe877a01d98a697c048ba36b5b692d4a9e4f35c5c8359"; + sha256 = "857ce86bce565f1c6c5a3191a3307d3cf4ea961eb46c8caca778adbadbf1b1ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-ES/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/es-ES/thunderbird-102.7.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "35ff4ab3acdacaa17c31577f34e791f805f039fff636f696f483e0e77a13cdce"; + sha256 = "acc10ed435a63062ff3087663afe013bd1b9dfd1e5b01507ffec5ae714dc66be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/es-MX/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/es-MX/thunderbird-102.7.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "da0dac340fe0467d48c75ca25a0f0c6ca40e7904969aff5efac7d14b8e2a790e"; + sha256 = "ddbece82bfbe3a87c5c464ae095ab85b751a8a273e959bb72673641a54379737"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/et/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/et/thunderbird-102.7.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "840bef653741da3b19b85c645fed1375ba706dee4bf2e6c8684b9f50a2d54a35"; + sha256 = "b5daa1beeaf2bfcc752c72146b2a1825a423c3c4b77ae27dcb2f3f0a6f1f456d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/eu/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/eu/thunderbird-102.7.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "397a1a04b45f4035338328a52baa2bfc30be9f48fcc76137122d18e0a350fcd3"; + sha256 = "0cd04b7cbfa63c6dde7d878167aaaa2910374362f30612c465d7057026588673"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fi/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/fi/thunderbird-102.7.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "9af605e6b57db7d2c661ecd95f422b613f1819110bd9ceee7b8d4da546fbe069"; + sha256 = "151af6da31e71c79c225b8b7ecd5be43bfe9ebcbac4a4f854b20d19f0b1778a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/fr/thunderbird-102.7.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "44c4a26ba5da3ddd8fb5368529279a50ffc3593f3b7cef35eb903d915d7720c1"; + sha256 = "4f9ec3fa67bd4ae618d31f6554d921ed2488e2b0f072142e528e06c0e4aa33f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/fy-NL/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/fy-NL/thunderbird-102.7.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "74023e7e027554a79362cdaeb8921393e55d902c10653221c7edc9c245646f99"; + sha256 = "ef432088a17e039e817d3a11dcced4ed1b561145683348a7c124542be6871c4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ga-IE/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ga-IE/thunderbird-102.7.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "04f6ea825e23b89ea5f55d5fdf86c11ed7c4f224df2f5fbcb1b800a5f45b22f1"; + sha256 = "dafc4777f7649bc2cf42989be7454ca40904480ff43ccca1b85b01a7fac2d5da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/gd/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/gd/thunderbird-102.7.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "fb428e74e80863cc6a69b2f9ede1694daa490637c166c5aacc041fa70943b5b2"; + sha256 = "860895c8660f356bc4c881a6c51e79b67eeb69cba94f1fe1532af226cc8d4bda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/gl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/gl/thunderbird-102.7.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "c548d0f51b881b220dbc8c93a69add3f1b19579236b3e47d0bb3cccdb7d8647d"; + sha256 = "1e5bd20d59beb8fe1ceecbd6ca51f5772ab3241a35a085af9a8c8c5dad280844"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/he/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/he/thunderbird-102.7.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "b22faa9d7646eb8efa3fc0e15c966f7286b53c12d72baa534a92ba20432ff8b7"; + sha256 = "2d068ad6b002363499b8ba9e3c9196cba421887509f0e3c2d975b6b0f4ee6f9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/hr/thunderbird-102.7.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "05571451a11e827ba451354f97695e449afe85d7c7dcd2c0ff3aea24727272c5"; + sha256 = "f49a4449183e0c3f105ceb95e42761354f6a51a30da7b95178e78991077cc2f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hsb/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/hsb/thunderbird-102.7.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "a3c0f43e1db05456aea23dc1f17b1057eb86124cc14a1ca5e80b71b1518a1fda"; + sha256 = "c4ecca8fdc1604488b4c0a7f3b171b16da1d32a3d1098da2de99e2010645696f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hu/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/hu/thunderbird-102.7.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "6b0f9ac8947699adc325435be839cb0c08052db330d0d2c8327fce5f4cc2eb22"; + sha256 = "1c565300c297a3f734d02a02d0e5804eedf18ff319ddc2d831a50e9f1f8681c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/hy-AM/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/hy-AM/thunderbird-102.7.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "0150496630287f01ed05dcf9e3dda88a923936e77cac41e2df856d8f4298f240"; + sha256 = "08269187570c64b9b7f8e121e7aafdb7546b4c9a9ff127e8d2287ddd977f00b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/id/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/id/thunderbird-102.7.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "0a2946beef4068a760f139f32782cea1f7ed20d8d577448bed785146394094ed"; + sha256 = "c3ac21a8843631d24e69e6f28409cb609811130ea3454f1b2d72d8fe0008f02d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/is/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/is/thunderbird-102.7.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9e876cd8b01e9ec4c77311c325b807d3318a17c7d4943a42dd1faf6500f222fe"; + sha256 = "959722f9ba38954ae7b6b7f746646492fb44274f1add7a15f324ddea632008fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/it/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/it/thunderbird-102.7.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "92a90f181df2b5ef167a0b2fcbc5169615a39287b75a7428650bc679e211c755"; + sha256 = "fdea9f2b4496396211cbfb82c37e8a4ba8417df9d41a06a16d8bedfb5c004183"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ja/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ja/thunderbird-102.7.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a90c125ee302827c11ba1ec41f6548c7c42c88041713747aa7ecfdb84b307d92"; + sha256 = "cb8e2152dc44dd0311c1fc26427be109c652edd666e50ce64228083b45aae1f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ka/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ka/thunderbird-102.7.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "a26c7070396101c94c35a35aada3869309d19e060f8c4e44ffa77a9cb6d291e4"; + sha256 = "5cf0d73fbf3010631d47edefd8fc61bacc0afc5dfc70b10e8f15ea1acb9d01b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/kab/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/kab/thunderbird-102.7.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "4596eec5222f4fc3c9f27c3af1426880ec3846b981b5719bf97decde06f14580"; + sha256 = "a7fd302122033f17395682a938a4f4568769e78da5c65497efd9bcfe8f1ad55a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/kk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/kk/thunderbird-102.7.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "957df20187a944e587f16426b975e0b25dc274ac6ff0112f8ad96f7b520f35f3"; + sha256 = "4904675ec60a76be7520ce049c3ed20f65aa536706197134982d7f8f06354fa8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ko/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ko/thunderbird-102.7.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "77cb35952ebd1b14e661d6c67933fe5c28e5670e2a08399227e90e0d1665a149"; + sha256 = "5d68318f86e9b454a7e91c3a633ceeea4622c822c16cf195a15a98e5c283b8e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/lt/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/lt/thunderbird-102.7.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "fda5d9ee40b2a9266a14969187fe54f5dfa97b3029cd23bb4f74dba31139cb9b"; + sha256 = "653a51abc8d653986327971267045ec39dadb87ce2d45db07c89f7af6d071ae8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/lv/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/lv/thunderbird-102.7.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "088a7b5746926614ce27ec42ac8e50dfa573006e76bc2cb2cab8d94b820ed3db"; + sha256 = "baff4993f6342633b78c91b89c6310797fc2e47ff4eb1fde42944600928c24d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ms/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ms/thunderbird-102.7.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "827c08cdc65fbd81bdd326b2036071d2174d469c72224929af899c3af90cbb1b"; + sha256 = "84bc6e45f468fa2502ab724b1e83646517e2317336859ef511416cf1f816c99c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nb-NO/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/nb-NO/thunderbird-102.7.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "f049be571b8d9b39dae313d370e2510251a0521ab64cb82cb432843fb26c407b"; + sha256 = "f27e36fc612a6371d909d59b8b8d890d253d6377c73c688a88d3d91bb28e6fd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/nl/thunderbird-102.7.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "26fb69eceb626eb7482f67ef0043dd9fa58003b534bf4066aef3d51792ea1834"; + sha256 = "08b7fd31958fb59a79805ebef8750444e9611153b51ef629f7346f093668b0cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/nn-NO/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/nn-NO/thunderbird-102.7.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4e586bda023baecaee92853a4e6e993e35ce193ca2770071bc22ba2006109898"; + sha256 = "e8acc09fa7461276a4d0e0b1cffbb6a6957abc258f5cde21cd60a12b0fa4a699"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pa-IN/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/pa-IN/thunderbird-102.7.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "8fad3effac8d00d5a07466b94b8d51ad6ecc23552ffec658fef6d127b0b80e4b"; + sha256 = "dbc65a49363f155806bbe224e2f53f711fdf87fa187eec0b853edb4c247142cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/pl/thunderbird-102.7.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7dc544a10b244425e76e341fc1164b52e915fb5e6c12fc755bcca173810827b7"; + sha256 = "bd59abc1773c3f4d14fe01fe0e4d02e6cdf47bddfdf2fedafa379852dc73ce2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pt-BR/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/pt-BR/thunderbird-102.7.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "7b38735922511f3a03febc10e98fced7880a8874ccb53c3c946d4db225d02823"; + sha256 = "7f53b244392fe8623712039afcbf5e48733eda8c30ded65dde32e4fb943dcbb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/pt-PT/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/pt-PT/thunderbird-102.7.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4baa786ae442af119a3c9d794a31aedee06839b8dc9551b46028a4578c4086bc"; + sha256 = "f28fd3208ef49e51f5facd75c070c1752a3d98b7918664ea5f990f5dc691a26e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/rm/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/rm/thunderbird-102.7.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "087b4ecbbf95853ca6937a828f4f806d32f8c56d0feaf0f5e05628e2ca2e3ace"; + sha256 = "ca914636f9f8039b6b009d703874894dd1a9baa9a8ab689646a27ea5ec19335b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ro/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ro/thunderbird-102.7.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "d3324a4fc7ab8e00d35fb7d1a4c6567a3a3f1b4c50590ca206eb6d5a6b950842"; + sha256 = "6773c7b4cf3d08573b561184a4791e0d8df6ef7471e575d67ab3714471eb7d6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/ru/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/ru/thunderbird-102.7.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6a2d2daf0f325f8f033869b3fe4e644ba5022244bff1031b35a439e43999cf44"; + sha256 = "83a0fc3af145e4a8977fad8fefa8c61dea05da241968a402163390dc51783405"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/sk/thunderbird-102.7.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "275785c953e5c88adf3b234c604ded4b04a087f28f32bfbf39e0b3a8e1e64c82"; + sha256 = "aa1f6583a8b67cf82020add4af9b036430d9dd4c098329ffef838aa17f438283"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/sl/thunderbird-102.7.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "398725e455f26782f3d44a8165897bc375a9d0b7544e1ee37f70b77898ee4ff9"; + sha256 = "7d56a2519b6b42b7415c5e2a08542acd4deae999b9da8d050d9d569d2090891a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sq/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/sq/thunderbird-102.7.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "cd2c03610f93518a95bd75cc0c7fc867b3922aaaf7e891d67dd6562aa4bc3064"; + sha256 = "de0301f1146de978731630f4a409123c3632a5f28f969343b3a9174b4682f54a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/sr/thunderbird-102.7.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "bf380394a724353bf91fae056a00e1e8238a14bd1d221bb47cc2ad6247ec721f"; + sha256 = "66bf3ab91904a380a489461ea8b291fee3c85a042adebdc6e444776b6421dd93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/sv-SE/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/sv-SE/thunderbird-102.7.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "8b57f7ed92a353a970c063c9374303c273a190fcc04045a7fb9ed7774a2bbfb6"; + sha256 = "69b274c1142959d2a8a246a37cd5ff6c6942cfff94395d19a8d01ec4a4115629"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/th/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/th/thunderbird-102.7.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "99abebff09161c06c5985e74e5e1337153d99d13fa8661abf8e4f1895c12d1ff"; + sha256 = "9fdd24e43f32722026728ab5673dc29bbce95415be580e75417e5769ad9ad154"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/tr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/tr/thunderbird-102.7.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b17a54aab88fc7c13c3e5551f9b9a14153e124b19d58fef3da28392dd1a18157"; + sha256 = "480221e013d98ba46271b1448057da4c405831fba518d8266d1502759fcace1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/uk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/uk/thunderbird-102.7.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "63565388a50fe92887ec6adbbcb9a2ee9835873fbaee782901b7f7fd8e35500f"; + sha256 = "2e43643374b2ebae4b882c8fabdbffbe75351679711b8c07edb3f81bbff99e18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/uz/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/uz/thunderbird-102.7.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "ad501a7dd6f98f5b263fd7c71572632088a4801b52ccb6ee37ebf235162fddb1"; + sha256 = "ce9f9ae3a6750863dbd88a54964d28bef949fefdd00de91ca149fc73c3780929"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/vi/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/vi/thunderbird-102.7.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "fd5d17c2965a94fcc0e2d167d5f202a67a024c0797afcc92481a3413d6445ffe"; + sha256 = "6913bfd4043cbeb8adc1b60b54958b4b45ea581ed32430496cc3c6e368da0432"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/zh-CN/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/zh-CN/thunderbird-102.7.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e666ac3bd0f75b3f7915bfade39b044b69af7f3d5901c0f48311ff614f4d710b"; + sha256 = "bed56c6e8c86919cea51fbb8b945cdfc8b1470a350bc30a81f090da873e0dc3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-x86_64/zh-TW/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-x86_64/zh-TW/thunderbird-102.7.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "5c85008c1974b961e08065976a28b0897ff9d5199bc69e1c3c403a10d546156b"; + sha256 = "e88b4af743a6a4f3351d84faa299c24398efd4e0a885744e972f48c842664231"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/af/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/af/thunderbird-102.7.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "e8c7b235b856b7c3ff1859acf856c8917d5a1dfc7e4a6d2b9d4736b3709f9150"; + sha256 = "77a1191878ba739e961c585972e09667f71fafa910d1b88e3b1d4f2cf3b57c98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ar/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ar/thunderbird-102.7.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8594ee599a9bcd600b679e762956042e71cfcc60d6942f22ec9c3a25a0790f78"; + sha256 = "fdb2b78af9e5f88dd1cc553fa49f79fbb1992ec68a39534a62a4059e3c90c8a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ast/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ast/thunderbird-102.7.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "15d81d66cee46104d0ba9af9dd6704b1dfde2c3720a68fd23fe5181b56b2942d"; + sha256 = "49f60ad48a7cb25072f51da1f0f1d9927054a0770e68615554e3fc252b7c01a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/be/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/be/thunderbird-102.7.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "07bc7abcc461b68d4bd7015518a4ab0f00486c3104ff04fb195244af826ce99e"; + sha256 = "d59942a904f325937566e776bf7f5ee0040237161bbea5c018b0e15e324e054c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/bg/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/bg/thunderbird-102.7.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "3c3995a3c75d7100d3b5a37de7d96032b41365cc27337af3f90bc01c318c621b"; + sha256 = "cee56ce650ada3771572cbb8c5a66c9b199a09e8b5aaba4c39f50c7f625c2bc6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/br/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/br/thunderbird-102.7.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a390683e704cafa6b594028c02db0729519688b14284cbf4e23af06d797030b6"; + sha256 = "75bb61c9af7eee854513c33c1691ec599a3a0f102a2d2c92f60166d29b00e518"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ca/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ca/thunderbird-102.7.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "bae799d097b2a072b4f8ecee6dd18b91a07d08f070da39a22dbd669bffa9cb33"; + sha256 = "251f8a7c25fc836fdbe442d411b52e27a72fb959506b0024fc51998f88853888"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cak/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/cak/thunderbird-102.7.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "68af639a2d228cc8925702ab32c8f7e6fd9ed48c83111325d93b477811177f80"; + sha256 = "e35db0bdaa032eb35da0e7c5f5434cb945ee2c76f3f22f4340beca77b1dc276d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cs/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/cs/thunderbird-102.7.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "191ec59655ec025ca02360710b180899bb3486910b5c6721165b4cc8ec78f9b2"; + sha256 = "4bf3e15c819ef3eaeea8ee48637adcc3dea859295ed1efe48727198b8ec68286"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/cy/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/cy/thunderbird-102.7.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a65d91c31430b9b0b138014135d23d56e4ecd849aec398539c6dadb63fdbf03c"; + sha256 = "ec4b2793bac062f91abea3d861f2347d5979bd7cd82ca90d207f42275ee45924"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/da/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/da/thunderbird-102.7.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "9306558c123903497e2e5ad7968aa69e94b9c4e809f6f5b4d35b9aafcbc75ed0"; + sha256 = "d8c3aa1d3725fd3b916b2b011e45d269efcd41884135b77007a3ab09b32b5790"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/de/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/de/thunderbird-102.7.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ab06a47e5472db33702187a88bd8a794632809977632bf129f3d980b8a06ceb5"; + sha256 = "dfe4bb2548772f2216bf8f40e0e299f72a4623f8a3515322d6fef8479160eb65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/dsb/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/dsb/thunderbird-102.7.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "05adea0c112d5d481990a7960de93c7a61d055f8268cbf617b295f86daaeb5b9"; + sha256 = "bd6341d73b0e45f1652ae7e0edd521c6050da76ca74318a1c09c23ff578e7f64"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/el/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/el/thunderbird-102.7.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "6d4d1913ae19fa528aa6986c617226d30cd46099825afb2bae83b052f5aac490"; + sha256 = "519956e96b8a588bb9b7300241088b75936aa6cb867df750d755ef877ffc4113"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-CA/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/en-CA/thunderbird-102.7.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9919702fe73038c05cbcdf747126b22b7b4fd62549ad4d1361ef85fe6aa92f71"; + sha256 = "d5dcb62cf3afbbe51bf331f521c38c3fb42509966fab7cd3de4555cb01c8385f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-GB/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/en-GB/thunderbird-102.7.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "5d8b8bcf27c67d6a0c70bb6754167474e9bd9fb7489f1fd21f3754d27d872326"; + sha256 = "33ac02dd0b28c0d3b3a371fa7d18b9dad9d50ba12b5b998cd8035a509bd9d0c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/en-US/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/en-US/thunderbird-102.7.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "b24ea963c7e09d1f69b1297a6f86a7d0462403a9172d81ef47c375141d54cce9"; + sha256 = "eba918d5d1945d5a2be98026c5cedfb8fc766bcc70e85b74a056ee6cb839e17e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-AR/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/es-AR/thunderbird-102.7.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "1617dc229307d42e1a60ea44f359a62f042f53064360dac7ffd59b6a7c90da41"; + sha256 = "28d3585777d69e3923fc092a07f3792374bd94b4355e9158b412f61ba48260de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-ES/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/es-ES/thunderbird-102.7.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "9f19e6654ff4e2eab1d9f7ee555da87c270e60cffb820b000b7892583f4faf6f"; + sha256 = "a548a4a7f1ac802dab608bec15d3102f60985d4f72d7ed3ce5b4af6019dad3bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/es-MX/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/es-MX/thunderbird-102.7.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "7b055cfb21573399df99e4d6884cb4c61ce2221ac8ea463d1d2b7115d97ece2a"; + sha256 = "c521d75f86ec69e520be6782b0f8ae50ee11781fbb65efde907788c0f780d13a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/et/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/et/thunderbird-102.7.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "cbeef98898969cd7b858bb127c6ca8b6b9888cda0e230e303a8c4c777a30d151"; + sha256 = "0ce40eedd20d47f10052380716afceaaeecfa1794654e0fe3d91c164369be7e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/eu/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/eu/thunderbird-102.7.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "5e8160115595350cf5b0a44e71c09d32fbac65ffda9ac6f22cb5e910d18462c1"; + sha256 = "fe0bc3bef267629b43aa9a30888b776c23823bc39d3b8de1669737d050d0c6d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fi/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/fi/thunderbird-102.7.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "291883c64f376bad4b6345864d10f0e067123589a2b30f38dc24a99b25854949"; + sha256 = "a7df2ae00cc2d6528d68d23dc6dd87d5ab888d4ff8bc8926fa1f260f3e941249"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/fr/thunderbird-102.7.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "7b57f6a1f499a009176cd894df6fa9fd151b707b63aec8dfb62e426a294c53d4"; + sha256 = "1ba6ee69c2e06b3e14257668a025949eb52427530303dea7f239b875622e2265"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/fy-NL/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/fy-NL/thunderbird-102.7.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6e355a646c8dd77c72fe16c896c25572c9b87c4806364836b3681407bf7941b7"; + sha256 = "5738e2f246aa21dcd65b7793930a6fff7f1df4a6e1a961647b9e5909751631b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ga-IE/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ga-IE/thunderbird-102.7.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fc2b1fbfc5aeb15082e656c01a71943045233ee593c3e1710440a79f50d4c0cc"; + sha256 = "964250c97a1657e0be2336aa2b7396d687ed1b09eff3a78491494c3f1d1f6e6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/gd/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/gd/thunderbird-102.7.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "e8be8dba1751fb4633dc5bef4a047b3ff85ed9e799b89669f26f8e0e3125e30a"; + sha256 = "9edbd8aa70d19fb8c458cbb3150af7b493d56d9eef148e95062c98eb484b37c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/gl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/gl/thunderbird-102.7.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "78ffb29b73629b7d319bf752471608e3d44624b5b99b6eaea7f241901d623a05"; + sha256 = "7115f6a9d4ec73c67388705798fcc7fb66170327197797bb0e94ccbb8d1533df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/he/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/he/thunderbird-102.7.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3bb4469702756c39cb70b0639b825e922d769a9aae7e78f296d8188b039499b6"; + sha256 = "694b96cc2ef17776114c5dfab1dd6986ea19eb915f1e2949643c50088a41d371"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/hr/thunderbird-102.7.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "acd95b3717e6b617212c75be3b9e0b193f33cf5e5636d2ea535a720006f7cfe8"; + sha256 = "cc8fbcf5f2a2140de52393a65b47c3dc3f8d0a3c5beff3c4b03146bcb3b22d01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hsb/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/hsb/thunderbird-102.7.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7c65d7f28c713723c58ed62715404224b8f4163a1915f702d125f827e642b509"; + sha256 = "dd58e25c539fe156b77bd38cc605273fed8d2eb5539c258ded6c549bd77b62b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hu/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/hu/thunderbird-102.7.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "6d206289e4e8ef8db85c29ec001b91add5eac67bca3d7f5eb42099cdc9934c6b"; + sha256 = "043699375afb74a87cc56745b7adea8a7e4277ead73fe955ec47edeba79fe376"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/hy-AM/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/hy-AM/thunderbird-102.7.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "8823ea085d97bedddb4ea16517626dae9747db2450900eaa102139121eacc5fb"; + sha256 = "a3070020b912611f951627b4301b1b1731a12e9862c5abf6d84bfaec42d053f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/id/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/id/thunderbird-102.7.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e6fc35cb393f7a0cd63625700e11c313124a2542cebd431159e065c826581176"; + sha256 = "cce39d28bab265b125a2fb764286a6074c529c1a135a9fb8513dfe1e68610fe6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/is/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/is/thunderbird-102.7.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "f92db50f2f743436373da51e2f3b9bba7c4f6943254a70e7459ebb7d90dba3a0"; + sha256 = "65d698c2be8159f86b7747a595035cd48cfd8894a1219aeea7ba533c63749bb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/it/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/it/thunderbird-102.7.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "9cbf3eeb035ddd0f60c3404efc79faccb454fe406467a3c66d71b6ad4e87389e"; + sha256 = "38c3e6dd5119036cad3747a756182509743c257ab91bc3a46c4f072f4215061f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ja/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ja/thunderbird-102.7.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "38c5621f8b32d55b67a79103704541b14599bc67090216a9561ac1cb4c311bd8"; + sha256 = "e6f4afe7187bc11c4bc91dec7c389967b087b70d80d1b573b6b59b14a96f928a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ka/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ka/thunderbird-102.7.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "05b906fba741580368f52b7ddbc4772181f4d1fb4ecca20c94bfa0d41364383b"; + sha256 = "e02c55859edc5b6b71c3f04b07f6a17c3eb47020d38e77c0dc197f89cff77280"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/kab/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/kab/thunderbird-102.7.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a225ab4d086e1b21afa6d0d1d8b33434832f37c7bfc4982d2024783111cd7d01"; + sha256 = "7355fe55ef05aac5d1216e5dbeaf471840f8044a94dad10ee5d243355a64e490"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/kk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/kk/thunderbird-102.7.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "38f0349f890702adf3f6854893e3a8bec5d6244ecbd69b86fa839f417a9e86c8"; + sha256 = "0d941de8c8b07818e6a97f5548a018f62cf054095b3f5760dbc3e6bcad265295"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ko/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ko/thunderbird-102.7.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d838976ac2902cd6cd055480a1f4b7510abb83cb2448b64fb36d600525a90a88"; + sha256 = "21fbbfb40b32f916e4954c1b9bd2f5a9dfff38b040472b217f9d5890e2addc9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/lt/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/lt/thunderbird-102.7.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "14e66fca1018cdc74b7bb50c46def97b0c6f25d667f869fc0c17d8ac16d7cc5d"; + sha256 = "460cb7183c5f257e2059e50e3dcf14f9acdee91be7bc80c2b135c113daa5e818"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/lv/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/lv/thunderbird-102.7.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "6b7fa2d6c712b373f5013f3acf875f8ea8b8fdb582b6759e96469094b375540f"; + sha256 = "48312688f9473fc4295a3a53552f6905cd6b6976e4a0098d1efe7066de79d99a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ms/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ms/thunderbird-102.7.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "fc42cae3d6ba0910df7aaa2c1df8391e70da60a093aaff60287503feaae37260"; + sha256 = "af5a24aa0419353e8114cf5e680a33189991bc46ff96b1a7e29f92090698ffe8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nb-NO/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/nb-NO/thunderbird-102.7.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "0ffb1b18c916f9c27e5ba3ab8bb5ee3107e37f983c2645a1955e9a4904cd8c47"; + sha256 = "3366f4fcb3f59feab347401c1d54a53baeb7e2f02983f9a673474915dc0f2f90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/nl/thunderbird-102.7.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "fcd3a85abbff759ed27c314f0b9d47d1a216ebe9bdaa3926885be81b31fdcc5a"; + sha256 = "e1eb9ec9b93325b33870c2a748cbb0678c5a616bc2f32ec72f21bf7e4f8b1dd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/nn-NO/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/nn-NO/thunderbird-102.7.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "affde5a378f0ac70d48d7e4c75f6b2f680517cb2106a28aa4a53e376349b43d3"; + sha256 = "866ca87d6a1a77ee4781e2843a9dfade6a9d5c8c41dfa378b67c19579da8ba93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pa-IN/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/pa-IN/thunderbird-102.7.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "81984847af5c43eeb35870d39eb6e006d8b9df35b5e03135670973ae6f5f7d1d"; + sha256 = "cde4426c3216a9864b8ab252c1217b82cb848f62dec9a26e05beda0326a349a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/pl/thunderbird-102.7.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "4710f6042126da09159cb5d465909bea3dff62753b6c5811f8920ca7782bcf73"; + sha256 = "391ecdc9bfa27b41c09efcc2e9609ae2824f24d7f355951eef5c2bacec0ee023"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pt-BR/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/pt-BR/thunderbird-102.7.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "92c564bb0623a9a258fefdacd7a76a3e636ca5211f962c3b3a68cfb16cc5217a"; + sha256 = "dd8c4daaf09b28c099f66066e1c09a1b7663bb88442091f288c30bc13a681d69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/pt-PT/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/pt-PT/thunderbird-102.7.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "37fb096c984cd78174def41da70d0c352536b1780a817731759f35ac3554e330"; + sha256 = "99939e63236d92365732da29fff66172b32817728eac3413bd8b36b642d71f78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/rm/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/rm/thunderbird-102.7.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "b72355afb5333ef44336d4686141a44b4f291edf110c75168070959380bbac58"; + sha256 = "cd7575f2e15668f18f47f025ebf72da6ef1a6f78cf1cae3857b378fb8f4a5bb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ro/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ro/thunderbird-102.7.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "8536fa781ea743fce1379137da66394ce1f79ccce4daf4f9d5e2c28432c94466"; + sha256 = "0cc819fa94f6f24ff71a834df6377593ac9a5f3dafd5b6341f3f566e310626f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/ru/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/ru/thunderbird-102.7.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "69b0d192d7cb04aedff4f356e9520ef6ce5f8125fc2309c60a1e6073dee64cc3"; + sha256 = "3d10ea1e92cb98873dc281a1299209233d378d4dcd57e1e520e70f9d110fbea9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/sk/thunderbird-102.7.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "0a1c3955f1ccd027a45249b7d0d44f40fa8a47c680dcd0411d04cf8dacfacad2"; + sha256 = "4e08aad359fb2f50306057014c02998c277355260190da6feb80ed5dab79da48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sl/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/sl/thunderbird-102.7.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "e9659cb2099dd02c1a990914383f75569b01a1f39f1f79c1dd60b24129c0986c"; + sha256 = "c235916f09e170081f431ff4a9fbb65f269c6778018c48cbe723e932fa477461"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sq/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/sq/thunderbird-102.7.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "080493bf33a13e2e705d8200f8b6edf4f85ba292881d71df4dd38600fee105da"; + sha256 = "3d41b2d0069c8bda97cb517bb2edbfae9d545cff78fe72e5a211cf1b1d6a1d28"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/sr/thunderbird-102.7.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "dd1efccc8bfba45aef4e25d872652b39a05de669e57aa30827b09574968f4ab7"; + sha256 = "5c7e1077b4f6bacfc85c81372da06fffbf1b5a57339dda29d529fac709713e86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/sv-SE/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/sv-SE/thunderbird-102.7.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f04fee4bbcdcf35c18be80c3a0d5cfde8cd3c918854c254f775272a3a005e2e6"; + sha256 = "73a71fac92a39bea72b791e4cdb376fbee5a158d985baf55c02254377392c23f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/th/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/th/thunderbird-102.7.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "841d28387ddcc3fdbaec217a8bc987bbed43a735b1d0ffe2eeb8b6fa58458f47"; + sha256 = "362ace4cc7d2059c53b58b387c1ac8b19965f5bdba7e566f5b1392236567bdca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/tr/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/tr/thunderbird-102.7.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e4d793ff7e738389aabc7ec9d6893e2e4162e63996c36341f64af570b26f5f6a"; + sha256 = "0c43d20819707c2e0facfe1d79cde5ed5c77022be74bec0d250ca1426917a462"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/uk/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/uk/thunderbird-102.7.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "03fecaf497d2a4188474e4ee6a0fcf084a32d0903fa041cbe39eab29421f7276"; + sha256 = "0c96f8bffd2e2c8c4acff92685b8a4d2d0f138950928d5795c8459c0c07e6a71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/uz/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/uz/thunderbird-102.7.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "d463b9108838a61c153ae4a8fc69fb805881589b441206c08e583289ef18c314"; + sha256 = "b555e4b71142757d42e72073392e8a1b6002728e08177e04793a2fba54dbd671"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/vi/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/vi/thunderbird-102.7.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "8f7cb20aa60e27c1b776ea03842f38629044b6ee1c3c49df172c774cc387f409"; + sha256 = "f47a1e2fcc3b30405a1320583a18984085a92fcbbb803a37054217d73d8bb585"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/zh-CN/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/zh-CN/thunderbird-102.7.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "90d52ae6329d04ddfa8f37d5f54f98ee0893ece5a7c73c550fbea568538c7485"; + sha256 = "d2c9a379863ef070f40cdba997eaf3a33d78ef3be05d44785cc5a7f91e815238"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.6.1/linux-i686/zh-TW/thunderbird-102.6.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.7.1/linux-i686/zh-TW/thunderbird-102.7.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "35b625402841a21a128eaf7c92ff277c996d6ff07f269fdf92f0d6cb3e04876c"; + sha256 = "4b355e48855b7a67ba7fd8fdd5a46ec17ab21eab1e971fb07199163966f72ea3"; } ]; } 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 49985ac7bd..8fefcc1c31 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -5,13 +5,13 @@ rec { thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.6.1"; + version = "102.7.1"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "06ea2fce76c08609d638435869fddc1c4d7f4b748951ebfb2476b4dba9f1f76d3de2c11e5f62540f297a5d30bb0fc637852d8e57f4fadc2c905f299757949d83"; + sha512 = "6310f3f122a1a61917ec2d0efe3a031b199ac13681e9fb4035abc0f4de0dbafb12accffbd63facb23f2cebf0124a13f7538a33176a2a513d1f685bee40db50ba"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/update.nix b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/update.nix index 49e676d13f..c3e1c7e1d5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/update.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/update.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchShebangs $out/bin/update.sh wrapProgram $out/bin/update.sh --prefix PATH : ${lib.makeBinPath buildInputs} ''; - phases = [ "installPhase" ]; + dontUnpack = true; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix index 9042399601..479d098091 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix @@ -17,7 +17,7 @@ , Security , withKeyring ? true , libsecret -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd }: diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix index 9b1a609d83..dc8c5729dd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, dpkg , alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, pango, nspr, nss, gtk3, mesa -, xorg, autoPatchelfHook, systemd, libnotify, libappindicator +, wayland, xorg, autoPatchelfHook, systemd, libnotify, libappindicator , makeWrapper }: @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { unpackPhase = "dpkg-deb -x $src ."; - runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator ]; + runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator wayland ]; installPhase = '' runHook preInstall @@ -79,6 +79,9 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/mullvad-vpn --set MULLVAD_DISABLE_UPDATE_NOTIFICATION 1 + wrapProgram $out/bin/mullvad-daemon \ + --set-default MULLVAD_RESOURCE_DIR "$out/share/mullvad/resources" + sed -i "s|Exec.*$|Exec=$out/bin/mullvad-vpn $U|" $out/share/applications/mullvad-vpn.desktop runHook postInstall diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix index 9919937769..86f2467677 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix @@ -220,13 +220,13 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-common-9.0.2" = { + "@azure/msal-common-9.1.1" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "9.0.2"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.2.tgz"; - sha512 = "qzwxuF8kZAp+rNUactMCgJh8fblq9D4lSqrrIxMDzLjgSZtjN32ix7r/HBe8QdOr76II9SVVPcMkX4sPzPfQ7w=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.1.1.tgz"; + sha512 = "we9xR8lvu47fF0h+J8KyXoRy9+G/fPzm3QEa2TrdR3jaVS3LKAyE2qyMuUkNdbVkvzl8Zr9f7l+IUSP22HeqXw=="; }; }; "@azure/msal-node-1.0.0-beta.6" = { @@ -256,22 +256,22 @@ let sha512 = "o/Mf6lkyYG/eBW4/hXB9864RxVNmAkcKHjsGR6Inlp5hupa3exjSyH2KjO3tLO//YGA+tS+17hM2bxRl9Sn16g=="; }; }; - "@babel/parser-7.20.7" = { + "@babel/parser-7.20.13" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.7"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz"; - sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.13.tgz"; + sha512 = "gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw=="; }; }; - "@babel/runtime-7.20.7" = { + "@babel/runtime-7.20.13" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.7"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz"; - sha512 = "UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz"; + sha512 = "gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA=="; }; }; "@codemirror/autocomplete-6.4.0" = { @@ -283,13 +283,22 @@ let sha512 = "HLF2PnZAm1s4kGs30EiqKMgD7XsYaQ0XJnMR0rofEWQ5t5D60SfqpDIkIh1ze5tiEbyUWm8+VJ6W1/erVvBMIA=="; }; }; - "@codemirror/commands-6.1.3" = { + "@codemirror/commands-6.2.0" = { name = "_at_codemirror_slash_commands"; packageName = "@codemirror/commands"; - version = "6.1.3"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.1.3.tgz"; - sha512 = "wUw1+vb34Ultv0Q9m/OVB7yizGXgtoDbkI5f5ErM8bebwLyUYjicdhJTKhTvPTpgkv8dq/BK0lQ3K5pRf2DAJw=="; + url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.0.tgz"; + sha512 = "+00smmZBradoGFEkRjliN7BjqPh/Hx0KCHWOEibUmflUqZz2RwBTU0MrVovEEHozhx3AUSGcO/rl3/5f9e9Biw=="; + }; + }; + "@codemirror/lang-css-6.0.1" = { + name = "_at_codemirror_slash_lang-css"; + packageName = "@codemirror/lang-css"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.0.1.tgz"; + sha512 = "rlLq1Dt0WJl+2epLQeAsfqIsx3lGu4HStHCJu95nGGuz2P2fNugbU3dQYafr2VRjM4eMC9HviI6jvS98CNtG5w=="; }; }; "@codemirror/lang-javascript-6.1.2" = { @@ -382,13 +391,13 @@ let sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; - "@fontsource/open-sans-4.5.13" = { + "@fontsource/open-sans-4.5.14" = { name = "_at_fontsource_slash_open-sans"; packageName = "@fontsource/open-sans"; - version = "4.5.13"; + version = "4.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.13.tgz"; - sha512 = "/UzqP7ZFk145XAq8KG4pvFPP7UQhtreDGXgqXZjagCDreKxcrhwn/x7DYz9rPcycWkLUVApIybcoczGZiM0cRg=="; + url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.14.tgz"; + sha512 = "mBXIIETBlW8q/ocuUN0hyGow2iuf75hQEHQt8R/RJ/HcphVbLg8KB7pHYGbFGDqs75W+SWvTC7JkVeAjT65BuQ=="; }; }; "@fortawesome/fontawesome-common-types-0.2.36" = { @@ -445,13 +454,13 @@ let sha512 = "JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w=="; }; }; - "@fortawesome/vue-fontawesome-2.0.9" = { + "@fortawesome/vue-fontawesome-2.0.10" = { name = "_at_fortawesome_slash_vue-fontawesome"; packageName = "@fortawesome/vue-fontawesome"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.9.tgz"; - sha512 = "tUmO92PFHbLOplitjHNBVGMJm6S57vp16tBXJVPKSI/6CfjrgLycqKxEpC6f7qsOqUdoXs5nIv4HLUfrOMHzuw=="; + url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.10.tgz"; + sha512 = "OTETSXz+3ygD2OK2/vy82cmUBpuJqeOAg4gfnnv+f2Rir1tDIhQg026Q3NQxznq83ZLz8iNqGG9XJm26inpDeg=="; }; }; "@gar/promisify-1.1.3" = { @@ -643,6 +652,15 @@ let sha512 = "SVgiGtMnMnW3ActR8SXgsDhw7a0w0ChHSYAyAUxxrOiJ1OqYWEKk/xJd84tTSPo1mo6DXLObAJALNnd0Hrv7Ng=="; }; }; + "@lezer/css-1.1.1" = { + name = "_at_lezer_slash_css"; + packageName = "@lezer/css"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@lezer/css/-/css-1.1.1.tgz"; + sha512 = "mSjx+unLLapEqdOYDejnGBokB5+AiJKZVclmud0MKQOKx3DLJ5b5VTCstgDDknR6iIV4gVrN6euzsCnj0A2gQA=="; + }; + }; "@lezer/highlight-1.1.3" = { name = "_at_lezer_slash_highlight"; packageName = "@lezer/highlight"; @@ -652,6 +670,15 @@ let sha512 = "3vLKLPThO4td43lYRBygmMY18JN3CPh9w+XS2j8WC30vR4yZeFG4z1iFe4jXE43NtGqe//zHW5q8ENLlHvz9gw=="; }; }; + "@lezer/html-1.3.0" = { + name = "_at_lezer_slash_html"; + packageName = "@lezer/html"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.0.tgz"; + sha512 = "jU/ah8DEoiECLTMouU/X/ujIg6k9WQMIOFMaCLebzaXfrguyGaR3DpTgmk0tbljiuIJ7hlmVJPcJcxGzmCd0Mg=="; + }; + }; "@lezer/javascript-1.4.1" = { name = "_at_lezer_slash_javascript"; packageName = "@lezer/javascript"; @@ -760,13 +787,13 @@ let sha512 = "OWhCpdu4QqggOPX1YPZ4XVmLLRX+lhGjXV6RNA7sogOwLqlEmSslnN/lhR5dkhcWZbKWBQH29YCrB3LDPRu/IA=="; }; }; - "@oclif/core-1.24.0" = { + "@oclif/core-1.26.1" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "1.24.0"; + version = "1.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.24.0.tgz"; - sha512 = "J41suyV4fLfLcRRySZdtgFYSjIlpYqD90SY01Fm4+ZJUMcfDh/eQAD4sogyYOsIT0bfEzYOyYCjmfHmgcoX5aA=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-1.26.1.tgz"; + sha512 = "g+OWJcM7JOVI53caTEtq0BB1nPotWctRLUyFODPgvDqXhVR7QED+Qz3LwFAMD8dt7/Ar2ZNq15U3bnpnOv453A=="; }; }; "@oclif/errors-1.3.6" = { @@ -949,49 +976,49 @@ let sha512 = "gW69MEamZ4wk1OsOq1nG1jcyhXIQcnrsX5JwixVw/9xaiav8TCyjESAruu1Rz9yyInhgBXxkNwMeygKnN2uxNA=="; }; }; - "@sentry/core-7.31.0" = { + "@sentry/core-7.34.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.31.0"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.31.0.tgz"; - sha512 = "IZS1MZznyBOPw7UEpZwq3t3aaaVhFB+r3KM4JYFSJRr7Ky9TjldXA3hadNUTztjYGgEC3u8kB9jXoRvNXM2hqA=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.34.0.tgz"; + sha512 = "J1oxsYZX1N0tkEcaHt/uuDqk6zOnaivyampp+EvBsUMCdemjg7rwKvawlRB0ZtBEQu3HAhi8zecm03mlpWfCDw=="; }; }; - "@sentry/integrations-7.31.0" = { + "@sentry/integrations-7.34.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.31.0"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.31.0.tgz"; - sha512 = "pZyxY2t92gWmqULXsSEAjy5LMUyFWTA4f5AL+2gB5xmUjYXSaKT37R7sX5IQ2MVbCyrpJZERklx2LLhCrKtigw=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.34.0.tgz"; + sha512 = "xbWnTvG4gkKeCVpmhhdPtMbQkPO0RAfEJ8VPO5TWmUMT23ZWy2kE0gTZHtnBopy7AXxg231XxTi4fxnwgQGxEQ=="; }; }; - "@sentry/node-7.31.0" = { + "@sentry/node-7.34.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.31.0"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.31.0.tgz"; - sha512 = "DBjPfThZ5CIC2G9/CVFRlSOP/QqF1IoZXNpTUPZkhQ1cjShJeERT64jMkTdk+RAStSTpEfF6J0rUy1NIyHHEoQ=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.34.0.tgz"; + sha512 = "VM4XeydRdgeaNTRe8kwqYg2oNPddVyY74PlCFEFnPEN1NccycNuwiFno68kNrApeqxxLlTTmzkJy0BWo16x2Yg=="; }; }; - "@sentry/types-7.31.0" = { + "@sentry/types-7.34.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.31.0"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.31.0.tgz"; - sha512 = "nFqo7wyMnapdSEdw1MD+cavDtD9x5QQmh/bwLEOb/euM0cHFJHYyD7CveY/mQng4HyEVWY+DCtX/7E3GcQ7Bdw=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.34.0.tgz"; + sha512 = "K+OeHIrl35PSYn6Zwqe4b8WWyAJQoI5NeWxHVkM7oQTGJ1YLG4BvLsR+UiUXnKdR5krE4EDtEA5jLsDlBEyPvw=="; }; }; - "@sentry/utils-7.31.0" = { + "@sentry/utils-7.34.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.31.0"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.31.0.tgz"; - sha512 = "B1KkvdfwlaqM7sDp3/yk2No7WsbMuLEywGRVOLzXeTqTLSBRBWyyYIudqPtx2LDds9anlUHj21zs9FKY+S3eiA=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.34.0.tgz"; + sha512 = "VIHHXEBw0htzqxnU8A7WkXKvmsG2pZVqHlAn0H9W/yyFQtXMuP1j1i0NsjADB/3JXUKK83kTNWGzScXvp0o+Jg=="; }; }; "@servie/events-1.0.0" = { @@ -1012,22 +1039,22 @@ let sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; }; }; - "@swc/core-1.3.27" = { + "@swc/core-1.3.29" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.27.tgz"; - sha512 = "praRNgpeYGvwDIm/Cl6JU+yHMvwVraL0U6ejMgGyzvpcm1FVsZd1/EYXGqzbBJ0ALv7Gx4eK56h4GnwV6d4L0w=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.29.tgz"; + sha512 = "BYDBEqQ77ASZNQYTP7PlKnMLwbHh3lhtlzD/gQP2zIK9XhqQlcy/zIcLljYDn0EOogLn3IyaUiXgAzDWoAmWMg=="; }; }; - "@swc/wasm-1.3.27" = { + "@swc/wasm-1.3.29" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.27.tgz"; - sha512 = "bSFeKxGU2zY/xC3K7Y4sjdtHMgbv6gM2Z01PTMGoC8b2PVubPKeW+BYmprZFSf2eCOsNLZaVzVufdVTQB/ORfg=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.29.tgz"; + sha512 = "Tzpl541GRLyzQufasGScL9tMOzk0SsdcVX0jYpG74u6VZHqr0u62Cw6nYtRhTtkcsFsfNpg7RQM+CycyXY8Nmw=="; }; }; "@techteamer/ocsp-1.0.0" = { @@ -1111,6 +1138,15 @@ let sha512 = "yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ=="; }; }; + "@types/asn1-0.2.0" = { + name = "_at_types_slash_asn1"; + packageName = "@types/asn1"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/asn1/-/asn1-0.2.0.tgz"; + sha512 = "5TMxIpYbIA9c1J0hYQjQDX3wr+rTgQEAXaW2BI8ECM8FO53wSW4HFZplTalrKSHuZUc76NtXcePRhwuOHqGD5g=="; + }; + }; "@types/big.js-6.1.6" = { name = "_at_types_slash_big.js"; packageName = "@types/big.js"; @@ -1156,13 +1192,13 @@ let sha512 = "erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA=="; }; }; - "@types/express-4.17.15" = { + "@types/express-4.17.16" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.15"; + version = "4.17.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz"; - sha512 = "Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.16.tgz"; + sha512 = "LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA=="; }; }; "@types/express-jwt-0.0.42" = { @@ -1174,13 +1210,13 @@ let sha512 = "WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag=="; }; }; - "@types/express-serve-static-core-4.17.32" = { + "@types/express-serve-static-core-4.17.33" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.32"; + version = "4.17.33"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz"; - sha512 = "aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz"; + sha512 = "TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA=="; }; }; "@types/express-unless-2.0.1" = { @@ -1336,13 +1372,22 @@ let sha512 = "sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA=="; }; }; - "@types/validator-13.7.10" = { + "@types/uuid-9.0.0" = { + name = "_at_types_slash_uuid"; + packageName = "@types/uuid"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.0.tgz"; + sha512 = "kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q=="; + }; + }; + "@types/validator-13.7.11" = { name = "_at_types_slash_validator"; packageName = "@types/validator"; - version = "13.7.10"; + version = "13.7.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.10.tgz"; - sha512 = "t1yxFAR2n0+VO6hd/FJ9F2uezAZVWHLmpmlJzm1eX03+H7+HsuTAp7L8QJs+2pQCfWkP1+EXsGK9Z9v7o/qPVQ=="; + url = "https://registry.npmjs.org/@types/validator/-/validator-13.7.11.tgz"; + sha512 = "WqTos+CnAKN64YwyBMhgUYhb5VsTNKwUY6AuzG5qu9/pFZJar/RJFMZBXwX7VS+uzYi+lIAr3WkvuWqEI9F2eg=="; }; }; "@types/webidl-conversions-7.0.0" = { @@ -1381,13 +1426,13 @@ let sha512 = "xDWoEtxGXhH9Ku3ROYX/rzhcpt4v31hpPU5zF3UeVC/qxA3dChmqU8zvTUYoKh3j7rzpNsoFOwqsWG7XPMlaFA=="; }; }; - "@vue/devtools-api-6.4.5" = { + "@vue/devtools-api-6.5.0" = { name = "_at_vue_slash_devtools-api"; packageName = "@vue/devtools-api"; - version = "6.4.5"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz"; - sha512 = "JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="; + url = "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz"; + sha512 = "o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="; }; }; "@xmldom/xmldom-0.8.6" = { @@ -1435,13 +1480,13 @@ let sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; - "acorn-8.8.1" = { + "acorn-8.8.2" = { name = "acorn"; packageName = "acorn"; - version = "8.8.1"; + version = "8.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz"; - sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"; + sha512 = "xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="; }; }; "acorn-walk-8.2.0" = { @@ -1867,13 +1912,13 @@ let sha512 = "9cYNccliXZDByFsFliVwk5GvTq058Fj513CiR4E60ndDwmuXzTJEp/Bp8FyuRmGyYupLjHLs+JA9/CBoVS4/NQ=="; }; }; - "aws-sdk-2.1295.0" = { + "aws-sdk-2.1304.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1295.0"; + version = "2.1304.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1295.0.tgz"; - sha512 = "HVYoFCyfiL8gzL/c0lSRTg8tWBLfqAEDfwzGe338ww/LahpmC6C07S71SBBIvtGq3dpd7IwEobAbubZDijrA0Q=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1304.0.tgz"; + sha512 = "9mf2uafa2M9yFC5IlMe85TIc7OUo1HSProCQWzpRmAAYhcSwmfbRyt02Wtr5YSVvJJPmcSgcyI92snsQR1c3nw=="; }; }; "aws-sign2-0.7.0" = { @@ -1921,13 +1966,13 @@ let sha512 = "00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA=="; }; }; - "axios-retry-3.3.1" = { + "axios-retry-3.4.0" = { name = "axios-retry"; packageName = "axios-retry"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.3.1.tgz"; - sha512 = "RohAUQTDxBSWLFEnoIG/6bvmy8l3TfpkclgStjl5MDCMBDgapAWCmr1r/9harQfWC8bzLC8job6UcL1A1Yc+/Q=="; + url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.4.0.tgz"; + sha512 = "VdgaP+gHH4iQYCCNUWF2pcqeciVOdGrBBAYUfTY+wPcO5Ltvp/37MLFNCmJKo7Gj3SHvCSdL8ouI1qLYJN3liA=="; }; }; "babel-helper-vue-jsx-merge-props-2.0.3" = { @@ -2632,6 +2677,15 @@ let sha512 = "RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA=="; }; }; + "codemirror-lang-html-n8n-1.0.0" = { + name = "codemirror-lang-html-n8n"; + packageName = "codemirror-lang-html-n8n"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/codemirror-lang-html-n8n/-/codemirror-lang-html-n8n-1.0.0.tgz"; + sha512 = "ofNP6VTDGJ5rue+kTCZlDZdF1PnE0sl2cAkfrsCAd5MlBgDmqTwuFJIkTI6KXOJXs0ucdTYH6QLhy9BSW7EaOQ=="; + }; + }; "codemirror-lang-n8n-expression-0.1.0" = { name = "codemirror-lang-n8n-expression"; packageName = "codemirror-lang-n8n-expression"; @@ -2956,13 +3010,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.27.1" = { + "core-js-3.27.2" = { name = "core-js"; packageName = "core-js"; - version = "3.27.1"; + version = "3.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.27.1.tgz"; - sha512 = "GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.27.2.tgz"; + sha512 = "9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w=="; }; }; "core-util-is-1.0.2" = { @@ -3703,15 +3757,6 @@ let sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; }; }; - "entities-2.2.0" = { - name = "entities"; - packageName = "entities"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; - sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; - }; - }; "entities-4.4.0" = { name = "entities"; packageName = "entities"; @@ -3991,6 +4036,15 @@ let sha512 = "5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ=="; }; }; + "express-async-errors-3.1.1" = { + name = "express-async-errors"; + packageName = "express-async-errors"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-async-errors/-/express-async-errors-3.1.1.tgz"; + sha512 = "h6aK1da4tpqWSbyCa3FxB/V6Ehd4EEB15zyQq9qe75OZBp0krinNKuH4rAY+S/U/2I36vdLAUFSjQJ+TFmODng=="; + }; + }; "express-openapi-validator-4.13.8" = { name = "express-openapi-validator"; packageName = "express-openapi-validator"; @@ -4000,6 +4054,15 @@ let sha512 = "89/sdkq+BKBuIyykaMl/vR9grFc3WFUPTjFo0THHbu+5g+q8rA7fKeoMfz+h84yOQIBcztmJ5ZJdk5uhEls31A=="; }; }; + "express-prom-bundle-6.6.0" = { + name = "express-prom-bundle"; + packageName = "express-prom-bundle"; + version = "6.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-6.6.0.tgz"; + sha512 = "tZh2P2p5a8/yxQ5VbRav011Poa4R0mHqdFwn9Swe/obXDe5F0jY9wtRAfNYnqk4LXY7akyvR/nrvAHxQPWUjsQ=="; + }; + }; "express-unless-2.1.3" = { name = "express-unless"; packageName = "express-unless"; @@ -4486,13 +4549,13 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.1.3" = { + "get-intrinsic-1.2.0" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; - sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; + sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; }; }; "get-package-type-0.1.0" = { @@ -4882,13 +4945,13 @@ let sha512 = "4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA=="; }; }; - "http-cache-semantics-4.1.0" = { + "http-cache-semantics-4.1.1" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; + sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; }; }; "http-errors-2.0.0" = { @@ -4936,6 +4999,15 @@ let sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; + "humanize-duration-3.28.0" = { + name = "humanize-duration"; + packageName = "humanize-duration"; + version = "3.28.0"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.28.0.tgz"; + sha512 = "jMAxraOOmHuPbffLVDKkEKi/NeG8dMqP8lGRd6Tbf7JgAeG33jjgPWDbXXU7ypCI0o+oNKJFgbSB9FKVdWNI2A=="; + }; + }; "humanize-ms-1.2.1" = { name = "humanize-ms"; packageName = "humanize-ms"; @@ -5125,13 +5197,13 @@ let sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; - "ioredis-5.2.5" = { + "ioredis-5.3.0" = { name = "ioredis"; packageName = "ioredis"; - version = "5.2.5"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-5.2.5.tgz"; - sha512 = "7HKo/ClM2DGLRXdFq8ruS3Uuadensz4A76wPOU0adqlOqd1qkhoLPDaBhmVhUhNGpB+J65/bhLmNB8DDY99HJQ=="; + url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.0.tgz"; + sha512 = "Id9jKHhsILuIZpHc61QkagfVdUj2Rag5GzG1TGEvRNeM7dtTOjICgjC+tvqYxi//PuX2wjQ+Xjva2ONBuf92Pw=="; }; }; "ip-1.1.8" = { @@ -5917,6 +5989,15 @@ let sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="; }; }; + "ldapts-4.2.2" = { + name = "ldapts"; + packageName = "ldapts"; + version = "4.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ldapts/-/ldapts-4.2.2.tgz"; + sha512 = "UHe7BtEhPUFHZZ6XHnRvLHWQrftTap3PgGU0nOLtrFeigZvfpXSsqJ8C9uXNouDV+iDHqoWwplS0eHoDu/GIEQ=="; + }; + }; "leac-0.6.0" = { name = "leac"; packageName = "leac"; @@ -6538,6 +6619,15 @@ let sha512 = "TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg=="; }; }; + "markdown-it-13.0.1" = { + name = "markdown-it"; + packageName = "markdown-it"; + version = "13.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz"; + sha512 = "lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q=="; + }; + }; "markdown-it-emoji-2.0.2" = { name = "markdown-it-emoji"; packageName = "markdown-it-emoji"; @@ -6727,13 +6817,13 @@ let sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; - "minimatch-5.1.4" = { + "minimatch-5.1.6" = { name = "minimatch"; packageName = "minimatch"; - version = "5.1.4"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.4.tgz"; - sha512 = "U0iNYXt9wALljzfnGkhFSy5sAC6/SCR3JrHrlsdJz4kF8MvhTRQNiC59iUi1iqsitV7abrNAJWElVL9pdnoUgw=="; + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"; + sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; }; }; "minimist-1.2.7" = { @@ -6961,13 +7051,13 @@ let sha512 = "RjHwP2cCIWQ9iUIk1SziUMb9+jj5mC4OqG2w16E5yig8jySi/TwiFvKlwcjNrPsndph0HtgCtbENnk5julf3yQ=="; }; }; - "msgpackr-1.8.1" = { + "msgpackr-1.8.2" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.1.tgz"; - sha512 = "05fT4J8ZqjYlR4QcRDIhLCYKUOHXk7C/xa62GzMKj74l3up9k2QZ3LgFc6qWdsPHl91QA2WLWqWc8b8t7GLNNw=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.2.tgz"; + sha512 = "eLuPeok0DMwsGN23AvuVg32mYpx55tsQnxI87d8V1yZsdT8U5jrWhmCa1INO/joGAFQFfo/eTlM/BxVwLKbBOQ=="; }; }; "mssql-7.3.5" = { @@ -7024,49 +7114,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.151.1" = { + "n8n-core-0.152.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.151.1"; + version = "0.152.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.151.1.tgz"; - sha512 = "tEPdPaJVJ+Vy87UD0XXAq7yhTPYl+WuBABtS2u9mxKtfu4XyOepK6M34XJV5gJtgBXxIPy8+sNCKVaugUvSGAA=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.152.0.tgz"; + sha512 = "Bx+4vv3E7SwjFvxLDqzpDbJwVzDUYAw1QTcqAfMnHpkUM9uxlYHV5U3kgSsjpkw0TAF7RVVroHWFYWgnrW9XHA=="; }; }; - "n8n-design-system-0.51.1" = { + "n8n-design-system-0.52.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.51.1"; + version = "0.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.51.1.tgz"; - sha512 = "zK4UI/LkdRzAGZfL9K7/tZSLjxXTIKgt/72LrgEJ8CGNxYPavk0f7eYTH9Q8tbcLAaMLDjUcbcdzVEWh5YZofA=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.52.0.tgz"; + sha512 = "Dd6SdWYDjlhgrpPbof4DFPP4hPdpH9cA+3YkFSCgQLNyCi0RdqiQJqPQ5xQFlNVaxd6a7R69RHy/oNwt6/+cLw=="; }; }; - "n8n-editor-ui-0.177.1" = { + "n8n-editor-ui-0.179.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.177.1"; + version = "0.179.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.177.1.tgz"; - sha512 = "h9TnC1mKjXyBXe2V6/Yzy81KzDvll6wlBugqnFGpTAs2IwjPDZ3WGwp94mCWwM7WDE9m2Ub9LX88ajj5WG8RyQ=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.179.0.tgz"; + sha512 = "mo1HoCA7myKzkNkZgmjp9UZ5euxDUX+ZPAyLCoxI+HXki3mhVxELeffzbkBiXAfezi9xlaYAKzehg5HuUyiHjg=="; }; }; - "n8n-nodes-base-0.209.1" = { + "n8n-nodes-base-0.211.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.209.1"; + version = "0.211.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.209.1.tgz"; - sha512 = "Ewpk1zuH1W3SZlsb1YRQJ5yOZUTD3m/VdKJE1UTTu2lwDqk+h8DhxmrLDY4AEcwm6Teyq8hjj0l1awCa1+Ppzg=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.211.0.tgz"; + sha512 = "AoERAZJTuztzCuVvSeAPJk0fko4XcnlK7oweum08+0C1g0X1o9iHQE2kkoHwTxsY77eS6mRbGd2r6OCggpKftQ=="; }; }; - "n8n-workflow-0.133.1" = { + "n8n-workflow-0.134.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.133.1"; + version = "0.134.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.133.1.tgz"; - sha512 = "T3Es12JyM50FpJFogz0wKbzPOUC2iCDoL8/2br3oNU1Q53i4MfGAE2Ftf9hHOMF8pU9SN+m/D5WR3ELysI0PSQ=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.134.0.tgz"; + sha512 = "m9sbI29zCXSeFprBEQ+Lqk1E53iI2Dbu0LoL+5Nw3fBcbxnTYCxReD9pSssZSKlHzb9BHSMSYeZk4pK5RyQuvw=="; }; }; "named-placeholders-1.1.3" = { @@ -7195,13 +7285,13 @@ let sha512 = "L8RfEgjBTHAISTuagw51PprVAqNZoG6KSB6LQ6H1bskMVkFs5E71IyjauLBv3XbuomJlguWF/VnRHdJ1gqiAqA=="; }; }; - "node-abort-controller-3.0.1" = { + "node-abort-controller-3.1.1" = { name = "node-abort-controller"; packageName = "node-abort-controller"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz"; - sha512 = "/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw=="; + url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz"; + sha512 = "AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ=="; }; }; "node-addon-api-4.3.0" = { @@ -7321,13 +7411,13 @@ let sha512 = "EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ=="; }; }; - "nodemailer-6.9.0" = { + "nodemailer-6.9.1" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.0.tgz"; - sha512 = "jFaCEGTeT3E/m/5R2MHWiyQH3pSARECRUDM+1hokOYc3lQAAG7ASuy+2jIsYVf+RVa9zePopSQwKNVFH8DKUpA=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.1.tgz"; + sha512 = "qHw7dOiU5UKNnQpXktdgQ1d3OFgRAekuvbJLcdG5dnEo/GtcTHRYM7+UfJARdOFU9WUQO8OiIamgWPmiSFHYAA=="; }; }; "nopt-5.0.0" = { @@ -7996,6 +8086,15 @@ let sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw=="; }; }; + "pg-8.9.0" = { + name = "pg"; + packageName = "pg"; + version = "8.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz"; + sha512 = "ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg=="; + }; + }; "pg-connection-string-2.5.0" = { name = "pg-connection-string"; packageName = "pg-connection-string"; @@ -8005,13 +8104,13 @@ let sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; }; }; - "pg-cursor-2.7.4" = { + "pg-cursor-2.8.0" = { name = "pg-cursor"; packageName = "pg-cursor"; - version = "2.7.4"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.7.4.tgz"; - sha512 = "CNWwOzTTZ9QvphoOL+Wg/7pmVr9GnAWBjPbuK2FRclrB4A/WRO/ssCJ9BlkzIGmmofK2M/LyokNHgsLSn+fMHA=="; + url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.8.0.tgz"; + sha512 = "LrOaEHK+R1C40e+xeri3FTRY/VKp9uTOCVsKtGB7LJ57qbeaphYvWjbVly8AesdT1GfHXYcAnVdExKhW7DKOvA=="; }; }; "pg-int8-1.0.1" = { @@ -8059,22 +8158,22 @@ let sha512 = "BKlHCMCdNUmF6gagVbehRWSEiVcZzPVltEx14OJExR9Iz9/1R6KETDWLLGv2l6yRqYFnEZZy1VDjRhArzeIGrw=="; }; }; - "pg-protocol-1.5.0" = { + "pg-protocol-1.6.0" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; - sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz"; + sha512 = "M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="; }; }; - "pg-query-stream-4.2.4" = { + "pg-query-stream-4.3.0" = { name = "pg-query-stream"; packageName = "pg-query-stream"; - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.2.4.tgz"; - sha512 = "Et3gTrWn4C2rj4LVioNq1QDd7aH/3mSJcBm79jZALv3wopvx9bWENtbOYZbHQ6KM+IkfFxs0JF1ZLjMDJ9/N6Q=="; + url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.3.0.tgz"; + sha512 = "+Eer4Y1e43rAaphFNu9/VJKn9nKTApFKCSwVtDjXYnuO4QYqWHOEkApmGJv8gvaU5T6fcuEtjsN24gk+Rx7X9A=="; }; }; "pg-types-1.13.0" = { @@ -8248,13 +8347,13 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; - "posthog-node-2.2.3" = { + "posthog-node-2.3.0" = { name = "posthog-node"; packageName = "posthog-node"; - version = "2.2.3"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.2.3.tgz"; - sha512 = "dYlLZhrDus+uRov/Hh+EiRlMoMhRKchNjNa7mNE2iWmKg/ryOTipf0XYKS9UKdki7aU1NzWFhnLe11HF615XuA=="; + url = "https://registry.npmjs.org/posthog-node/-/posthog-node-2.3.0.tgz"; + sha512 = "VV4s1DP2DTAL1WaR4Detq28epLlX2DVWfr/+itRWLvDVFyK9EDbAMqBhOkh8dd3JPkng0kcIjJ8PFII/cCXP9A=="; }; }; "prebuild-install-7.1.1" = { @@ -8275,6 +8374,15 @@ let sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; }; }; + "prettier-2.8.3" = { + name = "prettier"; + packageName = "prettier"; + version = "2.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz"; + sha512 = "tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw=="; + }; + }; "pretty-bytes-5.6.0" = { name = "pretty-bytes"; packageName = "pretty-bytes"; @@ -8410,13 +8518,13 @@ let sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; }; }; - "protobufjs-7.1.2" = { + "protobufjs-7.2.0" = { name = "protobufjs"; packageName = "protobufjs"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.1.2.tgz"; - sha512 = "4ZPTPkXCdel3+L81yw3dG6+Kq3umdWKh7Dc7GW/CpNk4SX3hK58iPCWeCyhVTDrbkNeKrYNZ7EojM5WDaEWTLQ=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.0.tgz"; + sha512 = "hYCqTDuII4iJ4stZqiuGCSU8xxWl5JeXYpwARGtn/tWcKCAro6h3WQz+xpsNbXW0UYqpmTQFEyFWO0G0Kjt64g=="; }; }; "proxy-addr-2.0.7" = { @@ -8500,13 +8608,13 @@ let sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="; }; }; - "punycode-2.2.0" = { + "punycode-2.3.0" = { name = "punycode"; packageName = "punycode"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz"; - sha512 = "LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw=="; + url = "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"; + sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; }; }; "python-struct-1.1.3" = { @@ -9040,13 +9148,13 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sanitize-html-2.7.0" = { + "sanitize-html-2.7.3" = { name = "sanitize-html"; packageName = "sanitize-html"; - version = "2.7.0"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.0.tgz"; - sha512 = "jfQelabOn5voO7FAfnQF7v+jsA6z9zC/O4ec0z3E35XPEtHYJT/OdUziVWlKW4irCr2kXaQAyXTXDHWAibg1tA=="; + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.7.3.tgz"; + sha512 = "jMaHG29ak4miiJ8wgqA1849iInqORgNv7SLfSw9LtfOhEUQ1C0YHKH73R+hgyufBW9ZFeJrb057k9hjlfBCVlw=="; }; }; "sax-1.2.1" = { @@ -9625,6 +9733,15 @@ let sha512 = "KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw=="; }; }; + "stream-browserify-3.0.0" = { + name = "stream-browserify"; + packageName = "stream-browserify"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz"; + sha512 = "H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA=="; + }; + }; "stream-events-1.0.5" = { name = "stream-events"; packageName = "stream-events"; @@ -9652,6 +9769,15 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; + "strict-event-emitter-types-2.0.0" = { + name = "strict-event-emitter-types"; + packageName = "strict-event-emitter-types"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strict-event-emitter-types/-/strict-event-emitter-types-2.0.0.tgz"; + sha512 = "Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA=="; + }; + }; "strict-uri-encode-2.0.0" = { name = "strict-uri-encode"; packageName = "strict-uri-encode"; @@ -10183,13 +10309,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.4.1" = { + "tslib-2.5.0" = { name = "tslib"; packageName = "tslib"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz"; - sha512 = "tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"; + sha512 = "336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="; }; }; "tsscmp-1.0.6" = { @@ -10462,6 +10588,15 @@ let sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; + "url-value-parser-2.2.0" = { + name = "url-value-parser"; + packageName = "url-value-parser"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-value-parser/-/url-value-parser-2.2.0.tgz"; + sha512 = "yIQdxJpgkPamPPAPuGdS7Q548rLhny42tg8d4vyTNzFqvOnwqrgHXvgehT09U7fwrzxi3RxCiXjoNUNnNOlQ8A=="; + }; + }; "urllib-2.40.0" = { name = "urllib"; packageName = "urllib"; @@ -10579,6 +10714,15 @@ let sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; + "uuid-9.0.0" = { + name = "uuid"; + packageName = "uuid"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"; + sha512 = "MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="; + }; + }; "v-click-outside-3.2.0" = { name = "v-click-outside"; packageName = "v-click-outside"; @@ -10696,6 +10840,15 @@ let sha512 = "C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA=="; }; }; + "vue-infinite-loading-2.4.5" = { + name = "vue-infinite-loading"; + packageName = "vue-infinite-loading"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-infinite-loading/-/vue-infinite-loading-2.4.5.tgz"; + sha512 = "xhq95Mxun060bRnsOoLE2Be6BR7jYwuC89kDe18+GmCLVrRA/dU0jrGb12Xu6NjmKs+iTW0AA6saSEmEW4cR7g=="; + }; + }; "vue-json-pretty-1.9.3" = { name = "vue-json-pretty"; packageName = "vue-json-pretty"; @@ -10750,6 +10903,15 @@ let sha512 = "N3FYX9Z6rZdTeP3BOBz2LMxlWo9WRmPF6SOsYzz+tEuUH0QjX8UD7c1X95J8pZ7cFvbh9QflVujYQRqRiiwoAg=="; }; }; + "vue2-boring-avatars-0.3.8" = { + name = "vue2-boring-avatars"; + packageName = "vue2-boring-avatars"; + version = "0.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vue2-boring-avatars/-/vue2-boring-avatars-0.3.8.tgz"; + sha512 = "8vNN+zhCIiIMnSQDu0DwhJ11e9r3t4t12dromXmXDtRryBhV58NPn4XgMb4JKrBlfNK92KFrY/cxRy3nzhQfpQ=="; + }; + }; "vue2-teleport-1.0.1" = { name = "vue2-teleport"; packageName = "vue2-teleport"; @@ -11161,10 +11323,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.211.1"; + version = "0.213.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.211.1.tgz"; - sha512 = "hD3AnzqByEYy6GMgjk//81JFdaM8UEnklcYo8Sjm4LKlDtOnjFIUFpN78KUkLVjM4WEPWkLczITFPhHuYcHCXA=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.213.0.tgz"; + sha512 = "O6ZOT3nhCSBXt0aA3OH64M+6UNwVO7coURqTaCI0oVwbaH387OawtKn+mVnn5Jho52hAAZAoHdF1RVal2LQtJQ=="; }; dependencies = [ (sources."@acuminous/bitsyntax-0.1.2" // { @@ -11180,53 +11342,53 @@ in }) (sources."@azure/abort-controller-1.1.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-auth-1.4.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-client-1.7.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-http-2.3.1" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" sources."tough-cookie-4.1.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."universalify-0.2.0" ]; }) sources."@azure/core-http-compat-1.3.0" (sources."@azure/core-lro-2.5.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-paging-1.4.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-rest-pipeline-1.10.1" // { dependencies = [ sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-tracing-1.0.1" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-util-1.1.1" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/identity-2.1.0" // { @@ -11234,17 +11396,17 @@ in sources."jwa-2.0.0" sources."jws-4.0.0" sources."open-8.4.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/keyvault-keys-4.6.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/logger-1.0.3" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."@azure/ms-rest-azure-env-2.0.0" @@ -11256,25 +11418,26 @@ in sources."@azure/ms-rest-nodeauth-3.1.1" (sources."@azure/msal-browser-2.32.2" // { dependencies = [ - sources."@azure/msal-common-9.0.2" + sources."@azure/msal-common-9.1.1" ]; }) sources."@azure/msal-common-7.6.0" (sources."@azure/msal-node-1.14.6" // { dependencies = [ - sources."@azure/msal-common-9.0.2" + sources."@azure/msal-common-9.1.1" ]; }) (sources."@azure/storage-blob-12.12.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) - sources."@babel/parser-7.20.7" - sources."@babel/runtime-7.20.7" + sources."@babel/parser-7.20.13" + sources."@babel/runtime-7.20.13" sources."@codemirror/autocomplete-6.4.0" - sources."@codemirror/commands-6.1.3" + sources."@codemirror/commands-6.2.0" + sources."@codemirror/lang-css-6.0.1" sources."@codemirror/lang-javascript-6.1.2" sources."@codemirror/language-6.4.0" sources."@codemirror/lint-6.1.0" @@ -11285,7 +11448,7 @@ in sources."@curlconverter/yargs-0.0.2" sources."@curlconverter/yargs-parser-0.0.1" sources."@dabh/diagnostics-2.0.3" - sources."@fontsource/open-sans-4.5.13" + sources."@fontsource/open-sans-4.5.14" sources."@fortawesome/fontawesome-common-types-0.3.0" sources."@fortawesome/fontawesome-svg-core-1.3.0" (sources."@fortawesome/free-regular-svg-icons-6.2.1" // { @@ -11298,7 +11461,7 @@ in sources."@fortawesome/fontawesome-common-types-0.2.36" ]; }) - sources."@fortawesome/vue-fontawesome-2.0.9" + sources."@fortawesome/vue-fontawesome-2.0.10" sources."@gar/promisify-1.1.3" (sources."@google-cloud/common-3.10.0" // { dependencies = [ @@ -11319,7 +11482,7 @@ in dependencies = [ sources."@grpc/proto-loader-0.7.4" sources."long-5.2.1" - sources."protobufjs-7.1.2" + sources."protobufjs-7.2.0" sources."yargs-16.2.0" ]; }) @@ -11345,7 +11508,9 @@ in sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@lezer/common-1.0.2" + sources."@lezer/css-1.1.1" sources."@lezer/highlight-1.1.3" + sources."@lezer/html-1.3.0" sources."@lezer/javascript-1.4.1" sources."@lezer/lr-1.3.1" sources."@mapbox/node-pre-gyp-1.0.10" @@ -11367,13 +11532,13 @@ in sources."@oclif/command-1.8.21" (sources."@oclif/config-1.18.6" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) - (sources."@oclif/core-1.24.0" // { + (sources."@oclif/core-1.26.1" // { dependencies = [ sources."supports-color-8.1.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."wrap-ansi-7.0.0" ]; }) @@ -11389,7 +11554,7 @@ in sources."@oclif/linewrap-1.0.0" (sources."@oclif/parser-3.8.9" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."@oclif/screen-3.0.4" @@ -11422,15 +11587,15 @@ in sources."domhandler-5.0.3" ]; }) - sources."@sentry/core-7.31.0" - sources."@sentry/integrations-7.31.0" - sources."@sentry/node-7.31.0" - sources."@sentry/types-7.31.0" - sources."@sentry/utils-7.31.0" + sources."@sentry/core-7.34.0" + sources."@sentry/integrations-7.34.0" + sources."@sentry/node-7.34.0" + sources."@sentry/types-7.34.0" + sources."@sentry/utils-7.34.0" sources."@servie/events-1.0.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/wasm-1.3.29" sources."@techteamer/ocsp-1.0.0" sources."@tediousjs/connection-string-0.3.0" sources."@tokenizer/token-0.3.0" @@ -11439,14 +11604,15 @@ in sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" + sources."@types/asn1-0.2.0" sources."@types/big.js-6.1.6" sources."@types/body-parser-1.19.2" sources."@types/connect-3.4.35" sources."@types/duplexify-3.6.1" sources."@types/es-aggregate-error-1.0.2" - sources."@types/express-4.17.15" + sources."@types/express-4.17.16" sources."@types/express-jwt-0.0.42" - sources."@types/express-serve-static-core-4.17.32" + sources."@types/express-serve-static-core-4.17.33" sources."@types/express-unless-2.0.1" sources."@types/js-nacl-1.3.1" sources."@types/json-schema-7.0.11" @@ -11468,7 +11634,8 @@ in sources."@types/stoppable-1.1.1" sources."@types/tough-cookie-2.3.8" sources."@types/tunnel-0.0.3" - sources."@types/validator-13.7.10" + sources."@types/uuid-9.0.0" + sources."@types/validator-13.7.11" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" sources."@vue/compiler-sfc-2.7.14" @@ -11477,13 +11644,13 @@ in sources."vue-2.6.14" ]; }) - sources."@vue/devtools-api-6.4.5" + sources."@vue/devtools-api-6.5.0" sources."@xmldom/xmldom-0.8.6" sources."a-sync-waterfall-1.0.1" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" (sources."adal-node-0.2.4" // { dependencies = [ @@ -11542,7 +11709,7 @@ in sources."assert-plus-1.0.0" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."async-3.2.4" @@ -11556,7 +11723,7 @@ in }) sources."available-typed-arrays-1.0.5" sources."avsc-5.7.7" - (sources."aws-sdk-2.1295.0" // { + (sources."aws-sdk-2.1304.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -11570,7 +11737,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.12.0" sources."axios-0.21.4" - sources."axios-retry-3.3.1" + sources."axios-retry-3.4.0" sources."babel-helper-vue-jsx-merge-props-2.0.3" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -11593,11 +11760,7 @@ in sources."bignumber.js-2.4.0" sources."binary-extensions-2.2.0" sources."binascii-0.0.2" - (sources."bindings-1.5.0" // { - dependencies = [ - sources."file-uri-to-path-1.0.0" - ]; - }) + sources."bindings-1.5.0" sources."bintrees-1.0.2" (sources."bl-4.1.0" // { dependencies = [ @@ -11648,12 +11811,12 @@ in sources."callsites-3.1.0" (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."capital-case-1.0.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."cardinal-2.1.1" @@ -11666,7 +11829,7 @@ in sources."chalk-4.1.2" (sources."change-case-4.1.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."chardet-0.7.0" @@ -11701,6 +11864,7 @@ in ]; }) sources."cluster-key-slot-1.1.2" + sources."codemirror-lang-html-n8n-1.0.0" sources."codemirror-lang-n8n-expression-0.1.0" sources."codepage-1.15.0" (sources."color-3.2.1" // { @@ -11735,7 +11899,7 @@ in sources."console-control-strings-1.1.0" (sources."constant-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."content-disposition-0.5.4" @@ -11749,7 +11913,7 @@ in }) sources."cookie-signature-1.0.6" sources."copy-to-2.0.1" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."create-require-1.1.1" @@ -11805,7 +11969,7 @@ in sources."domutils-2.8.0" (sources."dot-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."dotenv-8.6.0" @@ -11823,7 +11987,7 @@ in sources."encoding-japanese-2.0.0" sources."end-of-stream-1.4.4" sources."ent-2.2.0" - sources."entities-2.2.0" + sources."entities-2.1.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."es-abstract-1.21.1" @@ -11857,12 +12021,14 @@ in sources."ms-2.0.0" ]; }) + sources."express-async-errors-3.1.1" (sources."express-openapi-validator-4.13.8" // { dependencies = [ sources."media-typer-1.1.0" sources."path-to-regexp-6.2.1" ]; }) + sources."express-prom-bundle-6.6.0" sources."express-unless-2.1.3" sources."extend-3.0.2" sources."extend-shallow-2.0.1" @@ -11887,10 +12053,10 @@ in }) sources."file-saver-2.0.5" sources."file-type-16.5.4" - sources."file-uri-to-path-2.0.0" + sources."file-uri-to-path-1.0.0" (sources."filelist-1.0.4" // { dependencies = [ - sources."minimatch-5.1.4" + sources."minimatch-5.1.6" ]; }) sources."fill-range-7.0.1" @@ -11942,13 +12108,14 @@ in sources."generate-function-2.3.1" sources."generic-pool-3.9.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-package-type-0.1.0" sources."get-port-5.1.1" sources."get-symbol-description-1.0.0" sources."get-system-fonts-2.0.2" (sources."get-uri-3.0.2" // { dependencies = [ + sources."file-uri-to-path-2.0.0" sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."universalify-0.1.2" @@ -12012,7 +12179,7 @@ in sources."he-1.2.0" (sources."header-case-2.0.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."heap-0.2.7" @@ -12030,11 +12197,12 @@ in ]; }) sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" + sources."humanize-duration-3.28.0" sources."humanize-ms-1.2.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.6.3" @@ -12063,7 +12231,7 @@ in sources."inquirer-7.3.3" sources."internal-slot-1.0.4" sources."interpret-1.4.0" - (sources."ioredis-5.2.5" // { + (sources."ioredis-5.3.0" // { dependencies = [ sources."denque-2.1.0" ]; @@ -12159,6 +12327,11 @@ in sources."jws-3.2.2" sources."kafkajs-1.16.0" sources."kuler-2.0.0" + (sources."ldapts-4.2.2" // { + dependencies = [ + sources."uuid-9.0.0" + ]; + }) sources."leac-0.6.0" sources."leven-2.1.0" sources."levn-0.3.0" @@ -12214,7 +12387,7 @@ in sources."lossless-json-1.0.5" (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."lru-cache-4.0.2" @@ -12244,12 +12417,7 @@ in ]; }) sources."mappersmith-2.41.0" - (sources."markdown-it-12.3.2" // { - dependencies = [ - sources."argparse-2.0.1" - sources."entities-2.1.0" - ]; - }) + sources."markdown-it-13.0.1" sources."markdown-it-emoji-2.0.2" sources."markdown-it-link-attributes-4.0.1" sources."markdown-it-task-lists-2.1.1" @@ -12343,7 +12511,7 @@ in sources."mqtt-packet-6.10.0" sources."ms-2.1.2" sources."msal-1.4.17" - sources."msgpackr-1.8.1" + sources."msgpackr-1.8.2" (sources."mssql-8.1.4" // { dependencies = [ sources."commander-9.5.0" @@ -12359,25 +12527,31 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-0.151.1" // { + (sources."n8n-core-0.152.0" // { dependencies = [ sources."concat-stream-2.0.0" sources."readable-stream-3.6.0" ]; }) - sources."n8n-design-system-0.51.1" - (sources."n8n-editor-ui-0.177.1" // { + (sources."n8n-design-system-0.52.0" // { + dependencies = [ + sources."argparse-2.0.1" + sources."markdown-it-12.3.2" + sources."vue2-boring-avatars-0.3.8" + ]; + }) + (sources."n8n-editor-ui-0.179.0" // { dependencies = [ sources."luxon-2.5.2" ]; }) - (sources."n8n-nodes-base-0.209.1" // { + (sources."n8n-nodes-base-0.211.0" // { dependencies = [ sources."chokidar-3.5.2" sources."luxon-2.3.2" ]; }) - (sources."n8n-workflow-0.133.1" // { + (sources."n8n-workflow-0.134.0" // { dependencies = [ sources."luxon-2.3.2" ]; @@ -12399,11 +12573,11 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."node-abi-3.31.0" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" sources."node-ensure-0.0.0" sources."node-fetch-2.6.8" @@ -12432,7 +12606,7 @@ in sources."node-rsa-1.1.1" sources."node-ssh-12.0.5" sources."nodeify-1.0.1" - sources."nodemailer-6.9.0" + sources."nodemailer-6.9.1" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-wheel-1.0.1" @@ -12479,7 +12653,7 @@ in sources."packet-reader-1.0.0" (sources."param-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."parse-github-url-1.0.2" @@ -12491,7 +12665,7 @@ in sources."parseurl-1.3.3" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."passport-0.6.0" @@ -12505,7 +12679,7 @@ in }) (sources."path-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."path-dirname-1.0.2" @@ -12524,9 +12698,9 @@ in sources."peberminta-0.8.0" sources."peek-readable-4.1.0" sources."performance-now-2.1.0" - sources."pg-8.8.0" + sources."pg-8.9.0" sources."pg-connection-string-2.5.0" - sources."pg-cursor-2.7.4" + sources."pg-cursor-2.8.0" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" (sources."pg-native-3.0.1" // { @@ -12539,9 +12713,13 @@ in ]; }) sources."pg-pool-3.5.2" - sources."pg-promise-10.15.4" - sources."pg-protocol-1.5.0" - sources."pg-query-stream-4.2.4" + (sources."pg-promise-10.15.4" // { + dependencies = [ + sources."pg-8.8.0" + ]; + }) + sources."pg-protocol-1.6.0" + sources."pg-query-stream-4.3.0" sources."pg-types-2.2.0" (sources."pgpass-1.0.5" // { dependencies = [ @@ -12563,13 +12741,14 @@ in sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" sources."postgres-interval-1.2.0" - (sources."posthog-node-2.2.3" // { + (sources."posthog-node-2.3.0" // { dependencies = [ sources."axios-0.27.2" ]; }) sources."prebuild-install-7.1.1" sources."prelude-ls-1.1.2" + sources."prettier-2.8.3" sources."pretty-bytes-5.6.0" sources."printj-1.1.2" sources."prismjs-1.29.0" @@ -12601,7 +12780,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."python-struct-1.1.3" sources."qs-6.11.0" sources."query-string-7.1.3" @@ -12632,7 +12811,7 @@ in (sources."recast-0.21.5" // { dependencies = [ sources."ast-types-0.15.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."rechoir-0.6.2" @@ -12691,7 +12870,7 @@ in sources."safe-regex-test-1.0.0" sources."safe-stable-stringify-2.4.2" sources."safer-buffer-2.1.2" - (sources."sanitize-html-2.7.0" // { + (sources."sanitize-html-2.7.3" // { dependencies = [ sources."deepmerge-4.2.2" ]; @@ -12718,7 +12897,7 @@ in }) (sources."sentence-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."seq-queue-0.0.5" @@ -12748,7 +12927,7 @@ in sources."smart-buffer-4.2.0" (sources."snake-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."snowflake-sdk-1.6.17" // { @@ -12801,9 +12980,15 @@ in sources."statuses-2.0.1" sources."stealthy-require-1.1.1" sources."stoppable-1.1.0" + (sources."stream-browserify-3.0.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."stream-events-1.0.5" sources."stream-shift-1.0.1" sources."streamsearch-1.1.0" + sources."strict-event-emitter-types-2.0.0" sources."strict-uri-encode-2.0.0" sources."string-similarity-4.0.4" sources."string-width-4.2.3" @@ -12938,7 +13123,7 @@ in sources."bl-5.1.0" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."wrap-ansi-7.0.0" sources."yargs-17.6.2" sources."yargs-parser-21.1.1" @@ -12959,12 +13144,12 @@ in sources."unpipe-1.0.0" (sources."upper-case-2.0.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."upper-case-first-2.0.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."uri-js-4.4.1" @@ -12974,6 +13159,7 @@ in ]; }) sources."url-parse-1.5.10" + sources."url-value-parser-2.2.0" (sources."urllib-2.40.0" // { dependencies = [ sources."debug-2.6.9" @@ -13013,6 +13199,7 @@ in sources."vue-demi-0.13.11" sources."vue-fragment-1.5.1" sources."vue-i18n-8.28.2" + sources."vue-infinite-loading-2.4.5" sources."vue-json-pretty-1.9.3" sources."vue-prism-editor-0.3.0" sources."vue-router-3.6.5" diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/slrn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/slrn/default.nix index e49ffe15ee..b29d9f494b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -20,13 +20,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-slang=${slang.dev}" "--with-ssl=${openssl.dev}" + "--with-slrnpull" ]; buildInputs = [ slang ncurses openssl ]; meta = with lib; { description = "The slrn (S-Lang read news) newsreader"; - homepage = "http://slrn.sourceforge.net/index.html"; + homepage = "https://slrn.sourceforge.net/index.html"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index f2d368af61..e409551f12 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.6.4"; + version = "3.6.6"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-ZtDgm9xlBQflVXsxjt4bFmRby6ni0wjaGYaoiEWH9Q0="; + sha256 = "sha256-P3LSgrcMZZM0OY3yQz8t3Cf5spJJTB+JTIpoT9U3+xc="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix index b6f93ede05..c17c65e14f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.38.0"; + version = "1.39.4"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-dJ/3MBEsA8M4pfE+GPT/bNnK3n4fL3Hwk0umgMTJAfY="; + sha256 = "sha256-7inMloKU/AL4s/p171xCzs4p4+AcLsvsbVsELK9vhFc="; }; - vendorSha256 = "sha256-pCta8FzGVpl9fvnnjQ7/e2x/HolXAuxnz0vwKejGk98="; + vendorHash = "sha256-pCta8FzGVpl9fvnnjQ7/e2x/HolXAuxnz0vwKejGk98="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/novnc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/novnc/default.nix index 818e8764dd..17d32b84a7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/novnc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/novnc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "novnc"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "novnc"; repo = "noVNC"; rev = "v${version}"; - sha256 = "sha256-Z+bks7kcwj+Z3uf/t0u25DnGOM60QhSH6uuoIi59jqU="; + sha256 = "sha256-G7Rtv7pQFR9UrzhYXDyBf+FRqtjo5NAXU7m/HeXhI1k="; }; patches = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix index 2d23ece5e4..49193a384a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/onionshare/default.nix @@ -94,7 +94,7 @@ rec { obfs4 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix index b5bb12da0e..507d2a282e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix @@ -57,7 +57,7 @@ let wrapGAppsHook ]; - checkInputs = with pypkgs; [ + nativeCheckInputs = with pypkgs; [ pytestCheckHook pytest-twisted pytest-cov diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index df314b6591..91a078590b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix index ac7e15b6a2..7acfee3671 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/jesec-rtorrent/libtorrent.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD ''; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix index 76fc70b3ba..319a5e7f0d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -9,7 +9,6 @@ assert guiSupport -> (dbus != null); assert trackerSearch -> (python3 != null); -with lib; mkDerivation rec { pname = "qbittorrent"; version = "4.4.5"; @@ -27,8 +26,8 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost libtorrent-rasterbar qtbase qttools qtsvg ] - ++ optional guiSupport dbus # D(esktop)-Bus depends on GUI support - ++ optional trackerSearch python3; + ++ lib.optional guiSupport dbus # D(esktop)-Bus depends on GUI support + ++ lib.optional trackerSearch python3; # Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist. QMAKE_LRELEASE = "lrelease"; @@ -36,11 +35,11 @@ mkDerivation rec { configureFlags = [ "--with-boost-libdir=${boost.out}/lib" "--with-boost=${boost.dev}" ] - ++ optionals (!guiSupport) [ "--disable-gui" "--enable-systemd" ] # Also place qbittorrent-nox systemd service files - ++ optional (!webuiSupport) "--disable-webui" - ++ optional debugSupport "--enable-debug"; + ++ lib.optionals (!guiSupport) [ "--disable-gui" "--enable-systemd" ] # Also place qbittorrent-nox systemd service files + ++ lib.optional (!webuiSupport) "--disable-webui" + ++ lib.optional debugSupport "--enable-debug"; - qtWrapperArgs = optional trackerSearch "--prefix PATH : ${makeBinPath [ python3 ]}"; + qtWrapperArgs = lib.optional trackerSearch "--prefix PATH : ${lib.makeBinPath [ python3 ]}"; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/{Applications,bin} @@ -48,7 +47,7 @@ mkDerivation rec { makeWrapper $out/{Applications/qbittorrent.app/Contents/MacOS,bin}/qbittorrent ''; - meta = { + meta = with lib; { description = "Featureful free software BitTorrent client"; homepage = "https://www.qbittorrent.org/"; changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix index dce6baa438..21c59e84a4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { setproctitle ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ asynctest pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix index f3a33c2194..8d605877a6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix @@ -24,7 +24,7 @@ , enableQt ? false , qt5 , nixosTests -, enableSystemd ? stdenv.isLinux +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , enableDaemon ? true , enableCli ? true , installLib ? false diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix index 779de53d3c..b73c962240 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/xd/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-mJZRk3p+D3tCKIYggD5jVBXcKqJotEexljDzLKpn4/E="; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; postInstall = '' ln -s $out/bin/XD $out/bin/XD-CLI diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix index 1fc698fe19..fe0112a4aa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix @@ -9,13 +9,7 @@ let hash = "sha256-e11u0jdJr+2TDXvBAPlDfnuuDwSfBq+JtvnDUTNKp/c="; }; - python = python3.override { - packageOverrides = self: super: { - # The bravado-core dependency is incompatible with jschonschema 4.0: - # https://github.com/Yelp/bravado-core/pull/385 - jsonschema = super.jsonschema_3; - }; - }; + python = python3; pythonDeps = with python.pkgs; [ flask flask_assets flask-login flask-sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify diff --git a/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix b/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix index 3e6dfb1a7d..af55fef18c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix @@ -2,7 +2,7 @@ , stdenv , mkDerivation , fetchFromGitHub -, qmake +, symlinkJoin , qttools , cmake , clang_8 @@ -14,29 +14,40 @@ , libGL , zlib , curl +, v2ray +, v2ray-geoip, v2ray-domain-list-community +, assets ? [ v2ray-geoip v2ray-domain-list-community ] }: mkDerivation rec { pname = "qv2ray"; - version = "2.7.0"; + version = "unstable-2022-09-25"; src = fetchFromGitHub { owner = "Qv2ray"; repo = "Qv2ray"; - rev = "v${version}"; - sha256 = "sha256-afFTGX/zrnwq/p5p1kj+ANU4WeN7jNq3ieeW+c+GO5M="; + rev = "fb44fb1421941ab192229ff133bc28feeb4a8ce5"; + sha256 = "sha256-TngDgLXKyAoQFnXpBNaz4QjfkVwfZyuQwatdhEiI57U="; fetchSubmodules = true; }; - patchPhase = lib.optionals stdenv.isDarwin '' + postPatch = lib.optionals stdenv.isDarwin '' substituteInPlace cmake/platforms/macos.cmake \ --replace \''${QV2RAY_QtX_DIR}/../../../bin/macdeployqt macdeployqt ''; + assetsDrv = symlinkJoin { + name = "v2ray-assets"; + paths = assets; + }; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DQV2RAY_DISABLE_AUTO_UPDATE=on" + "-DQV2RAY_USE_V5_CORE=on" "-DQV2RAY_TRANSLATION_PATH=${placeholder "out"}/share/qv2ray/lang" + "-DQV2RAY_DEFAULT_VASSETS_PATH='${assetsDrv}/share/v2ray'" + "-DQV2RAY_DEFAULT_VCORE_PATH='${v2ray}/bin/v2ray'" ]; preConfigure = '' @@ -55,21 +66,19 @@ mkDerivation rec { nativeBuildInputs = [ cmake - - # The default clang_7 will result in reproducible ICE. - clang_8 - pkg-config - qmake qttools curl - ]; + # The default clang_7 will result in reproducible ICE. + ] ++ lib.optional (stdenv.isDarwin) clang_8; meta = with lib; { description = "An GUI frontend to v2ray"; - homepage = "https://qv2ray.github.io/en/"; - license = licenses.gpl3; - maintainers = with maintainers; [ poscat ]; + homepage = "https://github.com/Qv2ray/Qv2ray"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ poscat rewine ]; platforms = platforms.all; + # never built on aarch64-darwin, x86_64-darwin since update to unstable-2022-09-25 + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix index 12087ed108..c5095d8fd4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix @@ -1,21 +1,62 @@ -{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc, wayland-scanner -, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam, mesa +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, scdoc +, wayland-scanner +, aml +, jansson +, libxkbcommon +, mesa +, neatvnc +, pam +, pixman +, wayland }: stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.5.0"; + version = "0.6.2"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/OKkQKt43lR0UCmQeSDMl1hXh03k+dX3UweigMWEUx4="; + sha256 = "sha256-yNWTTjlmMCMTed1SiRep3iUxchQya1GnTVoub1cpR14="; }; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ]; - buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam mesa ]; + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + + buildInputs = [ + aml + jansson + libxkbcommon + mesa + neatvnc + pam + pixman + wayland + ]; + + mesonFlags = [ + (lib.mesonBool "tests" true) + ]; + + doCheck = true; meta = with lib; { description = "A VNC server for wlroots based Wayland compositors"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix index 3744451f3e..b7c51d70df 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix @@ -3,13 +3,13 @@ let xorgxrdp = stdenv.mkDerivation rec { pname = "xorgxrdp"; - version = "0.2.9"; + version = "0.9.19"; src = fetchFromGitHub { owner = "neutrinolabs"; repo = "xorgxrdp"; rev = "v${version}"; - sha256 = "1bhp5x47hajhinvglmc4vxxnpjvfjm6369njb3ghqfr7c5xypvzr"; + hash = "sha256-WI1KyJDQkmNHwweZMbNd2KUfawaieoGMDMQfeD12cZs="; }; nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; @@ -34,21 +34,23 @@ let }; xrdp = stdenv.mkDerivation rec { - version = "0.9.9"; + version = "0.9.21.1"; pname = "xrdp"; src = fetchFromGitHub { - owner = "volth"; + owner = "neutrinolabs"; repo = "xrdp"; - rev = "refs/tags/runtime-cfg-path-${version}"; # Fixes https://github.com/neutrinolabs/xrdp/issues/609; not a patch on top of the official repo because "xorgxrdp.configureFlags" above includes "xrdp.src" which must be patched already + rev = "v${version}"; fetchSubmodules = true; - sha256 = "0ynj6pml4f38y8571ryhifza57wfqg4frdrjcwzw3fmryiznfm1z"; + hash = "sha256-/o052ij+Tpcw5/k1UyP6OGOzrtBwh3jRkftStIEhUF0="; }; - nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm ]; + nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ]; buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ]; + patches = [ ./dynamic_config.patch ]; + postPatch = '' substituteInPlace sesman/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q" ''; @@ -58,23 +60,23 @@ let ./bootstrap ''; dontDisableStatic = true; - configureFlags = [ "--with-systemdsystemunitdir=/var/empty" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" ]; + configureFlags = [ "--with-systemdsystemunitdir=/var/empty" "--enable-ipv6" "--enable-jpeg" "--enable-fuse" "--enable-rfxcodec" "--enable-opus" "--enable-pam-config=unix" ]; installFlags = [ "DESTDIR=$(out)" "prefix=" ]; postInstall = '' - # remove generated keys (as non-determenistic) and upstart script - rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem,xrdp.sh} + # remove generated keys (as non-deterministic) + rm $out/etc/xrdp/{rsakeys.ini,key.pem,cert.pem} cp $src/keygen/openssl.conf $out/share/xrdp/openssl.conf substituteInPlace $out/etc/xrdp/sesman.ini --replace /etc/xrdp/pulse $out/etc/xrdp/pulse # remove all session types except Xorg (they are not supported by this setup) - ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini + perl -i -ne 'print unless /\[(X11rdp|Xvnc|console|vnc-any|sesman-any|rdp-any|neutrinordp-any)\]/ .. /^$/' $out/etc/xrdp/xrdp.ini # remove all session types and then add Xorg - ${perl}/bin/perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini + perl -i -ne 'print unless /\[(X11rdp|Xvnc|Xorg)\]/ .. /^$/' $out/etc/xrdp/sesman.ini cat >> $out/etc/xrdp/sesman.ini < + + #if defined(XRDP_NEUTRINORDP) + #include +@@ -46,10 +47,21 @@ xrdp_rdp_read_config(const char *xrdp_ini, struct xrdp_client_info *client_info) + struct list *values = (struct list *)NULL; + char *item = NULL; + char *value = NULL; ++ char cfg_dir[256]; + int pos; + char *tmp = NULL; + int tmp_length = 0; + ++ g_strncpy(cfg_dir, xrdp_ini, 255); ++ *(strrchr(cfg_dir, '/')) = 0; ++ ++ /* default location is next to xrdp.ini */ ++ g_snprintf(client_info->certificate, 1023, "%s/cert.pem", cfg_dir); ++ g_snprintf(client_info->key_file, 1023, "%s/key.pem", cfg_dir); ++ g_snprintf(client_info->xrdp_keyboard_ini_file, 255, "%s/xrdp_keyboard.ini", cfg_dir); ++ g_snprintf(client_info->rsakeys_ini_file, 255, "%s/rsakeys.ini", cfg_dir); ++ g_snprintf(client_info->keymaps_path, 255, "%s", cfg_dir); ++ + client_info->xrdp_keyboard_overrides.type = -1; + client_info->xrdp_keyboard_overrides.subtype = -1; + client_info->xrdp_keyboard_overrides.layout = -1; +@@ -253,14 +265,14 @@ xrdp_rdp_read_config(const char *xrdp_ini, struct xrdp_client_info *client_info) + if (g_strlen(value) == 0) + { + /* default key_file path */ +- g_snprintf(client_info->key_file, 1023, "%s/key.pem", XRDP_CFG_PATH); ++ g_snprintf(client_info->key_file, 1023, "%s/key.pem", cfg_dir); + LOG(LOG_LEVEL_INFO, "Using default X.509 key file: %s", + client_info->key_file); + } + else if (value[0] != '/') + { + /* default key_file path */ +- g_snprintf(client_info->key_file, 1023, "%s/key.pem", XRDP_CFG_PATH); ++ g_snprintf(client_info->key_file, 1023, "%s/key.pem", cfg_dir); + LOG(LOG_LEVEL_WARNING, + "X.509 key file should use absolute path, using " + "default instead: %s", client_info->key_file); +@@ -277,6 +289,51 @@ xrdp_rdp_read_config(const char *xrdp_ini, struct xrdp_client_info *client_info) + client_info->key_file, g_get_strerror()); + } + } ++ else if (g_strcasecmp(item, "rsakeys_ini") == 0) ++ { ++ if (value[0] != '/') ++ { ++ g_snprintf(client_info->rsakeys_ini_file, 255, "%s/rsakeys.ini", cfg_dir); ++ log_message(LOG_LEVEL_WARNING, ++ "rsakeys.ini file should use absolute path, using " ++ "default instead: %s", client_info->rsakeys_ini_file); ++ } ++ else ++ { ++ /* use user defined rsakeys.ini */ ++ g_strncpy(client_info->rsakeys_ini_file, value, 255); ++ } ++ } ++ else if (g_strcasecmp(item, "xrdp_keyboard_ini") == 0) ++ { ++ if (value[0] != '/') ++ { ++ g_snprintf(client_info->xrdp_keyboard_ini_file, 255, "%s/xrdp_keyboard.ini", cfg_dir); ++ log_message(LOG_LEVEL_WARNING, ++ "xrdp_keyboard.ini file should use absolute path, using " ++ "default instead: %s", client_info->xrdp_keyboard_ini_file); ++ } ++ else ++ { ++ /* use user defined xrdp_keyboard.ini */ ++ g_strncpy(client_info->xrdp_keyboard_ini_file, value, 255); ++ } ++ } ++ else if (g_strcasecmp(item, "keymaps_path") == 0) ++ { ++ if (value[0] != '/') ++ { ++ g_snprintf(client_info->keymaps_path, 255, "%s", cfg_dir); ++ log_message(LOG_LEVEL_WARNING, ++ "keymaps_path should use absolute path, using " ++ "default instead: %s", client_info->keymaps_path); ++ } ++ else ++ { ++ /* use user defined xrdp_keyboard.ini */ ++ g_strncpy(client_info->keymaps_path, value, 255); ++ } ++ } + else if (g_strcasecmp(item, "domain_user_separator") == 0 + && g_strlen(value) > 0) + { +diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c +index 8fa34aea..da94cf95 100644 +--- a/libxrdp/xrdp_sec.c ++++ b/libxrdp/xrdp_sec.c +@@ -371,7 +371,6 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info) + char *item = (char *)NULL; + char *value = (char *)NULL; + char *q = (char *)NULL; +- char keyboard_cfg_file[256] = { 0 }; + char rdp_layout[256] = { 0 }; + + const struct xrdp_keyboard_overrides *ko = +@@ -419,10 +418,9 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info) + client_info->keyboard_subtype = 1; + } + +- g_snprintf(keyboard_cfg_file, 255, "%s/xrdp_keyboard.ini", XRDP_CFG_PATH); +- LOG(LOG_LEVEL_DEBUG, "keyboard_cfg_file %s", keyboard_cfg_file); ++ LOG(LOG_LEVEL_DEBUG, "keyboard_cfg_file %s", client_info->xrdp_keyboard_ini_file); + +- fd = g_file_open(keyboard_cfg_file); ++ fd = g_file_open(client_info->xrdp_keyboard_ini_file); + + if (fd >= 0) + { +@@ -594,7 +592,7 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info) + else + { + LOG(LOG_LEVEL_ERROR, "xrdp_load_keyboard_layout: error opening %s", +- keyboard_cfg_file); ++ client_info->xrdp_keyboard_ini_file); + } + } + +@@ -2759,7 +2757,6 @@ xrdp_sec_incoming(struct xrdp_sec *self) + int index = 0; + char *item = NULL; + char *value = NULL; +- char key_file[256]; + + iso = self->mcs_layer->iso_layer; + +@@ -2805,19 +2802,17 @@ xrdp_sec_incoming(struct xrdp_sec *self) + LOG(LOG_LEVEL_DEBUG, "Using RDP security, and " + "reading the server configuration"); + +- g_memset(key_file, 0, sizeof(char) * 256); + g_random(self->server_random, 32); + items = list_create(); + items->auto_free = 1; + values = list_create(); + values->auto_free = 1; +- g_snprintf(key_file, 255, "%s/rsakeys.ini", XRDP_CFG_PATH); + +- if (file_by_name_read_section(key_file, "keys", items, values) != 0) ++ if (file_by_name_read_section(self->rdp_layer->client_info.rsakeys_ini_file, "keys", items, values) != 0) + { + /* this is a show stopper */ + LOG(LOG_LEVEL_ERROR, "XRDP cannot read file: %s " +- "(check permissions)", key_file); ++ "(check permissions)", self->rdp_layer->client_info.rsakeys_ini_file); + list_delete(items); + list_delete(values); + return 1; +diff --git a/sesman/config.c b/sesman/config.c +index 61e9e403..0466f61a 100644 +--- a/sesman/config.c ++++ b/sesman/config.c +@@ -34,6 +34,7 @@ + #include "sesman.h" + #include "log.h" + #include "string_calls.h" ++#include + #include "chansrv/chansrv_common.h" + + /***************************************************************************//** +@@ -47,11 +48,10 @@ + * + */ + static int +-config_read_globals(int file, struct config_sesman *cf, struct list *param_n, ++config_read_globals(const char *base_dir, int file, struct config_sesman *cf, struct list *param_n, + struct list *param_v) + { + int i; +- int length; + char *buf; + + list_clear(param_v); +@@ -127,13 +127,12 @@ config_read_globals(int file, struct config_sesman *cf, struct list *param_n, + g_free(cf->default_wm); + cf->default_wm = g_strdup("startwm.sh"); + } +- /* if default_wm doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */ ++ /* if default_wm doesn't begin with '/', it's a relative path to base_dir */ + if (cf->default_wm[0] != '/') + { + /* sizeof operator returns string length including null terminator */ +- length = sizeof(XRDP_CFG_PATH) + g_strlen(cf->default_wm) + 1; /* '/' */ +- buf = (char *)g_malloc(length, 0); +- g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, cf->default_wm); ++ buf = (char *)g_malloc(g_strlen(base_dir) + 1 + g_strlen(cf->default_wm) + 1, 0); ++ g_sprintf(buf, "%s/%s", base_dir, cf->default_wm); + g_free(cf->default_wm); + cf->default_wm = g_strdup(buf); + g_free(buf); +@@ -151,10 +150,8 @@ config_read_globals(int file, struct config_sesman *cf, struct list *param_n, + /* if reconnect_sh doesn't begin with '/', it's a relative path to XRDP_CFG_PATH */ + if (cf->reconnect_sh[0] != '/') + { +- /* sizeof operator returns string length including null terminator */ +- length = sizeof(XRDP_CFG_PATH) + g_strlen(cf->reconnect_sh) + 1; /* '/' */ +- buf = (char *)g_malloc(length, 0); +- g_sprintf(buf, "%s/%s", XRDP_CFG_PATH, cf->reconnect_sh); ++ buf = (char *)g_malloc(g_strlen(base_dir) + 1 + g_strlen(cf->reconnect_sh) + 1, 0); ++ g_sprintf(buf, "%s/%s", base_dir, cf->reconnect_sh); + g_free(cf->reconnect_sh); + cf->reconnect_sh = g_strdup(buf); + g_free(buf); +@@ -511,6 +508,7 @@ struct config_sesman * + config_read(const char *sesman_ini) + { + struct config_sesman *cfg; ++ char cfg_dir[256]; + int all_ok = 0; + + if ((cfg = g_new0(struct config_sesman, 1)) != NULL) +@@ -532,8 +530,10 @@ config_read(const char *sesman_ini) + param_v->auto_free = 1; + + /* read global config */ +- config_read_globals(fd, cfg, param_n, param_v); +- ++ g_strcpy(cfg_dir, sesman_ini); ++ *(strrchr(cfg_dir, '/')) = 0; // cfg_file validated to contain '/' ++ ++ config_read_globals(cfg_dir, fd, cfg, param_n, param_v); + /* read Xvnc/X11rdp/Xorg parameter list */ + config_read_vnc_params(fd, cfg, param_n, param_v); + config_read_rdp_params(fd, cfg, param_n, param_v); +diff --git a/xrdp/lang.c b/xrdp/lang.c +index e4c18077..06f92997 100644 +--- a/xrdp/lang.c ++++ b/xrdp/lang.c +@@ -229,7 +229,7 @@ km_read_section(int fd, const char *section_name, struct xrdp_key_info *keymap) + + /*****************************************************************************/ + int +-get_keymaps(int keylayout, struct xrdp_keymap *keymap) ++get_keymaps(const char* keymaps_path, int keylayout, struct xrdp_keymap *keymap) + { + int fd; + int basic_key_layout = keylayout & 0x0000ffff; +@@ -239,21 +239,21 @@ get_keymaps(int keylayout, struct xrdp_keymap *keymap) + filename = (char *)g_malloc(256, 0); + + /* check if there is a keymap file e.g. km-e00100411.ini */ +- g_snprintf(filename, 255, "%s/km-%08x.ini", XRDP_CFG_PATH, keylayout); ++ g_snprintf(filename, 255, "%s/km-%08x.ini", keymaps_path, keylayout); + + /* if the file does not exist, use only lower 16 bits instead */ + if (!g_file_exist(filename)) + { + LOG(LOG_LEVEL_WARNING, "Cannot find keymap file %s", filename); + /* e.g. km-00000411.ini */ +- g_snprintf(filename, 255, "%s/km-%08x.ini", XRDP_CFG_PATH, basic_key_layout); ++ g_snprintf(filename, 255, "%s/km-%08x.ini", keymaps_path, basic_key_layout); + } + + /* finally, use 'en-us' */ + if (!g_file_exist(filename)) + { + LOG(LOG_LEVEL_WARNING, "Cannot find keymap file %s", filename); +- g_snprintf(filename, 255, "%s/km-00000409.ini", XRDP_CFG_PATH); ++ g_snprintf(filename, 255, "%s/km-00000409.ini", keymaps_path); + } + + if (g_file_exist(filename)) +diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c +index e91672fb..37cef0c0 100644 +--- a/xrdp/xrdp.c ++++ b/xrdp/xrdp.c +@@ -384,7 +384,6 @@ xrdp_sanity_check(void) + { + int intval = 1; + int host_be; +- const char *key_file = XRDP_CFG_PATH "/rsakeys.ini"; + + /* check compiled endian with actual endian */ + host_be = !((int)(*(unsigned char *)(&intval))); +@@ -429,12 +428,6 @@ xrdp_sanity_check(void) + return 1; + } + +- if (!g_file_exist(key_file)) +- { +- g_writeln("File %s is missing, create it using xrdp-keygen", key_file); +- return 1; +- } +- + return 0; + } + +diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h +index 36d8f87a..687b9dd5 100644 +--- a/xrdp/xrdp.h ++++ b/xrdp/xrdp.h +@@ -380,7 +380,7 @@ get_char_from_scan_code(int device_flags, int scan_code, int *keys, + int caps_lock, int num_lock, int scroll_lock, + struct xrdp_keymap *keymap); + int +-get_keymaps(int keylayout, struct xrdp_keymap *keymap); ++get_keymaps(const char* keymaps_path, int keylayout, struct xrdp_keymap *keymap); + + /* xrdp_login_wnd.c */ + int +diff --git a/xrdp/xrdp.ini.in b/xrdp/xrdp.ini.in +index 3b6340f8..c05e2930 100644 +--- a/xrdp/xrdp.ini.in ++++ b/xrdp/xrdp.ini.in +@@ -52,6 +52,12 @@ crypt_level=high + ; openssl req -x509 -newkey rsa:2048 -nodes -keyout key.pem -out cert.pem -days 365 + certificate= + key_file= ++;directory with km-*.ini files; default is the directory of xrdp.ini ++#keymaps_path= ++;location of xrdp_keyboard_ini; default next to xrdp.ini ++#xrdp_keyboard_ini= ++;location of rsakeys.ini; default next to xrdp.ini ++#rsakeys_ini= + + ; set SSL protocols + ; can be comma separated list of 'SSLv3', 'TLSv1', 'TLSv1.1', 'TLSv1.2', 'TLSv1.3' +diff --git a/xrdp/xrdp_wm.c b/xrdp/xrdp_wm.c +index 94691582..602b3ca6 100644 +--- a/xrdp/xrdp_wm.c ++++ b/xrdp/xrdp_wm.c +@@ -64,7 +64,7 @@ xrdp_wm_create(struct xrdp_process *owner, + self->mm = xrdp_mm_create(self); + self->default_font = xrdp_font_create(self); + /* this will use built in keymap or load from file */ +- get_keymaps(self->session->client_info->keylayout, &(self->keymap)); ++ get_keymaps(client_info->keymaps_path, self->session->client_info->keylayout, &(self->keymap)); + xrdp_wm_set_login_state(self, WMLS_RESET); + self->target_surface = self->screen; + self->current_surface_index = 0xffff; /* screen */ +diff --git a/xup/xup.c b/xup/xup.c +index e67d9477..8bc718a0 100644 +--- a/xup/xup.c ++++ b/xup/xup.c +@@ -318,7 +318,7 @@ lib_mod_event(struct mod *mod, int msg, tbus param1, tbus param2, + msg param1 param2 param3 param4 + 15 0 65507 29 0 + 16 0 65507 29 49152 */ +- init_stream(s, 8192); ++ init_stream(s, (int)sizeof(mod->client_info) < 8192 ? 8192 : (int)sizeof(mod->client_info)); + s_push_layer(s, iso_hdr, 4); + out_uint16_le(s, 103); + out_uint32_le(s, 16); /* key up */ diff --git a/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix b/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix index a35f918ff5..e2b6e86c6c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "rymdport"; - version = "3.2.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "Jacalz"; repo = "rymdport"; rev = "v${version}"; - hash = "sha256-kAEkeRAS+gMjdriop4tQcqc+GldldxOn+QwgWTl8XB0="; + hash = "sha256-8Iul8YSxrfP7uG/uSmV+Qro+B1r+mhkOxCICHf204Lg="; }; - vendorHash = "sha256-rZHM0HwiTNbUuJmlNOHg/XoYxqrKt59l5BL/vjm4Hfk="; + vendorHash = "sha256-9Z++E4Lb1+VBvOx5GJ4yQuj7fpwUhlsMhavTifKxVw4="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index fbb8842393..1dabe93728 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -8,10 +8,8 @@ assert withQt -> qt5 != null; -with lib; - let - version = "4.0.2"; + version = "4.0.3"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -21,7 +19,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "sha256-81kVaZ8vmyjdshEgLUDsiYTlg008kRSDFEpJhLpEQR0="; + sha256 = "sha256-bFHhW8wK+5NzTmhtv/NU/9FZ9XC9KQS8u61vP+t+lRE="; }; cmakeFlags = [ @@ -39,17 +37,17 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; nativeBuildInputs = [ asciidoctor bison cmake flex makeWrapper pkg-config python3 perl ] - ++ optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; + ++ lib.optionals withQt [ qt5.wrapQtAppsHook wrapGAppsHook ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ gettext pcre2 libpcap lua5 libssh nghttp2 openssl libgcrypt libgpg-error gnutls geoip c-ares glib zlib - ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) - ++ optionals stdenv.isLinux [ libcap libnl ] - ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] - ++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); + ] ++ lib.optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) + ++ lib.optionals stdenv.isLinux [ libcap libnl ] + ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] + ++ lib.optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); strictDeps = true; @@ -72,7 +70,7 @@ in stdenv.mkDerivation { install_name_tool -change "$dylib" "$out/lib/$dylib" "$f" done done - '' else optionalString withQt '' + '' else lib.optionalString withQt '' pwd install -Dm644 -t $out/share/applications ../resources/freedesktop/org.wireshark.Wireshark.desktop diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix index 0b02b87a1b..71eece9e3b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix @@ -7,13 +7,13 @@ let apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; in stdenv.mkDerivation rec { pname = "backintime-common"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "sha256-7iTQZ7SiESsKK8F8BpLrRNkj8JhHo64kliaOvMvYGvw="; + sha256 = "sha256-cKmzq155/dCl5wZA2SE3XjfCocHxTh4Wa2IdfzSfQHg="; }; nativeBuildInputs = [ makeWrapper gettext ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/casync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/casync/default.nix index 5bc29832c5..7a1252f806 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/casync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/casync/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ++ lib.optionals (selinuxSupport) [ libselinux ] ++ lib.optionals (udevSupport) [ udev ]; nativeBuildInputs = [ meson ninja pkg-config python3 sphinx ]; - checkInputs = [ glibcLocales rsync ]; + nativeCheckInputs = [ glibcLocales rsync ]; postPatch = '' for f in test/test-*.sh.in; do diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/lsyncd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/lsyncd/default.nix index 85f30c7f00..cc9663dd6f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/lsyncd/default.nix @@ -3,23 +3,15 @@ stdenv.mkDerivation rec { pname = "lsyncd"; - version = "2.2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "axkibe"; repo = "lsyncd"; rev = "release-${version}"; - sha256 = "1hbsih5hfq9lhgnxm0wb5mrj6xmlk2l0i9a79wzd5f6cnjil9l3x"; + hash = "sha256-QBmvS1HGF3VWS+5aLgDr9AmUfEsuSz+DTFIeql2XHH4="; }; - patches = [ - (fetchpatch { - sha256 = "0b0h2qxh73l502p7phf6qgl8576nf6fvqqp2x5wy3nz7sc9qb1z8"; - name = "fix-non-versioned-lua-not-search-in-cmake.patch"; - url = "https://github.com/axkibe/lsyncd/pull/500/commits/0af99d8d5ba35118e8799684a2d4a8ea4b0c6957.patch"; - }) - ]; - postPatch = '' substituteInPlace default-rsync.lua \ --replace "/usr/bin/rsync" "${rsync}/bin/rsync" diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix index d928978d3c..6c64b755be 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix @@ -8,7 +8,7 @@ , curl , sqlite , libnotify -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd }: diff --git a/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix b/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix index 7dd8978dc2..d91ba79061 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix @@ -49,7 +49,7 @@ in rec { enableParallelBuilding = true; - checkInputs = [ wget curl ]; + nativeCheckInputs = [ wget curl ]; doInstallCheck = true; checkTarget = "check"; @@ -100,7 +100,7 @@ in rec { enableParallelBuilding = true; - checkInputs = [ jq ]; + nativeCheckInputs = [ jq ]; doInstallCheck = true; checkTarget = "check"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/twtxt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/twtxt/default.nix index 5745408625..7d703d2db4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/twtxt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/twtxt/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ aiohttp python-dateutil humanize click ]; - checkInputs = [ pytestCheckHook tox ]; + nativeCheckInputs = [ pytestCheckHook tox ]; disabledTests = [ # Disable test using relative date and time diff --git a/third_party/nixpkgs/pkgs/applications/networking/vnstat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/vnstat/default.nix index 8e9cfb5aee..56a609e3de 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/vnstat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/vnstat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gd ncurses sqlite ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/wgnord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/wgnord/default.nix new file mode 100644 index 0000000000..b338cab2b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/wgnord/default.nix @@ -0,0 +1,65 @@ +{ bash +, coreutils +, curl +, fetchFromGitHub +, gnugrep +, gnused +, iproute2 +, jq +, lib +, resholve +, wireguard-tools +}: + +resholve.mkDerivation rec { + pname = "wgnord"; + version = "0.1.10"; + + src = fetchFromGitHub { + owner = "phirecc"; + repo = pname; + rev = version; + hash = "sha256-T7dAEgi4tGvrzBABGLzKHhpCx0bxSCtTVI5iJJqJGlE="; + }; + + postPatch = '' + substituteInPlace wgnord \ + --replace '$conf_dir/countries.txt' "$out/share/countries.txt" \ + --replace '$conf_dir/countries_iso31662.txt' "$out/share/countries_iso31662.txt" + ''; + + dontBuild = true; + + installPhase = '' + install -Dm 755 wgnord -t $out/bin/ + install -Dm 644 countries.txt -t $out/share/ + install -Dm 644 countries_iso31662.txt -t $out/share/ + ''; + + solutions.default = { + scripts = [ "bin/wgnord" ]; + interpreter = "${bash}/bin/sh"; + inputs = [ + coreutils + curl + gnugrep + gnused + iproute2 + jq + wireguard-tools + ]; + fix.aliases = true; # curl command in an alias + execer = [ + "cannot:${iproute2}/bin/ip" + "cannot:${wireguard-tools}/bin/wg-quick" + ]; + }; + + meta = with lib; { + description = "A NordVPN Wireguard (NordLynx) client in POSIX shell"; + homepage = "https://github.com/phirecc/wgnord"; + changelog = "https://github.com/phirecc/wgnord/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ urandom ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/znc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/znc/default.nix index f73bb1c4bf..6675338719 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/znc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/znc/default.nix @@ -9,8 +9,6 @@ , withDebug ? false }: -with lib; - stdenv.mkDerivation rec { pname = "znc"; version = "1.8.2"; @@ -23,12 +21,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ optional withPerl perl - ++ optional withPython python3 - ++ optional withTcl tcl - ++ optional withCyrus cyrus_sasl - ++ optional withUnicode icu - ++ optional withZlib zlib; + ++ lib.optional withPerl perl + ++ lib.optional withPython python3 + ++ lib.optional withTcl tcl + ++ lib.optional withCyrus cyrus_sasl + ++ lib.optional withUnicode icu + ++ lib.optional withZlib zlib; configureFlags = [ (lib.enableFeature withPerl "perl") @@ -36,8 +34,8 @@ stdenv.mkDerivation rec { (lib.enableFeature withTcl "tcl") (lib.withFeatureAs withTcl "tcl" "${tcl}/lib") (lib.enableFeature withCyrus "cyrus") - ] ++ optionals (!withIPv6) [ "--disable-ipv6" ] - ++ optionals withDebug [ "--enable-debug" ]; + ] ++ lib.optionals (!withIPv6) [ "--disable-ipv6" ] + ++ lib.optionals withDebug [ "--enable-debug" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix index fce5bb1496..5828ac35fc 100644 --- a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix @@ -10,7 +10,9 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-Uw8UIJa+Dtsy+o31I1ynLyhZrFNX42NFRXu1O2ISbzU="; }; - nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; + pythonRelaxDeps = [ "cheroot" ]; + + nativeBuildInputs = with python3.pkgs; [ setuptools-scm pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ babel @@ -27,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { werkzeug ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix index e93be60741..1fbb9b7cbd 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gnumeric/default.nix @@ -7,11 +7,11 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.53"; + version = "1.12.54"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "VWjkyNzqu5Ao8TYdEEVSL5Xwpx2qWelzy90tObrdTwI="; + sha256 = "RpBAYv0cSkyTWW0mv2eTLNcvwPjSxaZ8F5GFJ/7oK3Q="; }; configureFlags = [ "--disable-component" ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix b/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix index 16a498afca..8165cc381c 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gtg/default.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication rec { caldav ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ nose mock xvfb-run diff --git a/third_party/nixpkgs/pkgs/applications/office/karlender/default.nix b/third_party/nixpkgs/pkgs/applications/office/karlender/default.nix index 6917e2ab94..ebbb0bbd9f 100644 --- a/third_party/nixpkgs/pkgs/applications/office/karlender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/karlender/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "karlender"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitLab { owner = "floers"; repo = pname; rev = "v${version}"; - hash = "sha256-WuTxsnYXudciTBH1RFHsIYNIHeoeZ+rI2JhYBYPUziw="; + hash = "sha256-lmNG9B2uO/zitOY/cNjnLRjCn6mSJ3CIpXIXpChDi9A="; }; - cargoHash = "sha256-eHEISCHh1jWCy3LwVuCx4LXfNLe1A4drHusyayoS+Ho="; + cargoHash = "sha256-foxl8pqRqEbVwUWUGHmaTGazrwLQxcDJ/RvJE9wIszg="; nativeBuildInputs = [ pkg-config @@ -35,6 +35,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace src/domain/time.rs --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + substituteInPlace build.rs --replace "// gra::build" "gra::build" ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/kexi/default.nix b/third_party/nixpkgs/pkgs/applications/office/kexi/default.nix index 4900dafb08..37240b8ac5 100644 --- a/third_party/nixpkgs/pkgs/applications/office/kexi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/kexi/default.nix @@ -49,7 +49,7 @@ mkDerivation rec { All database objects - tables, queries and forms - are stored in the database, making it easy to share data and design. ''; - homepage = "http://kexi-project.org/"; + homepage = "https://kexi-project.org/"; maintainers = with maintainers; [ zraexy ]; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/kmymoney/default.nix b/third_party/nixpkgs/pkgs/applications/office/kmymoney/default.nix index 64167b8424..dfab08ace2 100644 --- a/third_party/nixpkgs/pkgs/applications/office/kmymoney/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/kmymoney/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; - installCheckInputs = [ xvfb-run ]; + nativeInstallCheckInputs = [ xvfb-run ]; installCheckPhase = lib.optionalString doInstallCheck '' xvfb-run -s '-screen 0 1024x768x24' make test \ diff --git a/third_party/nixpkgs/pkgs/applications/office/ledger-autosync/default.nix b/third_party/nixpkgs/pkgs/applications/office/ledger-autosync/default.nix index 4f992c3ebe..55b89f195e 100644 --- a/third_party/nixpkgs/pkgs/applications/office/ledger-autosync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/ledger-autosync/default.nix @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { # Checks require ledger as a python package, # ledger does not support python3 while ledger-autosync requires it. - checkInputs = with python3Packages; [ ledger hledger nose mock pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ ledger hledger nose mock pytestCheckHook ]; # Disable some non-passing tests: # https://github.com/egh/ledger-autosync/issues/127 diff --git a/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix b/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix index 7065343378..d06d4d776a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "2.5.16"; + version = "2.6.4"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-U77yOgQNSj1p3WZbwkyq0Ui2UrXeuAv5sD7L+ZI2x24="; + sha256 = "sha256-2Cze8R22Wrvp+FJq/7Kp36i7Areo5e9fdBo3DQ+rvZY="; }; nativeBuildInputs = [ @@ -19,9 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; - dontBuild = true; - dontConfigure = true; - unpackCmd = '' dpkg-deb -x ${src} ./morgen-${pname} ''; @@ -37,7 +34,7 @@ stdenv.mkDerivation rec { # 2. Fixes startup script substituteInPlace $TMP/work/dist/main.js \ --replace "process.resourcesPath,\"todesktop-runtime-config.json" "\"$out/opt/Morgen/resources/todesktop-runtime-config.json" \ - --replace "Exec=\"+process.execPath+\"" "Exec=$out/bin/morgen" + --replace "Exec=\".concat(process.execPath," "Exec=\".concat(\"$out/bin/morgen\"," asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" $out/opt/Morgen/resources/app.asar substituteInPlace $out/share/applications/morgen.desktop \ diff --git a/third_party/nixpkgs/pkgs/applications/office/p3x-onenote/default.nix b/third_party/nixpkgs/pkgs/applications/office/p3x-onenote/default.nix index 1653e9ec82..43b511c74a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/p3x-onenote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/p3x-onenote/default.nix @@ -1,23 +1,19 @@ { lib, stdenv, appimageTools, desktop-file-utils, fetchurl }: let - version = "2020.10.111"; + version = "2022.10.117"; name = "p3x-onenote-${version}"; plat = { aarch64-linux = "-arm64"; armv7l-linux = "-armv7l"; - i386-linux = "-i386"; - i686-linux = "-i386"; x86_64-linux = ""; }.${stdenv.hostPlatform.system}; sha256 = { - aarch64-linux = "0a3c0w1312l6k2jvn7cn8priibnh8wg0184zjcli29f9ds1afl5s"; - armv7l-linux = "172m2d94zzm8q61pvnjy01cl5fg11ad9hfh1han0gycnv3difniy"; - i386-linux = "12m0i5sb15sbysp5fvhbj4k36950m7kpjr12n88r5fpkyh13ihsp"; - i686-linux = "12m0i5sb15sbysp5fvhbj4k36950m7kpjr12n88r5fpkyh13ihsp"; - x86_64-linux = "0bn48r55l5dh8zcf8ijh3z6hlyp3s6fvfyqc1csvnslm63dfkzcq"; + aarch64-linux = "0plpwymm1bgzbzwk2689lw1fadxdwxzzn5dmayk1ayxz1k3pj9wi"; + armv7l-linux = "1pvr8f1ccl4nyfmshn3v3jfaa5x519rsy57g4pdapffj10vpbkb8"; + x86_64-linux = "12j2py8yb81ngahbkbi7269izpc5aydd432cbv0sw45ighhyqhmr"; }.${stdenv.hostPlatform.system}; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/office/paper-note/default.nix b/third_party/nixpkgs/pkgs/applications/office/paper-note/default.nix index 18ab6250d0..e400c88df5 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paper-note/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paper-note/default.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation rec { gtksourceview5 ]; + postPatch = '' + substituteInPlace src/meson.build \ + --replace "1.2.0" "${libadwaita.version}" + ''; + postInstall = '' ln -s $out/bin/io.posidon.Paper $out/bin/paper ''; diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix index f3a7a4f5f0..61c607c422 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix @@ -1,6 +1,8 @@ { lib -, fetchurl +, fetchFromGitHub +, buildNpmPackage , nixosTests +, gettext , python3 , ghostscript , imagemagickBig @@ -12,10 +14,18 @@ , unpaper , poppler_utils , liberation_ttf -, fetchFromGitHub }: let + version = "1.12.2"; + + src = fetchFromGitHub { + owner = "paperless-ngx"; + repo = "paperless-ngx"; + rev = "refs/tags/v${version}"; + hash = "sha256-1QufnRD2Nbc4twRZ4Yrf3ae1BRGves8tJ/M7coWnRPI="; + }; + # Use specific package versions required by paperless-ngx python = python3.override { packageOverrides = self: super: { @@ -78,36 +88,67 @@ let unpaper poppler_utils ]; -in -python.pkgs.pythonPackages.buildPythonApplication rec { - pname = "paperless-ngx"; - version = "1.11.3"; - # Fetch the release tarball instead of a git ref because it contains the prebuilt frontend - src = fetchurl { - url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz"; - hash = "sha256-wGNkdczgV+UDd9ZO+BXMSWotpetE/+c/jJAAH+6SXps="; + frontend = buildNpmPackage { + pname = "paperless-ngx-frontend"; + inherit version src; + + npmDepsHash = "sha256-fp0Gy3018u2y6jaUM9bmXU0SVjyEJdsvkBqbmb8S10Y="; + + nativeBuildInputs = [ + python3 + ]; + + postPatch = '' + cd src-ui + ''; + + CYPRESS_INSTALL_BINARY = "0"; + NG_CLI_ANALYTICS = "false"; + + npmBuildFlags = [ + "--" "--configuration" "production" + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/paperless-ui + mv ../src/documents/static/frontend $out/lib/paperless-ui/ + runHook postInstall + ''; }; - +in +python.pkgs.buildPythonApplication rec { + pname = "paperless-ngx"; format = "other"; - propagatedBuildInputs = with python.pkgs.pythonPackages; [ + inherit version src; + + nativeBuildInputs = [ + gettext + ]; + + propagatedBuildInputs = with python.pkgs; [ aioredis - arrow + amqp + anyio asgiref async-timeout attrs autobahn automat + billiard bleach - blessed celery certifi cffi channels-redis channels - chardet + charset-normalizer click + click-didyoumean + click-plugins + click-repl coloredlogs concurrent-log-handler constantly @@ -118,18 +159,16 @@ python.pkgs.pythonPackages.buildPythonApplication rec { django-cors-headers django-extensions django-filter - django-picklefield django djangorestframework filelock - fuzzywuzzy gunicorn h11 hiredis httptools humanfriendly + humanize hyperlink - imagehash idna imap-tools img2pdf @@ -140,9 +179,11 @@ python.pkgs.pythonPackages.buildPythonApplication rec { langdetect lxml msgpack + mysqlclient nltk numpy ocrmypdf + packaging pathvalidate pdf2image pdfminer-six @@ -150,6 +191,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { pillow pluggy portalocker + prompt-toolkit psycopg2 pyasn1-modules pyasn1 @@ -158,7 +200,6 @@ python.pkgs.pythonPackages.buildPythonApplication rec { python-dateutil python-dotenv python-gnupg - levenshtein python-magic pytz pyyaml @@ -171,36 +212,51 @@ python.pkgs.pythonPackages.buildPythonApplication rec { scikit-learn scipy service-identity - six - sortedcontainers + setproctitle + sniffio sqlparse threadpoolctl tika + tornado tqdm - twisted.optional-dependencies.tls + twisted txaio + tzdata tzlocal urllib3 uvicorn uvloop + vine watchdog - watchgod + watchfiles wcwidth + webencodings websockets whitenoise whoosh + zipp zope_interface - ]; + ] + ++ redis.optional-dependencies.hiredis + ++ twisted.optional-dependencies.tls + ++ uvicorn.optional-dependencies.standard; - # Compile manually because `pythonRecompileBytecodeHook` only works for - # files in `python.sitePackages` postBuild = '' + # Compile manually because `pythonRecompileBytecodeHook` only works + # for files in `python.sitePackages` ${python.interpreter} -OO -m compileall src + + # Collect static files + ${python.interpreter} src/manage.py collectstatic --clear --no-input + + # Compile string translations using gettext + ${python.interpreter} src/manage.py compilemessages ''; installPhase = '' - mkdir -p $out/lib - cp -r . $out/lib/paperless-ngx + mkdir -p $out/lib/paperless-ngx + cp -r {src,static,LICENSE,gunicorn.conf.py} $out/lib/paperless-ngx + ln -s ${frontend}/lib/paperless-ui/frontend $out/lib/paperless-ngx/static/ chmod +x $out/lib/paperless-ngx/src/manage.py makeWrapper $out/lib/paperless-ngx/src/manage.py $out/bin/paperless-ngx \ --prefix PYTHONPATH : "$PYTHONPATH" \ @@ -210,12 +266,17 @@ python.pkgs.pythonPackages.buildPythonApplication rec { --prefix PATH : "${path}" ''; - checkInputs = with python.pkgs.pythonPackages; [ + postFixup = '' + # Remove tests with samples (~14M) + find $out/lib/paperless-ngx -type d -name tests -exec rm -rv {} + + ''; + + nativeCheckInputs = with python.pkgs; [ + factory_boy + imagehash pytest-django pytest-env - pytest-sugar pytest-xdist - factory_boy pytestCheckHook ]; @@ -250,13 +311,14 @@ python.pkgs.pythonPackages.buildPythonApplication rec { ]; passthru = { - inherit python path; + inherit python path frontend; tests = { inherit (nixosTests) paperless; }; }; meta = with lib; { description = "Tool to scan, index, and archive all of your physical documents"; homepage = "https://paperless-ngx.readthedocs.io/"; + changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ lukegb gador erikarvstedt ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix index 814ae5e51f..b67dfe436f 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-backend.nix @@ -39,6 +39,9 @@ buildPythonPackage rec { patchFlags = [ "-p2" ]; postPatch = '' + substituteInPlace setup.py \ + --replace python-Levenshtein Levenshtein + echo 'version = "${version}"' > src/paperwork_backend/_version.py chmod a+w -R .. patchShebangs ../tools @@ -72,7 +75,7 @@ buildPythonPackage rec { make l10n_compile ''; - checkInputs = [ + nativeCheckInputs = [ libreoffice openpaperwork-gtk psutil diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix index 387e6c2d76..6c09681137 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -22,7 +22,7 @@ let documentation_deps = [ (texlive.combine { - inherit (texlive) scheme-small wrapfig was; + inherit (texlive) scheme-small wrapfig gensymb; }) xvfb-run imagemagick @@ -45,6 +45,9 @@ python3Packages.buildPythonApplication rec { # Patch out a few paths that assume that we're using the FHS: postPatch = '' + substituteInPlace setup.py \ + --replace python-Levenshtein Levenshtein + chmod a+w -R .. patchShebangs ../tools @@ -83,7 +86,7 @@ python3Packages.buildPythonApplication rec { done ''; - checkInputs = [ dbus ]; + nativeCheckInputs = [ dbus ]; nativeBuildInputs = [ wrapGAppsHook diff --git a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix index 7e633f54f9..ee621df4d8 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperwork/paperwork-shell.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ openpaperwork-gtk ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/pdfmm/default.nix b/third_party/nixpkgs/pkgs/applications/office/pdfmm/default.nix new file mode 100644 index 0000000000..1a61f786de --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/pdfmm/default.nix @@ -0,0 +1,57 @@ +{ bash +, coreutils +, fetchFromGitHub +, ghostscript +, glibc +, gnome +, gnused +, lib +, resholve +, xorg +}: + +resholve.mkDerivation rec { + pname = "pdfmm"; + version = "unstable-2019-01-24"; + + src = fetchFromGitHub { + owner = "jpfleury"; + repo = pname; + rev = "45ee7796659d23bb030bf06647f1af85e1d2b52d"; + hash = "sha256-TOISD/2g7MwnLrtpMnfr2Ln0IiwlJVNavWl4eh/uwN0="; + }; + + dontBuild = true; + + installPhase = '' + install -Dm 0755 pdfmm $out/bin/pdfmm + ''; + + solutions.default = { + scripts = [ + "bin/pdfmm" + ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + coreutils + ghostscript + glibc + gnome.zenity + gnused + xorg.xmessage + ]; + execer = [ + "cannot:${glibc.bin}/bin/locale" + "cannot:${gnome.zenity}/bin/zenity" + "cannot:${xorg.xmessage}/bin/xmessage" + ]; + keep."$toutLu" = true; + }; + + meta = with lib; { + description = "Graphical assistant to reduce the size of a PDF file"; + homepage = "https://github.com/jpfleury/pdfmm"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix index e13cdc9c71..fbfe11a2c9 100644 --- a/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qnotero/default.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Quick access to Zotero references"; - homepage = "http://www.cogsci.nl/software/qnotero"; + homepage = "https://www.cogsci.nl/software/qnotero"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.nico202 ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix index 158c2389a3..9fe6221d49 100644 --- a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -17,14 +17,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.1.0"; + version = "23.1.2"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-HMs8DTL2BDSDmchadpVvbShjJMPP6W587F38uiixCuQ="; + sha256 = "sha256-yfsptsatmi0A+qLKHxchaLuu0WkJnUk7sjs1Pb/D6NU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/qpdfview/default.nix b/third_party/nixpkgs/pkgs/applications/office/qpdfview/default.nix similarity index 77% rename from third_party/nixpkgs/pkgs/applications/misc/qpdfview/default.nix rename to third_party/nixpkgs/pkgs/applications/office/qpdfview/default.nix index db5995149c..6cc26c95a0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qpdfview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qpdfview/default.nix @@ -12,19 +12,21 @@ , file , ghostscript }: + mkDerivation rec { pname = "qpdfview"; - version = "0.4.18"; + version = "0.5.0"; src = fetchurl { - url = "https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; - sha256 = "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c"; + url = "https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-0.5.tar.gz"; + hash = "sha256-RO/EQKRhy911eps5bxRh7novQ2ToHfVb0CIfkQIZvpk="; }; - # apply upstream fix for qt5.15 https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104 - patches = [ ./qpdfview-qt515-compat.patch ]; + nativeBuildInputs = [ + qmake + pkg-config + ]; - nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qtsvg @@ -35,6 +37,7 @@ mkDerivation rec { file ghostscript ]; + preConfigure = '' qmakeFlags+=(*.pro) ''; diff --git a/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix b/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix index 18091b82af..fc1087ab2d 100644 --- a/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.12.0"; + version = "7.12.1"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-Ms7wt79iZz0xnrp+yrFs/FzVqINe6BSOEmYG9Oiz5JU="; + sha256 = "sha256-zMw6C7kyO8yDLF2vrRlBqcgzcfM4TR7/fJPHPaixw6Y="; name = "${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix b/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix index 7cf777ae13..2295071b09 100644 --- a/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/timeline/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { markdown ]; - checkInputs = [ + nativeCheckInputs = [ gettext python3.pkgs.mock ]; @@ -76,8 +76,8 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with lib; { - homepage = "http://thetimelineproj.sourceforge.net/"; - changelog = "http://thetimelineproj.sourceforge.net/changelog.html"; + homepage = "https://thetimelineproj.sourceforge.net/"; + changelog = "https://thetimelineproj.sourceforge.net/changelog.html"; description = "Display and navigate information on a timeline"; license = with licenses; [ gpl3Only cc-by-sa-30 ]; platforms = with platforms; unix; diff --git a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix index 68ec08e156..50db368073 100644 --- a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { urwid ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ flake8 flake8-import-order freezegun diff --git a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix index bdedb717d0..5566906919 100644 --- a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-01-04"; + version = "unstable-2023-01-23"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "fad7747720a602268525d5a900c03c252c9070dd"; - sha256 = "2n8AEK2YZd+zZjYiDNFe45ACW2cl7YMoOpGIidsKLZU="; + rev = "f676cba7f9749825744ec705ee58b9fbea47db51"; + sha256 = "Zx1fGicCuX+HJm2QFSYQhcd9Ibg3qj5h9NPlSNNVLag="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix index 08084bfbf7..35b9b694c0 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, copyDesktopItems, libxshmfence, wrapGAppsHook }: +{ lib, callPackage, ... }: let metaCommon = with lib; { @@ -7,117 +7,11 @@ let license = licenses.agpl3Plus; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ fliegendewurst ]; + maintainers = with maintainers; [ fliegendewurst eliandoran ]; }; - - version = "0.58.7"; - - desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - desktopSource.sha256 = "1xr8fx5m6p9z18al1iigf45acn7b69vhbc6z6q1v933bvkwry16c"; - - serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "0xr474z7wz0z4rqvk5rhv6xh51mdysr8zw86fs8fk7av0fdqxyka"; - in { - trilium-desktop = stdenv.mkDerivation rec { - pname = "trilium-desktop"; - inherit version; - meta = metaCommon // { - mainProgram = "trilium"; - }; + trilium-desktop = callPackage ./desktop.nix { metaCommon = metaCommon; }; + trilium-server = callPackage ./server.nix { metaCommon = metaCommon; }; - src = fetchurl desktopSource; - - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - wrapGAppsHook - copyDesktopItems - ]; - - buildInputs = atomEnv.packages ++ [ libxshmfence ]; - - desktopItems = [ - (makeDesktopItem { - name = "Trilium"; - exec = "trilium"; - icon = "trilium"; - comment = meta.description; - desktopName = "Trilium Notes"; - categories = [ "Office" ]; - }) - ]; - - # Remove trilium-portable.sh, so trilium knows it is packaged making it stop auto generating a desktop item on launch - postPatch = '' - rm ./trilium-portable.sh - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $out/share/trilium - mkdir -p $out/share/icons/hicolor/128x128/apps - - cp -r ./* $out/share/trilium - ln -s $out/share/trilium/trilium $out/bin/trilium - - ln -s $out/share/trilium/icon.png $out/share/icons/hicolor/128x128/apps/trilium.png - runHook postInstall - ''; - - # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) - ''; - - dontStrip = true; - - passthru.updateScript = ./update.sh; - }; - - - trilium-server = stdenv.mkDerivation rec { - pname = "trilium-server"; - inherit version; - meta = metaCommon; - - src = fetchurl serverSource; - - nativeBuildInputs = [ - autoPatchelfHook - ]; - - buildInputs = [ - stdenv.cc.cc.lib - ]; - - patches = [ - # patch logger to use console instead of rolling files - ./0001-Use-console-logger-instead-of-rolling-files.patch - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - mkdir -p $out/share/trilium-server - - cp -r ./* $out/share/trilium-server - runHook postInstall - ''; - - postFixup = '' - cat > $out/bin/trilium-server < $out/bin/trilium-server < perlSupport; assert svnSupport -> perlSupport; let - version = "2.39.0"; + version = "2.39.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-uhmbE/tamco97JF7C9c2vA61qd+Hc31DXt398Q1pJls="; + sha256 = "sha256-QKOKCEezDDcbNYc7OvzxI4hd1B6j7Lv1EO+pfzzlwWE="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gita/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gita/default.nix index 6f20e4a44c..f2d9d2a9f6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gita/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gita/default.nix @@ -33,7 +33,7 @@ buildPythonApplication rec { done ''; - checkInputs = [ + nativeCheckInputs = [ git pytest ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 894f14ba44..1b4734027b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, buildGoPackage +, buildGoModule , fetchurl , makeWrapper , git @@ -13,16 +13,18 @@ , nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "gitea"; - version = "1.18.1"; + version = "1.18.3"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-FUliQ77P0WiwB1dWHDY3FjeJdHhUAcs/97JKXBdEdl0="; + hash = "sha256-jqjpbDgcmwZoc/ovgburFeeta9mAJOmz7yrvmUKAwRU="; }; + vendorHash = null; + patches = [ ./static-root-path.patch ]; @@ -31,37 +33,34 @@ buildGoPackage rec { substituteInPlace modules/setting/setting.go --subst-var data ''; + subPackages = [ "." ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional pamSupport pam; - preBuild = - let - tags = lib.optional pamSupport "pam" - ++ lib.optional sqliteSupport "sqlite sqlite_unlock_notify"; - tagsString = lib.concatStringsSep " " tags; - in - '' - export buildFlagsArray=( - -tags="${tagsString}" - -ldflags='-X "main.Version=${version}" -X "main.Tags=${tagsString}"' - ) - ''; + tags = lib.optional pamSupport "pam" + ++ lib.optionals sqliteSupport [ "sqlite" "sqlite_unlock_notify" ]; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + "-X 'main.Tags=${lib.concatStringsSep " " tags}'" + ]; outputs = [ "out" "data" ]; postInstall = '' mkdir $data - cp -R ./go/src/${goPackagePath}/{public,templates,options} $data + cp -R ./{public,templates,options} $data mkdir -p $out - cp -R ./go/src/${goPackagePath}/options/locale $out/locale + cp -R ./options/locale $out/locale wrapProgram $out/bin/gitea \ --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; - goPackagePath = "code.gitea.io/gitea"; - passthru.tests = nixosTests.gitea; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix index 196845bf52..2b6018dfe4 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitkraken/default.nix @@ -122,7 +122,9 @@ let postFixup = '' pushd $out/share/${pname} - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ${pname} + for file in ${pname} chrome-sandbox chrome_crashpad_handler; do + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $file + done for file in $(find . -type f \( -name \*.node -o -name ${pname} -o -name \*.so\* \) ); do patchelf --set-rpath ${libPath}:$out/share/${pname} $file || true diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json index a36dc3bc25..06eb8d78f0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.7.5", - "repo_hash": "sha256-zo1b82y114NpX43rJAWQmUhORM1kQxyiSnonqPUQJmY=", - "yarn_hash": "086v3lr4hnz8z8pla1d3mi2smldidmx2z2cmffn830ianpqkk83l", + "version": "15.8.1", + "repo_hash": "sha256-AdgebB7IY18u/J1F67oNnwVYmmeYJPNCI/yll2eZEiQ=", + "yarn_hash": "1famdjvsbhvnkg5sp2vnc3jzaixww41833pb0427s3qpig0fc7az", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.7.5-ee", + "rev": "v15.8.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.7.5", - "GITLAB_PAGES_VERSION": "15.7.5", - "GITLAB_SHELL_VERSION": "14.14.0", - "GITLAB_WORKHORSE_VERSION": "15.7.5" + "GITALY_SERVER_VERSION": "15.8.1", + "GITLAB_PAGES_VERSION": "15.8.1", + "GITLAB_SHELL_VERSION": "14.15.0", + "GITLAB_WORKHORSE_VERSION": "15.8.1" } } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index da95241d34..2b90a2e0cd 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -80,7 +80,7 @@ GEM reverse_markdown (~> 1.0) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - loofah (2.19.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -90,7 +90,7 @@ GEM minitest (5.16.3) msgpack (1.3.3) multipart-post (2.1.1) - nokogiri (1.13.8) + nokogiri (1.13.10) mini_portile2 (~> 2.8.0) racc (~> 1.4) octokit (4.20.0) @@ -112,15 +112,15 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (4.0.7) - racc (1.6.0) + racc (1.6.1) rack (2.2.4) rack-test (2.0.2) rack (>= 1.3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) rainbow (3.0.0) rbtrace (0.4.14) ffi (>= 1.0.6) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 9f217aa65f..28452edbfe 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.7.5"; + version = "15.8.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,10 +22,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-FT77MUcErc/16tChwyNczCLtADTOEzKKTsTlhLI6aV8="; + sha256 = "sha256-TolduUm8OhpubHXMCyy0vQhj65lauh5eST5UDvdWNVE="; }; - vendorSha256 = "sha256-UEEM0mv7d0gmDcsSKbeh4JcTnX4f5oogZnhRpqaNxwY="; + vendorSha256 = "sha256-8P5X/bqeI1hY45IGsvEWOg3GuetEQF/XtZzUMdX22pA="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index f7471a12b0..f3a4a082f2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -317,10 +317,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh"; + sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c"; type = "gem"; }; - version = "2.19.0"; + version = "2.19.1"; }; memoizable = { dependencies = ["thread_safe"]; @@ -385,10 +385,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; + sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; type = "gem"; }; - version = "1.13.8"; + version = "1.13.10"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -494,10 +494,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "0p685i23lr8pl7l09g9l2mcj615fr7g33w3mkcr472lcg34nq8n8"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; rack = { groups = ["default"]; @@ -537,10 +537,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; + sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.4"; }; rainbow = { source = { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 74fd1ab320..25e2a06424 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.14.0"; + version = "14.15.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-zXRLaEy2Q+mm1GLjLB1AxRtBxXAoLw6PA1YOJfvVhoc="; + sha256 = "sha256-GDhYBL5LT3r6UIjDDY3LV5VgcBch190hYLPb6uMWETs="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-mhmM33cXJbqVJ1jY82Mi/nWzz7HXdxxSsFNQknFkwpQ="; + vendorSha256 = "sha256-2DpQNJw67ipIW3ctHDJthuDrKNZCYvjXGlDxzBEMGWs="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index b164076c28..7a808ee2ff 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.7.5"; + version = "15.8.1"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-TrLc5L4kLAdu1CEM3ezw6hhF6Icy3rXkFyUaVTUQ6X4="; + vendorSha256 = "sha256-0FWR6cIV/0R2OrOAKhvuVnIY3Hkw4CIjyBUeF/paumw="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 417dc56637..96517b56ff 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -5,7 +5,7 @@ source 'https://rubygems.org' if ENV['BUNDLER_CHECKSUM_VERIFICATION_OPT_IN'] # this verification is still experimental $LOAD_PATH.unshift(File.expand_path("vendor/gems/bundler-checksum/lib", __dir__)) require 'bundler-checksum' - Bundler::Checksum.patch! + BundlerChecksum.patch! end gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', require: false @@ -37,7 +37,7 @@ gem 'view_component', '~> 2.74.1' gem 'default_value_for', '~> 3.4.0' # Supported DBs -gem 'pg', '~> 1.4.3' +gem 'pg', '~> 1.4.5' gem 'rugged', '~> 1.2' gem 'grape-path-helpers', '~> 1.7.1' @@ -84,7 +84,7 @@ gem 'gssapi', group: :kerberos gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # Spam and anti-bot protection -gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' +gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' gem 'akismet', '~> 3.0' gem 'invisible_captcha', '~> 2.0.0' @@ -113,7 +113,7 @@ gem 'gpgme', '~> 2.0.22' # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' -gem 'net-ldap', '~> 0.16.3' +gem 'net-ldap', '~> 0.17.1' # API gem 'grape', '~> 1.5.2' @@ -200,7 +200,7 @@ gem 'diffy', '~> 3.4' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.2.4' +gem 'rack', '~> 2.2.6', '>= 2.2.6.2' # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' @@ -304,7 +304,7 @@ gem 'fast_blank' gem 'gitlab-chronic', '~> 0.10.5' gem 'gitlab_chronic_duration', '~> 0.10.6.2' -gem 'rack-proxy', '~> 0.7.4' +gem 'rack-proxy', '~> 0.7.6' gem 'sassc-rails', '~> 2.1.0' gem 'autoprefixer-rails', '10.2.5.1' @@ -358,12 +358,12 @@ gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.2.6', require: false + gem 'lefthook', '~> 1.2.7', require: false gem 'rubocop' gem 'solargraph', '~> 0.47.2', require: false gem 'letter_opener_web', '~> 2.0.0' - gem 'lookbook', '~> 1.2', '>= 1.2.1' + gem 'lookbook', '~> 1.4', '>= 1.4.5' # Better errors handler gem 'better_errors', '~> 2.9.1' @@ -395,7 +395,7 @@ group :development, :test do gem 'spring', '~> 4.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 9.1.0', require: false + gem 'gitlab-styles', '~> 9.2.0', require: false gem 'haml_lint', '~> 0.40.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -538,7 +538,7 @@ gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: f gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' # File encryption -gem 'lockbox', '~> 0.6.2' +gem 'lockbox', '~> 1.1.1' # Email validation gem 'valid_email', '~> 0.1' @@ -574,6 +574,7 @@ gem 'arr-pm', '~> 0.0.12' # Apple plist parsing gem 'CFPropertyList' +gem 'app_store_connect' # For phone verification gem 'telesignenterprise', '~> 2.2' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 087d4d8aee..ea1771e5af 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -172,6 +172,9 @@ GEM apollo_upload_server (2.1.0) actionpack (>= 4.2) graphql (>= 1.8) + app_store_connect (0.29.0) + activesupport (>= 6.0.0) + jwt (>= 1.4, <= 2.5.0) arr-pm (0.0.12) asana (0.10.13) faraday (~> 1.0) @@ -598,7 +601,7 @@ GEM gitlab-sidekiq-fetcher (0.9.0) json (>= 2.5) sidekiq (~> 6.1) - gitlab-styles (9.1.0) + gitlab-styles (9.2.0) rubocop (~> 1.38.0) rubocop-gitlab-security (~> 0.1.1) rubocop-graphql (~> 0.14) @@ -832,7 +835,7 @@ GEM kramdown (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.2.6) + lefthook (1.2.7) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -861,7 +864,7 @@ GEM ffi-compiler (~> 1.0) rake (~> 13.0) locale (2.1.3) - lockbox (0.6.2) + lockbox (1.1.1) lograge (0.11.2) actionpack (>= 4) activesupport (>= 4) @@ -870,7 +873,7 @@ GEM loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lookbook (1.2.1) + lookbook (1.4.5) actioncable activemodel css_parser @@ -930,7 +933,7 @@ GEM nenv (0.3.0) net-http-persistent (4.0.1) connection_pool (~> 2.2) - net-ldap (0.16.3) + net-ldap (0.17.1) net-ntp (2.1.3) net-scp (3.0.0) net-ssh (>= 2.6.5, < 7.0.0) @@ -1068,7 +1071,7 @@ GEM tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.4.3) + pg (1.4.5) pg_query (2.2.0) google-protobuf (>= 3.19.2) plist (3.6.0) @@ -1108,7 +1111,7 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) racc (1.6.1) - rack (2.2.4) + rack (2.2.6.2) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.6.1) @@ -1123,7 +1126,7 @@ GEM rack (>= 2.1.0) rack-protection (2.2.2) rack - rack-proxy (0.7.4) + rack-proxy (0.7.6) rack rack-test (2.0.2) rack (>= 1.3) @@ -1150,8 +1153,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) rails-i18n (7.0.3) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) @@ -1174,7 +1177,7 @@ GEM rchardet (1.8.0) rdoc (6.3.2) re2 (1.6.0) - recaptcha (4.13.1) + recaptcha (5.12.3) json recursive-open-struct (1.1.3) redcarpet (3.5.1) @@ -1274,14 +1277,14 @@ GEM rubocop (>= 0.51) rubocop-graphql (0.18.0) rubocop (>= 0.87, < 2) - rubocop-performance (1.15.0) + rubocop-performance (1.15.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.17.2) + rubocop-rails (2.17.3) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.15.0) + rubocop-rspec (2.16.0) rubocop (~> 1.33) ruby-fogbugz (0.3.0) crack (~> 0.4) @@ -1581,6 +1584,7 @@ DEPENDENCIES addressable (~> 2.8) akismet (~> 3.0) apollo_upload_server (~> 2.1.0) + app_store_connect arr-pm (~> 0.0.12) asana (~> 0.10.13) asciidoctor (~> 2.0.17) @@ -1672,7 +1676,7 @@ DEPENDENCIES gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.10.0) gitlab-sidekiq-fetcher (= 0.9.0) - gitlab-styles (~> 9.1.0) + gitlab-styles (~> 9.2.0) gitlab_chronic_duration (~> 0.10.6.2) gitlab_omniauth-ldap (~> 2.2.0) gon (~> 6.4.0) @@ -1716,15 +1720,15 @@ DEPENDENCIES knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.9.3)! - lefthook (~> 1.2.6) + lefthook (~> 1.2.7) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) licensee (~> 9.15) listen (~> 3.7) - lockbox (~> 0.6.2) + lockbox (~> 1.1.1) lograge (~> 0.5) loofah (~> 2.19.1) - lookbook (~> 1.2, >= 1.2.1) + lookbook (~> 1.4, >= 1.4.5) lru_redux mail (= 2.7.1) mail-smtp_pool (~> 0.1.0)! @@ -1734,7 +1738,7 @@ DEPENDENCIES mini_magick (~> 4.10.1) minitest (~> 5.11.0) multi_json (~> 1.14.1) - net-ldap (~> 0.16.3) + net-ldap (~> 0.17.1) net-ntp nokogiri (~> 1.13.10) oauth2 (~> 2.0) @@ -1767,7 +1771,7 @@ DEPENDENCIES parallel (~> 1.19) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.4.3) + pg (~> 1.4.5) pg_query (~> 2.2) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) @@ -1777,11 +1781,11 @@ DEPENDENCIES pry-shell (~> 0.5.1) puma (~> 5.6.5) puma_worker_killer (~> 0.3.1) - rack (~> 2.2.4) + rack (~> 2.2.6, >= 2.2.6.2) rack-attack (~> 6.6.1) rack-cors (~> 1.1.1) rack-oauth2 (~> 1.21.3) - rack-proxy (~> 0.7.4) + rack-proxy (~> 0.7.6) rack-timeout (~> 0.6.3) rails (~> 6.1.6.1) rails-controller-testing @@ -1790,7 +1794,7 @@ DEPENDENCIES rbtrace (~> 0.4) rdoc (~> 6.3.2) re2 (~> 1.6.0) - recaptcha (~> 4.11) + recaptcha (~> 5.12) redis (~> 4.8.0) redis-actionpack (~> 5.3.0) redis-namespace (~> 1.9.0) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 968d07704f..269318a096 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -206,6 +206,17 @@ src: }; version = "2.1.0"; }; + app_store_connect = { + dependencies = ["activesupport" "jwt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03s3x8b6ifjrqk9ian59i9yyxxl65ykvbb4r424j2hjsh8iskmq1"; + type = "gem"; + }; + version = "0.29.0"; + }; arr-pm = { groups = ["default"]; platforms = []; @@ -2177,10 +2188,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ch27hxbby16jxvxg1jq3sqdbd3gg7ss4ymxn3yhsjy7gyglxza6"; + sha256 = "196fhlbhhanpbn5iriccp7m04xgkq7swyk07im50q7z05pxyf1ki"; type = "gem"; }; - version = "9.1.0"; + version = "9.2.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -3098,10 +3109,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qyylcc57pcf8mwm9dvlzkfjxcpbypnp4q21ni05s7wxalxb12ld"; + sha256 = "18vcakjkb5fhavq9s6j7zwjc14c652361qws5g1slqb300anfww2"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; letter_opener = { dependencies = ["launchy"]; @@ -3194,10 +3205,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g6w327y8d7dr0d7zw6p7hmlwh0hcvb7pkc7xxyf5mn3fmw6fdh1"; + sha256 = "1h1a3h3rfv3094pn5zn7d3c066dmhx9i380mhqa1qyagqla6pw8a"; type = "gem"; }; - version = "0.6.2"; + version = "1.1.1"; }; lograge = { dependencies = ["actionpack" "activesupport" "railties" "request_store"]; @@ -3227,10 +3238,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mv5q4gpgzklwrgp7s7mhi0gb7x739qhyrni2n96i2vr4nv48a3l"; + sha256 = "1nww5h9frmbjfpfy2nb296vn78xnq1qg0lq3lsn52ky8s8rb65dw"; type = "gem"; }; - version = "1.2.1"; + version = "1.4.5"; }; lru_redux = { groups = ["default"]; @@ -3581,10 +3592,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13lh6qizxi8fza8py73b2dvjp9p010dvbaq7diagir9nh8plsinv"; + sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; type = "gem"; }; - version = "0.16.3"; + version = "0.17.1"; }; net-ntp = { groups = ["default"]; @@ -4153,10 +4164,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb"; + sha256 = "1wd6nl81nbdwck04hccsm7wf23ghpi8yddd9j4rbwyvyj0sbsff1"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.5"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -4358,10 +4369,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; + sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.6.2"; }; rack-accept = { dependencies = ["rack"]; @@ -4424,10 +4435,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m6j2xk3s3ps3r9vqgwq3flyij9jgkyzanmgiifid8yqhcskgfx8"; + sha256 = "1a62439xwn5v6hsl9s11hdk4wj58czhcbg7lminv23mnkc0ca147"; type = "gem"; }; - version = "0.7.4"; + version = "0.7.6"; }; rack-test = { dependencies = ["rack"]; @@ -4489,10 +4500,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf"; + sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9"; type = "gem"; }; - version = "1.4.3"; + version = "1.4.4"; }; rails-i18n = { dependencies = ["i18n" "railties"]; @@ -4614,10 +4625,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121pkq8kwqjh4l751xzx15bjp5vmf5pirfmpb11h71zsiavjqv6w"; + sha256 = "1vmpppgdy64qa16bvkss0xyzmyyzxv5hwzvc1i6saw4yvm58kl9p"; type = "gem"; }; - version = "4.13.1"; + version = "5.12.3"; }; recursive-open-struct = { groups = ["default"]; @@ -5020,10 +5031,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h06a2asg8pjq7l0k885126n60y54rgw0qr957qarpv7qligzn4c"; + sha256 = "00ld0hfm2x5hzms9xhkyjfxs8afsmlg1kf0mklk68cq4wwwihkwd"; type = "gem"; }; - version = "1.15.0"; + version = "1.15.1"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -5031,10 +5042,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "052viwgi7dbbnq0pxihz1k72dwhph8gw4v2zzw057w42l39hhh6i"; + sha256 = "1bv51vwcg5m4v35n7653xclw9vv3ifvgbhvc2l79wz2p76ipm1bx"; type = "gem"; }; - version = "2.17.2"; + version = "2.17.3"; }; rubocop-rspec = { dependencies = ["rubocop"]; @@ -5042,10 +5053,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pj53m5zcrgyhb2zsjxqsav9sm9s8jh0mgk8c1qckaxy3dkwfxm4"; + sha256 = "1rpcww107xq6aj5wkypzjj346jaxhqal33wmhlwb9gc2h425yg5k"; type = "gem"; }; - version = "2.15.0"; + version = "2.16.0"; }; ruby-fogbugz = { dependencies = ["crack" "multipart-post"]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlint/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlint/default.nix index 626739864c..6adb5bdc7a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlint/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { sh ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ gitMinimal pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitprompt-rs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitprompt-rs/default.nix new file mode 100644 index 0000000000..6980c8f225 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitprompt-rs/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, rustPlatform, git }: + +rustPlatform.buildRustPackage rec { + pname = "gitprompt-rs"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "9ary"; + repo = pname; + rev = version; + sha256 = "00xxz7awk01981daabp8m3kwq127y733ynijiwqgs8xvn4nkg8h6"; + }; + + cargoSha256 = "0avs833vb6q1avjbfygm55s83iy942xgqsx6qdzksry44n35s418"; + + postPatch = '' + substituteInPlace src/main.rs \ + --replace 'Command::new("git")' 'Command::new("${git}/bin/git")' + ''; + + meta = with lib; { + description = "Simple Git prompt"; + homepage = "https://github.com/9ary/gitprompt-rs"; + license = with licenses; [ mpl20 ]; + maintainers = with maintainers; [ novenary ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitstats/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitstats/default.nix index d9eaae3ecb..a795f0f6f6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitstats/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitstats/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://gitstats.sourceforge.net/"; + homepage = "https://gitstats.sourceforge.net/"; description = "Git history statistics generator"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitstatus/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitstatus/default.nix index 4b669c2725..21e8bafcd0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitstatus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitstatus/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # that the script was sourced successfully and that the "gitstatus_query" # command ran successfully. This tests the binary itself and the zsh # integration. - installCheckInputs = [ git zsh ]; + nativeInstallCheckInputs = [ git zsh ]; doInstallCheck = true; installCheckPhase = '' TEMP=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/glitter/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/glitter/default.nix index 5f2ac7fea8..5786ebc8a6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/glitter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/glitter/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-GQ7Bns+FPj4jl2dBXnMrmcKIYcZTLZc1WvaHgKGj/gU="; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix index 00b49f2957..e601b1165f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.79"; + version = "0.83"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-eL4cCpBRhO0ctQZGg1n6+H5O6GhRKRsWcEOcRr+z2Hw="; + sha256 = "sha256-kNhU6OR9IUNPL72D90nhq2X5vmVW7YUmpnq/EOUvG/8="; }; nativeBuildInputs = [ pkg-config bison ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gource/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gource/default.nix index 584dd97d3e..d0175251e6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gource/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gource/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gource"; - version = "0.53"; + version = "0.54"; src = fetchurl { url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - hash = "sha256-PV9kwcaBL2RMMgy8mphY35e8YDb8Hl9gPKRrFbjdcjc="; + hash = "sha256-HcvO32XSz01p/gtjPlTCApJsCLgpvK0Lc+r54pzW+uU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/hub/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/hub/default.nix index cb75ec8264..307bf0e6f4 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/hub/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/hub/default.nix @@ -50,7 +50,7 @@ buildGoModule rec { --suffix PATH : ${lib.makeBinPath [ git ]} ''; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix index 754fa778fe..38531775b9 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix @@ -22,14 +22,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' - # make xdg-open overrideable at runtime - wrapProgram $out/bin/lab \ - --prefix PATH ":" "${lib.makeBinPath [ git ]}" \ - --suffix PATH ":" "${lib.makeBinPath [ xdg-utils ]}" + # create shell completions before wrapProgram so that lab detects the right path for itself installShellCompletion --cmd lab \ --bash <($out/bin/lab completion bash) \ --fish <($out/bin/lab completion fish) \ --zsh <($out/bin/lab completion zsh) + # make xdg-open overrideable at runtime + wrapProgram $out/bin/lab \ + --suffix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix index 3e1f002f97..7973b8ff1c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lefthook"; - version = "1.2.7"; + version = "1.2.8"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-bsPTOv1s/kU6UUxmmPpYC5Y9/YeR6LnuL09j1x5e3Es="; + sha256 = "sha256-hW3zKco0c90eIwWefHLABAZGUc2fGHsGnyPaSa/zGuQ="; }; vendorHash = "sha256-Dx9OL1D4VNfVQ0NUJr9aq54PXHecgMMtLg7GMFnQFCI="; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix index a201ce6ddb..e88f21a85c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { nbformat ]; - checkInputs = [ + nativeCheckInputs = [ coreutils git mercurial diff --git a/third_party/nixpkgs/pkgs/applications/version-management/pass-git-helper/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/pass-git-helper/default.nix index 63f7a459a7..7085e0c48f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/pass-git-helper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/pass-git-helper/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ pyxdg ]; - checkInputs = [ pytest pytest-mock ]; + nativeCheckInputs = [ pytest pytest-mock ]; preCheck = '' export HOME=$(mktemp -d) ''; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix index a8df056774..f74ae1cf37 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/radicle-cli/default.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { done ''; - checkInputs = [ openssh ]; + nativeCheckInputs = [ openssh ]; preCheck = '' eval $(ssh-agent) ''; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix index 15d26406bb..a9aabd7a87 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/smartgithg/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "22.1.1"; + version = "22.1.3"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "sha256-twN1Clnj17A2IUOOhvs8hs6PuvC81j9GqF0yKIk3IkQ="; + sha256 = "sha256-TnpjRFInqmlY02fGi7oxoS4P1DzahryFvNLitJ5NjM4="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -87,6 +87,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GUI for Git, Mercurial, Subversion"; homepage = "https://www.syntevo.com/smartgit/"; + changelog = "https://www.syntevo.com/smartgit/changelog.txt"; license = licenses.unfree; platforms = platforms.linux; maintainers = with lib.maintainers; [ jraygauthier ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix index b6e4f8c331..95ef43775e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { ''; # pytest tests fail - checkInputs = [ + nativeCheckInputs = [ pytest factory_boy ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/srvc/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/srvc/default.nix index 2c9fa57f0a..cba7be9531 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/srvc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/srvc/default.nix @@ -1,23 +1,23 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, webfs }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, Security, git }: rustPlatform.buildRustPackage rec { pname = "srvc"; - version = "0.10.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "insilica"; repo = "rs-srvc"; rev = "v${version}"; - sha256 = "sha256-yeyAorVMHFl9wm57gmK6ZAI1w5daN2xl29Gqq0DsTtc="; + sha256 = "sha256-m4mN+vDEKPHRavtI9CbszOOdJcLYa+XqlzEyPvPXE0g="; }; - cargoHash = "sha256-/1TL0lWb4I9h6nGV7exx7U6ACrieN0EULTWg7Weexeg="; + cargoHash = "sha256-USOYXb6/hEE9HVz5YcNZPY5yuvDxbrH4YyZxY7XNAto="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - checkInputs = [ webfs ]; + nativeCheckInputs = [ git ]; # remove timeouts in tests to make them less flaky TEST_SRVC_DISABLE_TIMEOUT = 1; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix index b5bdecd85a..535edeeff1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/stgit/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { format = "other"; - checkInputs = [ git perl ]; + nativeCheckInputs = [ git perl ]; postPatch = '' for f in Documentation/*.xsl; do diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix index 87ad6a2876..62122bc35b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/default.nix @@ -9,8 +9,8 @@ in { } {}; sublime-merge-dev = common { - buildVersion = "2078"; - x64sha256 = "33oJOnsOUr9W+OGMetafaGtXUa+CHxxLjmtDoZliw0k="; + buildVersion = "2082"; + x64sha256 = "Gl1BrLTSDLRTgrYQW/99o0XRjSIxvnNYRIViZEidcsM="; dev = true; } {}; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix index 69a2bce490..613872721d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/subversion/default.nix @@ -101,7 +101,7 @@ let enableParallelBuilding = true; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = false; # fails 10 out of ~2300 tests meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/vcsh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/vcsh/default.nix index 1fa1005918..0625d0a684 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/vcsh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/vcsh/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ git ]; - checkInputs = [] + nativeCheckInputs = [] ++ (with perlPackages; [ perl ShellCommand TestMost ]); outputs = [ "out" "doc" "man" ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/ani-cli/default.nix b/third_party/nixpkgs/pkgs/applications/video/ani-cli/default.nix index 07a0a5803c..03e9996a10 100644 --- a/third_party/nixpkgs/pkgs/applications/video/ani-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/ani-cli/default.nix @@ -4,21 +4,21 @@ , lib , gnugrep , gnused -, curl -, openssl +, wget +, fzf , mpv , aria2 }: stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "3.4"; + version = "4.0"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - sha256 = "sha256-Xb7MNL7YKbvyRR5ZppUfCYeYpjNAiJWNOjIFk5fUvpY="; + hash = "sha256-1yhBlQ/abT+/BKEIskgnAh+cmKCzXuS9hu6apaangVk="; }; nativeBuildInputs = [ makeWrapper ]; @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation rec { install -Dm755 ani-cli $out/bin/ani-cli wrapProgram $out/bin/ani-cli \ - --prefix PATH : ${lib.makeBinPath [ gnugrep gnused curl openssl mpv aria2 ]} + --prefix PATH : ${lib.makeBinPath [ gnugrep gnused wget fzf mpv aria2 ]} runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/video/cinelerra/default.nix b/third_party/nixpkgs/pkgs/applications/video/cinelerra/default.nix index 0ce0623ec9..972a68e04f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/cinelerra/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/cinelerra/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation { pname = "cinelerra-cv"; - version = "unstable-2021-02-14"; + version = "unstable-2023-01-29"; src = fetchFromGitHub { owner = "cinelerra-cv-team"; repo = "cinelerra-cv"; - rev = "7d0e8ede557d0cdf3606e0a8d97166a22f88d89e"; - sha256 = "0n84y2wp47y89drc48cm1609gads5c6saw6c6bqcf5c5wcg1yfbj"; + rev = "bb00ac6b70fcf3cf419348b56f9b264bc01c1a89"; + sha256 = "11965kb3d7xcvlcf8p7jlzk9swk5i78x7wja4s3043wlzmqmwv0q"; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix b/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix index 42c1d40b61..39af3876bf 100644 --- a/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix @@ -165,6 +165,7 @@ buildFHSUserEnv { writeText "davinci-wrapper" '' export QT_XKB_CONFIG_ROOT="${xkeyboard_config}/share/X11/xkb" + export QT_PLUGIN_PATH="${davinci}/libs/plugins:$QT_PLUGIN_PATH" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${davinci}/libs ${davinci}/bin/resolve '' diff --git a/third_party/nixpkgs/pkgs/applications/video/dvd-slideshow/default.nix b/third_party/nixpkgs/pkgs/applications/video/dvd-slideshow/default.nix index 165cb4ab4d..6499b6153c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/dvd-slideshow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/dvd-slideshow/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { meta = { description = "Suite of command line programs that creates a slideshow-style video from groups of pictures"; - homepage = "http://dvd-slideshow.sourceforge.net/wiki/Main_Page"; + homepage = "https://dvd-slideshow.sourceforge.net/wiki/Main_Page"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.robbinch ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/dvdauthor/default.nix b/third_party/nixpkgs/pkgs/applications/video/dvdauthor/default.nix index 941b080888..daf785b713 100644 --- a/third_party/nixpkgs/pkgs/applications/video/dvdauthor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/dvdauthor/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools for generating DVD files to be played on standalone DVD players"; - homepage = "http://dvdauthor.sourceforge.net/"; + homepage = "https://dvdauthor.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/dvdbackup/default.nix b/third_party/nixpkgs/pkgs/applications/video/dvdbackup/default.nix index 89995ab8cb..3e998d0c4a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/dvdbackup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/dvdbackup/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool to rip video DVDs from the command line"; - homepage = "http://dvdbackup.sourceforge.net/"; + homepage = "https://dvdbackup.sourceforge.net/"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.bradediger ]; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix b/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix index 6390558013..afc97cd7e1 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, zlib }: stdenv.mkDerivation rec { - version = "2.0.0"; + version = "2.2.0"; pname = "gpac"; src = fetchFromGitHub { owner = "gpac"; repo = "gpac"; rev = "v${version}"; - sha256 = "sha256-MIX32lSqf/lrz9240h4wMIQp/heUmwvDJz8WN08yf6c="; + sha256 = "sha256-m2qXTXLGgAyU9y6GEk4Hp/7Al57IPRSqImJatIcwswQ="; }; - postPatch = '' - substituteInPlace Makefile --replace 'dh_link' 'ln -s' - ''; + patches = [ + (fetchpatch { + name = "CVE-2023-0358.patch"; + url = "https://github.com/gpac/gpac/commit/9971fb125cf91cefd081a080c417b90bbe4a467b.patch"; + sha256 = "sha256-0PDQXahbJCOo1JJAC0T0N1u2mqmwAkdm87wXMJnBicM="; + }) + ]; # this is the bare minimum configuration, as I'm only interested in MP4Box # For most other functionality, this should probably be extended @@ -41,14 +45,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = with maintainers; [ bluescreen303 mgdelacroix ]; platforms = platforms.linux; - knownVulnerabilities = [ - "CVE-2022-1035" - "CVE-2022-1172" - "CVE-2022-1222" - "CVE-2022-1795" - "CVE-2022-2453" - "CVE-2022-2454" - "CVE-2022-2549" - ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix b/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix index a776fabc9a..3849acda94 100644 --- a/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/haruna/default.nix @@ -26,13 +26,13 @@ mkDerivation rec { pname = "haruna"; - version = "0.10.0"; + version = "0.10.2"; src = fetchFromGitLab { owner = "multimedia"; repo = "haruna"; rev = "v${version}"; - hash = "sha256-UU8tbaZz7udDulh+PHPZDc3rm1MvK4dafPgXL50apMI="; + hash = "sha256-hhHWxmr2EzW9QqfV1bpJCiWOWsmGJmvxvtQcuXlMTc4="; domain = "invent.kde.org"; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/jftui/default.nix b/third_party/nixpkgs/pkgs/applications/video/jftui/default.nix index 78d70d594a..938d231177 100644 --- a/third_party/nixpkgs/pkgs/applications/video/jftui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/jftui/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "jftui"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Aanok"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TkSnNZBnmDSMsxTFQx1OcFDLQBUqxIrFXQeeslXKqA0="; + sha256 = "sha256-4j0ypzszNWjHbb4RkMIoqvgz624zoKCKiIpidQUPIF4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/manim/default.nix b/third_party/nixpkgs/pkgs/applications/video/manim/default.nix index 3f1d5ecb81..bcb6eca163 100644 --- a/third_party/nixpkgs/pkgs/applications/video/manim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/manim/default.nix @@ -107,7 +107,7 @@ in python3.pkgs.buildPythonApplication rec { ]; - checkInputs = [ + nativeCheckInputs = [ python3.pkgs.pytest-xdist python3.pkgs.pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix index 7f6fd0b286..28e0d1d469 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix @@ -80,17 +80,17 @@ let inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; luaEnv = lua.withPackages (ps: with ps; [ luasocket ]); -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (self: { pname = "mpv"; - version = "0.35.0"; + version = "0.35.1"; outputs = [ "out" "dev" "man" ]; src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; - rev = "v${version}"; - sha256 = "sha256-U3NDSxlX4/WkoHFkOvpcwPMwfwTnSpCw0QI5yLMK08o="; + rev = "v${self.version}"; + sha256 = "sha256-CoYTX9hgxLo72YdMoa0sEywg4kybHbFsypHk1rCM6tM="; }; postPatch = '' @@ -216,8 +216,9 @@ in stdenv.mkDerivation rec { mpv is a free and open-source general-purpose video player, based on the MPlayer and mplayer2 projects, with great improvements above both. ''; + changelog = "https://github.com/mpv-player/mpv/releases/tag/v${self.version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix index 4052c968d2..af033781ac 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "mpvacious"; - version = "0.18"; + version = "0.20"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-FiYEpZVaeJQVSXa9obFYSKNVASJolOBm5D3faOlCzNY="; + sha256 = "sha256-9Lf7MVaJ5eC5Gb1PdGBvtENU8AAVq2jsUkY3wJfztt8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix index 0c46b4c2ba..35f5fcb549 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/sponsorblock.nix @@ -3,13 +3,13 @@ # Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }` stdenvNoCC.mkDerivation { pname = "mpv_sponsorblock"; - version = "unstable-2022-09-24"; + version = "unstable-2023-01-30"; src = fetchFromGitHub { owner = "po5"; repo = "mpv_sponsorblock"; - rev = "248d108c1280e05de551c42867aebb72cf0c83b9"; - sha256 = "1aacchyci34xyx7rcyd2r02i4rlqq8q61l6dcci8yd4g4hjiqqld"; + rev = "7785c1477103f2fafabfd65fdcf28ef26e6d7f0d"; + sha256 = "sha256-iUXaTWWFEdxhxClu2NYbQcThlvYty3A2dEYGooeAVAQ="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix new file mode 100644 index 0000000000..811b49e871 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/scripts/webtorrent-mpv-hook.nix @@ -0,0 +1,36 @@ +{ lib , buildNpmPackage , fetchFromGitHub, nodejs }: + +buildNpmPackage rec { + pname = "webtorrent-mpv-hook"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "mrxdst"; + repo = pname; + rev = "v${version}"; + hash = "sha256-AFKX31kriacXygZy0Mw+QwO+SwFEu13687mJ/WeAoKY="; + }; + + postPatch = '' + substituteInPlace src/webtorrent.ts --replace "node_path: 'node'" "node_path: '${nodejs}/bin/node'" + # This executable is just for telling non-Nix users how to install + substituteInPlace package.json --replace '"bin": "build/bin.js",' "" + rm -rf src/bin.ts + ''; + + npmDepsHash = "sha256-GpNUJ5ZCgMjSYLqsIE/RwkTSFT3uAhxrHPe7XvGDRHE="; + makeCacheWritable = true; + + postInstall = '' + mkdir -p $out/share/mpv/scripts/ + ln -s $out/lib/node_modules/webtorrent-mpv-hook/build/webtorrent.js $out/share/mpv/scripts/ + ''; + passthru.scriptName = "webtorrent.js"; + + meta = { + description = "Adds a hook that allows mpv to stream torrents"; + homepage = "https://github.com/mrxdst/webtorrent-mpv-hook"; + maintainers = [ lib.maintainers.chuangzhu ]; + license = lib.licenses.isc; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/mythtv/default.nix b/third_party/nixpkgs/pkgs/applications/video/mythtv/default.nix index 0df8cf6a72..7ea9a532a7 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mythtv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mythtv/default.nix @@ -1,7 +1,8 @@ { lib, mkDerivation, fetchFromGitHub, fetchpatch, which, qtbase, qtwebkit, qtscript , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsa-lib, freetype , perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm -, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders, soundtouch, libzip +, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders +, soundtouch, libzip, libhdhomerun , withWebKit ? false }: @@ -35,6 +36,7 @@ mkDerivation rec { freetype qtbase qtscript lame zlib libGLU libGL perl libsamplerate libbluray lzo alsa-lib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 soundtouch libzip + libhdhomerun ] ++ lib.optional withWebKit qtwebkit; nativeBuildInputs = [ pkg-config which yasm libtool autoconf automake file ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix index 1a7be5aa98..c796b2d84f 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix @@ -16,11 +16,13 @@ obs-hyperion = qt6Packages.callPackage ./obs-hyperion/default.nix { }; + obs-livesplit-one = callPackage ./obs-livesplit-one { }; + obs-move-transition = callPackage ./obs-move-transition.nix { }; obs-multi-rtmp = qt6Packages.callPackage ./obs-multi-rtmp { }; - obs-ndi = qt6Packages.callPackage ./obs-ndi.nix { }; + obs-ndi = qt6Packages.callPackage ./obs-ndi { }; obs-nvfbc = callPackage ./obs-nvfbc.nix { }; @@ -28,6 +30,8 @@ obs-source-record = callPackage ./obs-source-record.nix { }; + obs-vaapi = callPackage ./obs-vaapi { }; + obs-vkcapture = callPackage ./obs-vkcapture.nix { obs-vkcapture32 = pkgsi686Linux.obs-studio-plugins.obs-vkcapture; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index 70b6790a58..e58220bce7 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "obs-gstreamer"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "fzwoch"; - repo = "obs-gstreamer"; + repo = pname; rev = "v${version}"; - hash = "sha256-zP1MMoXLp+gp0fjVbWi/Wse6I8u9/K2IeSew3OjkCkE="; + hash = "sha256-C4yee7hzkSOjIeaacLaTGPzZ1qYdYtHK5a3m9gz2pPI="; }; nativeBuildInputs = [ pkg-config meson ninja ]; @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { # - We need "getLib" instead of default derivation, otherwise it brings gstreamer-bin; # - without gst-plugins-base it won't even show proper errors in logs; # - Without gst-plugins-bad it won't find element "h264parse"; - # - gst-vaapi adds "VA-API" to "Encoder type"; # - gst-plugins-ugly adds "x264" to "Encoder type"; # Tip: "could not link appsrc to videoconvert1" can mean a lot of things, enable GST_DEBUG=2 for help. passthru.obsWrapperArguments = @@ -36,11 +35,15 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-bad - gst-plugins-ugly - gst-vaapi ]; + # Fix output directory + postInstall = '' + mkdir $out/lib/obs-plugins + mv $out/lib/obs-gstreamer.so $out/lib/obs-plugins/ + ''; + meta = with lib; { description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio"; homepage = "https://github.com/fzwoch/obs-gstreamer"; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix new file mode 100644 index 0000000000..1f4665bf9e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, cmake +, fontconfig +, obs-studio +, pkg-config +}: + +rustPlatform.buildRustPackage rec { + pname = "obs-livesplit-one"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "CryZe"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-C1u4z7iQUETM84kf6S6obw+C0ox8J9gMJoVP3/3ZoYw="; + }; + + cargoHash = "sha256-mQ0TR4DL4bA5u4IL3RY9aLxU5G6qQ5W5xuNadiXGeB0="; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ fontconfig obs-studio ]; + + postInstall = '' + mkdir $out/lib/obs-plugins/ + mv $out/lib/libobs_livesplit_one.so $out/lib/obs-plugins/obs-livesplit-one.so + ''; + + meta = with lib; { + description = "OBS Studio plugin for adding LiveSplit One as a source"; + homepage = "https://github.com/CryZe/obs-livesplit-one"; + license = with licenses; [ asl20 mit ]; + maintainers = [ maintainers.Bauke ]; + platforms = obs-studio.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index 7af053e5c1..0f8eddaebd 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-zWHQ01iNTlqSAKcmsDCUZPXmmBIpqY/ZDftD5J6kp80="; + sha256 = "sha256-v4mAv4dqurM2S4/vM1APge0xoMLnOaigGU15vjNxxSo="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi.nix rename to third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch similarity index 100% rename from third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/hardcode-ndi-path.patch rename to third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-ndi/hardcode-ndi-path.patch diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix new file mode 100644 index 0000000000..7a8e193250 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, gst_all_1 +, pciutils +, pkg-config +, meson +, ninja +, obs-studio +}: + +stdenv.mkDerivation rec { + pname = "obs-vaapi"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "fzwoch"; + repo = pname; + rev = version; + hash = "sha256-qA4xVVShkp40QHp2HmmRzVxQaBwskRpUNEULKetVMu8="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = with gst_all_1; [ gstreamer gst-plugins-base obs-studio pciutils ]; + + # - We need "getLib" instead of default derivation, otherwise it brings gstreamer-bin; + # - without gst-plugins-base it won't even show proper errors in logs; + # - Without gst-plugins-bad it won't find element "vapostproc"; + # - gst-vaapi adds "VA-API" to "Encoder type"; + # Tip: "could not link appsrc to videoconvert1" can mean a lot of things, enable GST_DEBUG=2 for help. + passthru.obsWrapperArguments = + let + gstreamerHook = package: "--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : ${lib.getLib package}/lib/gstreamer-1.0"; + in + with gst_all_1; builtins.map gstreamerHook [ + gstreamer + gst-plugins-base + gst-plugins-bad + gst-vaapi + ]; + + meta = with lib; { + description = "OBS Studio VAAPI support via GStreamer"; + homepage = "https://github.com/fzwoch/obs-vaapi"; + maintainers = with maintainers; [ ahuzik pedrohlc ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index 3b97644bf2..ba0e8a8182 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "obs-vkcapture"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "nowrep"; repo = pname; rev = "v${version}"; - hash = "sha256-Ya4p0eXOTID1qmxokgSXdmBOd3nqzcOHM+pLqJi8LGg="; + hash = "sha256-xtIcIT9lWw73Et9WgyEUznwy1X947Rv5nTiM+t0qYaM="; }; cmakeFlags = lib.optionals stdenv.isi686 [ diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/wrapper.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/wrapper.nix index 5303991f1f..62bc80d26d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/wrapper.nix @@ -24,7 +24,7 @@ symlinkJoin { "$out/bin/obs" ''--set OBS_PLUGINS_PATH "${pluginsJoined}/lib/obs-plugins"'' ''--set OBS_PLUGINS_DATA_PATH "${pluginsJoined}/share/obs/obs-plugins"'' - ] ++ pluginArguments; + ] ++ lists.unique pluginArguments; in '' ${concatStringsSep " " wrapCommandLine} diff --git a/third_party/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix index 620cedb6c1..18e38122f2 100644 --- a/third_party/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix @@ -62,7 +62,7 @@ buildPerlModule rec { substituteInPlace Build.PL --replace 'my $gtk ' 'my $gtk = 1;#' ''; - checkInputs = [ + nativeCheckInputs = [ TestPod ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix b/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix index 60e5924b5f..30c364578e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, opencv, pcl, libusb1, eigen , wrapQtAppsHook, qtbase, g2o, ceres-solver, libpointmatcher, octomap, freenect -, libdc1394, librealsense, libGL, libGLU, vtkWithQt5, wrapGAppsHook, liblapack +, libdc1394, librealsense, libGL, libGLU, vtk_8_withQt5, wrapGAppsHook, liblapack , xorg }: stdenv.mkDerivation rec { @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { qtbase libGL libGLU - vtkWithQt5 + vtk_8_withQt5 ]; # Disable warnings that are irrelevant to us as packagers diff --git a/third_party/nixpkgs/pkgs/applications/video/showmethekey/default.nix b/third_party/nixpkgs/pkgs/applications/video/showmethekey/default.nix index d50b7ababf..b02d6e6e31 100644 --- a/third_party/nixpkgs/pkgs/applications/video/showmethekey/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/showmethekey/default.nix @@ -1,56 +1,40 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch -, glib , meson , ninja , libevdev , json-glib -, cairo -, pango , libinput , gtk4 , wrapGAppsHook4 , libxkbcommon , pkg-config }: - stdenv.mkDerivation rec { pname = "showmethekey"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "AlynxZhou"; - repo = "showmethekey"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-hq4X4dG25YauMjsNXC6Flco9pEpVj3EM2JiFWbRrPaA="; + hash = "sha256-iWZjOhugGD7GikcIKaJimfLrTDaGQeYgmp17N03Meb8="; }; - patches = [ - (fetchpatch { - name = "use-gtk4-update-icon-cache.patch"; - url = "https://github.com/alynxzhou/showmethekey/commit/c73102dc2825d00cbaf323fcfc96736381dc67ae.patch"; - sha256 = "sha256-6QDY5eQ9A8q3LZeD7v6WI/4vYXc/XXVY/WENA1nvIKo="; - }) - ]; - nativeBuildInputs = [ - glib meson ninja - cairo - pango json-glib pkg-config - libevdev - libinput - libxkbcommon wrapGAppsHook4 ]; buildInputs = [ gtk4 + libevdev + libinput + libxkbcommon ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/video/srtrelay/default.nix b/third_party/nixpkgs/pkgs/applications/video/srtrelay/default.nix index 898f728d3e..b0dc49d761 100644 --- a/third_party/nixpkgs/pkgs/applications/video/srtrelay/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/srtrelay/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorSha256 = "sha256-xTYlfdijSo99ei+ZMX6N9gl+yw0DrPQ2wOhn6SS9S/E="; buildInputs = [ srt ]; - checkInputs = [ ffmpeg ]; + nativeCheckInputs = [ ffmpeg ]; meta = with lib; { description = "Streaming-Relay for the SRT-protocol"; diff --git a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix b/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix index 6aeab3e6e4..d10fd2e21a 100644 --- a/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/streamlink/default.nix @@ -6,15 +6,15 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "5.1.2"; + version = "5.2.1"; format = "pyproject"; src = python3Packages.fetchPypi { inherit pname version; - hash = "sha256-UB9gTT2/rQXV1Q7UQywEHlGBCJDMDmXupD8nYII4dno="; + hash = "sha256-/YcFH5t9x9EsmK7oPvSECmhL2ypHYgPvsMdL1IupEfw="; }; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook mock requests-mock @@ -35,6 +35,7 @@ python3Packages.buildPythonApplication rec { requests websocket-client urllib3 + certifi ]) ++ [ ffmpeg ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix b/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix index e6cf8fef4d..859cd8e8cc 100644 --- a/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/tartube/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.4.093"; + version = "2.4.221"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "refs/tags/v${version}"; - sha256 = "sha256-l8jB+3vY9jOlCaLDHAvDm1Ko7viHbnRBIMEXLb/k2z0="; + sha256 = "sha256-A5p4olnXak22410DOKIPpZ6MQGR5aS2ARWO+083bSuQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix b/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix index 023f37de28..70e335192d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ustreamer"; - version = "5.20"; + version = "5.36"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - sha256 = "sha256-ZJebLsmoaIxfM8Eenv/r351Kr8XM+wyZUc2TI+oGDxU="; + sha256 = "sha256-VnqCiEPaBzGN2TL7oXO4T7dcNdGneac/5nFPwRPiJ9c="; }; buildInputs = [ libbsd libevent libjpeg ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/w_scan2/default.nix b/third_party/nixpkgs/pkgs/applications/video/w_scan2/default.nix new file mode 100644 index 0000000000..56000407fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/w_scan2/default.nix @@ -0,0 +1,25 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "w_scan2"; + version = "1.0.14"; + + src = fetchFromGitHub { + owner = "stefantalpalaru"; + repo = "w_scan2"; + rev = version; + sha256 = "sha256-fDFAJ4EMwu4X1Go3jkRjwA66xDY4tJ5wCKlEdZUT4qQ="; + }; + + meta = { + description = "A small channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T/T2 channels.conf files"; + homepage = "https://github.com/stefantalpalaru/w_scan2"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ _0x4A6F ] ; + license = lib.licenses.gpl2Only; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/xine-ui/default.nix b/third_party/nixpkgs/pkgs/applications/video/xine-ui/default.nix index 7fd00ec66d..8becf629d1 100644 --- a/third_party/nixpkgs/pkgs/applications/video/xine-ui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/xine-ui/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://xine.sourceforge.net/"; + homepage = "https://xine.sourceforge.net/"; description = "Xlib-based frontend for Xine video player"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/conmon-rs/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/conmon-rs/default.nix index 59a2de96e9..ef25427c4a 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/conmon-rs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/conmon-rs/default.nix @@ -7,19 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "conmon-rs"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VwVJWf9tKZ5rVF8tXDf35zsS2PipqC8FPbXUpOzsw/Y="; + sha256 = "sha256-mngs5ivRyMJ927VV00mFNIG+nD9EuE3qLyN+OHMMkHQ="; }; nativeBuildInputs = [ capnproto protobuf ]; doCheck = false; - cargoSha256 = "sha256-zY9fsZK1C3HnCxeNA5dCbQQHYx3IVDMHCHYwFh5ev2k="; + cargoSha256 = "sha256-ruChRz2rnPalBiXcpco/WS/eDgg52ckPBLBuoQa9us4="; meta = with lib; { description = "An OCI container runtime monitor written in Rust"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 40a1e671cc..d95b37ef1d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.15"; + version = "1.6.16"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-Vlftq//mLYZPoT2R/lHJA6wLnqiuC+Cpy4lGQC8jCPA="; + hash = "sha256-p2I188MGoxnd7dBAMQ0bM5+GT8z3y9S4cZW2Q99DyzY="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ go-md2man installShellFiles util-linux ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index 60d05f6f23..b37937e746 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.7.2"; + version = "1.8"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-SNNy/oI3ZcMeRLEMS2nSCS/rRaen5WsDfhdlHQCdtP4="; + hash = "sha256-8R9cja8Blk+7Sp25bJ9t9e0TvazD41livK+KKAwRpLg="; fetchSubmodules = true; }; @@ -74,9 +74,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A fast and lightweight fully featured OCI runtime and C library for running containers"; + homepage = "https://github.com/containers/crun"; license = licenses.gpl2Plus; platforms = platforms.linux; - inherit (src.meta) homepage; maintainers = with maintainers; [ ] ++ teams.podman.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix index aca97a811f..fda676ca00 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "distrobox"; - version = "1.4.1"; + version = "1.4.2.1"; src = fetchFromGitHub { owner = "89luca89"; repo = pname; rev = version; - sha256 = "sha256-WIpl3eSdResAmWFc8OG8Jm0uLTGaovkItGAZTOEzhuE="; + sha256 = "sha256-s3lq1Xr2y29cmyT1nY5/amiDA9dNfyGaMtjTvUINSD8="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix index c116a58110..bbefed66fa 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix @@ -1,21 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, makeBinaryWrapper }: buildGoModule rec { pname = "docker-slim"; - version = "1.39.0"; + version = "1.40.0"; src = fetchFromGitHub { - owner = "docker-slim"; - repo = "docker-slim"; + owner = "slimtoolkit"; + repo = "slim"; rev = version; - sha256 = "sha256-CN3mvXjI6c10yvXM2owWASngsU2PjgLhd1N55vxubw0="; + sha256 = "sha256-KbwkZIGkAdzPPo5CrWKnKzFsD8OUONk6JWo1wzwti3s="; }; vendorSha256 = null; - subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; + subPackages = [ "cmd/slim" "cmd/slim-sensor" ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeBinaryWrapper ]; ldflags = [ "-s" @@ -27,13 +27,13 @@ buildGoModule rec { # docker-slim tries to create its state dir next to the binary (inside the nix # store), so we set it to use the working directory at the time of invocation postInstall = '' - wrapProgram "$out/bin/docker-slim" --add-flags '--state-path "$(pwd)"' + wrapProgram "$out/bin/slim" --add-flags '--state-path "$(pwd)"' ''; meta = with lib; { description = "Minify and secure Docker containers"; - homepage = "https://dockersl.im/"; - changelog = "https://github.com/docker-slim/docker-slim/raw/${version}/CHANGELOG.md"; + homepage = "https://slimtoolkit.org/"; + changelog = "https://github.com/slimtoolkit/slim/raw/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ Br1ght0ne marsam mbrgm ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose_1.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose_1.nix index 425363e2b7..4e692eb51b 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose_1.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose_1.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { # lots of networking and other fails doCheck = false; nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ mock pytest nose ]; + nativeCheckInputs = [ mock pytest nose ]; propagatedBuildInputs = [ pyyaml colorama dockerpty docker jsonschema requests six texttable websocket-client diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix index fff9200285..1aa5071938 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -2,11 +2,12 @@ rec { dockerGen = { - version, rev, sha256 - , moby-src - , runcRev, runcSha256 - , containerdRev, containerdSha256 - , tiniRev, tiniSha256, buildxSupport ? true, composeSupport ? true + version + , cliRev, cliHash + , mobyRev, mobyHash + , runcRev, runcHash + , containerdRev, containerdHash + , tiniRev, tiniHash, buildxSupport ? true, composeSupport ? true # package dependencies , stdenv, fetchFromGitHub, fetchpatch, buildGoPackage , makeWrapper, installShellFiles, pkg-config, glibc @@ -15,7 +16,7 @@ rec { , iptables, e2fsprogs, xz, util-linux, xfsprogs, git , procps, rootlesskit, slirp4netns, fuse-overlayfs, nixosTests , clientOnly ? !stdenv.isLinux, symlinkJoin - , withSystemd ? stdenv.isLinux, systemd + , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , withBtrfs ? stdenv.isLinux, btrfs-progs , withLvm ? stdenv.isLinux, lvm2 , withSeccomp ? stdenv.isLinux, libseccomp @@ -29,7 +30,7 @@ rec { owner = "opencontainers"; repo = "runc"; rev = runcRev; - sha256 = runcSha256; + hash = runcHash; }; # docker/runc already include these patches / are not applicable @@ -44,7 +45,7 @@ rec { owner = "containerd"; repo = "containerd"; rev = containerdRev; - sha256 = containerdSha256; + hash = containerdHash; }; buildInputs = oldAttrs.buildInputs @@ -59,7 +60,7 @@ rec { owner = "krallin"; repo = "tini"; rev = tiniRev; - sha256 = tiniSha256; + hash = tiniHash; }; # Do not remove static from make files as we want a static binary @@ -70,6 +71,13 @@ rec { NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); + moby-src = fetchFromGitHub { + owner = "moby"; + repo = "moby"; + rev = mobyRev; + hash = mobyHash; + }; + moby = buildGoPackage (lib.optionalAttrs stdenv.isLinux rec { pname = "moby"; inherit version; @@ -95,7 +103,7 @@ rec { (fetchpatch { name = "buildkit-zfs.patch"; url = "https://github.com/moby/moby/pull/43136.patch"; - sha256 = "1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; + hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; }) ]; @@ -108,7 +116,7 @@ rec { # build engine cd ./go/src/${goPackagePath} export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="${rev}" + export DOCKER_GITCOMMIT="${cliRev}" export VERSION="${version}" ./hack/make.sh dynbinary cd - @@ -159,8 +167,8 @@ rec { src = fetchFromGitHub { owner = "docker"; repo = "cli"; - rev = "v${version}"; - sha256 = sha256; + rev = cliRev; + hash = cliHash; }; goPackagePath = "github.com/docker/cli"; @@ -192,7 +200,7 @@ rec { mkdir -p .gopath/src/github.com/docker/ ln -sf $PWD .gopath/src/github.com/docker/cli export GOPATH="$PWD/.gopath:$GOPATH" - export GITCOMMIT="${rev}" + export GITCOMMIT="${cliRev}" export VERSION="${version}" export BUILDTIME="1970-01-01T00:00:00Z" source ./scripts/build/.variables @@ -254,20 +262,16 @@ rec { # Get revisions from # https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/* docker_20_10 = callPackage dockerGen rec { - version = "20.10.21"; - rev = "v${version}"; - sha256 = "sha256-hPQ1t7L2fqoFWoinqIrDwFQ1bo9TzMb4l3HmAotIUS8="; - moby-src = fetchFromGitHub { - owner = "moby"; - repo = "moby"; - rev = "v${version}"; - sha256 = "sha256-BcYDh/UEmmURt7hWLWdPTKVu/Nzoeq/shE+HnUoh8b4="; - }; + version = "20.10.23"; + cliRev = "v${version}"; + cliHash = "sha256-fNaRpstyG90Jzq3+U2A42Jj+ixb+m7tXLioIcsegPbQ="; + mobyRev = "v${version}"; + mobyHash = "sha256-nBPw/M4VC9XeZ9S33HWdWSjY2J2mYpI/TPOzvLjSmJM="; runcRev = "v1.1.4"; - runcSha256 = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA="; - containerdRev = "v1.6.9"; - containerdSha256 = "sha256-KvQdYQLzgt/MKPsA/mO5un6nE3/xcvVYwIveNn/uDnU="; + runcHash = "sha256-ougJHW1Z+qZ324P8WpZqawY1QofKnn8WezP7orzRTdA="; + containerdRev = "v1.6.15"; + containerdHash = "sha256-Vlftq//mLYZPoT2R/lHJA6wLnqiuC+Cpy4lGQC8jCPA="; tiniRev = "v0.19.0"; - tiniSha256 = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix index 88c5f3779d..58c303a46c 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.66.2"; + version = "1.67.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-mZzDvD+40YiC8cBpLlYd7K1p5UBYpso9OMCDijopuik="; + hash = "sha256-iSL5ogS8BLcxge3eo+kCqtsGmj7P1wbi+/84nA9fO2Q="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/krunvm/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/krunvm/default.nix index d96277604b..bbf20c6039 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/krunvm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/krunvm/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/krunvm"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; + platforms = libkrun.meta.platforms; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/lima/bin.nix b/third_party/nixpkgs/pkgs/applications/virtualization/lima/bin.nix new file mode 100644 index 0000000000..86b49c5a1e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/lima/bin.nix @@ -0,0 +1,112 @@ +{ stdenvNoCC +, lib +, fetchurl +, writeScript +, installShellFiles +, qemu +, makeBinaryWrapper +, autoPatchelfHook +}: + +let + version = "0.14.2"; + + dist = { + aarch64-darwin = rec { + archSuffix = "Darwin-arm64"; + url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; + sha256 = "8334d83ca9555271b9843040066057dd8462a774f60dfaedbe97fae3834c3894"; + }; + + x86_64-darwin = rec { + archSuffix = "Darwin-x86_64"; + url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; + sha256 = "3866113c92619f0041ff6fc68fef2bf16e751058b9237289b2bea8fb960bdab0"; + }; + + aarch64-linux = rec { + archSuffix = "Linux-aarch64"; + url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; + sha256 = "373be7ebcf5932570c384c6bfb159cd418011b98a18c26ba0467827dad302230"; + }; + + x86_64-linux = rec { + archSuffix = "Linux-x86_64"; + url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; + sha256 = "44cae71eae65673afcc22c557f6385aa98792aecbb43195de48217581ae39143"; + }; + }; +in +stdenvNoCC.mkDerivation { + inherit version; + pname = "lima"; + src = fetchurl { + inherit (dist.${stdenvNoCC.hostPlatform.system} or + (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}")) url sha256; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ makeBinaryWrapper installShellFiles ] + ++ lib.optionals stdenvNoCC.isLinux [ autoPatchelfHook ]; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r bin share $out + chmod +x $out/bin/limactl + wrapProgram $out/bin/limactl \ + --prefix PATH : ${lib.makeBinPath [ qemu ]} + installShellCompletion --cmd limactl \ + --bash <($out/bin/limactl completion bash) \ + --fish <($out/bin/limactl completion fish) \ + --zsh <($out/bin/limactl completion zsh) + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + USER=nix $out/bin/limactl validate $out/share/lima/examples/default.yaml + USER=nix $out/bin/limactl validate $out/share/lima/examples/experimental/vz.yaml + ''; + + # Stripping removes entitlements of the binary on Darwin making it non-operational. + # Therefore, disable stripping on Darwin. + dontStrip = stdenvNoCC.isDarwin; + + passthru.updateScript = + let + lima-bin = builtins.toString ./bin.nix; + in + writeScript "update-lima-bin.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts curl jq gawk + + set -eou pipefail + + LATEST_VERSION=$(curl -H "Accept: application/vnd.github+json" -Ls https://api.github.com/repos/lima-vm/lima/releases/latest | jq -r .tag_name | cut -c 2-) + curl -Ls -o SHA256SUMS https://github.com/lima-vm/lima/releases/download/v$LATEST_VERSION/SHA256SUMS + AARCH64_DARWIN_SHA256=$(cat SHA256SUMS | awk '/Darwin-arm64/{print $1}') + X86_64_DARWIN_SHA256=$(cat SHA256SUMS | awk '/Darwin-x86_64/{print $1}') + AARCH64_LINUX_SHA256=$(cat SHA256SUMS | awk '/Linux-aarch64/{print $1}') + X86_64_LINUX_SHA256=$(cat SHA256SUMS | awk '/Linux-x86_64/{print $1}') + + # reset version first so that all platforms are always updated and in sync + update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=aarch64-darwin + update-source-version lima-bin $LATEST_VERSION $AARCH64_DARWIN_SHA256 --file=${lima-bin} --system=aarch64-darwin + update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=x86_64-darwin + update-source-version lima-bin $LATEST_VERSION $X86_64_DARWIN_SHA256 --file=${lima-bin} --system=x86_64-darwin + update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=aarch64-linux + update-source-version lima-bin $LATEST_VERSION $AARCH64_LINUX_SHA256 --file=${lima-bin} --system=aarch64-linux + update-source-version lima-bin 0 ${lib.fakeSha256} --file=${lima-bin} --system=x86_64-linux + update-source-version lima-bin $LATEST_VERSION $X86_64_LINUX_SHA256 --file=${lima-bin} --system=x86_64-linux + rm SHA256SUMS + ''; + + meta = with lib; { + homepage = "https://github.com/lima-vm/lima"; + description = "Linux virtual machines (on macOS, in most cases)"; + license = licenses.asl20; + maintainers = with maintainers; [ tricktron ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix index 03d049477b..29dd9b2723 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix @@ -1,31 +1,41 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , installShellFiles , qemu +, xcbuild +, sigtool , makeWrapper }: buildGoModule rec { pname = "lima"; - version = "0.13.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-alE7fUVxJRkLMtdia5ruHxh9nlWIubM0J6iIrmpreRM="; + sha256 = "sha256-g4FvkjBviI1m8zlc+GK/09dIqVkTQ2MqqK1Wkyu4qBc="; }; - vendorSha256 = "sha256-Kb2R8USWOWRFMjQO3tjdl5UHOzzb2B3ld+5vO2gF3KY="; + vendorSha256 = "sha256-l53MTxLY/uid+0U/eY96l0aBWKImST1gN2BARilh2K0="; - nativeBuildInputs = [ makeWrapper installShellFiles ]; + nativeBuildInputs = [ makeWrapper installShellFiles ] + ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; # clean fails with read only vendor dir postPatch = '' - substituteInPlace Makefile --replace 'binaries: clean' 'binaries:' + substituteInPlace Makefile \ + --replace 'binaries: clean' 'binaries:' \ + --replace 'codesign --entitlements vz.entitlements -s -' 'codesign --force --entitlements vz.entitlements -s -' ''; + # It attaches entitlements with codesign and strip removes those, + # voiding the entitlements and making it non-operational. + dontStrip = stdenv.isDarwin; + buildPhase = '' runHook preBuild make "VERSION=v${version}" binaries diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix index 2328e19a9e..c417794594 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rbpHi00LQiXQDzjRTSYnVG12ezJxi5ypZFXNIXipyqk="; + sha256 = "sha256-SrNYvkJy97GwneA7UClNLaO0fd+ZiMSxCCSgqwESw5Y="; }; - cargoHash = "sha256-gMxj1UtGcHmI9s/RPWKC0rlewaBtUan0nPHwZbgqWFM="; + cargoHash = "sha256-S/V2PVkL9T/USXAzorDpo0nhRm9DOkNtfw5CADg4oKM="; # skip test due FHS dependency doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/pods/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/pods/default.nix index 18472f03d8..604000434b 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/pods/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/pods/default.nix @@ -17,19 +17,19 @@ stdenv.mkDerivation rec { pname = "pods"; - version = "1.0.2"; + version = "1.0.4"; src = fetchFromGitHub { owner = "marhkb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kjonyd0xL0QLjPS+U3xDC6AhOOxQmVAZ3STLXaa8eXc="; + sha256 = "sha256-bBFy8yyEbMlVyJYOlWdffIlnZyVdRLPGebTN6bZmnBI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-K5oOpo3xJiNg7F549JLGs83658MYcoGfuIcNoF88Njc="; + sha256 = "sha256-DV/XJgWRPK+7q7EVltiNRcRGjS9fvHrDKw+w3wNYitQ="; }; nativeBuildInputs = [ @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A podman desktop application"; homepage = "https://github.com/marhkb/pods"; + changelog = "https://github.com/marhkb/pods/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ figsoda ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index e0c29518a7..e68cf7048b 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -192,7 +192,7 @@ stdenv.mkDerivation rec { # tests can still timeout on slower systems inherit doCheck; - checkInputs = [ socat ]; + nativeCheckInputs = [ socat ]; preCheck = '' # time limits are a little meagre for a build machine that's # potentially under load. diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix new file mode 100644 index 0000000000..54f3cf7700 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, SDL_compat }: + +stdenv.mkDerivation rec { + pname = "rvvm"; + version = "unstable-2023-01-25"; + + src = fetchFromGitHub { + owner = "LekKit"; + repo = "RVVM"; + rev = "4de27d7083db34bd074b4f056d6eb3871ccf5c10"; + sha256 = "sha256-FjEcXfweL6FzA6iLxl9XnKaD4Fh/wZuRTJzZzHkc/B4="; + }; + + buildInputs = [ SDL_compat ]; + + makeFlags = + [ "BUILDDIR=out" "BINARY=rvvm" "USE_SDL=1" "GIT_COMMIT=${src.rev}" "all" "lib" ] + # work around https://github.com/NixOS/nixpkgs/issues/19098 + ++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "CFLAGS=-fno-lto"; + + installPhase = '' + runHook preInstall + + install -d $out/{bin,lib,include/devices} + install -m755 out/rvvm -t $out/bin + install -m755 out/librvvm.{a,so} -t $out/lib + install -m644 src/rvvmlib.h -t $out/include + install -m644 src/devices/*.h -t $out/include/devices + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/LekKit/RVVM"; + description = "The RISC-V Virtual Machine"; + license = with licenses; [ gpl3 /* or */ mpl20 ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ nebulka ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index 03aba1c412..e5d5a1fbfe 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { --replace "'--owner=root:root'" "'--owner=0:0'" ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook cpio cdrtools diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix index 7837bd3751..f6612f3d9a 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "7.4.2"; + version = "7.6.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "sha256-oyxD6VCut7OfFYozdP0D2+ocOvidTrtaYrh0oCfZzBY="; + sha256 = "sha256-DehAWrEvoE/zWbfjQmF5Z7HTaQL5WMA/279Ee1Xm47g="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix index 95170b7932..251092049c 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix @@ -1,36 +1,42 @@ { lib , stdenv , fetchFromGitHub +, installShellFiles +, libX11 , libinput , libxcb , libxkbcommon , pixman , pkg-config +, substituteAll , wayland , wayland-protocols -, wlroots +, wlroots_0_16 , writeText -, enable-xwayland ? true, xwayland, libX11 +, xcbutilwm +, xwayland +, enableXWayland ? true , conf ? null -, patches ? [ ] }: let - totalPatches = patches ++ [ ]; + wlroots = wlroots_0_16; in - -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "dwl"; - version = "0.3.1"; + version = "0.4"; src = fetchFromGitHub { owner = "djpohly"; - repo = pname; - rev = "v${version}"; - hash = "sha256-VHxBjjnzJNmtJxrm3ywJzvt2bNHGk/Cx8TICw6SaoiQ="; + repo = "dwl"; + rev = "v${self.version}"; + hash = "sha256-OW7K7yMYSzqZWpQ9Vmpy8EgdWvyv3q1uh8A40f6AQF4="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + installShellFiles + pkg-config + ]; buildInputs = [ libinput @@ -40,18 +46,13 @@ stdenv.mkDerivation rec { wayland wayland-protocols wlroots - ] ++ lib.optionals enable-xwayland [ + ] ++ lib.optionals enableXWayland [ libX11 + xcbutilwm xwayland ]; - # Allow users to set their own list of patches - patches = totalPatches; - - # Last line of config.mk enables XWayland - prePatch = lib.optionalString enable-xwayland '' - sed -i -e '$ s|^#||' config.mk - ''; + outputs = [ "out" "man" ]; # Allow users to set an alternative config.def.h postPatch = let @@ -60,21 +61,19 @@ stdenv.mkDerivation rec { else writeText "config.def.h" conf; in lib.optionalString (conf != null) "cp ${configFile} config.def.h"; - NIX_CFLAGS_COMPILE = [ - # https://github.com/djpohly/dwl/issues/186 - "-Wno-error=unused-result" - ]; - - dontConfigure = true; - - installPhase = '' - runHook preInstall - install -d $out/bin - install -m755 dwl $out/bin - runHook postInstall + preBuild = '' + makeFlagsArray+=( + XWAYLAND=${if enableXWayland then "-DXWAYLAND" else ""} + XLIBS=${if enableXWayland then "xcb\\ xcb-icccm" else ""} + ) ''; - meta = with lib; { + installFlags = [ + "PREFIX=$(out)" + "MANDIR=$(man)/share/man/man1" + ]; + + meta = { homepage = "https://github.com/djpohly/dwl/"; description = "Dynamic window manager for Wayland"; longDescription = '' @@ -88,9 +87,10 @@ stdenv.mkDerivation rec { - Limited to 2000 SLOC to promote hackability - Tied to as few external dependencies as possible ''; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; + changelog = "https://github.com/djpohly/dwl/releases/tag/v${self.version}"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.AndersonTorres ]; inherit (wayland.meta) platforms; }; -} +}) # TODO: custom patches from upstream website diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/3.nix b/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/3.nix index 2e458c84f5..a0cddeff23 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/3.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/3.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fvwm3"; - version = "1.0.5"; + version = "1.0.6a"; src = fetchFromGitHub { owner = "fvwmorg"; repo = "fvwm3"; rev = finalAttrs.version; - hash = "sha256-/2Ssl/sgKCXbUCtKj2WIcvEC3B16h5/1Jp87AggKxJo="; + hash = "sha256-uYkIuMzhaWeCZm5aJF4oBYD72OLgwCBuUhDqpg6HQUM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hackedbox/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hackedbox/default.nix index 0f608b83a7..f38d0d6beb 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/hackedbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hackedbox/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A bastard hacked offspring of Blackbox"; - homepage = "http://github.com/museoa/hackedbox/"; + homepage = "https://github.com/museoa/hackedbox/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; inherit (libX11.meta) platforms; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix index 4918dad35f..f1d7c585c4 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ (python3.withPackages (ps: with ps; [ ewmh pytest xlib ])) xdotool xorgserver @@ -77,10 +77,9 @@ stdenv.mkDerivation rec { pytestFlagsArray = [ "../tests" ]; disabledTests = [ - "test_title_different_letters_are_drawn" # font problems - "test_completable_commands" # font problems "test_autostart" # $PATH problems "test_wmexec_to_other" # timeouts in sandbox + "test_rules" # timeouts ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix index ec2e03de0f..1c06fc2ae2 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/wmfocus.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "wmfocus"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HrS+C/6KDG2Rn/3u/mMmp4vzQ5YAHUFL4HFecteuzsc="; + sha256 = "sha256-zXqPZORwi7X1wBTecPg9nOCvRHWNTtloCpgbPwtFhzo="; }; - cargoSha256 = "sha256-EzgYnfUgwK2ldzrlqe9N9jeGgK+RzQPjbOjJCGEkcwE="; + cargoHash = "sha256-4eoV/viI7Q7I7mIqcHVAyPf/y2RWaWX0B+mLZWMEbcI="; nativeBuildInputs = [ python3 pkg-config ]; buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix index ad2ed5bf34..52a213cda8 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-Zl7ob0JcFN8sl8Zuf2aB7l7q3W8GmvVBoI1W3aLLXfU="; + hash = "sha256-2gEZRkym21X4rvj6kzZh9WChZUkfqgS1wiWh7LBioZM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix index 8bd0691450..adf3facb99 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix @@ -23,15 +23,15 @@ let wlroots = wlroots_0_16; in -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "labwc"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; - rev = finalAttrs.version; - hash = "sha256-P1hKYTW++dpV3kdmI5nBGun080gVTrKzi2WOJKR84j4="; + rev = self.version; + hash = "sha256-PfvtNbSAz1vt0+ko4zRPyRRN+lhQoA2kJ2xoJy5o4So="; }; nativeBuildInputs = [ @@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/labwc/labwc"; description = "A Wayland stacking compositor, similar to Openbox"; + changelog = "https://raw.githubusercontent.com/labwc/labwc/${self.version}/NEWS.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/0001-patch-version.patch b/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/0001-patch-version.patch new file mode 100644 index 0000000000..8c28f0c22a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/0001-patch-version.patch @@ -0,0 +1,22 @@ +diff --git a/Cargo.lock b/Cargo.lock +index ac3125a..c02b11d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -431,7 +431,7 @@ dependencies = [ + + [[package]] + name = "leftwm" +-version = "0.4.0" ++version = "0.4.1" + dependencies = [ + "anyhow", + "clap", +@@ -467,7 +467,7 @@ dependencies = [ + + [[package]] + name = "leftwm-core" +-version = "0.4.0" ++version = "0.4.1" + dependencies = [ + "dirs-next", + "futures", diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix index fe3e46f7b4..70d7476432 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/leftwm/default.nix @@ -6,16 +6,20 @@ in rustPlatform.buildRustPackage rec { pname = "leftwm"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm"; rev = version; - sha256 = "sha256-4f9YOVkOXn7+TzTUZS2Lultgj9WhiOPUa/fHUeyLBUU="; + sha256 = "sha256-ZAlX8Vu4JAwQlwBOHT435Bz3g3qqK5ePm9v0cDqP8Q4="; }; - cargoSha256 = "sha256-D00IFTELRlqeKQ7zheJKTvu5FBgYQXsZ+OnPnVzweC4="; + cargoSha256 = "sha256-nn/P9ZZNf1Zts4JiJ2kXWAAG/HT1GnlYHXcPijYiBlU="; + + cargoPatches = [ + ./0001-patch-version.patch + ]; buildInputs = rpathLibs; @@ -33,7 +37,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/leftwm/leftwm"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ yanganto ]; changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix index 6f1a37f937..f2d0e1d484 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/pekwm/default.nix @@ -16,15 +16,15 @@ , pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: { pname = "pekwm"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "pekdon"; repo = "pekwm"; - rev = "release-${version}"; - hash= "sha256-voHPstdcd4CHnAdD3PMxca0A6MyMYJi8Ik0UlFB0vG0="; + rev = "release-${self.version}"; + hash= "sha256-hA+TBAs9NMcc5DKIkzyUHWck3Xht+yeCO54xJ6oXXuQ="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libpng ]; - meta = with lib; { + meta = { homepage = "https://www.pekwm.se/"; description = "A lightweight window manager"; longDescription = '' @@ -65,8 +65,9 @@ stdenv.mkDerivation rec { they should when starting applications. - Chainable Keygrabber, usability for everyone. ''; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + changelog = "https://raw.githubusercontent.com/pekwm/pekwm/release-${self.version}/NEWS.md"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix index f18ca995b1..5b4480499d 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix @@ -1,11 +1,13 @@ { lib , stdenv , fetchFromGitLab +, gitUpdater , meson , ninja , pkg-config , python3 , wrapGAppsHook +, libadwaita , libhandy , libxkbcommon , libgudev @@ -13,7 +15,7 @@ , pulseaudio , evince , glib -, gtk3 +, gtk4 , gnome , gnome-desktop , gcr @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { pname = "phosh"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -43,10 +45,11 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects - sha256 = "sha256-q2AYm+zbL4/pRG1wn+MT6IYM8CZt15o48U9+piMPf74="; + sha256 = "sha256-EMPqBKrtlwI9SJlqZjyAN5CtV4/BNwc5LapfeCEIYxc="; }; nativeBuildInputs = [ + libadwaita meson ninja pkg-config @@ -71,7 +74,7 @@ stdenv.mkDerivation rec { gnome.gnome-control-center gnome-desktop gnome.gnome-session - gtk3 + gtk4 pam systemd upower @@ -79,7 +82,7 @@ stdenv.mkDerivation rec { feedbackd ]; - checkInputs = [ + nativeCheckInputs = [ dbus xvfb-run ]; @@ -127,11 +130,16 @@ stdenv.mkDerivation rec { ]; tests.phosh = nixosTests.phosh; + + updateScript = gitUpdater { + rev-prefix = "v"; + }; }; meta = with lib; { description = "A pure Wayland shell prototype for GNOME on mobile devices"; homepage = "https://gitlab.gnome.org/World/Phosh/phosh"; + changelog = "https://gitlab.gnome.org/World/Phosh/phosh/-/blob/v${version}/debian/changelog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ masipcat zhaofengli ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 6786576e6e..c09df0065e 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, gitUpdater , meson , ninja , pkg-config @@ -17,19 +18,20 @@ stdenv.mkDerivation rec { pname = "phosh-mobile-settings"; - version = "0.21.1"; + version = "0.23.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "guidog"; repo = "phosh-mobile-settings"; rev = "v${version}"; - sha256 = "sha256-60AXaKSF8bY+Z3TNlIIa7jZwQ2IkHqCbZ3uIlhkx6i0="; + sha256 = "sha256-D605efn25Dl3Bj92DZiagcx+MMcRz0GRaWxplBRcZhA="; }; nativeBuildInputs = [ meson ninja + phosh pkg-config wrapGAppsHook ]; @@ -41,7 +43,6 @@ stdenv.mkDerivation rec { libadwaita lm_sensors phoc - phosh wayland-protocols ]; @@ -56,9 +57,14 @@ stdenv.mkDerivation rec { --replace 'Exec=phosh-mobile-settings' "Exec=$out/bin/phosh-mobile-settings" ''; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + meta = with lib; { description = "A settings app for mobile specific things"; homepage = "https://gitlab.gnome.org/guidog/phosh-mobile-settings"; + changelog = "https://gitlab.gnome.org/guidog/phosh-mobile-settings/-/blob/v${version}/debian/changelog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ colinsane ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix index 7a10bf4cfa..e86af9dad5 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/river/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "riverwm"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eIW8NNhacAM/7gZCUHCmiySANLenfcaCRTUkoJUZRPQ="; + hash = "sha256-noZ2vo4J0cG3PN2k+2LzMc5WMtj0FEmMttE9obFH/tM="; fetchSubmodules = true; }; @@ -65,10 +65,11 @@ stdenv.mkDerivation rec { passthru.providedSessions = ["river"]; meta = with lib; { + changelog = "https://github.com/ifreund/river/releases/tag/v${version}"; homepage = "https://github.com/ifreund/river"; description = "A dynamic tiling wayland compositor"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k adamcstephens ]; + maintainers = with maintainers; [ fortuneteller2k adamcstephens rodrgz ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix index 0528553b18..4df306eec9 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ libxkbcommon mesa pixman wayland xorg.libxcb ]; doCheck = true; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; postInstall = '' rm $out/bin/sommelier_test # why does it install the test binary? o_O diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix index e49edbd190..6cfc552402 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/default.nix @@ -6,9 +6,8 @@ , nixosTests # Used by the NixOS module: , isNixOS ? false - , enableXWayland ? true, xorg -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , dbusSupport ? true , dbus , trayEnabled ? systemdSupport && dbusSupport 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 6479760a74..b410919022 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/idle.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/idle.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, runtimeShell -, systemdSupport ? stdenv.isLinux, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix index b7e07444a0..c3058294ca 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/lock-effects.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "swaylock-effects"; - version = "1.6.10"; + version = "1.6.11"; src = fetchFromGitHub { owner = "jirutka"; repo = "swaylock-effects"; rev = "v${version}"; - sha256 = "sha256-VkyH9XN/pR1UY/liG5ygDHp+ymdqCPeWHyU7/teJGbU="; + sha256 = "sha256-MKmWVYssO9HAcP5uqwpy9kDa6/kfZyV2NI7ibozt7Ug="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix index 1aa3dace78..36cfdcfaed 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sway/swayest-workstyle/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "swayest-workstyle"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Lyr-7D1h"; repo = "swayest_workstyle"; rev = version; - sha256 = "sha256-LciTrYbmJV0y0H6QH88vTBXbDdDSx6FQtO4J/CFLjtY="; + sha256 = "sha256-C2Nz6fBwaj+cOxIfoBu+9T+CoJ5Spc1TAJcQWdIF/+I="; }; - cargoSha256 = "sha256-34Ij3Hd1JI6d1vhv1XomFc9SFoB/6pbS39upLk+NeQM="; + cargoHash = "sha256-6pAlJmpyv2a1XCZQLOYilxJAGPbPmkEz1ynTLa0RjE0="; doCheck = false; # No tests diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/vwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/vwm/default.nix index e1a8c8f3dd..b0b40afc9e 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/vwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/vwm/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ]; meta = with lib; { - homepage = "http://vwm.sourceforge.net/"; + homepage = "https://vwm.sourceforge.net/"; description = "Dynamic window manager for the console"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index 6b9d6e905b..45ae3eba9b 100644 --- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix @@ -25,6 +25,7 @@ , nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , propagateDoc ? bintools != null && bintools ? man , extraPackages ? [], extraBuildCommands ? "" +, isGNU ? bintools.isGNU or false, isLLVM ? bintools.isLLVM or false , buildPackages ? {} , targetPackages ? {} , useMacosReexportHack ? false @@ -108,7 +109,7 @@ stdenv.mkDerivation { passthru = { inherit targetPrefix suffixSalt; - inherit bintools libc nativeTools nativeLibc nativePrefix; + inherit bintools libc nativeTools nativeLibc nativePrefix isGNU isLLVM; emacsBufferSetup = pkgs: '' ; We should handle propagation here too diff --git a/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix b/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix index 14f7ac38d3..d1cd502e7e 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-bazel-package/default.nix @@ -1,16 +1,11 @@ { stdenv -, bazel , cacert , lib }: -let - bazelPkg = bazel; -in - args@{ name ? "${args.pname}-${args.version}" -, bazel ? bazelPkg +, bazel , bazelFlags ? [] , bazelBuildFlags ? [] , bazelTestFlags ? [] diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index d1c57a77a5..33df804d5e 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -264,6 +264,7 @@ stdenv.mkDerivation { + optionalString cc.langGo or false '' wrap ${targetPrefix}gccgo $wrapper $ccPath/${targetPrefix}gccgo + wrap ${targetPrefix}go ${./go-wrapper.sh} $ccPath/${targetPrefix}go ''; strictDeps = true; @@ -320,6 +321,11 @@ stdenv.mkDerivation { && !(stdenv.targetPlatform.useLLVM or false) && gccForLibs != null) '' echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags + + # Pull in 'cc.out' target to get 'libstdc++fs.a'. It should be in + # 'cc.lib'. But it's a gcc package bug. + # TODO(trofi): remove once gcc is fixed to move libraries to .lib output. + echo "-L${gccForLibs}/${optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"}/lib" >> $out/nix-support/cc-ldflags '' ## @@ -337,11 +343,18 @@ stdenv.mkDerivation { # compile, because it uses "#include_next " to find the # limits.h file in ../includes-fixed. To remedy the problem, # another -idirafter is necessary to add that directory again. + # + # We use --sysroot=/nix/store/does/not/exist to drop embedded default + # path to glibc headers gcc was built against. Without it -idirafter + # only appends to the list and outdated glibc headers end up being + # used. 'cc-cflags-before' is used to allow user's --sysroot= option + # to override our default. + optionalString (libc != null) ('' touch "$out/nix-support/libc-cflags" touch "$out/nix-support/libc-ldflags" echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags '' + optionalString (!(cc.langD or false)) '' + echo "--sysroot=/nix/store/does/not/exist" >> $out/nix-support/cc-cflags-before echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags '' + optionalString (isGNU && (!(cc.langD or false))) '' for dir in "${cc}"/lib/gcc/*/*/include-fixed; do @@ -371,11 +384,11 @@ stdenv.mkDerivation { echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags done '' - + optionalString (libcxx.isLLVM or false) ('' + + optionalString (libcxx.isLLVM or false) '' echo "-isystem ${lib.getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags - echo "-lc++abi" >> $out/nix-support/libcxx-ldflags - '') + echo "-l${libcxx.cxxabi.libName}" >> $out/nix-support/libcxx-ldflags + '' ## ## Initial CFLAGS diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/go-wrapper.sh b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/go-wrapper.sh new file mode 100644 index 0000000000..5dfc5d2b73 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/go-wrapper.sh @@ -0,0 +1,11 @@ +#! @shell@ +set -eu -o pipefail +o posix +shopt -s nullglob + +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + +export GCCGO="@out@/bin/gccgo" + +exec @prog@ "$@" diff --git a/third_party/nixpkgs/pkgs/build-support/deterministic-uname/deterministic-uname.sh b/third_party/nixpkgs/pkgs/build-support/deterministic-uname/deterministic-uname.sh index 134bd467bc..5272bb5b3f 100644 --- a/third_party/nixpkgs/pkgs/build-support/deterministic-uname/deterministic-uname.sh +++ b/third_party/nixpkgs/pkgs/build-support/deterministic-uname/deterministic-uname.sh @@ -133,7 +133,7 @@ fi # NixOS: # Linux *nodename* 6.0.13 #1-NixOS SMP PREEMPT_DYNAMIC Wed Dec 14 10:41:06 UTC 2022 x86_64 GNU/Linux if [[ "$all" = "1" ]]; then - echo -n "$KERNEL_NAME_VAL $NODENAME_VAL $KERNEL_RELEASE_VAL $KERNEL_VERSION_VAL $MACHINE_VAL" + echo -n "$KERNEL_NAME_VAL $NODENAME_VAL $KERNEL_RELEASE_VAL $KERNEL_VERSION_VAL $MACHINE_VAL " # in help: except omit -p and -i if unknown. #echo -n "$PROCESSOR_VAL $HARDWARE_PLATFORM_VAL\n" echo -n "$OPERATING_SYSTEM_VAL" diff --git a/third_party/nixpkgs/pkgs/build-support/fetchbzr/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchbzr/builder.sh index 163f6fc60e..380642a5e6 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchbzr/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchbzr/builder.sh @@ -1,10 +1,8 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source "$stdenv/setup" -header "exporting \`$url' (revision $rev) into \`$out'" +echo "exporting \`$url' (revision $rev) into \`$out'" # Perform a lightweight checkout so that we don't end up importing # all the repository's history. BZR_LOG=/dev/null bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url" - -stopNest diff --git a/third_party/nixpkgs/pkgs/build-support/fetchcvs/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchcvs/builder.sh index 90363275b9..4b49e9676e 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchcvs/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchcvs/builder.sh @@ -24,5 +24,3 @@ else fi (cd export && cvs -f -z0 -d "$cvsRoot" export $tag "$module") mv export/* $out - -stopNest diff --git a/third_party/nixpkgs/pkgs/build-support/fetchdarcs/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchdarcs/builder.sh index 0188527705..ce5537f46f 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchdarcs/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchdarcs/builder.sh @@ -11,10 +11,8 @@ elif test -n "$context"; then tagflags="--context=$context" fi -header "getting $url $partial ${tagtext} into $out" +echo "getting $url $partial ${tagtext} into $out" darcs get --lazy $tagflags "$url" "$out" # remove metadata, because it can change rm -rf "$out/_darcs" - -stopNest diff --git a/third_party/nixpkgs/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchdocker/fetchdocker-builder.sh index e5a1a61b78..4eb70f672d 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchdocker/fetchdocker-builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchdocker/fetchdocker-builder.sh @@ -1,6 +1,6 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source "${stdenv}/setup" -header "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" +echo "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" mkdir -p "${out}" cat < "${out}/compositeImage.sh" @@ -26,4 +26,3 @@ ${gnutar}/bin/tar \ -c "${manifest}" "${repositories}" -T "${imageFileStorePaths}" EOF chmod +x "${out}/compositeImage.sh" -stopNest diff --git a/third_party/nixpkgs/pkgs/build-support/fetchdocker/generic-fetcher.nix b/third_party/nixpkgs/pkgs/build-support/fetchdocker/generic-fetcher.nix index 3b0c337704..6a7b977db2 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchdocker/generic-fetcher.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchdocker/generic-fetcher.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { inherit name; builder = writeText "${fetcher}-builder.sh" '' source "$stdenv/setup" - header "${fetcher} exporting to $out" + echo "${fetcher} exporting to $out" declare -A creds @@ -49,7 +49,7 @@ stdenv.mkDerivation { fi if [ -f "$dockerCredentialsFile" ]; then - header "using credentials from $dockerCredentialsFile" + echo "using credentials from $dockerCredentialsFile" CREDSFILE=$(cat "$dockerCredentialsFile") creds[token]=$(${awk} -F'=' '/DOCKER_TOKEN/ {print $2}' <<< "$CREDSFILE" | head -n1) @@ -77,8 +77,6 @@ stdenv.mkDerivation { ${layerDigestFlag} \ "${repository}/${imageName}" \ "${tag}" - - stopNest ''; buildInputs = [ haskellPackages.hocker ]; diff --git a/third_party/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix index 0fa51e6984..fe9ff5c469 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchfirefoxaddon/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { builder = writeScript "xpibuilder" '' source $stdenv/setup - header "firefox addon $name into $out" + echo "firefox addon $name into $out" UUID="${extid}" mkdir -p "$out/$UUID" diff --git a/third_party/nixpkgs/pkgs/build-support/fetchfossil/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchfossil/builder.sh index 009b23c406..36b758ab57 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchfossil/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchfossil/builder.sh @@ -1,6 +1,6 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "Cloning Fossil $url [$rev] into $out" +echo "Cloning Fossil $url [$rev] into $out" # Fossil, bless its adorable little heart, wants to write global configuration # to $HOME/.fossil. AFAICT, there is no way to disable this functionality. @@ -19,5 +19,3 @@ popd # Just nuke the checkout file. rm $out/.fslckout - -stopNest diff --git a/third_party/nixpkgs/pkgs/build-support/fetchgit/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchgit/builder.sh index acb970639a..77f6381b09 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchgit/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchgit/builder.sh @@ -6,7 +6,7 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting $url (rev $rev) into $out" +echo "exporting $url (rev $rev) into $out" $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${leaveDotGit:+--leave-dotGit} \ @@ -18,4 +18,3 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${branchName:+--branch-name "$branchName"} runHook postFetch -stopNest diff --git a/third_party/nixpkgs/pkgs/build-support/fetchhg/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchhg/builder.sh index cec0e441f2..1ce2947577 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchhg/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchhg/builder.sh @@ -1,10 +1,8 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "getting $url${rev:+ ($rev)} into $out" +echo "getting $url${rev:+ ($rev)} into $out" hg clone --insecure "$url" hg-clone hg archive -q$subrepoClause -y ${rev:+-r "$rev"} --cwd hg-clone $out rm -f $out/.hg_archival.txt - -stopNest diff --git a/third_party/nixpkgs/pkgs/build-support/fetchmtn/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchmtn/builder.sh index 7db66730da..1aabd7949e 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchmtn/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchmtn/builder.sh @@ -8,7 +8,7 @@ if ! [ -f "$cacheDB" ]; then mtn --db "$cacheDB" db init fi -header "getting revision $selector"; +echo "getting revision $selector"; done=; for source in $dbs; do @@ -32,9 +32,7 @@ for source in $dbs; do fi; done; -stopNest; - -header "checking out the revision $revision"; +echo "checking out the revision $revision"; if test -n "$done"; then mtn checkout --db "$cacheDB" -r "$revision" "$out" -b "${branch}" @@ -43,10 +41,6 @@ else exit 1; fi; -stopNest - -header "clearing _MTN in the output" +echo "clearing _MTN in the output" rm -rf "$out/_MTN" - -stopNest diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/fetchpypi.nix b/third_party/nixpkgs/pkgs/build-support/fetchpypi/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/interpreters/python/fetchpypi.nix rename to third_party/nixpkgs/pkgs/build-support/fetchpypi/default.nix diff --git a/third_party/nixpkgs/pkgs/build-support/fetchsvn/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchsvn/builder.sh index b58e5a88b3..aa4d049aba 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchsvn/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchsvn/builder.sh @@ -1,7 +1,7 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting $url (r$rev) into $out" +echo "exporting $url (r$rev) into $out" if test -n "$http_proxy"; then # Configure proxy @@ -22,5 +22,3 @@ fi; svn export --trust-server-cert --non-interactive \ ${ignoreExternals:+--ignore-externals} ${ignoreKeywords:+--ignore-keywords} \ -r "$rev" "$url" "$out" - -stopNest diff --git a/third_party/nixpkgs/pkgs/build-support/fetchsvnssh/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchsvnssh/builder.sh index b0441299dd..5782151524 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchsvnssh/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchsvnssh/builder.sh @@ -1,7 +1,7 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting $url (r$rev) into $out" +echo "exporting $url (r$rev) into $out" if test "$sshSupport"; then export SVN_SSH="$openssh/bin/ssh" @@ -12,5 +12,3 @@ fi # whether the server is being spoofed --- only the cryptographic # hash of the output matters. expect -f $sshSubversion "$username" "$password" "$rev" "$url" $out - -stopNest diff --git a/third_party/nixpkgs/pkgs/build-support/fetchurl/builder.sh b/third_party/nixpkgs/pkgs/build-support/fetchurl/builder.sh index dd987f41b4..e8eaba9348 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchurl/builder.sh +++ b/third_party/nixpkgs/pkgs/build-support/fetchurl/builder.sh @@ -37,7 +37,7 @@ if [ -n "$downloadToTemp" ]; then downloadedFile="$TMPDIR/file"; fi tryDownload() { local url="$1" echo - header "trying $url" + echo "trying $url" local curlexit=18; success= diff --git a/third_party/nixpkgs/pkgs/build-support/go/module.nix b/third_party/nixpkgs/pkgs/build-support/go/module.nix index 647f2a2f7a..448143f769 100644 --- a/third_party/nixpkgs/pkgs/build-support/go/module.nix +++ b/third_party/nixpkgs/pkgs/build-support/go/module.nix @@ -83,9 +83,12 @@ let inherit (args) src; inherit (go) GOOS GOARCH; + prePatch = args.prePatch or ""; patches = args.patches or []; patchFlags = args.patchFlags or []; + postPatch = args.postPatch or ""; preBuild = args.preBuild or ""; + postBuild = args.postBuild or ""; sourceRoot = args.sourceRoot or ""; GO111MODULE = "on"; diff --git a/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/default.nix index ca14a4495f..f685976626 100644 --- a/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/pkg-config-wrapper/default.nix @@ -46,14 +46,11 @@ stdenv.mkDerivation { strictDeps = true; dontBuild = true; dontConfigure = true; + dontUnpack = true; # Additional flags passed to pkg-config. addFlags = lib.optional stdenv.targetPlatform.isStatic "--static"; - unpackPhase = '' - src=$PWD - ''; - installPhase = '' mkdir -p $out/bin $out/nix-support diff --git a/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix b/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix index 9104bf2dce..679adad827 100644 --- a/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix +++ b/third_party/nixpkgs/pkgs/build-support/release/debian-build.nix @@ -43,9 +43,8 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( [ ! -f /etc/lsb-release ] || (source /etc/lsb-release; echo "OS release: $DISTRIB_DESCRIPTION") echo "System/kernel: $(uname -a)" if test -e /etc/debian_version; then echo "Debian release: $(cat /etc/debian_version)"; fi - header "installed Debian packages" + echo "installed Debian packages" dpkg-query --list - stopNest ''; installPhase = '' @@ -73,11 +72,10 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( [ "$(echo $out/debs/*.deb)" != "" ] for i in $out/debs/*.deb; do - header "Generated DEB package: $i" + echo "Generated DEB package: $i" dpkg-deb --info "$i" pkgName=$(dpkg-deb -W "$i" | awk '{print $1}') echo "file deb $i" >> $out/nix-support/hydra-build-products - stopNest done dpkg -i $out/debs/*.deb diff --git a/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix b/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix index 5ed2b0752e..9578fbf482 100644 --- a/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix +++ b/third_party/nixpkgs/pkgs/build-support/release/nix-build.nix @@ -74,10 +74,9 @@ stdenv.mkDerivation ( if test -n "$succeedOnFailure"; then if test -n "$keepBuildDirectory"; then KEEPBUILDDIR="$out/`basename $TMPDIR`" - header "Copying build directory to $KEEPBUILDDIR" + echo "Copying build directory to $KEEPBUILDDIR" mkdir -p $KEEPBUILDDIR cp -R "$TMPDIR/"* $KEEPBUILDDIR - stopNest fi fi ''; diff --git a/third_party/nixpkgs/pkgs/build-support/release/source-tarball.nix b/third_party/nixpkgs/pkgs/build-support/release/source-tarball.nix index 742cce13b7..d624d071cc 100644 --- a/third_party/nixpkgs/pkgs/build-support/release/source-tarball.nix +++ b/third_party/nixpkgs/pkgs/build-support/release/source-tarball.nix @@ -64,10 +64,9 @@ stdenv.mkDerivation ( if test -n "$succeedOnFailure"; then if test -n "$keepBuildDirectory"; then KEEPBUILDDIR="$out/`basename $TMPDIR`" - header "Copying build directory to $KEEPBUILDDIR" + echo "Copying build directory to $KEEPBUILDDIR" mkdir -p $KEEPBUILDDIR cp -R "$TMPDIR/"* $KEEPBUILDDIR - stopNest fi fi ''; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 637c9fc62f..a01e6c62bc 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -132,7 +132,7 @@ in '' export CARGO_CFG_UNIX=1 export CARGO_CFG_TARGET_ENV="gnu" export CARGO_CFG_TARGET_ENDIAN=${if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then "little" else "big"} - export CARGO_CFG_TARGET_POINTER_WIDTH=${toString stdenv.hostPlatform.parsed.cpu.bits} + export CARGO_CFG_TARGET_POINTER_WIDTH=${with stdenv.hostPlatform; toString (if isILP32 then 32 else parsed.cpu.bits)} export CARGO_CFG_TARGET_VENDOR=${stdenv.hostPlatform.parsed.vendor.name} export CARGO_MANIFEST_DIR=$(pwd) diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/audit-tmpdir.sh index 9c03bc2ee9..3671417815 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/audit-tmpdir.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/audit-tmpdir.sh @@ -13,7 +13,7 @@ auditTmpdir() { local dir="$1" [ -e "$dir" ] || return 0 - header "checking for references to $TMPDIR/ in $dir..." + echo "checking for references to $TMPDIR/ in $dir..." local i find "$dir" -type f -print0 | while IFS= read -r -d $'\0' i; do @@ -36,6 +36,4 @@ auditTmpdir() { fi done - - stopNest } diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.py b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.py index efb65a8099..e731feb1b1 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.py +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.py @@ -131,7 +131,14 @@ def populate_cache(initial: List[Path], recursive: bool =False) -> None: if not path.is_file(): continue + # As an optimisation, resolve the symlinks here, as the target is unique + # XXX: (layus, 2022-07-25) is this really an optimisation in all cases ? + # It could make the rpath bigger or break the fragile precedence of $out. resolved = path.resolve() + # Do not use resolved paths when names do not match + if resolved.name != path.name: + resolved = path + try: with open_elf(path) as elf: osabi = get_osabi(elf) diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/canonicalize-jars.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/canonicalize-jars.sh index 8c55810748..5137bfc94b 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/canonicalize-jars.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/canonicalize-jars.sh @@ -6,12 +6,11 @@ fixupOutputHooks+=('if [ -z "$dontCanonicalizeJars" -a -e "$prefix" ]; then cano canonicalizeJarsIn() { local dir="$1" - header "canonicalizing jars in $dir" + echo "canonicalizing jars in $dir" dir="$(realpath -sm -- "$dir")" while IFS= read -rd '' f; do canonicalizeJar "$f" done < <(find -- "$dir" -type f -name '*.jar' -print0) - stopNest } source @canonicalize_jar@ diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix index c9b03b75cd..c81a253b0d 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix @@ -10,6 +10,8 @@ }: makeSetupHook { + name = "make-binary-wrapper-hook"; + deps = [ dieHook ] # https://github.com/NixOS/nixpkgs/issues/148189 ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) cc; diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-symlinks-relative.sh index cd9c2eaa2d..f34353a761 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-symlinks-relative.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/make-symlinks-relative.sh @@ -6,8 +6,8 @@ postFixupHooks+=(_makeSymlinksRelative) _makeSymlinksRelative() { local symlinkTarget - if [ -n "${dontRewriteSymlinks-}" ]; then - return 0 + if [ "${dontRewriteSymlinks-}" ] || [ ! -e "$prefix" ]; then + return fi while IFS= read -r -d $'\0' f; do diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh index 8a2fc2f915..3a318933f1 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -4,16 +4,32 @@ preFixupHooks+=(_multioutDocs) preFixupHooks+=(_multioutDevs) postFixupHooks+=(_multioutPropagateDev) -# Assign the first string containing nonempty variable to the variable named $1 +# _assignFirst varName otherVarNames* +# +# Set the value of the variable named $varName to the first of otherVarNames +# that refers to a non-empty variable name. +# +# If none of otherVarNames refers to a non-empty variable, the error message is +# specific to this function's use case, which is setting up the output variables. _assignFirst() { local varName="$1" local REMOVE=REMOVE # slightly hacky - we allow REMOVE (i.e. not a variable name) shift - while (( $# )); do - if [ -n "${!1-}" ]; then eval "${varName}"="$1"; return; fi - shift + for var in "$@"; do + if [ -n "${!var-}" ]; then eval "${varName}"="${var}"; return; fi done - echo "Error: _assignFirst found no valid variant!" + echo + echo "error: _assignFirst: could not find a non-empty variable to assign to ${varName}." + echo " The following variables were all unset or empty:" + echo " $*" + if [ -z "${out:-}" ]; then + echo ' If you do not want an "out" output in your derivation, make sure to define' + echo ' the other specific required outputs. This can be achieved by picking one' + echo " of the above as an output." + echo ' You do not have to remove "out" if you want to have a different default' + echo ' output, because the first output is taken as a default.' + echo + fi return 1 # none found } diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh index 04ebcd2cc6..a26113abea 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -100,8 +100,6 @@ patchShebangs() { fi fi done < <(find "$@" -type f -perm -0100 -print0) - - stopNest } patchShebangsAuto () { diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh index 041a3f5653..3eec67d60f 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh @@ -50,10 +50,10 @@ EOF fi if ! type initdb >/dev/null; then - echo >&2 'initdb not found. Did you add postgresql to the checkInputs?' + echo >&2 'initdb not found. Did you add postgresql to the nativeCheckInputs?' false fi - header 'initializing postgresql' + echo 'initializing postgresql' initdb -U postgres # Move the socket @@ -65,15 +65,17 @@ EOF echo "listen_addresses = ''" >>"$PGDATA/postgresql.conf" fi - header 'starting postgresql' + echo 'starting postgresql' eval "${postgresqlStartCommands:-pg_ctl start}" - header 'setting up postgresql' + echo 'setting up postgresql' eval "$postgresqlTestSetupCommands" + runHook postgresqlTestSetupPost + } postgresqlStop() { - header 'stopping postgresql' + echo 'stopping postgresql' pg_ctl stop } diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix b/third_party/nixpkgs/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix index 6d8ad6c8c7..9881ed1016 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/postgresql-test-hook/test.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "postgresql-test-hook-test"; buildInputs = [ postgresqlTestHook ]; - checkInputs = [ postgresql ]; + nativeCheckInputs = [ postgresql ]; dontUnpack = true; doCheck = true; passAsFile = ["sql"]; @@ -14,6 +14,9 @@ stdenv.mkDerivation { INSERT INTO hello VALUES ('it '||'worked'); SELECT * FROM hello; ''; + postgresqlTestSetupPost = '' + TEST_POST_HOOK_RAN=1 + ''; checkPhase = '' runHook preCheck psql <$sqlPath | grep 'it worked' @@ -21,7 +24,7 @@ stdenv.mkDerivation { runHook postCheck ''; installPhase = '' - [[ $TEST_RAN == 1 ]] + [[ $TEST_RAN == 1 && $TEST_POST_HOOK_RAN == 1 ]] touch $out ''; } diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh index be94af545b..3c8c9c294c 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -26,7 +26,7 @@ _separateDebugInfo() { fi # Extract the debug info. - header "separating debug info from $i (build ID $id)" + echo "separating debug info from $i (build ID $id)" mkdir -p "$dst/${id:0:2}" # This may fail, e.g. if the binary is for a different diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/strip.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/strip.sh index 104b5515b3..f5e3bdced6 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/strip.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/strip.sh @@ -36,7 +36,7 @@ _doStrip() { local -n ranlibCmd="${ranlibCmds[$i]}" # `dontStrip` disables them all - if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null + if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null 1>&2 then continue; fi stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags[*]:--S}" diff --git a/third_party/nixpkgs/pkgs/build-support/testers/default.nix b/third_party/nixpkgs/pkgs/build-support/testers/default.nix index 6ab0ee843c..15694162ed 100644 --- a/third_party/nixpkgs/pkgs/build-support/testers/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/testers/default.nix @@ -121,4 +121,6 @@ in nixosTesting.simpleTest calledTest; + hasPkgConfigModule = callPackage ./hasPkgConfigModule/tester.nix { }; + } diff --git a/third_party/nixpkgs/pkgs/build-support/testers/hasPkgConfigModule/tester.nix b/third_party/nixpkgs/pkgs/build-support/testers/hasPkgConfigModule/tester.nix new file mode 100644 index 0000000000..c8342cdd5c --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/testers/hasPkgConfigModule/tester.nix @@ -0,0 +1,47 @@ +# Static arguments +{ runCommand, pkg-config }: + +# Tester arguments +{ package, + moduleName, + testName ? "check-pkg-config-${moduleName}", +}: + +runCommand testName { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ package ]; + inherit moduleName; + meta = { + description = "Test whether ${package.name} exposes pkg-config module ${moduleName}"; + } + # Make sure licensing info etc is preserved, as this is a concern for e.g. cache.nixos.org, + # as hydra can't check this meta info in dependencies. + # The test itself is just Nixpkgs, with MIT license. + // builtins.intersectAttrs + { + available = throw "unused"; + broken = throw "unused"; + insecure = throw "unused"; + license = throw "unused"; + maintainers = throw "unused"; + platforms = throw "unused"; + unfree = throw "unused"; + unsupported = throw "unused"; + } + package.meta; + } '' + echo "checking pkg-config module $moduleName in $buildInputs" + set +e + version="$(pkg-config --modversion $moduleName)" + r=$? + set -e + if [[ $r = 0 ]]; then + echo "✅ pkg-config module $moduleName exists and has version $version" + echo "$version" > $out + else + echo "These modules were available in the input propagation closure:" + pkg-config --list-all + echo "❌ pkg-config module $moduleName was not found" + false + fi + '' diff --git a/third_party/nixpkgs/pkgs/build-support/testers/hasPkgConfigModule/tests.nix b/third_party/nixpkgs/pkgs/build-support/testers/hasPkgConfigModule/tests.nix new file mode 100644 index 0000000000..8005c3f937 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/testers/hasPkgConfigModule/tests.nix @@ -0,0 +1,36 @@ +# cd nixpkgs +# nix-build -A tests.testers.hasPkgConfigModule +{ lib, testers, zlib, runCommand }: + +lib.recurseIntoAttrs { + + zlib-has-zlib = testers.hasPkgConfigModule { + package = zlib; + moduleName = "zlib"; + }; + + zlib-does-not-have-ylib = runCommand "zlib-does-not-have-ylib" { + failed = testers.testBuildFailure ( + testers.hasPkgConfigModule { + package = zlib; + moduleName = "ylib"; + } + ); + } '' + echo 'it logs a relevant error message' + { + grep -F "pkg-config module ylib was not found" $failed/testBuildFailure.log + } + + echo 'it logs which pkg-config modules are available, to be helpful' + { + # grep -v: the string zlib does also occur in a store path in an earlier message, which isn't particularly helpful + grep -v "checking pkg-config module" < $failed/testBuildFailure.log \ + | grep -F "zlib" + } + + # done + touch $out + ''; + +} diff --git a/third_party/nixpkgs/pkgs/build-support/testers/test/default.nix b/third_party/nixpkgs/pkgs/build-support/testers/test/default.nix index 0a5381b2b7..313c556737 100644 --- a/third_party/nixpkgs/pkgs/build-support/testers/test/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/testers/test/default.nix @@ -12,6 +12,8 @@ let in lib.recurseIntoAttrs { + hasPkgConfigModule = pkgs.callPackage ../hasPkgConfigModule/tests.nix { }; + # Check that the wiring of nixosTest is correct. # Correct operation of the NixOS test driver should be asserted elsewhere. nixosTest-example = pkgs-with-overlay.testers.nixosTest ({ lib, pkgs, figlet, ... }: { diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix index 80c3214f06..d8aa6c2324 100644 --- a/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix +++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders.nix @@ -10,25 +10,30 @@ in rec { /* Run the shell command `buildCommand' to produce a store path named - * `name'. The attributes in `env' are added to the environment - * prior to running the command. By default `runCommand` runs in a - * stdenv with no compiler environment. `runCommandCC` uses the default - * stdenv, `pkgs.stdenv`. - * - * Examples: - * runCommand "name" {envVariable = true;} ''echo hello > $out'' - * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out''; - * - * The `*Local` variants force a derivation to be built locally, - * it is not substituted. - * - * This is intended for very cheap commands (<1s execution time). - * It saves on the network roundrip and can speed up a build. - * - * It is the same as adding the special fields - * `preferLocalBuild = true;` - * `allowSubstitutes = false;` - * to a derivation’s attributes. + `name'. The attributes in `env' are added to the environment + prior to running the command. By default `runCommand` runs in a + stdenv with no compiler environment. `runCommandCC` uses the default + stdenv, `pkgs.stdenv`. + + Example: + + + runCommand "name" {envVariable = true;} ''echo hello > $out'' + runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out''; + + + The `*Local` variants force a derivation to be built locally, + it is not substituted. + + This is intended for very cheap commands (<1s execution time). + It saves on the network roundrip and can speed up a build. + + It is the same as adding the special fields + + `preferLocalBuild = true;` + `allowSubstitutes = false;` + + to a derivation’s attributes. */ runCommand = name: env: runCommandWith { stdenv = stdenvNoCC; @@ -53,13 +58,13 @@ rec { # We shouldn’t force the user to have a cc in scope. /* Generalized version of the `runCommand`-variants - * which does customized behavior via a single - * attribute set passed as the first argument - * instead of having a lot of variants like - * `runCommand*`. Additionally it allows changing - * the used `stdenv` freely and has a more explicit - * approach to changing the arguments passed to - * `stdenv.mkDerivation`. + which does customized behavior via a single + attribute set passed as the first argument + instead of having a lot of variants like + `runCommand*`. Additionally it allows changing + the used `stdenv` freely and has a more explicit + approach to changing the arguments passed to + `stdenv.mkDerivation`. */ runCommandWith = let @@ -91,27 +96,34 @@ rec { /* Writes a text file to the nix store. - * The contents of text is added to the file in the store. - * - * Examples: - * # Writes my-file to /nix/store/ - * writeTextFile { - * name = "my-file"; - * text = '' - * Contents of File - * ''; - * } - * # See also the `writeText` helper function below. - * - * # Writes executable my-file to /nix/store//bin/my-file - * writeTextFile { - * name = "my-file"; - * text = '' - * Contents of File - * ''; - * executable = true; - * destination = "/bin/my-file"; - * } + The contents of text is added to the file in the store. + + Example: + + + # Writes my-file to /nix/store/ + writeTextFile { + name = "my-file"; + text = '' + Contents of File + ''; + } + + + See also the `writeText` helper function below. + + + # Writes executable my-file to /nix/store//bin/my-file + writeTextFile { + name = "my-file"; + text = '' + Contents of File + ''; + executable = true; + destination = "/bin/my-file"; + } + + */ writeTextFile = { name # the name of the derivation @@ -144,29 +156,35 @@ rec { ''; /* - * Writes a text file to nix store with no optional parameters available. - * - * Example: - * # Writes contents of file to /nix/store/ - * writeText "my-file" - * '' - * Contents of File - * ''; - * + Writes a text file to nix store with no optional parameters available. + + Example: + + + # Writes contents of file to /nix/store/ + writeText "my-file" + '' + Contents of File + ''; + + */ writeText = name: text: writeTextFile {inherit name text;}; /* - * Writes a text file to nix store in a specific directory with no - * optional parameters available. - * - * Example: - * # Writes contents of file to /nix/store//share/my-file - * writeTextDir "share/my-file" - * '' - * Contents of File - * ''; - * + Writes a text file to nix store in a specific directory with no + optional parameters available. + + Example: + + + # Writes contents of file to /nix/store//share/my-file + writeTextDir "share/my-file" + '' + Contents of File + ''; + + */ writeTextDir = path: text: writeTextFile { inherit text; @@ -175,48 +193,58 @@ rec { }; /* - * Writes a text file to /nix/store/ and marks the file as - * executable. - * - * If passed as a build input, will be used as a setup hook. This makes setup - * hooks more efficient to create: you don't need a derivation that copies - * them to $out/nix-support/setup-hook, instead you can use the file as is. - * - * Example: - * # Writes my-file to /nix/store/ and makes executable - * writeScript "my-file" - * '' - * Contents of File - * ''; - * + Writes a text file to /nix/store/ and marks the file as + executable. + + If passed as a build input, will be used as a setup hook. This makes setup + hooks more efficient to create: you don't need a derivation that copies + them to $out/nix-support/setup-hook, instead you can use the file as is. + + Example: + + + # Writes my-file to /nix/store/ and makes executable + writeScript "my-file" + '' + Contents of File + ''; + + */ writeScript = name: text: writeTextFile {inherit name text; executable = true;}; /* - * Writes a text file to /nix/store//bin/ and - * marks the file as executable. - * - * Example: - * # Writes my-file to /nix/store//bin/my-file and makes executable. - * writeScriptBin "my-file" - * '' - * Contents of File - * ''; - * + Writes a text file to /nix/store//bin/ and + marks the file as executable. + + Example: + + + + # Writes my-file to /nix/store//bin/my-file and makes executable. + writeScriptBin "my-file" + '' + Contents of File + ''; + + */ writeScriptBin = name: text: writeTextFile {inherit name text; executable = true; destination = "/bin/${name}";}; /* - * Similar to writeScript. Writes a Shell script and checks its syntax. - * Automatically includes interpreter above the contents passed. - * - * Example: - * # Writes my-file to /nix/store/ and makes executable. - * writeShellScript "my-file" - * '' - * Contents of File - * ''; - * + Similar to writeScript. Writes a Shell script and checks its syntax. + Automatically includes interpreter above the contents passed. + + Example: + + + # Writes my-file to /nix/store/ and makes executable. + writeShellScript "my-file" + '' + Contents of File + ''; + + */ writeShellScript = name: text: writeTextFile { @@ -232,17 +260,20 @@ rec { }; /* - * Similar to writeShellScript and writeScriptBin. - * Writes an executable Shell script to /nix/store//bin/ and checks its syntax. - * Automatically includes interpreter above the contents passed. - * - * Example: - * # Writes my-file to /nix/store//bin/my-file and makes executable. - * writeShellScriptBin "my-file" - * '' - * Contents of File - * ''; - * + Similar to writeShellScript and writeScriptBin. + Writes an executable Shell script to /nix/store//bin/ and checks its syntax. + Automatically includes interpreter above the contents passed. + + Example: + + + # Writes my-file to /nix/store//bin/my-file and makes executable. + writeShellScriptBin "my-file" + '' + Contents of File + ''; + + */ writeShellScriptBin = name : text : writeTextFile { @@ -259,25 +290,29 @@ rec { }; /* - * Similar to writeShellScriptBin and writeScriptBin. - * Writes an executable Shell script to /nix/store//bin/ and - * checks its syntax with shellcheck and the shell's -n option. - * Automatically includes sane set of shellopts (errexit, nounset, pipefail) - * and handles creation of PATH based on runtimeInputs - * - * Note that the checkPhase uses stdenv.shell for the test run of the script, - * while the generated shebang uses runtimeShell. If, for whatever reason, - * those were to mismatch you might lose fidelity in the default checks. - * - * Example: - * # Writes my-file to /nix/store//bin/my-file and makes executable. - * writeShellApplication { - * name = "my-file"; - * runtimeInputs = [ curl w3m ]; - * text = '' - * curl -s 'https://nixos.org' | w3m -dump -T text/html - * ''; - * } + Similar to writeShellScriptBin and writeScriptBin. + Writes an executable Shell script to /nix/store//bin/ and + checks its syntax with shellcheck and the shell's -n option. + Automatically includes sane set of shellopts (errexit, nounset, pipefail) + and handles creation of PATH based on runtimeInputs + + Note that the checkPhase uses stdenv.shell for the test run of the script, + while the generated shebang uses runtimeShell. If, for whatever reason, + those were to mismatch you might lose fidelity in the default checks. + + Example: + + Writes my-file to /nix/store//bin/my-file and makes executable. + + + writeShellApplication { + name = "my-file"; + runtimeInputs = [ curl w3m ]; + text = '' + curl -s 'https://nixos.org' | w3m -dump -T text/html + ''; + } + */ writeShellApplication = { name @@ -334,23 +369,30 @@ rec { /* concat a list of files to the nix store. - * The contents of files are added to the file in the store. - * - * Examples: - * # Writes my-file to /nix/store/ - * concatTextFile { - * name = "my-file"; - * files = [ drv1 "${drv2}/path/to/file" ]; - * } - * # See also the `concatText` helper function below. - * - * # Writes executable my-file to /nix/store//bin/my-file - * concatTextFile { - * name = "my-file"; - * files = [ drv1 "${drv2}/path/to/file" ]; - * executable = true; - * destination = "/bin/my-file"; - * } + The contents of files are added to the file in the store. + + Example: + + + # Writes my-file to /nix/store/ + concatTextFile { + name = "my-file"; + files = [ drv1 "${drv2}/path/to/file" ]; + } + + + See also the `concatText` helper function below. + + + # Writes executable my-file to /nix/store//bin/my-file + concatTextFile { + name = "my-file"; + files = [ drv1 "${drv2}/path/to/file" ]; + executable = true; + destination = "/bin/my-file"; + } + + */ concatTextFile = { name # the name of the derivation @@ -373,70 +415,81 @@ rec { /* - * Writes a text file to nix store with no optional parameters available. - * - * Example: - * # Writes contents of files to /nix/store/ - * concatText "my-file" [ file1 file2 ] - * + Writes a text file to nix store with no optional parameters available. + + Example: + + + # Writes contents of files to /nix/store/ + concatText "my-file" [ file1 file2 ] + + */ concatText = name: files: concatTextFile { inherit name files; }; - /* - * Writes a text file to nix store with and mark it as executable. - * - * Example: - * # Writes contents of files to /nix/store/ - * concatScript "my-file" [ file1 file2 ] - * + /* + Writes a text file to nix store with and mark it as executable. + + Example: + # Writes contents of files to /nix/store/ + concatScript "my-file" [ file1 file2 ] + */ concatScript = name: files: concatTextFile { inherit name files; executable = true; }; /* - * Create a forest of symlinks to the files in `paths'. - * - * This creates a single derivation that replicates the directory structure - * of all the input paths. - * - * BEWARE: it may not "work right" when the passed paths contain symlinks to directories. - * - * Examples: - * # adds symlinks of hello to current build. - * symlinkJoin { name = "myhello"; paths = [ pkgs.hello ]; } - * - * # adds symlinks of hello and stack to current build and prints "links added" - * symlinkJoin { name = "myexample"; paths = [ pkgs.hello pkgs.stack ]; postBuild = "echo links added"; } - * - * This creates a derivation with a directory structure like the following: - * - * /nix/store/sglsr5g079a5235hy29da3mq3hv8sjmm-myexample - * |-- bin - * | |-- hello -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10/bin/hello - * | `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/bin/stack - * `-- share - * |-- bash-completion - * | `-- completions - * | `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/bash-completion/completions/stack - * |-- fish - * | `-- vendor_completions.d - * | `-- stack.fish -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/fish/vendor_completions.d/stack.fish - * ... - * - * symlinkJoin and linkFarm are similar functions, but they output - * derivations with different structure. - * - * symlinkJoin is used to create a derivation with a familiar directory - * structure (top-level bin/, share/, etc), but with all actual files being symlinks to - * the files in the input derivations. - * - * symlinkJoin is used many places in nixpkgs to create a single derivation - * that appears to contain binaries, libraries, documentation, etc from - * multiple input derivations. - * - * linkFarm is instead used to create a simple derivation with symlinks to - * other derivations. A derivation created with linkFarm is often used in CI - * as a easy way to build multiple derivations at once. + Create a forest of symlinks to the files in `paths'. + + This creates a single derivation that replicates the directory structure + of all the input paths. + + BEWARE: it may not "work right" when the passed paths contain symlinks to directories. + + Example: + + + # adds symlinks of hello to current build. + symlinkJoin { name = "myhello"; paths = [ pkgs.hello ]; } + + + + + # adds symlinks of hello and stack to current build and prints "links added" + symlinkJoin { name = "myexample"; paths = [ pkgs.hello pkgs.stack ]; postBuild = "echo links added"; } + + + This creates a derivation with a directory structure like the following: + + + /nix/store/sglsr5g079a5235hy29da3mq3hv8sjmm-myexample + |-- bin + | |-- hello -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10/bin/hello + | `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/bin/stack + `-- share + |-- bash-completion + | `-- completions + | `-- stack -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/bash-completion/completions/stack + |-- fish + | `-- vendor_completions.d + | `-- stack.fish -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1/share/fish/vendor_completions.d/stack.fish + ... + + + symlinkJoin and linkFarm are similar functions, but they output + derivations with different structure. + + symlinkJoin is used to create a derivation with a familiar directory + structure (top-level bin/, share/, etc), but with all actual files being symlinks to + the files in the input derivations. + + symlinkJoin is used many places in nixpkgs to create a single derivation + that appears to contain binaries, libraries, documentation, etc from + multiple input derivations. + + linkFarm is instead used to create a simple derivation with symlinks to + other derivations. A derivation created with linkFarm is often used in CI + as a easy way to build multiple derivations at once. */ symlinkJoin = args_@{ name @@ -462,29 +515,34 @@ rec { ''; /* - * Quickly create a set of symlinks to derivations. - * - * This creates a simple derivation with symlinks to all inputs. - * - * entries can be a list of attribute sets like - * [ { name = "name" ; path = "/nix/store/..."; } ] - * - * or an attribute set name -> path like: - * { name = "/nix/store/..."; other = "/nix/store/..."; } - * - * Example: - * - * # Symlinks hello and stack paths in store to current $out/hello-test and - * # $out/foobar. - * linkFarm "myexample" [ { name = "hello-test"; path = pkgs.hello; } { name = "foobar"; path = pkgs.stack; } ] - * - * This creates a derivation with a directory structure like the following: - * - * /nix/store/qc5728m4sa344mbks99r3q05mymwm4rw-myexample - * |-- foobar -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1 - * `-- hello-test -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10 - * - * See the note on symlinkJoin for the difference between linkFarm and symlinkJoin. + Quickly create a set of symlinks to derivations. + + This creates a simple derivation with symlinks to all inputs. + + entries can be a list of attribute sets like + + [ { name = "name" ; path = "/nix/store/..."; } ] + + + or an attribute set name -> path like: + + { name = "/nix/store/..."; other = "/nix/store/..."; } + + + Example: + + # Symlinks hello and stack paths in store to current $out/hello-test and + # $out/foobar. + linkFarm "myexample" [ { name = "hello-test"; path = pkgs.hello; } { name = "foobar"; path = pkgs.stack; } ] + + This creates a derivation with a directory structure like the following: + + /nix/store/qc5728m4sa344mbks99r3q05mymwm4rw-myexample + |-- foobar -> /nix/store/6lzdpxshx78281vy056lbk553ijsdr44-stack-2.1.3.1 + `-- hello-test -> /nix/store/qy93dp4a3rqyn2mz63fbxjg228hffwyw-hello-2.10 + + + See the note on symlinkJoin for the difference between linkFarm and symlinkJoin. */ linkFarm = name: entries: let @@ -510,56 +568,67 @@ rec { ''; /* - * Easily create a linkFarm from a set of derivations. - * - * This calls linkFarm with a list of entries created from the list of input - * derivations. It turns each input derivation into an attribute set - * like { name = drv.name ; path = drv }, and passes this to linkFarm. - * - * Example: - * - * # Symlinks the hello, gcc, and ghc derivations in $out - * linkFarmFromDrvs "myexample" [ pkgs.hello pkgs.gcc pkgs.ghc ] - * - * This creates a derivation with a directory structure like the following: - * - * /nix/store/m3s6wkjy9c3wy830201bqsb91nk2yj8c-myexample - * |-- gcc-wrapper-9.2.0 -> /nix/store/fqhjxf9ii4w4gqcsx59fyw2vvj91486a-gcc-wrapper-9.2.0 - * |-- ghc-8.6.5 -> /nix/store/gnf3s07bglhbbk4y6m76sbh42siym0s6-ghc-8.6.5 - * `-- hello-2.10 -> /nix/store/k0ll91c4npk4lg8lqhx00glg2m735g74-hello-2.10 - */ + Easily create a linkFarm from a set of derivations. + + This calls linkFarm with a list of entries created from the list of input + derivations. It turns each input derivation into an attribute set + like { name = drv.name ; path = drv }, and passes this to linkFarm. + + Example: + + # Symlinks the hello, gcc, and ghc derivations in $out + linkFarmFromDrvs "myexample" [ pkgs.hello pkgs.gcc pkgs.ghc ] + + This creates a derivation with a directory structure like the following: + + + /nix/store/m3s6wkjy9c3wy830201bqsb91nk2yj8c-myexample + |-- gcc-wrapper-9.2.0 -> /nix/store/fqhjxf9ii4w4gqcsx59fyw2vvj91486a-gcc-wrapper-9.2.0 + |-- ghc-8.6.5 -> /nix/store/gnf3s07bglhbbk4y6m76sbh42siym0s6-ghc-8.6.5 + `-- hello-2.10 -> /nix/store/k0ll91c4npk4lg8lqhx00glg2m735g74-hello-2.10 + + */ linkFarmFromDrvs = name: drvs: let mkEntryFromDrv = drv: { name = drv.name; path = drv; }; in linkFarm name (map mkEntryFromDrv drvs); /* - * Make a package that just contains a setup hook with the given contents. - * This setup hook will be invoked by any package that includes this package - * as a buildInput. Optionally takes a list of substitutions that should be - * applied to the resulting script. - * - * Examples: - * # setup hook that depends on the hello package and runs ./myscript.sh - * myhellohook = makeSetupHook { deps = [ hello ]; } ./myscript.sh; - * - * # writes a Linux-exclusive setup hook where @bash@ myscript.sh is substituted for the - * # bash interpreter. - * myhellohookSub = makeSetupHook { - * deps = [ hello ]; - * substitutions = { bash = "${pkgs.bash}/bin/bash"; }; - * meta.platforms = lib.platforms.linux; - * } ./myscript.sh; - * - * # setup hook with a package test - * myhellohookTested = makeSetupHook { - * deps = [ hello ]; - * substitutions = { bash = "${pkgs.bash}/bin/bash"; }; - * meta.platforms = lib.platforms.linux; - * passthru.tests.greeting = callPackage ./test { }; - * } ./myscript.sh; + Make a package that just contains a setup hook with the given contents. + This setup hook will be invoked by any package that includes this package + as a buildInput. Optionally takes a list of substitutions that should be + applied to the resulting script. + + Examples: + # setup hook that depends on the hello package and runs ./myscript.sh + myhellohook = makeSetupHook { deps = [ hello ]; } ./myscript.sh; + + # writes a Linux-exclusive setup hook where @bash@ myscript.sh is substituted for the + # bash interpreter. + myhellohookSub = makeSetupHook { + name = "myscript-hook"; + deps = [ hello ]; + substitutions = { bash = "${pkgs.bash}/bin/bash"; }; + meta.platforms = lib.platforms.linux; + } ./myscript.sh; + + # setup hook with a package test + myhellohookTested = makeSetupHook { + name = "myscript-hook"; + deps = [ hello ]; + substitutions = { bash = "${pkgs.bash}/bin/bash"; }; + meta.platforms = lib.platforms.linux; + passthru.tests.greeting = callPackage ./test { }; + } ./myscript.sh; */ - makeSetupHook = { name ? "hook", deps ? [], substitutions ? {}, meta ? {}, passthru ? {} }: script: + makeSetupHook = + { name ? lib.warn "calling makeSetupHook without passing a name is deprecated." "hook" + , deps ? [] + , substitutions ? {} + , meta ? {} + , passthru ? {} + }: + script: runCommand name (substitutions // { inherit meta; @@ -627,27 +696,27 @@ rec { /* - * Extract a string's references to derivations and paths (its - * context) and write them to a text file, removing the input string - * itself from the dependency graph. This is useful when you want to - * make a derivation depend on the string's references, but not its - * contents (to avoid unnecessary rebuilds, for example). - * - * Note that this only works as intended on Nix >= 2.3. + Extract a string's references to derivations and paths (its + context) and write them to a text file, removing the input string + itself from the dependency graph. This is useful when you want to + make a derivation depend on the string's references, but not its + contents (to avoid unnecessary rebuilds, for example). + + Note that this only works as intended on Nix >= 2.3. */ writeStringReferencesToFile = string: /* - * The basic operation this performs is to copy the string context - * from `string' to a second string and wrap that string in a - * derivation. However, that alone is not enough, since nothing in the - * string refers to the output paths of the derivations/paths in its - * context, meaning they'll be considered build-time dependencies and - * removed from the wrapper derivation's closure. Putting the - * necessary output paths in the new string is however not very - * straightforward - the attrset returned by `getContext' contains - * only references to derivations' .drv-paths, not their output - * paths. In order to "convert" them, we try to extract the - * corresponding paths from the original string using regex. + The basic operation this performs is to copy the string context + from `string' to a second string and wrap that string in a + derivation. However, that alone is not enough, since nothing in the + string refers to the output paths of the derivations/paths in its + context, meaning they'll be considered build-time dependencies and + removed from the wrapper derivation's closure. Putting the + necessary output paths in the new string is however not very + straightforward - the attrset returned by `getContext' contains + only references to derivations' .drv-paths, not their output + paths. In order to "convert" them, we try to extract the + corresponding paths from the original string using regex. */ let # Taken from https://github.com/NixOS/nix/blob/130284b8508dad3c70e8160b15f3d62042fc730a/src/libutil/hash.cc#L84 @@ -709,18 +778,19 @@ rec { /* Print an error message if the file with the specified name and - * hash doesn't exist in the Nix store. This function should only - * be used by non-redistributable software with an unfree license - * that we need to require the user to download manually. It produces - * packages that cannot be built automatically. - * - * Examples: - * - * requireFile { - * name = "my-file"; - * url = "http://example.com/download/"; - * sha256 = "ffffffffffffffffffffffffffffffffffffffffffffffffffff"; - * } + hash doesn't exist in the Nix store. This function should only + be used by non-redistributable software with an unfree license + that we need to require the user to download manually. It produces + packages that cannot be built automatically. + + Example: + + requireFile { + name = "my-file"; + url = "http://example.com/download/"; + sha256 = "ffffffffffffffffffffffffffffffffffffffffffffffffffff"; + } + */ requireFile = { name ? null , sha256 ? null @@ -767,30 +837,36 @@ rec { }; - # Copy a path to the Nix store. - # Nix automatically copies files to the store before stringifying paths. - # If you need the store path of a file, ${copyPathToStore } can be - # shortened to ${}. + /* + Copy a path to the Nix store. + Nix automatically copies files to the store before stringifying paths. + If you need the store path of a file, ${copyPathToStore } can be + shortened to ${}. + */ copyPathToStore = builtins.filterSource (p: t: true); - # Copy a list of paths to the Nix store. + /* + Copy a list of paths to the Nix store. + */ copyPathsToStore = builtins.map copyPathToStore; /* Applies a list of patches to a source directory. - * - * Examples: - * - * # Patching nixpkgs: - * applyPatches { - * src = pkgs.path; - * patches = [ - * (pkgs.fetchpatch { - * url = "https://github.com/NixOS/nixpkgs/commit/1f770d20550a413e508e081ddc08464e9d08ba3d.patch"; - * sha256 = "1nlzx171y3r3jbk0qhvnl711kmdk57jlq4na8f8bs8wz2pbffymr"; - * }) - * ]; - * } + + Example: + + # Patching nixpkgs: + + applyPatches { + src = pkgs.path; + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/NixOS/nixpkgs/commit/1f770d20550a413e508e081ddc08464e9d08ba3d.patch"; + sha256 = "1nlzx171y3r3jbk0qhvnl711kmdk57jlq4na8f8bs8wz2pbffymr"; + }) + ]; + } + */ applyPatches = { src diff --git a/third_party/nixpkgs/pkgs/build-support/vm/default.nix b/third_party/nixpkgs/pkgs/build-support/vm/default.nix index 7bae2fc7cf..84754e5803 100644 --- a/third_party/nixpkgs/pkgs/build-support/vm/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/vm/default.nix @@ -527,9 +527,8 @@ rec { echo "System/kernel: $(uname -a)" if test -e /etc/fedora-release; then echo "Fedora release: $(cat /etc/fedora-release)"; fi if test -e /etc/SuSE-release; then echo "SUSE release: $(cat /etc/SuSE-release)"; fi - header "installed RPM packages" + echo "installed RPM packages" rpm -qa --qf "%{Name}-%{Version}-%{Release} (%{Arch}; %{Distribution}; %{Vendor})\n" - stopNest ''; buildPhase = '' @@ -559,9 +558,8 @@ rec { find $rpmout -name "*.rpm" -exec cp {} $out/$outDir \; for i in $out/$outDir/*.rpm; do - header "Generated RPM/SRPM: $i" + echo "Generated RPM/SRPM: $i" rpm -qip $i - stopNest done eval "$postInstall" diff --git a/third_party/nixpkgs/pkgs/data/fonts/aileron/default.nix b/third_party/nixpkgs/pkgs/data/fonts/aileron/default.nix index 4961a5e744..5ae8351927 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/aileron/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/aileron/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "102"; - pname = "aileron"; in +stdenvNoCC.mkDerivation (self: { + pname = "aileron"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-Ht48gwJZrn0djo1yl6jHZ4+0b710FVwStiC1Zk5YXME="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "04xnzdy9plzd2p02yq367h37m5ygx0w8cpkdv39cc3754ljlsxim"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "A helvetica font in nine weights"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/alkalami/default.nix b/third_party/nixpkgs/pkgs/data/fonts/alkalami/default.nix index b0b2876f5a..60e31e88c2 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/alkalami/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/alkalami/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "alkalami"; version = "2.000"; - url = "https://software.sil.org/downloads/r/alkalami/Alkalami-${version}.zip"; + src = fetchzip { + url = "https://software.sil.org/downloads/r/alkalami/Alkalami-${version}.zip"; + hash = "sha256-rT0HzTFbooHr+l5BQ9GVYKxxNk7TESdkOQfWBeVpwYI="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - rm -rf $out/web $out/manifest.json mkdir -p $out/share/{doc/${pname},fonts/truetype} - mv $out/*.ttf $out/share/fonts/truetype/ - mv $out/*.txt $out/documentation $out/share/doc/${pname}/ - ''; + mv *.ttf $out/share/fonts/truetype/ + mv *.txt documentation $out/share/doc/${pname}/ - sha256 = "sha256-GjX3YOItLKSMlRjUbBgGp2D7QS/pOJQYuQJzW+iqBNo="; + runHook postInstall + ''; meta = with lib; { homepage = "https://software.sil.org/alkalami/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/amiri/default.nix b/third_party/nixpkgs/pkgs/data/fonts/amiri/default.nix index 87185e8469..bfd7c60bf5 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/amiri/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/amiri/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "amiri"; version = "1.000"; -in fetchzip rec { - name = "Amiri-${version}"; + src = fetchzip { + url = "https://github.com/alif-type/amiri/releases/download/${version}/Amiri-${version}.zip"; + hash = "sha256-WXxKLYIIKe01WWZrI1aLOv65wRgn7aqHl6Codf4foVw="; + }; - url = "https://github.com/alif-type/amiri/releases/download/${version}/${name}.zip"; + installPhase = '' + runHook preInstall - sha256 = "sha256-hG6m/zsGoGF5/xhHz9EHVL9Sg9dlQqfXpQ/lqNyI1vU="; - - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype/ - mkdir -p $out/share/doc/${name} - mv $out/{*.html,*.txt,*.md} $out/share/doc/${name}/ + mv *.ttf $out/share/fonts/truetype/ + mkdir -p $out/share/doc/${pname}-${version} + mv {*.html,*.txt,*.md} $out/share/doc/${pname}-${version}/ + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/andagii/default.nix b/third_party/nixpkgs/pkgs/data/fonts/andagii/default.nix index 2995f85f93..22b686684f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/andagii/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/andagii/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "andagii"; version = "1.0.2"; -in (fetchzip { - name = "andagii-${version}"; - url = "http://www.i18nguy.com/unicode/andagii.zip"; - curlOpts = "--user-agent 'Mozilla/5.0'"; - sha256 = "0j5kf2fmyqgnf5ji6h0h79lq9n9d85hkfrr4ya8hqj4gwvc0smb2"; + src = fetchzip { + url = "http://www.i18nguy.com/unicode/andagii.zip"; + curlOpts = "--user-agent 'Mozilla/5.0'"; + hash = "sha256-U7wC55G8jIvMMyPcEiJQ700A7nkWdgWK1LM0F/wgDCg="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf + + runHook postInstall + ''; # There are multiple claims that the font is GPL, so I include the # package; but I cannot find the original source, so use it on your @@ -20,10 +29,4 @@ in (fetchzip { license = "unknown"; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - mkdir -p $out/share/fonts/truetype - cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/andika/default.nix b/third_party/nixpkgs/pkgs/data/fonts/andika/default.nix index 5f2e6640d2..92757d303c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/andika/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/andika/default.nix @@ -1,33 +1,33 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "andika"; version = "6.101"; - name = "andika-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/andika/Andika-${version}.zip"; + hash = "sha256-LghkGd/cjuXghzsU9X/YneNIdBeDEnu0ARszipANm8w="; + }; - sha256 = "sha256-J/Ad+fmCMOxLoo+691LE6Bgi/l3ovIfWScwwVWtqACI="; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://software.sil.org/andika"; - description = "A family designed especially for literacy use taking into account the needs of beginning readers"; - longDescription = '' + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/andika"; + description = "A family designed especially for literacy use taking into account the needs of beginning readers"; + longDescription = '' Andika is a sans serif, Unicode-compliant font designed especially for literacy use, taking into account the needs of beginning readers. The focus is on clear, easy-to-perceive letterforms that will not be readily confused with one another. A sans serif font is preferred by some literacy personnel for teaching people to read. Its forms are simpler and less cluttered than those of most serif fonts. For years, literacy workers have had to make do with fonts that were not really suitable for beginning readers and writers. In some cases, literacy specialists have had to tediously assemble letters from a variety of fonts in order to get all of the characters they need for their particular language project, resulting in confusing and unattractive publications. Andika addresses those issues. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.f--t ]; - }; - }).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - }) + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.f--t ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/ankacoder/condensed.nix b/third_party/nixpkgs/pkgs/data/fonts/ankacoder/condensed.nix index 655c780129..676c3cf856 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ankacoder/condensed.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ankacoder/condensed.nix @@ -1,17 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let version = "1.100"; in -fetchzip { - name = "ankacoder-condensed-${version}"; - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip"; +stdenvNoCC.mkDerivation rec { + pname = "ankacoder-condensed"; + version = "1.100"; + + src = fetchzip { + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip"; + stripRoot = false; + hash = "sha256-NHrkV4Sb7i+DC4e4lToEYzah3pI+sKyYf2rGbhWj7iY="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - unzip $downloadedFile mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype - ''; - sha256 = "0i80zpr2y9368rg2i6x8jv0g7d03kdyr5h7w9yz7pjd7i9xd8439"; + runHook postInstall + ''; meta = with lib; { description = "Anka/Coder Condensed font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/ankacoder/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ankacoder/default.nix index afbd80674c..c363f025bf 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ankacoder/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ankacoder/default.nix @@ -1,12 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let version = "1.100"; in -(fetchzip { - name = "ankacoder-${version}"; - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoder.${version}.zip"; +stdenvNoCC.mkDerivation rec { + pname = "ankacoder"; + version = "1.100"; - sha256 = "1jqx9micfmiarqh9xp330gl96v3vxbwzz9cmg2vi845n9md4im85"; + src = fetchzip { + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoder.${version}.zip"; + stripRoot = false; + hash = "sha256-14ItaSQ/fO/WDq0O4SXGWnZgiM0kayJrWQgsKb7bsyY="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "Anka/Coder fonts"; @@ -15,10 +26,4 @@ let version = "1.100"; in maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/annapurna-sil/default.nix b/third_party/nixpkgs/pkgs/data/fonts/annapurna-sil/default.nix index 6eff39cf1a..59957bb700 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/annapurna-sil/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/annapurna-sil/default.nix @@ -1,31 +1,31 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "annapurna-sil"; version = "1.204"; - name = "annapurna-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/annapurna/AnnapurnaSIL-${version}.zip"; + hash = "sha256-4ya3Iydrz5Pvol9sTDIe9ZW5k3+XQp8GB2LAnRpeiXs="; + }; - sha256 = "sha256-kVeP9ZX8H+Wn6jzmH1UQvUKY6vJjadMTdEusS7LodFM="; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://software.sil.org/annapurna"; - description = "Unicode-based font family with broad support for writing systems that use the Devanagari script"; - longDescription = '' - Annapurna SIL is a Unicode-based font family with broad support for writing systems that use the Devanagari script. Inspired by traditional calligraphic forms, the design is intended to be highly readable, reasonably compact, and visually attractive. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.kmein ]; - }; - }).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/annapurna"; + description = "Unicode-based font family with broad support for writing systems that use the Devanagari script"; + longDescription = '' + Annapurna SIL is a Unicode-based font family with broad support for writing systems that use the Devanagari script. Inspired by traditional calligraphic forms, the design is intended to be highly readable, reasonably compact, and visually attractive. ''; - }) + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.kmein ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/anonymous-pro/default.nix b/third_party/nixpkgs/pkgs/data/fonts/anonymous-pro/default.nix index cb6ec6d894..f498e2780b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/anonymous-pro/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/anonymous-pro/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "anonymouspro"; version = "1.002"; -in fetchzip rec { - name = "anonymousPro-${version}"; - url = "http://www.marksimonson.com/assets/content/fonts/AnonymousPro-${version}.zip"; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}" + src = fetchzip { + url = "https://www.marksimonson.com/assets/content/fonts/AnonymousPro-${lib.replaceStrings ["."] ["_"] version}.zip"; + hash = "sha256-FhyzV4By8XKN9EyukAknzml/7lUuV6Evnt6Ht3H6TUU="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "05rgzag38qc77b31sm5i2vwwrxbrvwzfsqh3slv11skx36pz337f"; meta = with lib; { homepage = "https://www.marksimonson.com/fonts/view/anonymous-pro"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/arkpandora/default.nix b/third_party/nixpkgs/pkgs/data/fonts/arkpandora/default.nix index 259ac0141b..81a175b944 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/arkpandora/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/arkpandora/default.nix @@ -1,23 +1,26 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "arkpandora"; version = "2.04"; -in fetchurl { - name = "arkpandora-${version}"; - urls = [ - "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz" - "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz" - "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz" - ]; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 + src = fetchurl { + urls = [ + "http://distcache.FreeBSD.org/ports-distfiles/ttf-arkpandora-${version}.tgz" + "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz" + "http://www.users.bigpond.net.au/gavindi/ttf-arkpandora-${version}.tgz" + ]; + hash = "sha256-ofyVPJjQD8w+8WgETF2UcJlfbSsKQgBsH3ob+yjvrpo="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "177k0fbs0787al0snkl8w68d2qkg7snnnq6qp28j9s98vaabs04k"; meta = { description = "Font, metrically identical to Arial and Times New Roman"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/arphic/default.nix b/third_party/nixpkgs/pkgs/data/fonts/arphic/default.nix index 02e2a2de41..ed55855e43 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/arphic/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/arphic/default.nix @@ -1,22 +1,33 @@ -{ lib, fetchzip, mkfontscale, mkfontdir }: +{ lib, stdenvNoCC, fetchurl, mkfontdir, mkfontscale }: let version = "0.2.20080216.2"; -in { - arphic-ukai = fetchzip { - name = "arphic-ukai-${version}"; +in +{ + arphic-ukai = stdenvNoCC.mkDerivation rec { + pname = "arphic-ukai"; + inherit version; - url = "mirror://ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2"; + src = fetchurl { + url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-tJaNc1GfT4dH6FVI+4XSG2Zdob8bqQCnxJmXbmqK49I="; + }; + + nativeBuildInputs = [ + mkfontscale + mkfontdir + ]; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xjvf $downloadedFile --strip-components=1 install -D -v ukai.ttc $out/share/fonts/truetype/arphic-ukai.ttc cd $out/share/fonts - ${mkfontdir}/bin/mkfontdir - ${mkfontscale}/bin/mkfontscale - ''; + mkfontdir + mkfontscale - sha256 = "0xi5ycm7ydzpn7cqxv1kcj9vd70nr9wn8v27hmibyjc25y2qdmzl"; + runHook postInstall + ''; meta = with lib; { description = "CJK Unicode font Kai style"; @@ -28,20 +39,30 @@ in { }; }; - arphic-uming = fetchzip { - name = "arphic-uming-${version}"; + arphic-uming = stdenvNoCC.mkDerivation rec { + pname = "arphic-uming"; + inherit version; - url = "mirror://ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2"; + src = fetchurl { + url = "mirror://ubuntu/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-48GeBOp6VltKz/bx5CSAhNLhB1LjBb991sdugIYNwds="; + }; + + nativeBuildInputs = [ + mkfontscale + mkfontdir + ]; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xjvf $downloadedFile --strip-components=1 install -D -v uming.ttc $out/share/fonts/truetype/arphic-uming.ttc cd $out/share/fonts - ${mkfontdir}/bin/mkfontdir - ${mkfontscale}/bin/mkfontscale - ''; + mkfontdir + mkfontscale - sha256 = "16jybvj1cxamm682caj6nsm6l5c60x9mgchp1l2izrw2rvc8x38d"; + runHook postInstall + ''; meta = with lib; { description = "CJK Unicode font Ming style"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/atkinson-hyperlegible/default.nix b/third_party/nixpkgs/pkgs/data/fonts/atkinson-hyperlegible/default.nix index 8b2b045537..e8b09cfb63 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/atkinson-hyperlegible/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/atkinson-hyperlegible/default.nix @@ -1,21 +1,22 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "atkinson-hyperlegible"; version = "unstable-2021-04-29"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "googlefonts"; - repo = "atkinson-hyperlegible"; - rev = "1cb311624b2ddf88e9e37873999d165a8cd28b46"; - sha256 = "sha256-urSTqC3rfDRM8IMG+edwKEe7NPiTuDZph3heGHzLDks="; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "atkinson-hyperlegible"; + rev = "1cb311624b2ddf88e9e37873999d165a8cd28b46"; + hash = "sha256-RN4m5gyY2OiPzRXgFVQ3pq6JdkPcMxV4fRlX2EK+gOM="; + }; - postFetch = '' - install -Dm644 -t $out/share/fonts/opentype $out/fonts/otf/* - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/share/fonts/opentype fonts/otf/* + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/aurulent-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/aurulent-sans/default.nix index 50f456373c..f1ee19b3b1 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/aurulent-sans/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/aurulent-sans/default.nix @@ -1,15 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "aurulent-sans-0.1"; - owner = "deepfire"; - repo = "hartke-aurulent-sans"; - rev = name; - postFetch = '' - mkdir -p $out/share/fonts - tar xf $downloadedFile -C $out/share/fonts --strip=1 +stdenvNoCC.mkDerivation rec { + pname = "aurulent-sans"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "deepfire"; + repo = "hartke-aurulent-sans"; + rev = "${pname}-${version}"; + hash = "sha256-M/duhgqxXZJq5su9FrsGjZdm+wtO5B5meoDomde+GwY="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts + + runHook postInstall ''; - sha256 = "1l60psfv9x0x9qx9vp1qnhmck7a7kks385m5ycrd3d91irz1j5li"; meta = { description = "Aurulent Sans"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/b612/default.nix b/third_party/nixpkgs/pkgs/data/fonts/b612/default.nix index c38329227f..b78f3a9e85 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/b612/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/b612/default.nix @@ -1,25 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { +stdenvNoCC.mkDerivation rec { pname = "b612"; version = "1.008"; - owner = "polarsys"; - repo = "b612"; - rev = version; + src = fetchFromGitHub { + owner = "polarsys"; + repo = "b612"; + rev = version; + hash = "sha256-uyBC8UNOwztCHXhR9XZuWDwrty0eClbo0E+gI1PmjEg="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype + mv fonts/ttf/*.ttf $out/share/fonts/truetype - mv $out/fonts/ttf/*.ttf $out/share/fonts/truetype - - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + runHook postInstall ''; - hash = "sha256-aJ3XzWQauPsWwEDAHT2rD9a8RvLv1kqU3krFXprmypk="; - meta = with lib; { homepage = "https://b612-font.com/"; description = "Highly legible font family for use on aircraft cockpit screens"; @@ -36,8 +36,8 @@ fetchFromGitHub rec { variants of the font. This one, baptized B612 in reference to the imaginary asteroid of the aviator Saint‑Exupéry, benefited from a complete hinting on all the characters. - ''; - license = with licenses; [ ofl epl10 bsd3 ] ; + ''; + license = with licenses; [ ofl epl10 bsd3 ]; maintainers = with maintainers; [ leenaars ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/data/fonts/babelstone-han/default.nix b/third_party/nixpkgs/pkgs/data/fonts/babelstone-han/default.nix index 7ec429036b..9839295653 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/babelstone-han/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/babelstone-han/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { + pname = "babelstone-han"; version = "13.0.3"; -in (fetchzip { - name = "babelstone-han-${version}"; - # upstream download links are unversioned, so hash changes - url = "https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip"; - sha256 = "018isk3hbzsihzrxavgjbn485ngzvlm96npqx9y7zpkxsssslc4w"; + src = fetchzip { + # upstream download links are unversioned, so hash changes + url = "https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip"; + hash = "sha256-LLhNtHu2hh5DY2XVSrLuVzzR6OtMdSSHetyA0k1IFs0="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "Unicode CJK font with over 36000 Han characters"; @@ -18,9 +27,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ emily ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/truetype - unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/baekmuk-ttf/default.nix b/third_party/nixpkgs/pkgs/data/fonts/baekmuk-ttf/default.nix index 92f7401b32..3777f69fa5 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -1,15 +1,22 @@ -{ fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip rec { - name = "baekmuk-ttf-2.2"; +stdenvNoCC.mkDerivation rec { + pname = "baekmuk-ttf"; + version = "2.2"; + + src = fetchurl { + url = "http://kldp.net/baekmuk/release/865-${pname}-${version}.tar.gz"; + hash = "sha256-CKt9/7VdWIfMlCzjcPXjO3VqVfu06vC5DyRAcOjVGII="; + }; + + installPhase = '' + runHook preInstall - url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz"; - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts ttf/*.ttf - install -m444 -Dt $out/share/doc/${name} COPYRIGHT* + install -m444 -Dt $out/share/doc/${pname}-${version} COPYRIGHT* + + runHook postInstall ''; - sha256 = "1jgsvack1l14q8lbcv4qhgbswi30mf045k37rl772hzcmx0r206g"; meta = { description = "Korean font"; @@ -17,4 +24,3 @@ fetchzip rec { license = "BSD-like"; }; } - diff --git a/third_party/nixpkgs/pkgs/data/fonts/bakoma-ttf/default.nix b/third_party/nixpkgs/pkgs/data/fonts/bakoma-ttf/default.nix index a8c01b41e6..1d305674e6 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/bakoma-ttf/default.nix @@ -1,17 +1,23 @@ -{ fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "bakoma-ttf"; +stdenvNoCC.mkDerivation rec { + pname = "bakoma-ttf"; + version = "2.2"; - url = "http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; + src = fetchurl { + name = "${pname}.tar.bz2"; + url = "http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; + hash = "sha256-dYaUMneFn1yC5lIMSLQSNmFRW16AdUXGqWBobzAbPsg="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xjvf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp ttf/*.ttf $out/share/fonts/truetype - ''; - sha256 = "0g7i723n00cqx2va05z1h6v3a2ar69gqw4hy6pjj7m0ml906rngc"; + runHook postInstall + ''; meta = { description = "TrueType versions of the Computer Modern and AMS TeX Fonts"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/barlow/default.nix b/third_party/nixpkgs/pkgs/data/fonts/barlow/default.nix index aa618140b1..e9bfa4dee3 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/barlow/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/barlow/default.nix @@ -1,14 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "barlow"; version = "1.422"; -in -(fetchzip rec { - name = "barlow-${version}"; - url = "https://tribby.com/fonts/barlow/download/barlow-${version}.zip"; + src = fetchzip { + url = "https://tribby.com/fonts/barlow/download/barlow-${version}.zip"; + stripRoot = false; + hash = "sha256-aHAGPEgBkH41r7HR0D74OGCa7ta7Uo8Mgq4YVtYOwU8="; + }; - sha256 = "08ld4c3zq4d1px07lc64i7l8848zsc61ddy3654w2sh0hx5sm5ld"; + installPhase = '' + runHook preInstall + + install -Dm644 fonts/otf/*.otf -t $out/share/fonts/opentype + install -Dm644 fonts/ttf/*.ttf fonts/gx/*.ttf -t $out/share/fonts/truetype + install -Dm644 fonts/eot/*.eot -t $out/share/fonts/eot + install -Dm644 fonts/woff/*.woff -t $out/share/fonts/woff + install -Dm644 fonts/woff2/*.woff2 -t $out/share/fonts/woff2 + + runHook postInstall + ''; meta = with lib; { description = "A grotesk variable font superfamily"; @@ -17,13 +29,4 @@ in maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.eot -d $out/share/fonts/eot - unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff - unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix index be6ed005b1..143975f28d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/behdad-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "behdad-fonts"; version = "0.0.3"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "font-store"; - repo = "BehdadFont"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "font-store"; + repo = "BehdadFont"; + rev = "v${version}"; + hash = "sha256-gKfzxo3/bCMKXl2d6SP07ahIiNrUyrk/SN5XLND2lWY="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/behrad-fonts {} \; + + runHook postInstall ''; - sha256 = "0c57232462cv1jrfn0m2bl7jzcfkacirrdd2qimrc8iqhkz0ajfz"; meta = with lib; { homepage = "https://github.com/font-store/BehdadFont"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/borg-sans-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/borg-sans-mono/default.nix index 0f5de931b8..8037e5dc64 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/borg-sans-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/borg-sans-mono/default.nix @@ -1,16 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { pname = "borg-sans-mono"; version = "0.2.0"; -in -(fetchzip { - name = "${pname}-${version}"; - # https://github.com/marnen/borg-sans-mono/issues/19 - url = "https://github.com/marnen/borg-sans-mono/files/107663/BorgSansMono.ttf.zip"; - sha256 = "1gz4ab0smw76ih5cs2l3n92c77nv7ld5zghq42avjsfhxrc2n5ri"; + src = fetchzip { + # https://github.com/marnen/borg-sans-mono/issues/19 + url = "https://github.com/marnen/borg-sans-mono/files/107663/BorgSansMono.ttf.zip"; + hash = "sha256-nn7TGeVm45t7QI8+eEREBTFg9aShYYKtdEYEwQwO2fQ="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "Droid Sans Mono Slashed + Hasklig-style ligatures"; @@ -19,9 +25,4 @@ in platforms = platforms.all; maintainers = with maintainers; [ atila ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/cabin/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cabin/default.nix index e68d429db2..186a5359c4 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cabin/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cabin/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "cabin-1.005"; +stdenvNoCC.mkDerivation rec { + pname = "cabin"; + version = "1.005"; - owner = "impallari"; - repo = "Cabin"; - rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Cabin"; + rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; + hash = "sha256-9l4QcwCot340Bq41ER68HSZGQ9h0opyzgG3DG/fVZ5s="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype fonts/OTF/*.otf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "1bl7h217m695jn4rbniialfk573aa44fslp2rjxnhkicakpcm44h"; + runHook postInstall + ''; meta = with lib; { description = "A humanist sans with 4 weights and true italics"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/caladea/default.nix b/third_party/nixpkgs/pkgs/data/fonts/caladea/default.nix index 14a8de1b0d..bd00e80730 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/caladea/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/caladea/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "caladea"; version = "20130214"; -in fetchzip { - name = "caladea-${version}"; - url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 + src = fetchurl { + url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz"; + hash = "sha256-xI0cL9YTycBslZw02nuDiAWeJAjSuxmEXcPtNfduTQk="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype cp -v ${./cambria-alias.conf} $out/etc/fonts/conf.d/30-cambria.conf + + runHook postInstall ''; - sha256 = "0kwm42ggr8kvcn3554cpmv90xzam1sdncx7x3zs3bzp88mxrnv1z"; meta = with lib; { # This font doesn't appear to have any official web site but this @@ -27,7 +32,7 @@ in fetchzip { ''; license = licenses.asl20; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; # Reduce the priority of this package. The intent is that if you # also install the `vista-fonts` package, then you probably will diff --git a/third_party/nixpkgs/pkgs/data/fonts/camingo-code/default.nix b/third_party/nixpkgs/pkgs/data/fonts/camingo-code/default.nix index 626ff9f1c0..c852303021 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/camingo-code/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/camingo-code/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "camingo-code"; version = "1.0"; -in fetchzip rec { - name = "camingo-code-${version}"; - url = "https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip"; - postFetch = '' - install -Dm644 $out/camingo-code/*.ttf -t $out/share/fonts/truetype - install -Dm644 $out/camingo-code/*.txt -t $out/share/doc/${name} - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + src = fetchzip { + url = "https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip"; + hash = "sha256-oo5pWDq6h0bmyGvfF9Bkh7WyjKX4dG8uclfIsWLhDw8="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 camingo-code/*.ttf -t $out/share/fonts/truetype + install -Dm644 camingo-code/*.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "sha256-/vDNuR034stmiCZ9jUH5DlTQJn0WccLY5treoziXOJo="; meta = with lib; { homepage = "https://www.myfonts.com/fonts/jan-fromm/camingo-code/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/cardo/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cardo/default.nix index 21763365de..c862ea7ce8 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cardo/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cardo/default.nix @@ -1,20 +1,22 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { + pname = "cardo"; version = "1.04"; -in -fetchzip { - name = "cardo-${version}"; - url = "http://scholarsfonts.net/cardo104.zip"; + src = fetchzip { + url = "https://scholarsfonts.net/cardo104.zip"; + stripRoot = false; + hash = "sha256-NU6/H5f0JBlVo3L3uUcl7IvNxPMXD8UQY9k5o2YA5Vo="; + }; - hash = "sha256-eBK6+VQpreWA7jIneNXOcKFcT+cJzhoQ9XXyq93SZ8M="; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype - rm $out/*.pdf + mv *.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/carlito/default.nix b/third_party/nixpkgs/pkgs/data/fonts/carlito/default.nix index 0ecd3f85c6..283eb21a17 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/carlito/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/carlito/default.nix @@ -1,18 +1,18 @@ -{ lib, fetchzip, stdenvNoCC }: +{ lib, fetchurl, stdenvNoCC }: stdenvNoCC.mkDerivation rec { pname = "carlito"; version = "20130920"; - src = fetchzip { + src = fetchurl { url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz"; - sha256 = "sha256-OGDO5WoF7OmiRdLRRrIXMzg276Pgeq1L3Offcl0W2jg="; + sha256 = "sha256-S9ErbLwyHBzxbaduLFhcklzpVqCAZ65vbGTv9sz9r1o="; }; installPhase = '' mkdir -p $out/etc/fonts/conf.d mkdir -p $out/share/fonts/truetype - cp -v $src/*.ttf $out/share/fonts/truetype + cp -v *.ttf $out/share/fonts/truetype cp -v ${./calibri-alias.conf} $out/etc/fonts/conf.d/30-calibri.conf ''; @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec { ''; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; # Reduce the priority of this package. The intent is that if you # also install the `vista-fonts` package, then you probably will diff --git a/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix index 112f7c8d7d..df1af86d5c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "cascadia-code"; version = "2111.01"; -in -(fetchzip { - name = "cascadia-code-${version}"; - url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; + src = fetchzip { + url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; + stripRoot = false; + hash = "sha256-v9Vm5X80wEvorMhIlRw3MnyuSOdBpTl9ibBPpmm1vig="; + }; - sha256 = "sha256-kUVTQ/oMZztNf22sDbQBpQW0luSc5nr5sxWU5etLDec="; + installPhase = '' + runHook preInstall + + install -Dm644 otf/static/*.otf -t $out/share/fonts/opentype + install -Dm644 ttf/static/*.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal"; @@ -18,10 +27,4 @@ in maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/ccsymbols/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ccsymbols/default.nix index a32d35a088..f31dc65a8a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ccsymbols/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ccsymbols/default.nix @@ -1,23 +1,24 @@ -{ lib, fetchurl, unzip }: +{ lib, stdenvNoCC, fetchurl, unzip }: -let +stdenvNoCC.mkDerivation rec { pname = "ccsymbols"; version = "2020-04-19"; -in -fetchurl rec { - name = "${pname}-${version}"; + src = fetchurl { + url = "https://www.ctrl.blog/file/${version}_cc-symbols.zip"; + hash = "sha256-hkARhb8T6VgGAybYkVuPuebjhuk1dwiBJ1bZMwvYpMY="; + }; - url = "https://www.ctrl.blog/file/${version}_cc-symbols.zip"; - sha256 = "sha256-mrNgTS6BAVJrIz9fHOjf8pkSbZtZ55UjyoL9tQ1fiA8="; - recursiveHash = true; + sourceRoot = "."; nativeBuildInputs = [ unzip ]; - downloadToTemp = true; - postFetch = '' - mkdir -p "$out/share/fonts/ccsymbols" - unzip -d "$out/share/fonts/ccsymbols" "$downloadedFile" + installPhase = '' + runHook preInstall + + install -Dm644 CCSymbols.* -t $out/share/fonts/ccsymbols + + runHook postInstall ''; passthru = { inherit pname version; }; diff --git a/third_party/nixpkgs/pkgs/data/fonts/charis-sil/default.nix b/third_party/nixpkgs/pkgs/data/fonts/charis-sil/default.nix index 533f40a9a0..52c32fcc3d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/charis-sil/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/charis-sil/default.nix @@ -1,33 +1,33 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "charis-sil"; version = "6.101"; - name = "charis-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/charis/CharisSIL-${version}.zip"; + hash = "sha256-Rf5eKQVZw7zgTv6KkJUdNdd4sSJPdvjy/GDLusvlgzE="; + }; - sha256 = "sha256-b1ms9hJ6IPe7W6O9KgzHZvwT4/nAoLOhdydcUrwNfnU="; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://software.sil.org/charis"; - description = "A family of highly readable fonts for broad multilingual use"; - longDescription = '' + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/charis"; + description = "A family of highly readable fonts for broad multilingual use"; + longDescription = '' This Charis SIL font is essentially the same design as the SIL Charis font first released by SIL in 1997. Charis is similar to Bitstream Charter, one of the first fonts designed specifically for laser printers. It is highly readable and holds up well in less-than-ideal reproduction environments. It also has a full set of styles – regular, italic, bold, bold italic. Charis is a serif, proportionally-spaced font optimized for readability in long printed documents. The goal for this product was to provide a single Unicode-based font family that would contain a comprehensive inventory of glyphs needed for almost any Roman- or Cyrillic-based writing system, whether used for phonetic or orthographic needs. In addition, there is provision for other characters and symbols useful to linguists. This font makes use of state-of-the-art font technologies to support complex typographic issues, such as the need to position arbitrary combinations of base glyphs and diacritics optimally. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.f--t ]; - }; - }).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - }) + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.f--t ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/cm-unicode/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cm-unicode/default.nix index 3248813c3c..fc59baa5f9 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cm-unicode/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cm-unicode/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "cm-unicode"; version = "0.7.0"; -in fetchzip rec { - name = "cm-unicode-${version}"; - url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${name}-otf.tar.xz"; + src = fetchurl { + url = "mirror://sourceforge/cm-unicode/cm-unicode/${version}/${pname}-${version}-otf.tar.xz"; + hash = "sha256-VIp+vk1IYbEHW15wMrfGVOPqg1zBZDpgFx+jlypOHCg="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xJvf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/opentype *.otf - install -m444 -Dt $out/share/doc/${name} README FontLog.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README FontLog.txt - sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn"; + runHook postInstall + ''; meta = with lib; { homepage = "https://cm-unicode.sourceforge.io/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/cnstrokeorder/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cnstrokeorder/default.nix index 965bf119f6..66803b1b63 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cnstrokeorder/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cnstrokeorder/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "cnstrokeorder"; version = "0.0.4.7"; -in fetchurl { - name = "cnstrokeorder-${version}"; - url = "http://rtega.be/chmn/CNstrokeorder-${version}.ttf"; + src = fetchurl { + url = "http://rtega.be/chmn/CNstrokeorder-${version}.ttf"; + hash = "sha256-YYtOcUvt1V0DwAs/vf9KltcmYCFJNirvwjGyOK4JpIY="; + }; - recursiveHash = true; - downloadToTemp = true; + dontUnpack = true; - postFetch = '' - install -D $downloadedFile $out/share/fonts/truetype/CNstrokeorder-${version}.ttf + installPhase = '' + runHook preInstall + + install -D $src $out/share/fonts/truetype/CNstrokeorder-${version}.ttf + + runHook postInstall ''; - sha256 = "0cizgfdgbq9av5c8234mysr2q54iw9pkxrmq5ga8gv32hxhl5bx4"; - meta = with lib; { description = "Chinese font that shows stroke order for HSK 1-4"; homepage = "http://rtega.be/chmn/index.php?subpage=68"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/comfortaa/default.nix b/third_party/nixpkgs/pkgs/data/fonts/comfortaa/default.nix index fc7ce56f79..f47da9fc53 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/comfortaa/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/comfortaa/default.nix @@ -1,28 +1,37 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let - version = "2021-07-29"; -in fetchFromGitHub rec { - name = "comfortaa-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "comfortaa"; + version = "unstable-2021-07-29"; - owner = "googlefonts"; - repo = "comfortaa"; - rev = "2a87ac6f6ea3495150bfa00d0c0fb53dd0a2f11b"; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = pname; + rev = "2a87ac6f6ea3495150bfa00d0c0fb53dd0a2f11b"; + postFetch = '' + # Remove the OTF fonts as they are not needed and cause a hash mismatch + rm -rf $out/fonts/{OTF,otf} + ''; + hash = "sha256-4ZBRaQyYlnt9l4NgBHezuCnR3rKTJ37L41RTbGAhd0M="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype $out/share/doc/comfortaa cp fonts/TTF/*.ttf $out/share/fonts/truetype cp FONTLOG.txt README.md $out/share/doc/comfortaa - ''; - sha256 = "12ad7qy11q49iv9h3l2d7x7y7kf0hxbqhclb92bzwig8dzly9n2k"; + runHook postInstall + ''; meta = with lib; { homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949"; description = "A clean and modern font suitable for headings and logos"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/comic-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/comic-mono/default.nix index 0c915f21c1..fc3b8d6085 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/comic-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/comic-mono/default.nix @@ -1,23 +1,27 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { + pname = "comic-mono-font"; version = "2020-12-28"; -in fetchFromGitHub { - name = "comic-mono-font-${version}"; - owner = "dtinth"; - repo = "comic-mono-font"; - rev = "9a96d04cdd2919964169192e7d9de5012ef66de4"; + src = fetchFromGitHub { + owner = "dtinth"; + repo = "comic-mono-font"; + rev = "9a96d04cdd2919964169192e7d9de5012ef66de4"; + hash = "sha256-q8NxrluWuH23FfRlntIS0MDdl3TkkGE7umcU2plS6eU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts - tar -z -f $downloadedFile --wildcards -x \*.ttf --one-top-level=$out/share/fonts + cp *.ttf $out/share/fonts mkdir -p $out/etc/fonts/conf.d ln -s ${./comic-mono-weight.conf} $out/etc/fonts/conf.d/30-comic-mono.conf - ''; - hash = "sha256-poMU+WfDZcsyWyFiiXKJ284X22CJlxQIzcJtApnIdAY="; + runHook postInstall + ''; meta = with lib; { description = "A legible monospace font that looks like Comic Sans"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/comic-relief/default.nix b/third_party/nixpkgs/pkgs/data/fonts/comic-relief/default.nix index a5eafeae89..c4c7648acd 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/comic-relief/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/comic-relief/default.nix @@ -1,15 +1,27 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "comic-relief"; version = "1.1"; - name = "comic-relief-${version}"; -in (fetchzip rec { - inherit name; - url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; + src = fetchzip { + url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; + stripRoot = false; + hash = "sha256-lvkMfaQvLMZ8F0Q5JnpmMsIAkR+XfihoHIoS4z5QEvA="; + }; - sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff"; + installPhase = '' + runHook preInstall + + mkdir -p $out/etc/fonts/conf.d + mkdir -p $out/share/doc/${pname}-${version} + mkdir -p $out/share/fonts/truetype + cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf + cp *.ttf -d $out/share/fonts/truetype + cp FONTLOG.txt -d $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "https://fontlibrary.org/en/font/comic-relief"; @@ -23,20 +35,11 @@ in (fetchzip rec { ''; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; # Reduce the priority of this package. The intent is that if you # also install the `corefonts` package, then you probably will not # want to install the font alias of this package. priority = 10; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/etc/fonts/conf.d - mkdir -p $out/share/doc/${name} - mkdir -p $out/share/fonts/truetype - cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile FONTLOG.txt -d $out/share/doc/${name} - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix index 48c7bc8734..5a3bb59c25 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cooper-hewitt/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "cooper-hewitt"; version = "unstable-2014-06-09"; - url = "https://web.archive.org/web/20221004145117/https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20221004145117/https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip"; + hash = "sha256-bTlEXQeYNNspvnNdvQhJn6CNBrcSKYWuNWF/N6+3Vb0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/opentype - mv $out/*.otf $out/share/fonts/opentype - find $out -maxdepth 1 ! -type d -exec rm {} + - ''; + mv *.otf $out/share/fonts/opentype - sha256 = "01iwqmjvqkc6fmc2r0486vk06s6f51n9wxzl1pf9z48n0igj4gqd"; + runHook postInstall + ''; meta = with lib; { homepage = "https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix index db6ac71582..f8ffc6a2b8 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix @@ -17,7 +17,7 @@ let ]; eula = fetchurl { - url = "http://corefonts.sourceforge.net/eula.htm"; + url = "https://corefonts.sourceforge.net/eula.htm"; sha256 = "1aqbcnl032g2hd7iy56cs022g47scb0jxxp3mm206x1yqc90vs1c"; }; in @@ -87,7 +87,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://corefonts.sourceforge.net/"; + homepage = "https://corefonts.sourceforge.net/"; description = "Microsoft's TrueType core fonts for the Web"; platforms = platforms.all; license = licenses.unfreeRedistributable; diff --git a/third_party/nixpkgs/pkgs/data/fonts/courier-prime/default.nix b/third_party/nixpkgs/pkgs/data/fonts/courier-prime/default.nix index 59a823727b..1226966d5e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/courier-prime/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/courier-prime/default.nix @@ -1,14 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "courier-prime"; version = "unstable-2019-12-05"; - repo = "CourierPrime"; - rev = "7f6d46a766acd9391d899090de467c53fd9c9cb0"; -in (fetchzip rec { - name = "courier-prime-${version}"; - url = "https://github.com/quoteunquoteapps/${repo}/archive/${rev}/${name}.zip"; - sha256 = "1xh4pkksm6zrafhb69q4lq093q6pl245zi9qhqw3x6c1ab718704"; + + src = fetchzip { + url = "https://github.com/quoteunquoteapps/CourierPrime/archive/7f6d46a766acd9391d899090de467c53fd9c9cb0/${pname}-${version}.zip"; + hash = "sha256-pMFZpytNtgoZrBj2Gj8SgJ0Lab8uVY5aQtcO2lFbHj4="; + }; + + installPhase = '' + runHook preInstall + + install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf + + runHook postInstall + ''; meta = with lib; { description = "Monospaced font designed specifically for screenplays"; @@ -17,9 +24,4 @@ in (fetchzip rec { maintainers = [ maintainers.austinbutler ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - install -m444 -Dt $out/share/fonts/truetype ${repo}-${rev}/fonts/ttf/*.ttf - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix index 6402cf5be5..35d24db563 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/cozette/default.nix @@ -1,15 +1,24 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "1.13.0"; -in -(fetchzip rec { - name = "Cozette-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "cozette"; + version = "1.19.0"; - url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; + src = fetchzip { + url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; + hash = "sha256-nlEnQjQJAFRvZgdGMiloMs4afugmSFnITTIHD+Qkggg="; + }; - sha256 = "sha256-xp3BCYfNUxCNewg4FfzmJnKp0PARvvnViMVwT25nWdM="; + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.otf -t $out/share/fonts/opentype + install -Dm644 *.bdf -t $out/share/fonts/misc + install -Dm644 *.otb -t $out/share/fonts/misc + + runHook postInstall + ''; meta = with lib; { description = "A bitmap programming font optimized for coziness"; @@ -18,12 +27,4 @@ in platforms = platforms.all; maintainers = with maintainers; [ brettlyons marsam ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.bdf -d $out/share/fonts/misc - unzip -j $downloadedFile \*.otb -d $out/share/fonts/misc - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/crimson-pro/default.nix b/third_party/nixpkgs/pkgs/data/fonts/crimson-pro/default.nix index d07f5c9493..29066b5ec3 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/crimson-pro/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/crimson-pro/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation { hash = "sha256-3zFB1AMcC7eNEVA2Mx1OE8rLN9zPzexZ3FtER9wH5ss="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/data/fonts/crimson/default.nix b/third_party/nixpkgs/pkgs/data/fonts/crimson/default.nix index 9400ef06cf..1868c897bd 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/crimson/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/crimson/default.nix @@ -1,25 +1,30 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { + pname = "crimson"; version = "2014.10"; -in fetchzip rec { - name = "crimson-${version}"; - url = "https://github.com/skosch/Crimson/archive/fonts-october2014.tar.gz"; + src = fetchFromGitHub { + owner = "skosch"; + repo = "Crimson"; + rev = "fonts-october2014"; + hash = "sha256-Wp9L77q93TRmrAr0P4iH9gm0tqFY0X/xSsuFcd19aAE="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xzvf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/opentype "Desktop Fonts/OTF/"*.otf - install -m444 -Dt $out/share/doc/${name} README.md - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md - sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/skosch/Crimson"; description = "A font family inspired by beautiful oldstyle typefaces"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/culmus/default.nix b/third_party/nixpkgs/pkgs/data/fonts/culmus/default.nix index 00c472d7fe..28a7f4385a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/culmus/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/culmus/default.nix @@ -1,12 +1,17 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "culmus"; version = "0.133"; -in fetchzip { - name = "culmus-${version}"; - url = "mirror://sourceforge/culmus/culmus/${version}/culmus-${version}.tar.gz"; - postFetch = '' - tar xf $downloadedFile --strip=1 + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; + hash = "sha256-wMaHN0LQdUT2us8q1S65yzkpdNVkJ5ONwd+8g5nGTQU="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/{truetype,type1} cp -v *.pfa $out/share/fonts/type1/ cp -v *.afm $out/share/fonts/type1/ @@ -14,8 +19,9 @@ in fetchzip { cp -v *.ttf $out/share/fonts/truetype/ cp -v *.otf $out/share/fonts/truetype/ cp -v fonts.scale-ttf $out/share/fonts/truetype/fonts.scale + + runHook postInstall ''; - sha256 = "0zqqjcrqmbd4389hqz2dwymkkcxjrq9ylyriiv3gbmzl6l1ffk3g"; meta = { description = "Culmus Hebrew fonts"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/curie/default.nix b/third_party/nixpkgs/pkgs/data/fonts/curie/default.nix index fd21d1964a..4f3ab7eb01 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/curie/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/curie/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "curie"; version = "1.0"; -in fetchurl rec { - name = "curie-${version}"; - url = "https://github.com/NerdyPepper/curie/releases/download/v${version}/curie-v${version}.tar.gz"; + src = fetchurl { + url = "https://github.com/NerdyPepper/curie/releases/download/v${version}/curie-v${version}.tar.gz"; + hash = "sha256-B89GNbOmm3lY/cRWQJEFu/5morCM/WrRQb/m6covbt8="; + }; - downloadToTemp = true; + sourceRoot = "."; - recursiveHash = true; + installPhase = '' + runHook preInstall - sha256 = "sha256-twPAzsbTveYW0rQd7FYZz5AMZgvPbNmn5c7Nfzn7B0A="; - - postFetch = '' - tar xzf $downloadedFile mkdir -p $out/share/fonts/misc install *.otb $out/share/fonts/misc + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/d2coding/default.nix b/third_party/nixpkgs/pkgs/data/fonts/d2coding/default.nix index 0df5dd51df..84af3d18bf 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/d2coding/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/d2coding/default.nix @@ -1,15 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "1.3.2"; +stdenvNoCC.mkDerivation rec { pname = "d2codingfont"; + version = "1.3.2"; -in (fetchzip { - name = "${pname}-${version}"; - url = "https://github.com/naver/${pname}/releases/download/VER${version}/D2Coding-Ver${version}-20180524.zip"; + src = fetchzip { + url = "https://github.com/naver/${pname}/releases/download/VER${version}/D2Coding-Ver${version}-20180524.zip"; + stripRoot = false; + hash = "sha256-iC6iaUSVg4zt3wVFJUU4HEeswuKDOTFsAxq/0gRiOCA="; + }; - sha256 = "1812r82530wzfki7k9cm35fy6k2lvis7j6w0w8svc784949m1wwj"; + installPhase = '' + runHook preInstall + + install -Dm644 */*-all.ttc -t $out/share/fonts/truetype/ + + runHook postInstall + ''; meta = with lib; { description = "Monospace font with support for Korean and latin characters"; @@ -25,9 +32,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*-all.ttc -d $out/share/fonts/truetype/ - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/dancing-script/default.nix b/third_party/nixpkgs/pkgs/data/fonts/dancing-script/default.nix index 5129f4bc5a..7960691959 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/dancing-script/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/dancing-script/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "dancing-script"; version = "2.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "impallari"; - repo = "DancingScript"; - rev = "f7f54bc1b8836601dae8696666bfacd306f77e34"; - sha256 = "dfFvh8h+oMhAQL9XKMrNr07VUkdQdxAsA8+q27KWWCA="; + src = fetchFromGitHub { + owner = "impallari"; + repo = "DancingScript"; + rev = "f7f54bc1b8836601dae8696666bfacd306f77e34"; + hash = "sha256-B9oAZFPH3dG/Nt5FfKfFVJYtfUKGK0AXNkQHRC7IgdU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/dm-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/dm-sans/default.nix index f7b556fe53..c2d8f33eff 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/dm-sans/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/dm-sans/default.nix @@ -1,15 +1,22 @@ -{ lib, fetchzip }: -let version = "1.002"; in -fetchzip { - inherit version; - pname = "dm-sans"; - url = "https://github.com/googlefonts/dm-fonts/releases/download/v${version}/DeepMindSans_v${version}.zip"; - stripRoot = false; - hash = "sha256-zyS0gz7CGn39HCiyeN5cAP63v9nG6jffGSsI1vr84EQ="; +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "dm-sans"; + version = "1.002"; + + src = fetchzip { + url = "https://github.com/googlefonts/dm-fonts/releases/download/v${version}/DeepMindSans_v${version}.zip"; + stripRoot = false; + hash = "sha256-RSHHxiCac18qqF+hW5M3BbBcra4AQpNLLlUmhiWj9f8="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype + mv *.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = { diff --git a/third_party/nixpkgs/pkgs/data/fonts/dosis/default.nix b/third_party/nixpkgs/pkgs/data/fonts/dosis/default.nix index 918996c5f6..a33f086c9b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/dosis/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/dosis/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "dosis-1.007"; +stdenvNoCC.mkDerivation rec { + pname = "dosis"; + version = "1.007"; - owner = "impallari"; - repo = "Dosis"; - rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Dosis"; + rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; + hash = "sha256-rZ49uNBlI+NWkiZykpyXzOonXlbVB6Vf6a/8A56Plj4="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \; - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "0vz25w45i8flfvppymr5h83pa2n1r37da20v7691p44018fdsdny"; + runHook postInstall + ''; meta = with lib; { description = "A very simple, rounded, sans serif family"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/dotcolon-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/dotcolon-fonts/default.nix new file mode 100644 index 0000000000..fcd439ce30 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/dotcolon-fonts/default.nix @@ -0,0 +1,49 @@ +{ lib +, symlinkJoin +, aileron +, vegur +, f5_6 +, tenderness +, medio +, ferrum +, seshat +, penna +, eunomia +, route159 +, f1_8 +, nacelle +, melete +, fa_1 +}: + +symlinkJoin { + name = "dotcolon-fonts"; + + paths = [ + aileron + vegur + f5_6 + tenderness + medio + ferrum + seshat + penna + eunomia + route159 + f1_8 + nacelle + melete + fa_1 + ]; + + meta = { + description = "Font Collection by Sora Sagano"; + + homepage = "https://dotcolon.net/"; + + license = with lib.licenses; [ cc0 ofl ]; + + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ minijackson ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix b/third_party/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix index 83e2a9ac8e..5ffd9da5e0 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/doulos-sil/default.nix @@ -1,33 +1,33 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "doulos-sil"; version = "6.101"; - name = "doulos-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/doulos/DoulosSIL-${version}.zip"; + hash = "sha256-CPjk6SLgsDYjachZZ1hanp6Q+cxTxfHOkoeU59Om5b8="; + }; - sha256 = "sha256-vYdnudMkkWz6r8pwq98fyO0zcfFBRPmrqlmWxHCOIcc="; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://software.sil.org/doulos"; - description = "A font that provides complete support for the International Phonetic Alphabet"; - longDescription = '' + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 OFL.txt OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/doulos"; + description = "A font that provides complete support for the International Phonetic Alphabet"; + longDescription = '' This Doulos SIL font is essentially the same design as the SIL Doulos font first released by SIL in 1992. The design has been changed from the original in that it has been scaled down to be a better match with contemporary digital fonts, such as Times New Roman®. This current release is a regular typeface, with no bold or italic version available or planned. It is intended for use alongside other Times-like fonts where a range of styles (italic, bold) are not needed. Therefore, just one font is included in the Doulos SIL release: Doulos SIL Regular. The goal for this product was to provide a single Unicode-based font family that would contain a comprehensive inventory of glyphs needed for almost any Roman- or Cyrillic-based writing system, whether used for phonetic or orthographic needs. In addition, there is provision for other characters and symbols useful to linguists. This font makes use of state-of-the-art font technologies to support complex typographic issues, such as the need to position arbitrary combinations of base glyphs and diacritics optimally. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.f--t ]; - }; - }).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - }) + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.f--t ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/eb-garamond/default.nix b/third_party/nixpkgs/pkgs/data/fonts/eb-garamond/default.nix index 4240e853f2..7a57d9308c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/eb-garamond/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/eb-garamond/default.nix @@ -1,15 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "eb-garamond"; version = "0.016"; - name = "eb-garamond-${version}"; -in (fetchzip rec { - inherit name; - url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; + src = fetchzip { + url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; + hash = "sha256-P2VCLcqcMBBoTDJyRLP9vlHI+jE0EqPjPziN2MJbgEg="; + }; - sha256 = "04jq4mpln85zzbla8ybsjw7vn9qr3r0snmk5zykrm24imq7ripv3"; + installPhase = '' + runHook preInstall + + install -Dm644 otf/*.otf -t $out/share/fonts/opentype + install -Dm644 Changes README.markdown README.xelualatex -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "http://www.georgduffner.at/ebgaramond/"; @@ -18,10 +25,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*Changes \*README.markdown \*README.xelualatex -d "$out/share/doc/${name}" - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/edwin/default.nix b/third_party/nixpkgs/pkgs/data/fonts/edwin/default.nix index 4b1688dbc5..41926ac1b6 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/edwin/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/edwin/default.nix @@ -1,22 +1,21 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let - version = "0.52"; -in fetchurl { - name = "edwin-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "edwin"; + version = "0.54"; - url = "https://github.com/MuseScoreFonts/Edwin/archive/refs/tags/v${version}.tar.gz"; + src = fetchurl { + url = "https://github.com/MuseScoreFonts/Edwin/archive/refs/tags/v${version}.tar.gz"; + hash = "sha256-F6BzwnrsaELegdo6Bdju1OG+RI9zKnn4tIASR3q6zYk="; + }; - downloadToTemp = true; + installPhase = '' + runHook preInstall - recursiveHash = true; - - sha256 = "sha256-e0ADK72ECl+QMvLWtFJfeHBmuEwzr9M+Kqvkd5Z2mmo="; - - postFetch = '' - tar xzf $downloadedFile mkdir -p $out/share/fonts/opentype - install Edwin-${version}/*.otf $out/share/fonts/opentype + install *.otf $out/share/fonts/opentype + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/efont-unicode/default.nix b/third_party/nixpkgs/pkgs/data/fonts/efont-unicode/default.nix index f4ea61cbc9..e45bdab7a4 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/efont-unicode/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/efont-unicode/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchzip, libfaketime, xorg }: +{ lib, stdenv, fetchurl, libfaketime, xorg }: stdenv.mkDerivation rec { pname = "efont-unicode"; version = "0.4.2"; - src = fetchzip { + src = fetchurl { url = "http://openlab.ring.gr.jp/efont/dist/unicode-bdf/${pname}-bdf-${version}.tar.bz2"; - sha256 = "0bib3jgikq8s1m96imw4mlgbl5cbq1bs5sqig74s2l2cdfx3jaqc"; + sha256 = "sha256-fT7SsYlV3dCQrf0IZfiNI1grj3ngDgr8IkWdg+f9m3M="; }; nativeBuildInputs = with xorg; diff --git a/third_party/nixpkgs/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix index 5a31358b72..256084a320 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -1,14 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "emacs-all-the-icons-fonts"; version = "5.0.0"; -in (fetchzip { - name = "emacs-all-the-icons-fonts-${version}"; - url = "https://github.com/domtronn/all-the-icons.el/archive/${version}.zip"; + src = fetchzip { + url = "https://github.com/domtronn/all-the-icons.el/archive/${version}.zip"; + hash = "sha256-70ysVxOey6NLlCwhEYhxpxO6uuarMFDpg3Efh+3bj1M="; + }; - sha256 = "0vc9bkm4pcc05llcd2c9zr3d88h3zmci0izla5wnw8hg1n0rsrii"; + installPhase = '' + runHook preInstall + + install -Dm644 fonts/*.ttf -t $out/share/fonts/all-the-icons + + runHook postInstall + ''; meta = with lib; { description = "Icon fonts for emacs all-the-icons"; @@ -20,17 +27,12 @@ in (fetchzip { homepage = "https://github.com/domtronn/all-the-icons.el"; /* - The fonts come under a mixture of licenses - the MIT license, - SIL OFL license, and Apache license v2.0. See the GitHub page - for further information. + The fonts come under a mixture of licenses - the MIT license, + SIL OFL license, and Apache license v2.0. See the GitHub page + for further information. */ license = licenses.free; platforms = platforms.all; maintainers = with maintainers; [ rlupton20 ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/all-the-icons - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/encode-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/encode-sans/default.nix index a6836afbc8..1c9fc453c7 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/encode-sans/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/encode-sans/default.nix @@ -1,12 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: -let name = "encode-sans-1.002"; -in (fetchzip rec { - inherit name; +{ lib, stdenvNoCC, fetchzip }: - url = "https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip"; +stdenvNoCC.mkDerivation rec { + pname = "encode-sans"; + version = "1.002"; - sha256 = "16mx894zqlwrhnp4rflgayxhxppmsj6k7haxdngajhb30rlwf08p"; + src = fetchzip { + url = "https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip"; + hash = "sha256-TPAUc5msAUgJZHibjgYaS2TOuzKFy0rje9ZQTXE6s+w="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 README.md FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { description = "A versatile sans serif font family"; @@ -23,10 +33,4 @@ in (fetchzip rec { maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/et-book/default.nix b/third_party/nixpkgs/pkgs/data/fonts/et-book/default.nix index c410826b2f..d1b59e2cdc 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/et-book/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/et-book/default.nix @@ -1,16 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; - name = "et-book-${builtins.substring 0 6 rev}"; - owner = "edwardtufte"; - repo = "et-book"; - sha256 = "1bfb1l8k7fzgk2l8cikiyfn5x9m0fiwrnsbc1483p8w3qp58s5n2"; +stdenvNoCC.mkDerivation rec { + pname = "et-book"; + version = "unstable-2015-10-05"; + + src = fetchFromGitHub { + owner = "edwardtufte"; + repo = pname; + rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; + hash = "sha256-B6ryC9ibNop08TJC/w9LSHHwqV/81EezXsTUJFq8xpo="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xzf $downloadedFile mkdir -p $out/share/fonts/truetype - cp -t $out/share/fonts/truetype et-book-${rev}/source/4-ttf/*.ttf + cp -t $out/share/fonts/truetype source/4-ttf/*.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/eunomia/default.nix b/third_party/nixpkgs/pkgs/data/fonts/eunomia/default.nix index 272649582c..a09a0ad0d7 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/eunomia/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/eunomia/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "200"; - pname = "eunomia"; in +stdenvNoCC.mkDerivation (self: { + pname = "eunomia"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-Rd2EakaTWjzoEV00tHTgg/bXgJUFfPjCyQUWi7QhFG4="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; - sha256 = "0lpmczs1d4p9dy4s0dnvv7bl5cd0f6yzyasfrkxij5s86glps38b"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { homepage = "http://dotcolon.net/font/eunomia/"; description = "A futuristic decorative font"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.ofl; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/ezra-sil/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ezra-sil/default.nix index 2d970fbc38..7b628bd4bb 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ezra-sil/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ezra-sil/default.nix @@ -1,28 +1,28 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "ezra-sil"; version = "2.51"; - name = "ezra-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/ezra/EzraSIL-${version}.zip"; + hash = "sha256-hGOHjvFVFLwyVkcoUz+7rQekCdn4oEOB+L16XRpthJM="; + }; - sha256 = "sha256-1LGw/RPFeNtEvcBWFWZf8+dABvWye2RfZ/jt8rwQewM="; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://software.sil.org/ezra"; - description = "Typeface fashioned after the square letter forms of the typography of the Biblia Hebraica Stuttgartensia (BHS)"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.kmein ]; - }; - }).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; - }) + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 OFL-FAQ.txt README.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/ezra"; + description = "Typeface fashioned after the square letter forms of the typography of the Biblia Hebraica Stuttgartensia (BHS)"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.kmein ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/f1_8/default.nix b/third_party/nixpkgs/pkgs/data/fonts/f1_8/default.nix new file mode 100644 index 0000000000..5898fe1eab --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/f1_8/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenvNoCC, fetchzip }: + +let + majorVersion = "1"; + minorVersion = "101"; +in +stdenvNoCC.mkDerivation (self: { + pname = "f1_8"; + version = "${majorVersion}.${minorVersion}"; + + src = fetchzip { + url = "https://note.com/api/v2/attachments/download/d83b2c4ec63d7826acaa76725d261ff4"; + hash = "sha256-pe1G8WeFAo+KYjjsNwn0JmtXFn9QugE1SeGwaqnl1F0="; + stripRoot = false; + extension = "zip"; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://dotcolon.net/font/${self.pname}/"; + description = "A weighted decorative font"; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + license = licenses.ofl; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/f5_6/default.nix b/third_party/nixpkgs/pkgs/data/fonts/f5_6/default.nix index 112111faa3..a37ee591ef 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/f5_6/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/f5_6/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "110"; - pname = "f5_6"; in +stdenvNoCC.mkDerivation (self: { + pname = "f5_6"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-FeCU+mzR0iO5tixI72XUnhvpGj+WRfKyT3mhBtud3uE="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; - sha256 = "04p6lccd26rhjbpq3ddxi5vkk3lk8lqbpnk8lakjzixp3fgdqpp4"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "A weighted decorative font"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.ofl; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/fa_1/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fa_1/default.nix new file mode 100644 index 0000000000..4e8ab3cbaa --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/fa_1/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenvNoCC, fetchzip }: + +let + majorVersion = "0"; + minorVersion = "100"; +in +stdenvNoCC.mkDerivation (self: { + pname = "fa_1"; + version = "${majorVersion}.${minorVersion}"; + + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-BPJ+wZMYXY/yg5oEgBc5YnswA6A7w6V0gdv+cac0qdc="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://dotcolon.net/font/${self.pname}/"; + description = "A weighted decorative font"; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + license = licenses.ofl; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/fantasque-sans-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fantasque-sans-mono/default.nix index e8068d7fae..d4d60d95bc 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/fantasque-sans-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/fantasque-sans-mono/default.nix @@ -1,22 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "fantasque-sans-mono"; version = "1.8.0"; -in -fetchzip rec { - name = "fantasque-sans-mono-${version}"; + src = fetchzip { + url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono-Normal.zip"; + stripRoot = false; + hash = "sha256-MNXZoDPi24xXHXGVADH16a3vZmFhwX0Htz02+46hWFc="; + }; - url = "https://github.com/belluzj/fantasque-sans/releases/download/v${version}/FantasqueSansMono-Normal.zip"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile README.md -d $out/share/doc/${name} + install -Dm644 OTF/*.otf -t $out/share/fonts/opentype + install -Dm644 README.md -t $out/share/doc/${pname}-${version} + + runHook postInstall ''; - sha256 = "07y2w6xzkbaj6vr95fvvnmwq1pw9jib4z02xf8937dx812yic9ni"; - meta = with lib; { homepage = "https://github.com/belluzj/fantasque-sans"; description = "A font family with a great monospaced variant for programmers"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/ferrum/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ferrum/default.nix index 3f122d22da..33b3813cca 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ferrum/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ferrum/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "200"; - pname = "ferrum"; in +stdenvNoCC.mkDerivation (self: { + pname = "ferrum"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-NDJwgFWZgyhMkGRWlY55l2omEw6ju3e3dHCEsWNzQIc="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "1w1b3ch7ik4264f05lxms01ls0aargvlx770a9szm682dfmizn8w"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "A decorative font"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/fira-code/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fira-code/default.nix index f1eb218426..b0e6383515 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/fira-code/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/fira-code/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "fira-code"; version = "6.2"; -in (fetchzip { - name = "fira-code-${version}"; - url = "https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"; + src = fetchzip { + url = "https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"; + stripRoot = false; + hash = "sha256-UHOwZL9WpCHk6vZaqI/XfkZogKgycs5lWg1p0XdQt0A="; + }; - sha256 = "0l02ivxz3jbk0rhgaq83cqarqxr07xgp7n27l0fh8fbgxwi52djl"; + # only extract the variable font because everything else is a duplicate + installPhase = '' + runHook preInstall + + install -Dm644 variable_ttf/*-VF.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/tonsky/FiraCode"; @@ -22,10 +31,4 @@ in (fetchzip { maintainers = [ maintainers.rycee ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - # only extract the variable font because everything else is a duplicate - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile '*-VF.ttf' -d $out/share/fonts/truetype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/fira-code/symbols.nix b/third_party/nixpkgs/pkgs/data/fonts/fira-code/symbols.nix index 3d8c5bf342..35d51bb340 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/fira-code/symbols.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/fira-code/symbols.nix @@ -1,12 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "fira-code-symbols-20160811"; +stdenvNoCC.mkDerivation { + pname = "fira-code-symbols"; + version = "20160811"; - url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"; + src = fetchzip { + url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"; + hash = "sha256-7y51blEn0Osf8azytK08zJgtfVX/CIWQkiOoRzYKIa4="; + }; - sha256 = "19krsp22rin74ix0i19v4bh1c965g18xkmz1n55h6n6qimisnbkm"; + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { description = "FiraCode unicode ligature glyphs in private use area"; @@ -19,9 +28,4 @@ maintainers = [ maintainers.Profpatsch ]; homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632"; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile -d $out/share/fonts/opentype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/fira-go/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fira-go/default.nix index 2d5952523a..a850d7d2e9 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/fira-go/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/fira-go/default.nix @@ -1,25 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { pname = "fira-go"; version = "1.001"; - user = "bBoxType"; - repo = "FiraGo"; - rev = "9882ba0851f88ab904dc237f250db1d45641f45d"; -in -fetchzip { - name = "${pname}-${version}"; - url = "https://github.com/${user}/${repo}/archive/${rev}.zip"; + src = fetchzip { + url = "https://github.com/bBoxType/FiraGo/archive/9882ba0851f88ab904dc237f250db1d45641f45d.zip"; + hash = "sha256-WwgPg7OLrXBjR6oHG5061RO3HeNkj2Izs6ktwIxVw9o="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/opentype - mv $out/Fonts/FiraGO_OTF_1001/{Roman,Italic}/*.otf \ + mv Fonts/FiraGO_OTF_1001/{Roman,Italic}/*.otf \ $out/share/fonts/opentype - rm -r $out/{Fonts,'Technical Report PDF',OFL.txt,README.md,*.pdf} - ''; - sha256 = "sha256-MDGRba1eao/yVzSuncJ/nvCG8cpdrI4roVPI1G9qCbU="; + runHook postInstall + ''; meta = with lib; { homepage = "https://bboxtype.com/typefaces/FiraGO"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/fira-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fira-mono/default.nix index 763f54bb76..5d059dbf88 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/fira-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/fira-mono/default.nix @@ -1,13 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let version = "4.202"; -in (fetchzip { - name = "fira-mono-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "fira-mono"; + version = "4.202"; - url = "https://github.com/mozilla/Fira/archive/${version}.zip"; + src = fetchzip { + url = "https://github.com/mozilla/Fira/archive/${version}.zip"; + hash = "sha256-HLReqgL0PXF5vOpwLN0GiRwnzkjGkEVEyOEV2Z4R0oQ="; + }; - sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj"; + installPhase = '' + runHook preInstall + + install -Dm644 otf/FiraMono*.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { homepage = "https://mozilla.github.io/Fira/"; @@ -22,9 +30,4 @@ in (fetchzip { maintainers = [ maintainers.rycee ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile Fira-${version}/otf/FiraMono\*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/fira/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fira/default.nix index 039c5099b5..89af9fb7b7 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/fira/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/fira/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { + pname = "fira"; version = "4.202"; -in fetchFromGitHub { - name = "fira-${version}"; - owner = "mozilla"; - repo = "Fira"; - rev = version; + src = fetchFromGitHub { + owner = "mozilla"; + repo = "Fira"; + rev = version; + hash = "sha256-HLReqgL0PXF5vOpwLN0GiRwnzkjGkEVEyOEV2Z4R0oQ="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/opentype cp otf/*.otf $out/share/fonts/opentype - ''; - sha256 = "1iwxbp7kw5kghh5nbycb05zby7p2ib61mywva3h6giv2wd4lpxnz"; + runHook postInstall + ''; meta = with lib; { homepage = "https://mozilla.github.io/Fira/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix index cb9d5e73ed..53592152a3 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchurl } : +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "fixedsys-excelsior"; version = "3.00"; -in fetchurl rec { - name = "fixedsys-excelsior-${version}"; - url = "https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf"; + src = fetchurl { + url = "https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf"; + hash = "sha256-buDzVzvF4z6TthbvYoL0m8DiJ6Map1Osdu0uPz0CBW0="; + }; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -m444 -D $downloadedFile $out/share/fonts/truetype/${name}.ttf + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -m444 -D $src $out/share/fonts/truetype/${pname}-${version}.ttf + + runHook postInstall ''; - sha256 = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37"; - meta = { homepage = "http://www.fixedsysexcelsior.com/"; description = "Pan-unicode version of Fixedsys, a classic DOS font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix b/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix index 973df59e40..a6f748f2f0 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: let - font-awesome = { version, sha256, rev ? version }: fetchFromGitHub { - name = "font-awesome-${version}"; + font-awesome = { version, hash, rev ? version }: stdenvNoCC.mkDerivation { + pname = "font-awesome"; + inherit version; + src = fetchFromGitHub { + owner = "FortAwesome"; + repo = "Font-Awesome"; + inherit rev hash; + }; - owner = "FortAwesome"; - repo = "Font-Awesome"; - inherit rev; + installPhase = '' + runHook preInstall - postFetch = '' - install -m444 -Dt $out/share/fonts/opentype $out/{fonts,otfs}/*.otf - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf + + runHook postInstall ''; - inherit sha256; - meta = with lib; { description = "Font Awesome - OTF font"; longDescription = '' @@ -40,14 +41,14 @@ in v4 = font-awesome { version = "4.7.0"; rev = "v4.7.0"; - sha256 = "sha256-qdrIwxAB+z+4PXrKrj6bBuiJY0DYQuHm2DRng5sYEck="; + hash = "sha256-LL9zWFC+76wH74nqKszPQf2ZDfXq8BiH6tuiK43wYHA="; }; v5 = font-awesome { version = "5.15.3"; - sha256 = "sha256-EDxk/yO3nMmtM/ytrAEgPYSBbep3rA3NrKkiqf3OsU0="; + hash = "sha256-CFXGsl70o/gXUCEKu8Wkv4EBRhrrcMIq8NpfWzcxEus="; }; v6 = font-awesome { version = "6.1.1"; - sha256 = "sha256-BjK1PJQFWtKDvfQ2Vh7BoOPqYucyvOG+2Pu/Kh+JpAA="; + hash = "sha256-rujqhKI33Pi2xugMKGoTJDkPkCDK407+Da6yNJP2yAc="; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/fraunces/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fraunces/default.nix index 2d053b1ce7..21bab9002b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/fraunces/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/fraunces/default.nix @@ -1,14 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "fraunces"; version = "1.000"; -in -(fetchzip { - name = "fraunces-${version}"; - url = "https://github.com/undercasetype/Fraunces/releases/download/${version}/UnderCaseType_Fraunces_${version}.zip"; + src = fetchzip { + url = "https://github.com/undercasetype/Fraunces/releases/download/${version}/UnderCaseType_Fraunces_${version}.zip"; + hash = "sha256-hu2G4Fs2I3TMEy/EBFnc88Pv3c8Mpc5rm3OwVvol7gQ="; + }; - sha256 = "0qgl140qkn9p87x7pk60fd3lj206y5h0fq2xkcj2qiv3sxbqxwqb"; + installPhase = '' + runHook preInstall + + install -Dm644 */static/otf/*.otf -t $out/share/fonts/opentype + install -Dm644 */static/ttf/*.ttf */*.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "A display, “Old Style” soft-serif typeface inspired by early 20th century typefaces"; @@ -17,10 +25,4 @@ in maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/galatia-sil/default.nix b/third_party/nixpkgs/pkgs/data/fonts/galatia-sil/default.nix index 965596373c..70881399d5 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/galatia-sil/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/galatia-sil/default.nix @@ -1,31 +1,31 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "galatia-sil"; version = "2.1"; - name = "galatia-sil-${version}"; -in - (fetchzip rec { - inherit name; + src = fetchzip { url = "https://software.sil.org/downloads/r/galatia/GalatiaSIL-${version}.zip"; + hash = "sha256-7kXnTC5vpUOjcT40oNW6e32zFGejlWJq1J+p+5DiAos="; + }; - sha256 = "sha256-zLL/7LMcJul2LilhEafpvm+tiYlgv1y1jj85VvG+wiI="; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://software.sil.org/galatia"; - description = "Font designed to support Biblical Polytonic Greek"; - longDescription = '' - Galatia SIL, designed to support Biblical Polytonic Greek, is a Unicode 3.1 font released under the SIL Open Font License. The font supports precomposed characters rather than decomposed characters. Thus, you must use a keyboard that outputs NFC encoding (precomposed). - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.kmein ]; - }; - }).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + install -Dm644 $downloadedFile *.ttf -t $out/share/fonts/truetype + install -Dm644 $downloadedFile OFL.txt OFL-FAQ.txt FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://software.sil.org/galatia"; + description = "Font designed to support Biblical Polytonic Greek"; + longDescription = '' + Galatia SIL, designed to support Biblical Polytonic Greek, is a Unicode 3.1 font released under the SIL Open Font License. The font supports precomposed characters rather than decomposed characters. Thus, you must use a keyboard that outputs NFC encoding (precomposed). ''; - }) + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.kmein ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix index 1b8b3307eb..53ea5558c1 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/gandom-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "gandom-fonts"; version = "0.8"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "gandom-font"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "gandom-font"; + rev = "v${version}"; + hash = "sha256-nez8T0TtRLyXxIIR69LrVGde5ThCvA0fLXkYLyYQRV8="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/gandom-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-EDS3wwKwe2BIcOCxu7DxkVLCoEoTPP31k5ID51lqn3M="; meta = with lib; { homepage = "https://github.com/rastikerdar/gandom-font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/garamond-libre/default.nix b/third_party/nixpkgs/pkgs/data/fonts/garamond-libre/default.nix index 202ae2ce41..bd16afaf18 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/garamond-libre/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/garamond-libre/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "garamond-libre"; version = "1.4"; - url = "https://github.com/dbenjaminmiller/garamond-libre/releases/download/${version}/garamond-libre_${version}.zip"; - stripRoot = false; + src = fetchzip { + url = "https://github.com/dbenjaminmiller/garamond-libre/releases/download/${version}/garamond-libre_${version}.zip"; + stripRoot = false; + hash = "sha256-cD/JMICtb6MPIUcWs2VOTHnb/05ma0/KKtPyR4oJlIc="; + }; - postFetch = '' - install -Dm644 $out/*.otf -t $out/share/fonts/opentype - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "6WiuUe3CHXXL/0G7wURvSIgWPQ4isl50e3OBQ+ui0U4="; - meta = with lib; { homepage = "https://github.com/dbenjaminmiller/garamond-libre"; description = "Garamond Libre font family"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/gdouros/default.nix b/third_party/nixpkgs/pkgs/data/fonts/gdouros/default.nix index 171520e3d1..c12e3f8e9f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/gdouros/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/gdouros/default.nix @@ -1,32 +1,36 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchzip }: let fonts = { - aegan = { version = "13.00"; file = "Aegean.zip"; sha256 = "sha256-1DnbfL6bKn8Upht/ZYfKIp9kuDHq7y9E+jkt2Yhr38A="; description = "Aegean"; }; - aegyptus = { version = "13.00"; file = "Aegyptus.zip"; sha256 = "sha256-tObgHlhaquq6Akn/HdYKNfnKHHJP42yAT7lIn5qdCzY="; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; }; - akkadian = { version = "13.00"; file = "Akkadian.zip"; sha256 = "sha256-iHiXfxMS9FIlrRgT23MfxzCqYJMQrKuKYDShrqB74vU="; description = "Sumero-Akkadian Cuneiform"; }; - assyrian = { version = "13.00"; file = "Assyrian.zip"; sha256 = "sha256-YjTQjv1Vybr14Sn9pUdbGYVf4ZIjGT+cpB1qCIg1NNQ="; description = "Neo-Assyrian in Unicode with OpenType"; }; - eemusic = { version = "13.00"; file = "EEMusic.zip"; sha256 = "sha256-PaYBJOV+dmRV1ehY7TwDNL9dz1jPo58I3N8lWX1Vmy8="; description = "Byzantine Musical Notation in Unicode with OpenType"; }; - maya = { version = "13.00"; file = "Maya%20Hieroglyphs.zip"; sha256 = "sha256-9uqGo4hweV1ydI+pEp76IqmHslWvxr87rTvziQs35bQ="; description = "Maya Hieroglyphs"; }; - symbola = { version = "13.00"; file = "Symbola.zip"; sha256 = "sha256-C9HmforXr/Hqopb3go+bzqRFcWPv+0rz0JZsXc3mcxw="; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; }; - textfonts = { version = "13.00"; file = "Textfonts.zip"; sha256 = "sha256-1bDi5mwrT2I8gx6QdhnWjXATFdNAU9nt77BiFIci6C8="; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; }; - unidings = { version = "13.00"; file = "Unidings.zip"; sha256 = "sha256-6lSkDb603XIrBGy4fZhY7xYDd3x0qA0PRQOlQ9Roig0="; description = "Glyphs and Icons for blocks of The Unicode Standard"; }; + aegan = { version = "13.00"; file = "Aegean.zip"; hash = "sha256-3HmCqCMZLN6zF1N/EirQOPnHKTGHoc4aHKoZxFYTB34="; description = "Aegean"; }; + aegyptus = { version = "13.00"; file = "Aegyptus.zip"; hash = "sha256-SSAK707xhpsUTq8tSBcrzNGunCYad58amtCqAWuevnY="; description = "Egyptian Hieroglyphs, Coptic, Meroitic"; }; + akkadian = { version = "13.00"; file = "Akkadian.zip"; hash = "sha256-wXiDYyfujAs6fklOCqXq7Ms7wP5RbPlpNVwkUy7CV4k="; description = "Sumero-Akkadian Cuneiform"; }; + assyrian = { version = "13.00"; file = "Assyrian.zip"; hash = "sha256-CZj1sc89OexQ0INb7pbEu5GfE/w2E5JmhjT8cosoLSg="; description = "Neo-Assyrian in Unicode with OpenType"; }; + eemusic = { version = "13.00"; file = "EEMusic.zip"; hash = "sha256-LxOcQOPEImw0wosxJotbOJRbe0qlK5dR+kazuhm99Kg="; description = "Byzantine Musical Notation in Unicode with OpenType"; }; + maya = { version = "13.00"; file = "Maya%20Hieroglyphs.zip"; hash = "sha256-PAwF1lGqm6XVf4NQCA8AFLGU40N0Xsn5Q8x9ikHJDhY="; description = "Maya Hieroglyphs"; }; + symbola = { version = "13.00"; file = "Symbola.zip"; hash = "sha256-TsHWmzkEyMa8JOZDyjvk7PDhm239oH/FNllizNFf398="; description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; }; + textfonts = { version = "13.00"; file = "Textfonts.zip"; hash = "sha256-7S3NiiyDvyYoDrLPt2z3P9bEEFOEZACv2sIHG1Tn6yI="; description = "Aroania, Anaktoria, Alexander, Avdira and Asea"; }; + unidings = { version = "13.00"; file = "Unidings.zip"; hash = "sha256-WUY+Ylphep6WuzqLQ3Owv+vK5Yuu/aAkn4GOFXL0uQY="; description = "Glyphs and Icons for blocks of The Unicode Standard"; }; }; - mkpkg = name_: {version, file, sha256, description}: fetchzip rec { - name = "${name_}-${version}"; - url = "https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}"; - stripRoot = false; - postFetch = '' - mkdir -p $out/share/{fonts/opentype,doc/${name_}} - mv $out/*.otf -t "$out/share/fonts/opentype" - mv $out/*.{odt,ods,pdf,xlsx} -t "$out/share/doc/${name_}" || true # install docs if any - find $out -type d -empty -delete - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + mkpkg = pname: { version, file, hash, description }: stdenvNoCC.mkDerivation rec { + inherit pname version; + + src = fetchzip { + url = "https://dn-works.com/wp-content/uploads/2020/UFAS-Fonts/${file}"; + stripRoot = false; + inherit hash; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{fonts/opentype,doc/${pname}} + mv *.otf -t "$out/share/fonts/opentype" + mv *.{odt,ods,pdf,xlsx} -t "$out/share/doc/${pname}" || true # install docs if any + + runHook postInstall ''; - inherit sha256; meta = { inherit description; @@ -39,4 +43,4 @@ let }; }; in - lib.mapAttrs mkpkg fonts +lib.mapAttrs mkpkg fonts diff --git a/third_party/nixpkgs/pkgs/data/fonts/gelasio/default.nix b/third_party/nixpkgs/pkgs/data/fonts/gelasio/default.nix index c8cf655a18..cea8e439d3 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/gelasio/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/gelasio/default.nix @@ -1,18 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let - version = "unstable-2018-08-12"; -in fetchFromGitHub { - name = "gelasio-${version}"; - owner = "SorkinType"; - repo = "Gelasio"; - rev = "5bced461d54bcf8e900bb3ba69455af35b0d2ff1"; - sha256 = "0dfskz2vpwsmd88rxqsxf0f01g4f2hm6073afcm424x5gc297n39"; +stdenvNoCC.mkDerivation { + pname = "gelasio"; + version = "unstable-2022-06-09"; + + src = fetchFromGitHub { + owner = "SorkinType"; + repo = "Gelasio"; + rev = "a75c6d30a35f74cdbaea1813bdbcdb64bb11d3d5"; + hash = "sha256-ncm0lSDPPPREdxTx3dGl6OGBn4FGAjFTlQpA6oDCdMI="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype/ + cp fonts/ttf/*.ttf $out/share/fonts/truetype/ + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix b/third_party/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix index be2f71b534..5cbc31accf 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix @@ -1,17 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - major = "1"; - minor = "102"; - version = "${major}.${minor}"; - name = "gentium-book-basic-${version}"; -in (fetchzip rec { - inherit name; +stdenvNoCC.mkDerivation rec { + pname = "gentium-book-basic"; + version = "1.102"; - url = "http://software.sil.org/downloads/r/gentium/GentiumBasic_${major}${minor}.zip"; + src = fetchzip { + url = "http://software.sil.org/downloads/r/gentium/GentiumBasic_${lib.versions.major version}${lib.versions.minor version}.zip"; + hash = "sha256-oCmpl95MJRfCV25cg/4cf8AwQWnoymXasSss1ziOPoE="; + }; - sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd"; + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 FONTLOG.txt GENTIUM-FAQ.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "https://software.sil.org/gentium/"; @@ -20,10 +25,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt -d $out/share/doc/${name} - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/gentium/default.nix b/third_party/nixpkgs/pkgs/data/fonts/gentium/default.nix index 9494f8e62a..5c3f7dfab2 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/gentium/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/gentium/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "gentium"; version = "6.101"; - name = "gentium-${version}"; -in (fetchzip rec { - inherit name; - url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip"; + src = fetchzip { + url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip"; + hash = "sha256-iKD1Q7/lsbZCuJQoJqySQHwplrHv8yzmph+QwKpYgMU="; + }; - sha256 = "sha256-+T5aUlqQYDWRp4/4AZzsREHgjAnOeUB6qn1GAI0A5hE="; + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 FONTLOG.txt README.txt -t $out/share/doc/${pname}-${version} + cp -r documentation $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "https://software.sil.org/gentium/"; @@ -34,20 +42,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -l $downloadedFile - unzip -j $downloadedFile \*.ttf \ - -d $out/share/fonts/truetype - unzip -j $downloadedFile \ - \*/FONTLOG.txt \ - \*/README.txt \ - -d $out/share/doc/${name} - unzip -j $downloadedFile \ - \*/documentation/\*.html \ - \*/documentation/\*.txt \ - -x \*/documentation/source/\* \ - -d $out/share/doc/${name}/documentation - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/go-font/default.nix b/third_party/nixpkgs/pkgs/data/fonts/go-font/default.nix index 45041bb805..63d62ec2e8 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/go-font/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/go-font/default.nix @@ -1,22 +1,26 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "go-font"; version = "2.010"; - rev = "41969df76e82aeec85fa3821b1e24955ea993001"; -in (fetchzip { - name = "go-font-${version}"; - url = "https://go.googlesource.com/image/+archive/${rev}/font/gofont/ttfs.tar.gz"; - stripRoot = false; - postFetch = '' + src = fetchzip { + url = "https://go.googlesource.com/image/+archive/41969df76e82aeec85fa3821b1e24955ea993001/font/gofont/ttfs.tar.gz"; + stripRoot = false; + hash = "sha256-rdzt51wY4b7HEr7W/0Ar/FB0zMyf+nKLsOT+CRSEP3o="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype mkdir -p $out/share/doc/go-font - mv $out/*.ttf $out/share/fonts/truetype - mv $out/README $out/share/doc/go-font/LICENSE + mv *.ttf $out/share/fonts/truetype + mv README $out/share/doc/go-font/LICENSE + + runHook postInstall ''; - sha256 = "175jwq16qjnd2k923n9gcbjizchy7yv4n41dm691sjwrhbl0b13x"; -}) // { meta = with lib; { homepage = "https://blog.golang.org/go-fonts"; description = "The Go font family"; @@ -24,6 +28,5 @@ in (fetchzip { license = licenses.bsd3; maintainers = with maintainers; [ sternenseemann ]; platforms = lib.platforms.all; - hydraPlatforms = []; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/gyre/default.nix b/third_party/nixpkgs/pkgs/data/fonts/gyre/default.nix index 63633ffcda..254766d1de 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/gyre/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/gyre/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - baseName = "gyre-fonts"; +stdenvNoCC.mkDerivation rec { + pname = "gyre-fonts"; version = "2.005"; -in (fetchzip { - name="${baseName}-${version}"; - url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${version}otf.zip"; + src = fetchzip { + url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${version}otf.zip"; + stripRoot = false; + hash = "sha256-+6IufuFf+IoLXoZEPlfHUNgRhKrQNBEZ1OwPD9/uOjg="; + }; - sha256 = "17amdpahs6kn7hk3dqxpff1s095cg1caxzij3mxjbbxp8zy0l111"; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp *.otf $out/share/fonts/truetype + + runHook postInstall + ''; meta = { description = "OpenType fonts from the Gyre project, suitable for use with (La)TeX"; @@ -25,9 +33,4 @@ in (fetchzip { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ bergey ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/hack/default.nix b/third_party/nixpkgs/pkgs/data/fonts/hack/default.nix index 4b67da84d9..6c6bd1918d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/hack/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/hack/default.nix @@ -1,14 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "hack-font"; version = "3.003"; -in (fetchzip { - name = "hack-font-${version}"; - url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version}-ttf.zip"; + src = fetchzip { + url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version}-ttf.zip"; + hash = "sha256-SxF4kYp9aL/9L9EUniquFadzWt/+PcvhUQOIOvCrFRM="; + }; - sha256 = "1l6ih6v7dqali5c7zh6z2xnbf9h2wz0ag6fdgszmqd5lnhw39v6s"; + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/hack + + runHook postInstall + ''; meta = with lib; { description = "A typeface designed for source code"; @@ -22,7 +29,7 @@ in (fetchzip { homepage = "https://sourcefoundry.org/hack/"; /* - "The font binaries are released under a license that permits unlimited + "The font binaries are released under a license that permits unlimited print, desktop, and web use for commercial and non-commercial applications. It may be embedded and distributed in documents and applications. The source is released in the widely supported UFO format @@ -33,9 +40,4 @@ in (fetchzip { maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hack - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/hackgen/default.nix b/third_party/nixpkgs/pkgs/data/fonts/hackgen/default.nix index b60ccb87fb..24c3b7af37 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/hackgen/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/hackgen/default.nix @@ -1,18 +1,20 @@ -{ lib -, fetchzip -}: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "hackgen-font"; version = "2.8.0"; - url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_v${version}.zip"; - sha256 = "sha256-TLqns6ulovHRKoLHxxwKpj6SqfCq5UDVBf7gUASCGK4="; - postFetch = '' - install -Dm644 $out/*.ttf -t $out/share/fonts/hackgen - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + src = fetchzip { + url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_v${version}.zip"; + hash = "sha256-vKbiM3QUryey0m6oilO0lT6+efkCTLCwdtPF7PinkmU="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/hackgen + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/hackgen/nerdfont.nix b/third_party/nixpkgs/pkgs/data/fonts/hackgen/nerdfont.nix index f563a2eb47..54bec95c59 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/hackgen/nerdfont.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/hackgen/nerdfont.nix @@ -1,18 +1,20 @@ -{ lib -, fetchzip -}: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "hackgen-nf-font"; version = "2.8.0"; - url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_NF_v${version}.zip"; - sha256 = "sha256-xRFedeavEJY9OZg+gePF5ImpLTYdbSba5Wr9k0ivpkE="; - postFetch = '' - install -Dm644 $out/*.ttf -t $out/share/fonts/hackgen-nf - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + src = fetchzip { + url = "https://github.com/yuru7/HackGen/releases/download/v${version}/HackGen_NF_v${version}.zip"; + hash = "sha256-RLEq5IoA3gk/IzabV8wdJYj8yMpbWQVz+Qunef6oNOs="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/hackgen-nf + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/hanazono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/hanazono/default.nix index 29c982ed8a..f6dd5baa60 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/hanazono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/hanazono/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "hanazono"; version = "20170904"; -in fetchzip { - name = "hanazono-${version}"; - url = "mirror://osdn/hanazono-font/68253/hanazono-${version}.zip"; + src = fetchzip { + url = "mirror://osdn/hanazono-font/68253/hanazono-${version}.zip"; + stripRoot = false; + hash = "sha256-qd0q4wQnHBGLT7C+UQIiOHnxCnRCscMZcj3P5RRxD1U="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d $out/share/doc/hanazono + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/hanazono + + runHook postInstall ''; - sha256 = "0qiyd1vk3w8kqmwc6xi5d390wdr4ln8xhfbx3n8r1hhad9iz14p6"; - meta = with lib; { description = "Japanese Mincho-typeface TrueType font"; homepage = "https://fonts.jp/hanazono/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/hannom/default.nix b/third_party/nixpkgs/pkgs/data/fonts/hannom/default.nix index 72ba87fb17..d91de86c53 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/hannom/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/hannom/default.nix @@ -10,8 +10,6 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-Oh8V72tYvVA6Sk0f9UTIkRQYjdUbEB/fmCSaRYfyoP8="; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/data/fonts/hasklig/default.nix b/third_party/nixpkgs/pkgs/data/fonts/hasklig/default.nix index 8c81bf5204..a69f8f743c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/hasklig/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/hasklig/default.nix @@ -1,14 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "hasklig"; version = "1.1"; -in (fetchzip { - name = "hasklig-${version}"; - url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"; + src = fetchzip { + url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"; + stripRoot = false; + hash = "sha256-jsPQtjuegMePt4tB1dZ9mq15LSxXBYwtakbq4od/sko="; + }; - sha256 = "0xxyx0nkapviqaqmf3b610nq17k20afirvc72l32pfspsbxz8ybq"; + installPhase = '' + runHook preInstall + + install -m444 -Dt $out/share/fonts/opentype *.otf + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/i-tu/Hasklig"; @@ -17,9 +25,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ davidrusu Profpatsch ]; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - install -m444 -Dt $out/share/fonts/opentype *.otf - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/third_party/nixpkgs/pkgs/data/fonts/helvetica-neue-lt-std/default.nix index 7e69ff70d6..61dc6ba14e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/helvetica-neue-lt-std/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/helvetica-neue-lt-std/default.nix @@ -1,24 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { + name = "helvetica-neue-lt-std"; version = "2014.08.16"; # date of most recent file in distribution -in fetchzip { - name = "helvetica-neue-lt-std-${version}"; - url = "https://web.archive.org/web/20190823153624/http://ephifonts.com/downloads/helvetica-neue-lt-std.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20190823153624/http://ephifonts.com/downloads/helvetica-neue-lt-std.zip"; + stripRoot = false; + hash = "sha256-ytoTTrnwN1lMw/gTxS4DRAq+tV5WzB2xHP4vVxLZ1ZI="; + }; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts - install -Dm644 $out/'Helvetica Neue LT Std'/*.otf -t $out/share/fonts/opentype - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + install -Dm644 'Helvetica Neue LT Std'/*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "sha256-gM/QXrKI2xrrCBYt4R+Fk5Tj0AIkrnCP/pwgh0A/MyI="; - meta = with lib; { homepage = "https://web.archive.org/web/20190926040940/http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html"; description = "Helvetica Neue LT Std font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/hermit/default.nix b/third_party/nixpkgs/pkgs/data/fonts/hermit/default.nix index 999a8995b4..3ff770522d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/hermit/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/hermit/default.nix @@ -1,21 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { pname = "hermit"; version = "2.0"; -in fetchzip rec { - name = "${pname}-${version}"; - url = "https://pcaro.es/d/otf-${name}.tar.gz"; + src = fetchzip { + url = "https://pcaro.es/d/otf-${pname}-${version}.tar.gz"; + stripRoot = false; + hash = "sha256-RYXZ2yJ8BIxsgeEwhXz7g0NnWG3kMPZoJaOLMUQyWWQ="; + }; - stripRoot = false; - postFetch = '' - install -m444 -Dt $out/share/fonts/opentype $out/*.otf - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + installPhase = '' + runHook preInstall + + install -m444 -Dt $out/share/fonts/opentype *.otf + + runHook postInstall ''; - sha256 = "127hnpxicqya7v1wmzxxqafq3aj1n33i4j5ncflbw6gj5g3bizwl"; meta = with lib; { description = "monospace font designed to be clear, pragmatic and very readable"; @@ -25,4 +26,3 @@ in fetchzip rec { platforms = platforms.all; }; } - diff --git a/third_party/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix b/third_party/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix index bd7e14a72f..c72e4b9e19 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/hyperscrypt/default.nix @@ -1,18 +1,25 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "hyperscrypt"; version = "1.1"; - pname = "HyperScrypt"; -in -(fetchzip { - name = "${lib.toLower pname}-font-${version}"; - url = "https://gitlab.com/StudioTriple/Hyper-Scrypt/-/archive/${version}/Hyper-Scrypt-${version}.zip"; - sha256 = "01pf5p2scmw02s0gxnibiwxbpzczphaaapv0v4s7svk9aw2gmc0m"; + src = fetchzip { + url = "https://gitlab.com/StudioTriple/Hyper-Scrypt/-/archive/${version}/Hyper-Scrypt-${version}.zip"; + hash = "sha256-ONlAB9C/GYK6KmOaiHCYErkS6OlQ3TUnoumNDHGZnes="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 fonts/HyperScrypt_Web/*.ttf -t $out/share/fonts/truetype/ + install -Dm644 fonts/HyperScrypt_Web/*.otf fonts/*.otf -t $out/share/fonts/opentype/ + + runHook postInstall + ''; meta = with lib; { - homepage = "http://velvetyne.fr/fonts/hyper-scrypt/"; + homepage = "https://velvetyne.fr/fonts/hyper-scrypt/"; description = "A modern stencil typeface inspired by stained glass technique"; longDescription = '' The Hyper Scrypt typeface was designed for the Hyper Chapelle @@ -28,15 +35,9 @@ in molted metal, Hyper Scrypt is based upon a rigorous grid, allowing some neat alignements between shapes in multi lines layouts. - ''; + ''; license = licenses.ofl; maintainers = with maintainers; [ leenaars ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/{truetype,opentype} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname}.ttf - unzip -j $downloadedFile \*${pname}.otf -d $out/share/fonts/opentype/${pname}.otf - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/i-dot-ming/default.nix b/third_party/nixpkgs/pkgs/data/fonts/i-dot-ming/default.nix index d15d7bcc24..fb2679b2eb 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/i-dot-ming/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/i-dot-ming/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchurl, writeScript }: +{ lib, stdenvNoCC, fetchurl, writeScript }: -let +stdenvNoCC.mkDerivation rec { + pname = "i.ming"; version = "8.00"; -in -fetchurl { - name = "i.ming-${version}"; - url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf"; - hash = "sha256-JGu9H0+IdJL6QQtLwvqlFLEaJdq1JVRiqLm5zptwjyE="; - recursiveHash = true; - downloadToTemp = true; - postFetch = '' - install -DT -m444 $downloadedFile $out/share/fonts/truetype/I.Ming/I.Ming.ttf + src = fetchurl { + url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf"; + hash = "sha256-6345629OdKz6lTnD3Vjtp6DzsYy0ojaL0naXGrtdZvw="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -DT -m444 $src $out/share/fonts/truetype/I.Ming/I.Ming.ttf + + runHook postInstall ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix index 6da80a1bf8..483ed98737 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ia-writer-duospace/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let - version = "20180721"; -in fetchFromGitHub { - name = "ia-writer-duospace-${version}"; +stdenvNoCC.mkDerivation { + pname = "ia-writer-duospace"; + version = "unstable-2018-07-21"; - owner = "iaolo"; - repo = "iA-Fonts"; - rev = "55edf60f544078ab1e14987bc67e9029a200e0eb"; - sha256 = "0932lcxf861vb3hz52z1xj8r99ag9sdyqsnq9brv7gc4kp2l339c"; + src = fetchFromGitHub { + owner = "iaolo"; + repo = "iA-Fonts"; + rev = "55edf60f544078ab1e14987bc67e9029a200e0eb"; + hash = "sha256-/ifzOScILLuFkjFIgpy0ArCcelgealbpypKvZ46xApU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar --strip-components=1 -xzvf $downloadedFile mkdir -p $out/share/fonts/opentype cp "iA Writer Duospace/OTF (Mac)/"*.otf $out/share/fonts/opentype/ + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix index c632338d59..0de1f38a0f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ibm-plex/default.nix @@ -1,15 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "6.0.1"; +stdenvNoCC.mkDerivation rec { + pname = "ibm-plex"; + version = "6.1.1"; -in (fetchzip { - name = "ibm-plex-${version}"; + src = fetchzip { + url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; + hash = "sha256-PZ7KPtaXZFVD5uMc7i+GQMA4DU5PsspeAodiU/FrTpY="; + }; - url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; + installPhase = '' + runHook preInstall - sha256 = "sha256-HxO0L5Q6WJQBqtg64cczzuRcSYi4jEqbOzEWxDmqFp8="; + install -Dm644 */*.otf IBM-Plex-Sans-JP/unhinted/* -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { description = "IBM Plex Typeface"; @@ -19,9 +25,4 @@ in (fetchzip { platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile "OpenType/*/*.otf" -x "OpenType/IBM-Plex-Sans-JP/unhinted/*" -d $out/share/fonts/opentype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/inriafonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/inriafonts/default.nix index d8127b8512..1ca1ce2f90 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/inriafonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/inriafonts/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "inriafonts"; version = "1.200"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "BlackFoundry"; - repo = "InriaFonts"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "BlackFoundry"; + repo = "InriaFonts"; + rev = "v${version}"; + hash = "sha256-CMKkwGuUEVYavnFi15FCk7Xloyk97w+LhAZ6mpIv5xg="; + }; + + installPhase = '' + runHook preInstall + install -m444 -Dt $out/share/fonts/truetype fonts/*/TTF/*.ttf install -m444 -Dt $out/share/fonts/opentype fonts/*/OTF/*.otf + + runHook postInstall ''; - sha256 = "0wrwcyycyzvgvgnlmwi1ncdvwb8f6bbclynd1105rsyxgrz5dd70"; meta = with lib; { homepage = "https://black-foundry.com/work/inria"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/inter/default.nix b/third_party/nixpkgs/pkgs/data/fonts/inter/default.nix index 16adc93a9e..46ab699fd3 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/inter/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/inter/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "inter"; version = "3.19"; -in (fetchzip { - name = "inter-${version}"; - url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-${version}.zip"; + src = fetchzip { + url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-${version}.zip"; + stripRoot = false; + hash = "sha256-6kUQUTFtxiJEU6sYC6HzMwm1H4wvaKIoxoY3F6GJJa8="; + }; - sha256 = "sha256-8p15thg3xyvCA/8dH2jGQoc54nzESFDyv5m47FgWrSI="; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/opentype + cp */*.otf $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { homepage = "https://rsms.me/inter/"; @@ -17,10 +26,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ demize dtzWill ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; -}) - +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index 5d55dfbac8..590163fc05 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "17.0.2"; + version = "17.1.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix index d9efb0eedc..53a54f346d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, remarshal +{ stdenv +, lib +, pkgs +, buildNpmPackage +, fetchFromGitHub +, nodejs +, remarshal , ttfautohint-nox # Custom font set options. # See https://typeof.net/Iosevka/customizer @@ -42,70 +48,57 @@ # ''; , extraParameters ? null # Custom font set name. Required if any custom settings above. -, set ? null }: +, set ? null +}: assert (privateBuildPlan != null) -> set != null; assert (extraParameters != null) -> set != null; -let - # We don't know the attribute name for the Iosevka package as it - # changes not when our update script is run (which in turn updates - # node-packages.json, but when node-packages/generate.sh is run - # (which updates node-packages.nix). - # - # Doing it this way ensures that the package can always be built, - # although possibly an older version than ioseva-bin. - nodeIosevka = (import ./node-composition.nix { - inherit pkgs nodejs; - inherit (stdenv.hostPlatform) system; - }).package.override { - src = fetchFromGitHub { - owner = "be5invis"; - repo = "Iosevka"; - rev = "v15.6.3"; - hash = "sha256-wsFx5sD1CjQTcmwpLSt97OYFI8GtVH54uvKQLU1fWTg="; - }; +buildNpmPackage rec { + pname = if set != null then "iosevka-${set}" else "iosevka"; + version = "17.1.0"; + + src = fetchFromGitHub { + owner = "be5invis"; + repo = "iosevka"; + rev = "v${version}"; + hash = "sha256-xGRymDhkNP9b2JYTEu4M/CrRINmMGY2S5ZuM3Ot1wGg="; }; -in -stdenv.mkDerivation rec { - pname = if set != null then "iosevka-${set}" else "iosevka"; - inherit (nodeIosevka) version src; + npmDepsHash = "sha256-Ncf07ggyOnz/2SpgdmaYS2X/8Bad+J2sz8Yyx9Iri3E="; - nativeBuildInputs = [ - nodejs - remarshal - ttfautohint-nox - ]; + nativeBuildInputs = [ nodejs remarshal ttfautohint-nox ]; buildPlan = - if builtins.isAttrs privateBuildPlan - then builtins.toJSON { buildPlans.${pname} = privateBuildPlan; } - else privateBuildPlan; + if builtins.isAttrs privateBuildPlan then + builtins.toJSON { buildPlans.${pname} = privateBuildPlan; } + else + privateBuildPlan; inherit extraParameters; - passAsFile = [ - "extraParameters" - ] ++ lib.optionals (! (builtins.isString privateBuildPlan && lib.hasPrefix builtins.storeDir privateBuildPlan)) [ - "buildPlan" - ]; + passAsFile = [ "extraParameters" ] ++ lib.optionals + ( + !(builtins.isString privateBuildPlan + && lib.hasPrefix builtins.storeDir privateBuildPlan) + ) [ "buildPlan" ]; configurePhase = '' runHook preConfigure ${lib.optionalString (builtins.isAttrs privateBuildPlan) '' remarshal -i "$buildPlanPath" -o private-build-plans.toml -if json -of toml ''} - ${lib.optionalString (builtins.isString privateBuildPlan && (!lib.hasPrefix builtins.storeDir privateBuildPlan)) '' - cp "$buildPlanPath" private-build-plans.toml - ''} - ${lib.optionalString (builtins.isString privateBuildPlan && (lib.hasPrefix builtins.storeDir privateBuildPlan)) '' - cp "$buildPlan" private-build-plans.toml - ''} + ${lib.optionalString (builtins.isString privateBuildPlan + && (!lib.hasPrefix builtins.storeDir privateBuildPlan)) '' + cp "$buildPlanPath" private-build-plans.toml + ''} + ${lib.optionalString (builtins.isString privateBuildPlan + && (lib.hasPrefix builtins.storeDir privateBuildPlan)) '' + cp "$buildPlan" private-build-plans.toml + ''} ${lib.optionalString (extraParameters != null) '' echo -e "\n" >> params/parameters.toml cat "$extraParametersPath" >> params/parameters.toml ''} - ln -s ${nodeIosevka}/lib/node_modules/iosevka/node_modules . runHook postConfigure ''; @@ -126,16 +119,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru = { - updateScript = ./update-default.sh; - }; - meta = with lib; { - homepage = "https://be5invis.github.io/Iosevka"; + homepage = "https://typeof.net/Iosevka/"; downloadPage = "https://github.com/be5invis/Iosevka/releases"; description = '' - Slender monospace sans-serif and slab-serif typeface inspired by Pragmata - Pro, M+ and PF DIN Mono, designed to be the ideal font for programming. + Iosevka is an open-source, sans-serif + slab-serif, monospace + + quasi‑proportional typeface family, designed for writing code, using in + terminals, and preparing technical documents. ''; license = licenses.ofl; platforms = platforms.all; @@ -146,6 +136,7 @@ stdenv.mkDerivation rec { babariviere rileyinman AluisioASG + lunik1 ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/node-composition.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/node-composition.nix deleted file mode 100644 index 2e810490ca..0000000000 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/node-composition.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: - -let - nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; - 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/data/fonts/iosevka/node-packages.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/node-packages.nix deleted file mode 100644 index cff861ddfb..0000000000 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/node-packages.nix +++ /dev/null @@ -1,2697 +0,0 @@ -# This file has been generated by node2nix 1.11.1. Do not edit! - -{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: - -let - sources = { - "@eslint/eslintrc-1.3.0" = { - name = "_at_eslint_slash_eslintrc"; - packageName = "@eslint/eslintrc"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz"; - sha512 = "UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw=="; - }; - }; - "@humanwhocodes/config-array-0.9.5" = { - name = "_at_humanwhocodes_slash_config-array"; - packageName = "@humanwhocodes/config-array"; - version = "0.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz"; - sha512 = "ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw=="; - }; - }; - "@humanwhocodes/object-schema-1.2.1" = { - name = "_at_humanwhocodes_slash_object-schema"; - packageName = "@humanwhocodes/object-schema"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; - sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; - }; - }; - "@iarna/toml-2.2.5" = { - name = "_at_iarna_slash_toml"; - packageName = "@iarna/toml"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz"; - sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; - }; - }; - "@msgpack/msgpack-2.7.2" = { - name = "_at_msgpack_slash_msgpack"; - packageName = "@msgpack/msgpack"; - version = "2.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.7.2.tgz"; - sha512 = "rYEi46+gIzufyYUAoHDnRzkWGxajpD9vVXFQ3g1vbjrBm6P7MBmm+s/fqPa46sxa+8FOUdEuRQKaugo5a4JWpw=="; - }; - }; - "@ot-builder/bin-composite-types-1.5.3" = { - name = "_at_ot-builder_slash_bin-composite-types"; - packageName = "@ot-builder/bin-composite-types"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.5.3.tgz"; - sha512 = "5yZAaqs2/zJjtELtSNjbOlFuvs0bCuadanLjaEQwX6MS88Q3lO8p0y8AbLaXbKlV7ODiHRqqR42F1rpJ9r0KqQ=="; - }; - }; - "@ot-builder/bin-util-1.5.3" = { - name = "_at_ot-builder_slash_bin-util"; - packageName = "@ot-builder/bin-util"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.5.3.tgz"; - sha512 = "wbWc6T40IUvNEvyXVpdLY9ntwI3Sj1Lf/qxb3U8Xhe3PEM42xgBEYecE64eU1Y30faxfY3MSb+M5eVgF+s+Prg=="; - }; - }; - "@ot-builder/cli-help-shower-1.5.3" = { - name = "_at_ot-builder_slash_cli-help-shower"; - packageName = "@ot-builder/cli-help-shower"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.5.3.tgz"; - sha512 = "LFmbbsXvJm9E2swvOq/EHIegP+tJ10bP63+VxFjjN5+q9938WPyT0XtPd1dR2wN2HyRRAExYaNUiyRV6z160tw=="; - }; - }; - "@ot-builder/cli-proc-1.5.3" = { - name = "_at_ot-builder_slash_cli-proc"; - packageName = "@ot-builder/cli-proc"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.5.3.tgz"; - sha512 = "8tovAA4NyPONsJYUdfeWZlI9w1JEeFOW5D3oE+VydbGZw3wIWuK4gz7XgwS4eOM2xM6e/cMpIuzZ4qBmPJCmaA=="; - }; - }; - "@ot-builder/cli-shared-1.5.3" = { - name = "_at_ot-builder_slash_cli-shared"; - packageName = "@ot-builder/cli-shared"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.5.3.tgz"; - sha512 = "6sVkJd1fg5lOEEW2p2GfVUclAFjcnfaTfDaGETAk3tsxW4mYDj5cQP5B7nU7uK09a1545CS5sZHNcdd7mf9RiA=="; - }; - }; - "@ot-builder/common-impl-1.5.3" = { - name = "_at_ot-builder_slash_common-impl"; - packageName = "@ot-builder/common-impl"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.5.3.tgz"; - sha512 = "JSOt5yF/GjtMCQH+0xYUHUB4aGPfN/qo4ocvDd0V5W5AEa4vjwmqHyYSSNkXxXM1zdDe8k5FoQSijpzYzZ3pFw=="; - }; - }; - "@ot-builder/errors-1.5.3" = { - name = "_at_ot-builder_slash_errors"; - packageName = "@ot-builder/errors"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.5.3.tgz"; - sha512 = "NDsKCXNSdDiLyS6/vPDY3qWh/jAP1v3Eol/FtqDqSXOBUPPgg4XGlZR2zl3gSc99YbbSC5KecvRSh99YUMpKPQ=="; - }; - }; - "@ot-builder/io-bin-cff-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-cff"; - packageName = "@ot-builder/io-bin-cff"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.5.3.tgz"; - sha512 = "/oSc2k6hIh1WLpWBwjsoj1dp1KMnsKHM8JnI+undRasuDSi5QnNtbeqKWl+OlYYo5ES8RSopsLg0sCMAP2gnyw=="; - }; - }; - "@ot-builder/io-bin-encoding-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-encoding"; - packageName = "@ot-builder/io-bin-encoding"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.5.3.tgz"; - sha512 = "xG1dBbVHhboHCQ6n5nxnScaevCTShQ5rvFusRrC5MKKHFLL/1Vj2qk28ZWzHYP8nZfO7+ktU2HGsKkydnlWDeg=="; - }; - }; - "@ot-builder/io-bin-ext-private-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-ext-private"; - packageName = "@ot-builder/io-bin-ext-private"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.5.3.tgz"; - sha512 = "zwG4xDd1sAfbdQ4W/u86CMhBYtCK1/Eg04qDUVmBxcM4RBNjqKt55yN+nPTtQ+aeXBYN79DXM7gFZU4rFAmOIA=="; - }; - }; - "@ot-builder/io-bin-font-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-font"; - packageName = "@ot-builder/io-bin-font"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.5.3.tgz"; - sha512 = "fvccA/kbnVwIxNs/qgtTla9vj2www94HKKndF4EvkMINqksyaSoSBlaoddTrzb+caw/kANVGprfBmtjWZBEh+Q=="; - }; - }; - "@ot-builder/io-bin-glyph-store-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-glyph-store"; - packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.5.3.tgz"; - sha512 = "CsSy45gxKjH6Ivl00uprhsuwBWjy9GTfSD39qrXJK+WzIkU8ucM7RRRucwTXR4YKb7sVZUB/wwS+ViQMtu+xKg=="; - }; - }; - "@ot-builder/io-bin-layout-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-layout"; - packageName = "@ot-builder/io-bin-layout"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.5.3.tgz"; - sha512 = "rwAqkyJf+LSj8UFglas9hopsrOKNF4wwm32w/JJwwX/12LCMw68dzdu2qXvVgLHrnkrqjs5xmGDUY1JVkKwYpA=="; - }; - }; - "@ot-builder/io-bin-metadata-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-metadata"; - packageName = "@ot-builder/io-bin-metadata"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.5.3.tgz"; - sha512 = "+wSCWKRJ0HfA2oTXQda7uWmm9CAWhLnIQIz7s/hY92Nd7DXbJQG0c2RE2uXazqe9et8HYF6rqJUhOHHH5AsfbQ=="; - }; - }; - "@ot-builder/io-bin-metric-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-metric"; - packageName = "@ot-builder/io-bin-metric"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.5.3.tgz"; - sha512 = "Og2erTx12QmbguvdFk+5KFyoNOME0QMH2OaCih3G2/P/EJPrHGZEHkw38QsWQPa0LbPfatyhyvrURtZXQo4S9g=="; - }; - }; - "@ot-builder/io-bin-name-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-name"; - packageName = "@ot-builder/io-bin-name"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.5.3.tgz"; - sha512 = "BfJUVaZUrI372f4dHjEED3En0Ve4oItaZcqXPUySUpq9s+MgBIi+3Kq9WrDWlpDKRYLR+CsTrwW69TXBIGIa7w=="; - }; - }; - "@ot-builder/io-bin-sfnt-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-sfnt"; - packageName = "@ot-builder/io-bin-sfnt"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.5.3.tgz"; - sha512 = "tr6EHaV9aWf20veLLa22PSRZwJek/Sgsc6aPghKlSUPdpkL3SIwyVfwDxjzWCQLpcZJXa3YZ+wptuTdMlP7jJw=="; - }; - }; - "@ot-builder/io-bin-ttf-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-ttf"; - packageName = "@ot-builder/io-bin-ttf"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.5.3.tgz"; - sha512 = "A5IAzoqdCTznsqmZ+bSlF6rNuZ1KQXjX5ZqrYtOk2oCj2hdIgCCvZFhnE9dMPQ3oFRzeYGTl1SvxqX+eDZR18Q=="; - }; - }; - "@ot-builder/io-bin-vtt-private-1.5.3" = { - name = "_at_ot-builder_slash_io-bin-vtt-private"; - packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.5.3.tgz"; - sha512 = "vMkjn5WbpEFyy3PkU65AhIX6E0YrPbhZV5Wti9O+m/TDmtgcX+fbe3/LJnVtP2JUHDmCQtxnnb+A2Ymp1mwRdw=="; - }; - }; - "@ot-builder/ot-1.5.3" = { - name = "_at_ot-builder_slash_ot"; - packageName = "@ot-builder/ot"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.5.3.tgz"; - sha512 = "6ZlRH54FjVAf7Vtxlby5+25/fIZC/IIRt8HCE903dKtw6UYG9XJvW7SkPOu18LNNNKHyCzj3LwMawu+LDHtwHw=="; - }; - }; - "@ot-builder/ot-encoding-1.5.3" = { - name = "_at_ot-builder_slash_ot-encoding"; - packageName = "@ot-builder/ot-encoding"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.5.3.tgz"; - sha512 = "jz6Zg1fwYdlliwPWBghzYIOmqgN5S1xTjX/P8/dk0Jn0cpwyGN409uVkUJb3GuVa/sECQUcvnjTx39DlZSM/Qw=="; - }; - }; - "@ot-builder/ot-ext-private-1.5.3" = { - name = "_at_ot-builder_slash_ot-ext-private"; - packageName = "@ot-builder/ot-ext-private"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.5.3.tgz"; - sha512 = "Y233Lrk9Fv4g6k5A/9afPG8E0O28JWKjl7Gv2AW65bL9A7NCyHI6F7SgCLVcbPWj8jyEJ0urm43hsSNeBDqZdQ=="; - }; - }; - "@ot-builder/ot-glyphs-1.5.3" = { - name = "_at_ot-builder_slash_ot-glyphs"; - packageName = "@ot-builder/ot-glyphs"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.5.3.tgz"; - sha512 = "AIvIui15gNip1Zz3WLWFj/lYOLJWMNF1KDZ/sm3Ig+sTLM70C31AKNzA5HCDKQkKlWjE6IDsJ6gBCE2dwZNApg=="; - }; - }; - "@ot-builder/ot-layout-1.5.3" = { - name = "_at_ot-builder_slash_ot-layout"; - packageName = "@ot-builder/ot-layout"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.5.3.tgz"; - sha512 = "3yHkyFYAHZJRUtBO9XCOnVTEsOPpUZEOcxjZ9yznID7CGW3LnFe1CmEByJcWf4YPXNQ7fmu0A4qvKGiB7v5oQw=="; - }; - }; - "@ot-builder/ot-metadata-1.5.3" = { - name = "_at_ot-builder_slash_ot-metadata"; - packageName = "@ot-builder/ot-metadata"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.5.3.tgz"; - sha512 = "0wgd74aZEeBsCRgVTxXQV+0hrgbgRPIM8LVcaJCoS5G5ADGamlriyFCd0DEJkMOvvEcm7fDw5G/BBNIj0nhsag=="; - }; - }; - "@ot-builder/ot-name-1.5.3" = { - name = "_at_ot-builder_slash_ot-name"; - packageName = "@ot-builder/ot-name"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.5.3.tgz"; - sha512 = "OyLlvvUKulBmwpv6OPipUyN/EWVxyjx2a4LohoYyh5NQKjWuyVcpcknd90LDdCTEEw5WNvkIyo7cqkf3MOehxQ=="; - }; - }; - "@ot-builder/ot-sfnt-1.5.3" = { - name = "_at_ot-builder_slash_ot-sfnt"; - packageName = "@ot-builder/ot-sfnt"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.5.3.tgz"; - sha512 = "YnDHrVTd48LPe7Zhjveije8f04okb/Le55PurHFKmJlWJSG2b6DGXkZd7Dov/jZoiPUeFO6suaRqkw0Em/4mVg=="; - }; - }; - "@ot-builder/ot-standard-glyph-namer-1.5.3" = { - name = "_at_ot-builder_slash_ot-standard-glyph-namer"; - packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.5.3.tgz"; - sha512 = "j1n938jXFVgHl+QnZVZG/nfKIAD/UgbPHB4kzAl9RKWfQXDBZn9kL8GZ3HpBydIUTAD2YYzYRYMvopfr0p7tww=="; - }; - }; - "@ot-builder/ot-vtt-private-1.5.3" = { - name = "_at_ot-builder_slash_ot-vtt-private"; - packageName = "@ot-builder/ot-vtt-private"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.5.3.tgz"; - sha512 = "qz2Rw5ixqCtWj3dWdkVo4rRHfi8vHY42/52IV/Wrs+s1MITCTJEus2GTMCj9Z3W/SkwBvDeC0OGWA3CbdVj3Zw=="; - }; - }; - "@ot-builder/prelude-1.5.3" = { - name = "_at_ot-builder_slash_prelude"; - packageName = "@ot-builder/prelude"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.5.3.tgz"; - sha512 = "eevWMoYnh4pdQutfCsoSjFUMkGawnBtUllnFxjj/tpfWMSAQFb8vOufQJYP/GS8jn6VKum4+RR88FVgEZ0xPvg=="; - }; - }; - "@ot-builder/primitive-1.5.3" = { - name = "_at_ot-builder_slash_primitive"; - packageName = "@ot-builder/primitive"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.5.3.tgz"; - sha512 = "iOy+WoWOWFW3dvqTVmh9/qpYHXiqq8cscnWM5IWkOTKJqUICSyacW/qCXIcZejtvTltAHKbIYvNPpNtQl1me/A=="; - }; - }; - "@ot-builder/rectify-1.5.3" = { - name = "_at_ot-builder_slash_rectify"; - packageName = "@ot-builder/rectify"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.5.3.tgz"; - sha512 = "VSXtw20D1bKZcT7mlMMvn7TW4f3tsObyfJeOcemoIh6HkrbJZYEIhsGO5l260tWOI+XsXVSJeGPGMj0ZlVnuAQ=="; - }; - }; - "@ot-builder/stat-glyphs-1.5.3" = { - name = "_at_ot-builder_slash_stat-glyphs"; - packageName = "@ot-builder/stat-glyphs"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.5.3.tgz"; - sha512 = "4wXLbCM1oKhVoMVRR1YLXM7ncQWI/pYmPd7TKH9TbBEnGAX83+rWcoTUkD5egMftpCVmbpNy6grsAF3/BFQpOg=="; - }; - }; - "@ot-builder/trace-1.5.3" = { - name = "_at_ot-builder_slash_trace"; - packageName = "@ot-builder/trace"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.5.3.tgz"; - sha512 = "P1DQOtIDX8as9UGFM9GuUlxXgH3/3Qrizv+HMtFM2FASbn2q7IbIW/MKAO7uIV+UeqW2XAAGV7wRR6/KScGX2w=="; - }; - }; - "@ot-builder/var-store-1.5.3" = { - name = "_at_ot-builder_slash_var-store"; - packageName = "@ot-builder/var-store"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.5.3.tgz"; - sha512 = "+cMMLYkwgPXx9uaq7aw/8yuXG9/OuULM89GcRJRYJJ/unsPWNefDbTH69J9oKVyRjxc6mfl7jKxwQKbU51Zb2A=="; - }; - }; - "@ot-builder/variance-1.5.3" = { - name = "_at_ot-builder_slash_variance"; - packageName = "@ot-builder/variance"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.5.3.tgz"; - sha512 = "H19XizofoeoyJaaH2PjygykKJ7BhTRPWgQk4S+qpzIj/6LUN267tbCyQWomq8OW8EVUwGHuxBqKzQf6iAt7pag=="; - }; - }; - "@types/json5-0.0.29" = { - name = "_at_types_slash_json5"; - packageName = "@types/json5"; - version = "0.0.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"; - sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="; - }; - }; - "@unicode/unicode-14.0.0-1.2.2" = { - name = "_at_unicode_slash_unicode-14.0.0"; - packageName = "@unicode/unicode-14.0.0"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@unicode/unicode-14.0.0/-/unicode-14.0.0-1.2.2.tgz"; - sha512 = "NMs5JhYXGojBQJNJ7DumqktgRqs95Qt1cj6JMPz8lKBfHYRTRn7Am4CdyX/hS1zTn1lKwsWXBpMP9Hp0nelINg=="; - }; - }; - "@xmldom/xmldom-0.8.2" = { - name = "_at_xmldom_slash_xmldom"; - packageName = "@xmldom/xmldom"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.2.tgz"; - sha512 = "+R0juSseERyoPvnBQ/cZih6bpF7IpCXlWbHRoCRzYzqpz6gWHOgf8o4MOEf6KBVuOyqU+gCNLkCWVIJAro8XyQ=="; - }; - }; - "acorn-8.7.1" = { - name = "acorn"; - packageName = "acorn"; - version = "8.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz"; - sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; - }; - }; - "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=="; - }; - }; - "aglfn-1.0.2" = { - name = "aglfn"; - packageName = "aglfn"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/aglfn/-/aglfn-1.0.2.tgz"; - sha512 = "HUvXd7sNFa1aHtYgJnln2jPwzq7UAAOXhYH/+AY6BMdfXxprMxG8IrczlZn6MjjIWpYhpKR5mHwDWTgehZKO4g=="; - }; - }; - "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=="; - }; - }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha512 = "S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg=="; - }; - }; - "ansi-regex-5.0.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; - }; - }; - "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=="; - }; - }; - "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=="; - }; - }; - "array-includes-3.1.5" = { - name = "array-includes"; - packageName = "array-includes"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz"; - sha512 = "iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ=="; - }; - }; - "array.prototype.flat-1.3.0" = { - name = "array.prototype.flat"; - packageName = "array.prototype.flat"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz"; - sha512 = "12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw=="; - }; - }; - "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=="; - }; - }; - "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=="; - }; - }; - "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=="; - }; - }; - "chainsaw-0.0.9" = { - name = "chainsaw"; - packageName = "chainsaw"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/chainsaw/-/chainsaw-0.0.9.tgz"; - sha512 = "nG8PYH+/4xB+8zkV4G844EtfvZ5tTiLFoX3dZ4nhF4t3OCKIb9UvaFyNmeZO2zOSmRWzBoTD+napN6hiL+EgcA=="; - }; - }; - "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=="; - }; - }; - "cldr-7.2.0" = { - name = "cldr"; - packageName = "cldr"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cldr/-/cldr-7.2.0.tgz"; - sha512 = "NJB6wpFlIVrS4BhA/Q1a6UuS6MuFr5o2XhfosM6a+W+rad/Rt0HLLX3kuXdRrwHQZvla25iuzTkRnxOKjS+VhQ=="; - }; - }; - "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=="; - }; - }; - "clipper-lib-6.4.2" = { - name = "clipper-lib"; - packageName = "clipper-lib"; - version = "6.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clipper-lib/-/clipper-lib-6.4.2.tgz"; - sha512 = "knglhjQX5ihNj/XCIs6zCHrTemdvHY3LPZP9XB2nq2/3igyYMFueFXtfp84baJvEE+f8pO1ZS4UVeEgmLnAprQ=="; - }; - }; - "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=="; - }; - }; - "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.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=="; - }; - }; - "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"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - }; - "cross-spawn-7.0.3" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; - }; - }; - "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.4" = { - name = "debug"; - packageName = "debug"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; - }; - }; - "deep-is-0.1.4" = { - name = "deep-is"; - packageName = "deep-is"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; - sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; - }; - }; - "define-properties-1.1.4" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; - }; - }; - "doctrine-2.1.0" = { - name = "doctrine"; - packageName = "doctrine"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"; - sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; - }; - }; - "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=="; - }; - }; - "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=="; - }; - }; - "es-abstract-1.20.1" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.20.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz"; - sha512 = "WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA=="; - }; - }; - "es-shim-unscopables-1.0.0" = { - name = "es-shim-unscopables"; - packageName = "es-shim-unscopables"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"; - sha512 = "Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w=="; - }; - }; - "es-to-primitive-1.2.1" = { - name = "es-to-primitive"; - packageName = "es-to-primitive"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; - }; - }; - "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-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=="; - }; - }; - "escodegen-1.3.3" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; - sha512 = "z9FWgKc48wjMlpzF5ymKS1AF8OIgnKLp9VyN7KbdtyrP/9lndwUFqCtMm+TAJmJf7KJFFYc4cFJfVTTGkKEwsA=="; - }; - }; - "escodegen-2.0.0" = { - name = "escodegen"; - packageName = "escodegen"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz"; - sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; - }; - }; - "escope-1.0.3" = { - name = "escope"; - packageName = "escope"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz"; - sha512 = "PgST3E92KAnuUX/4PXwpE9RI8jubyyTGIN73mfhl0XP4H+hiA7JqvhXNfffs+naSk41Eipq/klcmoGsCrjxPlQ=="; - }; - }; - "eslint-8.18.0" = { - name = "eslint"; - packageName = "eslint"; - version = "8.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz"; - sha512 = "As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA=="; - }; - }; - "eslint-config-prettier-8.5.0" = { - name = "eslint-config-prettier"; - packageName = "eslint-config-prettier"; - version = "8.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz"; - sha512 = "obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q=="; - }; - }; - "eslint-import-resolver-node-0.3.6" = { - name = "eslint-import-resolver-node"; - packageName = "eslint-import-resolver-node"; - version = "0.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz"; - sha512 = "0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw=="; - }; - }; - "eslint-module-utils-2.7.3" = { - name = "eslint-module-utils"; - packageName = "eslint-module-utils"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz"; - sha512 = "088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ=="; - }; - }; - "eslint-plugin-import-2.26.0" = { - name = "eslint-plugin-import"; - packageName = "eslint-plugin-import"; - version = "2.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz"; - sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; - }; - }; - "eslint-scope-7.1.1" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz"; - sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw=="; - }; - }; - "eslint-utils-3.0.0" = { - name = "eslint-utils"; - packageName = "eslint-utils"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"; - sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; - }; - }; - "eslint-visitor-keys-2.1.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; - sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; - }; - }; - "eslint-visitor-keys-3.3.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"; - sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; - }; - }; - "esmangle-1.0.1" = { - name = "esmangle"; - packageName = "esmangle"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz"; - sha512 = "+vgj0CirCf7fiZ5Cy1VH7ZovC1qh42mB6GBVN3cxLwZgY1CqIvu9xOdDW8il8Y8ym+fiFLCM3crZFku8rBNLOA=="; - }; - }; - "espree-9.3.2" = { - name = "espree"; - packageName = "espree"; - version = "9.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz"; - sha512 = "D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA=="; - }; - }; - "esprima-1.1.1" = { - name = "esprima"; - packageName = "esprima"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; - sha512 = "qxxB994/7NtERxgXdFgLHIs9M6bhLXc6qtUmWZ3L8+gTQ9qaoyki2887P2IqAYsoENyr8SUbTutStDniOHSDHg=="; - }; - }; - "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=="; - }; - }; - "esshorten-1.1.1" = { - name = "esshorten"; - packageName = "esshorten"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz"; - sha512 = "jvHUQncAuUI/HOzw1a94cGDdgyRUUcVDABU24X2TRb+y4G3ohSllMKjG+ROQVjj5OEVhXYwwsV+OpLOJ63snEA=="; - }; - }; - "estraverse-1.5.1" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; - sha512 = "FpCjJDfmo3vsc/1zKSeqR5k42tcIhxFIlvq+h9j0fO2q/h2uLKyweq7rYJ+0CoVvrGQOxIS5wyBrW/+vF58BUQ=="; - }; - }; - "estraverse-2.0.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz"; - sha512 = "3liNs3aDBUmf9Hl3YRLqz7Zop0iiTxWaa/ayuxoVS441zjjTPowZJ/uH3y5yhPcXmrLj2rS6Pvu7tfOC7kT61A=="; - }; - }; - "estraverse-4.1.1" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz"; - sha512 = "r3gEa6vc6lGQdrXfo834EaaqnOzYmik8JPg8VB95acIMZRjqaHI0/WMZFoMBGPtS+HCgylwTLoc4Y5yl0owOHQ=="; - }; - }; - "estraverse-5.3.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"; - sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; - }; - }; - "esutils-1.0.0" = { - name = "esutils"; - packageName = "esutils"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; - sha512 = "x/iYH53X3quDwfHRz4y8rn4XcEwwCJeWsul9pF1zldMbGtgOtMNBEOuYWwB1EQlK2LRa1fev3YAgym/RElp5Cg=="; - }; - }; - "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=="; - }; - }; - "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.0.7" = { - name = "fast-levenshtein"; - packageName = "fast-levenshtein"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz"; - sha512 = "hYsfI0s4lfQ2rHVFKXwAr/L/ZSbq9TZwgXtZqW7ANcn9o9GKvcbWxOnxx7jykXf/Ezv1V8TvaBEKcGK7DWKX5A=="; - }; - }; - "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"; - sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; - }; - }; - "file-entry-cache-6.0.1" = { - name = "file-entry-cache"; - packageName = "file-entry-cache"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; - }; - }; - "find-up-2.1.0" = { - name = "find-up"; - packageName = "find-up"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; - sha512 = "NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ=="; - }; - }; - "flat-cache-3.0.4" = { - name = "flat-cache"; - packageName = "flat-cache"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"; - sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; - }; - }; - "flatted-3.2.5" = { - name = "flatted"; - packageName = "flatted"; - version = "3.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; - sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; - }; - }; - "fs-extra-10.1.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz"; - sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; - }; - }; - "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"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - }; - "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=="; - }; - }; - "function.prototype.name-1.1.5" = { - name = "function.prototype.name"; - packageName = "function.prototype.name"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; - sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; - }; - }; - "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"; - sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; - }; - }; - "functions-have-names-1.2.3" = { - name = "functions-have-names"; - packageName = "functions-have-names"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"; - sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; - }; - }; - "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-intrinsic-1.1.2" = { - name = "get-intrinsic"; - packageName = "get-intrinsic"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz"; - sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; - }; - }; - "get-symbol-description-1.0.0" = { - name = "get-symbol-description"; - packageName = "get-symbol-description"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; - }; - }; - "glob-7.2.3" = { - name = "glob"; - packageName = "glob"; - version = "7.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - }; - "glob-parent-6.0.2" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"; - sha512 = "XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="; - }; - }; - "globals-13.15.0" = { - name = "globals"; - packageName = "globals"; - version = "13.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz"; - sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; - }; - }; - "graceful-fs-4.2.10" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; - }; - }; - "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-bigints-1.0.2" = { - name = "has-bigints"; - packageName = "has-bigints"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"; - sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; - }; - }; - "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-property-descriptors-1.0.0" = { - name = "has-property-descriptors"; - packageName = "has-property-descriptors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; - }; - }; - "has-symbols-1.0.3" = { - name = "has-symbols"; - packageName = "has-symbols"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - }; - "has-tostringtag-1.0.0" = { - name = "has-tostringtag"; - packageName = "has-tostringtag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; - }; - }; - "hashish-0.0.4" = { - name = "hashish"; - packageName = "hashish"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/hashish/-/hashish-0.0.4.tgz"; - sha512 = "xyD4XgslstNAs72ENaoFvgMwtv8xhiDtC2AtzCG+8yF7W/Knxxm9BX+e2s25mm+HxMKh0rBmXVOEGF3zNImXvA=="; - }; - }; - "iconv-lite-0.6.3" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; - }; - }; - "ignore-5.2.0" = { - name = "ignore"; - packageName = "ignore"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; - sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; - }; - }; - "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"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - }; - "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"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - }; - "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=="; - }; - }; - "internal-slot-1.0.3" = { - name = "internal-slot"; - packageName = "internal-slot"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; - }; - }; - "is-bigint-1.0.4" = { - name = "is-bigint"; - packageName = "is-bigint"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"; - sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; - }; - }; - "is-boolean-object-1.1.2" = { - name = "is-boolean-object"; - packageName = "is-boolean-object"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; - sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; - }; - }; - "is-callable-1.2.4" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"; - sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; - }; - }; - "is-core-module-2.9.0" = { - name = "is-core-module"; - packageName = "is-core-module"; - version = "2.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"; - sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; - }; - }; - "is-date-object-1.0.5" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; - sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; - }; - }; - "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"; - sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; - }; - }; - "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-4.0.3" = { - name = "is-glob"; - packageName = "is-glob"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; - sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; - }; - }; - "is-negative-zero-2.0.2" = { - name = "is-negative-zero"; - packageName = "is-negative-zero"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; - sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; - }; - }; - "is-number-object-1.0.7" = { - name = "is-number-object"; - packageName = "is-number-object"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"; - sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; - }; - }; - "is-regex-1.1.4" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; - sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; - }; - }; - "is-shared-array-buffer-1.0.2" = { - name = "is-shared-array-buffer"; - packageName = "is-shared-array-buffer"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; - sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; - }; - }; - "is-string-1.0.7" = { - name = "is-string"; - packageName = "is-string"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"; - sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; - }; - }; - "is-symbol-1.0.4" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"; - sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; - }; - }; - "is-weakref-1.0.2" = { - name = "is-weakref"; - packageName = "is-weakref"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"; - sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; - }; - }; - "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"; - sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; - }; - }; - "js-yaml-4.1.0" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; - sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; - }; - }; - "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"; - sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; - }; - }; - "json5-1.0.1" = { - name = "json5"; - packageName = "json5"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; - sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; - }; - }; - "jsonfile-6.1.0" = { - name = "jsonfile"; - packageName = "jsonfile"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; - }; - }; - "levn-0.2.5" = { - name = "levn"; - packageName = "levn"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz"; - sha512 = "mvp+NO++YH0B+e8cC/SvJxk6k5Z9Ngd3iXuz7tmT8vZCyQZj/5SI1GkFOiZGGPkm5wWGI9SUrqiAfPq7BJH+0w=="; - }; - }; - "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"; - sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; - }; - }; - "levn-0.4.1" = { - name = "levn"; - packageName = "levn"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"; - sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; - }; - }; - "locate-path-2.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; - sha512 = "NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA=="; - }; - }; - "lodash.merge-4.6.2" = { - name = "lodash.merge"; - packageName = "lodash.merge"; - version = "4.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"; - sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; - }; - }; - "lru-cache-2.5.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; - sha512 = "dVmQmXPBlTgFw77hm60ud//l2bCuDKkqC2on1EBoM7s9Urm9IQDrnujwZ93NFnAq0dVZ0HBXTS7PwEG+YE7+EQ=="; - }; - }; - "lru-cache-6.0.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - }; - "memoizeasync-1.1.0" = { - name = "memoizeasync"; - packageName = "memoizeasync"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memoizeasync/-/memoizeasync-1.1.0.tgz"; - sha512 = "HMfzdLqClZo8HMyuM9B6TqnXCNhw82iVWRLqd2cAdXi063v2iJB4mQfWFeKVByN8VUwhmDZ8NMhryBwKrPRf8Q=="; - }; - }; - "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.1.2" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; - }; - }; - "minimist-1.2.6" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"; - sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; - }; - }; - "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"; - sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; - }; - }; - "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=="; - }; - }; - "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"; - sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; - }; - }; - "object-inspect-1.12.2" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.12.2"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; - sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; - }; - }; - "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.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.values-1.1.5" = { - name = "object.values"; - packageName = "object.values"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz"; - sha512 = "QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg=="; - }; - }; - "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"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - }; - "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.3.0" = { - name = "optionator"; - packageName = "optionator"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz"; - sha512 = "qM6AKy0HNNRczFIFciGVSkh6H5yu8kC2hdgqElG8pM6IvQwFYVBd3aUrqjsgZtauuGZr2u/Nf+wLzlZgeCqpSQ=="; - }; - }; - "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=="; - }; - }; - "optionator-0.9.1" = { - name = "optionator"; - packageName = "optionator"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"; - sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; - }; - }; - "ot-builder-1.5.3" = { - name = "ot-builder"; - packageName = "ot-builder"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.5.3.tgz"; - sha512 = "SLKp4TM/4ZUVLUMKHOVoZajocaC5WmcY9H3r7PIfCbHUQXLfcsRvo3OIo5vcRZLG3dvZ71eoQr9GqSICvaZEcw=="; - }; - }; - "otb-ttc-bundle-1.5.3" = { - name = "otb-ttc-bundle"; - packageName = "otb-ttc-bundle"; - version = "1.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.5.3.tgz"; - sha512 = "Uq2trJQEGM1a8z1C0sNgVS6FxsNP6YLWJD2+bH5K53ARnxXNzEINf0lckmgLLClW/uScALn8OlNXhD7vnbdZ6w=="; - }; - }; - "p-limit-1.3.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz"; - sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; - }; - }; - "p-locate-2.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; - sha512 = "nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg=="; - }; - }; - "p-try-1.0.0" = { - name = "p-try"; - packageName = "p-try"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha512 = "U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww=="; - }; - }; - "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=="; - }; - }; - "passerror-1.1.1" = { - name = "passerror"; - packageName = "passerror"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/passerror/-/passerror-1.1.1.tgz"; - sha512 = "PwrEQJBkJMxnxG+tdraz95vTstYnCRqiURNbGtg/vZHLgcAODc9hbiD5ZumGUoh3bpw0F0qKLje7Vd2Fd5Lx3g=="; - }; - }; - "patel-0.38.0" = { - name = "patel"; - packageName = "patel"; - version = "0.38.0"; - src = fetchurl { - url = "https://registry.npmjs.org/patel/-/patel-0.38.0.tgz"; - sha512 = "Bzhgo3HTG1phko50ULaBEi7wBZxJLgt0BZDJDjdIhSz+ZlhsY6+yDvXAJcXAtTwcqSR4F5j2Yc2Gqkornk9D5A=="; - }; - }; - "path-exists-3.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha512 = "bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="; - }; - }; - "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"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - }; - "path-key-3.1.1" = { - name = "path-key"; - packageName = "path-key"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"; - sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; - }; - }; - "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=="; - }; - }; - "patrisika-0.25.0" = { - name = "patrisika"; - packageName = "patrisika"; - version = "0.25.0"; - src = fetchurl { - url = "https://registry.npmjs.org/patrisika/-/patrisika-0.25.0.tgz"; - sha512 = "Kevy01SFkhzON30J1nKVzHPdoJmkmRY2HG+OIFeI/IT4eBveQwbrE3Q2beEx9t02HhMyAlnYFXt0z5wNY6mePA=="; - }; - }; - "patrisika-scopes-0.12.0" = { - name = "patrisika-scopes"; - packageName = "patrisika-scopes"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.12.0.tgz"; - sha512 = "rj428KYq5leS75PCDl6iyl91n6/d63yw1ikHYwd1z9UXwWk11Vj2gpTu0CxjLZJJOiFNA01LiX+WMpC5icCKng=="; - }; - }; - "pegjs-0.10.0" = { - name = "pegjs"; - packageName = "pegjs"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; - sha512 = "qI5+oFNEGi3L5HAxDwN2LA4Gg7irF70Zs25edhjld9QemOgp0CbvMtbFcMvFtEo1OityPrcCzkQFB8JP/hxgow=="; - }; - }; - "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"; - sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; - }; - }; - "prelude-ls-1.2.1" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"; - sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; - }; - }; - "prettier-2.7.1" = { - name = "prettier"; - packageName = "prettier"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz"; - sha512 = "ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g=="; - }; - }; - "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=="; - }; - }; - "regexp.prototype.flags-1.4.3" = { - name = "regexp.prototype.flags"; - packageName = "regexp.prototype.flags"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; - sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; - }; - }; - "regexpp-3.2.0" = { - name = "regexpp"; - packageName = "regexpp"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"; - sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; - }; - }; - "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"; - sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; - }; - }; - "resolve-1.22.1" = { - name = "resolve"; - packageName = "resolve"; - version = "1.22.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; - sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; - }; - }; - "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=="; - }; - }; - "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=="; - }; - }; - "resumer-0.0.0" = { - name = "resumer"; - packageName = "resumer"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz"; - sha512 = "Fn9X8rX8yYF4m81rZCK/5VmrmsSbqS/i3rDLl6ZZHAXgC2nTAx3dhwG8q8odP/RmdLa2YrybDJaAMg+X1ajY3w=="; - }; - }; - "rimraf-3.0.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; - }; - }; - "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=="; - }; - }; - "semaphore-async-await-1.5.1" = { - name = "semaphore-async-await"; - packageName = "semaphore-async-await"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz"; - sha512 = "b/ptP11hETwYWpeilHXXQiV5UJNJl7ZWWooKRE5eBIYWoom6dZ0SluCIdCtKycsMtZgKWE01/qAw6jblw1YVhg=="; - }; - }; - "semver-7.3.7" = { - name = "semver"; - packageName = "semver"; - version = "7.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; - }; - }; - "seq-0.3.5" = { - name = "seq"; - packageName = "seq"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/seq/-/seq-0.3.5.tgz"; - sha512 = "sisY2Ln1fj43KBkRtXkesnRHYNdswIkIibvNe/0UKm2GZxjMbqmccpiatoKr/k2qX5VKiLU8xm+tz/74LAho4g=="; - }; - }; - "shebang-command-2.0.0" = { - name = "shebang-command"; - packageName = "shebang-command"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"; - sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; - }; - }; - "shebang-regex-3.0.0" = { - name = "shebang-regex"; - packageName = "shebang-regex"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; - }; - }; - "side-channel-1.0.4" = { - name = "side-channel"; - packageName = "side-channel"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; - }; - }; - "signal-exit-3.0.7" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; - sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; - }; - }; - "source-map-0.1.43" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.43"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; - sha512 = "VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ=="; - }; - }; - "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=="; - }; - }; - "spiro-3.0.0" = { - name = "spiro"; - packageName = "spiro"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/spiro/-/spiro-3.0.0.tgz"; - sha512 = "UEhtLWA8fDQuExOKpT3FLa7Rk238G5Bm3wGAxbvnah3H2X6yEL4blIkAsc38wNwMXBwQFRYE6l0Q9X0t1izOxA=="; - }; - }; - "string-width-4.2.3" = { - name = "string-width"; - packageName = "string-width"; - version = "4.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; - sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; - }; - }; - "string.prototype.trimend-1.0.5" = { - name = "string.prototype.trimend"; - packageName = "string.prototype.trimend"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; - sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; - }; - }; - "string.prototype.trimstart-1.0.5" = { - name = "string.prototype.trimstart"; - packageName = "string.prototype.trimstart"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; - sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; - }; - }; - "strip-ansi-6.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; - }; - }; - "strip-bom-3.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha512 = "vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="; - }; - }; - "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=="; - }; - }; - "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-preserve-symlinks-flag-1.0.0" = { - name = "supports-preserve-symlinks-flag"; - packageName = "supports-preserve-symlinks-flag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; - sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; - }; - }; - "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"; - sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; - }; - }; - "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"; - sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; - }; - }; - "toposort-2.0.2" = { - name = "toposort"; - packageName = "toposort"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"; - sha512 = "0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg=="; - }; - }; - "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"; - sha512 = "iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ=="; - }; - }; - "tsconfig-paths-3.14.1" = { - name = "tsconfig-paths"; - packageName = "tsconfig-paths"; - version = "3.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"; - sha512 = "fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ=="; - }; - }; - "tslib-2.4.0" = { - name = "tslib"; - packageName = "tslib"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"; - sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; - }; - }; - "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"; - sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; - }; - }; - "type-check-0.4.0" = { - name = "type-check"; - packageName = "type-check"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"; - sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; - }; - }; - "type-fest-0.20.2" = { - name = "type-fest"; - packageName = "type-fest"; - version = "0.20.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; - sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; - }; - }; - "typo-geom-0.12.1" = { - name = "typo-geom"; - packageName = "typo-geom"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.12.1.tgz"; - sha512 = "W20RYp2OCEGMhEYayR0cAP67AUWiGRUufMs6Clul7MAmu5SpLuOG/RWk7+LkL65wsugcfhPQlFEJ231C2xHNQg=="; - }; - }; - "unbox-primitive-1.0.2" = { - name = "unbox-primitive"; - packageName = "unbox-primitive"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; - sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; - }; - }; - "unicoderegexp-0.4.1" = { - name = "unicoderegexp"; - packageName = "unicoderegexp"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unicoderegexp/-/unicoderegexp-0.4.1.tgz"; - sha512 = "ydh8D5mdd2ldTS25GtZJEgLciuF0Qf2n3rwPhonELk3HioX201ClYGvZMc1bCmx6nblZiADQwbMWekeIqs51qw=="; - }; - }; - "universalify-2.0.0" = { - name = "universalify"; - packageName = "universalify"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; - }; - }; - "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=="; - }; - }; - "uuid-8.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; - sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; - }; - }; - "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=="; - }; - }; - "verda-1.10.0" = { - name = "verda"; - packageName = "verda"; - version = "1.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.10.0.tgz"; - sha512 = "euo21L72IMCzrQ9GrYGEI1kmQT6bgKcfJaa0zr4a+FpODsOrszDk55SYsvAqKUMzgXJHAGh4LvE9ytu45E79OA=="; - }; - }; - "wawoff2-2.0.1" = { - name = "wawoff2"; - packageName = "wawoff2"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wawoff2/-/wawoff2-2.0.1.tgz"; - sha512 = "r0CEmvpH63r4T15ebFqeOjGqU4+EgTx4I510NtK35EMciSdcTxCw3Byy3JnBonz7iyIFZ0AbVo0bbFpEVuhCYA=="; - }; - }; - "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-boxed-primitive-1.0.2" = { - name = "which-boxed-primitive"; - packageName = "which-boxed-primitive"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; - sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; - }; - }; - "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=="; - }; - }; - "wordwrap-0.0.3" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - sha512 = "1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw=="; - }; - }; - "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"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - }; - "xpath-0.0.32" = { - name = "xpath"; - packageName = "xpath"; - version = "0.0.32"; - src = fetchurl { - url = "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz"; - sha512 = "rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw=="; - }; - }; - "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=="; - }; - }; - "yallist-4.0.0" = { - name = "yallist"; - packageName = "yallist"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; - sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; - }; - }; - "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-17.5.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz"; - sha512 = "t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA=="; - }; - }; - "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-21.0.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "21.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"; - sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; - }; - }; - }; - args = { - name = "iosevka"; - packageName = "iosevka"; - version = "15.6.3"; - src = ./.; - dependencies = [ - sources."@eslint/eslintrc-1.3.0" - sources."@humanwhocodes/config-array-0.9.5" - sources."@humanwhocodes/object-schema-1.2.1" - sources."@iarna/toml-2.2.5" - sources."@msgpack/msgpack-2.7.2" - sources."@ot-builder/bin-composite-types-1.5.3" - sources."@ot-builder/bin-util-1.5.3" - sources."@ot-builder/cli-help-shower-1.5.3" - sources."@ot-builder/cli-proc-1.5.3" - sources."@ot-builder/cli-shared-1.5.3" - sources."@ot-builder/common-impl-1.5.3" - sources."@ot-builder/errors-1.5.3" - sources."@ot-builder/io-bin-cff-1.5.3" - sources."@ot-builder/io-bin-encoding-1.5.3" - sources."@ot-builder/io-bin-ext-private-1.5.3" - sources."@ot-builder/io-bin-font-1.5.3" - sources."@ot-builder/io-bin-glyph-store-1.5.3" - sources."@ot-builder/io-bin-layout-1.5.3" - sources."@ot-builder/io-bin-metadata-1.5.3" - sources."@ot-builder/io-bin-metric-1.5.3" - sources."@ot-builder/io-bin-name-1.5.3" - sources."@ot-builder/io-bin-sfnt-1.5.3" - sources."@ot-builder/io-bin-ttf-1.5.3" - sources."@ot-builder/io-bin-vtt-private-1.5.3" - sources."@ot-builder/ot-1.5.3" - sources."@ot-builder/ot-encoding-1.5.3" - sources."@ot-builder/ot-ext-private-1.5.3" - sources."@ot-builder/ot-glyphs-1.5.3" - sources."@ot-builder/ot-layout-1.5.3" - sources."@ot-builder/ot-metadata-1.5.3" - sources."@ot-builder/ot-name-1.5.3" - sources."@ot-builder/ot-sfnt-1.5.3" - sources."@ot-builder/ot-standard-glyph-namer-1.5.3" - sources."@ot-builder/ot-vtt-private-1.5.3" - sources."@ot-builder/prelude-1.5.3" - sources."@ot-builder/primitive-1.5.3" - sources."@ot-builder/rectify-1.5.3" - sources."@ot-builder/stat-glyphs-1.5.3" - sources."@ot-builder/trace-1.5.3" - sources."@ot-builder/var-store-1.5.3" - sources."@ot-builder/variance-1.5.3" - sources."@types/json5-0.0.29" - sources."@unicode/unicode-14.0.0-1.2.2" - sources."@xmldom/xmldom-0.8.2" - sources."acorn-8.7.1" - sources."acorn-jsx-5.3.2" - sources."aglfn-1.0.2" - sources."ajv-6.12.6" - sources."amdefine-1.0.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."array-includes-3.1.5" - sources."array.prototype.flat-1.3.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."call-bind-1.0.2" - sources."callsites-3.1.0" - sources."chainsaw-0.0.9" - sources."chalk-4.1.2" - sources."cldr-7.2.0" - sources."cli-cursor-3.1.0" - sources."clipper-lib-6.4.2" - sources."cliui-7.0.4" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."concat-map-0.0.1" - sources."cross-spawn-7.0.3" - sources."debug-4.3.4" - sources."deep-is-0.1.4" - sources."define-properties-1.1.4" - sources."doctrine-3.0.0" - sources."emoji-regex-8.0.0" - sources."es-abstract-1.20.1" - sources."es-shim-unscopables-1.0.0" - sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" - sources."escape-string-regexp-4.0.0" - sources."escodegen-2.0.0" - (sources."escope-1.0.3" // { - dependencies = [ - sources."estraverse-2.0.0" - ]; - }) - (sources."eslint-8.18.0" // { - dependencies = [ - sources."optionator-0.9.1" - ]; - }) - sources."eslint-config-prettier-8.5.0" - (sources."eslint-import-resolver-node-0.3.6" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."eslint-module-utils-2.7.3" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) - (sources."eslint-plugin-import-2.26.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."doctrine-2.1.0" - sources."ms-2.0.0" - ]; - }) - sources."eslint-scope-7.1.1" - (sources."eslint-utils-3.0.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) - sources."eslint-visitor-keys-3.3.0" - (sources."esmangle-1.0.1" // { - dependencies = [ - sources."escodegen-1.3.3" - sources."esprima-1.1.1" - sources."estraverse-1.5.1" - sources."esutils-1.0.0" - sources."fast-levenshtein-1.0.7" - sources."levn-0.2.5" - sources."optionator-0.3.0" - sources."prelude-ls-1.1.2" - sources."source-map-0.1.43" - sources."type-check-0.3.2" - ]; - }) - sources."espree-9.3.2" - sources."esprima-4.0.1" - sources."esquery-1.4.0" - sources."esrecurse-4.3.0" - (sources."esshorten-1.1.1" // { - dependencies = [ - sources."estraverse-4.1.1" - ]; - }) - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."file-entry-cache-6.0.1" - sources."find-up-2.1.0" - sources."flat-cache-3.0.4" - sources."flatted-3.2.5" - sources."fs-extra-10.1.0" - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" - sources."functional-red-black-tree-1.0.1" - sources."functions-have-names-1.2.3" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.2" - sources."get-symbol-description-1.0.0" - sources."glob-7.2.3" - sources."glob-parent-6.0.2" - sources."globals-13.15.0" - sources."graceful-fs-4.2.10" - sources."has-1.0.3" - sources."has-bigints-1.0.2" - sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hashish-0.0.4" - sources."iconv-lite-0.6.3" - sources."ignore-5.2.0" - sources."import-fresh-3.3.0" - sources."imurmurhash-0.1.4" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."internal-slot-1.0.3" - sources."is-bigint-1.0.4" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.4" - sources."is-core-module-2.9.0" - sources."is-date-object-1.0.5" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-negative-zero-2.0.2" - sources."is-number-object-1.0.7" - sources."is-regex-1.1.4" - sources."is-shared-array-buffer-1.0.2" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-weakref-1.0.2" - sources."isexe-2.0.0" - sources."js-yaml-4.1.0" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-1.0.1" - sources."jsonfile-6.1.0" - sources."levn-0.4.1" - sources."locate-path-2.0.0" - sources."lodash.merge-4.6.2" - sources."lru-cache-2.5.0" - sources."memoizeasync-1.1.0" - sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" - sources."minimist-1.2.6" - sources."ms-2.1.2" - sources."natural-compare-1.4.0" - sources."object-inspect-1.12.2" - sources."object-keys-1.1.1" - sources."object.assign-4.1.2" - sources."object.values-1.1.5" - sources."once-1.4.0" - sources."onetime-5.1.2" - (sources."optionator-0.8.3" // { - dependencies = [ - sources."levn-0.3.0" - sources."prelude-ls-1.1.2" - sources."type-check-0.3.2" - ]; - }) - sources."ot-builder-1.5.3" - sources."otb-ttc-bundle-1.5.3" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."parent-module-1.0.1" - sources."passerror-1.1.1" - sources."patel-0.38.0" - sources."path-exists-3.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."patrisika-0.25.0" - sources."patrisika-scopes-0.12.0" - sources."pegjs-0.10.0" - sources."prelude-ls-1.2.1" - sources."prettier-2.7.1" - sources."punycode-2.1.1" - sources."regexp.prototype.flags-1.4.3" - sources."regexpp-3.2.0" - sources."require-directory-2.1.1" - sources."resolve-1.22.1" - sources."resolve-from-4.0.0" - sources."restore-cursor-3.1.0" - sources."resumer-0.0.0" - sources."rimraf-3.0.2" - sources."safer-buffer-2.1.2" - sources."semaphore-async-await-1.5.1" - (sources."semver-7.3.7" // { - dependencies = [ - sources."lru-cache-6.0.0" - ]; - }) - sources."seq-0.3.5" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" - sources."signal-exit-3.0.7" - sources."source-map-0.6.1" - sources."spiro-3.0.0" - sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" - sources."strip-ansi-6.0.1" - sources."strip-bom-3.0.0" - sources."strip-json-comments-3.1.1" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."text-table-0.2.0" - sources."through-2.3.8" - sources."toposort-2.0.2" - sources."traverse-0.3.9" - sources."tsconfig-paths-3.14.1" - sources."tslib-2.4.0" - sources."type-check-0.4.0" - sources."type-fest-0.20.2" - sources."typo-geom-0.12.1" - sources."unbox-primitive-1.0.2" - sources."unicoderegexp-0.4.1" - sources."universalify-2.0.0" - sources."uri-js-4.4.1" - sources."uuid-8.3.2" - sources."v8-compile-cache-2.3.0" - (sources."verda-1.10.0" // { - dependencies = [ - sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" - ]; - }) - sources."wawoff2-2.0.1" - sources."which-2.0.2" - sources."which-boxed-primitive-1.0.2" - sources."word-wrap-1.2.3" - sources."wordwrap-0.0.3" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."xpath-0.0.32" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - ]; - buildInputs = globalBuildInputs; - meta = { - }; - production = false; - bypassCache = true; - reconstructLock = false; - }; -in -{ - args = args; - sources = sources; - tarball = nodeEnv.buildNodeSourceDist args; - package = nodeEnv.buildNodePackage args; - shell = nodeEnv.buildNodeShell args; - nodeDependencies = nodeEnv.buildNodeDependencies (lib.overrideExisting args { - src = stdenv.mkDerivation { - name = args.name + "-package-json"; - src = nix-gitignore.gitignoreSourcePure [ - "*" - "!package.json" - "!package-lock.json" - ] args.src; - dontBuild = true; - installPhase = "mkdir -p $out; cp -r ./* $out;"; - }; - }); -} diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh b/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh deleted file mode 100755 index 8d91805898..0000000000 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p common-updater-scripts coreutils gawk replace -set -euo pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" - -nixpkgs=../../../.. -repo=https://github.com/be5invis/Iosevka - -# Discover the latest version. -current_version=$(nix-instantiate "$nixpkgs" --eval --strict -A iosevka.version | tr -d '"') -new_version=$(list-git-tags --url="$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }') -if [[ "$new_version" == "$current_version" ]]; then - echo "iosevka: no update found" - exit -fi - -# Update the source package in nodePackages. -current_source="$repo/archive/v$current_version.tar.gz" -new_source="$repo/archive/v$new_version.tar.gz" -replace-literal -ef "$current_source" "$new_source" ../../../development/node-packages/node-packages.json -echo "iosevka: $current_version -> $new_version (after nodePackages update)" diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index c2b4f0268f..6699023498 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "004vj7r84kansfvdh0d7qmp9xdsrbw4x0iqa8k37pvg0czzvzz14"; - iosevka-aile = "0mm9y56z6rlfj1w3giql4n12190i95rizd182id9jgjiap75nqdi"; - iosevka-curly = "0z3hd4wbpz4r1njdprafad8jlq77scwjyy60j6nb900bid0s130b"; - iosevka-curly-slab = "1v3wrydar72l3nrnjajlrqkz3brqwc5g8vsix1c2acw7k8pj4adq"; - iosevka-etoile = "04vlvi5dzfpz6qvkv8r4ba0zp36bwdxqyspf7za8a1cqpwg6dhv1"; - iosevka-slab = "0b7n3rvf6irp4scpm5g9pr5ikik2q7mkw35qdy63wq0d7vy7k67m"; - iosevka-ss01 = "0xa0hrn6hjzj094xs1wilp9csb3i3yfpngfw9g9p59wnsphq12k7"; - iosevka-ss02 = "00ygpybyq5qa1fva5d5lbmpl34cf6w18kba958rjzydc5zj4hfk1"; - iosevka-ss03 = "1l2s01a32mblgmd7c6n11nwk9fxh7iflba6da9wb9rszwj9kh7fb"; - iosevka-ss04 = "1pqvclbhw8nrlaasi03l3mjmg8sh48fhh6fl1ngmsc86k15ym8xy"; - iosevka-ss05 = "1vg827f694kx841fnsjkmwvs4nbcy9jpbxfr6cbjmhr9g9hp8qis"; - iosevka-ss06 = "1zkndj11ld5crkkyf8pbn6bd8xigm4mvs9h0mb15hqym09phsvbf"; - iosevka-ss07 = "0ssalch56zkdr7q97s215iwjsiny0a4svjp5qij0w0w9vfh1c8q4"; - iosevka-ss08 = "0i1v47ji7wn13vmad9jkskislqg1zgi3vsk2fjygx8z9b39svs1h"; - iosevka-ss09 = "1bk9lr4zafj97p53pdqryi01malijniqhn9mkz984m0z7fnyh35j"; - iosevka-ss10 = "1rqmak3bwmj32s9s85ipxfyplcxqljj1z8p1s3i6l8njqfx9hmv9"; - iosevka-ss11 = "0d13sgam6kpw0pp0g0ibhi7ji63yijfjgrid32fs99i7l636f7y0"; - iosevka-ss12 = "1ya76hfizg56ryfmf12lmb9wivdhx8wps55m3mryldaqw3ys5fh5"; - iosevka-ss13 = "0gdz4g9l2p4ah5ms2nhnwz14h8bvw1mszxzjj6v474za2py989dh"; - iosevka-ss14 = "14l6vk0yzk4c2gk28s30ys9k26ic3p9sywbbwinzm7y67knqsc2b"; - iosevka-ss15 = "1vpx2ksdjmlp37difs12b4cs25x73v5qlqzjvck2z9ikbgf9drn7"; - iosevka-ss16 = "088zf8q75v4qgpdinlf80rfkblviwxk94kzf0qa7zsk1hg9xmb59"; - iosevka-ss17 = "0wz5z58aalk4xp9xhcq3xrm6mf2l28gp5qydxgajgzz7lh405znh"; - iosevka-ss18 = "12r294lrwy1a663dzfs0hxsg113v127365nwb2wn5q7jksmaxxd6"; - sgr-iosevka = "13fy2vyslhrikf9vf668754gdqfz1dyqfx9kk0r5yzi0g6ysvdkx"; - sgr-iosevka-aile = "0qjyag5axpcfqng6cqv4j0fh0a6f0v834iwhf8zx7qgh1h6j1vvy"; - sgr-iosevka-curly = "1gvi7clwyl24dyrmrcb2i4n96p9rqhxxl6cvl1bdv9v6qi9y65lc"; - sgr-iosevka-curly-slab = "10ha1h64w2189azpszdg328c0p1nfg8r9rwrk1qxs7cv7mkmr5fj"; - sgr-iosevka-etoile = "0yd95kn3ickra7ssb62m8c61c8aarxkljcxk9j470rf679fsj3rp"; - sgr-iosevka-fixed = "00qiswcfhqf1jsw4xwbqdpaq2jhxvkcdq5vhjg26q97nv5hdqk9w"; - sgr-iosevka-fixed-curly = "1bqcsqysxf3x5g5970hgsazy0qgdkqhjdh1pqknqng2r8awrpi45"; - sgr-iosevka-fixed-curly-slab = "1jcxc19q83k7rxcsyg99ahg267i7q86kf9kxzb06bj48f52ypkd3"; - sgr-iosevka-fixed-slab = "1dgjqn7pniq45f5m2sqj47nmdmrgkk2g1860f262b48aydh3lfnh"; - sgr-iosevka-fixed-ss01 = "0g9jwlc616b52r9wakpdi61ny79vr64zg2cch5jrvsn03gkp47jv"; - sgr-iosevka-fixed-ss02 = "0lvc2m8cwrfsp1lnnl3fshqj6xskv0gdj4xr3m16axkwa60h2qcb"; - sgr-iosevka-fixed-ss03 = "0fhsrmbvwwnrg3jicark56r0zirnq5yp1lg2xaznx8wmw08221z5"; - sgr-iosevka-fixed-ss04 = "0wy4mja82xrxwfmdpkmil9d8q6681a8dj44wb3h8hvybd40qm8xf"; - sgr-iosevka-fixed-ss05 = "1rhilqnw3kay2mgjmjzxaappgyz3rib4gq142j717m0scbd7c5dw"; - sgr-iosevka-fixed-ss06 = "0ci3sfy39850zks4glnlr7ml40akhh290rz43s4qd7lcpsyiqaw8"; - sgr-iosevka-fixed-ss07 = "1i0r4sb9jpipp08cw43n8ajskfyzk5yz2d08h4z0bfd4k8ap9vd0"; - sgr-iosevka-fixed-ss08 = "1jgqdr09gpv2rysi8yj3p6wc79xhx81hncaim3vmj32gkv3pqpbx"; - sgr-iosevka-fixed-ss09 = "1m9085hmpljn3pfnxjc3h2q0agkidqdi5b2dl744xs9p1nzm7y9c"; - sgr-iosevka-fixed-ss10 = "03j0bv0yfd15jjc2ssffsbhq7vcg38prxycvzh1nbc9g0rl3ji24"; - sgr-iosevka-fixed-ss11 = "0kgjjnsihycxyqlgc4zngfqiynqp8agnic7mydni8mqwl1jxaw17"; - sgr-iosevka-fixed-ss12 = "0v0gva1v3q9xhvzyv1qlggb0dy96a9fm2vm682jj913j925mh23m"; - sgr-iosevka-fixed-ss13 = "06jd2lggi8i9lmaqjhss837wplaypc60k8fnjall16wzdg3an8di"; - sgr-iosevka-fixed-ss14 = "1qvdyran2c56wrzwnz5l42ld1iy6y7bvadw3mgrjfi01xfs43ncb"; - sgr-iosevka-fixed-ss15 = "06kpf9fzvq8flvn2fw6cg5n9c629qnwpxh8vx0z9bqn29kqvf0d1"; - sgr-iosevka-fixed-ss16 = "0sdm5h1zbr812pa2i1c8qz1a884pcdcng47xyk7li5v1y2gznmij"; - sgr-iosevka-fixed-ss17 = "109d2cl2cs8wzqq2g9sjcfbxl8x2zl4pssh3jsns8n2yx63lmkxf"; - sgr-iosevka-fixed-ss18 = "1pjy2zb0qgjqy11mbj4ia8pdxm8h888ifwsjyjy0zm9q6v8y5xcb"; - sgr-iosevka-slab = "0vak6d76ignsik1561s8dm1r4pqn02w32vavls668mjg3i051llq"; - sgr-iosevka-ss01 = "0p195gvj4ljjw4difg78hq139l5hmpk4jbjm8pzfrxmn643z0yi4"; - sgr-iosevka-ss02 = "01llc2hykx7i7r9bp7gcc650iw9ry5c17s2ap06j0vv7gz0a47h5"; - sgr-iosevka-ss03 = "0m208v1mdxm2w5c92cijpvbcqh4hxg2mchghwchq9kyk00b1ld2d"; - sgr-iosevka-ss04 = "15x7i8pxy5i512whh6464x4l72qygvrd0rs1y3y1kbavp1scb5ck"; - sgr-iosevka-ss05 = "1xqxc66nfb5n38hyr8s3r7yrm4v27ymr8mfkqp10jnpyyi47mwg5"; - sgr-iosevka-ss06 = "1wskdfz3y24ia402b0mn34393w9nbjszqryg7x8ka1c4fjvccwdn"; - sgr-iosevka-ss07 = "09ahix65wcspjmsjnw9f7mad8pl7m9yl4kzlh2awv3ag448cgj3s"; - sgr-iosevka-ss08 = "03g23ni2jqvwjbibhpbn6i2ddc3yr5znvxhinwgag45vrjfr629m"; - sgr-iosevka-ss09 = "0n1vi5r5yjxrrdx0w5ab1hd31dwzrg9n8cp6gcj1d532mk6y7y74"; - sgr-iosevka-ss10 = "034ai6djsw32jd0y037svfp2mlrsg99gwxl9awjvip219n6gqly2"; - sgr-iosevka-ss11 = "1ngkjmgiq99p51ar2hff8xf27xq18m32wrw2igk8mr58r35xzkpi"; - sgr-iosevka-ss12 = "1wdh48px6ywj990nm45w8nmllvl9f8k9pj2jf5frfrr9qshvzsmz"; - sgr-iosevka-ss13 = "0wh2dq3crpdx002wv6lzznirx7bvgkl04x429nzfvkkwp28y2jj9"; - sgr-iosevka-ss14 = "05w3bl8kxj9qgm2vqhl93bz0zyhkdhbsmxh82fwl74mxs530sjpj"; - sgr-iosevka-ss15 = "09xf5xlzz4d4whw4blwa9hlyij0kfihi8q3q448p40r116kvl2zy"; - sgr-iosevka-ss16 = "1d6jfaxz8ivn3a7zsk408z0hr9rjh2gv93zqq41a191zpgd7zj3g"; - sgr-iosevka-ss17 = "12x3nlcq89c6ldq70bi5w418iqwmb2i8jq7csh9cg7ghbl4bmr9x"; - sgr-iosevka-ss18 = "0z9pg0y56ix679br1zdfmqsf9an704gb1gf420mypkr9dyf2yh50"; - sgr-iosevka-term = "1ry11xwl715lpiy6psh4l4bwjsf5f14igrv6wzag60xk0ip91qgv"; - sgr-iosevka-term-curly = "0jkblgqmpixh4qjr96sjv6mag1faak2yz7251g63x4gbf2sbahlq"; - sgr-iosevka-term-curly-slab = "1yjcy6y31nyilkxmid6laxwsrmf61akgsaz5ybjy20vhhkylj1hj"; - sgr-iosevka-term-slab = "1cxv8qh4mjs0xl0v3ckgz916dir3n4wvmibhv161valvd5cswrci"; - sgr-iosevka-term-ss01 = "0i6qkxwgbq2iz4gzqcfi5jdnw7rdrasdh5cmbah72fxrxmwbwxrx"; - sgr-iosevka-term-ss02 = "13hgq4airgimi26c2bi54m6405w7gi3pl3i76nxr009vkia50nsk"; - sgr-iosevka-term-ss03 = "1n0f4kmnaibsf7ss34shc1yhdjsfsia76qycpsl2jhhq3531z080"; - sgr-iosevka-term-ss04 = "11fq16w1h4ajzs24qx6ng0nnh0c0pbqa9m75bavn47vjhl10d1v9"; - sgr-iosevka-term-ss05 = "1ym9hq8hk687b4ahg2dq1hp7gb7xjxnak12ijsppzsgp42dmjbjl"; - sgr-iosevka-term-ss06 = "1zc70ywxzk2m69rrmcah8kq994j9y40bhm0wnb9cbl45zkgacms1"; - sgr-iosevka-term-ss07 = "03cd38wnjmqkm93v23ga4yd03w5l58yb8ipw1pi9s8i7vicicvb5"; - sgr-iosevka-term-ss08 = "0226qnp4nabsynd7nxvis237vm31785k7msh2vpxnmbl8m2h54b6"; - sgr-iosevka-term-ss09 = "1c63qiiz8pw49x7xjfxbnm36isc486bk9d19zbfhylchbd0yfbxx"; - sgr-iosevka-term-ss10 = "1pl3b935mbdf126m0bjq17wfy80rdcvq3zmh13w2hb8pmx0m31gg"; - sgr-iosevka-term-ss11 = "1nqzh75ia7z74f3v6m9jkh51qhjpxnmhqxnz3ks5s5rb3qgvj1h6"; - sgr-iosevka-term-ss12 = "0z9xafdp75c88g1mf5hyh6h88n1w3qs6fid7bvwy1jjnsnai835s"; - sgr-iosevka-term-ss13 = "0bccy0fhr5kqx1b53wb6gcijn7axlbg2x24vp8mh72mnw306qnf3"; - sgr-iosevka-term-ss14 = "174srnn43rwsc1l8qjk6hrqg3qndk2sf61cii3v2hk1pnrqxs85r"; - sgr-iosevka-term-ss15 = "15lg2p7hpdkd21f8nkywxzp8gmxg3wpi2q33m0bchvcr1cb6p326"; - sgr-iosevka-term-ss16 = "0b20m1akm95nbkjy7cqgn4gfiaashdkwc1nf6abwhpm8iydwas3v"; - sgr-iosevka-term-ss17 = "1x0n4z4si9qzkqanbdp1lqn73hynbxa7s59rwc9z0s902vyqpgcx"; - sgr-iosevka-term-ss18 = "19b3nx5mvdr6r6hbcqjxrdsyr975ym42v0i670l4550bg0z24cyl"; + iosevka = "0lxcyg93max17fqm6yvxwvr79jz9bggxcmv6qx8sknvjmq89l0pf"; + iosevka-aile = "0pljy65m5zaxbajfmhc3gayz73rbp8vzaqzqcrlm2ir9yxaz21qc"; + iosevka-curly = "0svf6hm0cspydgzjg39f5rp7mrcabb0vc2088r1msipaw8naajqf"; + iosevka-curly-slab = "1afk0ijfciwh9pjy2qsawxw7gq7jxr52li2nwggcq04c9ybh62pg"; + iosevka-etoile = "07zihk9q1ff93ms9gj92hbf2fzw7h4fl28szhrfll3p96y9f81q7"; + iosevka-slab = "18hrv0kc82hfb6ivbdg5k9179k37anjigm8ddh5waiq2is6gmh8l"; + iosevka-ss01 = "127zki1wcd2wjpqr1n2zf57iq44pwcrg2vlrspi3b9lhmxw0rlz9"; + iosevka-ss02 = "0ig7y86c2d9y4bg5cqibbn0wqwwzm5d5qxd8vwhvd323mg3gh6bg"; + iosevka-ss03 = "0zp2nkrl39pvidn846706dp8l12ac66kd9wsyh4cnn08mmm6gl4i"; + iosevka-ss04 = "0r0ylsxj2j9akpxchnldwyddm7vrlpn82sxkgmjhr81hn3q08bgc"; + iosevka-ss05 = "0r9mdhdjndxgm68fg59dbd810ggrpmpkvgcypyqf92l8sf1h55hj"; + iosevka-ss06 = "1c6ga4jaglfp5mx980qy1alkifr1d1lq4qj69xfq6sx4146xn20f"; + iosevka-ss07 = "0h1x2p9finl4482vx6lvs45x5258bpw5avkpgmg66wn16kd95zfq"; + iosevka-ss08 = "1n5m11dlv49jj63s771ny77qpiz178iyvn7pfnhv2mzqwimz5sl2"; + iosevka-ss09 = "1rbs15xsk7fajrm81nacixf18jjx08bpg26fw7pmxjv727zafv05"; + iosevka-ss10 = "1rdpiq5pyzrnxhnsvf08zg0vjhln25vqkyknnv4xf34wr8r9xcc0"; + iosevka-ss11 = "0l9454vx90pj0yva864qfj06ggplia0qdkv3nr14s3wmv5khh9gw"; + iosevka-ss12 = "0cafszj0c7nkcxpbqsrqy5l2v0nzfph6i22w1iayg8bqvpip3x5m"; + iosevka-ss13 = "1mlxh6qikrl0g82difr85lpkxdr83z5iymf0brmgdxkmyig3psr7"; + iosevka-ss14 = "1330p52h94fgr76gll396hb0qalamm8z79hw73ci4ph22dpsd4ni"; + iosevka-ss15 = "0cc5a1187i9idgvz7zhs0byya8c69f0g4pkqlivh37ffj07yv47v"; + iosevka-ss16 = "052nypjppbrbkhjq85nwmx8469prfsbc9f05kw0vi30c8mpcjqwf"; + iosevka-ss17 = "0k5p1qvx8vi8ic7yayky7zdi1hrkwli698ydlfhnk4yx10l0xq8j"; + iosevka-ss18 = "16diyrfpz1kp9vcyq61pbdrrv4pl96kzn8ckv7wb5cnwxwa336c7"; + sgr-iosevka = "0b92jmai9cgxdah74jmks7fwbyb1m722ablf3qaiizc597y031wv"; + sgr-iosevka-aile = "1z5jg74aspkvhw41ihwzbfs4f075gs8ny76m30adp0n3v877nhjz"; + sgr-iosevka-curly = "06bm6jg16sgvxnqbayqa92lvr0bc5vdjybbi467yx57hi83w860q"; + sgr-iosevka-curly-slab = "08kg8imp29sww57mdpfmi86046vqwd4a2ayijcvs511v8nhl478r"; + sgr-iosevka-etoile = "0gybfn95n2b8kn3bvi8pjkps5bmndnbbq9jbfbm81fims0s0496b"; + sgr-iosevka-fixed = "15q4y8cm8cwxcbmjzknc19gyqmd4nb928b26nswm8m17p85zlcq0"; + sgr-iosevka-fixed-curly = "1faci2m7w8cf65mjkigqlyh838r5mqvg7ai4nfdidms6ilhhsf37"; + sgr-iosevka-fixed-curly-slab = "019m3nvsy6vwgf6f0z2l0wxxkqbl30y55jfgi2bsmxhizwzl3csc"; + sgr-iosevka-fixed-slab = "1ps1xi334h7by3nihn3n6d76sbzcvv03dwy4iy5wixlz0lr8id5i"; + sgr-iosevka-fixed-ss01 = "18qdd6qbk8dy6z36lsy89a7g6l1asdzqvlc82j9vk437yjm59vwi"; + sgr-iosevka-fixed-ss02 = "0xm1k1f5hbhjbksshlv7bcdigdrxxhfpc8pgv7dvz7zpy7cx2y4y"; + sgr-iosevka-fixed-ss03 = "1741k3p2mncq9kp1wshpl6dkwqvvg2bpakl91k6ssvj1z63r2zhq"; + sgr-iosevka-fixed-ss04 = "0sw65088yihk2sk2mcdr4cd8rl9l954l2sc3y7dil3jkgw6kf0wq"; + sgr-iosevka-fixed-ss05 = "1cc71vidcljh6k6pw6z5yygi0kir7n235l19as8y1qazmc8kh0ip"; + sgr-iosevka-fixed-ss06 = "0s2f0j0z4dyd23z5mldih03cg8vqwvpqrmagbpx02v2krzn2vb27"; + sgr-iosevka-fixed-ss07 = "07nfdx7bdbsxrmylsja8bvr1n2a116qyfg8pk1wpcax3vf56jamh"; + sgr-iosevka-fixed-ss08 = "0ys6gw2p7vpdv8csxzxjx09m8k0h4s28w7i98iq27ak47xcm8xd7"; + sgr-iosevka-fixed-ss09 = "0vn6vc0byakggyrd6d9mv1l9d4h5g7wcbkkmxzqfjr6xp3k96r88"; + sgr-iosevka-fixed-ss10 = "0llqjvv7m1imvqw41xvmcw9y9c9wsnv2i8swnszr9r5khx3kbp6h"; + sgr-iosevka-fixed-ss11 = "1wwjp1fgl2gxhjkmsz6k0a59kjcapby9y8j5m763ap4ig5djbv8r"; + sgr-iosevka-fixed-ss12 = "1k9ak5dc3s024iz6rp4yz9b73752v93n0kldcnwi0lvbh4hp358k"; + sgr-iosevka-fixed-ss13 = "0rgj38jkj6d7g44wn02k6ycixkwq6lwy756vp9w01aqqn5flw6s1"; + sgr-iosevka-fixed-ss14 = "0lbpwnc40lswlmfwqziz7n3kn95kc5rn4fbq5nxa1z8cxz9dkhvh"; + sgr-iosevka-fixed-ss15 = "034h7af7876q0ni8idj5dhkq1cpl91gvxhwxyw17pgnz8i51a261"; + sgr-iosevka-fixed-ss16 = "0i00nxj0j7yr57b4ccd2yc4x7k8zw1xxpdwfwlm0n38c05iqbvj9"; + sgr-iosevka-fixed-ss17 = "1z21han7l7nwz0qfi6fzvwdiadd9brpna51p24drdi8y3915b8n9"; + sgr-iosevka-fixed-ss18 = "0fjdsx66al0h3spgdivryiw5d871s93s2lbmh7nxwf19lylrkv19"; + sgr-iosevka-slab = "0j42hxgcwy5abf5jv5aqjri6h21k2nkgjj7527f68rgcnl9d980b"; + sgr-iosevka-ss01 = "1m7c8zb3rhxnf9h4v55jv7ns6x74bwfsl6f4sl2b1gkfl50ibwqg"; + sgr-iosevka-ss02 = "05cc3p8lkxl1s27wmgspk93fz8f51daqcfid8vpsvnqw75abivc9"; + sgr-iosevka-ss03 = "0bmh1ijdalss96lkji0dcyl00wc2yw7a3lx0nqbbjl4m0l2mz4yp"; + sgr-iosevka-ss04 = "1jc1y9rgw8hnd7zqrn98b35r01kmr2nykqip63h6qal7l456m4s2"; + sgr-iosevka-ss05 = "06acxqhzfxlhqd083s57b15sx2vgq0r6pl9myp8syh1d9azbk899"; + sgr-iosevka-ss06 = "0g3zaxy9363p28kcv6a52dqb1swnrn3rwl6pfvanz92vrrjspr7n"; + sgr-iosevka-ss07 = "1bmdparw1hg3i8lnx8vwd467pwf4q94q80a62fcy87hppy3afryg"; + sgr-iosevka-ss08 = "16kgj158nhmlql0gkkfya04dy1gp9an4gk691f28n0mqhi7hygcr"; + sgr-iosevka-ss09 = "144x84qmh9pycn9v36q4z074vmnngn0chlyb8a8hyhgsyfqf7q7h"; + sgr-iosevka-ss10 = "0i9hsmw78yg75a3m80jlmdn2rn72snz69m0abvz7z94b7c99ffsb"; + sgr-iosevka-ss11 = "05a9azf7f64jdr5wwiy7djlmarl01mg6rfmzvrdd8a1a0nfcz1iz"; + sgr-iosevka-ss12 = "1nqa88csh170gs3bggs6v5ssaqljvpw1zxaclhmzdvyhcphrwd19"; + sgr-iosevka-ss13 = "1klhp2w99znj9qyz95z8jq3g23fs8jznya9dfzfy2i4hivw2gxv0"; + sgr-iosevka-ss14 = "1w84mqg0x46fbr8v72ccxc9a7sp52g4qb0x6l84wr8cm1fn7n21f"; + sgr-iosevka-ss15 = "05kdxmghhdyvlnc3wxzc5yyp00ybrq63fzh2kz3s4rwh11hhf0lq"; + sgr-iosevka-ss16 = "0a9i7plsfy8fawip70p5w3dkmjh4sy61iwi9pnl0ara7z23783dq"; + sgr-iosevka-ss17 = "1xmaqs54jhag7s18gfll94g0ixjqp2z5s69kwk48nznzpbfbpdsb"; + sgr-iosevka-ss18 = "09nq0a7b4hkiyi1prxpf6vwms9cnmby2dzn9k4y0xcax7m464531"; + sgr-iosevka-term = "1zr8cyq6578n8f3y9yyc0phs26hda1bf0bsd417wqcwsn88wfmx8"; + sgr-iosevka-term-curly = "0xlwljc2gmwh119x83p2pic5zwjqdymg7pbl2ginzilsrgjl2k0q"; + sgr-iosevka-term-curly-slab = "1vmpdws71sf1pf8nz3w7y0a64a5c3mp8f9w57bqmcn9vr22ymcl7"; + sgr-iosevka-term-slab = "1wkqdgy9nd4mvy4rsssvpis1r17ikpbl8mfx6bp80fh0lai97mxw"; + sgr-iosevka-term-ss01 = "1ly5ic5ihj00apb87am3kl38mywns8jizc7f4hniyrd9xhy1186z"; + sgr-iosevka-term-ss02 = "09lisy461dvppfv6sdk4i6vfrqhxyx558zdaflv9vskmfq8iq66d"; + sgr-iosevka-term-ss03 = "0nm84l4xk53l1q96hx8q63nbflgmivj3cq7z5mysv1z8jdp7isx3"; + sgr-iosevka-term-ss04 = "1y9kkasxmpm4n1vs5plsa25cgwvdi4jahn3ggdlxpl35yi4kxnr3"; + sgr-iosevka-term-ss05 = "1drngqgcibv6kfwjn3s2bik286ypj613q4p3fz0b7incniaz372j"; + sgr-iosevka-term-ss06 = "1rkqnj59hv1lzsplss3jk0jgz6q68qkg4a3200hv10rs9i2w2qxk"; + sgr-iosevka-term-ss07 = "1z6jh8qmc2063zgwbd00xi258grdillkc1nja69awdxiamv6hgf9"; + sgr-iosevka-term-ss08 = "022qw6frmmmpwbq6af8rysm8pbq713fiw92hkqi5k3j4v8dwl9v2"; + sgr-iosevka-term-ss09 = "1c32p4d46q3izif68ka6gr1hmq10snrlga5d7ypphmm8yxvavd9c"; + sgr-iosevka-term-ss10 = "1p497kqa386q5rvsfigzxdr0009agiw4bv4xxmb83pg3sl8bf7z9"; + sgr-iosevka-term-ss11 = "19kfvmwijd1kyw4bln0m5z7wpch9h44ny13ccxx0qmiv5y7wwm94"; + sgr-iosevka-term-ss12 = "1pnr7yd431xnym12vnlww6rxm1vfd9x24kqpx0323q3n61yjqzd6"; + sgr-iosevka-term-ss13 = "04nhps95s360vv4qr1pbzs1aj8zdalzv4ajdkawdssxaz1xs57c7"; + sgr-iosevka-term-ss14 = "1xvdpx8sa4ifgy9a3y65qcxj8cavisw4h7hjfivq4y0il79sl7nw"; + sgr-iosevka-term-ss15 = "03rs8b8yb7n1f7cp6zffgr7x20vx6hiag7a22ysx0zr2i4zp37i6"; + sgr-iosevka-term-ss16 = "1s86hmr7a6qwyf5m9q0npzzd25nvh9k1nlja1b8fnnlgchycwfbw"; + sgr-iosevka-term-ss17 = "0y5i99iy7r3z4cv87s3v3mxbadp3np16a3c65w41pjv86llkc30g"; + sgr-iosevka-term-ss18 = "0s5hdh61y5v17jrdpajgkzzrg0cqgcad6gvs9m8v55xi2zlqfxip"; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix index 9f3268f8d5..986eab13a2 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ipaexfont/default.nix @@ -1,12 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "ipaexfont-004.01"; +stdenvNoCC.mkDerivation { + pname = "ipaexfont"; + version = "004.01"; - url = "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip"; + src = fetchzip { + url = "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip"; + hash = "sha256-/87qJIb+v4qrtDy+ApfXxh59reOk+6RhGqFN98mc+8Q="; + }; - sha256 = "0wp369kri33kb1mmiq4lpl9i4xnacw9fj63ycmkmlkq64s8qnjnx"; + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { description = "Japanese font package with Mincho and Gothic fonts"; @@ -21,9 +30,4 @@ license = licenses.ipa; maintainers = with maintainers; [ gebner ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/ipafont/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ipafont/default.nix index 5dca9b9faa..8a1f91da34 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ipafont/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ipafont/default.nix @@ -1,12 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "ipafont-003.03"; +stdenvNoCC.mkDerivation { + pname = "ipafont"; + version = "003.03"; - url = "https://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont00303.zip"; + src = fetchzip { + url = "https://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont00303.zip"; + hash = "sha256-EzUNKuDNHr0NIXiqX09w99wtz1r2pZurR/izdgzTcAs="; + }; - sha256 = "0lrjd0bfy36f9j85m12afg5nvr5id3sig2nmzs5qifskbd7mqv9h"; + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = { description = "Japanese font package with Mincho and Gothic fonts"; @@ -19,9 +28,4 @@ license = lib.licenses.ipa; maintainers = [ lib.maintainers.auntie ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix index 2e535255cc..d59c111c96 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ir-standard-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "ir-standard-fonts"; - version = "unstable-2017-01-21"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "morealaz"; - repo = pname; - rev = "d36727d6c38c23c01b3074565667a2fe231fe18f"; + version = "20170121"; + + src = fetchFromGitHub { + owner = "molaeiali"; + repo = pname; + rev = version; + hash = "sha256-o1d8SBX3nf7g6Gh4OP+JRS+LNrHTQOIiHhW3VNCkDV0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/ir-standard-fonts {} \; + + runHook postInstall ''; - sha256 = "0i2vzhwk77pm6fx5z5gxl026z9f35rhh3cvl003mry2lcg1x5rhp"; meta = with lib; { homepage = "https://github.com/morealaz/ir-standard-fonts"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iwona/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iwona/default.nix index 85cf06df11..0d3944b2da 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iwona/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iwona/default.nix @@ -1,16 +1,18 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, texlive }: -let - version = "0_995"; -in fetchzip { - name = "iwona-${version}"; - url = "http://jmn.pl/pliki/Iwona-otf-${version}.zip"; +stdenvNoCC.mkDerivation { + pname = "iwona"; + version = "0.995b"; - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile *.otf -d $out/share/fonts/opentype + src = lib.head (builtins.filter (p: p.tlType == "run") texlive.iwona.pkgs); + + installPhase = '' + runHook preInstall + + install -Dm644 fonts/opentype/nowacki/iwona/*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "1dcpn13bd31dw7ir0s722bv3nk136dy6qsab0kznjbzfqd7agswa"; meta = with lib; { description = "A two-element sans-serif typeface, created by Małgorzata Budyta"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/jost/default.nix b/third_party/nixpkgs/pkgs/data/fonts/jost/default.nix index 676ec842c8..f5d3a1e48b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/jost/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/jost/default.nix @@ -1,13 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{lib, fetchzip}: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "jost"; version = "3.5"; -in (fetchzip { - name = "jost-${version}"; - url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip"; - sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq"; + src = fetchzip { + url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip"; + hash = "sha256-ne81bMhmTzNZ/GGIzb7nCYh19vNLK+hJ3cP/zDxtiGM="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 fonts/otf/*.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/indestructible-type/Jost"; @@ -15,9 +23,4 @@ in (fetchzip { license = licenses.ofl; maintainers = [ maintainers.ar1a ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; -}) +} 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 66e91df010..e99dfde411 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -1,20 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "0.046"; +stdenvNoCC.mkDerivation rec { + pname = "JuliaMono-ttf"; + version = "0.047"; -in -fetchzip { - name = "JuliaMono-ttf-${version}"; - url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; - sha256 = "sha256-+Ro517m1unQskQFhsT6oiz19aov87/tT1jlP/XB7kFU="; + src = fetchzip { + url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; + stripRoot = false; + hash = "sha256-tCZo48SBGdhcsP1wgaWkfWr3L3Yz+p/iqesLmarSWbk="; + }; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype - rm $out/LICENSE + mv *.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/junicode/default.nix b/third_party/nixpkgs/pkgs/data/fonts/junicode/default.nix index 5f5ce1048c..4e42cf1c41 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/junicode/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/junicode/default.nix @@ -1,23 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "junicode"; version = "1.003"; -in -fetchFromGitHub { - name = "${pname}-${version}"; - owner = "psb1558"; - repo = "Junicode-font"; - rev = "55d816d91a5e19795d9b66edec478379ee2b9ddb"; + src = fetchFromGitHub { + owner = "psb1558"; + repo = "Junicode-font"; + rev = "55d816d91a5e19795d9b66edec478379ee2b9ddb"; + hash = "sha256-eTiMgI8prnpR4H6sqKRaB3Gcnt4C5QWZalRajWW49G4="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' local out_ttf=$out/share/fonts/junicode-ttf mkdir -p $out_ttf - tar -f $downloadedFile -C $out_ttf --wildcards -x '*.ttf' --strip=2 - ''; + cp legacy/*.ttf $out_ttf - sha256 = "1v334gljmidh58kmrarz5pf348b0ac7vh25f1xs3gyvn78khh5nw"; + runHook postInstall + ''; meta = { homepage = "https://github.com/psb1558/Junicode-font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/kacst/default.nix b/third_party/nixpkgs/pkgs/data/fonts/kacst/default.nix index 38f85d2ad0..aa5ed8b547 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/kacst/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/kacst/default.nix @@ -1,16 +1,21 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "kacst"; version = "2.01"; -in -fetchzip { - name = "kacst-${version}"; - url = "mirror://debian/pool/main/f/fonts-kacst/fonts-kacst_${version}+mry.orig.tar.bz2"; - sha256 = "sha256-pIO58CXfmKYRKYJ1oI+tjTwlKBRnkZ/CpIM2Xa0CDA4="; - postFetch = '' + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}+mry.orig.tar.bz2"; + hash = "sha256-byiZzpYiMU6kJs+NSISfHPFzAnJtc8toNIbV/fKiMzg="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts - tar xjf $downloadedFile --strip-components=1 -C $out/share/fonts + cp -R kacst $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix index 2dbe43aa6a..1a2f51a6d6 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/kawkab-mono/default.nix @@ -1,21 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "kawkab-mono-20151015"; +stdenvNoCC.mkDerivation { + pname = "kawkab-mono"; + version = "20151015"; - url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; + src = fetchzip { + url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; + stripRoot = false; + hash = "sha256-arZTzXj7Ba5G4WF3eZVGNaONhOsYVPih9iBgsN/lg14="; + }; - sha256 = "1vfrb7xs817najplncg7zl9j5yxj8qnwb7aqm2v9p9xwafa4d2yd"; + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = { description = "An arab fixed-width font"; homepage = "https://makkuk.com/kawkab-mono/"; license = lib.licenses.ofl; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/khmeros/default.nix b/third_party/nixpkgs/pkgs/data/fonts/khmeros/default.nix index 28db0d0098..5df7c3637b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/khmeros/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/khmeros/default.nix @@ -1,20 +1,21 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "khmeros"; version = "5.0"; -in -fetchzip { - name = "khmeros-${version}"; - url = "mirror://debian/pool/main/f/fonts-khmeros/fonts-khmeros_${version}.orig.tar.xz"; - sha256 = "sha256-pS+7RQbGwlBxdCfSVxHmARCAkZrZttwYNlV/CrxqI+w="; - postFetch = '' - unpackDir="$TMPDIR/unpack" - mkdir "$unpackDir" - cd "$unpackDir" - tar xf "$downloadedFile" --strip-components=1 + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.xz"; + hash = "sha256-gBcM9YHSuhbxvwfQTvywH/5kN921GOyvGtkROcmcBiw="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts cp *.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/kochi-substitute-naga10/default.nix b/third_party/nixpkgs/pkgs/data/fonts/kochi-substitute-naga10/default.nix index 63ca3cf3e4..ae216a7897 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/kochi-substitute-naga10/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/kochi-substitute-naga10/default.nix @@ -1,24 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let version = "20030809"; -in -fetchzip { - name = "kochi-substitute-naga10-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "kochi-substitute-naga10"; + version = "20030809"; - url = "mirror://osdn/efont/5411/kochi-substitute-${version}.tar.bz2"; + src = fetchzip { + url = "mirror://osdn/efont/5411/kochi-substitute-${version}.tar.bz2"; + stripRoot = false; + hash = "sha256-dRJAxeVGYcNjLWqJJ+9Z2FW3BHrgyGRzlgM2x5YG3AM="; + }; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*/kochi-gothic-subst.ttf $out/share/fonts/truetype/kochi-gothic-subst-naga10.ttf - mv $out/*/kochi-mincho-subst.ttf $out/share/fonts/truetype/kochi-mincho-subst-naga10.ttf - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob - ''; + mv */kochi-gothic-subst.ttf $out/share/fonts/truetype/kochi-gothic-subst-naga10.ttf + mv */kochi-mincho-subst.ttf $out/share/fonts/truetype/kochi-mincho-subst-naga10.ttf - sha256 = "sha256-SZ7ZJYuCYU0NxWHlEszbvFmyZxWeBtmPL204PjIrS64="; + runHook postInstall + ''; meta = { description = "Japanese font, non-free replacement for MS Gothic and MS Mincho"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/kreative-square-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/kreative-square-fonts/default.nix index c9e5131973..f6a0023bd1 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/kreative-square-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/kreative-square-fonts/default.nix @@ -1,22 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "kreative-square-fonts"; version = "unstable-2021-01-29"; -in -fetchFromGitHub { - name = "${pname}-${version}"; - owner = "kreativekorp"; - repo = "open-relay"; - rev = "084f05af3602307499981651eca56851bec01fca"; + src = fetchFromGitHub { + owner = "kreativekorp"; + repo = "open-relay"; + rev = "084f05af3602307499981651eca56851bec01fca"; + hash = "sha256-+ihosENczaGal3BGDIaJ/de0pf8txdtelSYMxPok6ww="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquare.ttf install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquareSM.ttf + + runHook postInstall ''; - sha256 = "15vvbbzv6b3jh7lxg77viycdd7yf3y8lxy54vs3rsrsxwncg0pak"; meta = with lib; { description = "Fullwidth scalable monospace font designed specifically to support pseudographics, semigraphics, and private use characters"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/lalezar-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lalezar-fonts/default.nix index 31a857bfda..f54c17b51f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/lalezar-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/lalezar-fonts/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { pname = "lalezar-fonts"; version = "unstable-2017-02-28"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "BornaIz"; - repo = "Lalezar"; - rev = "238701c4241f207e92515f845a199be9131c1109"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "BornaIz"; + repo = "Lalezar"; + rev = "238701c4241f207e92515f845a199be9131c1109"; + hash = "sha256-95z58ABTx53aREXRpj9xgclX9kuGiQiiKBwqwnF6f8g="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/lalezar-fonts cp -v $( find . -name '*.ttf') $out/share/fonts/lalezar-fonts + + runHook postInstall ''; - sha256 = "0jmwhr2dqgj3vn0v26jh6c0id6n3wd6as3bq39xa870zlk7v307b"; meta = with lib; { homepage = "https://github.com/BornaIz/Lalezar"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/lao/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lao/default.nix index abe359410b..d7d5d3ddd4 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/lao/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/lao/default.nix @@ -1,16 +1,21 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "lao"; version = "0.0.20060226"; -in -fetchzip { - name = "lao-${version}"; - url = "mirror://debian/pool/main/f/fonts-lao/fonts-lao_${version}.orig.tar.xz"; - sha256 = "sha256-Ti3DNOgLR5VBJ1mSe8M+qs4UYbCR7qOPgqxRfmHa+jY="; - postFetch = '' + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.xz"; + hash = "sha256-DlgdyfhxxzVkNIL+NGsQ+PRlNkCuG3v2OahkIEYx60o="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts - tar xf $downloadedFile --strip-components=1 -C $out/share/fonts fonts-lao-${version}/Phetsarath_OT.ttf + cp Phetsarath_OT.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix b/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix index 8cad990ac9..1932fd6da8 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let - version = "14.000"; -in fetchurl { - name = "last-resort-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "last-resort"; + version = "15.000"; - url = "https://github.com/unicode-org/last-resort-font/releases/download/${version}/LastResortHE-Regular.ttf"; - downloadToTemp = true; + src = fetchurl { + url = "https://github.com/unicode-org/last-resort-font/releases/download/${version}/LastResortHE-Regular.ttf"; + hash = "sha256-Qyo/tuBvBHnG/LW8sUAy62xpeqlXfyfwjUCbr4vJEag="; + }; - postFetch = '' - install -D -m 0644 $downloadedFile $out/share/fonts/truetype/LastResortHE-Regular.ttf + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -D -m 0644 $src $out/share/fonts/truetype/LastResortHE-Regular.ttf + + runHook postInstall ''; - recursiveHash = true; - sha256 = "sha256-rb69V4oExSFx4GpedpyVvGuS6o+MxmxTCSZhoe9kUhI="; - meta = with lib; { description = "Fallback font of last resort"; homepage = "https://github.com/unicode-org/last-resort-font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/lato/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lato/default.nix index 7fa894c1cc..ff1cc62bee 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/lato/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/lato/default.nix @@ -1,12 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "lato-2.0"; +stdenvNoCC.mkDerivation { + pname = "lato"; + version = "2.0"; - url = "https://www.latofonts.com/download/Lato2OFL.zip"; + src = fetchzip { + url = "https://www.latofonts.com/download/Lato2OFL.zip"; + stripRoot = false; + hash = "sha256-n1TsqigCQIGqyGLGTjLtjHuBf/iCwRlnqh21IHfAuXI="; + }; - sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5"; + installPhase = '' + runHook preInstall + + install -Dm644 Lato2OFL/*.ttf -t $out/share/fonts/lato + + runHook postInstall + ''; meta = with lib; { homepage = "https://www.latofonts.com/"; @@ -32,9 +42,4 @@ platforms = platforms.all; maintainers = with maintainers; [ chris-martin ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/lato - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/liberastika/default.nix b/third_party/nixpkgs/pkgs/data/fonts/liberastika/default.nix index 5435a601d1..7c716c1a35 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/liberastika/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/liberastika/default.nix @@ -1,31 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "liberastika"; version = "1.1.5"; -in fetchzip rec { - name = "liberastika-${version}"; - url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip"; + src = fetchzip { + url = "mirror://sourceforge/project/lib-ka/liberastika-ttf-${version}.zip"; + stripRoot = false; + hash = "sha256-woUpOmxhj6eEw7PKJ8EyRcs3ORj0gCZhxHP5a5dy5z0="; + }; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts - install -Dm644 $out/*.ttf -t $out/share/fonts/truetype - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "sha256-1hoETOjPRUIzzM+NUR+g/Ph16jXmH2ARSlZHjgEwoeM="; - meta = with lib; { description = "Liberation Sans fork with improved cyrillic support"; homepage = "https://sourceforge.net/projects/lib-ka/"; license = licenses.gpl2; platforms = platforms.all; - hydraPlatforms = []; maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/libertinus/default.nix b/third_party/nixpkgs/pkgs/data/fonts/libertinus/default.nix index 8f58cb92ba..cc60f80965 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/libertinus/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/libertinus/default.nix @@ -1,18 +1,20 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "libertinus"; 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"; - downloadToTemp = true; - recursiveHash = true; + src = fetchurl { + url = "https://github.com/alerque/libertinus/releases/download/v${version}/Libertinus-${version}.tar.xz"; + hash = "sha256-f+nwInItHBzGfcLCihELO7VbrjV1GWFg0kIsiTM7OFA="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m644 -Dt $out/share/fonts/opentype static/OTF/*.otf + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/libre-baskerville/default.nix b/third_party/nixpkgs/pkgs/data/fonts/libre-baskerville/default.nix index a4be7b5b3e..56d83554e9 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/libre-baskerville/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/libre-baskerville/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "libre-baskerville-1.000"; +stdenvNoCC.mkDerivation rec { + pname = "libre-baskerville"; + version = "1.000"; - owner = "impallari"; - repo = "Libre-Baskerville"; - rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Baskerville"; + rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; + hash = "sha256-1EXi1hxFpc7pFsLbEj1xs9LqjeIf3XBol/8HdKNROUU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/truetype *.ttf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "1kpji85d1mgwq8b4fh1isznrhsrv32la3wf058rwjmhx5a3l7yaj"; + runHook postInstall + ''; meta = with lib; { description = "A webfont family optimized for body text"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/libre-bodoni/default.nix b/third_party/nixpkgs/pkgs/data/fonts/libre-bodoni/default.nix index 63bbf8eba7..cd55c10d2e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/libre-bodoni/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/libre-bodoni/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "libre-bodoni-2.000"; +stdenvNoCC.mkDerivation rec { + pname = "libre-bodoni"; + version = "2.000"; - owner = "impallari"; - repo = "Libre-Bodoni"; - rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Bodoni"; + rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; + hash = "sha256-yfqVeT/JiAT+fsqkXUxqlz4sEEFwEJUdvFTAzuqejtk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype */v2000\ -\ initial\ glyphs\ migration/OTF/*.otf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "0my0i5a7f0d27m6dcdirjmlcnswqqfp8gl3ccxa5f2wkn3qlzkvz"; + runHook postInstall + ''; meta = with lib; { description = "Bodoni fonts adapted for today's web requirements"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/libre-franklin/default.nix b/third_party/nixpkgs/pkgs/data/fonts/libre-franklin/default.nix index b41ae8878c..f6fe791743 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/libre-franklin/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/libre-franklin/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { - name = "libre-franklin-1.014"; +stdenvNoCC.mkDerivation rec { + pname = "libre-franklin"; + version = "1.014"; - owner = "impallari"; - repo = "Libre-Franklin"; - rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Franklin"; + rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; + hash = "sha256-GR1KHiQ1lTOmU8eAPR2pxUlMpWiW2EDMG78VDjELxDU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype */OTF/*.otf - install -m444 -Dt $out/share/doc/${name} README.md FONTLOG.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README.md FONTLOG.txt - sha256 = "0aq280m01pbirkzga432340aknf2m5ggalw0yddf40sqz7falykf"; + runHook postInstall + ''; meta = with lib; { description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic."; diff --git a/third_party/nixpkgs/pkgs/data/fonts/linja-pi-pu-lukin/default.nix b/third_party/nixpkgs/pkgs/data/fonts/linja-pi-pu-lukin/default.nix index 426acd2668..40f330cec7 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/linja-pi-pu-lukin/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/linja-pi-pu-lukin/default.nix @@ -1,16 +1,22 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -fetchurl { +stdenvNoCC.mkDerivation { pname = "linja-pi-pu-lukin"; version = "unstable-2021-10-29"; - url = "https://web.archive.org/web/20211029000000/https://jansa-tp.github.io/linja-pi-pu-lukin/PuLukin.otf"; - hash = "sha256-VPdrMHWpiokFYON4S8zT+pSs4TsB17S8TZRtkjqIqU8="; + src = fetchurl { + url = "https://web.archive.org/web/20211029000000/https://jansa-tp.github.io/linja-pi-pu-lukin/PuLukin.otf"; + hash = "sha256-Mf7P9fLGiG7L555Q3wRaI/PRv/TIs0njLq2IzIbc5Wo="; + }; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -D $downloadedFile $out/share/fonts/opentype/linja-pi-pu-lukin.otf + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -D $src $out/share/fonts/opentype/linja-pi-pu-lukin.otf + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/lklug-sinhala/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lklug-sinhala/default.nix index 45f907f1cf..817dbbb253 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/lklug-sinhala/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/lklug-sinhala/default.nix @@ -1,16 +1,21 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "lklug-sinhala"; version = "0.6"; -in -fetchzip { - name = "lklug-sinhala-${version}"; - url = "mirror://debian/pool/main/f/fonts-lklug-sinhala/fonts-lklug-sinhala_${version}.orig.tar.xz"; - sha256 = "sha256-Fy+QnAajA4yLf/I1vOQll5pRd0ZLfLe8UXq4XMC9qNc="; - postFetch = '' - mkdir -p $out/share/fonts - tar xf $downloadedFile --strip-components=1 -C $out/share/fonts fonts-lklug-sinhala-${version}/lklug.ttf + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.xz"; + hash = "sha256-oPCCa01PMQcCK5fEILgXjrGzoDg+UvxkqK6AgeQaKio="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/lmmath/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lmmath/default.nix index ebe4ceb88c..3881f0f0f4 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/lmmath/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/lmmath/default.nix @@ -1,13 +1,24 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "lmmath"; version = "1.959"; -in (fetchzip rec { - name = "lmmath-${version}"; - url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"; - sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn"; + src = fetchzip { + url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"; + hash = "sha256-et/WMhfZZYgP0S7ZmI6MZK5owv9bSoMBXFX6yGSng5Y="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/opentype/ + mkdir -p $out/share/doc/latinmodern-math-${version}/ + cp otf/*.otf $out/share/fonts/opentype/ + cp doc/*.txt $out/share/doc/latinmodern-math-${version}/ + + runHook postInstall + ''; meta = with lib; { description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth"; @@ -19,11 +30,4 @@ in (fetchzip rec { maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/opentype/ - mkdir -p $out/share/doc/latinmodern-math-${version}/ - unzip -j $downloadedFile "*/otf/*.otf" -d $out/share/fonts/opentype/ - unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/latinmodern-math-${version}/ - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/lmodern/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lmodern/default.nix index af0e703313..85aa7060ea 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/lmodern/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/lmodern/default.nix @@ -1,26 +1,27 @@ -{ fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "lmodern-2.005"; +stdenvNoCC.mkDerivation rec { + pname = "lmodern"; + version = "2.005"; - url = "mirror://debian/pool/main/l/lmodern/lmodern_2.005.orig.tar.gz"; + src = fetchurl { + url = "mirror://debian/pool/main/l/${pname}/${pname}_${version}.orig.tar.gz"; + hash = "sha256-xlUuZt6rjW0pX4t6PKWAHkkv3PisGCj7ZwatZPAUNxk="; + }; - postFetch = '' - tar xzvf $downloadedFile + installPhase = '' + runHook preInstall mkdir -p $out/texmf-dist/ mkdir -p $out/share/fonts/ - cp -r lmodern-2.005/* $out/texmf-dist/ - cp -r lmodern-2.005/fonts/{opentype,type1} $out/share/fonts/ + cp -r * $out/texmf-dist/ + cp -r fonts/{opentype,type1} $out/share/fonts/ - ln -s -r $out/texmf* $out/share/ + runHook postInstall ''; - sha256 = "sha256-ySdKUt8o5FqmpdnYSzbGJ1f9t8VmKYXqPt53e1/E/FA="; - meta = { description = "Latin Modern font"; }; } - diff --git a/third_party/nixpkgs/pkgs/data/fonts/lohit-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lohit-fonts/default.nix index 64ae831767..53bccc4a40 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/lohit-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/lohit-fonts/default.nix @@ -1,35 +1,38 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: let fonts = { - assamese = { label = "Assamese"; version = "2.91.5"; sha256 = "06cw416kgw0m6883n5ixmpniinsd747rdmacf06z83w1hqwj2js6"; }; - bengali = { label = "Bengali"; version = "2.91.5"; sha256 = "1j7gfmkzzyk9mivy09a9yfqxpidw52hw48dyh4qkci304mspcbvr"; }; - devanagari = { label = "Devanagari script"; version = "2.95.4"; sha256 = "1c17xirzx5rf7xpmkrm94jf9xrzckyagwnqn3pyag28lyj8x67m5"; }; - gujarati = { label = "Gujarati"; version = "2.92.4"; sha256 = "0xdgmkikz532zxj239wr73l24qnzxhra88f52146x7fsb7gpvfb1"; }; - gurmukhi = { label = "Gurmukhi script"; version = "2.91.2"; sha256 = "1xk1qvc0xwcmjcavj9zmy4bbphffdlv7sldmqlk30ch5fy5r0ypb"; }; # renamed from Punjabi - kannada = { label = "Kannada"; version = "2.5.4" ; sha256 = "0sax56xg98p2nf0nsvba42hhz946cs7q0gidiz9zfpb6pbgwxdgg"; }; - malayalam = { label = "Malayalam"; version = "2.92.2"; sha256 = "18sca59fj9zvqhagbix35i4ld2n4mwv57q04pijl5gvpyfb1abs8"; }; - marathi = { label = "Marathi"; version = "2.94.2"; sha256 = "0cjjxxlhqmdmhr35s4ak0ma89456daik5rqrn6pdzj39098lmci7"; }; - nepali = { label = "Nepali"; version = "2.94.2"; sha256 = "1p7lif136xakfqkbv6p1lb56rs391b25vn4bxrjdfvsk0r0h0ry3"; }; - odia = { label = "Odia"; version = "2.91.2"; sha256 = "0z5rc4f9vfrfm8h2flzf5yx44x50jqdmmzifkmjwczib3hpg2ila"; }; # renamed from Oriya - tamil-classical = { label = "Classical Tamil"; version = "2.5.4" ; sha256 = "0svmj3dhk0195mhdwjhi3qgwa83223irb32fp12782sj9njdvyi2"; }; - tamil = { label = "Tamil"; version = "2.91.3"; sha256 = "0qyw9p8alyvjryyw8a25q3gfyrhby49mjb0ydgggf5ckd07kblcm"; }; - telugu = { label = "Telugu"; version = "2.5.5" ; sha256 = "07p41686ypmclj9d3njp01lvrgssqxa4s5hsbrqfjrnwd3rjspzr"; }; + assamese = { label = "Assamese"; version = "2.91.5"; hash = "sha256-Oo/hHHFg/Nu3eaZLMdBclY90lKU2AMFUclyXHxGaAgg="; }; + bengali = { label = "Bengali"; version = "2.91.5"; hash = "sha256-QGf94TdQS2c9+wSSDK4Mknw5ubCGTuvg0xoNaJdirBc="; }; + devanagari = { label = "Devanagari script"; version = "2.95.4"; hash = "sha256-6CbOCqOei5eO1zwNQZvB+fFDkqxvJnK82z+zmClhRAE="; }; + gujarati = { label = "Gujarati"; version = "2.92.4"; hash = "sha256-BpwibF0/HXDvXpDEek0fj73cxo2QC1hSfQ49Q/ZOZg8="; }; + gurmukhi = { label = "Gurmukhi script"; version = "2.91.2"; hash = "sha256-5iLFW2FEE5LBqoALi+3sUjwC0ADntsp259TP+bYwR9g="; }; # renamed from Punjabi + kannada = { label = "Kannada"; version = "2.5.4" ; hash = "sha256-7y2u0tBdNYCeY7Y+aqhxXP7Qv6GglJeVO1wvM9CzyIQ="; }; + malayalam = { label = "Malayalam"; version = "2.92.2"; hash = "sha256-SzM38vuAlP9OMC8kUuHQylmH8TUjCeg1y/Zcu2I2bjA="; }; + marathi = { label = "Marathi"; version = "2.94.2"; hash = "sha256-jK1Gwcr5gqzRNkbIxs4V/OYgUlUEpU0OYzKDTkiMlqM="; }; + nepali = { label = "Nepali"; version = "2.94.2"; hash = "sha256-OX1ekxeSbVGOrdbZ3Jvu4nii0zkgbuij10JIzqRcFx4="; }; + odia = { label = "Odia"; version = "2.91.2"; hash = "sha256-3/eczBGGZj4QPs7KY0as9zk5HaBfhgz6YgU0qmwpVcA="; }; # renamed from Oriya + tamil-classical = { label = "Classical Tamil"; version = "2.5.4" ; hash = "sha256-6SsddTCEUHMoF7X4+i7eXimmMuktfFAl8uz95RwM+yg="; }; + tamil = { label = "Tamil"; version = "2.91.3"; hash = "sha256-8lcNw87o9lhQsKwCqwBSfx7rhcrH/eEqac7EsA9/w/E="; }; + telugu = { label = "Telugu"; version = "2.5.5" ; hash = "sha256-cZh93NfEB+5S1JeEowtBMJ0nbZsFGpbEp2WAtzxrA8A="; }; }; gplfonts = { # GPL fonts removed from later releases - kashmiri = { label = "Kashmiri"; version = "2.4.3" ; sha256 = "0c6whklad9bscymrlcbxj4fdvh4cdf40vb61ykbp6mapg6dqxwhn"; }; - konkani = { label = "Konkani"; version = "2.4.3" ; sha256 = "0pcb5089dabac1k6ymqnbnlyk7svy2wnb5glvhsd8glycjhrcp70"; }; - maithili = { label = "Maithili"; version = "2.4.3" ; sha256 = "1yfwv7pcj7k4jryz0s6mb56bq7fs15g56y7pi5yd89q1f8idk6bc"; }; - sindhi = { label = "Sindhi"; version = "2.4.3" ; sha256 = "1iywzyy185bvfsfi5pp11c8bzrp40kni2cpwcmxqwha7c9v8brlc"; }; + kashmiri = { label = "Kashmiri"; version = "2.4.3" ; hash = "sha256-6T2QaWnt3+e5nr4vbk44FouqmeWKzia1lSf8S/bvqCs="; }; + konkani = { label = "Konkani"; version = "2.4.3" ; hash = "sha256-hVy2rxrUTPDeNnugi3Bk7z0JqGmk4/yeUsAoI/4R7A8="; }; + maithili = { label = "Maithili"; version = "2.4.3" ; hash = "sha256-ikDcpJqdizAYRpgoebzqxOEeodJ6C3fO2rsqGzC0HCs="; }; + sindhi = { label = "Sindhi"; version = "2.4.3" ; hash = "sha256-wU3B9fh+8E1bFBMnakzmajY7eNKzed9+eYL5AOxyNQI="; }; }; - mkpkg = license: name: {label, version, sha256}: fetchzip { - name = "lohit-${name}-${version}"; + mkpkg = license: pname: {label, version, hash}: stdenvNoCC.mkDerivation { + inherit pname version; - url = "https://releases.pagure.org/lohit/lohit-${name}-ttf-${version}.tar.gz"; + src = fetchurl { + url = "https://releases.pagure.org/lohit/lohit-${pname}-ttf-${version}.tar.gz"; + inherit hash; + }; - postFetch = '' - tar -xzf $downloadedFile --strip-components=1 + installPhase = '' + runHook preInstall mkdir -p $out/share/fonts/truetype cp -v *.ttf $out/share/fonts/truetype/ @@ -37,11 +40,11 @@ let mkdir -p $out/etc/fonts/conf.d cp -v *.conf $out/etc/fonts/conf.d - mkdir -p "$out/share/doc/lohit-${name}" - cp -v ChangeLog* COPYRIGHT* "$out/share/doc/lohit-${name}/" - ''; + mkdir -p "$out/share/doc/lohit-${pname}" + cp -v ChangeLog* COPYRIGHT* "$out/share/doc/lohit-${pname}/" - inherit sha256; + runHook postInstall + ''; meta = { inherit license; diff --git a/third_party/nixpkgs/pkgs/data/fonts/luculent/default.nix b/third_party/nixpkgs/pkgs/data/fonts/luculent/default.nix index 9d61931db3..1347af957e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/luculent/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/luculent/default.nix @@ -1,17 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let version = "2.0.0"; in -fetchzip { - name = "luculent-${version}"; - url = "http://www.eastfarthing.com/luculent/luculent.tar.xz"; +stdenvNoCC.mkDerivation rec { + pname = "luculent"; + version = "2.0.0"; + + src = fetchurl { + url = "http://www.eastfarthing.com/${pname}/${pname}.tar.xz"; + hash = "sha256-6NxLnTBnvHmTUTFa2wW0AuKPEbCqzaWQyiFVnF0sBqU="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xJf $downloadedFile --strip-components=1 mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype - ''; - sha256 = "1m3g64galwna1xjxb1fczmfplm6c1fn3ra1ln7f0vkm0ah5m4lbv"; + runHook postInstall + ''; meta = with lib; { description = "luculent font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix new file mode 100644 index 0000000000..9d05689657 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchurl +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation rec { + pname = "lxgw-neoxihei"; + version = "1.005"; + + src = fetchurl { + url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; + hash = "sha256-IvbbeBjpFz9zHt3mHu5vY8sLETKnvOMv7eHjANQ2GlA="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/LXGWNeoXiHei.ttf + + runHook postInstall + ''; + + meta = with lib; { + description = "A Simplified Chinese sans-serif font derived from IPAex Gothic"; + homepage = "https://github.com/lxgw/LxgwNeoXiHei"; + license = licenses.ipa; + platforms = platforms.all; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix index bb36d9a920..c16a5f7749 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.245.1"; + version = "1.250"; - url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/lxgw-wenkai-v${version}.tar.gz"; + src = fetchurl { + url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; + hash = "sha256-Nkd0xXYCnR0NZAk/JCxy+zOlxIxD52Px4F9o2L9mgRE="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - mv $out/*.ttf $out/share/fonts/truetype + mv *.ttf $out/share/fonts/truetype - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + runHook postInstall ''; - hash = "sha256-4RQ+aqAZPQH3t6v2KvrNWgYT3J3uMuY34XTuvyLEOeI="; - meta = with lib; { homepage = "https://lxgw.github.io/"; description = "An open-source Chinese font derived from Fontworks' Klee One"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/manrope/default.nix b/third_party/nixpkgs/pkgs/data/fonts/manrope/default.nix index 9bf4f32cae..7c9ab17a79 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/manrope/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/manrope/default.nix @@ -1,18 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "manrope"; version = "3"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "sharanda"; - repo = pname; - rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9"; - sha256 = "1h4chkfbp75hrrqqarf28ld4yb7hfrr7q4w5yz96ivg94lbwlnld"; - postFetch = '' - tar xf $downloadedFile --strip=1 + + src = fetchFromGitHub { + owner = "sharanda"; + repo = pname; + rev = "3bd68c0c325861e32704470a90dfc1868a5c37e9"; + hash = "sha256-Gm7mUD/Ud2Rf8mA3jwUL7RE8clCmb6SETOskuj6r1sw="; + }; + + installPhase = '' + runHook preInstall + install -Dm644 -t $out/share/fonts/opentype "desktop font"/* + + runHook postInstall ''; + meta = with lib; { description = "Open-source modern sans-serif font family"; homepage = "https://github.com/sharanda/manrope"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/marathi-cursive/default.nix b/third_party/nixpkgs/pkgs/data/fonts/marathi-cursive/default.nix index 8c228fd91a..7f6bedc75e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/marathi-cursive/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/marathi-cursive/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let - version = "2.0"; -in fetchzip rec { - name = "marathi-cursive-${version}"; +stdenvNoCC.mkDerivation rec { + pname = "marathi-cursive"; + version = "2.1"; - url = "https://github.com/MihailJP/MarathiCursive/releases/download/v${version}/MarathiCursive-${version}.tar.xz"; + src = fetchurl { + url = "https://github.com/MihailJP/MarathiCursive/releases/download/v${version}/MarathiCursive-${version}.tar.xz"; + hash = "sha256-C/z8ALV9bht0SaYqACO5ulSVCk1d6wBwvpVC4ZLgtek="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xJf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/marathi-cursive *.otf *.ttf - install -m444 -Dt $out/share/doc/${name} README *.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README *.txt - sha256 = "17pj60ajnjghxhxka8a046mz6vfwr79wnby7xd6pg5hgncin2hgg"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/MihailJP/MarathiCursive"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix b/third_party/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix index 82f422146a..49d52ebb77 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/material-design-icons/default.nix @@ -1,24 +1,28 @@ -{ lib, fetchFromGitHub }: +{ lib, fetchFromGitHub, stdenvNoCC }: -let - version = "7.0.96"; -in fetchFromGitHub { - name = "material-design-icons-${version}"; - owner = "Templarian"; - repo = "MaterialDesign-Webfont"; - rev = "v${version}"; +stdenvNoCC.mkDerivation rec { + pname = "material-design-icons"; + version = "7.1.96"; - postFetch = '' - mkdir -p $out/share/fonts/{eot,truetype,woff,woff2} - mv $out/fonts/*.eot $out/share/fonts/eot/ - mv $out/fonts/*.ttf $out/share/fonts/truetype/ - mv $out/fonts/*.woff $out/share/fonts/woff/ - mv $out/fonts/*.woff2 $out/share/fonts/woff2/ - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + src = fetchFromGitHub { + owner = "Templarian"; + repo = "MaterialDesign-Webfont"; + rev = "v${version}"; + sha256 = "sha256-qS7zJQkd0Q5wYLgYXa63fD3Qi2T5JWD6vXW2FoFzZxo="; + sparseCheckout = [ "fonts" ]; + }; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/fonts/"{eot,truetype,woff,woff2} + cp fonts/*.eot "$out/share/fonts/eot/" + cp fonts/*.ttf "$out/share/fonts/truetype/" + cp fonts/*.woff "$out/share/fonts/woff/" + cp fonts/*.woff2 "$out/share/fonts/woff2/" + + runHook postInstall ''; - sha256 = "sha256-l60LRXLwLh+7Ls3kMTJ5eDTVpVMcqtshMv/ehIk8fCk="; meta = with lib; { description = "7000+ Material Design Icons from the Community"; @@ -30,6 +34,6 @@ in fetchFromGitHub { homepage = "https://materialdesignicons.com"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ vlaci ]; + maintainers = with maintainers; [ vlaci PlayerNameHere ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/material-icons/default.nix b/third_party/nixpkgs/pkgs/data/fonts/material-icons/default.nix index 656be1b153..f03e8683e5 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/material-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/material-icons/default.nix @@ -1,20 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { + pname = "material-icons"; version = "3.0.1"; -in fetchFromGitHub { - name = "material-icons-${version}"; - owner = "google"; - repo = "material-design-icons"; - rev = version; + src = fetchFromGitHub { + owner = "google"; + repo = "material-design-icons"; + rev = version; + hash = "sha256-4FphNJCsaLWzlVR4TmXnDBid0EVj39fkeoh5j1leBZ8="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype cp iconfont/*.ttf $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "1syy6v941lb8nqxhdf7mfx28v05lwrfnq53r3c1ym13x05l9kchp"; meta = with lib; { description = "System status icons by Google, featuring material design"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/medio/default.nix b/third_party/nixpkgs/pkgs/data/fonts/medio/default.nix index c94046f085..240b6fbeea 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/medio/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/medio/default.nix @@ -1,24 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "200"; - pname = "medio"; in +stdenvNoCC.mkDerivation (self: { + pname = "medio"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-S+CcwD4zGVk7cIFD6K4NnpE/0mrJq4RnDJC576rhcLQ="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "0gxcmhjlsh2pzsmj78vw4v935ax7hfk533ddlhfhfma52zyxyh7x"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "Serif font designed by Sora Sagano"; longDescription = '' Medio is a serif font designed by Sora Sagano, based roughly @@ -26,7 +31,7 @@ fetchzip { but with hairline serifs in the style of a Didone. ''; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/melete/default.nix b/third_party/nixpkgs/pkgs/data/fonts/melete/default.nix new file mode 100644 index 0000000000..cae6bcaf4e --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/melete/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenvNoCC, fetchzip }: + +let + majorVersion = "0"; + minorVersion = "200"; +in +stdenvNoCC.mkDerivation (self: { + pname = "melete"; + version = "${majorVersion}.${minorVersion}"; + + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-y1xtNM1Oy92gOvbr9J71XNxb1JeTzOgxKms3G2YHK00="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://dotcolon.net/font/${self.pname}/"; + description = "A headline typeface that could be used as a movie title"; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + license = licenses.ofl; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/mno16/default.nix b/third_party/nixpkgs/pkgs/data/fonts/mno16/default.nix index f0ff4c1b20..59597120c1 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/mno16/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/mno16/default.nix @@ -1,22 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { pname = "mno16"; version = "1.0"; -in (fetchzip rec { - name = "${pname}-${version}"; - url = "https://github.com/sevmeyer/${pname}/releases/download/${version}/${name}.zip"; - sha256 = "1x06nl281fcjk6g1p4cgrgxakmwcci6vvasskaygsqlzxd8ig87w"; + + src = fetchzip { + url = "https://github.com/sevmeyer/${pname}/releases/download/${version}/${pname}-${version}.zip"; + stripRoot = false; + hash = "sha256-xJQ9V7GlGUTEeYhqYFl/SemS6iqV0eW85YOn/tLgA+M="; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp fonts/*.ttf $out/share/fonts/truetype/ + ''; meta = with lib; { description = "minimalist monospaced font"; homepage = "https://sev.dev/fonts/mno16"; license = licenses.cc0; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/truetype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/mononoki/default.nix b/third_party/nixpkgs/pkgs/data/fonts/mononoki/default.nix index b45d130b1c..7f7c287669 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/mononoki/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/mononoki/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "mononoki"; version = "1.3"; -in (fetchzip { - name = "mononoki-${version}"; - url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; + src = fetchzip { + url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; + stripRoot = false; + hash = "sha256-bZYBRdmbQVs4i6UzMIHwJnoLWggX4CW8ZogNFYiX/9w="; + }; - sha256 = "sha256-K2uOpJRmQ1NcDZfh6rorCF0MvGHFCsSW8J7Ue9OC/OY="; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/mononoki + cp webfont/* $out/share/fonts/mononoki + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/madmalik/mononoki"; @@ -16,9 +25,4 @@ in (fetchzip { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/mononoki - unzip -j $downloadedFile -d $out/share/fonts/mononoki - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/montserrat/default.nix b/third_party/nixpkgs/pkgs/data/fonts/montserrat/default.nix index cb396080e4..6074018f55 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/montserrat/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/montserrat/default.nix @@ -1,25 +1,27 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub rec { +stdenvNoCC.mkDerivation rec { pname = "montserrat"; version = "7.222"; - owner = "JulietaUla"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-MeNnc1e5X5f0JyaLY6fX22rytHkvL++eM2ygsdlGMv0="; + src = fetchFromGitHub { + owner = "JulietaUla"; + repo = pname; + rev = "v${version}"; + hash = "sha256-eVCRn2OtNI5NuYZBQy06HKnMMXhPPnFxI8m8kguZjg0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/{otf,ttf,woff,woff2} - mv $out/fonts/otf/*.otf $out/share/fonts/otf - mv $out/fonts/ttf/*.ttf $out/share/fonts/ttf - mv $out/fonts/webfonts/*.woff $out/share/fonts/woff - mv $out/fonts/webfonts/*.woff2 $out/share/fonts/woff2 + mv fonts/otf/*.otf $out/share/fonts/otf + mv fonts/ttf/*.ttf $out/share/fonts/ttf + mv fonts/webfonts/*.woff $out/share/fonts/woff + mv fonts/webfonts/*.woff2 $out/share/fonts/woff2 - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/mph-2b-damase/default.nix b/third_party/nixpkgs/pkgs/data/fonts/mph-2b-damase/default.nix index 10a8dc38d9..d5623d907b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/mph-2b-damase/default.nix @@ -1,17 +1,21 @@ -{ fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip { - name = "MPH-2B-Damase-2"; +stdenvNoCC.mkDerivation rec { + pname = "mph-2b-damase"; + version = "2"; - url = "http://www.wazu.jp/downloads/damase_v.2.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20160322114946/http://www.wazu.jp/downloads/damase_v.2.zip"; + hash = "sha256-4x78D+c3ZBxfhTQQ4+gyxvrsuztHF2ItXLh4uA0PxvU="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "0yzf12z6fpbgycqwiz88f39iawdhjabadfa14wxar3nhl9n434ql"; - - meta = { - }; + meta = { }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/mplus-outline-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/mplus-outline-fonts/default.nix index c3def549aa..93e508ecd4 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -1,16 +1,23 @@ -{ lib, fetchzip, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchurl, fetchFromGitHub }: let pname = "mplus-outline-fonts"; -in { - osdnRelease = fetchzip { - name = "${pname}-osdn"; - url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-063a.tar.xz"; - sha256 = "sha256-+VN+aFx5hMlWwtk+FM+vL6G07+yEi9kYYsoQLSfMUZo="; - postFetch = '' - install -m444 -Dt $out/share/fonts/truetype/${pname} $out/*.ttf - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob +in +{ + osdnRelease = stdenvNoCC.mkDerivation { + pname = "${pname}-osdn"; + version = "063a"; + + src = fetchurl { + url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-063a.tar.xz"; + hash = "sha256-ROuXO0tq/1dN5FTbEF3cI+Z0nCKUc0vZyx4Nc05M3Xk="; + }; + + installPhase = '' + runHook preInstall + + install -m444 -Dt $out/share/fonts/truetype/${pname} *.ttf + + runHook postInstall ''; meta = with lib; { @@ -22,19 +29,25 @@ in { }; }; - githubRelease = fetchFromGitHub { - name = "${pname}-github"; - owner = "coz-m"; - repo = "MPLUS_FONTS"; - rev = "336fec4e9e7c1e61bd22b82e6364686121cf3932"; - sha256 = "sha256-LSIyrstJOszll72mxXIC7EW4KEMTFCaQwWs59j0UScE="; - postFetch = '' + githubRelease = stdenvNoCC.mkDerivation { + pname = "${pname}-github"; + version = "unstable-2022-05-19"; + + src = fetchFromGitHub { + owner = "coz-m"; + repo = "MPLUS_FONTS"; + rev = "336fec4e9e7c1e61bd22b82e6364686121cf3932"; + hash = "sha256-jzDDUs1dKjqNjsMeTA2/4vm+akIisnOuE2mPQS7IDSA="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/{truetype,opentype}/${pname} - mv $out/fonts/ttf/* $out/share/fonts/truetype/${pname} - mv $out/fonts/otf/* $out/share/fonts/opentype/${pname} - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + mv fonts/ttf/* $out/share/fonts/truetype/${pname} + mv fonts/otf/* $out/share/fonts/opentype/${pname} + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/mro-unicode/default.nix b/third_party/nixpkgs/pkgs/data/fonts/mro-unicode/default.nix index 9f4eda63d0..9a522c1c2a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/mro-unicode/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/mro-unicode/default.nix @@ -1,13 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "mro-unicode-2013-05-25"; +stdenvNoCC.mkDerivation { + pname = "mro-unicode"; + version = "unstable-2013-05-25"; - url = "https://github.com/phjamr/MroUnicode/raw/f297de070f7eba721a47c850e08efc119d3bfbe8/MroUnicode-Regular.ttf"; + src = fetchurl { + url = "https://github.com/phjamr/MroUnicode/raw/f297de070f7eba721a47c850e08efc119d3bfbe8/MroUnicode-Regular.ttf"; + hash = "sha256-hcQmTuRWxaU5KEMXg/O0b1olE8YxXWz0PAlqAJknR/0="; + }; - postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/MroUnicode-Regular.ttf"; + dontUnpack = true; - sha256 = "1i71bjd9gdyn8ladfncbfhz6xz1h8xx8yf876j1z8lh719410c8g"; + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/MroUnicode-Regular.ttf + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/phjamr/MroUnicode"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/myrica/default.nix b/third_party/nixpkgs/pkgs/data/fonts/myrica/default.nix index c36292eb00..5d8aa43a5b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/myrica/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/myrica/default.nix @@ -1,18 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub { - name = "myrica-2.011.20160403"; +stdenvNoCC.mkDerivation { + pname = "myrica"; + version = "2.011.20160403"; - owner = "tomokuni"; - repo = "Myrica"; - # commit does not exist on any branch on the target repository - rev = "b737107723bfddd917210f979ccc32ab3eb6dc20"; - sha256 = "187rklcibbkai6m08173ca99qn8v7xpdfdv0izpymmavj85axm12"; + src = fetchFromGitHub { + owner = "tomokuni"; + repo = "Myrica"; + # commit does not exist on any branch on the target repository + rev = "b737107723bfddd917210f979ccc32ab3eb6dc20"; + hash = "sha256-kx+adbN2DsO81KJFt+FGAPZN+1NpE9xiagKZ4KyaJV0="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar --strip-components=1 -xzvf $downloadedFile mkdir -p $out/share/fonts/truetype cp product/*.TTC $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/nacelle/default.nix b/third_party/nixpkgs/pkgs/data/fonts/nacelle/default.nix new file mode 100644 index 0000000000..007de90b75 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/nacelle/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenvNoCC, fetchzip }: + +let + majorVersion = "1"; + minorVersion = "00"; +in +stdenvNoCC.mkDerivation (self: { + pname = "nacelle"; + version = "${majorVersion}.${minorVersion}"; + + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-e4QsPiyfWEAYHWdwR3CkGc2UzuA3hZPYYlWtIubY0Oo="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://dotcolon.net/font/${self.pname}/"; + description = "A improved version of the Aileron font"; + platforms = platforms.all; + maintainers = with maintainers; [ minijackson ]; + license = licenses.ofl; + }; +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/nahid-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/nahid-fonts/default.nix index fbceb3c927..d036eed35c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/nahid-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/nahid-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "nahid-fonts"; version = "0.3.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "nahid-font"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "nahid-font"; + rev = "v${version}"; + hash = "sha256-r8/W0/pJV6OX954spIITvW7M6lIbZRpbsvEHErnXglg="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/nahid-fonts {} \; + + runHook postInstall ''; - sha256 = "0df169sibq14j2mj727sq86c00jm1nz8565v85hkvh4zgz2plb7c"; meta = with lib; { homepage = "https://github.com/rastikerdar/nahid-font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix b/third_party/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix index 4a0e3c975f..3798a33b66 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "VER2.5"; - fullName = "NanumGothicCoding-2.5"; +stdenvNoCC.mkDerivation rec { + pname = "nanum-gothic-coding"; + version = "2.5"; -in (fetchzip { - name = "nanum-gothic-coding"; - url = "https://github.com/naver/nanumfont/releases/download/${version}/${fullName}.zip"; + src = fetchzip { + url = "https://github.com/naver/nanumfont/releases/download/VER${version}/NanumGothicCoding-${version}.zip"; + stripRoot = false; + hash = "sha256-jHbbCMUxn54iQMKdAWI3r8CDxi+5LLJh8ucQzq2Ukdc="; + }; - sha256 = "0b3pkhd6xn6393zi0dhj3ah08w1y1ji9fl6584bi0c8lanamf2pc"; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/NanumGothicCoding + cp *.ttf $out/share/fonts/NanumGothicCoding + + runHook postInstall + ''; meta = with lib; { description = "A contemporary monospaced sans-serif typeface with a warm touch"; @@ -18,9 +26,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/NanumGothicCoding - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/NanumGothicCoding - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/nanum/default.nix b/third_party/nixpkgs/pkgs/data/fonts/nanum/default.nix index 1aac2c53d8..8f432edf41 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/nanum/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/nanum/default.nix @@ -1,20 +1,21 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "nanum"; version = "20170925"; -in -fetchzip { - name = "nanum-${version}"; - url = "mirror://ubuntu/pool/universe/f/fonts-nanum/fonts-nanum_${version}.orig.tar.xz"; - sha256 = "sha256-lSTeQEuMmlQxiQqrx9tNScifE8nMOUDJF3lCfoAFIJk="; - postFetch = '' - unpackDir="$TMPDIR/unpack" - mkdir "$unpackDir" - cd "$unpackDir" - tar xf "$downloadedFile" --strip-components=1 + src = fetchurl { + url = "mirror://ubuntu/pool/universe/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.xz"; + hash = "sha256-GlVXH9YUU3wHMkNoz5miBv7N2oUEbwUXlcVoElQ9++4="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts cp *.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/national-park/default.nix b/third_party/nixpkgs/pkgs/data/fonts/national-park/default.nix index cfa36870ed..4970e0d592 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/national-park/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/national-park/default.nix @@ -1,14 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { pname = "national-park-typeface"; version = "206464"; -in (fetchzip { - name = "${pname}-${version}"; - url = "https://files.cargocollective.com/c${version}/NationalPark.zip"; - sha256 = "044gh4xcasp8i9ny6z4nmns1am2pk5krc4ann2afq35v9bnl2q5d"; + src = fetchzip { + url = "https://files.cargocollective.com/c${version}/NationalPark.zip"; + stripRoot = false; + hash = "sha256-VUboZZVJfKupnoHXo3RxetEEYimrr1DxghVZaaWnnw4="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts/opentype/ + + runHook postInstall + ''; meta = with lib; { description = ''Typeface designed to mimic the national park service @@ -17,9 +25,4 @@ in (fetchzip { license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile National\*.otf -d $out/share/fonts/opentype/ - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/shas.nix b/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/shas.nix index e7ea24935d..b8b5f490e3 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/shas.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/shas.nix @@ -1,55 +1,55 @@ { - "3270" = "1icrqgi7i7cf4jhgpdymv2mkvwh5lgx6yfbs3lrj6jxyhyv14mjj"; - "Agave" = "0ar50csbsx0rhm3zbi3jf2c9r7wpx20lpmij1i205p53qbiihpv1"; - "AnonymousPro" = "1is1jgxslmjy4pag137yyh99cf6dvlbkwwnaf91i73ad2w2mm2hm"; - "Arimo" = "0a5s4flni7wggw5cc9mcc0ipcbmm786fmh2b2y7kp2d3i92sq76x"; - "AurulentSansMono" = "10agjvrr18ddh8gmdv3ih2lxvrklc65vwsrzzi89h0f8jcas50l5"; - "BigBlueTerminal" = "130p26r3b2m66ycd549sirvysicr3ld3l8qmrdfw9fr4jva8767s"; - "BitstreamVeraSansMono" = "02dwhxs7agr3nbwslimryd3wq41wxsw9as0dk3czyjwrgiiwqbzh"; - "CascadiaCode" = "1y06c8sfwy3pbxda56z7b7awrhia30f7xylj4m1wsnqql5bkwz21"; - "CodeNewRoman" = "07y2yv9yi35lksiinpm0pxl5jjlbhffnm3mqjqr9292k0d76wrr8"; - "Cousine" = "1cr1l25ynis1wf9rh0hdyaj4v4cvpv8ci359qjlhhpai5vspr273"; - "DaddyTimeMono" = "1qj1fqrass97hnn2vm9wdmhyn99w5xk1swm2b1kp70bjbp4jarvh"; - "DejaVuSansMono" = "03z80lhg128r4ivpcixcxfradn2n9hnwdk2bnbk7z5brqskh0sfy"; - "DroidSansMono" = "17kvbcsasvfz339ld390msw8715ydfd5vvfm8rm6lyb34rv1z53s"; - "FantasqueSansMono" = "0whjkl0dk1w4f29vw4jnzx8zwll9fl1axxnmsch9pcm3q7rwzpb5"; - "FiraCode" = "0wn127x4i4l64v8ql32fw64k82iv9z6q0gkf5p285dcrlbjih04x"; - "FiraMono" = "0cl4ssdylydwm4zhms2400c7idg0mf7yzsqds2qm7im744m6gkr7"; - "FontPatcher" = "0hidpffswnz4375s61wq76djn0wilcgcmwz4b0v5gs4hz0zj0yp2"; - "Go-Mono" = "1w9a507lnxv50x0xlj28ypijvvgcmypk6i27i367gkwsnnn6sqpp"; - "Gohu" = "11gd9mzj6jwkxq3mxa33i0gb3s5f3dn00lnw360pamc5dyakr6l0"; - "Hack" = "05vp3315bigfnr6p2fb884jrw489lhhpfqp764h51rldhf6674pj"; - "Hasklig" = "081z71gfk3i1dqmy6myjygrk65bd7ln6p761i8j6sw3jx0567ml6"; - "HeavyData" = "1fawn2xfq5js661s5wqjpfbfksg6n38r6n4x6zcgmr47g5hpnpmn"; - "Hermit" = "0gz6vhlgpaljg41w1fddrv58jxjrngyi101vzm2gc8gp7ym4m4ad"; - "iA-Writer" = "09m4039hzjqinx3ilzddq2msb64iz1y0ba43k2jd33b66svpi37a"; - "IBMPlexMono" = "0vwrqy0v2swfh63ikp1lbh6cl4f2qv2q28lk2f2dd6kzzg28p6qj"; - "Inconsolata" = "0n4nqbry3i019b9zbcawjqn5i7kf04p542sbbmnpi6vpfiv7fi5c"; - "InconsolataGo" = "1q2dq0jrcd1f611icj1zcwp3zbdrrfxq5882d7blkrbhnlj3jywy"; - "InconsolataLGC" = "0y29y7vk3x2jvi0ca8lxb8z2w9ww00gpsvkh5qvwxxqxhp5qjafk"; - "Iosevka" = "1j7bb0vf0hxvi55w4q3bnqhqwn9pp2i58mj79nz0qi59sals3qbm"; - "JetBrainsMono" = "146w91f1x4709wf52c2rh315qcgpph61cgr07ysn154hnwg5miqj"; - "Lekton" = "1s5dmk24n119hlsj2aw99d5g564adn40vmyrqgzi3kh72zpqlixy"; - "LiberationMono" = "06miqkf15h8ficd44rh755lw56i2nqcyxaf0vwa2zvls0v5mk2ar"; - "Lilex" = "0zbgkj20dqnb5hmh52cmcn175zhc55bz1h1gi3ngmfi6nwgn20vz"; - "Meslo" = "1d94ligqlngj4lwclah1w3ksvb3wg1iqjpmgblnxl36cd965pjqm"; - "Monofur" = "1x43siij45h7yz1cw8i32kvdqx1n6zgc9qrj179ms1jl180lj1pj"; - "Monoid" = "183qd1gpf78j2bipr4xh43kwaidlw3sfl8czzngkfdbpymssqak4"; - "Mononoki" = "1vpdcmwb406rxgvbarhmb3fpzaj53xgg05nagr33vhpzp7d999b1"; - "MPlus" = "1a7pb4dvh38bsdsjpbnb01pyn07rx0pwwr287i4vy1p46i39qm9m"; - "NerdFontsSymbolsOnly" = "0zgjvggb7ipssnjcqlw230pkb4vqpl6xzq42wqk9pcgsv7wg09nv"; - "Noto" = "17p48ig61dgzgd7fyppw65vdj1isg85w4xcxqjkaqx1225w4k8f9"; - "OpenDyslexic" = "0ypzyhh00vgd1ws6wh23sph9ycp193y5x9aimscxir8sdbnx3sxp"; - "Overpass" = "19k8kj9gid1m52b55s5jn8m5kslsgm16jqdifj5as2pd2bgjpwbh"; - "ProFont" = "1wrmh6jqkbygwba7nsfq5ycw84rqp4mpr10bd50cr7p9inkddq3n"; - "ProggyClean" = "066k2zdihv1x6vbsdalw5cyygmw27b32jvnvq774ry9bbz8yv4l1"; - "RobotoMono" = "1glqsz3h7rxs55jf8bycvzxd2snf7jd9qgd4ra0jn8h0qkgvsfgd"; - "ShareTechMono" = "0j3ribfylx3hnqir7i82pgyb56qlvlzp1y1c6lwvw8k15d06y7fi"; - "SourceCodePro" = "0zdy8xr2ka9m64d69380plz3xaq08rxwdv8idzxbkhfykrp1j3cz"; - "SpaceMono" = "1nqkqj0jxfj54wlcs6d2618b89y2fs2pg77kvfr4bc45lrqlbxzk"; - "Terminus" = "00qyvxjv7aa90xn4bmpygwm0llzd1rr7y0szdbv7h5n7i80yx29s"; - "Tinos" = "11ii28g1wv6ajpkbvw51vg47s3ww4lss46mh4pd0pf0fzz54gfcc"; - "Ubuntu" = "0vc8rfpqvajj4xd3anqrnx8g54mhnz9z2h4287g21qf2n1qqagn4"; - "UbuntuMono" = "0rzd625krvvf1c04172ck2507szm9fq6isydgqyhhkr1kwzx5pzq"; - "VictorMono" = "09nf02zig9kvgvqqwd6dynx3cidjnlq8sa3qxqw3b313pzia8k3i"; + "3270" = "03rf3prn4c9q5mggbdzpp3la7in1dq12anqxjpinxwla7ngdh4rv"; + "Agave" = "177b2yljw4fxbsmjp8yrwvjzj9186f8g0s59xnz56nrl9ndx84qm"; + "AnonymousPro" = "0qn5xa37g9y47ski5hc2vxhvfbfpl58ranpziiw733kv83pkbkq6"; + "Arimo" = "0b69gh5qgl0v6b1cirma7l32yxj2d53w305gpfr6flral3ljq6if"; + "AurulentSansMono" = "165hfg67061zqbs28fl66ldi910n5pnzb6n6d39wh70pclgy2g4n"; + "BigBlueTerminal" = "1adindb4lvihya3mphmshk4vigragskyrx6ixydrp8i1f7s9sp20"; + "BitstreamVeraSansMono" = "0mi9j69f8s48fygwb7fz9m81871nvajh895mpch7qj69xmpp9acs"; + "CascadiaCode" = "13vlfbagjx033j97li6ypvr0zhxbm96lcz8xcn715225mslr2ib4"; + "CodeNewRoman" = "1r4q48p315x021m0qrd1xmfgqw4xif3snlc764hq5iy10vxdv9ni"; + "Cousine" = "18m2dlcg6dymi0xwrky4q7ynjx4bqnr5lnvbgr9cdnyf3zz9b6rj"; + "DaddyTimeMono" = "0qq5lb4xpqggaz0bml8c2awlgwal6xvyx9nydxqgs672jq7hn1cd"; + "DejaVuSansMono" = "1qnl6gyfyq4cyx0nyl7f39cm3mz33rfngv9kq2g7b187n4dmawaa"; + "DroidSansMono" = "1l2cl2ryv9p7wlg6q5zsmg5wmfp27s3h47lq75d07chydyr08vii"; + "FantasqueSansMono" = "1m2xkr7dhfa9bn9vha0s1x7sl1n8l1kdl8f4c876cwjh1mvrwkar"; + "FiraCode" = "02gnxi9rs25i7mpzkir62w6khvijpma0j0sm3a7gfm0kfdkqzi8j"; + "FiraMono" = "1kn5vl90xi6ba7msfgwvv9frpfr33xv8q93r62lnqs3avfk743j9"; + "FontPatcher" = "039yiz7clkghyc6djf4zcaq6k83w2jhxcy66z4i9zmqh3km81wlr"; + "Go-Mono" = "0bmd7r38ss754gpkndlag0gxap5ga473y778fyrrr3ccccg6d8iv"; + "Gohu" = "0cvfdli8kzrd9n2h152432f8zr9ffvp29vsfcf98nla3ax2p0v05"; + "Hack" = "1q3xdlpxps41pi724697mb5bc98mmql8s2lc4xh9zwddjvchd3zl"; + "Hasklig" = "0xmg0h5bjjiqj00pv51q2babfm7j6bl1b8r1w26z95jvrpnifi1z"; + "HeavyData" = "1rppgk2lj95kv67c9s97wkqkbrmyp5y7qm1b0a1sk49sg7l4mljp"; + "Hermit" = "1cw8ia9b5adb7z63cag6l25sahp82gr6bsz9qqc3p12nzi5lxsk8"; + "iA-Writer" = "01bx8j6hqpl5zmx96d6zrwn3n6ckic5zxr53wls6zdmp01wnkg72"; + "IBMPlexMono" = "1m1qzxls16cfsxwly5r4vlwpfv477sf3gi6yj9krvkxp0d5ymz74"; + "Inconsolata" = "1vavavjdiwrlxy9klp0cm6pvmr0nkl7dpls7ja79zgkw7yjhsifq"; + "InconsolataGo" = "0cp76c6s2r3q8vgild0jpc94b13ypzbyvmas9gwhq1mvf24k4jp5"; + "InconsolataLGC" = "16a59y1idqp1zgkw9wxcdgcjg6bjlxwbj3a3a00h4gwkczlp2r42"; + "Iosevka" = "0qg88d2rqbm1x0vfyyr495dznnviga8979dg0ik5yw27fc43hrjj"; + "JetBrainsMono" = "19ja9dksxq2dl2hi8nyflvl7skyi2wd65s4z14jcilbynxmk2z0q"; + "Lekton" = "03378znmbss5qq75jmc0r51qwpxsiy2ng8gi164s2mjykr83gr2n"; + "LiberationMono" = "13r13drx8r1mkbndfw6ip48sjyhf6qw0wgrwyqlgz5dcm3z9c3gx"; + "Lilex" = "1w2iw9ksnkmwa37a30vrlwg6sxh6l19wc95f8s5mx06sa3ywfs11"; + "Meslo" = "0fli7njkhq89ykdmdch313mzswlb23b716d0656qw8q3fbyh9dzh"; + "Monofur" = "0lhfm5dxh4nsq0whwvpqbr2grb27pl03wi7l7vdjbf5x1iacrpfp"; + "Monoid" = "1jrknl6yz6k6a8l9iiw2s74xkfqckn9y9vjdk49cyf2iy3fzbi30"; + "Mononoki" = "0jw1kx7ryakx1wdgk9jf2ygrcq65wjaar5w1bggv5zlsxpxdllis"; + "MPlus" = "1lvmv4vcs36137fv1vbw3vnyxxar8klgngn77202lhgvgi44x60a"; + "NerdFontsSymbolsOnly" = "0sizriiwa7xh2dscz96gyr4sg04dxxi4f3sv27qk3g46vq0ciw4w"; + "Noto" = "0dwjj3l7ryx7ysbnp5hh81n3qqqn3yf4h8jypm4ri96vf360myad"; + "OpenDyslexic" = "1gpmzcgp6bpidi8h1l5a0n3q912swqk04mdhqwpqskj1jn77d2hb"; + "Overpass" = "1ywp6fphy6akdfd96a37jqcjqry9w15zr0r609vf5a11n1aq3s0w"; + "ProFont" = "0g3qa8lcp199mln5myn3yn4hdgyx3n16ajdm8a7anjfi9im2i6ns"; + "ProggyClean" = "0q4m7kq3k0ga6i2kr6a4k59na8b7m6zvvj9zyp61375lm6wb3bv2"; + "RobotoMono" = "0j055qjm0x4ksy19snplykm9dm9jkmn9swsis49k96mfw7wx9mfq"; + "ShareTechMono" = "055hg15ghd1ca8wxq3sfjpck8w4x6qnzjyn3r8rslyrbhl51v9aj"; + "SourceCodePro" = "05fs5ralnz9m6zdck9bvzf1rjgr4f5m1fr9m51cmr60wzhag9qsz"; + "SpaceMono" = "1m3x85qzykxg5mb56d1zgl367q55ndndxzzmsrlibmybqvc1ffq9"; + "Terminus" = "0fkqd85qfp8dk8sbyjfxirfiwlfl9a40z8jhybzzd7ys4yrzlq1c"; + "Tinos" = "11bbg7ssf7wndxrm6kklggsfhmyaijfg4xi6cw743kcwzfvi8kd1"; + "Ubuntu" = "14w55vh42mz5lvbpl4p1vx31hba957c5345qfpmym5majz83hx3q"; + "UbuntuMono" = "1xybn0q1xx5sidhllna5y7584fl75qw6v5alb2p1b6933a5czg0m"; + "VictorMono" = "02c5c9ljnmkf4awfhbjna6g86220ckv977rrc1sh6qr7q8zci6vr"; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/version.nix b/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/version.nix index 78c409bb9d..1719346d09 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/version.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/nerdfonts/version.nix @@ -1 +1 @@ -"2.3.0" +"2.3.3" diff --git a/third_party/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix index f497a184be..f5076f3c93 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/nika-fonts/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "nika-fonts"; version = "1.0.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "font-store"; - repo = "NikaFont"; - rev = "v${version}"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitHub { + owner = "font-store"; + repo = "NikaFont"; + rev = "v${version}"; + hash = "sha256-jDemm8IyjhoCOg4Bfsp0tzUR7m+JaswL5d7Kug+asJk="; + }; + + installPhase = '' + runHook preInstall + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/nika-fonts {} \; + + runHook postInstall ''; - sha256 = "1x34b2dqn1dymi1vmj5vrjcy2z8s0f3rr6cniyrz85plvid6x40i"; meta = with lib; { homepage = "https://github.com/font-store/NikaFont/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/norwester/default.nix b/third_party/nixpkgs/pkgs/data/fonts/norwester/default.nix index 5d96ba5527..f1236d5c05 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/norwester/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/norwester/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "1.2"; +stdenvNoCC.mkDerivation rec { pname = "norwester"; -in (fetchzip { - name = "${pname}-${version}"; + version = "1.2"; - url = "http://jamiewilson.io/norwester/assets/norwester.zip"; + src = fetchzip { + url = "http://jamiewilson.io/norwester/assets/norwester.zip"; + stripRoot = false; + hash = "sha256-Ak/nobrQE/XYGWs/IhlZlTp74ff+s4adUR6Sht5Yf8g="; + }; - sha256 = "1npsaiiz9g5z6315lnmynwcnrfl37fyxc7w1mhkw1xbzcnv74z4r"; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/opentype + cp ${pname}-v${version}/${pname}.otf $out/share/fonts/opentype/ + + runHook postInstall + ''; meta = with lib; { homepage = "http://jamiewilson.io/norwester"; @@ -18,9 +26,4 @@ in (fetchzip { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -D -j $downloadedFile ${pname}-v${version}/${pname}.otf -d $out/share/fonts/opentype/ - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix index 6161f71195..b3e4d7d67b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix @@ -230,15 +230,22 @@ rec { pname = "noto-fonts-emoji-blob-bin"; version = "14.0.1"; in - fetchurl { - name = "${pname}-${version}"; - url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf"; - sha256 = "sha256-wSH9kRJ8y2i5ZDqzeT96dJcEJnHDSpU8bOhmxaT+UCg="; + stdenvNoCC.mkDerivation { + inherit pname version; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - install -Dm 444 $downloadedFile $out/share/fonts/blobmoji/Blobmoji.ttf + src = fetchurl { + url = "https://github.com/C1710/blobmoji/releases/download/v${version}/Blobmoji.ttf"; + hash = "sha256-w9s7uF6E6nomdDmeKB4ATcGB/5A4sTwDvwHT3YGXz8g="; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + install -Dm 444 $src $out/share/fonts/blobmoji/Blobmoji.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix index 82b56b9eff..1b515b486f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { zopfli ]; - checkInputs = [ + nativeCheckInputs = [ pillow six bash diff --git a/third_party/nixpkgs/pkgs/data/fonts/office-code-pro/default.nix b/third_party/nixpkgs/pkgs/data/fonts/office-code-pro/default.nix index 0513baf486..f05a7ddd31 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/office-code-pro/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/office-code-pro/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "office-code-pro"; version = "1.004"; -in fetchFromGitHub rec { - name = "${pname}-${version}"; - owner = "nathco"; - repo = "Office-Code-Pro"; - rev = version; + src = fetchFromGitHub { + owner = "nathco"; + repo = "Office-Code-Pro"; + rev = version; + hash = "sha256-qzKTXYswkithZUJT0a3IifCq4RJFeKciZAPhYr2U1X4="; + }; - postFetch = '' - tar xf $downloadedFile --strip=1 - install -m644 -Dt $out/share/doc/${name} README.md + installPhase = '' + runHook preInstall + + install -m644 -Dt $out/share/doc/${pname}-${version} README.md install -m444 -Dt $out/share/fonts/opentype 'Fonts/Office Code Pro/OTF/'*.otf 'Fonts/Office Code Pro D/OTF/'*.otf + + runHook postInstall ''; - sha256 = "1bagwcaicn6q8qkqazz6wb3x30y4apmkga0mkv8fh6890hfhywr9"; meta = with lib; { description = "A customized version of Source Code Pro"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/oldsindhi/default.nix b/third_party/nixpkgs/pkgs/data/fonts/oldsindhi/default.nix index e0e783fd80..88692d9145 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/oldsindhi/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/oldsindhi/default.nix @@ -1,25 +1,28 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "oldsindhi"; version = "1.0"; -in fetchzip rec { - name = "oldsindhi-${version}"; - url = "https://github.com/MihailJP/oldsindhi/releases/download/v${version}/OldSindhi-${version}.tar.xz"; + src = fetchurl { + url = "https://github.com/MihailJP/${pname}/releases/download/v${version}/OldSindhi-${version}.tar.xz"; + hash = "sha256-jOcl+mo6CJ9Lnn3nAUiXXHCJssovVgLoPrbGxj4uzQs="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xJf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/truetype *.ttf - install -m444 -Dt $out/share/doc/${name} README *.txt - ''; + install -m444 -Dt $out/share/doc/${pname}-${version} README *.txt - sha256 = "03c483vbrwz2fpdfbys42fmik9788zxfmjmc4fgq4s2d0mraa0j1"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/MihailJP/oldsindhi"; description = "Free Sindhi Khudabadi font"; maintainers = with maintainers; [ mathnerd314 ]; - license = with licenses; [mit ofl]; + license = with licenses; [ mit ofl ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/oldstandard/default.nix b/third_party/nixpkgs/pkgs/data/fonts/oldstandard/default.nix index c6b7846a85..33bf37c18b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/oldstandard/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/oldstandard/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "oldstandard"; version = "2.2"; - name = "oldstandard-${version}"; -in (fetchzip rec { - inherit name; - url = "https://github.com/akryukov/oldstand/releases/download/v${version}/${name}.otf.zip"; + src = fetchzip { + url = "https://github.com/akryukov/oldstand/releases/download/v${version}/${pname}-${version}.otf.zip"; + stripRoot = false; + hash = "sha256-cDB5KJm87DK+GczZ3Nmn4l5ejqViswVbwrJ9XbhEh8I="; + }; - sha256 = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n"; + installPhase = '' + runHook preInstall + + install -m444 -Dt $out/share/fonts/opentype *.otf + install -m444 -Dt $out/share/doc/${pname}-${version} FONTLOG.txt + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/akryukov/oldstand"; @@ -18,10 +26,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - install -m444 -Dt $out/share/fonts/opentype *.otf - install -m444 -Dt $out/share/doc/${name} FONTLOG.txt - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/open-dyslexic/default.nix b/third_party/nixpkgs/pkgs/data/fonts/open-dyslexic/default.nix index f34ff0c17b..8a6b01b1d6 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/open-dyslexic/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/open-dyslexic/default.nix @@ -1,26 +1,28 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { + pname = "open-dyslexic"; version = "2016-06-23"; -in (fetchzip { - name = "open-dyslexic-${version}"; - url = "https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip"; + src = fetchzip { + url = "https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip"; + hash = "sha256-f/uavR3n0qHyqumZDw7r8Zy0om2RlJAKyWuGaUXSJ1s="; + }; - sha256 = "1vl8z5rknh2hpr2f0v4b2qgs5kclx5pzyk8al7243k5db82a2cyi"; + installPhase = '' + runHook preInstall + + install -Dm644 otf/*.otf -t $out/share/fonts/opentype + install -Dm644 README.md -t $out/share/doc/open-dyslexic + + runHook postInstall + ''; meta = with lib; { homepage = "https://opendyslexic.org/"; description = "Font created to increase readability for readers with dyslexia"; license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)"; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*/README.md -d $out/share/doc/open-dyslexic - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/open-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/open-fonts/default.nix index e503b11430..6a628174f2 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/open-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/open-fonts/default.nix @@ -1,21 +1,21 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { pname = "open-fonts"; version = "0.7.0"; -in -fetchurl { - name = "${pname}-${version}"; - url = "https://github.com/kiwi0fruit/open-fonts/releases/download/${version}/open-fonts.tar.xz"; - downloadToTemp = true; - recursiveHash = true; - sha256 = "sha256-bSP9Flotoo3E5vRU3eKOUAPD2fmkWseWYWG4y0S07+4="; + src = fetchurl { + url = "https://github.com/kiwi0fruit/open-fonts/releases/download/${version}/open-fonts.tar.xz"; + hash = "sha256-NJKbdrvgZz9G7mjAJYzN7rU/fo2xRFZA2BbQ+A56iPw="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile mkdir -p $out/share/fonts/truetype - install open-fonts/*.ttf $out/share/fonts/truetype + install *.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/open-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/open-sans/default.nix index 0c7f8dce57..4883cd818b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/open-sans/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/open-sans/default.nix @@ -1,21 +1,25 @@ -{ lib, fetchFromGitLab }: +{ lib, stdenvNoCC, fetchFromGitLab }: -let +stdenvNoCC.mkDerivation { pname = "open-sans"; version = "1.11"; -in fetchFromGitLab { - name = "${pname}-${version}"; - domain = "salsa.debian.org"; - owner = "fonts-team"; - repo = "fonts-open-sans"; - rev = "debian/1.11-1"; - postFetch = '' - tar xf $downloadedFile --strip=1 + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "fonts-team"; + repo = "fonts-open-sans"; + rev = "debian/1.11-1"; + hash = "sha256-gkq5RPa83dND91q1hiA9Qokq1iA8gLQ8XvCNWe+e8Bw="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "146ginwx18z624z582lrnhil8jvi9bjg6843265bgxxrfmf75vhp"; meta = with lib; { description = "Open Sans fonts"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/orbitron/default.nix b/third_party/nixpkgs/pkgs/data/fonts/orbitron/default.nix index f4a0a9600a..973c79f667 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/orbitron/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/orbitron/default.nix @@ -1,42 +1,45 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { + pname = "orbitron"; version = "20110526"; -in fetchFromGitHub { - name = "orbitron-${version}"; - owner = "theleagueof"; - repo = "orbitron"; - rev = "13e6a52"; + src = fetchFromGitHub { + owner = "theleagueof"; + repo = "orbitron"; + rev = "13e6a52"; + hash = "sha256-zjNPVrDUxcQbrsg1/8fFa6Wenu1yuG/XDfKA7NVZ0rA="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -m444 -Dt $out/share/fonts/opentype/orbitron *.otf install -m444 -Dt $out/share/fonts/ttf/orbitron *.ttf - ''; - sha256 = "1y9yzvpqs2v3ssnqk2iiglrh8amgsscnk8vmfgnqgqi9f4dhdvnv"; + runHook postInstall + ''; meta = with lib; { homepage = "https://www.theleagueofmoveabletype.com/orbitron"; downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download"; description = "Geometric sans-serif for display purposes by Matt McInerney"; longDescription = '' - Orbitron is a geometric sans-serif typeface intended for display - purposes. It features four weights (light, medium, bold, and - black), a stylistic alternative, small caps, and a ton of - alternate glyphs. + Orbitron is a geometric sans-serif typeface intended for display + purposes. It features four weights (light, medium, bold, and + black), a stylistic alternative, small caps, and a ton of + alternate glyphs. - Orbitron was designed so that graphic designers in the future - will have some alternative to typefaces like Eurostile or Bank - Gothic. If you’ve ever seen a futuristic sci-fi movie, you have - may noticed that all other fonts have been lost or destroyed in - the apocalypse that led humans to flee earth. Only those very few - geometric typefaces have survived to be used on spaceship - exteriors, space station signage, monopolistic corporate - branding, uniforms featuring aerodynamic shoulder pads, etc. Of - course Orbitron could also be used on the posters for the movies - portraying this inevitable future. + Orbitron was designed so that graphic designers in the future + will have some alternative to typefaces like Eurostile or Bank + Gothic. If you’ve ever seen a futuristic sci-fi movie, you have + may noticed that all other fonts have been lost or destroyed in + the apocalypse that led humans to flee earth. Only those very few + geometric typefaces have survived to be used on spaceship + exteriors, space station signage, monopolistic corporate + branding, uniforms featuring aerodynamic shoulder pads, etc. Of + course Orbitron could also be used on the posters for the movies + portraying this inevitable future. ''; license = licenses.ofl; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/data/fonts/overpass/default.nix b/third_party/nixpkgs/pkgs/data/fonts/overpass/default.nix index 553b4e52ef..521c08c85c 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/overpass/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/overpass/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "overpass"; version = "3.0.5"; - name = "overpass-${version}"; -in (fetchzip rec { - inherit name; - url = "https://github.com/RedHatOfficial/Overpass/releases/download/v${version}/overpass-${version}.zip"; + src = fetchzip { + url = "https://github.com/RedHatOfficial/Overpass/releases/download/v${version}/overpass-${version}.zip"; + hash = "sha256-8AWT0/DELfNWXtZOejC90DbUSOtyGt9tSkcSuO7HP2o="; + }; - sha256 = "1fpyhd6x3i3g0xxjmyfnjsri1kkvci15fv7jp1bnza7k0hz0bnha"; + installPhase = '' + runHook preInstall + + install -Dm644 */*/*.otf -t $out/share/fonts/opentype + install -Dm644 */*/*.ttf -t $out/share/fonts/truetype + install -Dm644 *.md -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "https://overpassfont.org/"; @@ -18,11 +26,4 @@ in (fetchzip rec { platforms = platforms.all; maintainers = [ maintainers.rycee ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts $out/share/doc - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.md -d $out/share/doc/${name} - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/oxygenfonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/oxygenfonts/default.nix index e34e49d981..32d9273d63 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/oxygenfonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/oxygenfonts/default.nix @@ -1,19 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub { - name = "oxygenfonts-20160824"; +stdenvNoCC.mkDerivation rec { + pname = "oxygenfonts"; + version = "20160824"; - owner = "vernnobile"; - repo = "oxygenFont"; - rev = "62db0ebe3488c936406685485071a54e3d18473b"; + src = fetchFromGitHub { + owner = "vernnobile"; + repo = "oxygenFont"; + rev = "62db0ebe3488c936406685485071a54e3d18473b"; + hash = "sha256-0LKq8nChkDAb6U1sOUyga/DvzpDmIjoRn+2PB9rok4w="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype cp */Oxygen-Sans.ttf */Oxygen-Sans-Bold.ttf */OxygenMono-Regular.ttf $out/share/fonts/truetype - ''; - sha256 = "17m86p1s7a7d90zqjsr46h5bpmas4vxsgj7kd0j5c8cb7lw92jyf"; + runHook postInstall + ''; meta = with lib; { description = "Desktop/gui font for integrated use with the KDE desktop"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix index a3d273bb8a..a91596a66e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/parastoo-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "parastoo-fonts"; version = "2.0.1"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "parastoo-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "parastoo-font"; + rev = "v${version}"; + hash = "sha256-E94B9R2h227D49dscCBsprmb7w0GrQ+2tWOWRf8FH30="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/parastoo-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-4smobLS43DB7ISmbWDWX0IrtaeiyXpi1QpAiL8NyXoQ="; meta = with lib; { homepage = "https://github.com/rastikerdar/parastoo-font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix b/third_party/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix index 292e9466b9..86646ae0ac 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,15 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "paratype-pt-mono"; +stdenvNoCC.mkDerivation rec { + pname = "paratype-pt-mono"; + version = "2.005"; - urls = [ - "https://company.paratype.com/system/attachments/631/original/ptmono.zip" - "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip" - ]; + src = fetchzip { + urls = [ + "https://company.paratype.com/system/attachments/631/original/ptmono.zip" + "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip" + ]; + stripRoot = false; + hash = "sha256-mfDAu/KGelC6wZpUCrUrLVZKo+XiKNBqcpMI8tH2tMw="; + }; - sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm"; + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/paratype + + runHook postInstall + ''; meta = with lib; { homepage = "http://www.paratype.ru/public/"; @@ -23,10 +34,4 @@ platforms = platforms.all; maintainers = with maintainers; [ raskin ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix b/third_party/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix index 1c976ecb48..dffd25c23a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,15 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "paratype-pt-sans"; +stdenvNoCC.mkDerivation rec { + pname = "paratype-pt-sans"; + version = "2.005"; - urls = [ - "https://company.paratype.com/system/attachments/629/original/ptsans.zip" - "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip" - ]; + src = fetchzip { + urls = [ + "https://company.paratype.com/system/attachments/629/original/ptsans.zip" + "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip" + ]; + stripRoot = false; + hash = "sha256-34TqYXtWzkAstaGQBhJy+/hVk5tg6ZvHZ/kvUroWVLs="; + }; - sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0"; + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/paratype + + runHook postInstall + ''; meta = with lib; { homepage = "http://www.paratype.ru/public/"; @@ -23,10 +34,4 @@ platforms = platforms.all; maintainers = with maintainers; [ raskin ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix b/third_party/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix index abe6c3d87f..f346382d1f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,15 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "paratype-pt-serif"; +stdenvNoCC.mkDerivation rec { + pname = "paratype-pt-serif"; + version = "2.005"; - urls = [ - "https://company.paratype.com/system/attachments/634/original/ptserif.zip" - "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip" - ]; + src = fetchzip { + urls = [ + "https://company.paratype.com/system/attachments/634/original/ptserif.zip" + "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip" + ]; + stripRoot = false; + hash = "sha256-4L3t5NEHmj975fn8eBAkRUO1OL0xseNp9g7k7tt/O2c="; + }; - sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d"; + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/paratype + + runHook postInstall + ''; meta = with lib; { homepage = "http://www.paratype.ru/public/"; @@ -23,10 +34,4 @@ platforms = platforms.all; maintainers = with maintainers; [ raskin ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/pecita/default.nix b/third_party/nixpkgs/pkgs/data/fonts/pecita/default.nix index f0bdbc3ea0..568363889f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/pecita/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/pecita/default.nix @@ -1,29 +1,30 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation { + pname = "pecita"; version = "5.4"; -in -fetchurl { - name = "pecita-${version}"; + src = fetchurl { + url = "http://pecita.eu/b/Pecita.otf"; + hash = "sha256-D9IZ+p4UFHUNt9me7D4vv0x6rMK9IaViKPliCEyX6t4="; + }; - url = "http://pecita.eu/b/Pecita.otf"; + dontUnpack = true; - downloadToTemp = true; + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/opentype - cp -v $downloadedFile $out/share/fonts/opentype/Pecita.otf - ''; + cp -v $src $out/share/fonts/opentype/Pecita.otf - recursiveHash = true; - sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm"; + runHook postInstall + ''; meta = with lib; { homepage = "http://pecita.eu/police-en.php"; description = "Handwritten font with connected glyphs"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/penna/default.nix b/third_party/nixpkgs/pkgs/data/fonts/penna/default.nix index 784f9d2573..893262f66e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/penna/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/penna/default.nix @@ -1,24 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; - minorVersion = "10"; - pname = "penna"; + minorVersion = "100"; in +stdenvNoCC.mkDerivation (self: { + pname = "penna"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-fmCJnEaoUGdW9JK3J7JSm5D4qOMRW7qVKPgVE7uCH5w="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "0hk15yndm56l6rbdykpkry2flffx0567mgjcqcnsx1iyzwwla5km"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "Geometric sans serif designed by Sora Sagano"; longDescription = '' Penna is a geometric sans serif designed by Sora Sagano, @@ -26,7 +31,7 @@ fetchzip { with a small x-height. ''; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/powerline-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/powerline-fonts/default.nix index 3a2ae92c1e..ea2da0fe2e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/powerline-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/powerline-fonts/default.nix @@ -1,22 +1,27 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -fetchFromGitHub { - name = "powerline-fonts-2018-11-11"; +stdenvNoCC.mkDerivation { + pname = "powerline-fonts"; + version = "unstable-2018-11-11"; - owner = "powerline"; - repo = "fonts"; - rev = "e80e3eba9091dac0655a0a77472e10f53e754bb0"; + src = fetchFromGitHub { + owner = "powerline"; + repo = "fonts"; + rev = "e80e3eba9091dac0655a0a77472e10f53e754bb0"; + hash = "sha256-GGfON6Z/0czCUAGxnqtndgDnaZGONFTU9/Hu4BGDHlk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.otf' -exec install -Dt $out/share/fonts/opentype {} \; find . -name '*.ttf' -exec install -Dt $out/share/fonts/truetype {} \; find . -name '*.bdf' -exec install -Dt $out/share/fonts/bdf {} \; find . -name '*.pcf.gz' -exec install -Dt $out/share/fonts/pcf {} \; find . -name '*.psf.gz' -exec install -Dt $out/share/consolefonts {} \; - ''; - sha256 = "0r8p4z3db17f5p8jr7sv80nglmjxhg83ncfvwg1dszldswr0dhvr"; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/powerline/fonts"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/pretendard/default.nix b/third_party/nixpkgs/pkgs/data/fonts/pretendard/default.nix index 40175dc540..60ecc61c7e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/pretendard/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/pretendard/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let version = "1.3.3"; - mkPretendard = { pname, typeface, sha256 }: - fetchzip { - name = "${pname}-${version}"; + mkPretendard = { pname, typeface, hash }: + stdenvNoCC.mkDerivation { + inherit pname version; - url = "https://github.com/orioncactus/pretendard/releases/download/v${version}/${typeface}-${version}.zip"; - inherit sha256; + src = fetchzip { + url = "https://github.com/orioncactus/pretendard/releases/download/v${version}/${typeface}-${version}.zip"; + stripRoot = false; + inherit hash; + }; - stripRoot = false; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/ - install -Dm644 $out/public/static/*.otf -t $out/share/fonts/opentype - rm -rf $out/{public,web,LICENSE.txt} + install -Dm644 public/static/*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; meta = with lib; { @@ -32,18 +35,18 @@ in pretendard = mkPretendard { pname = "pretendard"; typeface = "Pretendard"; - sha256 = "sha256-lRHRdCAg3i3+3Y6j0dCXUgwLdeS/VeI6KNkbDKchNEY="; + hash = "sha256-xCEZlwTPhrNIO6WODl55wo2oin+iMYOL/rVaEybpzr0="; }; pretendard-jp = mkPretendard { pname = "pretendard-jp"; typeface = "PretendardJP"; - sha256 = "sha256-VgGt/WoaaJJDAzw+gUQVgTQ+q34bdAaKUB4cA9eU0dQ="; + hash = "sha256-x0G7ULzkIJqZlK995+wWKHXZdWryUTRouGTa5LsJQzk="; }; pretendard-std = mkPretendard { pname = "pretendard-std"; typeface = "PretendardStd"; - sha256 = "sha256-FOlZrr6CHPfUm9Q+Yoi0HLQUI7cAhQYq6P6sJGXBIWg="; + hash = "sha256-/I8LZhFB86/+o+IzUP+bSIq7scKPOL7k/6/Bom0ZSqg="; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/public-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/public-sans/default.nix index 36fa7b136a..0682388978 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/public-sans/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/public-sans/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "public-sans"; version = "2.001"; -in (fetchzip { - name = "public-sans-${version}"; - url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip"; + src = fetchzip { + url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip"; + stripRoot = false; + hash = "sha256-XFs/UMXI/kdrW+53t8Mj26+Rn5p+LQ6KW2K2/ShoIag="; + }; - sha256 = "sha256-Ba7D4J72GZQsGn0KINRib9BmHsAnoEsAwAOC+M3CkMU="; + installPhase = '' + runHook preInstall + + install -Dm644 */*/*.otf -t $out/share/fonts/opentype + install -Dm644 */*/*.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "A strong, neutral, principles-driven, open source typeface for text or display"; @@ -18,10 +27,4 @@ in (fetchzip { maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix index 7841a203f7..7659598842 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/quattrocento-sans/default.nix @@ -1,27 +1,29 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "quattrocento-sans"; version = "2.0"; - name = "quattrocento-sans-${version}"; -in (fetchzip rec { - inherit name; - url = "https://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; + stripRoot = false; + hash = "sha256-L3aFZmaA94B9APxsp8bSBpocIlK3Ehvj/RFXVcW2nso="; + }; - sha256 = "0g8hnn92ks4y0jbizwj7yfa097lk887wqkqpqjdmc09sd2n44343"; + installPhase = '' + runHook preInstall + + install -Dm644 */*/QuattrocentoSans*.otf -t $out/share/fonts/opentype + install -Dm644 */FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "http://www.impallari.com/quattrocentosans/"; description = "A classic, elegant and sober sans-serif typeface"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{fonts,doc} - unzip -j $downloadedFile '*/QuattrocentoSans*.otf' -d $out/share/fonts/opentype - unzip -j $downloadedFile '*/FONTLOG.txt' -d $out/share/doc/${name} - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/quattrocento/default.nix b/third_party/nixpkgs/pkgs/data/fonts/quattrocento/default.nix index 12f146c0e8..a70396437e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/quattrocento/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/quattrocento/default.nix @@ -1,27 +1,28 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "quattrocento"; version = "1.1"; - name = "quattrocento-${version}"; -in (fetchzip rec { - inherit name; - url = "https://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; + hash = "sha256-ntY6Wl6TI8F7SShMyD8mdOxVg4oz9kvJ7vKTyGdPLtE="; + }; - sha256 = "0f8l19y61y20sszn8ni8h9kgl0zy1gyzychg22z5k93ip4h7kfd0"; + installPhase = '' + runHook preInstall + + install -Dm644 */*.otf -t $out/share/fonts/opentype + install -Dm644 FONTLOG.txt -t $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "http://www.impallari.com/quattrocento/"; description = "A classic, elegant, sober and strong serif typeface"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{fonts,doc} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*FONTLOG.txt -d $out/share/doc/${name} - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/raleway/default.nix b/third_party/nixpkgs/pkgs/data/fonts/raleway/default.nix index ddded71a6f..935fde722e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/raleway/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/raleway/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation { + pname = "raleway"; version = "2016-08-30"; -in fetchFromGitHub { - name = "raleway-${version}"; - owner = "impallari"; - repo = "Raleway"; - rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a"; + src = fetchFromGitHub { + owner = "impallari"; + repo = "Raleway"; + rev = "fa27f47b087fc093c6ae11cfdeb3999ac602929a"; + hash = "sha256-mcIpE+iqG6M43I5TT95oV+5kNgphunmyxC+Jaj0JysQ="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name "*-Original.otf" -exec install -Dt $out/share/fonts/opentype {} \; - cp *.txt *.md -d $out - ''; - sha256 = "16jr7drqg2wib2q48ajlsa7rh1jxjibl1wd4rjndi49vfl463j60"; + runHook postInstall + ''; meta = { description = "Raleway is an elegant sans-serif typeface family"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/redhat-official/default.nix b/third_party/nixpkgs/pkgs/data/fonts/redhat-official/default.nix index 9daaffd0b4..fd732b401b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/redhat-official/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/redhat-official/default.nix @@ -1,23 +1,26 @@ -{ lib, fetchFromGitHub }: -let +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "redhat-official"; version = "4.0.2"; -in -fetchFromGitHub { - name = "redhat-official-${version}"; - owner = "RedHatOfficial"; - repo = "RedHatFont"; - rev = version; + src = fetchFromGitHub { + owner = "RedHatOfficial"; + repo = "RedHatFont"; + rev = version; + hash = "sha256-p5RS/57CDApwnRDwMi0gIEJYTDAtibIyyU2w/pnbHJI="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 for kind in mono proportional; do install -m444 -Dt $out/share/fonts/opentype fonts/$kind/static/otf/*.otf install -m444 -Dt $out/share/fonts/truetype fonts/$kind/static/ttf/*.ttf done - ''; - sha256 = "sha256-904uQtbAdLx9MJudLk/vVk/+uK0nsPbWbAeXrWxTHm8="; + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/RedHatOfficial/RedHatFont"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/rhodium-libre/default.nix b/third_party/nixpkgs/pkgs/data/fonts/rhodium-libre/default.nix index fc89d65259..1c36f41b48 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/rhodium-libre/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/rhodium-libre/default.nix @@ -1,22 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "RhodiumLibre"; version = "1.2.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "DunwichType"; - repo = pname; - rev = version; + src = fetchFromGitHub { + owner = "DunwichType"; + repo = pname; + rev = version; + hash = "sha256-YCQvUdjEAj4G71WCRCM0+NwiqRqwt1Ggeg9jb/oWEsY="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -Dm444 -t $out/share/fonts/opentype/ RhodiumLibre-Regular.otf install -Dm444 -t $out/share/fonts/truetype/ RhodiumLibre-Regular.ttf - ''; - sha256 = "04ax6bri5vsji465806p8d7zbdf12r5bpvcm9nb8isfqm81ggj0r"; + runHook postInstall + ''; meta = with lib; { description = "F/OSS/Libre font for Latin and Devanagari"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/roboto-serif/default.nix b/third_party/nixpkgs/pkgs/data/fonts/roboto-serif/default.nix new file mode 100644 index 0000000000..d6cc1019cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/roboto-serif/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +}: + +stdenvNoCC.mkDerivation rec { + pname = "roboto-serif"; + version = "1.007"; + + src = fetchurl { + url = "https://github.com/googlefonts/roboto-serif/releases/download/v${version}/RobotoSerifFonts-v${version}.zip"; + hash = "sha256-A14GztkTvaLBvcm1i3A0Vi9vaz77nFYYoSNggqbffFo="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ + unzip + ]; + + installPhase = '' + runHook preInstall + + install -Dm644 variable/*.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; + + meta = with lib; { + description = "The Roboto family of fonts"; + longDescription = '' + Google’s signature family of fonts, the default font on Android and + Chrome OS, and the recommended font for Google’s visual language, + Material Design. + ''; + homepage = "https://github.com/googlefonts/roboto-serif"; + license = licenses.ofl; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/roboto/default.nix b/third_party/nixpkgs/pkgs/data/fonts/roboto/default.nix index 9f53eaa38c..02ca82edf1 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/roboto/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/roboto/default.nix @@ -1,14 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "roboto"; version = "2.138"; -in (fetchzip { - name = "roboto-${version}"; - url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; + src = fetchzip { + url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; + stripRoot = false; + hash = "sha256-ue3PUZinBpcYgSho1Zrw1KHl7gc/GlN1GhWFk6g5QXE="; + }; - sha256 = "1s3c48wwvvwd3p4w3hfkri5v2c54j2bdxmd3bjv54klc5mrlh6z3"; + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = { homepage = "https://github.com/google/roboto"; @@ -22,9 +30,4 @@ in (fetchzip { platforms = lib.platforms.all; maintainers = [ lib.maintainers.romildo ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -x __MACOSX/\* -d $out/share/fonts/truetype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/rounded-mgenplus/default.nix b/third_party/nixpkgs/pkgs/data/fonts/rounded-mgenplus/default.nix index eccbddd185..688518150f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/rounded-mgenplus/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/rounded-mgenplus/default.nix @@ -1,17 +1,25 @@ -{ lib, fetchzip, p7zip }: +{ lib, stdenvNoCC, fetchurl, p7zip }: -let +stdenvNoCC.mkDerivation rec { pname = "rounded-mgenplus"; version = "20150602"; -in fetchzip rec { - name = "${pname}-${version}"; - url = "https://osdn.jp/downloads/users/8/8598/${name}.7z"; - postFetch = '' - ${p7zip}/bin/7z x $downloadedFile + src = fetchurl { + url = "https://osdn.jp/downloads/users/8/8598/${pname}-${version}.7z"; + hash = "sha256-7OpnZJc9k5NiOPHAbtJGMQvsMg9j81DCvbfo0f7uJcw="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ p7zip ]; + + installPhase = '' + runHook preInstall + install -m 444 -D -t $out/share/fonts/${pname} ${pname}-*.ttf + + runHook postInstall ''; - sha256 = "0vwdknagdrl5dqwpb1x5lxkbfgvbx8dpg7cb6yamgz71831l05v1"; meta = with lib; { description = "A Japanese font based on Rounded M+ and Noto Sans Japanese"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/route159/default.nix b/third_party/nixpkgs/pkgs/data/fonts/route159/default.nix index cbc89c550b..4d0bf9941b 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/route159/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/route159/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "1"; minorVersion = "10"; - pname = "route159"; in +stdenvNoCC.mkDerivation (self: { + pname = "route159"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-1InyBW1LGbp/IU/ql9mvT14W3MTxJdWThFwRH6VHpTU="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; - sha256 = "1nv5csg73arvvwpac7ylh4j9n0s3qp79rbv2s4jvs2bf6gqhsq7h"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "A weighted sans serif font"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.ofl; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/ruwudu/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ruwudu/default.nix index 2002f4b672..61f306c710 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ruwudu/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ruwudu/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "ruwudu"; version = "2.000"; - url = "https://software.sil.org/downloads/r/ruwudu/Ruwudu-${version}.zip"; + src = fetchzip { + url = "https://software.sil.org/downloads/r/ruwudu/Ruwudu-${version}.zip"; + hash = "sha256-FP+ZHm1fKlozAAI2PbJ4r4v5OwRxBtYMRLmRwPbqx2I="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - rm -rf $out/web $out/manifest.json mkdir -p $out/share/{doc/${pname},fonts/truetype} - mv $out/*.ttf $out/share/fonts/truetype/ - mv $out/*.txt $out/documentation $out/share/doc/${pname}/ - ''; + mv *.ttf $out/share/fonts/truetype/ + mv *.txt documentation $out/share/doc/${pname}/ - sha256 = "sha256-JCvVPbAFBWHL2eEnEUSgdTZ+Vkw3wkS3aS85xQZKNQs="; + runHook postInstall + ''; meta = with lib; { homepage = "https://software.sil.org/ruwudu/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix index 9079ba7fad..860a006627 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sahel-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "sahel-fonts"; version = "3.4.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "sahel-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "sahel-font"; + rev = "v${version}"; + hash = "sha256-U4tIICXZFK9pk7zdzRwBPIPYFUlYXPSebnItUJUgGJY="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/sahel-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-MrKSgz9WpVgLS37uH/7S0LPBD/n3GLXeUCMBD7x5CG8="; meta = with lib; { homepage = "https://github.com/rastikerdar/sahel-font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix index b29114e6b1..2117cc0e63 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/samim-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "samim-fonts"; version = "4.0.4"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "samim-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "samim-font"; + rev = "v${version}"; + hash = "sha256-erT8iV5YHbEN47nEE5p5CbQYUgm8daOjymLAWF4fpVk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/samim-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-WYSJ2mAzAe5H0EaMYU3qNVcQ0lRuHsjZ11YmLnZ2FCo="; meta = with lib; { homepage = "https://github.com/rastikerdar/samim-font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/sampradaya/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sampradaya/default.nix index 749abb71db..8c0545d2c7 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sampradaya/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sampradaya/default.nix @@ -1,16 +1,26 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "sampradaya-2015-05-26"; +stdenvNoCC.mkDerivation rec { + pname = "sampradaya"; + version = "0.5.0"; - url = "https://bitbucket.org/OorNaattaan/sampradaya/raw/afa9f7c6ab17e14bd7dd74d0acaec2f75454dfda/Sampradaya.ttf"; + src = fetchurl { + url = "https://github.com/deepestblue/sampradaya/releases/download/v${version}/Sampradaya.ttf"; + hash = "sha256-ygKMNzHvbLR2A5HHrfY2C9ZUg0yng+JL3cyg6sBKqeQ="; + }; - postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/Sampradaya.ttf"; + dontUnpack = true; - sha256 = "1pqyj5r5jc7dk8yyzl7i6qq2m9zvahcjj49a66wwzdby5zyw8dqv"; + installPhase = '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/Sampradaya.ttf + + runHook postInstall + ''; meta = with lib; { - homepage = "https://bitbucket.org/OorNaattaan/sampradaya/"; + homepage = "https://github.com/deepestblue/sampradaya"; description = "Unicode-compliant Grantha font"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.ofl; # See font metadata diff --git a/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix index 9bfe95518d..c874afde34 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,21 +1,27 @@ -{ lib, fetchurl, libarchive }: +{ lib, stdenvNoCC, fetchurl, p7zip }: -let +stdenvNoCC.mkDerivation rec { + pname = "sarasa-gothic"; version = "0.38.0"; -in fetchurl { - name = "sarasa-gothic-${version}"; - # Use the 'ttc' files here for a smaller closure size. - # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) - url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - sha256 = "sha256-lGkb3e2EFHkDLm+/KArfOQ50qBFRThlpcID06g0t4aI="; + src = fetchurl { + # Use the 'ttc' files here for a smaller closure size. + # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) + url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; + hash = "sha256-UXWstk1vIoaFqa8nVxfJcAtN7BzWevzgfMx1gyXu0k8="; + }; - recursiveHash = true; - downloadToTemp = true; + sourceRoot = "."; + + nativeBuildInputs = [ p7zip ]; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/truetype - ${libarchive}/bin/bsdtar -xf $downloadedFile -C $out/share/fonts/truetype + cp *.ttc $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/scheherazade/default.nix b/third_party/nixpkgs/pkgs/data/fonts/scheherazade/default.nix index 07c7f6b0bc..9960248b0d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/scheherazade/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/scheherazade/default.nix @@ -1,20 +1,30 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip, version ? "3.300" }: +{ lib, stdenvNoCC, fetchzip, version ? "3.300" }: let new = lib.versionAtLeast version "3.000"; - sha256 = { - "2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; - "3.300" = "1bja1ma1mnna0qlk3dis31cvq5z1kgcqj7wjp8ml03zc5mpa2wb2"; + hash = { + "2.100" = "sha256-d2UyOOOnmE1afCwyIrM1bL3lQC7XRwh03hzetk/4V30="; + "3.300" = "sha256-LaaA6DWAE2dcwVVX4go9cJaiuwI6efYbPk82ym3W3IY="; }."${version}"; - name = "scheherazade${lib.optionalString new "-new"}-${version}"; + pname = "scheherazade${lib.optionalString new "-new"}"; +in +stdenvNoCC.mkDerivation rec { + inherit pname version; -in (fetchzip rec { - inherit name; + src = fetchzip { + url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade${lib.optionalString new "New"}-${version}.zip"; + inherit hash; + }; - url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade${lib.optionalString new "New"}-${version}.zip"; + installPhase = '' + runHook preInstall - inherit sha256; + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 FONTLOG.txt README.txt -t $out/share/doc + cp -r documentation $out/share/doc/ + + runHook postInstall + ''; meta = with lib; { homepage = "https://software.sil.org/scheherazade/"; @@ -40,13 +50,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -l $downloadedFile - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip $downloadedFile \*/documentation/\* -d $out/share/doc/ - mv $out/share/doc/* $out/share/doc/${name} - unzip -j $downloadedFile \*/FONTLOG.txt \*/README.txt -d $out/share/doc/${name} - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/scientifica/default.nix b/third_party/nixpkgs/pkgs/data/fonts/scientifica/default.nix index bf5b887cc7..1f946ecb17 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/scientifica/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/scientifica/default.nix @@ -1,25 +1,24 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "scientifica"; version = "2.3"; -in fetchurl rec { - name = "scientifica-${version}"; - url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica.tar"; + src = fetchurl { + url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica.tar"; + hash = "sha256-8IV4aaDoRsbxddy4U90fEZ6henUhjmO38HNtWo4ein8="; + }; - downloadToTemp = true; + installPhase = '' + runHook preInstall - recursiveHash = true; - - sha256 = "sha256-pVWkj/2lFpmWk0PPDrIMU4Gey7/m/9tzUsuD3ZDUAdc="; - - postFetch = '' - tar xf $downloadedFile mkdir -p $out/share/fonts/truetype mkdir -p $out/share/fonts/misc - install scientifica/ttf/*.ttf $out/share/fonts/truetype - install scientifica/otb/*.otb $out/share/fonts/misc - install scientifica/bdf/*.bdf $out/share/fonts/misc + install ttf/*.ttf $out/share/fonts/truetype + install otb/*.otb $out/share/fonts/misc + install bdf/*.bdf $out/share/fonts/misc + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/seshat/default.nix b/third_party/nixpkgs/pkgs/data/fonts/seshat/default.nix index 71483a04cb..7ed7abd5fb 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/seshat/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/seshat/default.nix @@ -1,24 +1,29 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "100"; - pname = "seshat"; in +stdenvNoCC.mkDerivation (self: { + pname = "seshat"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-XgprDhzAbcTzZw2QOwpCnzusYheYmSlM+ApU+Y0wO2Q="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}.zip"; - sha256 = "1zzgc2d0jrris92p3irmxjhdq8aj99alz0z7dlz25qf37lcilrir"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "Roman body font designed for main text by Sora Sagano"; longDescription = '' Seshat is a Roman body font designed for the main text. By @@ -31,7 +36,7 @@ fetchzip { It incorporates symbols and ligatures used in the European region. ''; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.cc0; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix index d5e7e2b243..c5f5e00e02 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/shabnam-fonts/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "shabnam-fonts"; version = "5.0.1"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "shabnam-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "shabnam-font"; + rev = "v${version}"; + hash = "sha256-H03GTKRVPiwU4edkr4x5upW4JCy6320Lo+cKK9FRMQs="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/shabnam-fonts {} \; + + runHook postInstall ''; - sha256 = "sha256-m4G4UtW/0S9CsvaSF7QfthfIxGQ02E7SucdDm5s3G7A="; meta = with lib; { homepage = "https://github.com/rastikerdar/shabnam-font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/shrikhand/default.nix b/third_party/nixpkgs/pkgs/data/fonts/shrikhand/default.nix index 684f3d0395..0db94ebd4e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/shrikhand/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/shrikhand/default.nix @@ -1,15 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let - version = "2016-03-03"; -in fetchzip { - name = "shrikhand-${version}"; +stdenvNoCC.mkDerivation { + pname = "shrikhand"; + version = "unstable-2016-03-03"; - url = "https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf"; + src = fetchurl { + url = "https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf"; + hash = "sha256-wHP1Bwu5Yw3a+RwDOHrmthsnuvwyCV4l6ma5EjA6EMA="; + }; - postFetch = "install -D -m644 $downloadedFile $out/share/fonts/truetype/Shrikhand-Regular.ttf"; + dontUnpack = true; - sha256 = "0s54k9cs1g2yz6lwg5gakqb12vg5qkfdz3pc8mh7mib2s6q926hs"; + installPhase = '' + runHook preInstall + + install -D -m644 $src $out/share/fonts/truetype/Shrikhand-Regular.ttf + + runHook postInstall + ''; meta = with lib; { homepage = "https://jonpinhorn.github.io/shrikhand/"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/sil-abyssinica/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sil-abyssinica/default.nix index b61af144dc..f01c50b426 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sil-abyssinica/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sil-abyssinica/default.nix @@ -1,18 +1,22 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "sil-abyssinica"; version = "2.200"; -in -fetchzip rec { - name = "sil-abyssinica-${version}"; - url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip"; - sha256 = "sha256-Kvswqzw8remcu36QaVjeyk03cR4wW5BKQMDihiaxJoE="; - postFetch = '' - rm -rf $out/web - mkdir -p $out/share/{fonts/truetype,doc/${name}} - mv $out/*.ttf $out/share/fonts/truetype/ - mv $out/*.txt $out/documentation $out/share/doc/${name}/ + src = fetchzip { + url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip"; + hash = "sha256-IdWMZHm9VoLVDO0//ISujxlXUxe0O6+aEcdP63YRmPg="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{fonts/truetype,doc/${pname}-${version}} + mv *.ttf $out/share/fonts/truetype/ + mv *.txt documentation $out/share/doc/${pname}-${version}/ + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/sil-padauk/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sil-padauk/default.nix index b993ef5ae6..fe45da1317 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sil-padauk/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sil-padauk/default.nix @@ -1,19 +1,23 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "sil-padauk"; version = "5.001"; -in -fetchzip rec { - name = "sil-padauk-${version}"; - url = "https://software.sil.org/downloads/r/padauk/Padauk-${version}.zip"; - sha256 = "sha256-6H9EDmXr1Ox2fgLw9sG5JrCAllK3tbjvMfLi8DTF1f0="; - postFetch = '' + src = fetchzip { + url = "https://software.sil.org/downloads/r/padauk/Padauk-${version}.zip"; + hash = "sha256-rLzuDUd+idjTN0xQxblXQ9V2rQtJPN2EtWGmTRY1R7U="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype - rm -rf $out/{manifest.json,web/} - mv $out/*.ttf $out/share/fonts/truetype/ - mkdir -p $out/share/doc/${name} - mv $out/*.txt $out/documentation/ $out/share/doc/${name}/ + mv *.ttf $out/share/fonts/truetype/ + mkdir -p $out/share/doc/${pname}-${version} + mv *.txt documentation/ $out/share/doc/${pname}-${version}/ + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/sitelen-seli-kiwen/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sitelen-seli-kiwen/default.nix index 60f5c3e36e..de0fec7b6f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sitelen-seli-kiwen/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sitelen-seli-kiwen/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - rev = "69132c99873894746c9710707aaeb2cea2609709"; -in -fetchzip { +stdenvNoCC.mkDerivation { pname = "sitelen-seli-kiwen"; version = "unstable-2022-06-28"; - url = "https://raw.githubusercontent.com/kreativekorp/sitelen-seli-kiwen/${rev}/sitelenselikiwen.zip"; - hash = "sha256-63sl/Ha2QAe8pVKCpLNs//DB0kjLdW01u6tVMrGquIU="; - stripRoot = false; + src = fetchzip { + url = "https://raw.githubusercontent.com/kreativekorp/sitelen-seli-kiwen/69132c99873894746c9710707aaeb2cea2609709/sitelenselikiwen.zip"; + stripRoot = false; + hash = "sha256-viOLAj9Rn60bcQkkDHVuKHCE8KPnIz/L0hIJhum1SSQ="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/{opentype,truetype} - mv $out/*.eot $out/share/fonts/opentype/ - mv $out/*.ttf $out/share/fonts/truetype/ + mv *.eot $out/share/fonts/opentype/ + mv *.ttf $out/share/fonts/truetype/ + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/source-code-pro/default.nix b/third_party/nixpkgs/pkgs/data/fonts/source-code-pro/default.nix index 37273530bb..c94e9aaca4 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/source-code-pro/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/source-code-pro/default.nix @@ -1,14 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "source-code-pro"; version = "2.038"; -in (fetchzip { - name = "source-code-pro-${version}"; - url = "https://github.com/adobe-fonts/source-code-pro/releases/download/${version}R-ro%2F1.058R-it%2F1.018R-VAR/OTF-source-code-pro-${version}R-ro-1.058R-it.zip"; + src = fetchzip { + url = "https://github.com/adobe-fonts/source-code-pro/releases/download/${version}R-ro%2F1.058R-it%2F1.018R-VAR/OTF-source-code-pro-${version}R-ro-1.058R-it.zip"; + stripRoot = false; + hash = "sha256-ijeTLka131jf6B9xj/eNWK1T5r7r3aBXBgnVyRAxmuY="; + }; - sha256 = "027cf62zj27q7l3d4sqzdfgz423lzysihdg8cvmkk6z910a1v368"; + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = { description = "Monospaced font family for user interface and coding environments"; @@ -17,9 +25,4 @@ in (fetchzip { homepage = "https://adobe-fonts.github.io/source-code-pro/"; license = lib.licenses.ofl; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/source-han-code-jp/default.nix b/third_party/nixpkgs/pkgs/data/fonts/source-han-code-jp/default.nix index 076291ab88..2a64680ee1 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/source-han-code-jp/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/source-han-code-jp/default.nix @@ -1,15 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { pname = "source-han-code-jp"; - version = "2.012R"; -in (fetchzip { - name = "${pname}-${version}"; + version = "2.012"; - url = "https://github.com/adobe-fonts/${pname}/archive/${version}.zip"; + src = fetchzip { + url = "https://github.com/adobe-fonts/${pname}/archive/${version}R.zip"; + hash = "sha256-ljO/1/CaE9Yj+AN5xxlIr30/nV/axGQPO0fGACAZGCQ="; + }; - sha256 = "16y5as1k864ghy3vzp8svr3q0sw57rv53za3f48700ksvxz5pwry"; + installPhase = '' + runHook preInstall + + install -Dm444 OTF/*.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = { description = "A monospaced Latin font suitable for coding"; @@ -18,9 +24,4 @@ in (fetchzip { homepage = "https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html"; license = lib.licenses.ofl; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/source-han/default.nix b/third_party/nixpkgs/pkgs/data/fonts/source-han/default.nix index edf8ecfaa4..2f91118654 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/source-han/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/source-han/default.nix @@ -1,7 +1,7 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ stdenvNoCC -, lib -, fetchzip +{ lib +, stdenvNoCC +, fetchurl +, unzip }: let @@ -9,21 +9,37 @@ let { family , description , rev - , sha256 - , postFetch ? '' - install -m444 -Dt $out/share/fonts/opentype/source-han-${family} $downloadedFile - '' + , hash , zip ? "" }: let Family = lib.toUpper (lib.substring 0 1 family) + lib.substring 1 (lib.stringLength family) family; in - (fetchzip { - name = "source-han-${family}-${lib.removeSuffix "R" rev}"; + stdenvNoCC.mkDerivation rec { + pname = "source-han-${family}"; + version = lib.removeSuffix "R" rev; - url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc${zip}"; - inherit sha256; + src = fetchurl { + url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc${zip}"; + inherit hash; + }; + + nativeBuildInputs = lib.optionals (zip == ".zip") [ unzip ]; + + unpackPhase = lib.optionalString (zip == "") '' + cp $src SourceHan${Family}.ttc${zip} + '' + lib.optionalString (zip == ".zip") '' + unzip $src + ''; + + installPhase = '' + runHook preInstall + + install -Dm444 *.ttc -t $out/share/fonts/opentype/${pname} + + runHook postInstall + ''; meta = { description = "An open source Pan-CJK ${description} typeface"; @@ -31,18 +47,14 @@ let license = lib.licenses.ofl; maintainers = with lib.maintainers; [ taku0 emily ]; }; - }).overrideAttrs (_: { inherit postFetch; }); + }; in { sans = makePackage { family = "sans"; description = "sans-serif"; rev = "2.004R"; - sha256 = "052d17hvz435zc4r2y1p9cgkkgn0ps8g74mfbvnbm1pv8ykj40m9"; - postFetch = '' - mkdir -p $out/share/fonts/opentype/source-han-sans - unzip $downloadedFile -d $out/share/fonts/opentype/source-han-sans - ''; + hash = "sha256-b1kRiprdpaf+Tp5rtTgwn34dPFQR+anTKvMqeVAbfk8="; zip = ".zip"; }; @@ -50,11 +62,7 @@ in family = "serif"; description = "serif"; rev = "2.000R"; - sha256 = "0x3n6s4khdd6l0crwd7g9sjaqp8lkvksglhc7kj3cv80hldab9wp"; - postFetch = '' - mkdir -p $out/share/fonts/opentype/source-han-serif - unzip $downloadedFile -d $out/share/fonts/opentype/source-han-serif - ''; + hash = "sha256-RDgywab7gwT+YBO7F1KJvKOv0E/3+7Zi/pQl+UDsGcM="; zip = ".zip"; }; @@ -62,6 +70,6 @@ in family = "mono"; description = "monospaced"; rev = "1.002"; - sha256 = "010h1y469c21bjavwdmkpbwk3ny686inz8i062wh1dhcv8cnqk3c"; + hash = "sha256-DBkkSN6QhI8R64M2h2iDqaNtxluJZeSJYAz8x6ZzWME="; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/source-sans-pro/default.nix b/third_party/nixpkgs/pkgs/data/fonts/source-sans-pro/default.nix index 382c20aa97..2a2d2c70f2 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/source-sans-pro/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/source-sans-pro/default.nix @@ -1,18 +1,28 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: # Source Sans Pro got renamed to Source Sans 3 (see # https://github.com/adobe-fonts/source-sans/issues/192). This is the # last version named "Pro". It is useful for backward compatibility # with older documents/templates/etc. -let - version = "3.006"; -in (fetchzip { + +stdenvNoCC.mkDerivation rec { name = "source-sans-pro-${version}"; + version = "3.006"; - url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; + src = fetchzip { + url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; + hash = "sha256-1Savijgq3INuUN89MR0t748HOuGseXVw5Kd4hYwuVas="; + }; - sha256 = "sha256-uWr/dFyLF65v0o6+oN/3RQoe4ziPspzGB1rgiBkoTYY="; + installPhase = '' + runHook preInstall + + install -Dm444 OTF/*.otf -t $out/share/fonts/opentype + install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype + install -Dm444 VAR/*.otf -t $out/share/fonts/variable + + runHook postInstall + ''; meta = with lib; { homepage = "https://adobe-fonts.github.io/source-sans/"; @@ -21,11 +31,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/{opentype,truetype,variable} - unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype - unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype - unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/source-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/source-sans/default.nix index 94df27765e..1433804ce7 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/source-sans/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/source-sans/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "source-sans"; version = "3.046"; -in (fetchzip { - name = "source-sans-${version}"; - url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; + src = fetchzip { + url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; + hash = "sha256-nBLEK+T5n1CdZK2zvCWIhF2MxPmiAwL9l55a55yHtgU="; + }; - sha256 = "1wxdinnliq0xqbjrs0sqykwaggkmyqawfq862d9xn05g1pnxda94"; + installPhase = '' + runHook preInstall + + install -Dm444 OTF/*.otf -t $out/share/fonts/opentype + install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype + install -Dm444 VAR/*.otf -t $out/share/fonts/variable + + runHook postInstall + ''; meta = with lib; { homepage = "https://adobe-fonts.github.io/source-sans/"; @@ -17,11 +26,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/{opentype,truetype,variable} - unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype - unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype - unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/source-serif-pro/default.nix b/third_party/nixpkgs/pkgs/data/fonts/source-serif-pro/default.nix index 8f2ae0f799..698694faf5 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/source-serif-pro/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/source-serif-pro/default.nix @@ -1,18 +1,28 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: # Source Serif Pro got renamed to Source Serif 4 (see # https://github.com/adobe-fonts/source-serif/issues/77). This is the # last version named "Pro". It is useful for backward compatibility # with older documents/templates/etc. -let + +stdenvNoCC.mkDerivation rec { + pname = "source-serif-pro"; version = "3.001"; -in (fetchzip { - name = "source-serif-pro-${version}"; - url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-pro-${version}R.zip"; + src = fetchzip { + url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-pro-${version}R.zip"; + hash = "sha256-chXoaPOACtQ7wz/etElXuIJH/yvUsP03WlxeCfqWF/w="; + }; - sha256 = "sha256-rYWk8D41QMuuSP+cQMk8ttT7uX3a7gBk4OqjA7K9udk="; + installPhase = '' + runHook preInstall + + install -Dm444 OTF/*.otf -t $out/share/fonts/opentype + install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype + install -Dm444 VAR/*.otf -t $out/share/fonts/variable + + runHook postInstall + ''; meta = with lib; { homepage = "https://adobe-fonts.github.io/source-serif/"; @@ -21,11 +31,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/{opentype,truetype,variable} - unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype - unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype - unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/source-serif/default.nix b/third_party/nixpkgs/pkgs/data/fonts/source-serif/default.nix index 3c61627183..626b36f270 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/source-serif/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/source-serif/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "source-serif"; version = "4.004"; -in (fetchzip { - name = "source-serif-${version}"; - url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-${version}.zip"; + src = fetchzip { + url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-${version}.zip"; + hash = "sha256-tGSMOwYBEZat7MI78wkPr6lgJdsOdOaIZb+IAOoOlq4="; + }; - sha256 = "06814hcp20abca6p0ii61f23g6h1ibqyhq30lsva59wbwx5iha0h"; + installPhase = '' + runHook preInstall + + install -Dm444 OTF/*.otf -t $out/share/fonts/opentype + install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype + install -Dm444 VAR/*.otf -t $out/share/fonts/variable + + runHook postInstall + ''; meta = with lib; { homepage = "https://adobe-fonts.github.io/source-serif/"; @@ -17,11 +26,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/{opentype,truetype,variable} - unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype - unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype - unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix b/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix index 737a799438..ec2a1da084 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix @@ -1,25 +1,31 @@ -{ lib, fetchurl, xorg }: +{ lib, stdenvNoCC, fetchurl, xorg }: -let +stdenvNoCC.mkDerivation rec { pname = "spleen"; version = "1.9.1"; -in fetchurl { - name = "${pname}-${version}"; - url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; - downloadToTemp = true; - recursiveHash = true; - postFetch = '' - tar xvf $downloadedFile --strip=1 + src = fetchurl { + url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; + hash = "sha256-fvWcTgKkXp3e1ryhi1Oc3w8OtJ5svLJXhY2lasXapiI="; + }; + + nativeBuildInputs = [ xorg.mkfontscale ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + d="$out/share/fonts/misc" install -D -m 644 *.{pcf,bdf,otf} -t "$d" install -D -m 644 *.psfu -t "$out/share/consolefonts" install -m644 fonts.alias-spleen $d/fonts.alias # create fonts.dir so NixOS xorg module adds to fp - ${xorg.mkfontscale}/bin/mkfontdir "$d" + mkfontdir "$d" + + runHook postInstall ''; - sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94="; meta = with lib; { description = "Monospaced bitmap fonts"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/stix-otf/default.nix b/third_party/nixpkgs/pkgs/data/fonts/stix-otf/default.nix index 894fd22c36..c5505b7a79 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/stix-otf/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/stix-otf/default.nix @@ -1,24 +1,28 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "stix-otf"; version = "1.1.1"; -in fetchzip { - name = "stix-otf-${version}"; - url = "http://ftp.fi.muni.cz/pub/linux/gentoo/distfiles/STIXv${version}-word.zip"; + src = fetchzip { + url = "https://sources.debian.org/src/fonts-stix/1.1.1-4.1/STIXv${version}-word.zip"; + stripRoot = false; + hash = "sha256-M3STue+RPHi8JgZZupV0dVLZYKBiFutbBOlanuKkD08="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + installPhase = '' + runHook preInstall + + install -Dm644 Fonts/STIX-Word/*.otf -t $out/share/fonts/opentype + + runHook postInstall ''; - sha256 = "04d4qxq3i9fyapsmxk6d9v1xirjam8c74fyxs6n24d3gf2945zmw"; - meta = with lib; { homepage = "http://www.stixfonts.org/"; description = "Fonts for Scientific and Technical Information eXchange"; license = licenses.ofl; platforms = platforms.all; - maintainers = [maintainers.rycee]; + maintainers = [ maintainers.rycee ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/stix-two/default.nix b/third_party/nixpkgs/pkgs/data/fonts/stix-two/default.nix index fb494391a8..86ceb388f8 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/stix-two/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/stix-two/default.nix @@ -1,14 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "stix-two"; version = "2.13"; -in -(fetchzip { - name = "stix-two-${version}"; - url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip"; + src = fetchzip { + url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip"; + stripRoot = false; + hash = "sha256-hfQmrw7HjlhQSA0rVTs84i3j3iMVR0k7tCRBcB6hEpU="; + }; - sha256 = "sha256-cBtZe/oq4bQCscSAhJ4YuTSghDleD9O/+3MHOJyI50o="; + installPhase = '' + runHook preInstall + + install -Dm644 */*.otf -t $out/share/fonts/opentype + install -Dm644 */*.ttf -t $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { homepage = "https://www.stixfonts.org/"; @@ -17,10 +26,4 @@ in platforms = platforms.all; maintainers = [ maintainers.rycee ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix index c4af97c7cc..26870d8003 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix @@ -1,12 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let - version = "0.64"; -in (fetchzip { - name = "sudo-font-${version}"; - url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "sha256-ewLTeIVY76eq5mHTnjIsJ5Q2CMuBqXJzxvjZTONPsr8="; +stdenvNoCC.mkDerivation rec { + pname = "sudo-font"; + version = "0.69"; + + src = fetchzip { + url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; + hash = "sha256-GXlQh9JRAzbwWKTJw/y003ywjaWtiQayHxiWPTPvIO0="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype/ + + runHook postInstall + ''; meta = with lib; { description = "Font for programmers and command line users"; @@ -16,9 +25,4 @@ in (fetchzip { maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/tai-languages/default.nix b/third_party/nixpkgs/pkgs/data/fonts/tai-languages/default.nix index 71ca170afb..4e4c689b6a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/tai-languages/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/tai-languages/default.nix @@ -1,24 +1,34 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: { -tai-ahom = fetchzip { - name = "tai-ahom-2015-07-06"; + tai-ahom = stdenvNoCC.mkDerivation rec { + pname = "tai-ahom"; + version = "unstable-2015-07-06"; - url = "https://github.com/enabling-languages/tai-languages/blob/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf?raw=true"; + src = fetchurl { + url = "https://github.com/enabling-languages/tai-languages/raw/b57a3ea4589af69bb8e87c6c4bb7cd367b52f0b7/ahom/.fonts/ttf/.original/AhomUnicode_FromMartin.ttf"; + hash = "sha256-U1vcVf/VgXhvK1f2Iw2JKkd2EzJgz7KbHAwnUanX8n4="; + }; - postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/AhomUnicode.ttf"; + dontUnpack = true; - sha256 = "03h8ql9d5bzq4j521j0cz08ddf717bzim1nszh2aar6kn0xqnp9q"; + installPhase = '' + runHook preInstall - meta = with lib; { - homepage = "https://github.com/enabling-languages/tai-languages"; - description = "Unicode-compliant Tai Ahom font"; - maintainers = with maintainers; [ mathnerd314 ]; - license = licenses.ofl; # See font metadata - platforms = platforms.all; + install -Dm644 $src $out/share/fonts/truetype/AhomUnicode.ttf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/enabling-languages/tai-languages"; + description = "Unicode-compliant Tai Ahom font"; + maintainers = with maintainers; [ mathnerd314 ]; + license = licenses.ofl; # See font metadata + platforms = platforms.all; + }; }; -}; -# TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai) + # TODO: package others (Khamti Shan, Tai Aiton, Tai Phake, and/or Assam Tai) } diff --git a/third_party/nixpkgs/pkgs/data/fonts/takao/default.nix b/third_party/nixpkgs/pkgs/data/fonts/takao/default.nix index dcbce858e0..353287d4d7 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/takao/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/takao/default.nix @@ -1,20 +1,21 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "takao"; version = "00303.01"; -in -fetchzip { - name = "takao-${version}"; - url = "mirror://ubuntu/pool/universe/f/fonts-takao/fonts-takao_${version}.orig.tar.gz"; - sha256 = "sha256-TlPq3iIv8vHlxYu5dkX/Lf6ediYKQaQ5uMbFvypQM/w="; - postFetch = '' - unpackDir="$TMPDIR/unpack" - mkdir "$unpackDir" - cd "$unpackDir" - tar xf "$downloadedFile" --strip-components=1 + src = fetchurl { + url = "mirror://ubuntu/pool/universe/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.gz"; + hash = "sha256-0wjHNv1yStp0q9D0WfwjgUYoUKcCrXA5jFO8PEVgq5k="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts cp *.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/tenderness/default.nix b/third_party/nixpkgs/pkgs/data/fonts/tenderness/default.nix index 09ea566e73..40b284c254 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/tenderness/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/tenderness/default.nix @@ -1,27 +1,32 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let majorVersion = "0"; minorVersion = "601"; - pname = "tenderness"; in +stdenvNoCC.mkDerivation (self: { + pname = "tenderness"; + version = "${majorVersion}.${minorVersion}"; -fetchzip { - name = "${pname}-font-${majorVersion}.${minorVersion}"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-bwJKW+rY7/r2pBCSA6HYlaRMsI/U8UdW2vV4tmYuJww="; + stripRoot = false; + }; - url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip"; - sha256 = "0d88l5mzq0k63zsmb8d5w3hfqxy04vpv4j0j8nmj1xv6kikhhybh"; + installPhase = '' + runHook preInstall - postFetch = '' - mkdir -p $out/share/fonts/opentype/${pname} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/${pname} + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; meta = with lib; { - homepage = "http://dotcolon.net/font/${pname}/"; + homepage = "http://dotcolon.net/font/${self.pname}/"; description = "Serif font designed by Sora Sagano with old-style figures"; platforms = platforms.all; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars minijackson ]; license = licenses.ofl; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix b/third_party/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix index 3c9494f1c0..6231d0e0c1 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -1,14 +1,26 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "terminus-font-ttf"; version = "4.49.1"; -in (fetchzip { - name = "terminus-font-ttf-${version}"; - url = "https://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; + src = fetchzip { + url = "https://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; + hash = "sha256-NKswkZR05V21mszT56S2x85k//qhfzRShhepYaAybDc="; + }; - sha256 = "sha256-UaTnCamIRN/3xZsYt5nYzvykXQ3ri94a047sWOJ2RfU="; + installPhase = '' + runHook preInstall + + for i in *.ttf; do + local destname="$(echo "$i" | sed -E 's|-[[:digit:].]+\.ttf$|.ttf|')" + install -Dm 644 "$i" "$out/share/fonts/truetype/$destname" + done + + install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" + + runHook postInstall + ''; meta = with lib; { description = "A clean fixed width TTF font"; @@ -20,15 +32,4 @@ in (fetchzip { license = licenses.ofl; maintainers = with maintainers; [ ]; }; -}).overrideAttrs (_: { - postFetch = '' - unzip -j $downloadedFile - - for i in *.ttf; do - local destname="$(echo "$i" | sed -E 's|-[[:digit:].]+\.ttf$|.ttf|')" - install -Dm 644 "$i" "$out/share/fonts/truetype/$destname" - done - - install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/terminus-font/default.nix b/third_party/nixpkgs/pkgs/data/fonts/terminus-font/default.nix index 348f341cea..cbda0cc100 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/terminus-font/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/terminus-font/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { 16x32. The styles are normal and bold (except for 6x12), plus EGA/VGA-bold for 8x14 and 8x16. ''; - homepage = "http://terminus-font.sourceforge.net/"; + homepage = "https://terminus-font.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ astsmtl ]; }; diff --git a/third_party/nixpkgs/pkgs/data/fonts/theano/default.nix b/third_party/nixpkgs/pkgs/data/fonts/theano/default.nix index 69107f4a8e..3a3107e136 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/theano/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/theano/default.nix @@ -1,15 +1,25 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "theano"; version = "2.0"; - name = "theano-${version}"; -in (fetchzip rec { - inherit name; - url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip"; + src = fetchzip { + url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip"; + stripRoot = false; + hash = "sha256-9wnwHcRHB+AToOvGwZSXvHkQ8hqMd7Sdl26Ty/IwbPw="; + }; - sha256 = "1my1symb7k80ys33iphsxvmf6432wx6vjdnxhzhkgrang1rhx1h8"; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${pname}-${version} + cp *.otf $out/share/fonts/opentype + cp *.txt $out/share/doc/${pname}-${version} + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/akryukov/theano"; @@ -18,11 +28,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}" - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/tibetan-machine/default.nix b/third_party/nixpkgs/pkgs/data/fonts/tibetan-machine/default.nix index 67393a9c4a..4731bfcd36 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/tibetan-machine/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/tibetan-machine/default.nix @@ -1,16 +1,21 @@ -{ fetchzip, lib }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "tibetan-machine"; version = "1.901b"; -in -fetchzip { - name = "tibetan-machine-${version}"; - url = "mirror://debian/pool/main/f/fonts-tibetan-machine/fonts-tibetan-machine_${version}.orig.tar.bz2"; - sha256 = "sha256-A+RgpFLsP4iTzl0PMRHaNzWGbDR5Qa38lRegNJ96ULo="; - postFetch = '' + src = fetchurl { + url = "mirror://debian/pool/main/f/fonts-${pname}/fonts-${pname}_${version}.orig.tar.bz2"; + hash = "sha256-c/1Sgv7xKHpsJGjY9ZY2qOJHShGHL1robvphFNJOt5w="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts - tar xf $downloadedFile --strip-components=1 -C $out/share/fonts ttf-tmuni-${version}/TibMachUni-${version}.ttf + cp *.ttf $out/share/fonts + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix b/third_party/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix index 8f6e7eceb0..840e75c710 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix @@ -1,15 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation { + pname = "times-newer-roman"; version = "unstable-2018-09-11"; -in -(fetchzip { - name = "times-newer-roman-${version}"; - url = "https://web.archive.org/web/20210609022835/https://timesnewerroman.com/assets/TimesNewerRoman.zip"; + src = fetchzip { + url = "https://web.archive.org/web/20210609022835/https://timesnewerroman.com/assets/TimesNewerRoman.zip"; + stripRoot = false; + hash = "sha256-wO4rxyJNQyhRLpswCYKXdeiXy5G+iWyxulYCHZb60QM="; + }; - hash = "sha256-Hx59RYLLwfimEQjEEes0lCpg6iql46DFwhQ7kVGiEzc="; + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/opentype + cp *.otf $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { description = "A font that looks just like Times New Roman, except each character is 5-10% wider"; @@ -18,9 +26,4 @@ in maintainers = with maintainers; [ ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/tt2020/default.nix b/third_party/nixpkgs/pkgs/data/fonts/tt2020/default.nix index c92e860327..63b4e1834a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/tt2020/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/tt2020/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "TT2020"; - version = "2020-01-05"; -in -fetchFromGitHub { - name = "${pname}-${version}"; - owner = "ctrlcctrlv"; - repo = pname; - rev = "2b418fab5f99f72a18b3b2e7e2745ac4e03aa612"; - sha256 = "1z0nizvs0gp0xl7pn6xcjvsysxhnfm7aqfamplkyvya3fxvhncds"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "ctrlcctrlv"; + repo = pname; + rev = "v${version}"; + hash = "sha256-eAJzaookHcQ/7QNq/HUKA/O2liyKynJNdo6QuZ1Bv6k="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 install -Dm644 -t $out/share/fonts/truetype dist/*.ttf install -Dm644 -t $out/share/fonts/woff2 dist/*.woff2 + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix index 95e4ce2a52..e71888969f 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -1,20 +1,21 @@ -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchurl }: + +stdenvNoCC.mkDerivation rec { pname = "ttf-bitstream-vera"; version = "1.10"; -in -fetchzip rec { - name = "${pname}-${version}"; - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.bz2"; + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; + hash = "sha256-21sn33u7MYA269t1rNPpjxvW62YI+3CmfUeM0kPReNw="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xjf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/truetype *.ttf + + runHook postInstall ''; - sha256 = "179hal4yi3367jg8rsvqx6h2w4s0kn9zzrv8c47sslyg28g39s4m"; - - meta = { - }; + meta = { }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/ttf-envy-code-r/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ttf-envy-code-r/default.nix index 871bfb0099..673d946a1e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ttf-envy-code-r/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ttf-envy-code-r/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { pname = "ttf-envy-code-r"; version = "PR7"; -in fetchzip { - name = "${pname}-0.${version}"; - url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; + src = fetchzip { + url = "http://download.damieng.com/fonts/original/EnvyCodeR-${version}.zip"; + hash = "sha256-pJqC/sbNjxEwbVf2CVoXMBI5zvT3DqzRlKSqFT8I2sM="; + }; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d "$out/share/doc/${pname}" + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + install -Dm644 *.txt -t $out/share/doc/${pname} + + runHook postInstall ''; - sha256 = "0x0r07nax68cmz7490x2crzzgdg4j8fg63wppcmjqm0230bggq2z"; - meta = with lib; { homepage = "https://damieng.com/blog/tag/envy-code-r"; description = "Free scalable coding font by DamienG"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix index bf52d07c52..85b2ec1ce7 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -1,19 +1,22 @@ -{ lib, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { + pname = "ttf-tw-moe"; version = "2020-11-14"; -in -fetchzip { - name = "ttf-tw-moe"; - url = "https://github.com/Jiehong/TW-fonts/archive/${version}.zip"; + src = fetchzip { + url = "https://github.com/Jiehong/TW-fonts/archive/${version}.zip"; + hash = "sha256-9gy8xO93ViIPmpg1du0DbXVCR2FowourLH8nP9d6HK0="; + }; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile TW-fonts-${version}/\*.ttf -d $out/share/fonts/truetype + installPhase = '' + runHook preInstall + + install -Dm644 *.ttf -t $out/share/fonts/truetype + + runHook postInstall ''; - sha256 = "1jd3gjjfa4vadp6d499n0irz5b22z611kd7q5qgqf6s2fwbxfhiz"; - meta = with lib; { homepage = "http://www.moe.gov.tw/"; description = "Set of KAI and SONG fonts from the Ministry of Education of Taiwan"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/u001/default.nix b/third_party/nixpkgs/pkgs/data/fonts/u001/default.nix index fc2f3a4863..c50e972a4d 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/u001/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/u001/default.nix @@ -10,8 +10,6 @@ stdenvNoCC.mkDerivation rec { stripRoot = false; }; - dontBuild = true; - installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/data/fonts/ubuntu-font-family/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ubuntu-font-family/default.nix index 0458abf91d..331e34690a 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -1,18 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -fetchzip rec { +stdenvNoCC.mkDerivation rec { pname = "ubuntu-font-family"; version = "0.83"; - url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-${version}.zip"; + src = fetchzip { + url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-${version}.zip"; + hash = "sha256-FAg1xn8Gcbwmuvqtg9SquSet4oTT9nqE+Izeq7ZMVcA="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p $out/share/fonts/ubuntu - mv $out/*.ttf $out/share/fonts/ubuntu - find $out -maxdepth 1 ! -type d -exec rm {} + - ''; + mv *.ttf $out/share/fonts/ubuntu - sha256 = "090y665h4kf2bi623532l6wiwkwnpd0xds0jr7560xwfwys1hiqh"; + runHook postInstall + ''; meta = with lib; { description = "Ubuntu Font Family"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix index 2c945f2452..27933b5b13 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix @@ -1,13 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "ultimate-oldschool-pc-font-pack"; version = "2.2"; -in -(fetchzip { - name = "ultimate-oldschool-pc-font-pack-${version}"; - url = "https://int10h.org/oldschool-pc-fonts/download/oldschool_pc_font_pack_v${version}_linux.zip"; - sha256 = "sha256-BOA2fMa2KT3Bkpvj/0DzrzuZbl3RARvNn4qbI/+dApU="; + + src = fetchzip { + url = "https://int10h.org/oldschool-pc-fonts/download/oldschool_pc_font_pack_v${version}_linux.zip"; + stripRoot = false; + hash = "sha256-54U8tZzvivTSOgmGesj9QbIgkSTm9w4quMhsuEc0Xy4="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp */*.ttf $out/share/fonts/truetype + + runHook postInstall + ''; meta = with lib; { description = "The Ultimate Oldschool PC Font Pack (TTF Fonts)"; @@ -16,9 +26,4 @@ in license = licenses.cc-by-sa-40; maintainers = [ maintainers.endgame ]; }; -}).overrideAttrs (_: { - postFetch= '' - mkdir -p $out/share/fonts/truetype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix b/third_party/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix index fe694a5e31..3e3087c6ab 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/undefined-medium/default.nix @@ -1,12 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: -let name = "undefined-medium-1.0"; -in (fetchzip rec { - inherit name; +{ lib, stdenvNoCC, fetchzip }: - url = "https://github.com/andirueckel/undefined-medium/archive/v1.0.zip"; +stdenvNoCC.mkDerivation rec { + pname = "undefined-medium"; + version = "1.1"; - sha256 = "1wa04jzbffshwcxm705yb5wja8wakn8j7fvim1mlih2z1sqw0njk"; + src = fetchzip { + url = "https://github.com/andirueckel/undefined-medium/archive/v1.1.zip"; + hash = "sha256-iquxt7lo92y4AQZf23Ij5Qzg2U7buL3kGLksQSR6vac="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 fonts/otf/*.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { homepage = "https://undefined-medium.com/"; @@ -19,9 +28,4 @@ in (fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile ${name}/fonts/otf/\*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/unfonts-core/default.nix b/third_party/nixpkgs/pkgs/data/fonts/unfonts-core/default.nix index 7f01d5531e..5756a948f6 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/unfonts-core/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/unfonts-core/default.nix @@ -1,16 +1,20 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { pname = "unfonts-core"; version = "1.0.2-080608"; -in fetchzip { - name = "${pname}-${version}"; - url = "https://kldp.net/unfonts/release/2607-un-fonts-core-${version}.tar.gz"; - hash = "sha256-k9C7d/SbVLWFzRnDWpOIMtY6cAEIcaLcbxQAqjwuWds="; - postFetch = '' - tar -xzf $downloadedFile --strip-components=1 + src = fetchurl { + url = "https://kldp.net/unfonts/release/2607-un-fonts-core-${version}.tar.gz"; + hash = "sha256-OwpydPmqt+jw8ZOMAacOFYF2bVG0lLoUVoPzesVXkY4="; + }; + + installPhase = '' + runHook preInstall + install -m444 -Dt $out/share/fonts/truetype *.ttf + + runHook postInstall ''; meta = with lib; { @@ -20,7 +24,7 @@ in fetchzip { The Un-fonts come from the HLaTeX as type1 fonts in 1998 by Koaunghi Un, he made type1 fonts to use with Korean TeX (HLaTeX) in the late 1990's and released it under the GPL license. They were converted to TrueType with the FontForge (PfaEdit) by Won-kyu Park in 2003. - ''; + ''; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.ehmry ]; diff --git a/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix b/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix index 026a262a84..aa87206830 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "unifont_upper"; version = "15.0.01"; -in fetchurl rec { - name = "unifont_upper-${version}"; - url = "mirror://gnu/unifont/unifont-${version}/${name}.ttf"; + src = fetchurl { + url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.ttf"; + hash = "sha256-o6ItW9fME+f4t2cvhj96r3ZG9nKLAUznn/pdukFYnxw="; + }; - downloadToTemp = true; + dontUnpack = true; - recursiveHash = true; + installPhase = '' + runHook preInstall - postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; + install -Dm644 $src $out/share/fonts/truetype/unifont_upper.ttf - hash = "sha256-cGX9umTGRfrQT3gwPgNqxPHB7Un3ZT3b7hPy4IP45Fk="; + runHook postInstall + ''; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/vazir-code-font/default.nix b/third_party/nixpkgs/pkgs/data/fonts/vazir-code-font/default.nix index 6702fd1b02..6ba69b57fe 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/vazir-code-font/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/vazir-code-font/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "vazir-code-font"; version = "1.1.2"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "vazir-code-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "vazir-code-font"; + rev = "v${version}"; + hash = "sha256-iBojse3eHr4ucZtPfpkN+mmO6sEExY8WcAallyPgMsI="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; + + runHook postInstall ''; - sha256 = "0ivwpn9xm2zwhwgg9mghyiy5v66cn4786w9j6rkff5cmzshv279r"; meta = with lib; { homepage = "https://github.com/rastikerdar/vazir-code-font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix index b8885298c0..787d250068 100755 --- a/third_party/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/vazir-fonts/default.nix @@ -1,20 +1,25 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "vazir-fonts"; version = "32.0.0"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "rastikerdar"; - repo = "vazir-font"; - rev = "v${version}"; + src = fetchFromGitHub { + owner = "rastikerdar"; + repo = "vazir-font"; + rev = "v${version}"; + hash = "sha256-lkjlSW3Sfr1bJ9/IOsZl9yOVh9mYKhoV5XcLkqcQ71g="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall - postFetch = '' - tar xf $downloadedFile --strip=1 find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; + + runHook postInstall ''; - sha256 = "sha256-Uy8hgBtCcTLwXu9FkLN1WavUfP74Jf53ChxVGS3UBVM="; meta = with lib; { homepage = "https://github.com/rastikerdar/vazir-font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/vdrsymbols/default.nix b/third_party/nixpkgs/pkgs/data/fonts/vdrsymbols/default.nix index 4b280df564..5df82b31cf 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/vdrsymbols/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/vdrsymbols/default.nix @@ -1,15 +1,20 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip { - name = "vdrsymbols-20100612"; +stdenvNoCC.mkDerivation rec { + pname = "vdrsymbols"; + version = "20100612"; - url = "http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz"; + src = fetchurl { + url = "http://andreas.vdr-developer.org/fonts/download/${pname}-ttf-${version}.tgz"; + hash = "sha256-YxB+JcDkta5are+OQyP/WKDL0vllgn0m26bU9mQ3C/Q="; + }; - sha256 = "0wpxns8zqic98c84j18dr4zmj092v07yq07vwwgzblr0rw9n6gzr"; + installPhase = '' + runHook preInstall - postFetch = '' - tar xvzf "$downloadedFile" - install -Dm444 -t "$out/share/fonts/truetype" */*.ttf + install -Dm444 -t "$out/share/fonts/truetype" *.ttf + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/fonts/vegur/default.nix b/third_party/nixpkgs/pkgs/data/fonts/vegur/default.nix index 2f03dac391..effaf74be7 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/vegur/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/vegur/default.nix @@ -1,26 +1,32 @@ -{ lib, buildPackages, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: let - version = "0.701"; -in fetchzip { - name = "vegur-font-${version}"; + majorVersion = "0"; + minorVersion = "701"; +in +stdenvNoCC.mkDerivation (self: { + pname = "vegur"; + version = "${majorVersion}.${minorVersion}"; - # Upstream doesn't version their URLs. - # http://dotcolon.net/font/vegur/ → http://dotcolon.net/DL/font/vegur.zip - url = "http://download.opensuse.org/repositories/M17N:/fonts/SLE_12_SP3/src/dotcolon-vegur-fonts-0.701-1.4.src.rpm"; + src = fetchzip { + url = "https://dotcolon.net/download/fonts/${self.pname}_${majorVersion}${minorVersion}.zip"; + hash = "sha256-sGb3mEb3g15ZiVCxEfAanly8zMUopLOOjw8W4qbXLPA="; + stripRoot = false; + }; - postFetch = '' - ${buildPackages.rpmextract}/bin/rpmextract $downloadedFile - unzip vegur.zip - install -m444 -Dt $out/share/fonts/Vegur *.otf + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall ''; - sha256 = "0iisi2scq72lyj7pc1f36fhfjnm676n5byl4zaavhbxpdrbc6d1v"; meta = with lib; { homepage = "http://dotcolon.net/font/vegur/"; description = "A humanist sans serif font"; platforms = platforms.all; - maintainers = [ maintainers.samueldr ]; + maintainers = with maintainers; [ minijackson samueldr ]; license = licenses.cc0; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/victor-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/victor-mono/default.nix index f34baa8a83..1708a43b80 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/victor-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/victor-mono/default.nix @@ -1,11 +1,8 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "victor-mono"; version = "1.5.4"; -in -fetchzip { - name = "victor-mono-${version}"; - stripRoot = false; # Upstream prefers we download from the website, # but we really insist on a more versioned resource. @@ -14,19 +11,23 @@ fetchzip { # so we extract it from the tagged release. # Both methods produce the same file, but this way # we can safely reason about what version it is. - url = "https://github.com/rubjo/victor-mono/raw/v${version}/public/VictorMonoAll.zip"; + src = fetchzip { + url = "https://github.com/rubjo/victor-mono/raw/v${version}/public/VictorMonoAll.zip"; + stripRoot = false; + hash = "sha256-E8j1bfYrM8yRtasiwgTvyE4EYx2LyAbmw3MXH1l+owk="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' mkdir -p "$out/share/fonts/" - mv $out/OTF $out/share/fonts/opentype - mv $out/TTF $out/share/fonts/truetype + mv OTF $out/share/fonts/opentype + mv TTF $out/share/fonts/truetype - rm -r $out/{EOT,WOFF,WOFF2,LICENSE.txt} + runHook postInstall ''; - sha256 = "sha256-1si0d2lpuXaDcSc3giVMMMbZc/eKbHKU3wmwfYHZ8o0="; - meta = with lib; { description = "Free programming font with cursive italics and ligatures"; homepage = "https://rubjo.github.io/victor-mono"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/vollkorn/default.nix b/third_party/nixpkgs/pkgs/data/fonts/vollkorn/default.nix index b5e3a8e572..deeeac19c9 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/vollkorn/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/vollkorn/default.nix @@ -1,14 +1,27 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, stdenv, fetchzip }: -let +{ lib, stdenvNoCC, fetchzip }: + +stdenvNoCC.mkDerivation rec { pname = "vollkorn"; version = "4.105"; -in -(fetchzip { - name = "${pname}-${version}"; - url = "http://vollkorn-typeface.com/download/vollkorn-${builtins.replaceStrings ["."] ["-"] version}.zip"; - sha256 = "0srff2nqs7353mqcpmvaq156lamfh621py4h1771n0l9ix2c8mss"; - stripRoot = false; + + src = fetchzip { + url = "http://vollkorn-typeface.com/download/vollkorn-${builtins.replaceStrings ["."] ["-"] version}.zip"; + stripRoot = false; + hash = "sha256-oG79GgCwCavbMFAPakza08IPmt13Gwujrkc/NKTai7g="; + }; + + installPhase = '' + runHook preInstall + + mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}} + cp -v {Fontlog,OFL-FAQ,OFL}.txt $out/share/doc/${pname}-${version}/ + cp -v PS-OTF/*.otf $out/share/fonts/opentype + cp -v TTF/*.ttf $out/share/fonts/truetype + cp -v WOFF/*.woff $out/share/fonts/WOFF + cp -v WOFF2/*.woff2 $out/share/fonts/WOFF2 + + runHook postInstall + ''; meta = with lib; { homepage = "http://vollkorn-typeface.com/"; @@ -17,14 +30,4 @@ in platforms = platforms.all; maintainers = [ maintainers.schmittlauch ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}} - unzip $downloadedFile - cp -v {Fontlog,OFL-FAQ,OFL}.txt $out/share/doc/${pname}-${version}/ - cp -v PS-OTF/*.otf $out/share/fonts/opentype - cp -v TTF/*.ttf $out/share/fonts/truetype - cp -v WOFF/*.woff $out/share/fonts/WOFF - cp -v WOFF2/*.woff2 $out/share/fonts/WOFF2 - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/weather-icons/default.nix b/third_party/nixpkgs/pkgs/data/fonts/weather-icons/default.nix index 7171f65cb6..00f9cebac1 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/weather-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/weather-icons/default.nix @@ -1,13 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "weather-icons"; version = "2.0.12"; -in (fetchzip { - name = "weather-icons-${version}"; - url = "https://github.com/erikflowers/weather-icons/archive/refs/tags/${version}.zip"; - sha256 = "sha256-NGPzAloeZa1nCazb+mjAbYw7ZYYDoKpLwcvzg1Ly9oM="; + src = fetchzip { + url = "https://github.com/erikflowers/weather-icons/archive/refs/tags/${version}.zip"; + hash = "sha256-0ZFH2awUo4BkTpK1OsWZ4YKczJHo+HHM6ezGBJAmT+U="; + }; + + installPhase = '' + runHook preInstall + + install -Dm644 _docs/font-source/weathericons-regular.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { description = "Weather Icons"; @@ -21,9 +29,4 @@ in (fetchzip { platforms = platforms.all; maintainers = with maintainers; [ pnelson ]; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile weather-icons-${version}/_docs/font-source/weathericons-regular.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/work-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/work-sans/default.nix index 208f370105..07c5704b51 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/work-sans/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/work-sans/default.nix @@ -1,15 +1,21 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "work-sans"; version = "2.010"; -in -(fetchzip { - name = "work-sans-${version}"; - url = "https://github.com/weiweihuanghuang/Work-Sans/archive/refs/tags/v${version}.zip"; + src = fetchzip { + url = "https://github.com/weiweihuanghuang/Work-Sans/archive/refs/tags/v${version}.zip"; + hash = "sha256-cedcx3CpcPZk3jxxIs5Bz78dxZNtOemvXnUBO6zl2dw="; + }; - sha256 = "sha256-S4O5EoKY4w/p+MHeHRCmPyQRAOUfEwNiETxMgNcsrws="; + installPhase = '' + runHook preInstall + + install -Dm644 fonts/variable/*.ttf fonts/static/TTF/*.ttf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = with lib; { description = "A grotesque sans"; @@ -18,9 +24,4 @@ in maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile "*/fonts/*.ttf" -d $out/share/fonts/opentype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/wqy-microhei/default.nix b/third_party/nixpkgs/pkgs/data/fonts/wqy-microhei/default.nix index f7d3b0333c..7c410e7d00 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/wqy-microhei/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/wqy-microhei/default.nix @@ -1,16 +1,21 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -fetchzip rec { - name = "wqy-microhei-0.2.0-beta"; +stdenvNoCC.mkDerivation rec { + pname = "wqy-microhei"; + version = "0.2.0"; - url = "mirror://sourceforge/wqy/${name}.tar.gz"; + src = fetchurl { + url = "mirror://sourceforge/wqy/${pname}-${version}-beta.tar.gz"; + hash = "sha256-KAKsgCOqNqZupudEWFTjoHjTd///QhaTQb0jeHH3IT4="; + }; + + installPhase = '' + runHook preInstall - postFetch = '' - tar -xzf $downloadedFile --strip-components=1 install -Dm644 wqy-microhei.ttc $out/share/fonts/wqy-microhei.ttc - ''; - sha256 = "0i5jh7mkp371fxqmsvn7say075r641yl4hq26isjyrqvb8cv92a9"; + runHook postInstall + ''; meta = { description = "A (mainly) Chinese Unicode font"; @@ -20,4 +25,3 @@ fetchzip rec { platforms = lib.platforms.all; }; } - diff --git a/third_party/nixpkgs/pkgs/data/fonts/wqy-zenhei/default.nix b/third_party/nixpkgs/pkgs/data/fonts/wqy-zenhei/default.nix index 5d461d0f5b..c59f74d454 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/wqy-zenhei/default.nix @@ -1,20 +1,22 @@ -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchurl }: -let +stdenvNoCC.mkDerivation rec { + pname = "wqy-zenhei"; version = "0.9.45"; -in fetchzip rec { - name = "wqy-zenhei-${version}"; - url = "mirror://sourceforge/wqy/${name}.tar.gz"; + src = fetchurl { + url = "mirror://sourceforge/wqy/${pname}-${version}.tar.gz"; + hash = "sha256-5LfjBkdb+UJ9F1dXjw5FKJMMhMROqj8WfUxC8RDuddY="; + }; - postFetch = '' - tar -xzf $downloadedFile --strip-components=1 - mkdir -p $out/share/fonts - install -m644 *.ttc $out/share/fonts/ + installPhase = '' + runHook preInstall + + install -Dm644 *.ttc -t $out/share/fonts/ + + runHook postInstall ''; - sha256 = "0hbjq6afcd63nsyjzrjf8fmm7pn70jcly7fjzjw23v36ffi0g255"; - meta = { description = "A (mainly) Chinese Unicode font"; homepage = "http://wenq.org"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix b/third_party/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix index cfdd3c0eae..c1ddbe9fae 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/xkcd-font/default.nix @@ -1,24 +1,24 @@ -{ lib, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -let +stdenvNoCC.mkDerivation rec { pname = "xkcd-font"; version = "unstable-2017-08-24"; -in fetchFromGitHub { - name = "${pname}-${version}"; - owner = "ipython"; - repo = pname; - rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d"; + src = fetchFromGitHub { + owner = "ipython"; + repo = pname; + rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d"; + hash = "sha256-1DgSx2L+OpXuPVSXbbl/hcZUyBK9ikPyGWuk6wNzlwc="; + }; - postFetch = '' - install -Dm444 -t $out/share/fonts/opentype/ $out/xkcd/build/xkcd.otf - install -Dm444 -t $out/share/fonts/truetype/ $out/xkcd-script/font/xkcd-script.ttf + installPhase = '' + runHook preInstall - shopt -s extglob dotglob - rm -rf $out/!(share) - shopt -u extglob dotglob + install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf + install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf + + runHook postInstall ''; - sha256 = "sha256-ITsJPs+ZXwUWYe2AmwyVZib8RV7bpiWHOUD8qEZRHHY="; meta = with lib; { description = "The xkcd font"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/third_party/nixpkgs/pkgs/data/fonts/yanone-kaffeesatz/default.nix index 2b1a967043..99cd30f3df 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/yanone-kaffeesatz/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/yanone-kaffeesatz/default.nix @@ -1,12 +1,22 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -(fetchzip { - name = "yanone-kaffeesatz-2004"; +stdenvNoCC.mkDerivation rec { + pname = "yanone-kaffeesatz"; + version = "2004"; - url = "https://yanone.de/2015/data/UIdownloads/Yanone%20Kaffeesatz.zip"; + src = fetchzip { + url = "https://yanone.de/2015/data/UIdownloads/Yanone%20Kaffeesatz.zip"; + stripRoot = false; + hash = "sha256-8yAB73UJ77/c8/VLqiFeT1KtoBQzOh+vWrI+JA2dCoY="; + }; - sha256 = "190c4wx7avy3kp98lsyml7kc0jw7csf5n79af2ypbkhsadfsy8di"; + installPhase = '' + runHook preInstall + + install -Dm644 *.otf -t $out/share/fonts/opentype + + runHook postInstall + ''; meta = { description = "The free font classic"; @@ -15,9 +25,4 @@ homepage = "https://yanone.de/fonts/kaffeesatz/"; license = lib.licenses.ofl; }; -}).overrideAttrs (_: { - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/zilla-slab/default.nix b/third_party/nixpkgs/pkgs/data/fonts/zilla-slab/default.nix index e3dd19c711..886362d78e 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/zilla-slab/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/zilla-slab/default.nix @@ -1,13 +1,23 @@ -# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' -{ lib, fetchzip }: +{ lib, stdenvNoCC, fetchzip }: -let +stdenvNoCC.mkDerivation rec { + pname = "zilla-slab"; version = "1.002"; -in (fetchzip { - name = "zilla-slab-${version}"; - url = "https://github.com/mozilla/zilla-slab/releases/download/v${version}/Zilla-Slab-Fonts-v${version}.zip"; - sha256 = "1b1ys28hyjcl4qwbnsyi6527nj01g3d6id9jl23fv6f8fjm4ph0f"; + src = fetchzip { + url = "https://github.com/mozilla/zilla-slab/releases/download/v${version}/Zilla-Slab-Fonts-v${version}.zip"; + stripRoot = false; + hash = "sha256-yOHu+dSWlyI7w1N1teED9R1Fphso2bKAlYDC1KdqBCc="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fonts/truetype + cp -v zilla-slab/ttf/*.ttf $out/share/fonts/truetype/ + + runHook postInstall + ''; meta = with lib; { homepage = "https://github.com/mozilla/zilla-slab"; @@ -26,10 +36,4 @@ in (fetchzip { maintainers = with maintainers; [ caugner ]; platforms = platforms.all; }; -}).overrideAttrs (_: { - postFetch = '' - unzip $downloadedFile - mkdir -p $out/share/fonts/truetype - cp -v zilla-slab/ttf/*.ttf $out/share/fonts/truetype/ - ''; -}) +} diff --git a/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix b/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix index b27b96cb5e..06c8becd64 100644 --- a/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix @@ -3,47 +3,37 @@ , fetchFromGitHub , fetchurl , clickgen -, unzip +, attrs }: stdenvNoCC.mkDerivation rec { pname = "bibata-cursors"; - version = "1.1.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "ful1e5"; repo = "Bibata_Cursor"; rev = "v${version}"; - sha256 = "1q2wdbrmdnr9mwiilm5cc9im3zwbl7yaj1zpy5wwn44ypq3hcngy"; + sha256 = "zCk7qgPeae0BfzhxxU2Dk1SOWJQOxiWyJuzH/ri+Gq4="; }; - bitmaps = fetchurl { - url = "https://github.com/ful1e5/Bibata_Cursor/releases/download/v${version}/bitmaps.zip"; - sha256 = "1pcn6par0f0syyhzpzmqr3c6b9ri4lprkdd2ncwzdas01p2d9v1i"; - }; - - nativeBuildInputs = [ unzip ]; - - buildInputs = [ clickgen ]; + buildInputs = [ clickgen attrs ]; buildPhase = '' - mkdir bitmaps - unzip $bitmaps -d bitmaps - rm -rf themes - cd builder && make build_unix + ctgen build.toml -p x11 -d 'bitmaps/Bibata-Modern-Amber' -n 'Bibata-Modern-Amber' -c 'Yellowish and rounded edge bibata cursors.' + ctgen build.toml -p x11 -d 'bitmaps/Bibata-Modern-Classic' -n 'Bibata-Modern-Classic' -c 'Black and rounded edge Bibata cursors.' + ctgen build.toml -p x11 -d 'bitmaps/Bibata-Modern-Ice' -n 'Bibata-Modern-Ice' -c 'White and rounded edge Bibata cursors.' + + ctgen build.toml -p x11 -d 'bitmaps/Bibata-Original-Amber' -n 'Bibata-Original-Amber' -c 'Yellowish and sharp edge Bibata cursors.' + ctgen build.toml -p x11 -d 'bitmaps/Bibata-Original-Classic' -n 'Bibata-Original-Classic' -c 'Black and sharp edge Bibata cursors.' + ctgen build.toml -p x11 -d 'bitmaps/Bibata-Original-Ice' -n 'Bibata-Original-Ice' -c 'White and sharp edge Bibata cursors.' ''; installPhase = '' install -dm 0755 $out/share/icons - cd ../ cp -rf themes/* $out/share/icons/ ''; - postPatch = '' - substituteInPlace "builder/Makefile" \ - --replace "/bin/bash" "bash" - ''; - meta = with lib; { description = "Material Based Cursor Theme"; homepage = "https://github.com/ful1e5/Bibata_Cursor"; diff --git a/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix b/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix index 15a746eabf..ed9a70a6d3 100644 --- a/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix +++ b/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix @@ -50,5 +50,7 @@ stdenvNoCC.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ dtzWill AdsonCicilioti ]; + # unmaintained as of Nov 9, 2022. unable to be build with clickgen version 2.x + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/data/icons/nordzy-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/nordzy-icon-theme/default.nix index 74e3ac8725..bc9d20342e 100644 --- a/third_party/nixpkgs/pkgs/data/icons/nordzy-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/nordzy-icon-theme/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "nordzy-icon-theme"; - version = "1.7.6"; + version = "1.8.1"; src = fetchFromGitHub { owner = "alvatip"; repo = "Nordzy-icon"; rev = version; - sha256 = "sha256-VKcbQ6DeQ0zGOPJgfmZMNsHjsMwoCk7jUT2Oc8xuwGc="; + sha256 = "sha256-JfVcznGoL/HmNbjZk6RUUp/RZIXYIAoOMA3HBpqlUcE="; }; # In the post patch phase we should first make sure to patch shebangs. diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index 529f8aec9e..f966f22b82 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.01.12"; + version = "23.01.29"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-WqCQxZcr19tKcEwULoW9O3rhq3fFs4xRl37p7VJYodY="; + sha256 = "sha256-VmVzU8ACBE4Rx0uVScdQVbygDLE9MmD7ssD1j4ri74g="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index 2337a97517..b7074b8142 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "23.01.12"; + version = "23.01.29"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-DqinupNkjAzjiLkuPCw9IaKRCHtwGnvUQbPNLUeqtRs="; + sha256 = "sha256-uHy1HXCRlPQh9t9bsvClTmP4FW/sP91hYKUXxtdBmdw="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/rose-pine/default.nix b/third_party/nixpkgs/pkgs/data/icons/rose-pine/default.nix new file mode 100644 index 0000000000..051294c5d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/icons/rose-pine/default.nix @@ -0,0 +1,47 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, gtk3 +}: + +stdenvNoCC.mkDerivation rec { + pname = "rose-pine-icon-theme"; + version = "unstable-2022-09-01"; + + src = fetchFromGitHub { + owner = "rose-pine"; + repo = "gtk"; + rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; + sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + # avoid the makefile which is only for the theme maintainers + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + mv icons/rose-pine-icons $out/share/icons/rose-pine + mv icons/rose-pine-dawn-icons $out/share/icons/rose-pine-dawn + mv icons/rose-pine-moon-icons $out/share/icons/rose-pine-moon + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall + ''; + + meta = with lib; { + description = "Rosé Pine icon theme for GTK"; + homepage = "https://github.com/rose-pine/gtk"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [romildo the-argus]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix index cb55697fa5..eee3a425b7 100644 --- a/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-11-06"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "ybp+r0Ru2lJg1WipFHIowvRO5XjppI0cUxKc6kPn0lM="; + sha256 = "J3opK+5xGmV81ubA60BZw9+9IifylrRYo+5cRLWd6Xs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix b/third_party/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix index 0d3f273d5b..22b66b1c65 100644 --- a/third_party/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix @@ -25,18 +25,30 @@ stdenvNoCC.mkDerivation rec { dontDropIconThemeCache = true; buildPhase = '' - cd DMZ-White/pngs; ./make.sh; cd - - cd DMZ-Black/pngs; ./make.sh; cd - + runHook preBuild + + for theme in DMZ-{White,Black}; do + pushd $theme/pngs + ./make.sh + popd + done + + runHook postBuild ''; installPhase = '' - install -d $out/share/icons/Vanilla-DMZ/cursors - cp -a DMZ-White/xcursors/* $out/share/icons/Vanilla-DMZ/cursors - install -Dm644 DMZ-White/index.theme $out/share/icons/Vanilla-DMZ/index.theme + runHook preInstall - install -d $out/share/icons/Vanilla-DMZ-AA/cursors - cp -a DMZ-Black/xcursors/* $out/share/icons/Vanilla-DMZ-AA/cursors - install -Dm644 DMZ-Black/index.theme $out/share/icons/Vanilla-DMZ-AA/index.theme + for theme in DMZ-{White,Black}; do + mkdir -p $out/share/icons/$theme/cursors + cp -a $theme/xcursors/* $out/share/icons/$theme/cursors/ + install -m644 $theme/index.theme $out/share/icons/$theme/index.theme + done + + ln -s $out/share/icons/{DMZ-White,Vanilla-DMZ} + ln -s $out/share/icons/{DMZ-Black,Vanilla-DMZ-AA} + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/icons/vimix-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/vimix-icon-theme/default.nix index 7ef0abb85c..d402c6d5ff 100644 --- a/third_party/nixpkgs/pkgs/data/icons/vimix-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/vimix-icon-theme/default.nix @@ -1,6 +1,7 @@ { lib , stdenvNoCC , fetchFromGitHub +, gitUpdater , gtk3 , hicolor-icon-theme , jdupes @@ -11,22 +12,27 @@ let pname = "vimix-icon-theme"; in -lib.checkListOfEnum "${pname}: color variants" [ "standard" "Amethyst" "Beryl" "Doder" "Ruby" "Black" "White" ] colorVariants +lib.checkListOfEnum "${pname}: color variants" [ "standard" "Amethyst" "Beryl" "Doder" "Ruby" "Jade" "Black" "White" ] colorVariants stdenvNoCC.mkDerivation rec { inherit pname; - version = "2021-11-09"; + version = "2023-01-18"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1ali128027yw5kllip7p32c92pby5gaqs0i393m3bp69547np1d4"; + sha256 = "5EgTWF6qu12VYVi7w5BOp7IleN4IevLZR0hH9x/qbGo="; }; - nativeBuildInputs = [ gtk3 jdupes ]; + nativeBuildInputs = [ + gtk3 + jdupes + ]; - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; dontDropIconThemeCache = true; @@ -34,21 +40,25 @@ stdenvNoCC.mkDerivation rec { dontPatchELF = true; dontRewriteSymlinks = true; + postPatch = '' + patchShebangs install.sh + ''; + installPhase = '' runHook preInstall - patchShebangs install.sh - ./install.sh \ ${if colorVariants != [] then builtins.toString colorVariants else "-a"} \ -d $out/share/icons # replace duplicate files with symlinks - jdupes -L -r $out/share/icons + jdupes --quiet --link-soft --recurse $out/share runHook postInstall ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "A Material Design icon theme based on Paper icon theme"; homepage = "https://github.com/vinceliuice/vimix-icon-theme"; diff --git a/third_party/nixpkgs/pkgs/data/misc/colemak-dh/default.nix b/third_party/nixpkgs/pkgs/data/misc/colemak-dh/default.nix index 261a7741f1..0ce188bdc9 100644 --- a/third_party/nixpkgs/pkgs/data/misc/colemak-dh/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/colemak-dh/default.nix @@ -9,14 +9,12 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "ColemakMods"; - repo = "mod-dh"; + repo = "mod-dh"; rev = "e846a5bd24d59ed15ba70b3a9d5363a38ca51d09"; - sha256 = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks="; + sha256 = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks="; sparseCheckout = [ "console" ]; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix index 3d91a4e7e7..c351778eb1 100644 --- a/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix @@ -1,31 +1,21 @@ { lib, stdenv -, autoconf -, automake -, libtool +, autoreconfHook , intltool , fetchFromGitHub }: stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20220903"; + version = "20230124"; src = fetchFromGitHub { owner = "ddccontrol"; - repo = "ddccontrol-db"; + repo = pname; rev = version; - sha256 = "sha256-OmroJ2AEQdELE2Wuk1qPXzp+/9RUUULrEAdEpmXrJxw="; + sha256 = "sha256-coKdlV2DCZ0S3hg9bQEfE9/FaUbFX5w6IMj/kAqERic="; }; - preConfigure = '' - ./autogen.sh - ''; - - nativeBuildInputs = [ autoconf automake intltool ]; - buildInputs = - [ - libtool - ]; + nativeBuildInputs = [ autoreconfHook intltool ]; meta = with lib; { description = "Monitor database for DDCcontrol"; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index 9e14413b74..3cb903245f 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "39a6ef760cb2f514e170dc40e7ec1f7699722e7d", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/39a6ef760cb2f514e170dc40e7ec1f7699722e7d.tar.gz", - "sha256": "1s9w4g4dar9blr3vvy9pf18qxcgyvrrdnc65jrkx75gr9dr3247w", - "msg": "Update from Hackage at 2023-01-08T15:35:40Z" + "commit": "75d1bbbd68d9ae36d527666e2f140343323b02fa", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/75d1bbbd68d9ae36d527666e2f140343323b02fa.tar.gz", + "sha256": "018lz90f12bw8n8g4rbwfbnpmw6g3vblc12pd4qzq727h1d27p5l", + "msg": "Update from Hackage at 2023-01-12T12:18:29Z" } diff --git a/third_party/nixpkgs/pkgs/data/misc/shared-desktop-ontologies/default.nix b/third_party/nixpkgs/pkgs/data/misc/shared-desktop-ontologies/default.nix index fd797d8d63..fdbd2991cd 100644 --- a/third_party/nixpkgs/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - homepage = "http://oscaf.sourceforge.net/"; + homepage = "https://oscaf.sourceforge.net/"; description = "Ontologies necessary for the Nepomuk semantic desktop"; longDescription = '' The shared-desktop-ontologies package brings the semantic web to the diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix b/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix index 7ce9973c3b..5f33ff70c1 100644 --- a/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202301120046"; + version = "202301260045"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "c308361f47373772d1a3b9d486cd7dded7165d8e"; - sha256 = "sha256-GhCEsMDeMapWpJckMWS+3azuNjMdiN4cjDyq8aSJINA="; + rev = "dda29e7611d13ff6f580cf389a7b84194363f75c"; + sha256 = "sha256-9X9Oh4WFFpuRG1jQyQHTqNOCcW5f+uNOjH1iv1i6Je0="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/third_party/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index f05788076a..9a81fbb6e1 100644 --- a/third_party/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/third_party/nixpkgs/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; # */ meta = { - homepage = "http://www.w3.org/TR/xhtml1/"; + homepage = "https://www.w3.org/TR/xhtml1/"; description = "DTDs for XHTML 1.0, the Extensible HyperText Markup Language"; platforms = lib.platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/data/themes/rose-pine-gtk/default.nix b/third_party/nixpkgs/pkgs/data/themes/rose-pine-gtk/default.nix index d139876e14..4211864139 100644 --- a/third_party/nixpkgs/pkgs/data/themes/rose-pine-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/rose-pine-gtk/default.nix @@ -1,20 +1,20 @@ -{ stdenv -, fetchFromGitHub +{ stdenvNoCC , lib +, fetchFromGitHub , gnome-themes-extra , gtk-engine-murrine , gtk_engines }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "rose-pine-gtk-theme"; - version = "unstable-2021-02-22"; + version = "unstable-2022-09-01"; src = fetchFromGitHub { owner = "rose-pine"; repo = "gtk"; - rev = "9cd2dd449f911973ec549231a57a070d256da9fd"; - sha256 = "0lqx8dmv754ix3xbg7h440x964n0bg4lb06vbzvsydnbx79h7lvy"; + rev = "7a4c40989fd42fd8d4a797f460c79fc4a085c304"; + sha256 = "0q74wjyrsjyym770i3sqs071bvanwmm727xzv50wk6kzvpyqgi67"; }; buildInputs = [ @@ -26,11 +26,18 @@ stdenv.mkDerivation rec { gtk-engine-murrine # murrine engine for Gtk2 ]; + # avoid the makefile which is only for theme maintainers + dontBuild = true; + installPhase = '' runHook preInstall + mkdir -p $out/share/themes - cp -a Rose-Pine $out/share/themes - rm $out/share/themes/*/LICENSE + mv gtk3/rose-pine-gtk $out/share/themes/rose-pine + mv gtk3/rose-pine-moon-gtk $out/share/themes/rose-pine-moon + mv gtk3/rose-pine-dawn-gtk $out/share/themes/rose-pine-dawn + mv gnome_shell/moon/gnome-shell $out/share/themes/rose-pine-moon + runHook postInstall ''; @@ -39,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rose-pine/gtk"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; + maintainers = with maintainers; [romildo the-argus]; }; } diff --git a/third_party/nixpkgs/pkgs/data/themes/vimix/default.nix b/third_party/nixpkgs/pkgs/data/themes/vimix/default.nix index 85dc0788bf..f9dbf73b3a 100644 --- a/third_party/nixpkgs/pkgs/data/themes/vimix/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/vimix/default.nix @@ -17,20 +17,20 @@ let pname = "vimix-gtk-themes"; in -lib.checkListOfEnum "${pname}: theme variants" [ "doder" "beryl" "ruby" "amethyst" "grey" ] themeVariants +lib.checkListOfEnum "${pname}: theme variants" [ "doder" "beryl" "ruby" "amethyst" "jade" "grey" "all" ] themeVariants lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants -lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants +lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" "all" ] sizeVariants lib.checkListOfEnum "${pname}: tweaks" [ "flat" "grey" "mix" "translucent" ] tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2022-10-30"; + version = "2023-01-25"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "QGKh2Md25VNVqy58w/LBzNnEM+g4gBMUjj0W0IuVZ1U="; + sha256 = "4IJMLSUsZvtPfuMS+NYkKo8K3laec2YJk20d5tL0vKI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 158e72587a..ef3013f2e4 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -7,7 +7,7 @@ , cinnamon-session , cinnamon-translations , cjs -, clutter +, evolution-data-server , fetchFromGitHub , gdk-pixbuf , gettext @@ -23,6 +23,7 @@ , libstartup_notification , libXtst , libXdamage +, mesa , muffin , networkmanager , pkg-config @@ -52,6 +53,23 @@ , perl }: +let + pythonEnv = python3.withPackages (pp: with pp; [ + dbus-python + setproctitle + pygobject3 + pycairo + pp.xapp # don't omit `pp.`, see #213561 + pillow + pyinotify # for looking-glass + pytz + tinycss2 + python-pam + pexpect + distro + requests + ]); +in stdenv.mkDerivation rec { pname = "cinnamon-common"; version = "5.6.7"; @@ -69,28 +87,14 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - (python3.withPackages (pp: with pp; [ - dbus-python - setproctitle - pygobject3 - pycairo - python3.pkgs.xapp # The scope prefix is required - pillow - pytz - tinycss2 - python-pam - pexpect - distro - requests - ])) atk cacert cinnamon-control-center cinnamon-desktop cinnamon-menus cjs - clutter dbus + evolution-data-server # for calendar-server gdk-pixbuf glib gsound @@ -100,9 +104,11 @@ stdenv.mkDerivation rec { libstartup_notification libXtst libXdamage + mesa muffin networkmanager polkit + pythonEnv libxml2 libgnomekbd gst_all_1.gstreamer @@ -151,9 +157,9 @@ stdenv.mkDerivation rec { sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py - sed "s|/usr/share/%s|/run/current-system/sw/share/%s|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py + sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py - sed "s|\"upload-system-info\"|\"${xapp}/bin/upload-system-info\"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|/usr/share/%s|/run/current-system/sw/share/%s|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_themes.py sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g" \ -i ./files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js -i ./files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix index 8398df6b7c..7bdfb469c3 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "warpinator"; - version = "1.4.3"; + version = "1.4.4"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-blsDOAdfu0N6I+6ZvycL+BIIsZPIjwYm+sJnbZtHJE8="; + hash = "sha256-oHJOwdCvHnPalTHb5E3mNDYBaR9ZvlV1F6ux7nejBlc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-calculator/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-calculator/default.nix new file mode 100644 index 0000000000..e565eabe18 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-calculator/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, cmake +, qtbase +, qttools +, pkg-config +, wrapQtAppsHook +, gtest +}: + +stdenv.mkDerivation rec { + pname = "deepin-calculator"; + version = "5.8.23"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-MczQWYIQfpSkyA3144y3zly66N0vgcVvTYR6B7Hq1aw="; + }; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + dtkwidget + dde-qt-dbus-factory + gtest + ]; + + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + "--prefix QT_QPA_PLATFORM_PLUGIN_PATH : ${qt5platform-plugins}/${qtbase.qtPluginPrefix}" + ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + meta = with lib; { + description = "An easy to use calculator for ordinary users"; + homepage = "https://github.com/linuxdeepin/deepin-calculator"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix new file mode 100644 index 0000000000..657b69e6d9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, qt5integration +, qt5platform-plugins +, dde-qt-dbus-factory +, cmake +, qtbase +, qttools +, qtx11extras +, pkg-config +, wrapQtAppsHook +, at-spi2-core +, libsecret +, chrpath +, lxqt +, gtest +}: + +stdenv.mkDerivation rec { + pname = "deepin-terminal"; + version = "5.4.34"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-CpI7dyQwrYOYzqVZ6aa+/OAUC3xRyY4ZwzH1mqURTfY="; + }; + + patches = [ + (fetchpatch { + name = "chore: use GNUInstallDirs in CmakeLists"; + url = "https://github.com/linuxdeepin/deepin-terminal/commit/b18a2ca8411f09f5573aa2a8403a484b693ec975.patch"; + sha256 = "sha256-Qy8Jg+7BfZr8tQEsCAzhMEwf6rU96gkgup5f9bMMELY="; + }) + ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + lxqt.lxqt-build-tools + ]; + + buildInputs = [ + dtkwidget + qt5platform-plugins + dde-qt-dbus-factory + qtx11extras + at-spi2-core + libsecret + chrpath + gtest + ]; + + strictDeps = true; + + # qt5integration must be placed before qtsvg in QT_PLUGIN_PATH + qtWrapperArgs = [ + "--prefix QT_PLUGIN_PATH : ${qt5integration}/${qtbase.qtPluginPrefix}" + ]; + + meta = with lib; { + description = "Terminal emulator with workspace, multiple windows, remote management, quake mode and other features"; + homepage = "https://github.com/linuxdeepin/deepin-terminal"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix new file mode 100644 index 0000000000..91438a043c --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/artwork/dde-account-faces/default.nix @@ -0,0 +1,26 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "dde-account-faces"; + version = "1.0.12.1"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-NWjR8qxWi2IrcP0cSF+lLxBJ/GrVpk1BfTjVH0ytinY="; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}/var" ]; + + meta = with lib; { + description = "Account faces of deepin desktop environment"; + homepage = "https://github.com/linuxdeepin/dde-account-faces"; + license = with licenses; [ gpl3Plus cc0 ]; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix new file mode 100644 index 0000000000..3864989196 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-gtk-theme/default.nix @@ -0,0 +1,31 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, gtk-engine-murrine +}: + +stdenvNoCC.mkDerivation rec { + pname = "deepin-gtk-theme"; + version = "unstable-2022-07-26"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "deepin-gtk-theme"; + rev = "5ac53cbdfba4e6804451605db726876a3be9fb07"; + sha256 = "sha256-NJ5URKYs4rVzddXxkwJK9ih40f8McVEbj3G1tPFAiMs"; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + description = "Deepin GTK Theme"; + homepage = "https://github.com/linuxdeepin/deepin-gtk-theme"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix new file mode 100644 index 0000000000..0cda82fdfc --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix @@ -0,0 +1,46 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, gtk3 +, xcursorgen +, papirus-icon-theme +}: + +stdenvNoCC.mkDerivation rec { + pname = "deepin-icon-theme"; + version = "2021.11.24"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-UC3PbqolcCbVrIEDqMovfJ4oeofMUGJag1A6u7X3Ml8="; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + nativeBuildInputs = [ + gtk3 + xcursorgen + ]; + + propagatedBuildInputs = [ + papirus-icon-theme + ]; + + dontDropIconThemeCache = true; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with lib; { + description = "Deepin Icon Theme provides the base icon themes on Deepin"; + homepage = "https://github.com/linuxdeepin/deepin-icon-theme"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix new file mode 100644 index 0000000000..f311339b6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-sound-theme/default.nix @@ -0,0 +1,26 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "deepin-sound-theme"; + version = "15.10.6"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-BvG/ygZfM6sDuDSzAqwCzDXGT/bbA6Srlpg3br117OU="; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + description = "The freedesktop sound theme for Deepin"; + homepage = "https://github.com/linuxdeepin/deepin-sound-theme"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix new file mode 100644 index 0000000000..69f6afff8e --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/default.nix @@ -0,0 +1,34 @@ +{ lib, pkgs, libsForQt5 }: +let + packages = self: + let + inherit (self) callPackage; + in { + #### LIBRARIES + dtkcommon = callPackage ./library/dtkcommon { }; + dtkcore = callPackage ./library/dtkcore { }; + dtkgui = callPackage ./library/dtkgui { }; + dtkwidget = callPackage ./library/dtkwidget { }; + qt5platform-plugins = callPackage ./library/qt5platform-plugins { }; + qt5integration = callPackage ./library/qt5integration { }; + deepin-wayland-protocols = callPackage ./library/deepin-wayland-protocols { }; + dwayland = callPackage ./library/dwayland { }; + dde-qt-dbus-factory = callPackage ./library/dde-qt-dbus-factory { }; + disomaster = callPackage ./library/disomaster { }; + docparser = callPackage ./library/docparser { }; + gio-qt = callPackage ./library/gio-qt { }; + image-editor = callPackage ./library/image-editor { }; + udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; + + #### Dtk Application + deepin-calculator = callPackage ./apps/deepin-calculator { }; + deepin-terminal = callPackage ./apps/deepin-terminal { }; + + #### ARTWORK + dde-account-faces = callPackage ./artwork/dde-account-faces { }; + deepin-icon-theme = callPackage ./artwork/deepin-icon-theme { }; + deepin-gtk-theme = callPackage ./artwork/deepin-gtk-theme { }; + deepin-sound-theme = callPackage ./artwork/deepin-sound-theme { }; + }; +in +lib.makeScope libsForQt5.newScope packages diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix new file mode 100644 index 0000000000..ef302c5b72 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dde-qt-dbus-factory/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, qtbase +, wrapQtAppsHook +, python3 +, dtkcore +}: + +stdenv.mkDerivation rec { + pname = "dde-qt-dbus-factory"; + version = "5.5.22"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-jqk04S+i3py3rVJcHmkPKHsU+eNEN1yoUBBlfXBbcwM="; + }; + + nativeBuildInputs = [ + qmake + wrapQtAppsHook + python3 + ]; + + buildInputs = [ + qtbase + dtkcore + ]; + + qmakeFlags = [ + "INSTALL_ROOT=${placeholder "out"}" + "LIB_INSTALL_DIR=${placeholder "out"}/lib" + ]; + + postPatch = '' + substituteInPlace libdframeworkdbus/libdframeworkdbus.pro \ + --replace "/usr" "" + + substituteInPlace libdframeworkdbus/DFrameworkdbusConfig.in \ + --replace "/usr/include" "$out/include" + ''; + + meta = with lib; { + description = "Repo of auto-generated D-Bus source code which DDE used"; + homepage = "https://github.com/linuxdeepin/dde-qt-dbus-factory"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix new file mode 100644 index 0000000000..ad3dce815c --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/deepin-wayland-protocols/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, extra-cmake-modules +}: + +stdenv.mkDerivation rec { + pname = "deepin-wayland-protocols"; + version = "1.6.0-deepin.1.2"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-8Im3CueC8sYA5mwRU/Z7z8HA4mPQvVSqcTD813QCYxo="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + meta = with lib; { + description = "XML files of the non-standard wayland protocols use in deepin"; + homepage = "https://github.com/linuxdeepin/deepin-wayland-protocols"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/disomaster/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/disomaster/default.nix new file mode 100644 index 0000000000..3f65505e0a --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/disomaster/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, qmake +, qttools +, wrapQtAppsHook +, libisoburn +}: + +stdenv.mkDerivation rec { + pname = "disomaster"; + version = "5.0.8"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-wN8mhddqqzYXkT6rRWsHVCWzaG2uRcF2iiFHlZx2LfY="; + }; + + nativeBuildInputs = [ + qmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ libisoburn ]; + + qmakeFlags = [ "VERSION=${version}" ]; + + meta = with lib; { + description = "A libisoburn wrapper class for Qt"; + homepage = "https://github.com/linuxdeepin/disomaster"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/docparser/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/docparser/default.nix new file mode 100644 index 0000000000..8605a0d214 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/docparser/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, qmake +, qttools +, wrapQtAppsHook +, poppler +}: + +stdenv.mkDerivation rec { + pname = "docparser"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-iWRWSu8fALTTLLWdQGbpunN/1tpvKxuN/ZWJg34x0mU="; + }; + + nativeBuildInputs = [ + qmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ poppler ]; + + qmakeFlags = [ "VERSION=${version}" ]; + + meta = with lib; { + description = "A document parser library ported from document2html"; + homepage = "https://github.com/linuxdeepin/docparser"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkcommon/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkcommon/default.nix new file mode 100644 index 0000000000..24e22e99c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkcommon/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, cmake +, qtbase +, qttools +, wrapQtAppsHook +, glib +}: + +stdenv.mkDerivation rec { + pname = "dtkcommon"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-9gFJ0Uun0q/XVaegxTUu4Kkc+/GE09eAV68VZgWurrM="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + qttools + wrapQtAppsHook + ]; + + buildInputs = [ qtbase ]; + + qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + + preFixup = '' + glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"} + ''; + + meta = with lib; { + description = "A public project for building DTK Library"; + homepage = "https://github.com/linuxdeepin/dtkcommon"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkcore/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkcore/default.nix new file mode 100644 index 0000000000..282d079570 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkcore/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, cmake +, gsettings-qt +, wrapQtAppsHook +, lshw +, dtkcommon +}: + +stdenv.mkDerivation rec { + pname = "dtkcore"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-DEpo/eKMjtTVGEkq5JofkRNSHtTOZ1t2QNjrdulUtPQ="; + }; + + postPatch = '' + substituteInPlace src/dsysinfo.cpp \ + --replace "/usr/share/deepin/distribution.info" "/etc/distribution.info" \ + ''; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + gsettings-qt + lshw + ]; + + propagatedBuildInputs = [ dtkcommon ]; + + cmakeFlags = [ + "-DDVERSION=${version}" + "-DBUILD_DOCS=OFF" + "-DDSG_PREFIX_PATH='/run/current-system/sw'" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + ]; + + meta = with lib; { + description = "Deepin tool kit core library"; + homepage = "https://github.com/linuxdeepin/dtkcore"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkgui/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkgui/default.nix new file mode 100644 index 0000000000..0cc4076828 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -0,0 +1,57 @@ +{ stdenv +, lib +, fetchFromGitHub +, pkg-config +, cmake +, qttools +, wrapQtAppsHook +, librsvg +, lxqt +, dtkcore +, qtimageformats +, freeimage +}: + +stdenv.mkDerivation rec { + pname = "dtkgui"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-r6ZwGPiK6CcKEg8RoHV07wJbQI3idJFV3WFtuKim8n4="; + }; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + lxqt.libqtxdg + ]; + + propagatedBuildInputs = [ + dtkcore + librsvg + qtimageformats + freeimage + ]; + + cmakeFlags = [ + "-DDVERSION=${version}" + "-DBUILD_DOCS=OFF" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + ]; + + meta = with lib; { + description = "Deepin Toolkit, gui module for DDE look and feel"; + homepage = "https://github.com/linuxdeepin/dtkgui"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkwidget/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkwidget/default.nix new file mode 100644 index 0000000000..170ae821eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dtkwidget/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkgui +, pkg-config +, cmake +, qttools +, qtmultimedia +, qtsvg +, qtx11extras +, wrapQtAppsHook +, cups +, gsettings-qt +, libstartup_notification +, xorg +}: + +stdenv.mkDerivation rec { + pname = "dtkwidget"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-APk2p8pdLsaKvPp95HtEI1F1LM4ySUL+fhGsC5vHasU="; + }; + + postPatch = '' + substituteInPlace src/widgets/dapplication.cpp \ + --replace "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \ + "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";" + ''; + + nativeBuildInputs = [ + cmake + qttools + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtmultimedia + qtsvg + qtx11extras + cups + gsettings-qt + libstartup_notification + xorg.libXdmcp + ]; + + propagatedBuildInputs = [ dtkgui ]; + + cmakeFlags = [ + "-DDVERSION=${version}" + "-DBUILD_DOCS=OFF" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + ]; + + meta = with lib; { + description = "Deepin graphical user interface library"; + homepage = "https://github.com/linuxdeepin/dtkwidget"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/dwayland/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/dwayland/default.nix new file mode 100644 index 0000000000..a1797344a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/dwayland/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, qtbase +, qtwayland +, wayland +, wayland-protocols +, extra-cmake-modules +, deepin-wayland-protocols +, qttools +}: + +stdenv.mkDerivation rec { + pname = "dwayland"; + version = "5.24.3-deepin.1.4"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-/aWS4uvhxi9azxJWjRE+Bw+veURFO+mC8l9yypseclU="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + qttools + ]; + + buildInputs = [ + qtbase + qtwayland + wayland + wayland-protocols + deepin-wayland-protocols + ]; + + dontWrapQtApps = true; + + meta = with lib; { + description = "Qt-style API to interact with the wayland-client and wayland-server"; + homepage = "https://github.com/linuxdeepin/dwayland"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/gio-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/gio-qt/default.nix new file mode 100644 index 0000000000..5c27afe7e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/gio-qt/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, wrapQtAppsHook +, glibmm +, doxygen +, qttools +, qtbase +, buildDocs ? true +}: + +stdenv.mkDerivation rec { + pname = "gio-qt"; + version = "0.0.11"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-dlY1CTlXywgGZUonBBe3cDwx8h2xXrPY6Ft/D59nlug="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ] ++ lib.optional buildDocs [ doxygen qttools.dev ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DPROJECT_VERSION=${version}" + ] ++ lib.optional (!buildDocs) [ "-DBUILD_DOCS=OFF" ]; + + propagatedBuildInputs = [ glibmm ]; + + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} + ''; + + meta = with lib; { + description = "Gio wrapper for Qt applications"; + homepage = "https://github.com/linuxdeepin/gio-qt"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/image-editor/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/image-editor/default.nix new file mode 100644 index 0000000000..ec5f3568fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/image-editor/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, dtkwidget +, cmake +, qttools +, pkg-config +, wrapQtAppsHook +, opencv +, freeimage +, libmediainfo +, ffmpegthumbnailer +, pcre +}: + +stdenv.mkDerivation rec { + pname = "image-editor"; + version = "1.0.24"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-0p/aicuBfaEyvfZomnz49IJLospWIdl23ZreDe+Bzqc="; + }; + + patches = [ + (fetchpatch { + name = "feat_check_PREFIX_value_before_set"; + url = "https://github.com/linuxdeepin/image-editor/commit/dae86e848cf53ba0ece879d81e8d5335d61a7473.patch"; + sha256 = "sha256-lxmR+nIrMWVyhl1jpA17x2yqJ40h5vnpqKKcjd8j9RY="; + }) + (fetchpatch { + name = "feat_use_FULL_install_path"; + url = "https://github.com/linuxdeepin/image-editor/commit/855ae53a0444ac628aa0fe893932df6263b82e2e.patch"; + sha256 = "sha256-3Dynlwl/l/b6k6hOHjTdoDQ/VGBDfyRz9b8QY8FEsCc="; + }) + ]; + + postPatch = '' + substituteInPlace libimageviewer/service/ffmpegvideothumbnailer.cpp \ + --replace 'libPath("libffmpegthumbnailer.so")' 'QString("${ffmpegthumbnailer.out}/lib/libffmpegthumbnailer.so")' + + substituteInPlace libimageviewer/CMakeLists.txt --replace '/usr' '$out' + substituteInPlace libimagevisualresult/CMakeLists.txt --replace '/usr' '$out' + ''; + + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; + + buildInputs = [ + dtkwidget + opencv + freeimage + libmediainfo + ffmpegthumbnailer + pcre + ]; + + cmakeFlags = [ "-DVERSION=${version}" ]; + + meta = with lib; { + description = "Image editor lib for dtk"; + homepage = "https://github.com/linuxdeepin/image-editor"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5integration/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5integration/default.nix new file mode 100644 index 0000000000..af34c6cfb7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5integration/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchFromGitHub +, dtkwidget +, qmake +, qtbase +, qtsvg +, pkg-config +, wrapQtAppsHook +, qtx11extras +, qt5platform-plugins +, lxqt +, mtdev +, xorg +, gtest +}: + +stdenv.mkDerivation rec { + pname = "qt5integration"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-GXxPoBM4tlWezTfv/f+/IJezzcAsuMbr/OOGaSOpn2g="; + }; + + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + + buildInputs = [ + dtkwidget + qtx11extras + qt5platform-plugins + mtdev + lxqt.libqtxdg + xorg.xcbutilrenderutil + gtest + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/${qtbase.qtPluginPrefix} + cp -r bin/plugins/* $out/${qtbase.qtPluginPrefix}/ + runHook postInstall + ''; + + meta = with lib; { + description = "Qt platform theme integration plugins for DDE"; + homepage = "https://github.com/linuxdeepin/qt5integration"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix new file mode 100644 index 0000000000..6ebe542398 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/qt5platform-plugins/default.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, pkg-config +, qtbase +, qtx11extras +, wrapQtAppsHook +, mtdev +, cairo +, xorg +, waylandSupport ? false +}: + +stdenv.mkDerivation rec { + pname = "qt5platform-plugins"; + version = "5.6.3"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-AySltMI9x5mfquy532h1QfGpfwSfI9+h6BtIHPyNWGk="; + }; + + ## https://github.com/linuxdeepin/qt5platform-plugins/pull/119 + postPatch = '' + rm -r xcb/libqt5xcbqpa-dev/ + mkdir -p xcb/libqt5xcbqpa-dev/${qtbase.version} + cp -r ${qtbase.src}/src/plugins/platforms/xcb/*.h xcb/libqt5xcbqpa-dev/${qtbase.version}/ + ''; + + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + + buildInputs = [ + mtdev + cairo + qtbase + qtx11extras + xorg.libSM + ]; + + qmakeFlags = [ + "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" + ] + ++ lib.optional (!waylandSupport) [ "CONFIG+=DISABLE_WAYLAND" ]; + + meta = with lib; { + description = "Qt platform plugins for DDE"; + homepage = "https://github.com/linuxdeepin/qt5platform-plugins"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/library/udisks2-qt5/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/library/udisks2-qt5/default.nix new file mode 100644 index 0000000000..84321809eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/deepin/library/udisks2-qt5/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, lib +, fetchFromGitHub +, qmake +, pkg-config +, wrapQtAppsHook +, udisks +}: + +stdenv.mkDerivation rec { + pname = "udisks2-qt5"; + version = "5.0.6"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "sha256-WS4fmqEYXi5dkn8RvyJBzy3+r+UgFcGDFFpQlbblLu4="; + }; + + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; + + buildInputs = [ udisks ]; + + qmakeFlags = [ "VERSION=${version}" ]; + + meta = with lib; { + description = "UDisks2 D-Bus interfaces binding for Qt5"; + homepage = "https://github.com/linuxdeepin/udisks2-qt5"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.deepin.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gedit/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gedit/default.nix index d7895df784..3d79656d25 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/gedit/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/gedit/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "43.2"; + version = "44.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; - sha256 = "+VDS01xZS7bI28n1RAytd4jKCoaI4rB4Rvg96aTj/CU="; + sha256 = "O7sbN3XUwnfa9UqqtEsOuDpOsfCfA5GAAEHJ5WiT7BE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix index 154e3db33b..c79d3d731e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/ghex/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { glib ]; - checkInputs = [ + nativeCheckInputs = [ appstream-glib desktop-file-utils ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/empathy/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/empathy/default.nix deleted file mode 100644 index fbfee37cd1..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/empathy/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ lib, stdenv -, intltool -, fetchurl -, webkitgtk -, pkg-config -, gtk3 -, glib -, file -, librsvg -, gnome -, gdk-pixbuf -, python3 -, telepathy-glib -, telepathy-farstream -, clutter-gtk -, clutter-gst -, gst_all_1 -, cogl -, gnome-online-accounts -, gcr -, libsecret -, folks -, libpulseaudio -, telepathy-mission-control -, telepathy-logger -, libnotify -, clutter -, libsoup -, gnutls -, evolution-data-server -, yelp-xsl -, libcanberra-gtk3 -, p11-kit -, farstream -, libtool -, shared-mime-info -, wrapGAppsHook -, itstool -, libxml2 -, libxslt -, icu -, libgee -, gsettings-desktop-schemas -, isocodes -, enchant -, libchamplain -, geoclue2 -, geocode-glib -, cheese -, libgudev -}: - -stdenv.mkDerivation rec { - pname = "empathy"; - version = "3.25.90"; - - src = fetchurl { - url = "mirror://gnome/sources/empathy/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc"; - }; - - propagatedBuildInputs = [ - (folks.override { telepathySupport = true; }) - telepathy-logger - evolution-data-server - telepathy-mission-control - ]; - - nativeBuildInputs = [ - pkg-config - libtool - intltool - itstool - file - wrapGAppsHook - libxml2 - libxslt - yelp-xsl - python3 - ]; - - buildInputs = [ - gtk3 - glib - webkitgtk - icu - gnome-online-accounts - telepathy-glib - clutter-gtk - clutter-gst - cogl - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gcr - libsecret - libpulseaudio - gdk-pixbuf - libnotify - clutter - libsoup - gnutls - libgee - p11-kit - libcanberra-gtk3 - telepathy-farstream - farstream - gnome.adwaita-icon-theme - gsettings-desktop-schemas - librsvg - - # Spell-checking - enchant - isocodes - - # Display maps, location awareness, geocode support - libchamplain - geoclue2 - geocode-glib - - # Cheese webcam support, camera monitoring - cheese - libgudev - ]; - - enableParallelBuilding = true; - - preFixup = '' - gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" - ) - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = "empathy"; - versionPolicy = "none"; - }; - }; - - meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Empathy"; - description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; - maintainers = teams.gnome.members; - license = [ licenses.gpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-keyring/default.nix index 0ef440a78f..877b99748e 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { p11-kit ]; - checkInputs = [ dbus python3 ]; + nativeCheckInputs = [ dbus python3 ]; configureFlags = [ "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 1a79cce084..a853a2457d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -62,9 +62,9 @@ stdenv.mkDerivation rec { libxkbcommon pipewire systemd - ] ++ checkInputs; + ] ++ nativeCheckInputs; - checkInputs = [ + nativeCheckInputs = [ mesa # for gbm libgudev xvfb-run diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix index e7e3e225fa..24c637909a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/totem/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { python3Packages.dbus-python ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/default.nix index fa9b8eef06..ae8bc2bc13 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/default.nix @@ -23,8 +23,6 @@ lib.makeScope pkgs.newScope (self: with self; { dconf-editor = callPackage ./core/dconf-editor { }; - empathy = callPackage ./core/empathy { }; - epiphany = callPackage ./core/epiphany { }; evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests @@ -264,6 +262,7 @@ lib.makeScope pkgs.newScope (self: with self; { }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. + empathy = throw "The ‘gnome.empathy’ package was removed as it is unmaintained and no longer launches due to libsoup3 migration."; # added 2023-01-20 gnome-desktop = throw "The ‘gnome.gnome-desktop’ alias was removed. Please use ‘pkgs.gnome-desktop’ directly."; # converted to throw on 2022-10-26 gnome-todo = pkgs.endeavour; # added 2022-07-30 libgnome-games-support = throw "The ‘gnome.libgnome-games-support’ alias was removed. Please use ‘pkgs.libgnome-games-support’ directly."; # converted to throw on 2022-10-26 diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/collisions.json b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/collisions.json index 61635abcf3..47580d7f53 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/collisions.json +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/collisions.json @@ -118,6 +118,10 @@ "volume-scroller": [ "volume_scroller@trflynn89.pm.me", "volume_scroller@noskoski" + ], + "floating-panel": [ + "floating-panel@aylur", + "floating-panel-usedbymyself@wpism" ] }, "41": { @@ -164,6 +168,10 @@ "volume-scroller": [ "volume_scroller@trflynn89.pm.me", "volume_scroller@noskoski" + ], + "floating-panel": [ + "floating-panel@aylur", + "floating-panel-usedbymyself@wpism" ] }, "42": { @@ -198,6 +206,10 @@ "auto-activities": [ "auto-activities@acedron.github.io", "auto-activities@CleoMenezesJr.github.io" + ], + "floating-panel": [ + "floating-panel@aylur", + "floating-panel-usedbymyself@wpism" ] }, "43": { @@ -212,6 +224,10 @@ "noannoyance": [ "noannoyance@sindex.com", "noannoyance@daase.net" + ], + "floating-panel": [ + "floating-panel@aylur", + "floating-panel-usedbymyself@wpism" ] } } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix index 08f2e7de38..189a84d335 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensionRenames.nix @@ -12,6 +12,10 @@ "workspace-indicator@gnome-shell-extensions.gcampax.github.com" = "workspace-indicator"; "horizontal-workspace-indicator@tty2.io" = "workspace-indicator-2"; + # no source repository can be found for this extension + "floating-panel@aylur" = "floating-panel"; + "floating-panel-usedbymyself@wpism" = null; + # forks of each other, azan@faissal.bensefia.id is more recent "azan@faissal.bensefia.id" = "azan-islamic-prayer-times"; "azan@hatem.masmoudi.org" = null; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json index 1a5613f50a..4fd053d76d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json @@ -17,7 +17,7 @@ , {"uuid": "gnome-shell-trash-extension", "name": "Trash", "pname": "trash", "description": "A Trash button for the GNOME shell panel", "link": "https://extensions.gnome.org/extension/48/trash/", "shell_version_map": {"38": {"version": "22", "sha256": "00sph5bz2q77shsqh6yf9lmb3bp6ryx6crrz0gi7s70i4byji991", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVHJhc2ggYnV0dG9uIGZvciB0aGUgR05PTUUgc2hlbGwgcGFuZWwiLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJUcmFzaCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiQXhlbCB2b24gQmVydG9sZGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iZXJ0b2xkaWEvZ25vbWUtc2hlbGwtdHJhc2gtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC10cmFzaC1leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "00sph5bz2q77shsqh6yf9lmb3bp6ryx6crrz0gi7s70i4byji991", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVHJhc2ggYnV0dG9uIGZvciB0aGUgR05PTUUgc2hlbGwgcGFuZWwiLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJUcmFzaCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiQXhlbCB2b24gQmVydG9sZGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iZXJ0b2xkaWEvZ25vbWUtc2hlbGwtdHJhc2gtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC10cmFzaC1leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "00sph5bz2q77shsqh6yf9lmb3bp6ryx6crrz0gi7s70i4byji991", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVHJhc2ggYnV0dG9uIGZvciB0aGUgR05PTUUgc2hlbGwgcGFuZWwiLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJUcmFzaCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiQXhlbCB2b24gQmVydG9sZGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iZXJ0b2xkaWEvZ25vbWUtc2hlbGwtdHJhc2gtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC10cmFzaC1leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "22", "sha256": "00sph5bz2q77shsqh6yf9lmb3bp6ryx6crrz0gi7s70i4byji991", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVHJhc2ggYnV0dG9uIGZvciB0aGUgR05PTUUgc2hlbGwgcGFuZWwiLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJUcmFzaCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiQXhlbCB2b24gQmVydG9sZGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9iZXJ0b2xkaWEvZ25vbWUtc2hlbGwtdHJhc2gtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC10cmFzaC1leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} , {"uuid": "RecentItems@bananenfisch.net", "name": "Recent Items", "pname": "recent-items", "description": "Adds an icon for recently used items at the top panel; clear list by click; left click: open file, right click: open containing folder; Settings for: number of items, number of items under \"more\" and blacklisting options are defined at the top of extension.js (see https://github.com/bananenfisch/RecentItems for more infos).", "link": "https://extensions.gnome.org/extension/72/recent-items/", "shell_version_map": {"40": {"version": "22", "sha256": "17xgw3iqcznlsfqjfs99bb5s1h7wlg37xjn9rar1hqpl7dsy84nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JhbmFuZW5maXNjaC9SZWNlbnRJdGVtcyIsCiAgInV1aWQiOiAiUmVjZW50SXRlbXNAYmFuYW5lbmZpc2NoLm5ldCIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "22", "sha256": "17xgw3iqcznlsfqjfs99bb5s1h7wlg37xjn9rar1hqpl7dsy84nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JhbmFuZW5maXNjaC9SZWNlbnRJdGVtcyIsCiAgInV1aWQiOiAiUmVjZW50SXRlbXNAYmFuYW5lbmZpc2NoLm5ldCIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "22", "sha256": "17xgw3iqcznlsfqjfs99bb5s1h7wlg37xjn9rar1hqpl7dsy84nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JhbmFuZW5maXNjaC9SZWNlbnRJdGVtcyIsCiAgInV1aWQiOiAiUmVjZW50SXRlbXNAYmFuYW5lbmZpc2NoLm5ldCIsCiAgInZlcnNpb24iOiAyMgp9"}, "43": {"version": "22", "sha256": "17xgw3iqcznlsfqjfs99bb5s1h7wlg37xjn9rar1hqpl7dsy84nk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiBmb3IgcmVjZW50bHkgdXNlZCBpdGVtcyBhdCB0aGUgdG9wIHBhbmVsOyBjbGVhciBsaXN0IGJ5IGNsaWNrOyBsZWZ0IGNsaWNrOiBvcGVuIGZpbGUsIHJpZ2h0IGNsaWNrOiBvcGVuIGNvbnRhaW5pbmcgZm9sZGVyOyBTZXR0aW5ncyBmb3I6IG51bWJlciBvZiBpdGVtcywgbnVtYmVyIG9mIGl0ZW1zIHVuZGVyIFwibW9yZVwiIGFuZCBibGFja2xpc3Rpbmcgb3B0aW9ucyBhcmUgZGVmaW5lZCBhdCB0aGUgdG9wIG9mIGV4dGVuc2lvbi5qcyAoc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9iYW5hbmVuZmlzY2gvUmVjZW50SXRlbXMgZm9yIG1vcmUgaW5mb3MpLiIsCiAgIm5hbWUiOiAiUmVjZW50IEl0ZW1zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JhbmFuZW5maXNjaC9SZWNlbnRJdGVtcyIsCiAgInV1aWQiOiAiUmVjZW50SXRlbXNAYmFuYW5lbmZpc2NoLm5ldCIsCiAgInZlcnNpb24iOiAyMgp9"}}} , {"uuid": "lockscreen@sri.ramkrishna.me", "name": "Lock Screen", "pname": "lock-screen", "description": "Add lock icon to the panel and lock the screen instead of using ctrl-alt-l", "link": "https://extensions.gnome.org/extension/83/lock-screen/", "shell_version_map": {"40": {"version": "14", "sha256": "1dh02rbq7pfvpjpgjq7rlx7lld2qhq602apn1g17hbxbcpdzz004", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsb2NrIGljb24gdG8gdGhlIHBhbmVsIGFuZCBsb2NrIHRoZSBzY3JlZW4gaW5zdGVhZCBvZiB1c2luZyBjdHJsLWFsdC1sIiwKICAibmFtZSI6ICJMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiNDAuMCIsCiAgICAiNDIuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NyYW1rcmlzaG5hL2dub21lMy1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsb2Nrc2NyZWVuQHNyaS5yYW1rcmlzaG5hLm1lIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "1dh02rbq7pfvpjpgjq7rlx7lld2qhq602apn1g17hbxbcpdzz004", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBsb2NrIGljb24gdG8gdGhlIHBhbmVsIGFuZCBsb2NrIHRoZSBzY3JlZW4gaW5zdGVhZCBvZiB1c2luZyBjdHJsLWFsdC1sIiwKICAibmFtZSI6ICJMb2NrIFNjcmVlbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiNDAuMCIsCiAgICAiNDIuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NyYW1rcmlzaG5hL2dub21lMy1leHRlbnNpb25zIiwKICAidXVpZCI6ICJsb2Nrc2NyZWVuQHNyaS5yYW1rcmlzaG5hLm1lIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} -, {"uuid": "CoverflowAltTab@palatis.blogspot.com", "name": "Coverflow Alt-Tab", "pname": "coverflow-alt-tab", "description": "Replacement of Alt-Tab, iterates through windows in a cover-flow manner.", "link": "https://extensions.gnome.org/extension/97/coverflow-alt-tab/", "shell_version_map": {"38": {"version": "44", "sha256": "18qpriqi0h6la45bl584hglnni0ka2d5q4qv61wdcan28a7kywq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNpbm5hbW9uLXZlcnNpb24iOiBbCiAgICAiMS4yIiwKICAgICIxLjQiLAogICAgIjEuNiIsCiAgICAiMS44IiwKICAgICIxLjkiLAogICAgIjIuMCIsCiAgICAiMi4xIiwKICAgICIyLjIiLAogICAgIjIuMyIsCiAgICAiMi40IiwKICAgICIyLjgiLAogICAgIjMuMCIKICBdLAogICJkZXNjcmlwdGlvbiI6ICJSZXBsYWNlbWVudCBvZiBBbHQtVGFiLCBpdGVyYXRlcyB0aHJvdWdoIHdpbmRvd3MgaW4gYSBjb3Zlci1mbG93IG1hbm5lci4iLAogICJuYW1lIjogIkNvdmVyZmxvdyBBbHQtVGFiIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG1vNjAvQ292ZXJmbG93QWx0VGFiIiwKICAidXVpZCI6ICJDb3ZlcmZsb3dBbHRUYWJAcGFsYXRpcy5ibG9nc3BvdC5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "40": {"version": "49", "sha256": "0mmz5qrlx2gjfahpyy6c050wcif3pwwfff7i8wxf7xcmj21nqlwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "41": {"version": "49", "sha256": "0mmz5qrlx2gjfahpyy6c050wcif3pwwfff7i8wxf7xcmj21nqlwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "42": {"version": "55", "sha256": "16ff2fbv8vf9cgzrxy85vis9a5bgbkn1lb21brpxsf9gs5kk4v8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDU1Cn0="}, "43": {"version": "57", "sha256": "0inq9hb87mzq3cv0m403z9n7sx6kflpbny808hy2lhlxfji7dwid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG1vNjAvQ292ZXJmbG93QWx0VGFiIiwKICAidXVpZCI6ICJDb3ZlcmZsb3dBbHRUYWJAcGFsYXRpcy5ibG9nc3BvdC5jb20iLAogICJ2ZXJzaW9uIjogNTcKfQ=="}}} +, {"uuid": "CoverflowAltTab@palatis.blogspot.com", "name": "Coverflow Alt-Tab", "pname": "coverflow-alt-tab", "description": "Replacement of Alt-Tab, iterates through windows in a cover-flow manner.", "link": "https://extensions.gnome.org/extension/97/coverflow-alt-tab/", "shell_version_map": {"38": {"version": "44", "sha256": "18qpriqi0h6la45bl584hglnni0ka2d5q4qv61wdcan28a7kywq4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNpbm5hbW9uLXZlcnNpb24iOiBbCiAgICAiMS4yIiwKICAgICIxLjQiLAogICAgIjEuNiIsCiAgICAiMS44IiwKICAgICIxLjkiLAogICAgIjIuMCIsCiAgICAiMi4xIiwKICAgICIyLjIiLAogICAgIjIuMyIsCiAgICAiMi40IiwKICAgICIyLjgiLAogICAgIjMuMCIKICBdLAogICJkZXNjcmlwdGlvbiI6ICJSZXBsYWNlbWVudCBvZiBBbHQtVGFiLCBpdGVyYXRlcyB0aHJvdWdoIHdpbmRvd3MgaW4gYSBjb3Zlci1mbG93IG1hbm5lci4iLAogICJuYW1lIjogIkNvdmVyZmxvdyBBbHQtVGFiIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG1vNjAvQ292ZXJmbG93QWx0VGFiIiwKICAidXVpZCI6ICJDb3ZlcmZsb3dBbHRUYWJAcGFsYXRpcy5ibG9nc3BvdC5jb20iLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "40": {"version": "49", "sha256": "0mmz5qrlx2gjfahpyy6c050wcif3pwwfff7i8wxf7xcmj21nqlwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "41": {"version": "49", "sha256": "0mmz5qrlx2gjfahpyy6c050wcif3pwwfff7i8wxf7xcmj21nqlwx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDQ5Cn0="}, "42": {"version": "55", "sha256": "16ff2fbv8vf9cgzrxy85vis9a5bgbkn1lb21brpxsf9gs5kk4v8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RtbzYwL0NvdmVyZmxvd0FsdFRhYiIsCiAgInV1aWQiOiAiQ292ZXJmbG93QWx0VGFiQHBhbGF0aXMuYmxvZ3Nwb3QuY29tIiwKICAidmVyc2lvbiI6IDU1Cn0="}, "43": {"version": "58", "sha256": "0n9g1gg9ngqj8b5gpq8vmhl7y9zi0hyl15cvk5ypjhi6fx55q4dg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VtZW50IG9mIEFsdC1UYWIsIGl0ZXJhdGVzIHRocm91Z2ggd2luZG93cyBpbiBhIGNvdmVyLWZsb3cgbWFubmVyLiIsCiAgIm5hbWUiOiAiQ292ZXJmbG93IEFsdC1UYWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZG1vNjAvQ292ZXJmbG93QWx0VGFiIiwKICAidXVpZCI6ICJDb3ZlcmZsb3dBbHRUYWJAcGFsYXRpcy5ibG9nc3BvdC5jb20iLAogICJ2ZXJzaW9uIjogNTgKfQ=="}}} , {"uuid": "netspeed@hedayaty.gmail.com", "name": "NetSpeed", "pname": "netspeed", "description": "Displays Internet Speed", "link": "https://extensions.gnome.org/extension/104/netspeed/", "shell_version_map": {"40": {"version": "34", "sha256": "04137rwnnf2mbp228wl9qjcix6i7757cqsdamabdrjwclg147vql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIEludGVybmV0IFNwZWVkIiwKICAibmFtZSI6ICJOZXRTcGVlZCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoZWRheWF0eUBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlZGF5YXR5L05ldFNwZWVkIiwKICAidXVpZCI6ICJuZXRzcGVlZEBoZWRheWF0eS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "41": {"version": "34", "sha256": "04137rwnnf2mbp228wl9qjcix6i7757cqsdamabdrjwclg147vql", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIEludGVybmV0IFNwZWVkIiwKICAibmFtZSI6ICJOZXRTcGVlZCIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoZWRheWF0eUBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hlZGF5YXR5L05ldFNwZWVkIiwKICAidXVpZCI6ICJuZXRzcGVlZEBoZWRheWF0eS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}}} , {"uuid": "favorites@cvine.org", "name": "Favorites Menu", "pname": "favorites-menu", "description": "Provide panel menu for favorites", "link": "https://extensions.gnome.org/extension/115/favorites-menu/", "shell_version_map": {"40": {"version": "15", "sha256": "02s0p33dcr6wrxivjd47rwb42whqc6qswr3qdvd7p6jym4zddbi2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgcGFuZWwgbWVudSBmb3IgZmF2b3JpdGVzIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgTWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHA6Ly93d3cuY3ZpbmUucGx1cy5jb20vZmF2b3JpdGVzL2luZGV4Lmh0bWwiLAogICJ1dWlkIjogImZhdm9yaXRlc0BjdmluZS5vcmciLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "19", "sha256": "18kqda8kbc43i6qyx2fj5wjpb8b5ijazynbvvqvx7xhfi3a6x6w5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgcGFuZWwgbWVudSBmb3IgZmF2b3JpdGVzIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgTWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cDovL3d3dy5jdmluZS5wbHVzLmNvbS9mYXZvcml0ZXMvaW5kZXguaHRtbCIsCiAgInV1aWQiOiAiZmF2b3JpdGVzQGN2aW5lLm9yZyIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "19", "sha256": "18kqda8kbc43i6qyx2fj5wjpb8b5ijazynbvvqvx7xhfi3a6x6w5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgcGFuZWwgbWVudSBmb3IgZmF2b3JpdGVzIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgTWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cDovL3d3dy5jdmluZS5wbHVzLmNvbS9mYXZvcml0ZXMvaW5kZXguaHRtbCIsCiAgInV1aWQiOiAiZmF2b3JpdGVzQGN2aW5lLm9yZyIsCiAgInZlcnNpb24iOiAxOQp9"}, "43": {"version": "19", "sha256": "18kqda8kbc43i6qyx2fj5wjpb8b5ijazynbvvqvx7xhfi3a6x6w5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgcGFuZWwgbWVudSBmb3IgZmF2b3JpdGVzIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgTWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cDovL3d3dy5jdmluZS5wbHVzLmNvbS9mYXZvcml0ZXMvaW5kZXguaHRtbCIsCiAgInV1aWQiOiAiZmF2b3JpdGVzQGN2aW5lLm9yZyIsCiAgInZlcnNpb24iOiAxOQp9"}}} , {"uuid": "system-monitor@paradoxxx.zero.gmail.com", "name": "system-monitor", "pname": "system-monitor", "description": "Display system information in GNOME Shell status bar, such as memory, CPU, disk and battery usages, network rates…", "link": "https://extensions.gnome.org/extension/120/system-monitor/", "shell_version_map": {"40": {"version": "40", "sha256": "05xmpbwwjzax5y7p7a492k6mmv9rjiyinnrfkzrzm16yncn3mbvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgc3lzdGVtIGluZm9ybWF0aW9uIGluIEdOT01FIFNoZWxsIHN0YXR1cyBiYXIsIHN1Y2ggYXMgbWVtb3J5LCBDUFUsIGRpc2sgYW5kIGJhdHRlcnkgdXNhZ2VzLCBuZXR3b3JrIHJhdGVzXHUyMDI2IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic3lzdGVtLW1vbml0b3IiLAogICJuYW1lIjogInN5c3RlbS1tb25pdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BhcmFkb3h4eHplcm8vZ25vbWUtc2hlbGwtc3lzdGVtLW1vbml0b3ItYXBwbGV0IiwKICAidXVpZCI6ICJzeXN0ZW0tbW9uaXRvckBwYXJhZG94eHguemVyby5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="}}} @@ -51,7 +51,7 @@ , {"uuid": "ShellTile@emasab.it", "name": "ShellTile", "pname": "shelltile", "description": "A tiling window extension for GNOME Shell. Just move a window to the edges of the screen to create a tiling, otherwise move a window over another one, holding down the Control key. Grouped windows minimize, resize, raise and change workspace together. Move or maximize a window to remove it from the group.", "link": "https://extensions.gnome.org/extension/657/shelltile/", "shell_version_map": {"38": {"version": "69", "sha256": "1kpsqaq2fcj1z3jcbvgh23c8k6bv9l6vyl05kpw0fclzsmy60mh1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgdGlsaW5nIHdpbmRvdyBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBKdXN0IG1vdmUgYSB3aW5kb3cgdG8gdGhlIGVkZ2VzIG9mIHRoZSBzY3JlZW4gdG8gY3JlYXRlIGEgdGlsaW5nLCBvdGhlcndpc2UgbW92ZSBhIHdpbmRvdyBvdmVyIGFub3RoZXIgb25lLCBob2xkaW5nIGRvd24gdGhlIENvbnRyb2wga2V5LiBHcm91cGVkIHdpbmRvd3MgbWluaW1pemUsIHJlc2l6ZSwgcmFpc2UgYW5kIGNoYW5nZSB3b3Jrc3BhY2UgdG9nZXRoZXIuIE1vdmUgb3IgbWF4aW1pemUgYSB3aW5kb3cgdG8gcmVtb3ZlIGl0IGZyb20gdGhlIGdyb3VwLiIsCiAgImdldHRleHQtZG9tYWluIjogInNoZWxsdGlsZSIsCiAgIm5hbWUiOiAiU2hlbGxUaWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNoZWxsdGlsZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZW1hc2FiL3NoZWxsdGlsZSIsCiAgInV1aWQiOiAiU2hlbGxUaWxlQGVtYXNhYi5pdCIsCiAgInZlcnNpb24iOiA2OQp9"}}} , {"uuid": "lunarcal@ailin.nemui", "name": "Lunar Calendar 农历", "pname": "lunar-calendar", "description": "Display Chinese Lunar Calendar in panel\n\n⚠⚠⚠ dependency: typelib-1_0-LunarDate-3_0 / gir1.2-lunar-date-2.0", "link": "https://extensions.gnome.org/extension/675/lunar-calendar/", "shell_version_map": {"38": {"version": "25", "sha256": "1pj439wdsqpxim6p4d0y09v40kdjga908hagxfyvq0fzjykc51rn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "40": {"version": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}, "41": {"version": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}, "42": {"version": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}, "43": {"version": "30", "sha256": "0k8740vjail6ld8vgq3ilbkz2kzjfzwaaah8l3dzn5spvfsmgmb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImx1bmFyY2FsQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDMwCn0="}}} , {"uuid": "EasyScreenCast@iacopodeenosee.gmail.com", "name": "EasyScreenCast", "pname": "easyscreencast", "description": "This extension simplifies the use of the video recording function integrated in gnome shell, allows quickly to change the various settings of the desktop recording.\n\nSOURCE CODE -> https://github.com/EasyScreenCast/EasyScreenCast\n\nVIDEO -> https://youtu.be/81E9AruraKU\n\n**NOTICE**\nif an error occurs during the update is recommended to reload GNOME Shell (Alt + F2, 'r') and reload the extension's installation page.", "link": "https://extensions.gnome.org/extension/690/easyscreencast/", "shell_version_map": {"38": {"version": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "40": {"version": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "41": {"version": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "42": {"version": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "43": {"version": "46", "sha256": "1hg4148gi2zpwba8x0vxibz7n4zqm1xn7cpl9mr9cinr9m2ixrl3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FYXN5U2NyZWVuQ2FzdC9FYXN5U2NyZWVuQ2FzdCIsCiAgInV1aWQiOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ2Cn0="}}} -, {"uuid": "scroll-workspaces@gfxmonk.net", "name": "Top Panel Workspace Scroll", "pname": "top-panel-workspace-scroll", "description": "Change workspaces by scrolling over the top panel", "link": "https://extensions.gnome.org/extension/701/top-panel-workspace-scroll/", "shell_version_map": {"40": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "41": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "42": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "43": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}}} +, {"uuid": "scroll-workspaces@gfxmonk.net", "name": "Top Panel Workspace Scroll", "pname": "top-panel-workspace-scroll", "description": "Change workspaces by scrolling over the top panel", "link": "https://extensions.gnome.org/extension/701/top-panel-workspace-scroll/", "shell_version_map": {"40": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "41": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "42": {"version": "32", "sha256": "0lfklqnwjrvd0ndsbaspr58d5grf33pbaghw8pbhgf564mfj5946", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMyCn0="}, "43": {"version": "33", "sha256": "00khagznqp07ac392zjnccw0qnz1v8zy6m7mz1mwflqbgz18ki6p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dmeG1vbmsvZ25vbWUtc2hlbGwtc2Nyb2xsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNjcm9sbC13b3Jrc3BhY2VzQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDMzCn0="}}} , {"uuid": "all-windows@ezix.org", "name": "All Windows", "pname": "all-windows", "description": "List open windows of all workspaces", "link": "https://extensions.gnome.org/extension/704/all-windows/", "shell_version_map": {"40": {"version": "13", "sha256": "19cxrgxpim2dca6llbi8cr34hjx3pab2i4687803r96cp2hsg07l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3Qgb3BlbiB3aW5kb3dzIG9mIGFsbCB3b3Jrc3BhY2VzIiwKICAibmFtZSI6ICJBbGwgV2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlvbmVsL2FsbC13aW5kb3dzIiwKICAidXVpZCI6ICJhbGwtd2luZG93c0Bleml4Lm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "19cxrgxpim2dca6llbi8cr34hjx3pab2i4687803r96cp2hsg07l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3Qgb3BlbiB3aW5kb3dzIG9mIGFsbCB3b3Jrc3BhY2VzIiwKICAibmFtZSI6ICJBbGwgV2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlvbmVsL2FsbC13aW5kb3dzIiwKICAidXVpZCI6ICJhbGwtd2luZG93c0Bleml4Lm9yZyIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "panel-osd@berend.de.schouwer.gmail.com", "name": "Panel OSD", "pname": "panel-osd", "description": "I'm sorry to say, that I am not able to work on this project anymore.\nI simply don't have the power to do it any longer.\nIf anybody wants to take it over, feel free to fork it.\nBest wishes to all the users.\n\nJens\n\nConfiguring where on the (main) screen notifications will appear, instead of just above the message tray", "link": "https://extensions.gnome.org/extension/708/panel-osd/", "shell_version_map": {"38": {"version": "39", "sha256": "12mv6fcaanv6r3zrf7717jqzq5mndy25gqh6y7hqh9cmyssakis2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkknbSBzb3JyeSB0byBzYXksIHRoYXQgSSBhbSBub3QgYWJsZSB0byB3b3JrIG9uIHRoaXMgcHJvamVjdCBhbnltb3JlLlxuSSBzaW1wbHkgZG9uJ3QgaGF2ZSB0aGUgcG93ZXIgdG8gZG8gaXQgYW55IGxvbmdlci5cbklmIGFueWJvZHkgd2FudHMgdG8gdGFrZSBpdCBvdmVyLCBmZWVsIGZyZWUgdG8gZm9yayBpdC5cbkJlc3Qgd2lzaGVzIHRvIGFsbCB0aGUgdXNlcnMuXG5cbkplbnNcblxuQ29uZmlndXJpbmcgd2hlcmUgb24gdGhlIChtYWluKSBzY3JlZW4gbm90aWZpY2F0aW9ucyB3aWxsIGFwcGVhciwgaW5zdGVhZCBvZiBqdXN0IGFib3ZlIHRoZSBtZXNzYWdlIHRyYXkiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBhbmVsIE9TRCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2plbnNsb2R5L2dub21lLXNoZWxsLWV4dGVuc2lvbi1wYW5lbC1vc2QiLAogICJ1dWlkIjogInBhbmVsLW9zZEBiZXJlbmQuZGUuc2Nob3V3ZXIuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM5Cn0="}, "40": {"version": "40", "sha256": "16bqq0w6xrzix74xwhj2pyj22scszvspc770w1pkdhmj54mypwks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkknbSBzb3JyeSB0byBzYXksIHRoYXQgSSBhbSBub3QgYWJsZSB0byB3b3JrIG9uIHRoaXMgcHJvamVjdCBhbnltb3JlLlxuSSBzaW1wbHkgZG9uJ3QgaGF2ZSB0aGUgcG93ZXIgdG8gZG8gaXQgYW55IGxvbmdlci5cbklmIGFueWJvZHkgd2FudHMgdG8gdGFrZSBpdCBvdmVyLCBmZWVsIGZyZWUgdG8gZm9yayBpdC5cbkJlc3Qgd2lzaGVzIHRvIGFsbCB0aGUgdXNlcnMuXG5cbkplbnNcblxuQ29uZmlndXJpbmcgd2hlcmUgb24gdGhlIChtYWluKSBzY3JlZW4gbm90aWZpY2F0aW9ucyB3aWxsIGFwcGVhciwgaW5zdGVhZCBvZiBqdXN0IGFib3ZlIHRoZSBtZXNzYWdlIHRyYXkiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIlBhbmVsIE9TRCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qZW5zbG9keS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGFuZWwtb3NkIiwKICAidXVpZCI6ICJwYW5lbC1vc2RAYmVyZW5kLmRlLnNjaG91d2VyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0MAp9"}}} , {"uuid": "pixel-saver@deadalnix.me", "name": "Pixel Saver", "pname": "pixel-saver", "description": "Pixel Saver is designed to save pixel by fusing activity bar and title bar in a natural way", "link": "https://extensions.gnome.org/extension/723/pixel-saver/", "shell_version_map": {"38": {"version": "28", "sha256": "11bd2ngn359q5858cd1r2v15lcxn7xlgpxr0jjzakj4v4g6zda85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI4Cn0="}, "40": {"version": "28", "sha256": "11bd2ngn359q5858cd1r2v15lcxn7xlgpxr0jjzakj4v4g6zda85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI4Cn0="}, "41": {"version": "28", "sha256": "11bd2ngn359q5858cd1r2v15lcxn7xlgpxr0jjzakj4v4g6zda85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI4Cn0="}, "42": {"version": "28", "sha256": "11bd2ngn359q5858cd1r2v15lcxn7xlgpxr0jjzakj4v4g6zda85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI4Cn0="}, "43": {"version": "28", "sha256": "11bd2ngn359q5858cd1r2v15lcxn7xlgpxr0jjzakj4v4g6zda85", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RlYWRhbG5peC9waXhlbC1zYXZlciIsCiAgInV1aWQiOiAicGl4ZWwtc2F2ZXJAZGVhZGFsbml4Lm1lIiwKICAidmVyc2lvbiI6IDI4Cn0="}}} @@ -91,13 +91,13 @@ , {"uuid": "workspace_scroll@squgeim.com.np", "name": "Workspace Scroll", "pname": "workspace-scroll", "description": "Just scroll anywhere in the top panel to change the workspace.", "link": "https://extensions.gnome.org/extension/943/workspace-scroll/", "shell_version_map": {"40": {"version": "6", "sha256": "0pglhzy81zh9wwcmh1ynygkghq64s948k9qaa9vr3k514bq8b8n0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2Nyb2xsIGFueXdoZXJlIGluIHRoZSB0b3AgcGFuZWwgdG8gY2hhbmdlIHRoZSB3b3Jrc3BhY2UuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU2Nyb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0MC4xMCIsCiAgICAiNDAuNSIsCiAgICAiNDAuMTEiLAogICAgIjQwLjkiLAogICAgIjQwLjgiLAogICAgIjQwLjciLAogICAgIjQwLjYiLAogICAgIjQwLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zcXVnZWltL1dvcmtzcGFjZS1TY3JvbGwiLAogICJ1dWlkIjogIndvcmtzcGFjZV9zY3JvbGxAc3F1Z2VpbS5jb20ubnAiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0pglhzy81zh9wwcmh1ynygkghq64s948k9qaa9vr3k514bq8b8n0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2Nyb2xsIGFueXdoZXJlIGluIHRoZSB0b3AgcGFuZWwgdG8gY2hhbmdlIHRoZSB3b3Jrc3BhY2UuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU2Nyb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0MC4xMCIsCiAgICAiNDAuNSIsCiAgICAiNDAuMTEiLAogICAgIjQwLjkiLAogICAgIjQwLjgiLAogICAgIjQwLjciLAogICAgIjQwLjYiLAogICAgIjQwLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zcXVnZWltL1dvcmtzcGFjZS1TY3JvbGwiLAogICJ1dWlkIjogIndvcmtzcGFjZV9zY3JvbGxAc3F1Z2VpbS5jb20ubnAiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "cpupower@mko-sl.de", "name": "CPU Power Manager", "pname": "cpu-power-manager", "description": "Manage your CPU's frequency scaling driver", "link": "https://extensions.gnome.org/extension/945/cpu-power-manager/", "shell_version_map": {"38": {"version": "27", "sha256": "0873r4hfgk5lypi64y21mwl68c9z6d9skgw1p61l1qc23vbqg4d6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB5b3VyIENQVSdzIGZyZXF1ZW5jeSBzY2FsaW5nIGRyaXZlciIsCiAgImxvY2FsZWRpciI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiQ1BVIFBvd2VyIE1hbmFnZXIiLAogICJzY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZWluc3RhcGVsL2NwdXBvd2VyIiwKICAidXVpZCI6ICJjcHVwb3dlckBta28tc2wuZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "40": {"version": "27", "sha256": "0873r4hfgk5lypi64y21mwl68c9z6d9skgw1p61l1qc23vbqg4d6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB5b3VyIENQVSdzIGZyZXF1ZW5jeSBzY2FsaW5nIGRyaXZlciIsCiAgImxvY2FsZWRpciI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiQ1BVIFBvd2VyIE1hbmFnZXIiLAogICJzY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZWluc3RhcGVsL2NwdXBvd2VyIiwKICAidXVpZCI6ICJjcHVwb3dlckBta28tc2wuZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "41": {"version": "27", "sha256": "0873r4hfgk5lypi64y21mwl68c9z6d9skgw1p61l1qc23vbqg4d6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB5b3VyIENQVSdzIGZyZXF1ZW5jeSBzY2FsaW5nIGRyaXZlciIsCiAgImxvY2FsZWRpciI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiQ1BVIFBvd2VyIE1hbmFnZXIiLAogICJzY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZWluc3RhcGVsL2NwdXBvd2VyIiwKICAidXVpZCI6ICJjcHVwb3dlckBta28tc2wuZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "27", "sha256": "0873r4hfgk5lypi64y21mwl68c9z6d9skgw1p61l1qc23vbqg4d6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSB5b3VyIENQVSdzIGZyZXF1ZW5jeSBzY2FsaW5nIGRyaXZlciIsCiAgImxvY2FsZWRpciI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiQ1BVIFBvd2VyIE1hbmFnZXIiLAogICJzY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kZWluc3RhcGVsL2NwdXBvd2VyIiwKICAidXVpZCI6ICJjcHVwb3dlckBta28tc2wuZGUiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} , {"uuid": "world_clock_lite@ailin.nemui", "name": "Panel World Clock (Lite)", "pname": "panel-world-clock-lite", "description": "A world clock for the panel\n\nInstall gnome-clocks to get started! (Flatpak or Snap versions NOT supported) \n\nGnome ≤3.14? https://extensions.gnome.org/extension/697/panel-world-clock/", "link": "https://extensions.gnome.org/extension/946/panel-world-clock-lite/", "shell_version_map": {"38": {"version": "11", "sha256": "0a6347p8s9iw1007yc7vlm3hy399prfvqm28ziy8wb8wmj5xd9rn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIndvcmxkX2Nsb2NrX2xpdGVAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "19", "sha256": "18l04cf2sv1wrsqcif5wsrmcsw6nsh7y459a7xjhl06hzigf5k0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3JsZF9jbG9ja19saXRlQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "18l04cf2sv1wrsqcif5wsrmcsw6nsh7y459a7xjhl06hzigf5k0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3JsZF9jbG9ja19saXRlQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "19", "sha256": "18l04cf2sv1wrsqcif5wsrmcsw6nsh7y459a7xjhl06hzigf5k0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3JsZF9jbG9ja19saXRlQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "43": {"version": "19", "sha256": "18l04cf2sv1wrsqcif5wsrmcsw6nsh7y459a7xjhl06hzigf5k0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgd29ybGQgY2xvY2sgZm9yIHRoZSBwYW5lbFxuXG5JbnN0YWxsIGdub21lLWNsb2NrcyB0byBnZXQgc3RhcnRlZCEgKEZsYXRwYWsgb3IgU25hcCB2ZXJzaW9ucyBOT1Qgc3VwcG9ydGVkKSBcblxuR25vbWUgXHUyMjY0My4xND8gaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNjk3L3BhbmVsLXdvcmxkLWNsb2NrLyIsCiAgIm5hbWUiOiAiUGFuZWwgV29ybGQgQ2xvY2sgKExpdGUpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmxkLWNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3JsZF9jbG9ja19saXRlQGFpbGluLm5lbXVpIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} -, {"uuid": "dim-on-battery@nailfarmer.nailfarmer.com", "name": "Dim On Battery Power", "pname": "dim-on-battery-power", "description": "Automatically dims the screen when the machine is running on battery power.", "link": "https://extensions.gnome.org/extension/947/dim-on-battery-power/", "shell_version_map": {"38": {"version": "27", "sha256": "1lqfsm349bwhbidv5g9sagfncysng3qf0fypnf4sqp0gwaxx6yy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9uYWlsZmFybWVyL2dub21lLXNoZWxsLWRpbS1vbi1iYXR0ZXJ5LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLW9uLWJhdHRlcnlAbmFpbGZhcm1lci5uYWlsZmFybWVyLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "40": {"version": "27", "sha256": "1lqfsm349bwhbidv5g9sagfncysng3qf0fypnf4sqp0gwaxx6yy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9uYWlsZmFybWVyL2dub21lLXNoZWxsLWRpbS1vbi1iYXR0ZXJ5LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLW9uLWJhdHRlcnlAbmFpbGZhcm1lci5uYWlsZmFybWVyLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "1lqfsm349bwhbidv5g9sagfncysng3qf0fypnf4sqp0gwaxx6yy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9uYWlsZmFybWVyL2dub21lLXNoZWxsLWRpbS1vbi1iYXR0ZXJ5LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLW9uLWJhdHRlcnlAbmFpbGZhcm1lci5uYWlsZmFybWVyLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "42": {"version": "29", "sha256": "1da36r0yz1jf1r78gv9qx132ws5k2vshgh2fn538szm4skd2nbsk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbmFpbGZhcm1lci9nbm9tZS1zaGVsbC1kaW0tb24tYmF0dGVyeS1leHRlbnNpb24iLAogICJ1dWlkIjogImRpbS1vbi1iYXR0ZXJ5QG5haWxmYXJtZXIubmFpbGZhcm1lci5jb20iLAogICJ2ZXJzaW9uIjogMjkKfQ=="}}} +, {"uuid": "dim-on-battery@nailfarmer.nailfarmer.com", "name": "Dim On Battery Power", "pname": "dim-on-battery-power", "description": "Automatically dims the screen when the machine is running on battery power.", "link": "https://extensions.gnome.org/extension/947/dim-on-battery-power/", "shell_version_map": {"38": {"version": "27", "sha256": "1lqfsm349bwhbidv5g9sagfncysng3qf0fypnf4sqp0gwaxx6yy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9uYWlsZmFybWVyL2dub21lLXNoZWxsLWRpbS1vbi1iYXR0ZXJ5LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLW9uLWJhdHRlcnlAbmFpbGZhcm1lci5uYWlsZmFybWVyLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "40": {"version": "27", "sha256": "1lqfsm349bwhbidv5g9sagfncysng3qf0fypnf4sqp0gwaxx6yy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9uYWlsZmFybWVyL2dub21lLXNoZWxsLWRpbS1vbi1iYXR0ZXJ5LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLW9uLWJhdHRlcnlAbmFpbGZhcm1lci5uYWlsZmFybWVyLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "1lqfsm349bwhbidv5g9sagfncysng3qf0fypnf4sqp0gwaxx6yy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9uYWlsZmFybWVyL2dub21lLXNoZWxsLWRpbS1vbi1iYXR0ZXJ5LWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGltLW9uLWJhdHRlcnlAbmFpbGZhcm1lci5uYWlsZmFybWVyLmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "42": {"version": "30", "sha256": "00fplpjbb0kfvqassy2zn5rd6yg2268jq5sq0jpkpw9b2bgnlgyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL25haWxmYXJtZXIvZ25vbWUtc2hlbGwtZGltLW9uLWJhdHRlcnktZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaW0tb24tYmF0dGVyeUBuYWlsZmFybWVyLm5haWxmYXJtZXIuY29tIiwKICAidmVyc2lvbiI6IDMwCn0="}, "43": {"version": "30", "sha256": "00fplpjbb0kfvqassy2zn5rd6yg2268jq5sq0jpkpw9b2bgnlgyn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgZGltcyB0aGUgc2NyZWVuIHdoZW4gdGhlIG1hY2hpbmUgaXMgcnVubmluZyBvbiBiYXR0ZXJ5IHBvd2VyLiIsCiAgIm5hbWUiOiAiRGltIE9uIEJhdHRlcnkgUG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL25haWxmYXJtZXIvZ25vbWUtc2hlbGwtZGltLW9uLWJhdHRlcnktZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaW0tb24tYmF0dGVyeUBuYWlsZmFybWVyLm5haWxmYXJtZXIuY29tIiwKICAidmVyc2lvbiI6IDMwCn0="}}} , {"uuid": "bottompanel@tmoer93", "name": "BottomPanel", "pname": "bottompanel", "description": "Moves the GNOME panel to the bottom of the screen\n\nSource here: https://github.com/Thoma5/gnome-shell-extension-bottompanel", "link": "https://extensions.gnome.org/extension/949/bottompanel/", "shell_version_map": {"38": {"version": "11", "sha256": "0r4z1pww6w8q0f7gzsmc363hd2178r40ifsppyigj67mwwik3mkq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSBHTk9NRSBwYW5lbCB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW5cblxuU291cmNlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9UaG9tYTUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWJvdHRvbXBhbmVsIiwKICAibmFtZSI6ICJCb3R0b21QYW5lbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJib3R0b21wYW5lbEB0bW9lcjkzIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "dejadup-backup@fthx", "name": "Déjà Dup Backup Button", "pname": "deja-dup-backup-button", "description": "Button that directly starts Déjà Dup backup, following Déjà Dup backup settings.\n\n It simply runs 'deja-dup --backup' and shows Déjà Dup window during backup.", "link": "https://extensions.gnome.org/extension/955/deja-dup-backup-button/", "shell_version_map": {"38": {"version": "7", "sha256": "1d5xl18297zlw6g6jqwvwf32yiiqbz7jqyb4pz691d8ngqvvlwpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiB0aGF0IGRpcmVjdGx5IHN0YXJ0cyBEXHUwMGU5alx1MDBlMCBEdXAgYmFja3VwLCBmb2xsb3dpbmcgRFx1MDBlOWpcdTAwZTAgRHVwIGJhY2t1cCBzZXR0aW5ncy5cblxuIEl0IHNpbXBseSBydW5zICdkZWphLWR1cCAtLWJhY2t1cCcgYW5kIHNob3dzIERcdTAwZTlqXHUwMGUwIER1cCB3aW5kb3cgZHVyaW5nIGJhY2t1cC4iLAogICJuYW1lIjogIkRcdTAwZTlqXHUwMGUwIER1cCBCYWNrdXAgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZGVqYWR1cC1iYWNrdXAiLAogICJ1dWlkIjogImRlamFkdXAtYmFja3VwQGZ0aHgiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "1d5xl18297zlw6g6jqwvwf32yiiqbz7jqyb4pz691d8ngqvvlwpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiB0aGF0IGRpcmVjdGx5IHN0YXJ0cyBEXHUwMGU5alx1MDBlMCBEdXAgYmFja3VwLCBmb2xsb3dpbmcgRFx1MDBlOWpcdTAwZTAgRHVwIGJhY2t1cCBzZXR0aW5ncy5cblxuIEl0IHNpbXBseSBydW5zICdkZWphLWR1cCAtLWJhY2t1cCcgYW5kIHNob3dzIERcdTAwZTlqXHUwMGUwIER1cCB3aW5kb3cgZHVyaW5nIGJhY2t1cC4iLAogICJuYW1lIjogIkRcdTAwZTlqXHUwMGUwIER1cCBCYWNrdXAgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZGVqYWR1cC1iYWNrdXAiLAogICJ1dWlkIjogImRlamFkdXAtYmFja3VwQGZ0aHgiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "ISS_Above@mcepl.cepl.eu", "name": "ISS Above", "pname": "iss-above", "description": "Shows an icon when ISS is above you (+- 1000km)", "link": "https://extensions.gnome.org/extension/956/iss-above/", "shell_version_map": {"40": {"version": "4", "sha256": "00r5clklx8wbwdqyniz1lxf864jk71q7j36icq6jkp65v8av5cjn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGFuIGljb24gd2hlbiBJU1MgaXMgYWJvdmUgeW91ICgrLSAxMDAwa20pIiwKICAibmFtZSI6ICJJU1MgQWJvdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjYiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWNlcGwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLUlTU19BYm92ZS8iLAogICJ1dWlkIjogIklTU19BYm92ZUBtY2VwbC5jZXBsLmV1IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "switcher@landau.fi", "name": "Switcher", "pname": "switcher", "description": "Switch windows or launch applications quickly by typing\n\nUse the configured global hotkey (Super+w by default) to open a list of current windows. Type a part of the name or title of the application window you want to activate and hit enter or click on the item you wish to activate. You can use the arrow keys to navigate among the filtered selection and type several space separated search terms to filter further. If your search matches launchable apps, those are shown in the list too. Use Esc or click anywhere outside the switcher to cancel.\n\nYou can customize the look and feel and functionality in the preferences.", "link": "https://extensions.gnome.org/extension/973/switcher/", "shell_version_map": {"38": {"version": "32", "sha256": "188bfj4b0kslja757fc70xhjqj5blk2jcdjfd2pvm6g2cxslfjg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIGxhdW5jaCBhcHBsaWNhdGlvbnMgcXVpY2tseSBieSB0eXBpbmdcblxuVXNlIHRoZSBjb25maWd1cmVkIGdsb2JhbCBob3RrZXkgKFN1cGVyK3cgYnkgZGVmYXVsdCkgdG8gb3BlbiBhIGxpc3Qgb2YgY3VycmVudCB3aW5kb3dzLiBUeXBlIGEgcGFydCBvZiB0aGUgbmFtZSBvciB0aXRsZSBvZiB0aGUgYXBwbGljYXRpb24gd2luZG93IHlvdSB3YW50IHRvIGFjdGl2YXRlIGFuZCBoaXQgZW50ZXIgb3IgY2xpY2sgb24gdGhlIGl0ZW0geW91IHdpc2ggdG8gYWN0aXZhdGUuIFlvdSBjYW4gdXNlIHRoZSBhcnJvdyBrZXlzIHRvIG5hdmlnYXRlIGFtb25nIHRoZSBmaWx0ZXJlZCBzZWxlY3Rpb24gYW5kIHR5cGUgc2V2ZXJhbCBzcGFjZSBzZXBhcmF0ZWQgc2VhcmNoIHRlcm1zIHRvIGZpbHRlciBmdXJ0aGVyLiBJZiB5b3VyIHNlYXJjaCBtYXRjaGVzIGxhdW5jaGFibGUgYXBwcywgdGhvc2UgYXJlIHNob3duIGluIHRoZSBsaXN0IHRvby4gVXNlIEVzYyBvciBjbGljayBhbnl3aGVyZSBvdXRzaWRlIHRoZSBzd2l0Y2hlciB0byBjYW5jZWwuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBsb29rIGFuZCBmZWVsIGFuZCBmdW5jdGlvbmFsaXR5IGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJuYW1lIjogIlN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFuaWVsbGFuZGF1L3N3aXRjaGVyIiwKICAidXVpZCI6ICJzd2l0Y2hlckBsYW5kYXUuZmkiLAogICJ2ZXJzaW9uIjogMzIKfQ=="}, "40": {"version": "33", "sha256": "1dk91bvmjqr4hrsldb6ikvrd6ihk5flbg8wfhfnmq4c18kynsv9i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIGxhdW5jaCBhcHBsaWNhdGlvbnMgcXVpY2tseSBieSB0eXBpbmdcblxuVXNlIHRoZSBjb25maWd1cmVkIGdsb2JhbCBob3RrZXkgKFN1cGVyK3cgYnkgZGVmYXVsdCkgdG8gb3BlbiBhIGxpc3Qgb2YgY3VycmVudCB3aW5kb3dzLiBUeXBlIGEgcGFydCBvZiB0aGUgbmFtZSBvciB0aXRsZSBvZiB0aGUgYXBwbGljYXRpb24gd2luZG93IHlvdSB3YW50IHRvIGFjdGl2YXRlIGFuZCBoaXQgZW50ZXIgb3IgY2xpY2sgb24gdGhlIGl0ZW0geW91IHdpc2ggdG8gYWN0aXZhdGUuIFlvdSBjYW4gdXNlIHRoZSBhcnJvdyBrZXlzIHRvIG5hdmlnYXRlIGFtb25nIHRoZSBmaWx0ZXJlZCBzZWxlY3Rpb24gYW5kIHR5cGUgc2V2ZXJhbCBzcGFjZSBzZXBhcmF0ZWQgc2VhcmNoIHRlcm1zIHRvIGZpbHRlciBmdXJ0aGVyLiBJZiB5b3VyIHNlYXJjaCBtYXRjaGVzIGxhdW5jaGFibGUgYXBwcywgdGhvc2UgYXJlIHNob3duIGluIHRoZSBsaXN0IHRvby4gVXNlIEVzYyBvciBjbGljayBhbnl3aGVyZSBvdXRzaWRlIHRoZSBzd2l0Y2hlciB0byBjYW5jZWwuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBsb29rIGFuZCBmZWVsIGFuZCBmdW5jdGlvbmFsaXR5IGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJuYW1lIjogIlN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmllbGxhbmRhdS9zd2l0Y2hlciIsCiAgInV1aWQiOiAic3dpdGNoZXJAbGFuZGF1LmZpIiwKICAidmVyc2lvbiI6IDMzCn0="}, "41": {"version": "34", "sha256": "1bgj8w7qlz4kv70k6rjmm5f5rygn2n5fp0rd29jj1wfm50hfvzg1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIGxhdW5jaCBhcHBsaWNhdGlvbnMgcXVpY2tseSBieSB0eXBpbmdcblxuVXNlIHRoZSBjb25maWd1cmVkIGdsb2JhbCBob3RrZXkgKFN1cGVyK3cgYnkgZGVmYXVsdCkgdG8gb3BlbiBhIGxpc3Qgb2YgY3VycmVudCB3aW5kb3dzLiBUeXBlIGEgcGFydCBvZiB0aGUgbmFtZSBvciB0aXRsZSBvZiB0aGUgYXBwbGljYXRpb24gd2luZG93IHlvdSB3YW50IHRvIGFjdGl2YXRlIGFuZCBoaXQgZW50ZXIgb3IgY2xpY2sgb24gdGhlIGl0ZW0geW91IHdpc2ggdG8gYWN0aXZhdGUuIFlvdSBjYW4gdXNlIHRoZSBhcnJvdyBrZXlzIHRvIG5hdmlnYXRlIGFtb25nIHRoZSBmaWx0ZXJlZCBzZWxlY3Rpb24gYW5kIHR5cGUgc2V2ZXJhbCBzcGFjZSBzZXBhcmF0ZWQgc2VhcmNoIHRlcm1zIHRvIGZpbHRlciBmdXJ0aGVyLiBJZiB5b3VyIHNlYXJjaCBtYXRjaGVzIGxhdW5jaGFibGUgYXBwcywgdGhvc2UgYXJlIHNob3duIGluIHRoZSBsaXN0IHRvby4gVXNlIEVzYyBvciBjbGljayBhbnl3aGVyZSBvdXRzaWRlIHRoZSBzd2l0Y2hlciB0byBjYW5jZWwuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBsb29rIGFuZCBmZWVsIGFuZCBmdW5jdGlvbmFsaXR5IGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJuYW1lIjogIlN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmllbGxhbmRhdS9zd2l0Y2hlciIsCiAgInV1aWQiOiAic3dpdGNoZXJAbGFuZGF1LmZpIiwKICAidmVyc2lvbiI6IDM0Cn0="}, "42": {"version": "36", "sha256": "06ayifrf49bdf61y9502fcwf9937py3zlmcf1idlp1f3y18s5i8c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIGxhdW5jaCBhcHBsaWNhdGlvbnMgcXVpY2tseSBieSB0eXBpbmdcblxuVXNlIHRoZSBjb25maWd1cmVkIGdsb2JhbCBob3RrZXkgKFN1cGVyK3cgYnkgZGVmYXVsdCkgdG8gb3BlbiBhIGxpc3Qgb2YgY3VycmVudCB3aW5kb3dzLiBUeXBlIGEgcGFydCBvZiB0aGUgbmFtZSBvciB0aXRsZSBvZiB0aGUgYXBwbGljYXRpb24gd2luZG93IHlvdSB3YW50IHRvIGFjdGl2YXRlIGFuZCBoaXQgZW50ZXIgb3IgY2xpY2sgb24gdGhlIGl0ZW0geW91IHdpc2ggdG8gYWN0aXZhdGUuIFlvdSBjYW4gdXNlIHRoZSBhcnJvdyBrZXlzIHRvIG5hdmlnYXRlIGFtb25nIHRoZSBmaWx0ZXJlZCBzZWxlY3Rpb24gYW5kIHR5cGUgc2V2ZXJhbCBzcGFjZSBzZXBhcmF0ZWQgc2VhcmNoIHRlcm1zIHRvIGZpbHRlciBmdXJ0aGVyLiBJZiB5b3VyIHNlYXJjaCBtYXRjaGVzIGxhdW5jaGFibGUgYXBwcywgdGhvc2UgYXJlIHNob3duIGluIHRoZSBsaXN0IHRvby4gVXNlIEVzYyBvciBjbGljayBhbnl3aGVyZSBvdXRzaWRlIHRoZSBzd2l0Y2hlciB0byBjYW5jZWwuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBsb29rIGFuZCBmZWVsIGFuZCBmdW5jdGlvbmFsaXR5IGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJuYW1lIjogIlN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmllbGxhbmRhdS9zd2l0Y2hlciIsCiAgInV1aWQiOiAic3dpdGNoZXJAbGFuZGF1LmZpIiwKICAidmVyc2lvbiI6IDM2Cn0="}, "43": {"version": "37", "sha256": "19yrdy58hx1zwl0a7wjd0fwnfwsgsyqv9m1va8x5niynblajcs8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3aW5kb3dzIG9yIGxhdW5jaCBhcHBsaWNhdGlvbnMgcXVpY2tseSBieSB0eXBpbmdcblxuVXNlIHRoZSBjb25maWd1cmVkIGdsb2JhbCBob3RrZXkgKFN1cGVyK3cgYnkgZGVmYXVsdCkgdG8gb3BlbiBhIGxpc3Qgb2YgY3VycmVudCB3aW5kb3dzLiBUeXBlIGEgcGFydCBvZiB0aGUgbmFtZSBvciB0aXRsZSBvZiB0aGUgYXBwbGljYXRpb24gd2luZG93IHlvdSB3YW50IHRvIGFjdGl2YXRlIGFuZCBoaXQgZW50ZXIgb3IgY2xpY2sgb24gdGhlIGl0ZW0geW91IHdpc2ggdG8gYWN0aXZhdGUuIFlvdSBjYW4gdXNlIHRoZSBhcnJvdyBrZXlzIHRvIG5hdmlnYXRlIGFtb25nIHRoZSBmaWx0ZXJlZCBzZWxlY3Rpb24gYW5kIHR5cGUgc2V2ZXJhbCBzcGFjZSBzZXBhcmF0ZWQgc2VhcmNoIHRlcm1zIHRvIGZpbHRlciBmdXJ0aGVyLiBJZiB5b3VyIHNlYXJjaCBtYXRjaGVzIGxhdW5jaGFibGUgYXBwcywgdGhvc2UgYXJlIHNob3duIGluIHRoZSBsaXN0IHRvby4gVXNlIEVzYyBvciBjbGljayBhbnl3aGVyZSBvdXRzaWRlIHRoZSBzd2l0Y2hlciB0byBjYW5jZWwuXG5cbllvdSBjYW4gY3VzdG9taXplIHRoZSBsb29rIGFuZCBmZWVsIGFuZCBmdW5jdGlvbmFsaXR5IGluIHRoZSBwcmVmZXJlbmNlcy4iLAogICJuYW1lIjogIlN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmllbGxhbmRhdS9zd2l0Y2hlciIsCiAgInV1aWQiOiAic3dpdGNoZXJAbGFuZGF1LmZpIiwKICAidmVyc2lvbiI6IDM3Cn0="}}} , {"uuid": "keyboard_modifiers_status@sneetsher", "name": "Keyboard Modifiers Status", "pname": "keyboard-modifiers-status", "description": "Shows keyboard modifiers status. It's useful when sticky keys are active.", "link": "https://extensions.gnome.org/extension/975/keyboard-modifiers-status/", "shell_version_map": {"38": {"version": "16", "sha256": "14l418xz2p8sa8r6df4wbr9x9x337gcdihdah2nj95xzr9f9q1ks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbmVldHNoZXIvS2V5Ym9hcmQtTW9kaWZpZXJzLVN0YXR1cyIsCiAgInV1aWQiOiAia2V5Ym9hcmRfbW9kaWZpZXJzX3N0YXR1c0BzbmVldHNoZXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "40": {"version": "16", "sha256": "14l418xz2p8sa8r6df4wbr9x9x337gcdihdah2nj95xzr9f9q1ks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbmVldHNoZXIvS2V5Ym9hcmQtTW9kaWZpZXJzLVN0YXR1cyIsCiAgInV1aWQiOiAia2V5Ym9hcmRfbW9kaWZpZXJzX3N0YXR1c0BzbmVldHNoZXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "14l418xz2p8sa8r6df4wbr9x9x337gcdihdah2nj95xzr9f9q1ks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbmVldHNoZXIvS2V5Ym9hcmQtTW9kaWZpZXJzLVN0YXR1cyIsCiAgInV1aWQiOiAia2V5Ym9hcmRfbW9kaWZpZXJzX3N0YXR1c0BzbmVldHNoZXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "42": {"version": "16", "sha256": "14l418xz2p8sa8r6df4wbr9x9x337gcdihdah2nj95xzr9f9q1ks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbmVldHNoZXIvS2V5Ym9hcmQtTW9kaWZpZXJzLVN0YXR1cyIsCiAgInV1aWQiOiAia2V5Ym9hcmRfbW9kaWZpZXJzX3N0YXR1c0BzbmVldHNoZXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "43": {"version": "16", "sha256": "14l418xz2p8sa8r6df4wbr9x9x337gcdihdah2nj95xzr9f9q1ks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGtleWJvYXJkIG1vZGlmaWVycyBzdGF0dXMuIEl0J3MgdXNlZnVsIHdoZW4gc3RpY2t5IGtleXMgYXJlIGFjdGl2ZS4iLAogICJuYW1lIjogIktleWJvYXJkIE1vZGlmaWVycyBTdGF0dXMiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic25lZXRzaGVyQGxvY2FsaG9zdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zbmVldHNoZXIvS2V5Ym9hcmQtTW9kaWZpZXJzLVN0YXR1cyIsCiAgInV1aWQiOiAia2V5Ym9hcmRfbW9kaWZpZXJzX3N0YXR1c0BzbmVldHNoZXIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} -, {"uuid": "thinkpadthermal@moonlight.drive.vk.gmail.com", "name": "ThinkPad Thermal", "pname": "thinkpad-thermal", "description": "ThinkPad thermal monitor, display ThinkPad thermal and fan status using /proc/acpi/ibm/thermal and /proc/acpi/ibm/fan.", "link": "https://extensions.gnome.org/extension/986/thinkpad-thermal/", "shell_version_map": {"42": {"version": "9", "sha256": "0lizicj0nvc7fl7vh88rnnxq6clrp2ablgsyd161359mcnng57qy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZtdWpha2l0ei90aGlua3BhZC10aGVybWFsIiwKICAidXVpZCI6ICJ0aGlua3BhZHRoZXJtYWxAbW9vbmxpZ2h0LmRyaXZlLnZrLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "0lizicj0nvc7fl7vh88rnnxq6clrp2ablgsyd161359mcnng57qy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZtdWpha2l0ei90aGlua3BhZC10aGVybWFsIiwKICAidXVpZCI6ICJ0aGlua3BhZHRoZXJtYWxAbW9vbmxpZ2h0LmRyaXZlLnZrLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}}} +, {"uuid": "thinkpadthermal@moonlight.drive.vk.gmail.com", "name": "ThinkPad Thermal", "pname": "thinkpad-thermal", "description": "ThinkPad thermal monitor, display ThinkPad thermal and fan status using /proc/acpi/ibm/thermal and /proc/acpi/ibm/fan.", "link": "https://extensions.gnome.org/extension/986/thinkpad-thermal/", "shell_version_map": {"42": {"version": "10", "sha256": "0ahdw7a5v38d8aw4b90yyi57pgi88jp4qbgml1q5ay6vphhn0h7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZtdWpha2l0ei90aGlua3BhZC10aGVybWFsIiwKICAidXVpZCI6ICJ0aGlua3BhZHRoZXJtYWxAbW9vbmxpZ2h0LmRyaXZlLnZrLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "0ahdw7a5v38d8aw4b90yyi57pgi88jp4qbgml1q5ay6vphhn0h7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaW5rUGFkIHRoZXJtYWwgbW9uaXRvciwgZGlzcGxheSBUaGlua1BhZCB0aGVybWFsIGFuZCBmYW4gc3RhdHVzIHVzaW5nIC9wcm9jL2FjcGkvaWJtL3RoZXJtYWwgYW5kIC9wcm9jL2FjcGkvaWJtL2Zhbi4iLAogICJuYW1lIjogIlRoaW5rUGFkIFRoZXJtYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZtdWpha2l0ei90aGlua3BhZC10aGVybWFsIiwKICAidXVpZCI6ICJ0aGlua3BhZHRoZXJtYWxAbW9vbmxpZ2h0LmRyaXZlLnZrLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "harddiskled@bijidroid.gmail.com", "name": "Harddisk LED", "pname": "harddisk-led", "description": "Show harddisk activity (IO speed read/write and LED). Click to change led size", "link": "https://extensions.gnome.org/extension/988/harddisk-led/", "shell_version_map": {"38": {"version": "33", "sha256": "18lcfg83laqmh2hz4n2x6ppw49arsclhwbdc364l4ixd7vj8i5dm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JpamkvaGFyZGRpc2tsZWQiLAogICJ1dWlkIjogImhhcmRkaXNrbGVkQGJpamlkcm9pZC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "40": {"version": "33", "sha256": "18lcfg83laqmh2hz4n2x6ppw49arsclhwbdc364l4ixd7vj8i5dm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JpamkvaGFyZGRpc2tsZWQiLAogICJ1dWlkIjogImhhcmRkaXNrbGVkQGJpamlkcm9pZC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "41": {"version": "33", "sha256": "18lcfg83laqmh2hz4n2x6ppw49arsclhwbdc364l4ixd7vj8i5dm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JpamkvaGFyZGRpc2tsZWQiLAogICJ1dWlkIjogImhhcmRkaXNrbGVkQGJpamlkcm9pZC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "42": {"version": "33", "sha256": "18lcfg83laqmh2hz4n2x6ppw49arsclhwbdc364l4ixd7vj8i5dm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JpamkvaGFyZGRpc2tsZWQiLAogICJ1dWlkIjogImhhcmRkaXNrbGVkQGJpamlkcm9pZC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "43": {"version": "33", "sha256": "18lcfg83laqmh2hz4n2x6ppw49arsclhwbdc364l4ixd7vj8i5dm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgaGFyZGRpc2sgYWN0aXZpdHkgKElPIHNwZWVkIHJlYWQvd3JpdGUgYW5kIExFRCkuIENsaWNrIHRvIGNoYW5nZSBsZWQgc2l6ZSIsCiAgIm5hbWUiOiAiSGFyZGRpc2sgTEVEIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JpamkvaGFyZGRpc2tsZWQiLAogICJ1dWlkIjogImhhcmRkaXNrbGVkQGJpamlkcm9pZC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} , {"uuid": "syncthingicon@jay.strict@posteo.de", "name": "Syncthing Icon", "pname": "syncthing-icon", "description": "Display Syncthing Icon in Top Bar", "link": "https://extensions.gnome.org/extension/989/syncthing-icon/", "shell_version_map": {"40": {"version": "34", "sha256": "1pca7xk11bh46a1y1dhxmw6rlmmf5dpp0jamwn17xxxsp35fz5qk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamF5c3RyaWN0b3IvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZyIsCiAgInV1aWQiOiAic3luY3RoaW5naWNvbkBqYXkuc3RyaWN0QHBvc3Rlby5kZSIsCiAgInZlcnNpb24iOiAzNAp9"}, "41": {"version": "34", "sha256": "1pca7xk11bh46a1y1dhxmw6rlmmf5dpp0jamwn17xxxsp35fz5qk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamF5c3RyaWN0b3IvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZyIsCiAgInV1aWQiOiAic3luY3RoaW5naWNvbkBqYXkuc3RyaWN0QHBvc3Rlby5kZSIsCiAgInZlcnNpb24iOiAzNAp9"}, "42": {"version": "34", "sha256": "1pca7xk11bh46a1y1dhxmw6rlmmf5dpp0jamwn17xxxsp35fz5qk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamF5c3RyaWN0b3IvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZyIsCiAgInV1aWQiOiAic3luY3RoaW5naWNvbkBqYXkuc3RyaWN0QHBvc3Rlby5kZSIsCiAgInZlcnNpb24iOiAzNAp9"}, "43": {"version": "35", "sha256": "077m5n41bhaxk2iky751p9bwmcsqkg69rpg2irw4q3nq09lb8s1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgU3luY3RoaW5nIEljb24gaW4gVG9wIEJhciIsCiAgIm5hbWUiOiAiU3luY3RoaW5nIEljb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3luY3RoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2pheXN0cmljdG9yL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeW5jdGhpbmciLAogICJ1dWlkIjogInN5bmN0aGluZ2ljb25AamF5LnN0cmljdEBwb3N0ZW8uZGUiLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} , {"uuid": "window-search-provider@quelltexter.org", "name": "Window Search Provider", "pname": "window-search-provider", "description": "Provide active windows as search results in overview", "link": "https://extensions.gnome.org/extension/1001/window-search-provider/", "shell_version_map": {"38": {"version": "2", "sha256": "030s38akm3fw7nq9v4wfgzhw716b51l2z3szns0gcwc0gx5zpfjv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGUgYWN0aXZlIHdpbmRvd3MgYXMgc2VhcmNoIHJlc3VsdHMgaW4gb3ZlcnZpZXciLAogICJuYW1lIjogIldpbmRvdyBTZWFyY2ggUHJvdmlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjMuNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rbG9yZW56L2dub21lLXNoZWxsLXdpbmRvdy1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogIndpbmRvdy1zZWFyY2gtcHJvdmlkZXJAcXVlbGx0ZXh0ZXIub3JnIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} @@ -110,7 +110,7 @@ , {"uuid": "randomwallpaper@iflow.space", "name": "Random Wallpaper", "pname": "random-wallpaper", "description": "Fetch a random wallpaper from an online source and set it as a desktop background. \nThe desktop background can be updated periodically or manually.\n\nFeatures:\nMany different online sources with filters:\n - Unsplash (https://unsplash.com/)\n - Wallhaven (https://wallhaven.cc/)\n - Reddit (https://reddit.com)\n - Basically any JSON API/File (see Examples on GitHub)\nHistory of previous images\nSet lock screen image\nAutomatic renewal (Auto-Fetching)", "link": "https://extensions.gnome.org/extension/1040/random-wallpaper/", "shell_version_map": {"38": {"version": "22", "sha256": "1mnc7k1816r0q8c95y36ryzl9cni6zms5xm587wmdmy4xi92i8ic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNC41IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2lmbDB3L1JhbmRvbVdhbGxwYXBlckdub21lMyIsCiAgInV1aWQiOiAicmFuZG9td2FsbHBhcGVyQGlmbG93LnNwYWNlIiwKICAidmVyc2lvbiI6IDIyCn0="}, "40": {"version": "31", "sha256": "1avzc1yxvr84qjjak9sdqbmjylw0vvll0rqjrx91fxdpwd5w88lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNy4zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pZmwwdy9SYW5kb21XYWxscGFwZXJHbm9tZTMiLAogICJ1dWlkIjogInJhbmRvbXdhbGxwYXBlckBpZmxvdy5zcGFjZSIsCiAgInZlcnNpb24iOiAzMQp9"}, "41": {"version": "31", "sha256": "1avzc1yxvr84qjjak9sdqbmjylw0vvll0rqjrx91fxdpwd5w88lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNy4zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pZmwwdy9SYW5kb21XYWxscGFwZXJHbm9tZTMiLAogICJ1dWlkIjogInJhbmRvbXdhbGxwYXBlckBpZmxvdy5zcGFjZSIsCiAgInZlcnNpb24iOiAzMQp9"}, "42": {"version": "31", "sha256": "1avzc1yxvr84qjjak9sdqbmjylw0vvll0rqjrx91fxdpwd5w88lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNy4zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pZmwwdy9SYW5kb21XYWxscGFwZXJHbm9tZTMiLAogICJ1dWlkIjogInJhbmRvbXdhbGxwYXBlckBpZmxvdy5zcGFjZSIsCiAgInZlcnNpb24iOiAzMQp9"}, "43": {"version": "31", "sha256": "1avzc1yxvr84qjjak9sdqbmjylw0vvll0rqjrx91fxdpwd5w88lw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZldGNoIGEgcmFuZG9tIHdhbGxwYXBlciBmcm9tIGFuIG9ubGluZSBzb3VyY2UgYW5kIHNldCBpdCBhcyBhIGRlc2t0b3AgYmFja2dyb3VuZC4gXG5UaGUgZGVza3RvcCBiYWNrZ3JvdW5kIGNhbiBiZSB1cGRhdGVkIHBlcmlvZGljYWxseSBvciBtYW51YWxseS5cblxuRmVhdHVyZXM6XG5NYW55IGRpZmZlcmVudCBvbmxpbmUgc291cmNlcyB3aXRoIGZpbHRlcnM6XG4gICAgICAgIC0gVW5zcGxhc2ggKGh0dHBzOi8vdW5zcGxhc2guY29tLylcbiAgICAgICAgLSBXYWxsaGF2ZW4gKGh0dHBzOi8vd2FsbGhhdmVuLmNjLylcbiAgICAgICAgLSBSZWRkaXQgKGh0dHBzOi8vcmVkZGl0LmNvbSlcbiAgICAgICAgLSBCYXNpY2FsbHkgYW55IEpTT04gQVBJL0ZpbGUgKHNlZSBFeGFtcGxlcyBvbiBHaXRIdWIpXG5IaXN0b3J5IG9mIHByZXZpb3VzIGltYWdlc1xuU2V0IGxvY2sgc2NyZWVuIGltYWdlXG5BdXRvbWF0aWMgcmVuZXdhbCAoQXV0by1GZXRjaGluZykiLAogICJuYW1lIjogIlJhbmRvbSBXYWxscGFwZXIiLAogICJzZW1hbnRpYy12ZXJzaW9uIjogIjIuNy4zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLmlmbG93LnJhbmRvbXdhbGxwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAuMCIsCiAgICAiNDAuMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pZmwwdy9SYW5kb21XYWxscGFwZXJHbm9tZTMiLAogICJ1dWlkIjogInJhbmRvbXdhbGxwYXBlckBpZmxvdy5zcGFjZSIsCiAgInZlcnNpb24iOiAzMQp9"}}} , {"uuid": "gse-haguichi-indicator@ztefn.github.com", "name": "Haguichi Indicator", "pname": "haguichi-indicator", "description": "Lets you control Haguichi directly from the system status area in GNOME Shell.", "link": "https://extensions.gnome.org/extension/1045/haguichi-indicator/", "shell_version_map": {"38": {"version": "19", "sha256": "0yph8cgi4jqb9br2pb009a01i5lg6r6r18kxrh963bymravv7nvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiSGFndWljaGkgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "40": {"version": "19", "sha256": "0yph8cgi4jqb9br2pb009a01i5lg6r6r18kxrh963bymravv7nvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiSGFndWljaGkgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "41": {"version": "19", "sha256": "0yph8cgi4jqb9br2pb009a01i5lg6r6r18kxrh963bymravv7nvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiSGFndWljaGkgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "19", "sha256": "0yph8cgi4jqb9br2pb009a01i5lg6r6r18kxrh963bymravv7nvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiSGFndWljaGkgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "43": {"version": "19", "sha256": "0yph8cgi4jqb9br2pb009a01i5lg6r6r18kxrh963bymravv7nvb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldHMgeW91IGNvbnRyb2wgSGFndWljaGkgZGlyZWN0bHkgZnJvbSB0aGUgc3lzdGVtIHN0YXR1cyBhcmVhIGluIEdOT01FIFNoZWxsLiIsCiAgIm5hbWUiOiAiSGFndWljaGkgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3p0ZWZuL2dzZS1oYWd1aWNoaS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdzZS1oYWd1aWNoaS1pbmRpY2F0b3JAenRlZm4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}}} , {"uuid": "gnome-shutdown-button@kirby_33@hotmail.fr", "name": "Gnome-Shutdown Button", "pname": "gnome-shutdown-button", "description": "Add a power off button to easily turn off your computer.\nThis button replaces the power off icon in the system area of the Gnome panel.\nYou no longer need to open the system menu to turn off your computer.", "link": "https://extensions.gnome.org/extension/1056/gnome-shutdown-button/", "shell_version_map": {"40": {"version": "6", "sha256": "118p8avf2nfxpp3f7l1675s6glcjk0by9fvzrrdv2bqvi0mxnj15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHBvd2VyIG9mZiBidXR0b24gdG8gZWFzaWx5IHR1cm4gb2ZmIHlvdXIgY29tcHV0ZXIuXG5UaGlzIGJ1dHRvbiByZXBsYWNlcyB0aGUgcG93ZXIgb2ZmIGljb24gaW4gdGhlIHN5c3RlbSBhcmVhIG9mIHRoZSBHbm9tZSBwYW5lbC5cbllvdSBubyBsb25nZXIgbmVlZCB0byBvcGVuIHRoZSBzeXN0ZW0gbWVudSB0byB0dXJuIG9mZiB5b3VyIGNvbXB1dGVyLiIsCiAgIm5hbWUiOiAiR25vbWUtU2h1dGRvd24gQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcva2lyYnlfMzMvZ25vbWUtc2h1dGRvd24tYnV0dG9uLyIsCiAgInV1aWQiOiAiZ25vbWUtc2h1dGRvd24tYnV0dG9uQGtpcmJ5XzMzQGhvdG1haWwuZnIiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "118p8avf2nfxpp3f7l1675s6glcjk0by9fvzrrdv2bqvi0mxnj15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHBvd2VyIG9mZiBidXR0b24gdG8gZWFzaWx5IHR1cm4gb2ZmIHlvdXIgY29tcHV0ZXIuXG5UaGlzIGJ1dHRvbiByZXBsYWNlcyB0aGUgcG93ZXIgb2ZmIGljb24gaW4gdGhlIHN5c3RlbSBhcmVhIG9mIHRoZSBHbm9tZSBwYW5lbC5cbllvdSBubyBsb25nZXIgbmVlZCB0byBvcGVuIHRoZSBzeXN0ZW0gbWVudSB0byB0dXJuIG9mZiB5b3VyIGNvbXB1dGVyLiIsCiAgIm5hbWUiOiAiR25vbWUtU2h1dGRvd24gQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcva2lyYnlfMzMvZ25vbWUtc2h1dGRvd24tYnV0dG9uLyIsCiAgInV1aWQiOiAiZ25vbWUtc2h1dGRvd24tYnV0dG9uQGtpcmJ5XzMzQGhvdG1haWwuZnIiLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "118p8avf2nfxpp3f7l1675s6glcjk0by9fvzrrdv2bqvi0mxnj15", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHBvd2VyIG9mZiBidXR0b24gdG8gZWFzaWx5IHR1cm4gb2ZmIHlvdXIgY29tcHV0ZXIuXG5UaGlzIGJ1dHRvbiByZXBsYWNlcyB0aGUgcG93ZXIgb2ZmIGljb24gaW4gdGhlIHN5c3RlbSBhcmVhIG9mIHRoZSBHbm9tZSBwYW5lbC5cbllvdSBubyBsb25nZXIgbmVlZCB0byBvcGVuIHRoZSBzeXN0ZW0gbWVudSB0byB0dXJuIG9mZiB5b3VyIGNvbXB1dGVyLiIsCiAgIm5hbWUiOiAiR25vbWUtU2h1dGRvd24gQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcva2lyYnlfMzMvZ25vbWUtc2h1dGRvd24tYnV0dG9uLyIsCiAgInV1aWQiOiAiZ25vbWUtc2h1dGRvd24tYnV0dG9uQGtpcmJ5XzMzQGhvdG1haWwuZnIiLAogICJ2ZXJzaW9uIjogNgp9"}}} -, {"uuid": "timezone@jwendell", "name": "Timezone", "pname": "timezone", "description": "See people with their timezones from the Shell", "link": "https://extensions.gnome.org/extension/1060/timezone/", "shell_version_map": {"40": {"version": "18", "sha256": "1ksb8pm2y4lxjcwn2l0yj6piz5cqgmzx6k4rygx1mbh5y76mwdji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBwZW9wbGUgd2l0aCB0aGVpciB0aW1lem9uZXMgZnJvbSB0aGUgU2hlbGwiLAogICJuYW1lIjogIlRpbWV6b25lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWV6b25lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2p3ZW5kZWxsL2dub21lLXNoZWxsLWV4dGVuc2lvbi10aW1lem9uZSIsCiAgInV1aWQiOiAidGltZXpvbmVAandlbmRlbGwiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "41": {"version": "21", "sha256": "04a9rhflbyfi9bwcb3iy5cijl2zj12f4f10d6v4h7rql3fz2r5vd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBwZW9wbGUgd2l0aCB0aGVpciB0aW1lem9uZXMgZnJvbSB0aGUgU2hlbGwiLAogICJuYW1lIjogIlRpbWV6b25lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWV6b25lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qd2VuZGVsbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGltZXpvbmUiLAogICJ1dWlkIjogInRpbWV6b25lQGp3ZW5kZWxsIiwKICAidmVyc2lvbiI6IDIxCn0="}, "42": {"version": "21", "sha256": "04a9rhflbyfi9bwcb3iy5cijl2zj12f4f10d6v4h7rql3fz2r5vd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBwZW9wbGUgd2l0aCB0aGVpciB0aW1lem9uZXMgZnJvbSB0aGUgU2hlbGwiLAogICJuYW1lIjogIlRpbWV6b25lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWV6b25lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qd2VuZGVsbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGltZXpvbmUiLAogICJ1dWlkIjogInRpbWV6b25lQGp3ZW5kZWxsIiwKICAidmVyc2lvbiI6IDIxCn0="}}} +, {"uuid": "timezone@jwendell", "name": "Timezone", "pname": "timezone", "description": "See people with their timezones from the Shell", "link": "https://extensions.gnome.org/extension/1060/timezone/", "shell_version_map": {"40": {"version": "18", "sha256": "1ksb8pm2y4lxjcwn2l0yj6piz5cqgmzx6k4rygx1mbh5y76mwdji", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBwZW9wbGUgd2l0aCB0aGVpciB0aW1lem9uZXMgZnJvbSB0aGUgU2hlbGwiLAogICJuYW1lIjogIlRpbWV6b25lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWV6b25lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2p3ZW5kZWxsL2dub21lLXNoZWxsLWV4dGVuc2lvbi10aW1lem9uZSIsCiAgInV1aWQiOiAidGltZXpvbmVAandlbmRlbGwiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "41": {"version": "21", "sha256": "04a9rhflbyfi9bwcb3iy5cijl2zj12f4f10d6v4h7rql3fz2r5vd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBwZW9wbGUgd2l0aCB0aGVpciB0aW1lem9uZXMgZnJvbSB0aGUgU2hlbGwiLAogICJuYW1lIjogIlRpbWV6b25lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWV6b25lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qd2VuZGVsbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGltZXpvbmUiLAogICJ1dWlkIjogInRpbWV6b25lQGp3ZW5kZWxsIiwKICAidmVyc2lvbiI6IDIxCn0="}, "42": {"version": "21", "sha256": "04a9rhflbyfi9bwcb3iy5cijl2zj12f4f10d6v4h7rql3fz2r5vd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBwZW9wbGUgd2l0aCB0aGVpciB0aW1lem9uZXMgZnJvbSB0aGUgU2hlbGwiLAogICJuYW1lIjogIlRpbWV6b25lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWV6b25lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9qd2VuZGVsbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tdGltZXpvbmUiLAogICJ1dWlkIjogInRpbWV6b25lQGp3ZW5kZWxsIiwKICAidmVyc2lvbiI6IDIxCn0="}, "43": {"version": "24", "sha256": "06mp40f1dgphvcj42am3j4l1svwip15mmj1s9nyxzazdwwqhh41a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBwZW9wbGUgd2l0aCB0aGVpciB0aW1lem9uZXMgZnJvbSB0aGUgU2hlbGwiLAogICJuYW1lIjogIlRpbWV6b25lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRpbWV6b25lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2p3ZW5kZWxsL2dub21lLXNoZWxsLWV4dGVuc2lvbi10aW1lem9uZSIsCiAgInV1aWQiOiAidGltZXpvbmVAandlbmRlbGwiLAogICJ2ZXJzaW9uIjogMjQKfQ=="}}} , {"uuid": "On_Screen_Keyboard_Button@bradan.eu", "name": "On Screen Keyboard Button", "pname": "on-screen-keyboard-button", "description": "Shows or hides the OSK via top bar button. It works with X, not with wayland. Wayland has it's own technique: swipe the keyboard up from the bottom display edge.\n\nSource code: https://github.com/Bradan/Gnome-On-Screen-Keyboard-Button", "link": "https://extensions.gnome.org/extension/1061/on-screen-keyboard-button/", "shell_version_map": {"38": {"version": "5", "sha256": "0z3jcv5gzv1pwfla9ghp5kjljc5n80fcab0d2c2i2pw7y7kvpabr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG9yIGhpZGVzIHRoZSBPU0sgdmlhIHRvcCBiYXIgYnV0dG9uLiBJdCB3b3JrcyB3aXRoIFgsIG5vdCB3aXRoIHdheWxhbmQuIFdheWxhbmQgaGFzIGl0J3Mgb3duIHRlY2huaXF1ZTogc3dpcGUgdGhlIGtleWJvYXJkIHVwIGZyb20gdGhlIGJvdHRvbSBkaXNwbGF5IGVkZ2UuXG5cblNvdXJjZSBjb2RlOiBodHRwczovL2dpdGh1Yi5jb20vQnJhZGFuL0dub21lLU9uLVNjcmVlbi1LZXlib2FyZC1CdXR0b24iLAogICJuYW1lIjogIk9uIFNjcmVlbiBLZXlib2FyZCBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjgiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiT25fU2NyZWVuX0tleWJvYXJkX0J1dHRvbkBicmFkYW4uZXUiLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "System_Monitor@bghome.gmail.com", "name": "System Monitor", "pname": "system-monitor", "description": "Display resource usage.\n\nLinux distribution specific installation instructions can be found in the wiki at https://github.com/elvetemedve/gnome-shell-extension-system-monitor/wiki/Installation.\n\nPlease report bugs here: https://github.com/elvetemedve/gnome-shell-extension-system-monitor/issues", "link": "https://extensions.gnome.org/extension/1064/system-monitor/", "shell_version_map": {"38": {"version": "25", "sha256": "09hicika6w7kj38s5hnarxkhh1r0rq3vcq6mrkdssv511ljkr7m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "40": {"version": "25", "sha256": "09hicika6w7kj38s5hnarxkhh1r0rq3vcq6mrkdssv511ljkr7m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "41": {"version": "25", "sha256": "09hicika6w7kj38s5hnarxkhh1r0rq3vcq6mrkdssv511ljkr7m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "42": {"version": "25", "sha256": "09hicika6w7kj38s5hnarxkhh1r0rq3vcq6mrkdssv511ljkr7m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}, "43": {"version": "25", "sha256": "09hicika6w7kj38s5hnarxkhh1r0rq3vcq6mrkdssv511ljkr7m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcmVzb3VyY2UgdXNhZ2UuXG5cbkxpbnV4IGRpc3RyaWJ1dGlvbiBzcGVjaWZpYyBpbnN0YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGNhbiBiZSBmb3VuZCBpbiB0aGUgd2lraSBhdCBodHRwczovL2dpdGh1Yi5jb20vZWx2ZXRlbWVkdmUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5c3RlbS1tb25pdG9yL3dpa2kvSW5zdGFsbGF0aW9uLlxuXG5QbGVhc2UgcmVwb3J0IGJ1Z3MgaGVyZTogaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvci9pc3N1ZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJTeXN0ZW1fTW9uaXRvckBiZ2hvbWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJTeXN0ZW0gTW9uaXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zeXN0ZW0tbW9uaXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAuMCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VsdmV0ZW1lZHZlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zeXN0ZW0tbW9uaXRvciIsCiAgInV1aWQiOiAiU3lzdGVtX01vbml0b3JAYmdob21lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNQp9"}}} , {"uuid": "syncthing@gnome.2nv2u.com", "name": "Syncthing Indicator", "pname": "syncthing-indicator", "description": "Shell indicator for starting, monitoring and controlling the Syncthing daemon using SystemD", "link": "https://extensions.gnome.org/extension/1070/syncthing-indicator/", "shell_version_map": {"38": {"version": "27", "sha256": "08l9xsbndgi7v863x76q4br89gjysaxwx8rhfkcp2nwqw247wfa2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "40": {"version": "27", "sha256": "08l9xsbndgi7v863x76q4br89gjysaxwx8rhfkcp2nwqw247wfa2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "08l9xsbndgi7v863x76q4br89gjysaxwx8rhfkcp2nwqw247wfa2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "42": {"version": "27", "sha256": "08l9xsbndgi7v863x76q4br89gjysaxwx8rhfkcp2nwqw247wfa2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS8ybnYydS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3luY3RoaW5nLWluZGljYXRvciIsCiAgInV1aWQiOiAic3luY3RoaW5nQGdub21lLjJudjJ1LmNvbSIsCiAgInZlcnNpb24iOiAyNwp9"}, "43": {"version": "28", "sha256": "08pyzrdyccr2gm3y5rh55fq8g1a4j6jlyk1c1dmlbsh4nzxwzvxm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNoZWxsIGluZGljYXRvciBmb3Igc3RhcnRpbmcsIG1vbml0b3JpbmcgYW5kIGNvbnRyb2xsaW5nIHRoZSBTeW5jdGhpbmcgZGFlbW9uIHVzaW5nIFN5c3RlbUQiLAogICJuYW1lIjogIlN5bmN0aGluZyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vMm52MnUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXN5bmN0aGluZy1pbmRpY2F0b3IiLAogICJ1dWlkIjogInN5bmN0aGluZ0Bnbm9tZS4ybnYydS5jb20iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}}} @@ -141,7 +141,7 @@ , {"uuid": "utcclock@injcristianrojas.github.com", "name": "UTCClock", "pname": "utcclock", "description": "UTC clock for the top bar", "link": "https://extensions.gnome.org/extension/1183/utcclock/", "shell_version_map": {"38": {"version": "24", "sha256": "0yjbpmrq8y52yn4q2yp6bgg4b6r60h9spccrc0d7jn6vi3a4ns4s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL1VUQ0Nsb2NrIiwKICAidXVpZCI6ICJ1dGNjbG9ja0BpbmpjcmlzdGlhbnJvamFzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}, "40": {"version": "32", "sha256": "0qcz5i2kikkq2yj39mxvk0iq7wzl1lbnsk648vh3plc6v10d8yvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW5qY3Jpc3RpYW5yb2phcy9VVENDbG9jayIsCiAgInV1aWQiOiAidXRjY2xvY2tAaW5qY3Jpc3RpYW5yb2phcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMyCn0="}, "41": {"version": "32", "sha256": "0qcz5i2kikkq2yj39mxvk0iq7wzl1lbnsk648vh3plc6v10d8yvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW5qY3Jpc3RpYW5yb2phcy9VVENDbG9jayIsCiAgInV1aWQiOiAidXRjY2xvY2tAaW5qY3Jpc3RpYW5yb2phcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMyCn0="}, "42": {"version": "32", "sha256": "0qcz5i2kikkq2yj39mxvk0iq7wzl1lbnsk648vh3plc6v10d8yvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW5qY3Jpc3RpYW5yb2phcy9VVENDbG9jayIsCiAgInV1aWQiOiAidXRjY2xvY2tAaW5qY3Jpc3RpYW5yb2phcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMyCn0="}, "43": {"version": "32", "sha256": "0qcz5i2kikkq2yj39mxvk0iq7wzl1lbnsk648vh3plc6v10d8yvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVUQyBjbG9jayBmb3IgdGhlIHRvcCBiYXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJVVENDbG9jayIsCiAgIm5hbWUiOiAiVVRDQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXRjY2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW5qY3Jpc3RpYW5yb2phcy9VVENDbG9jayIsCiAgInV1aWQiOiAidXRjY2xvY2tAaW5qY3Jpc3RpYW5yb2phcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMyCn0="}}} , {"uuid": "show-desktop-button@amivaleo", "name": "Show Desktop Button", "pname": "show-desktop-button", "description": "Minimize/unminimize all open windows with a single click.\n\nNOTE: I ignore bug reports sent here. Please use github.", "link": "https://extensions.gnome.org/extension/1194/show-desktop-button/", "shell_version_map": {"38": {"version": "17", "sha256": "0hq25s6kwkd857z5799598n8nx5dxvwy9xwnsrsad3n79pgl7rir", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW1pdmFsZW8vU2hvdy1EZXNrdG9wLUJ1dHRvbiIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWJ1dHRvbkBhbWl2YWxlbyIsCiAgInZlcnNpb24iOiAxNwp9"}, "40": {"version": "30", "sha256": "1gw8dy8kvx52n0mqmsb0lm4fjw4zgfcfi13fxb57y4g90397dlxv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaXZhbGVvL1Nob3ctRGVza3RvcC1CdXR0b24iLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1idXR0b25AYW1pdmFsZW8iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "41": {"version": "30", "sha256": "1gw8dy8kvx52n0mqmsb0lm4fjw4zgfcfi13fxb57y4g90397dlxv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaXZhbGVvL1Nob3ctRGVza3RvcC1CdXR0b24iLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1idXR0b25AYW1pdmFsZW8iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "42": {"version": "30", "sha256": "1gw8dy8kvx52n0mqmsb0lm4fjw4zgfcfi13fxb57y4g90397dlxv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaXZhbGVvL1Nob3ctRGVza3RvcC1CdXR0b24iLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1idXR0b25AYW1pdmFsZW8iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "43": {"version": "30", "sha256": "1gw8dy8kvx52n0mqmsb0lm4fjw4zgfcfi13fxb57y4g90397dlxv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5OT1RFOiBJIGlnbm9yZSBidWcgcmVwb3J0cyBzZW50IGhlcmUuIFBsZWFzZSB1c2UgZ2l0aHViLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYnV0dG9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWJ1dHRvbiIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEJ1dHRvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaXZhbGVvL1Nob3ctRGVza3RvcC1CdXR0b24iLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1idXR0b25AYW1pdmFsZW8iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}}} , {"uuid": "walkpaper@walkpaper.blinkbp.github.com", "name": "Walkpaper", "pname": "walkpaper", "description": "Set different wallpaper for each workspace by having the wallpaper switch on workspace change.", "link": "https://extensions.gnome.org/extension/1200/walkpaper/", "shell_version_map": {"40": {"version": "9", "sha256": "1ckrf3y20wp3dv4aig44rycj7kbrxj14gh3rzs17vcqma3aw76bq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBkaWZmZXJlbnQgd2FsbHBhcGVyIGZvciBlYWNoIHdvcmtzcGFjZSBieSBoYXZpbmcgdGhlIHdhbGxwYXBlciBzd2l0Y2ggb24gd29ya3NwYWNlIGNoYW5nZS4iLAogICJleHRlbnNpb24taWQiOiAid2Fsa3BhcGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZW5nbGlzaCIsCiAgIm5hbWUiOiAiV2Fsa3BhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndhbGtwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmxpbmtCUC93YWxrcGFwZXIiLAogICJ1dWlkIjogIndhbGtwYXBlckB3YWxrcGFwZXIuYmxpbmticC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1ckrf3y20wp3dv4aig44rycj7kbrxj14gh3rzs17vcqma3aw76bq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBkaWZmZXJlbnQgd2FsbHBhcGVyIGZvciBlYWNoIHdvcmtzcGFjZSBieSBoYXZpbmcgdGhlIHdhbGxwYXBlciBzd2l0Y2ggb24gd29ya3NwYWNlIGNoYW5nZS4iLAogICJleHRlbnNpb24taWQiOiAid2Fsa3BhcGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZW5nbGlzaCIsCiAgIm5hbWUiOiAiV2Fsa3BhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndhbGtwYXBlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmxpbmtCUC93YWxrcGFwZXIiLAogICJ1dWlkIjogIndhbGtwYXBlckB3YWxrcGFwZXIuYmxpbmticC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} -, {"uuid": "nasa_apod@elinvention.ovh", "name": "NASA APOD Wallpaper Changer", "pname": "nasa-apod", "description": "Change your wallpaper daily to the NASA's astronomy picture of the day", "link": "https://extensions.gnome.org/extension/1202/nasa-apod/", "shell_version_map": {"40": {"version": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, "41": {"version": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, "42": {"version": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, "43": {"version": "34", "sha256": "1klwfcz4jn1swwh9lwqrr75ncad9y4218f8asnsfhnd0mmxc3xjx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hc2EtYXBvZCIsCiAgInV1aWQiOiAibmFzYV9hcG9kQGVsaW52ZW50aW9uLm92aCIsCiAgInZlcnNpb24iOiAzNAp9"}}} +, {"uuid": "nasa_apod@elinvention.ovh", "name": "NASA APOD Wallpaper Changer", "pname": "nasa-apod", "description": "Change your wallpaper daily to the NASA's astronomy picture of the day", "link": "https://extensions.gnome.org/extension/1202/nasa-apod/", "shell_version_map": {"40": {"version": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, "41": {"version": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, "42": {"version": "33", "sha256": "1x0si8w2mzvb6msck3nvcgsn7day00cva58il04l9z53sj04d6b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9FbGludmVudGlvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmFzYS1hcG9kIiwKICAidXVpZCI6ICJuYXNhX2Fwb2RAZWxpbnZlbnRpb24ub3ZoIiwKICAidmVyc2lvbiI6IDMzCn0="}, "43": {"version": "35", "sha256": "166h6l5dvh9hj1h5jmxwn2lrp41h2gi8awybkwr28gdbynwyr01c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB5b3VyIHdhbGxwYXBlciBkYWlseSB0byB0aGUgTkFTQSdzIGFzdHJvbm9teSBwaWN0dXJlIG9mIHRoZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYXNhLWFwb2QiLAogICJuYW1lIjogIk5BU0EgQVBPRCBXYWxscGFwZXIgQ2hhbmdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYXNhLWFwb2QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5hc2EtYXBvZCIsCiAgInV1aWQiOiAibmFzYV9hcG9kQGVsaW52ZW50aW9uLm92aCIsCiAgInZlcnNpb24iOiAzNQp9"}}} , {"uuid": "SystemMenu@jonnius.github.com", "name": "System Menu", "pname": "system-menu", "description": "System menu with usefull shortcuts", "link": "https://extensions.gnome.org/extension/1204/system-menu/", "shell_version_map": {"38": {"version": "5", "sha256": "10zfr3fhqvq0fxqjzqmnxmhmdw5xcw9m5k3jm1apcjqnm38r896w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBtZW51IHdpdGggdXNlZnVsbCBzaG9ydGN1dHMiLAogICJuYW1lIjogIlN5c3RlbSBNZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlN5c3RlbU1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL2pvbm5pdXMvZ25vbWUtc3lzdGVtLW1lbnUiLAogICJ1dWlkIjogIlN5c3RlbU1lbnVAam9ubml1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "undecorate@sun.wxg@gmail.com", "name": "Undecorate Window", "pname": "undecorate", "description": "Add undecorate item in window menu. Use ALT+Space to show window menu.", "link": "https://extensions.gnome.org/extension/1208/undecorate/", "shell_version_map": {"40": {"version": "7", "sha256": "1ivk8x3sjdsyhjj10lfzdrhci7p1f8ws68nyml0vs7ypqdchihcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAidXVpZCI6ICJ1bmRlY29yYXRlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "1ivk8x3sjdsyhjj10lfzdrhci7p1f8ws68nyml0vs7ypqdchihcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAidXVpZCI6ICJ1bmRlY29yYXRlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "1ivk8x3sjdsyhjj10lfzdrhci7p1f8ws68nyml0vs7ypqdchihcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAidXVpZCI6ICJ1bmRlY29yYXRlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "1ivk8x3sjdsyhjj10lfzdrhci7p1f8ws68nyml0vs7ypqdchihcr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB1bmRlY29yYXRlIGl0ZW0gaW4gd2luZG93IG1lbnUuIFVzZSBBTFQrU3BhY2UgdG8gc2hvdyB3aW5kb3cgbWVudS4iLAogICJuYW1lIjogIlVuZGVjb3JhdGUgV2luZG93IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJzdW4ud3hnQGdtYWlsLmNvbSIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAidXVpZCI6ICJ1bmRlY29yYXRlQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "rcd@criztovyl.space", "name": "Right Click Down", "pname": "right-click-down", "description": "Moves windows one workspace down by right-clicking them in the overview.", "link": "https://extensions.gnome.org/extension/1210/right-click-down/", "shell_version_map": {"38": {"version": "3", "sha256": "1vh9capapzbbwg2zlw9iphdk48q6fqk0qsmaylvsvw59xc7f9bia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHdpbmRvd3Mgb25lIHdvcmtzcGFjZSBkb3duIGJ5IHJpZ2h0LWNsaWNraW5nIHRoZW0gaW4gdGhlIG92ZXJ2aWV3LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJyY2QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbmlvbnMtcmlnaHQtY2xpY2stZG93biIsCiAgIm5hbWUiOiAiUmlnaHQgQ2xpY2sgRG93biIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yaWdodC1jbGljay1kb3duIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4LjAiLAogICAgIjMuMzguMSIsCiAgICAiMy4zOC4yIiwKICAgICI0MC5hbHBoYSIsCiAgICAiNDAuYWxwaGEiLAogICAgIjMuMzguMyIsCiAgICAiMy4zNy45MiIsCiAgICAiMy4zNy45MSIsCiAgICAiMy4zNy45MCIsCiAgICAiMy4zNy4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vY3JpenRvdnlsL2dub21lLXJpZ2h0LWNsaWNrLWRvd24iLAogICJ1dWlkIjogInJjZEBjcml6dG92eWwuc3BhY2UiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1vh9capapzbbwg2zlw9iphdk48q6fqk0qsmaylvsvw59xc7f9bia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHdpbmRvd3Mgb25lIHdvcmtzcGFjZSBkb3duIGJ5IHJpZ2h0LWNsaWNraW5nIHRoZW0gaW4gdGhlIG92ZXJ2aWV3LiIsCiAgImV4dGVuc2lvbi1pZCI6ICJyY2QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbmlvbnMtcmlnaHQtY2xpY2stZG93biIsCiAgIm5hbWUiOiAiUmlnaHQgQ2xpY2sgRG93biIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yaWdodC1jbGljay1kb3duIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4LjAiLAogICAgIjMuMzguMSIsCiAgICAiMy4zOC4yIiwKICAgICI0MC5hbHBoYSIsCiAgICAiNDAuYWxwaGEiLAogICAgIjMuMzguMyIsCiAgICAiMy4zNy45MiIsCiAgICAiMy4zNy45MSIsCiAgICAiMy4zNy45MCIsCiAgICAiMy4zNy4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vY3JpenRvdnlsL2dub21lLXJpZ2h0LWNsaWNrLWRvd24iLAogICJ1dWlkIjogInJjZEBjcml6dG92eWwuc3BhY2UiLAogICJ2ZXJzaW9uIjogMwp9"}}} @@ -154,7 +154,7 @@ , {"uuid": "SomaFm-Radio@alireza6677.gmail.com", "name": "SomaFM internet radio", "pname": "somafm-internet-radio", "description": "Listen to SomaFm free internet radio in your GNOME desktop\n\n* Featues:\n- 32+ Channels\n- Volume slider\n- Favorites menu\n- Good sound quality\n- Supports most gnome-shell versions\n- Channel logos\n\n* Requirements:\n- Gstreamer and plugins:\nYou need to install 'gstreamer' and multimedia codecs/plugins for your distro.", "link": "https://extensions.gnome.org/extension/1237/somafm-internet-radio/", "shell_version_map": {"38": {"version": "29", "sha256": "07l6sa58azf3sav6858q48cbqazavq9bflfxdn0p9ys29h6mf50c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "40": {"version": "29", "sha256": "07l6sa58azf3sav6858q48cbqazavq9bflfxdn0p9ys29h6mf50c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}}} , {"uuid": "timepp@zagortenay333", "name": "Time ++", "pname": "time", "description": "A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarm clock", "link": "https://extensions.gnome.org/extension/1238/time/", "shell_version_map": {"38": {"version": "155", "sha256": "1v71hlwrw9kbxfvka5w8cfqmvcjw3k9xjdwhwlk4i4q5k6kgjih3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInRyYW5zbGF0aW9uc191cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvdGltZXBwX19nbm9tZS90cmVlL21hc3Rlci9kYXRhL3BvX2ZpbGVzIiwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUiLAogICJ1dWlkIjogInRpbWVwcEB6YWdvcnRlbmF5MzMzIiwKICAidmVyc2lvbiI6IDE1NQp9"}, "40": {"version": "163", "sha256": "0qb28jgpqz4nrigx2vjpsv2wfbnvkfk9rrc6aqgmh1mhhw3f7wfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidHJhbnNsYXRpb25zX3VybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy90aW1lcHBfX2dub21lL3RyZWUvbWFzdGVyL2RhdGEvcG9fZmlsZXMiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvdGltZXBwX19nbm9tZSIsCiAgInV1aWQiOiAidGltZXBwQHphZ29ydGVuYXkzMzMiLAogICJ2ZXJzaW9uIjogMTYzCn0="}, "41": {"version": "163", "sha256": "0qb28jgpqz4nrigx2vjpsv2wfbnvkfk9rrc6aqgmh1mhhw3f7wfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidHJhbnNsYXRpb25zX3VybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy90aW1lcHBfX2dub21lL3RyZWUvbWFzdGVyL2RhdGEvcG9fZmlsZXMiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvdGltZXBwX19nbm9tZSIsCiAgInV1aWQiOiAidGltZXBwQHphZ29ydGVuYXkzMzMiLAogICJ2ZXJzaW9uIjogMTYzCn0="}, "42": {"version": "165", "sha256": "1zf2nf3ymzj2177yn7qz98yv6avwr77ws57g37v3f1711cfsb222", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ0cmFuc2xhdGlvbnNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvdHJlZS9tYXN0ZXIvZGF0YS9wb19maWxlcyIsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy90aW1lcHBfX2dub21lIiwKICAidXVpZCI6ICJ0aW1lcHBAemFnb3J0ZW5heTMzMyIsCiAgInZlcnNpb24iOiAxNjUKfQ=="}}} , {"uuid": "obmin@konkor", "name": "Obmin", "pname": "obmin", "description": "One-Click File Sharing for your network.\nObmin is lightweight HTTP(S) File Server for GNU/Linux systems.\n\nFeatures:\n⚫ Easy installation.\n⚫ Easy setup just choose file(s) locations and tune Obmin on.\n⚫ Doesn't require ROOT privileges.\n⚫ Doesn't require any special client side installation.\n⚫ HTTP transfer protocol available everywhere Linux, OSX, Windows, Android, iOS so.\n⚫ More ...\n\nFor more information and how-to see README.md", "link": "https://extensions.gnome.org/extension/1254/obmin/", "shell_version_map": {"38": {"version": "25", "sha256": "14liv381k2gdgcsgaqsarfg0ycrg0whhq0jzzzdzvnk9vs8jdni8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "25", "sha256": "14liv381k2gdgcsgaqsarfg0ycrg0whhq0jzzzdzvnk9vs8jdni8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "41": {"version": "25", "sha256": "14liv381k2gdgcsgaqsarfg0ycrg0whhq0jzzzdzvnk9vs8jdni8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDI1Cn0="}}} -, {"uuid": "BingWallpaper@ineffable-gmail.com", "name": "Bing Wallpaper", "pname": "bing-wallpaper-changer", "description": "Sync your wallpaper to today's Microsoft Bing image of the day (the image you see when you visit Bing.com).\n\n *Disclaimer*: this extension is unofficial and not affiliated with Bing or Microsoft in any way. Images are protected by copyright and are licensed only for use as wallpapers.\n\nFeatures:\n* UHD resolution wallpapers\n* Automatically fetches current Bing wallpaper of the day and sets as both lock screen and desktop wallpaper (user selectable on GNOME versions that support it)\n* Doesn't poll continuously - only once per day and on startup (schedules a refresh when Bing is due to update)\n * random mode (from previously downloaded wallpapers)\n *NEW: select/cycle wallpaper through previously downloaded images\n* Language support: English (en), German (de), Dutch (nl), Italian (it), Polish (pl), Chinese (zh_CN, zh_TW), French (fr_FR), Portuguese (pt, pt_BR), Ukrainian (uk), Russian (ru_RU), Spanish (es), Korean (ko), Indonesian (id), Catalan (ca), Norwegian Bokmål (nb) & Nynorsk (ni), Swedish (sv), Arabic (ar), Hungarian (hu) and Japanese (ja) - a HUGE thanks to the translators\n\nThis extension was forked from the NASA APOD extension by Elinvention (https://github.com/Elinvention) and inspired by Bing Desktop Wallpaper Changer by Utkarsh Gupta (https://github.com/UtkarshGpta).\n\nAlways restart GNOME after manually updating extensions. Please report bugs to the GitHub page below:", "link": "https://extensions.gnome.org/extension/1262/bing-wallpaper-changer/", "shell_version_map": {"38": {"version": "43", "sha256": "1bhd491i0kzn8ia55wgrw99jvz5jrjxhxq9bf44cw542pica5zkb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "40": {"version": "43", "sha256": "1bhd491i0kzn8ia55wgrw99jvz5jrjxhxq9bf44cw542pica5zkb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "41": {"version": "43", "sha256": "1bhd491i0kzn8ia55wgrw99jvz5jrjxhxq9bf44cw542pica5zkb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "42": {"version": "43", "sha256": "1bhd491i0kzn8ia55wgrw99jvz5jrjxhxq9bf44cw542pica5zkb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}, "43": {"version": "43", "sha256": "1bhd491i0kzn8ia55wgrw99jvz5jrjxhxq9bf44cw542pica5zkb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQzCn0="}}} +, {"uuid": "BingWallpaper@ineffable-gmail.com", "name": "Bing Wallpaper", "pname": "bing-wallpaper-changer", "description": "Sync your wallpaper to today's Microsoft Bing image of the day (the image you see when you visit Bing.com).\n\n *Disclaimer*: this extension is unofficial and not affiliated with Bing or Microsoft in any way. Images are protected by copyright and are licensed only for use as wallpapers.\n\nFeatures:\n* UHD resolution wallpapers\n* Automatically fetches current Bing wallpaper of the day and sets as both lock screen and desktop wallpaper (user selectable on GNOME versions that support it)\n* Doesn't poll continuously - only once per day and on startup (schedules a refresh when Bing is due to update)\n * random mode (from previously downloaded wallpapers)\n *NEW: select/cycle wallpaper through previously downloaded images\n* Language support: English (en), German (de), Dutch (nl), Italian (it), Polish (pl), Chinese (zh_CN, zh_TW), French (fr_FR), Portuguese (pt, pt_BR), Ukrainian (uk), Russian (ru_RU), Spanish (es), Korean (ko), Indonesian (id), Catalan (ca), Norwegian Bokmål (nb) & Nynorsk (ni), Swedish (sv), Arabic (ar), Hungarian (hu) and Japanese (ja) - a HUGE thanks to the translators\n\nThis extension was forked from the NASA APOD extension by Elinvention (https://github.com/Elinvention) and inspired by Bing Desktop Wallpaper Changer by Utkarsh Gupta (https://github.com/UtkarshGpta).\n\nAlways restart GNOME after manually updating extensions. Please report bugs to the GitHub page below:", "link": "https://extensions.gnome.org/extension/1262/bing-wallpaper-changer/", "shell_version_map": {"38": {"version": "44", "sha256": "0cij7hp4197qnjfzxx68798fmqxxz4xa0jlc6kvnc1gphg891gdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}, "40": {"version": "44", "sha256": "0cij7hp4197qnjfzxx68798fmqxxz4xa0jlc6kvnc1gphg891gdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}, "41": {"version": "44", "sha256": "0cij7hp4197qnjfzxx68798fmqxxz4xa0jlc6kvnc1gphg891gdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}, "42": {"version": "44", "sha256": "0cij7hp4197qnjfzxx68798fmqxxz4xa0jlc6kvnc1gphg891gdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}, "43": {"version": "44", "sha256": "0cij7hp4197qnjfzxx68798fmqxxz4xa0jlc6kvnc1gphg891gdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5bmMgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cbkZlYXR1cmVzOlxuKiBVSEQgcmVzb2x1dGlvbiB3YWxscGFwZXJzXG4qIEF1dG9tYXRpY2FsbHkgZmV0Y2hlcyBjdXJyZW50IEJpbmcgd2FsbHBhcGVyIG9mIHRoZSBkYXkgYW5kIHNldHMgYXMgYm90aCBsb2NrIHNjcmVlbiBhbmQgZGVza3RvcCB3YWxscGFwZXIgKHVzZXIgc2VsZWN0YWJsZSBvbiBHTk9NRSB2ZXJzaW9ucyB0aGF0IHN1cHBvcnQgaXQpXG4qIERvZXNuJ3QgcG9sbCBjb250aW51b3VzbHkgLSBvbmx5IG9uY2UgcGVyIGRheSBhbmQgb24gc3RhcnR1cCAoc2NoZWR1bGVzIGEgcmVmcmVzaCB3aGVuIEJpbmcgaXMgZHVlIHRvIHVwZGF0ZSlcbiAqIHJhbmRvbSBtb2RlIChmcm9tIHByZXZpb3VzbHkgZG93bmxvYWRlZCB3YWxscGFwZXJzKVxuICpORVc6IHNlbGVjdC9jeWNsZSB3YWxscGFwZXIgdGhyb3VnaCBwcmV2aW91c2x5IGRvd25sb2FkZWQgaW1hZ2VzXG4qIExhbmd1YWdlIHN1cHBvcnQ6IEVuZ2xpc2ggKGVuKSwgR2VybWFuIChkZSksIER1dGNoIChubCksIEl0YWxpYW4gKGl0KSwgUG9saXNoIChwbCksIENoaW5lc2UgKHpoX0NOLCB6aF9UVyksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBVa3JhaW5pYW4gKHVrKSwgUnVzc2lhbiAocnVfUlUpLCBTcGFuaXNoIChlcyksIEtvcmVhbiAoa28pLCBJbmRvbmVzaWFuIChpZCksIENhdGFsYW4gKGNhKSwgTm9yd2VnaWFuIEJva21cdTAwZTVsIChuYikgJiBOeW5vcnNrIChuaSksIFN3ZWRpc2ggKHN2KSwgQXJhYmljIChhciksIEh1bmdhcmlhbiAoaHUpIGFuZCBKYXBhbmVzZSAoamEpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuVGhpcyBleHRlbnNpb24gd2FzIGZvcmtlZCBmcm9tIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25lZmZvL2Jpbmctd2FsbHBhcGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQmluZ1dhbGxwYXBlckBpbmVmZmFibGUtZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQ0Cn0="}}} , {"uuid": "gnomesome@chwick.github.com", "name": "Gnomesome", "pname": "gnomesome", "description": "Tiling window manager with awesome keybindings", "link": "https://extensions.gnome.org/extension/1268/gnomesome/", "shell_version_map": {"38": {"version": "15", "sha256": "1dn67is3qk80xxfkc2pd43jrsyylmsprd7v3axvl677wdjgaq83z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGluZyB3aW5kb3cgbWFuYWdlciB3aXRoIGF3ZXNvbWUga2V5YmluZGluZ3MiLAogICJuYW1lIjogIkdub21lc29tZSIsCiAgInNldHRpbmdzLWtleWJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lc29tZS5rZXliaW5kaW5ncyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Nod2ljay9nbm9tZXNvbWUiLAogICJ1dWlkIjogImdub21lc29tZUBjaHdpY2suZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNQp9"}}} , {"uuid": "gnome-vagrant-indicator@gnome-shell-exstensions.fffilo.github.com", "name": "GNOME Vagrant Indicator", "pname": "gnome-vagrant-indicator", "description": "Easily manage your vagrant machines from status area", "link": "https://extensions.gnome.org/extension/1269/gnome-vagrant-indicator/", "shell_version_map": {"40": {"version": "15", "sha256": "0ca6jssz9h2dycs4ash89j0c8mwsxhlbc4mf684zfxih30fj43hl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEiLAogICJkZXNjcmlwdGlvbi1odG1sIjogIkluc3BpcmVkIGJ5IDxhIGhyZWY9XCJodHRwczovL2dpdGh1Yi5jb20vY2FuZGlkdGltL3ZhZ3JhbnQtYXBwaW5kaWNhdG9yXCI+dmdhcHBsZXQ8L2E+LFxuPGI+R05PTUUgVmFncmFudCBJbmRpY2F0b3I8L2I+IGxldHMgeW91IGVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJsaWNlbnNlIjogIkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjAiLAogICJsaWNlbnNlLWh0bWwiOiAiVGhpcyBwcm9ncmFtIGNvbWVzIHdpdGggQUJTT0xVVEVMWSBOTyBXQVJSQU5UWS5cblNlZSB0aGUgPGEgaHJlZj1cImh0dHBzOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvZ3BsLTMuMC5odG1sXCI+R05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMDwvYT4gZm9yIGRldGFpbHMuIiwKICAibmFtZSI6ICJHTk9NRSBWYWdyYW50IEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyA8YSBocmVmPVwibWFpbHRvOmZmZmlsbzY2NkBnbWFpbC5jb21cIj4mbHQ7ZmZmaWxvNjY2QGdtYWlsLmNvbSZndDs8L2E+IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXZhZ3JhbnQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmZpbG8vZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdub21lLXZhZ3JhbnQtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "0ca6jssz9h2dycs4ash89j0c8mwsxhlbc4mf684zfxih30fj43hl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEiLAogICJkZXNjcmlwdGlvbi1odG1sIjogIkluc3BpcmVkIGJ5IDxhIGhyZWY9XCJodHRwczovL2dpdGh1Yi5jb20vY2FuZGlkdGltL3ZhZ3JhbnQtYXBwaW5kaWNhdG9yXCI+dmdhcHBsZXQ8L2E+LFxuPGI+R05PTUUgVmFncmFudCBJbmRpY2F0b3I8L2I+IGxldHMgeW91IGVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJsaWNlbnNlIjogIkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjAiLAogICJsaWNlbnNlLWh0bWwiOiAiVGhpcyBwcm9ncmFtIGNvbWVzIHdpdGggQUJTT0xVVEVMWSBOTyBXQVJSQU5UWS5cblNlZSB0aGUgPGEgaHJlZj1cImh0dHBzOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvZ3BsLTMuMC5odG1sXCI+R05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMDwvYT4gZm9yIGRldGFpbHMuIiwKICAibmFtZSI6ICJHTk9NRSBWYWdyYW50IEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyA8YSBocmVmPVwibWFpbHRvOmZmZmlsbzY2NkBnbWFpbC5jb21cIj4mbHQ7ZmZmaWxvNjY2QGdtYWlsLmNvbSZndDs8L2E+IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXZhZ3JhbnQtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmZpbG8vZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdub21lLXZhZ3JhbnQtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "17", "sha256": "1nwyjh48rs18scgmr5ghgm15x4azmx83mad7s91fx8cbb8h7l71h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVhc2lseSBtYW5hZ2UgeW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEiLAogICJkZXNjcmlwdGlvbi1odG1sIjogIkluc3BpcmVkIGJ5IDxhIGhyZWY9XCJodHRwczovL2dpdGh1Yi5jb20vY2FuZGlkdGltL3ZhZ3JhbnQtYXBwaW5kaWNhdG9yXCI+dmdhcHBsZXQ8L2E+LDxiciAvPjxiPkdOT01FIFZhZ3JhbnQgSW5kaWNhdG9yPC9iPiBsZXRzIHlvdSBlYXNpbHkgbWFuYWdlPGJyIC8+eW91ciB2YWdyYW50IG1hY2hpbmVzIGZyb20gc3RhdHVzIGFyZWEuIiwKICAiZG9uYXRpb24iOiAiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9mZmZpbG8iLAogICJkb25hdGlvbi1odG1sIjogIklmIHlvdSBmaW5kIHRoaXMgcHJvamVjdCB1c2VmdWwgeW91IG1heSBjb25zaWRlciB0aGUgb3B0aW9uIHRvPGJyLz5idXkgbWUgYSBiZWVyLCBpbiByZWFsIGxpZmUgb3IgdGhyb3VnaCA8YSBocmVmPVwiaHR0cHM6Ly93d3cuYnV5bWVhY29mZmVlLmNvbS9mZmZpbG9cIj5kb25hdGlvbjwvYT4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJsaWNlbnNlIjogIkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjAiLAogICJsaWNlbnNlLWh0bWwiOiAiVGhpcyBwcm9ncmFtIGNvbWVzIHdpdGggQUJTT0xVVEVMWSBOTyBXQVJSQU5UWS48YnIgLz5TZWUgdGhlIDxhIGhyZWY9XCJodHRwczovL3d3dy5nbnUub3JnL2xpY2Vuc2VzL2dwbC0zLjAuaHRtbFwiPkdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIHYzLjA8L2E+IGZvciBkZXRhaWxzLiIsCiAgIm5hbWUiOiAiR05PTUUgVmFncmFudCBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gPGEgaHJlZj1cIm1haWx0bzpmZmZpbG82NjZAZ21haWwuY29tXCI+Jmx0O2ZmZmlsbzY2NkBnbWFpbC5jb20mZ3Q7PC9hPiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS12YWdyYW50LWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmZpbG8vZ25vbWUtdmFncmFudC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImdub21lLXZhZ3JhbnQtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} , {"uuid": "prime-indicator@gnome-shell-exstensions.fffilo.github.com", "name": "Prime Indicator", "pname": "prime-indicator", "description": "Intel/NVIDIA GPU Switch", "link": "https://extensions.gnome.org/extension/1275/prime-indicator/", "shell_version_map": {"40": {"version": "10", "sha256": "0p8yrdryw4f6a4llsqlv0415hb08lkgjf8q6vb8b14y736hphzns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL05WSURJQSBHUFUgU3dpdGNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICJHTk9NRSBzaGVsbCBleHRlbnNpb24gdGhhdCBhZGRzIEludGVsL05WSURJQSBHUFUgc3dpdGNoIHRvIGFnZ3JlZ2F0ZSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInByaW1lLWluZGljYXRvciIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIlByaW1lIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyAmbHQ7PGEgaHJlZj1cIm1haWx0bzpmZmZpbG82NjZAZ21haWwuY29tXCI+ZmZmaWxvNjY2QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW1lLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmZmaWxvL3ByaW1lLWluZGljYXRvciIsCiAgInV1aWQiOiAicHJpbWUtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0p8yrdryw4f6a4llsqlv0415hb08lkgjf8q6vb8b14y736hphzns", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL05WSURJQSBHUFUgU3dpdGNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICJHTk9NRSBzaGVsbCBleHRlbnNpb24gdGhhdCBhZGRzIEludGVsL05WSURJQSBHUFUgc3dpdGNoIHRvIGFnZ3JlZ2F0ZSBtZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogInByaW1lLWluZGljYXRvciIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIlByaW1lIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJGcmFuam8gRmlsbyA8ZmZmaWxvNjY2QGdtYWlsLmNvbT4iLAogICJvcmlnaW5hbC1hdXRob3ItaHRtbCI6ICJGcmFuam8gRmlsbyAmbHQ7PGEgaHJlZj1cIm1haWx0bzpmZmZpbG82NjZAZ21haWwuY29tXCI+ZmZmaWxvNjY2QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnByaW1lLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmZmaWxvL3ByaW1lLWluZGljYXRvciIsCiAgInV1aWQiOiAicHJpbWUtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "13", "sha256": "0cm6m0w9rv99l68v1xkn4ry0k6b1y8kmpblldzjd7f560zz8h64h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL05WSURJQSBHUFUgU3dpdGNoIiwKICAiZGVzY3JpcHRpb24taHRtbCI6ICJHTk9NRSBzaGVsbCBleHRlbnNpb24gdGhhdCBhZGRzIEludGVsL05WSURJQSBHUFUgc3dpdGNoIHRvIGFnZ3JlZ2F0ZSBtZW51LiIsCiAgImRvbmF0aW9uIjogImh0dHBzOi8vd3d3LmJ1eW1lYWNvZmZlZS5jb20vZmZmaWxvIiwKICAiZG9uYXRpb24taHRtbCI6ICJJZiB5b3UgZmluZCB0aGlzIHByb2plY3QgdXNlZnVsIHlvdSBtYXkgY29uc2lkZXIgdGhlIG9wdGlvbiB0bzxici8+YnV5IG1lIGEgYmVlciwgaW4gcmVhbCBsaWZlIG9yIHRocm91Z2ggPGEgaHJlZj1cImh0dHBzOi8vd3d3LmJ1eW1lYWNvZmZlZS5jb20vZmZmaWxvXCI+ZG9uYXRpb248L2E+LiIsCiAgImdldHRleHQtZG9tYWluIjogInByaW1lLWluZGljYXRvciIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLjxiciAvPlNlZSB0aGUgPGEgaHJlZj1cImh0dHBzOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvZ3BsLTMuMC5odG1sXCI+R05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMDwvYT4gZm9yIGRldGFpbHMuIiwKICAibmFtZSI6ICJQcmltZSBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcmltZS1pbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmZmaWxvL3ByaW1lLWluZGljYXRvciIsCiAgInVybC1kb25hdGlvbiI6ICJodHRwczovL3d3dy5idXltZWFjb2ZmZWUuY29tL2ZmZmlsbyIsCiAgInV1aWQiOiAicHJpbWUtaW5kaWNhdG9yQGdub21lLXNoZWxsLWV4c3RlbnNpb25zLmZmZmlsby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} @@ -253,8 +253,8 @@ , {"uuid": "application_view_when_empty@fawtytoo", "name": "Show Application View When Workspace Empty", "pname": "show-application-view-when-workspace-empty", "description": "Shows the application view when the workspace is or becomes empty, such as switching to an empty workspace, when all windows on a workspace are closed, or after login. Starting applications or switching to a workspace with open windows will hide the application view if it's showing.\nFrom version 22, this extension waits for any window closing animation to complete (if enabled) before showing the application view.", "link": "https://extensions.gnome.org/extension/2036/show-application-view-when-workspace-empty/", "shell_version_map": {"38": {"version": "26", "sha256": "0jiys746bz0knqlh7yxmdd3839jkmsdjzpbchgigbwrd4ya67fsp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNgp9"}, "40": {"version": "26", "sha256": "0jiys746bz0knqlh7yxmdd3839jkmsdjzpbchgigbwrd4ya67fsp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNgp9"}, "41": {"version": "26", "sha256": "0jiys746bz0knqlh7yxmdd3839jkmsdjzpbchgigbwrd4ya67fsp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "26", "sha256": "0jiys746bz0knqlh7yxmdd3839jkmsdjzpbchgigbwrd4ya67fsp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBhcHBsaWNhdGlvbiB2aWV3IHdoZW4gdGhlIHdvcmtzcGFjZSBpcyBvciBiZWNvbWVzIGVtcHR5LCBzdWNoIGFzIHN3aXRjaGluZyB0byBhbiBlbXB0eSB3b3Jrc3BhY2UsIHdoZW4gYWxsIHdpbmRvd3Mgb24gYSB3b3Jrc3BhY2UgYXJlIGNsb3NlZCwgb3IgYWZ0ZXIgbG9naW4uIFN0YXJ0aW5nIGFwcGxpY2F0aW9ucyBvciBzd2l0Y2hpbmcgdG8gYSB3b3Jrc3BhY2Ugd2l0aCBvcGVuIHdpbmRvd3Mgd2lsbCBoaWRlIHRoZSBhcHBsaWNhdGlvbiB2aWV3IGlmIGl0J3Mgc2hvd2luZy5cbkZyb20gdmVyc2lvbiAyMiwgdGhpcyBleHRlbnNpb24gd2FpdHMgZm9yIGFueSB3aW5kb3cgY2xvc2luZyBhbmltYXRpb24gdG8gY29tcGxldGUgKGlmIGVuYWJsZWQpIGJlZm9yZSBzaG93aW5nIHRoZSBhcHBsaWNhdGlvbiB2aWV3LiIsCiAgIm5hbWUiOiAiU2hvdyBBcHBsaWNhdGlvbiBWaWV3IFdoZW4gV29ya3NwYWNlIEVtcHR5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFwcGxpY2F0aW9uX3ZpZXdfd2hlbl9lbXB0eUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyNgp9"}}} , {"uuid": "activities_icon_menu@fawtytoo", "name": "Activities Icon Menu", "pname": "activities-menu-for-apps-and-windows", "description": "NO LONGER MAINTAINED.\n\nThis extension turns the Activities button into a popup menu with icons for selecting either Applications or Workspaces in the Overview. Selecting the same view again will hide the overview.\n\nThis is particularly useful for tablet users that find the Activities button difficult to click on, whereas a menu can be more easily invoked.", "link": "https://extensions.gnome.org/extension/2048/activities-menu-for-apps-and-windows/", "shell_version_map": {"38": {"version": "11", "sha256": "1jq6bprdy2j7fdk988ch9bcawjwnkdvhb5s59aknmfl1k2r3mpmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PIExPTkdFUiBNQUlOVEFJTkVELlxuXG5UaGlzIGV4dGVuc2lvbiB0dXJucyB0aGUgQWN0aXZpdGllcyBidXR0b24gaW50byBhIHBvcHVwIG1lbnUgd2l0aCBpY29ucyBmb3Igc2VsZWN0aW5nIGVpdGhlciBBcHBsaWNhdGlvbnMgb3IgV29ya3NwYWNlcyBpbiB0aGUgT3ZlcnZpZXcuIFNlbGVjdGluZyB0aGUgc2FtZSB2aWV3IGFnYWluIHdpbGwgaGlkZSB0aGUgb3ZlcnZpZXcuXG5cblRoaXMgaXMgcGFydGljdWxhcmx5IHVzZWZ1bCBmb3IgdGFibGV0IHVzZXJzIHRoYXQgZmluZCB0aGUgQWN0aXZpdGllcyBidXR0b24gZGlmZmljdWx0IHRvIGNsaWNrIG9uLCB3aGVyZWFzIGEgbWVudSBjYW4gYmUgbW9yZSBlYXNpbHkgaW52b2tlZC4iLAogICJuYW1lIjogIkFjdGl2aXRpZXMgSWNvbiBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFjdGl2aXRpZXNfaWNvbl9tZW51QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "1jq6bprdy2j7fdk988ch9bcawjwnkdvhb5s59aknmfl1k2r3mpmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PIExPTkdFUiBNQUlOVEFJTkVELlxuXG5UaGlzIGV4dGVuc2lvbiB0dXJucyB0aGUgQWN0aXZpdGllcyBidXR0b24gaW50byBhIHBvcHVwIG1lbnUgd2l0aCBpY29ucyBmb3Igc2VsZWN0aW5nIGVpdGhlciBBcHBsaWNhdGlvbnMgb3IgV29ya3NwYWNlcyBpbiB0aGUgT3ZlcnZpZXcuIFNlbGVjdGluZyB0aGUgc2FtZSB2aWV3IGFnYWluIHdpbGwgaGlkZSB0aGUgb3ZlcnZpZXcuXG5cblRoaXMgaXMgcGFydGljdWxhcmx5IHVzZWZ1bCBmb3IgdGFibGV0IHVzZXJzIHRoYXQgZmluZCB0aGUgQWN0aXZpdGllcyBidXR0b24gZGlmZmljdWx0IHRvIGNsaWNrIG9uLCB3aGVyZWFzIGEgbWVudSBjYW4gYmUgbW9yZSBlYXNpbHkgaW52b2tlZC4iLAogICJuYW1lIjogIkFjdGl2aXRpZXMgSWNvbiBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFjdGl2aXRpZXNfaWNvbl9tZW51QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "1jq6bprdy2j7fdk988ch9bcawjwnkdvhb5s59aknmfl1k2r3mpmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PIExPTkdFUiBNQUlOVEFJTkVELlxuXG5UaGlzIGV4dGVuc2lvbiB0dXJucyB0aGUgQWN0aXZpdGllcyBidXR0b24gaW50byBhIHBvcHVwIG1lbnUgd2l0aCBpY29ucyBmb3Igc2VsZWN0aW5nIGVpdGhlciBBcHBsaWNhdGlvbnMgb3IgV29ya3NwYWNlcyBpbiB0aGUgT3ZlcnZpZXcuIFNlbGVjdGluZyB0aGUgc2FtZSB2aWV3IGFnYWluIHdpbGwgaGlkZSB0aGUgb3ZlcnZpZXcuXG5cblRoaXMgaXMgcGFydGljdWxhcmx5IHVzZWZ1bCBmb3IgdGFibGV0IHVzZXJzIHRoYXQgZmluZCB0aGUgQWN0aXZpdGllcyBidXR0b24gZGlmZmljdWx0IHRvIGNsaWNrIG9uLCB3aGVyZWFzIGEgbWVudSBjYW4gYmUgbW9yZSBlYXNpbHkgaW52b2tlZC4iLAogICJuYW1lIjogIkFjdGl2aXRpZXMgSWNvbiBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFjdGl2aXRpZXNfaWNvbl9tZW51QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "1jq6bprdy2j7fdk988ch9bcawjwnkdvhb5s59aknmfl1k2r3mpmg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5PIExPTkdFUiBNQUlOVEFJTkVELlxuXG5UaGlzIGV4dGVuc2lvbiB0dXJucyB0aGUgQWN0aXZpdGllcyBidXR0b24gaW50byBhIHBvcHVwIG1lbnUgd2l0aCBpY29ucyBmb3Igc2VsZWN0aW5nIGVpdGhlciBBcHBsaWNhdGlvbnMgb3IgV29ya3NwYWNlcyBpbiB0aGUgT3ZlcnZpZXcuIFNlbGVjdGluZyB0aGUgc2FtZSB2aWV3IGFnYWluIHdpbGwgaGlkZSB0aGUgb3ZlcnZpZXcuXG5cblRoaXMgaXMgcGFydGljdWxhcmx5IHVzZWZ1bCBmb3IgdGFibGV0IHVzZXJzIHRoYXQgZmluZCB0aGUgQWN0aXZpdGllcyBidXR0b24gZGlmZmljdWx0IHRvIGNsaWNrIG9uLCB3aGVyZWFzIGEgbWVudSBjYW4gYmUgbW9yZSBlYXNpbHkgaW52b2tlZC4iLAogICJuYW1lIjogIkFjdGl2aXRpZXMgSWNvbiBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFjdGl2aXRpZXNfaWNvbl9tZW51QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "Gold_Price_Monitor@wotmshuaisi_github", "name": "Gold Price Monitor", "pname": "gold-price-monitor", "description": "simple gnome extension helps you tracking gold price in realtime", "link": "https://extensions.gnome.org/extension/2075/gold-price-monitor/", "shell_version_map": {"40": {"version": "27", "sha256": "13km181vzf13id19xrv2b1mbry6378c9vhhpzm9agplgka104xap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "41": {"version": "27", "sha256": "13km181vzf13id19xrv2b1mbry6378c9vhhpzm9agplgka104xap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "27", "sha256": "13km181vzf13id19xrv2b1mbry6378c9vhhpzm9agplgka104xap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "43": {"version": "27", "sha256": "13km181vzf13id19xrv2b1mbry6378c9vhhpzm9agplgka104xap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhbmdlcm91cyI6IGZhbHNlLAogICJkZXNjcmlwdGlvbiI6ICJzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIGhlbHBzIHlvdSB0cmFja2luZyBnb2xkIHByaWNlIGluIHJlYWx0aW1lIiwKICAibmFtZSI6ICJHb2xkIFByaWNlIE1vbml0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ29sZC1wcmljZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3dvdG1zaHVhaXNpL2dvbGRwcmljZW1vbml0b3IiLAogICJ1dWlkIjogIkdvbGRfUHJpY2VfTW9uaXRvckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} -, {"uuid": "ding@rastersoft.com", "name": "Desktop Icons NG (DING)", "pname": "desktop-icons-ng-ding", "description": "Adds icons to the desktop. Fork of the original Desktop Icons extension, with several enhancements .", "link": "https://extensions.gnome.org/extension/2087/desktop-icons-ng-ding/", "shell_version_map": {"38": {"version": "52", "sha256": "121zylcg1c171j3fd7mp5l0fnv57h7n4bnys7nmd9sixzf1v7hhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "40": {"version": "52", "sha256": "121zylcg1c171j3fd7mp5l0fnv57h7n4bnys7nmd9sixzf1v7hhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "41": {"version": "52", "sha256": "121zylcg1c171j3fd7mp5l0fnv57h7n4bnys7nmd9sixzf1v7hhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "42": {"version": "52", "sha256": "121zylcg1c171j3fd7mp5l0fnv57h7n4bnys7nmd9sixzf1v7hhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}, "43": {"version": "52", "sha256": "121zylcg1c171j3fd7mp5l0fnv57h7n4bnys7nmd9sixzf1v7hhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1Mgp9"}}} -, {"uuid": "order-extensions@wa4557.github.com", "name": "Order Gnome Shell extensions", "pname": "order-gnome-shell-extensions", "description": "Fixes order of gnome-shell extensions", "link": "https://extensions.gnome.org/extension/2114/order-gnome-shell-extensions/", "shell_version_map": {"38": {"version": "6", "sha256": "0hcbjrhrg11f5p23bhss75nhc9sqlh6p1bmfq7p7m7d276ckdmkk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICIzLjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm9yZGVyLWV4dGVuc2lvbnNAd2E0NTU3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "13", "sha256": "1ld85pl6d5axmy6413x8dsb1n7g98qja0065fz6h1f924c23wqh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "1ld85pl6d5axmy6413x8dsb1n7g98qja0065fz6h1f924c23wqh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "1ld85pl6d5axmy6413x8dsb1n7g98qja0065fz6h1f924c23wqh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "13", "sha256": "1ld85pl6d5axmy6413x8dsb1n7g98qja0065fz6h1f924c23wqh5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} +, {"uuid": "ding@rastersoft.com", "name": "Desktop Icons NG (DING)", "pname": "desktop-icons-ng-ding", "description": "Adds icons to the desktop. Fork of the original Desktop Icons extension, with several enhancements .", "link": "https://extensions.gnome.org/extension/2087/desktop-icons-ng-ding/", "shell_version_map": {"38": {"version": "54", "sha256": "0k7djhv1i36rs193zm2nxbqn60dwi4d6lx166zch4p3ivr39bcvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}, "40": {"version": "54", "sha256": "0k7djhv1i36rs193zm2nxbqn60dwi4d6lx166zch4p3ivr39bcvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}, "41": {"version": "54", "sha256": "0k7djhv1i36rs193zm2nxbqn60dwi4d6lx166zch4p3ivr39bcvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}, "42": {"version": "54", "sha256": "0k7djhv1i36rs193zm2nxbqn60dwi4d6lx166zch4p3ivr39bcvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}, "43": {"version": "54", "sha256": "0k7djhv1i36rs193zm2nxbqn60dwi4d6lx166zch4p3ivr39bcvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgaWNvbnMgdG8gdGhlIGRlc2t0b3AuIEZvcmsgb2YgdGhlIG9yaWdpbmFsIERlc2t0b3AgSWNvbnMgZXh0ZW5zaW9uLCB3aXRoIHNldmVyYWwgZW5oYW5jZW1lbnRzIC4iLAogICJuYW1lIjogIkRlc2t0b3AgSWNvbnMgTkcgKERJTkcpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3Jhc3RlcnNvZnQvZGVza3RvcC1pY29ucy1uZyIsCiAgInV1aWQiOiAiZGluZ0ByYXN0ZXJzb2Z0LmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}}} +, {"uuid": "order-extensions@wa4557.github.com", "name": "Order Gnome Shell extensions", "pname": "order-gnome-shell-extensions", "description": "Fixes order of gnome-shell extensions in the panel (also with items added by other extensions such as https://extensions.gnome.org/extension/615/appindicator-support/) . The order can be set for each item individually via settings.\nBug reports and issues please here https://github.com/andia89/order-icons/issues", "link": "https://extensions.gnome.org/extension/2114/order-gnome-shell-extensions/", "shell_version_map": {"38": {"version": "6", "sha256": "17nd8jddb9hvb8rz7nvrd9nabbv5zmlxj0y16d1y5jbjqnm6snaa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIGluIHRoZSBwYW5lbCAoYWxzbyB3aXRoIGl0ZW1zIGFkZGVkIGJ5IG90aGVyIGV4dGVuc2lvbnMgc3VjaCBhcyBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MTUvYXBwaW5kaWNhdG9yLXN1cHBvcnQvKSAuIFRoZSBvcmRlciBjYW4gYmUgc2V0IGZvciBlYWNoIGl0ZW0gaW5kaXZpZHVhbGx5IHZpYSBzZXR0aW5ncy5cbkJ1ZyByZXBvcnRzIGFuZCBpc3N1ZXMgcGxlYXNlIGhlcmUgaHR0cHM6Ly9naXRodWIuY29tL2FuZGlhODkvb3JkZXItaWNvbnMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICIzLjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm9yZGVyLWV4dGVuc2lvbnNAd2E0NTU3LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "13", "sha256": "0hwh0w3bwl5nsdahii43j7ac792ciabsdsp8xarnrkbfvlafb2lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIGluIHRoZSBwYW5lbCAoYWxzbyB3aXRoIGl0ZW1zIGFkZGVkIGJ5IG90aGVyIGV4dGVuc2lvbnMgc3VjaCBhcyBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MTUvYXBwaW5kaWNhdG9yLXN1cHBvcnQvKSAuIFRoZSBvcmRlciBjYW4gYmUgc2V0IGZvciBlYWNoIGl0ZW0gaW5kaXZpZHVhbGx5IHZpYSBzZXR0aW5ncy5cbkJ1ZyByZXBvcnRzIGFuZCBpc3N1ZXMgcGxlYXNlIGhlcmUgaHR0cHM6Ly9naXRodWIuY29tL2FuZGlhODkvb3JkZXItaWNvbnMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "0hwh0w3bwl5nsdahii43j7ac792ciabsdsp8xarnrkbfvlafb2lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIGluIHRoZSBwYW5lbCAoYWxzbyB3aXRoIGl0ZW1zIGFkZGVkIGJ5IG90aGVyIGV4dGVuc2lvbnMgc3VjaCBhcyBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MTUvYXBwaW5kaWNhdG9yLXN1cHBvcnQvKSAuIFRoZSBvcmRlciBjYW4gYmUgc2V0IGZvciBlYWNoIGl0ZW0gaW5kaXZpZHVhbGx5IHZpYSBzZXR0aW5ncy5cbkJ1ZyByZXBvcnRzIGFuZCBpc3N1ZXMgcGxlYXNlIGhlcmUgaHR0cHM6Ly9naXRodWIuY29tL2FuZGlhODkvb3JkZXItaWNvbnMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "0hwh0w3bwl5nsdahii43j7ac792ciabsdsp8xarnrkbfvlafb2lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIGluIHRoZSBwYW5lbCAoYWxzbyB3aXRoIGl0ZW1zIGFkZGVkIGJ5IG90aGVyIGV4dGVuc2lvbnMgc3VjaCBhcyBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MTUvYXBwaW5kaWNhdG9yLXN1cHBvcnQvKSAuIFRoZSBvcmRlciBjYW4gYmUgc2V0IGZvciBlYWNoIGl0ZW0gaW5kaXZpZHVhbGx5IHZpYSBzZXR0aW5ncy5cbkJ1ZyByZXBvcnRzIGFuZCBpc3N1ZXMgcGxlYXNlIGhlcmUgaHR0cHM6Ly9naXRodWIuY29tL2FuZGlhODkvb3JkZXItaWNvbnMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "13", "sha256": "0hwh0w3bwl5nsdahii43j7ac792ciabsdsp8xarnrkbfvlafb2lk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBbmRyZWFzIEFuZ2VyZXIiLAogICJkZXNjcmlwdGlvbiI6ICJGaXhlcyBvcmRlciBvZiBnbm9tZS1zaGVsbCBleHRlbnNpb25zIGluIHRoZSBwYW5lbCAoYWxzbyB3aXRoIGl0ZW1zIGFkZGVkIGJ5IG90aGVyIGV4dGVuc2lvbnMgc3VjaCBhcyBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi82MTUvYXBwaW5kaWNhdG9yLXN1cHBvcnQvKSAuIFRoZSBvcmRlciBjYW4gYmUgc2V0IGZvciBlYWNoIGl0ZW0gaW5kaXZpZHVhbGx5IHZpYSBzZXR0aW5ncy5cbkJ1ZyByZXBvcnRzIGFuZCBpc3N1ZXMgcGxlYXNlIGhlcmUgaHR0cHM6Ly9naXRodWIuY29tL2FuZGlhODkvb3JkZXItaWNvbnMvaXNzdWVzIiwKICAiZXh0ZW5zaW9uLWlkIjogIm9yZGVyLWV4dGVuc2lvbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvcmRlciBleHRlbnNpb25zIiwKICAibmFtZSI6ICJPcmRlciBHbm9tZSBTaGVsbCBleHRlbnNpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJvcmRlci1leHRlbnNpb25zQHdhNDU1Ny5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "sound-percentage@maestroschan.fr", "name": "Sound percentage", "pname": "sound-percentage", "description": "Display the current sound percentage in the system tray", "link": "https://extensions.gnome.org/extension/2120/sound-percentage/", "shell_version_map": {"38": {"version": "3", "sha256": "140a83mqwja4vkk83ajmknginh0izli65b8x7nab32sif99z7nya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkiLAogICJuYW1lIjogIlNvdW5kIHBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovc291bmQtcGVyY2VudGFnZS1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogInNvdW5kLXBlcmNlbnRhZ2VAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "140a83mqwja4vkk83ajmknginh0izli65b8x7nab32sif99z7nya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkiLAogICJuYW1lIjogIlNvdW5kIHBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovc291bmQtcGVyY2VudGFnZS1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogInNvdW5kLXBlcmNlbnRhZ2VAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "140a83mqwja4vkk83ajmknginh0izli65b8x7nab32sif99z7nya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkiLAogICJuYW1lIjogIlNvdW5kIHBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovc291bmQtcGVyY2VudGFnZS1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogInNvdW5kLXBlcmNlbnRhZ2VAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "140a83mqwja4vkk83ajmknginh0izli65b8x7nab32sif99z7nya", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgc291bmQgcGVyY2VudGFnZSBpbiB0aGUgc3lzdGVtIHRyYXkiLAogICJuYW1lIjogIlNvdW5kIHBlcmNlbnRhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYW9zY2hhbnovc291bmQtcGVyY2VudGFnZS1ncy1leHRlbnNpb24iLAogICJ1dWlkIjogInNvdW5kLXBlcmNlbnRhZ2VAbWFlc3Ryb3NjaGFuLmZyIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "horizontal-workspaces@gnome-shell-extensions.gcampax.github.com", "name": "Horizontal workspaces", "pname": "horizontal-workspaces", "description": "Use a horizontal workspace layout", "link": "https://extensions.gnome.org/extension/2141/horizontal-workspaces/", "shell_version_map": {"38": {"version": "5", "sha256": "0kbqcrs96v72yk0rf8jghy1a31651fyvgpi97yp46n4wmvc41vk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBhIGhvcml6b250YWwgd29ya3NwYWNlIGxheW91dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJIb3Jpem9udGFsIHdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiaG9yaXpvbnRhbC13b3Jrc3BhY2VzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "threefingerwindowmove@do.sch.dev.gmail.com", "name": "Three Finger Window Move", "pname": "three-finger-window-move", "description": "Allows moving windows around with a three finger trackpad gesture (Wayland only)", "link": "https://extensions.gnome.org/extension/2164/three-finger-window-move/", "shell_version_map": {"38": {"version": "7", "sha256": "1m7vwr6s6w297b0x0bmnj8fs2hl73pbys6m93lnb9inh5pmgiv1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBtb3Zpbmcgd2luZG93cyBhcm91bmQgd2l0aCBhIHRocmVlIGZpbmdlciB0cmFja3BhZCBnZXN0dXJlIChXYXlsYW5kIG9ubHkpIiwKICAibmFtZSI6ICJUaHJlZSBGaW5nZXIgV2luZG93IE1vdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kby1zY2gvZ25vbWUtc2hlbGwtdG91Y2hwYWQtd2luZG93LW1vdmUiLAogICJ1dWlkIjogInRocmVlZmluZ2Vyd2luZG93bW92ZUBkby5zY2guZGV2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} @@ -306,7 +306,7 @@ , {"uuid": "overview_full_bright@fawtytoo", "name": "Overview Full Bright", "pname": "overview-full-bright", "description": "Shows the Overview in full brightness and without the vignette.\n\nNOTE: This will not be developed beyond GS 3.38.", "link": "https://extensions.gnome.org/extension/2884/overview-full-bright/", "shell_version_map": {"38": {"version": "4", "sha256": "1dm5h1kl40lsly9a80ch4mfi67ppwd7dgg4idx8vrcx5iksnzxil", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHRoZSBPdmVydmlldyBpbiBmdWxsIGJyaWdodG5lc3MgYW5kIHdpdGhvdXQgdGhlIHZpZ25ldHRlLlxuXG5OT1RFOiBUaGlzIHdpbGwgbm90IGJlIGRldmVsb3BlZCBiZXlvbmQgR1MgMy4zOC4iLAogICJuYW1lIjogIk92ZXJ2aWV3IEZ1bGwgQnJpZ2h0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm92ZXJ2aWV3X2Z1bGxfYnJpZ2h0QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "trayIconsReloaded@selfmade.pl", "name": "Tray Icons: Reloaded", "pname": "tray-icons-reloaded", "description": "Tray Icons Reloaded is a GNOME Shell extension which bring back Tray Icons to top panel, with additional features.", "link": "https://extensions.gnome.org/extension/2890/tray-icons-reloaded/", "shell_version_map": {"38": {"version": "11", "sha256": "16dx06l7m8jjcy1xr7s3vj57csnbdmdwlmmjwxhilq10a1dapiw8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJheUljb25zUmVsb2FkZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAxMQp9"}, "40": {"version": "16", "sha256": "0ywl1v26b3qfkj58g2l7y1g2qf1fi7kkjd6403546hwyzcqkph0z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJheUljb25zUmVsb2FkZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFydGluUEwvVHJheS1JY29ucy1SZWxvYWRlZCIsCiAgInV1aWQiOiAidHJheUljb25zUmVsb2FkZWRAc2VsZm1hZGUucGwiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "22", "sha256": "0nmrjpk93afmywq0zrm7qjpkil6s6wszmr9f78q0ybnjv58jf953", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "25", "sha256": "0y3sks6idn9v2r54rb4i69gliip0c9na5q5kwl9vfc7irncgmqjr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyNQp9"}, "43": {"version": "26", "sha256": "1yx9w70ql13f0gnjbihkscyhi8mgapbl6p0hy0aqmnirhwn3fc31", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYXkgSWNvbnMgUmVsb2FkZWQgaXMgYSBHTk9NRSBTaGVsbCBleHRlbnNpb24gd2hpY2ggYnJpbmcgYmFjayBUcmF5IEljb25zIHRvIHRvcCBwYW5lbCwgd2l0aCBhZGRpdGlvbmFsIGZlYXR1cmVzLiIsCiAgIm5hbWUiOiAiVHJheSBJY29uczogUmVsb2FkZWQiLAogICJvcGVuLWJsYWNrbGlzdCI6IFsKICAgICJFbGVjdHJvbiIsCiAgICAiWWFkIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cmF5SWNvbnNSZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXJ0aW5QTC9UcmF5LUljb25zLVJlbG9hZGVkIiwKICAidXVpZCI6ICJ0cmF5SWNvbnNSZWxvYWRlZEBzZWxmbWFkZS5wbCIsCiAgInZlcnNpb24iOiAyNgp9"}}} , {"uuid": "messagingmenu@lauinger-clan.de", "name": "Messaging Menu", "pname": "messaging-menu", "description": "A Messaging Menu for the Gnome Shell. All Email and Chat Applications in one Place.", "link": "https://extensions.gnome.org/extension/2896/messaging-menu/", "shell_version_map": {"38": {"version": "4", "sha256": "1xa0hyvs2aw1z7kg5gcsgh2pjn7b13zhps98j4xpwfiv6zm0sa73", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvbWVzc2FnaW5nbWVudSIsCiAgInV1aWQiOiAibWVzc2FnaW5nbWVudUBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "20", "sha256": "1hssx7g6cz8b03iafcvqf956s5ylav9ss9ifn4x385wp75r9spj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "20", "sha256": "1hssx7g6cz8b03iafcvqf956s5ylav9ss9ifn4x385wp75r9spj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyMAp9"}, "42": {"version": "20", "sha256": "1hssx7g6cz8b03iafcvqf956s5ylav9ss9ifn4x385wp75r9spj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyMAp9"}, "43": {"version": "20", "sha256": "1hssx7g6cz8b03iafcvqf956s5ylav9ss9ifn4x385wp75r9spj5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTWVzc2FnaW5nIE1lbnUgZm9yIHRoZSBHbm9tZSBTaGVsbC4gQWxsIEVtYWlsIGFuZCBDaGF0IEFwcGxpY2F0aW9ucyBpbiBvbmUgUGxhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibWVzc2FnaW5nbWVudSIsCiAgIm5hbWUiOiAiTWVzc2FnaW5nIE1lbnUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAic2luaXN0ZXJzdHVmIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lc3NhZ2luZ21lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L21lc3NhZ2luZ21lbnUiLAogICJ1dWlkIjogIm1lc3NhZ2luZ21lbnVAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyMAp9"}}} -, {"uuid": "SettingsCenter@lauinger-clan.de", "name": "SettingsCenter", "pname": "settingscenter", "description": "Settings Center is a customizable drop-down menu for quickly launching frequently used apps in Gnome:Shell via the quicksettings. Originally created by XES.\n\nSettings shortcuts : gnome-tweak-tool, dconf-editor, gconf-editor, gnome-session-properties, gnome-shell-extension-prefs, seahorse and nvidia-settings. You can add your own\n\nOriginal source : http://svn.xesnet.fr/gnomeextensions", "link": "https://extensions.gnome.org/extension/2899/settingscenter/", "shell_version_map": {"38": {"version": "2", "sha256": "0sywdlmfgy4k5bkxmawcb7b8100g8wnpndmwvdzjq51xv5605gcs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjQiLAogICAgIjMuNiIsCiAgICAiMy41LjQiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NocmlzTGF1aW5nZXI3Ny9YRVMtU2V0dGluZ3MtQ2VudGVyLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2V0dGluZ3NDZW50ZXJAbGF1aW5nZXItY2xhbi5kZSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "17na0a5bm4qkh1lcch9frpmlxn44kg7d4lx96lmpx8v0zp4v0c2a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImxvY2FsZSI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2V0dGluZ3NDZW50ZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiWGVzLCBsMzAwbHZsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLlNldHRpbmdzQ2VudGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "14", "sha256": "0w8whn009b960wllaf9sw86h7d5xc768rjf5kq4m47ycmxj0nb19", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vhay10b29sLCBkY29uZi1lZGl0b3IsIGdjb25mLWVkaXRvciwgZ25vbWUtc2Vzc2lvbi1wcm9wZXJ0aWVzLCBnbm9tZS1zaGVsbC1leHRlbnNpb24tcHJlZnMsIHNlYWhvcnNlIGFuZCBudmlkaWEtc2V0dGluZ3MuIFlvdSBjYW4gYWRkIHlvdXIgb3duXG5cbk9yaWdpbmFsIHNvdXJjZSA6IGh0dHA6Ly9zdm4ueGVzbmV0LmZyL2dub21lZXh0ZW5zaW9ucyIsCiAgImdldHRleHQtZG9tYWluIjogIlNldHRpbmdzQ2VudGVyIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} +, {"uuid": "SettingsCenter@lauinger-clan.de", "name": "SettingsCenter", "pname": "settingscenter", "description": "Settings Center is a customizable drop-down menu for quickly launching frequently used apps in Gnome:Shell via the quicksettings. Originally created by XES.\n\nSettings shortcuts : gnome-tweaks, dconf-editor, gconf-editor, gnome-session-properties, gnome-shell-extension-prefs, seahorse and nvidia-settings, pulseaudio. You can add your own\n\nOriginal source : http://svn.xesnet.fr/gnomeextensions", "link": "https://extensions.gnome.org/extension/2899/settingscenter/", "shell_version_map": {"38": {"version": "2", "sha256": "0p1iq97210rvm4p5wwcs9m8wnicnlvx1qgxbp6mnifny7srw4p0l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vha3MsIGRjb25mLWVkaXRvciwgZ2NvbmYtZWRpdG9yLCBnbm9tZS1zZXNzaW9uLXByb3BlcnRpZXMsIGdub21lLXNoZWxsLWV4dGVuc2lvbi1wcmVmcywgc2VhaG9yc2UgYW5kIG52aWRpYS1zZXR0aW5ncywgcHVsc2VhdWRpby4gWW91IGNhbiBhZGQgeW91ciBvd25cblxuT3JpZ2luYWwgc291cmNlIDogaHR0cDovL3N2bi54ZXNuZXQuZnIvZ25vbWVleHRlbnNpb25zIiwKICAibG9jYWxlIjogIi91c3Ivc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuNCIsCiAgICAiMy42IiwKICAgICIzLjUuNCIsCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hyaXNMYXVpbmdlcjc3L1hFUy1TZXR0aW5ncy1DZW50ZXItRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJTZXR0aW5nc0NlbnRlckBsYXVpbmdlci1jbGFuLmRlIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "11", "sha256": "0lc74s1ii73v091skwdcfjj7pd2zhn89bhm4jyivjpkhghc1kzby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vha3MsIGRjb25mLWVkaXRvciwgZ2NvbmYtZWRpdG9yLCBnbm9tZS1zZXNzaW9uLXByb3BlcnRpZXMsIGdub21lLXNoZWxsLWV4dGVuc2lvbi1wcmVmcywgc2VhaG9yc2UgYW5kIG52aWRpYS1zZXR0aW5ncywgcHVsc2VhdWRpby4gWW91IGNhbiBhZGQgeW91ciBvd25cblxuT3JpZ2luYWwgc291cmNlIDogaHR0cDovL3N2bi54ZXNuZXQuZnIvZ25vbWVleHRlbnNpb25zIiwKICAibG9jYWxlIjogIi91c3Ivc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvWEVTLVNldHRpbmdzLUNlbnRlci1FeHRlbnNpb24iLAogICJ1dWlkIjogIlNldHRpbmdzQ2VudGVyQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0lc74s1ii73v091skwdcfjj7pd2zhn89bhm4jyivjpkhghc1kzby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vha3MsIGRjb25mLWVkaXRvciwgZ2NvbmYtZWRpdG9yLCBnbm9tZS1zZXNzaW9uLXByb3BlcnRpZXMsIGdub21lLXNoZWxsLWV4dGVuc2lvbi1wcmVmcywgc2VhaG9yc2UgYW5kIG52aWRpYS1zZXR0aW5ncywgcHVsc2VhdWRpby4gWW91IGNhbiBhZGQgeW91ciBvd25cblxuT3JpZ2luYWwgc291cmNlIDogaHR0cDovL3N2bi54ZXNuZXQuZnIvZ25vbWVleHRlbnNpb25zIiwKICAibG9jYWxlIjogIi91c3Ivc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvWEVTLVNldHRpbmdzLUNlbnRlci1FeHRlbnNpb24iLAogICJ1dWlkIjogIlNldHRpbmdzQ2VudGVyQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0lc74s1ii73v091skwdcfjj7pd2zhn89bhm4jyivjpkhghc1kzby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vha3MsIGRjb25mLWVkaXRvciwgZ2NvbmYtZWRpdG9yLCBnbm9tZS1zZXNzaW9uLXByb3BlcnRpZXMsIGdub21lLXNoZWxsLWV4dGVuc2lvbi1wcmVmcywgc2VhaG9yc2UgYW5kIG52aWRpYS1zZXR0aW5ncywgcHVsc2VhdWRpby4gWW91IGNhbiBhZGQgeW91ciBvd25cblxuT3JpZ2luYWwgc291cmNlIDogaHR0cDovL3N2bi54ZXNuZXQuZnIvZ25vbWVleHRlbnNpb25zIiwKICAibG9jYWxlIjogIi91c3Ivc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJTZXR0aW5nc0NlbnRlciIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJYZXMsIGwzMDBsdmwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuU2V0dGluZ3NDZW50ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvWEVTLVNldHRpbmdzLUNlbnRlci1FeHRlbnNpb24iLAogICJ1dWlkIjogIlNldHRpbmdzQ2VudGVyQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "43": {"version": "16", "sha256": "1xik5jhf8cf9zswxkhy9rgji30bl26adzysv2j6i9nsc8y0jjkn0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldHRpbmdzIENlbnRlciBpcyBhIGN1c3RvbWl6YWJsZSBkcm9wLWRvd24gbWVudSBmb3IgcXVpY2tseSBsYXVuY2hpbmcgZnJlcXVlbnRseSB1c2VkIGFwcHMgaW4gR25vbWU6U2hlbGwgdmlhIHRoZSBxdWlja3NldHRpbmdzLiBPcmlnaW5hbGx5IGNyZWF0ZWQgYnkgWEVTLlxuXG5TZXR0aW5ncyBzaG9ydGN1dHMgOiBnbm9tZS10d2Vha3MsIGRjb25mLWVkaXRvciwgZ2NvbmYtZWRpdG9yLCBnbm9tZS1zZXNzaW9uLXByb3BlcnRpZXMsIGdub21lLXNoZWxsLWV4dGVuc2lvbi1wcmVmcywgc2VhaG9yc2UgYW5kIG52aWRpYS1zZXR0aW5ncywgcHVsc2VhdWRpby4gWW91IGNhbiBhZGQgeW91ciBvd25cblxuT3JpZ2luYWwgc291cmNlIDogaHR0cDovL3N2bi54ZXNuZXQuZnIvZ25vbWVleHRlbnNpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2V0dGluZ3NDZW50ZXIiLAogICJuYW1lIjogIlNldHRpbmdzQ2VudGVyIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIlhlcywgbDMwMGx2bCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5TZXR0aW5nc0NlbnRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DaHJpc0xhdWluZ2VyNzcvWEVTLVNldHRpbmdzLUNlbnRlci1FeHRlbnNpb24iLAogICJ1dWlkIjogIlNldHRpbmdzQ2VudGVyQGxhdWluZ2VyLWNsYW4uZGUiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} , {"uuid": "auto-mute-toggle@garotosopa.github.io", "name": "Auto-mute toggle", "pname": "auto-mute-toggle", "description": "Toggle whether to auto-mute speakers when headphones are plugged in.", "link": "https://extensions.gnome.org/extension/2905/auto-mute-toggle/", "shell_version_map": {"40": {"version": "6", "sha256": "1lyh51gvsh9ydip77vjj8rigjiah97lh8gp91jcpqblwx69fs3dk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB3aGV0aGVyIHRvIGF1dG8tbXV0ZSBzcGVha2VycyB3aGVuIGhlYWRwaG9uZXMgYXJlIHBsdWdnZWQgaW4uIiwKICAibmFtZSI6ICJBdXRvLW11dGUgdG9nZ2xlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dhcm90b3NvcGEvZ3NlLWF1dG8tbXV0ZS10b2dnbGUiLAogICJ1dWlkIjogImF1dG8tbXV0ZS10b2dnbGVAZ2Fyb3Rvc29wYS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "optimus-manager-indicator@andr3slelouch.github.com", "name": "Optimus Manager Indicator", "pname": "optimus-manager-indicator", "description": "Intel/Hybrid/NVIDIA GPU Switch Note: The GPU mode activated doesn't show up in the options, by example: When you turn on the PC you are gonna be in Intel mode so Intel option is not gonna be shown. Note: Optimus Manager Indicator is made(for the moment) for Arch based distributions with optimus-manager.", "link": "https://extensions.gnome.org/extension/2908/optimus-manager-indicator/", "shell_version_map": {"38": {"version": "5", "sha256": "1mqgnwfdbd2460ngkkq6wiswvb9bvwgm5n32j7jgvn1xhb3mqn58", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL0h5YnJpZC9OVklESUEgR1BVIFN3aXRjaCBOb3RlOiBUaGUgR1BVIG1vZGUgYWN0aXZhdGVkIGRvZXNuJ3Qgc2hvdyB1cCBpbiB0aGUgb3B0aW9ucywgYnkgZXhhbXBsZTogV2hlbiB5b3UgdHVybiBvbiB0aGUgUEMgeW91IGFyZSBnb25uYSBiZSBpbiBJbnRlbCBtb2RlIHNvIEludGVsIG9wdGlvbiBpcyBub3QgZ29ubmEgYmUgc2hvd24uIE5vdGU6IE9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IgaXMgbWFkZShmb3IgdGhlIG1vbWVudCkgZm9yIEFyY2ggYmFzZWQgZGlzdHJpYnV0aW9ucyB3aXRoIG9wdGltdXMtbWFuYWdlci4iLAogICJuYW1lIjogIk9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmRyM3NsZWxvdWNoL09wdGltdXMtTWFuYWdlci1JbmRpY2F0b3IiLAogICJ1dWlkIjogIm9wdGltdXMtbWFuYWdlci1pbmRpY2F0b3JAYW5kcjNzbGVsb3VjaC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "1mqgnwfdbd2460ngkkq6wiswvb9bvwgm5n32j7jgvn1xhb3mqn58", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVsL0h5YnJpZC9OVklESUEgR1BVIFN3aXRjaCBOb3RlOiBUaGUgR1BVIG1vZGUgYWN0aXZhdGVkIGRvZXNuJ3Qgc2hvdyB1cCBpbiB0aGUgb3B0aW9ucywgYnkgZXhhbXBsZTogV2hlbiB5b3UgdHVybiBvbiB0aGUgUEMgeW91IGFyZSBnb25uYSBiZSBpbiBJbnRlbCBtb2RlIHNvIEludGVsIG9wdGlvbiBpcyBub3QgZ29ubmEgYmUgc2hvd24uIE5vdGU6IE9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IgaXMgbWFkZShmb3IgdGhlIG1vbWVudCkgZm9yIEFyY2ggYmFzZWQgZGlzdHJpYnV0aW9ucyB3aXRoIG9wdGltdXMtbWFuYWdlci4iLAogICJuYW1lIjogIk9wdGltdXMgTWFuYWdlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbmRyM3NsZWxvdWNoL09wdGltdXMtTWFuYWdlci1JbmRpY2F0b3IiLAogICJ1dWlkIjogIm9wdGltdXMtbWFuYWdlci1pbmRpY2F0b3JAYW5kcjNzbGVsb3VjaC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "BringOutSubmenuOfPowerOffLogoutButton@pratap.fastmail.fm", "name": "Bring Out Submenu Of Power Off/Logout Button", "pname": "bring-out-submenu-of-power-offlogout-button", "description": "Bring Out Submenu Of Power Off/Logout Button and Rearrange the Order of System Menu.", "link": "https://extensions.gnome.org/extension/2917/bring-out-submenu-of-power-offlogout-button/", "shell_version_map": {"38": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "40": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "41": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "42": {"version": "29", "sha256": "18b945hcy8a13dm0s2d1x9dc6d8b2pxgmhaqshk8wbcmxjwiv866", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9CcmluZy1PdXQtU3VibWVudS1vZi1Qb3dlci1PZmYtTG9nb3V0IiwKICAidXVpZCI6ICJCcmluZ091dFN1Ym1lbnVPZlBvd2VyT2ZmTG9nb3V0QnV0dG9uQHByYXRhcC5mYXN0bWFpbC5mbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "43": {"version": "35", "sha256": "1295hf1xgzj6p89k40zz7x4fbdbvm9bkv88ym8f2ibn6080gbx1s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5nIE91dCBTdWJtZW51IE9mIFBvd2VyIE9mZi9Mb2dvdXQgQnV0dG9uIGFuZCBSZWFycmFuZ2UgdGhlIE9yZGVyIG9mIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiQnJpbmcgT3V0IFN1Ym1lbnUgT2YgUG93ZXIgT2ZmL0xvZ291dCBCdXR0b24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYnJuZ291dCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvQnJpbmctT3V0LVN1Ym1lbnUtb2YtUG93ZXItT2ZmLUxvZ291dCIsCiAgInV1aWQiOiAiQnJpbmdPdXRTdWJtZW51T2ZQb3dlck9mZkxvZ291dEJ1dHRvbkBwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} @@ -328,7 +328,7 @@ , {"uuid": "ssss@tu.berry", "name": "Simple Subscriber", "pname": "ss-subscriber", "description": "Simple shadowsocks subscriber (SSD only), yet another proxy switcher for GNOME Shell\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3073/ss-subscriber/", "shell_version_map": {"38": {"version": "18", "sha256": "03gryl577559h2l1s3adi5gxa8ivp454p4lq7jng1db6smlpj95a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcy1zdWJzY3JpYmVyIiwKICAibmFtZSI6ICJTaW1wbGUgU3Vic2NyaWJlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcy1zdWJzY3JpYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9zcy1zdWJzY3JpYmVyIiwKICAidXVpZCI6ICJzc3NzQHR1LmJlcnJ5IiwKICAidmVyc2lvbiI6IDE4Cn0="}, "40": {"version": "20", "sha256": "075d00xsbmr4qs554p2anddhkmgcx7xd4nn8prgmf4wpyfk87552", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcy1zdWJzY3JpYmVyIiwKICAibmFtZSI6ICJTaW1wbGUgU3Vic2NyaWJlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcy1zdWJzY3JpYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc3Mtc3Vic2NyaWJlciIsCiAgInV1aWQiOiAic3Nzc0B0dS5iZXJyeSIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "21", "sha256": "06ybzk62fbi88iqssl4pw0amsbcp09pnw99wxanh2jlvaakqgday", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3Mtc3Vic2NyaWJlciIsCiAgIm5hbWUiOiAiU2ltcGxlIFN1YnNjcmliZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3Mtc3Vic2NyaWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NzLXN1YnNjcmliZXIiLAogICJ1dWlkIjogInNzc3NAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "42": {"version": "23", "sha256": "078111h68zv03n6i4yw9jgdn9idxb91qpami64xl5g1rc75sc91w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3Mtc3Vic2NyaWJlciIsCiAgIm5hbWUiOiAiU2ltcGxlIFN1YnNjcmliZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3Mtc3Vic2NyaWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NzLXN1YnNjcmliZXIiLAogICJ1dWlkIjogInNzc3NAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "43": {"version": "25", "sha256": "0s33s1gq6na12ygzmjf4kkcbv4zz6mwg449456m0pxhblmwng093", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3Mtc3Vic2NyaWJlciIsCiAgIm5hbWUiOiAiU2ltcGxlIFN1YnNjcmliZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3Mtc3Vic2NyaWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NzLXN1YnNjcmliZXIiLAogICJ1dWlkIjogInNzc3NAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} , {"uuid": "extension-list@tu.berry", "name": "Extension List", "pname": "extension-list", "description": "Simple GNOME Shell extension manager in the top panel\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3088/extension-list/", "shell_version_map": {"38": {"version": "25", "sha256": "0cwabswbb5p0z156488ag095h558hf541650vfnjgw4nas7v2ccx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVuc2lvbi1saXN0IiwKICAibmFtZSI6ICJFeHRlbnNpb24gTGlzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHRlbnNpb24tbGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvZXh0ZW5zaW9uLWxpc3QiLAogICJ1dWlkIjogImV4dGVuc2lvbi1saXN0QHR1LmJlcnJ5IiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "27", "sha256": "0m13qzzbbx5rnq8a9xn09nvr3dy9zqkp8y9529y12250wyjafl1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVuc2lvbi1saXN0IiwKICAibmFtZSI6ICJFeHRlbnNpb24gTGlzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHRlbnNpb24tbGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2V4dGVuc2lvbi1saXN0IiwKICAidXVpZCI6ICJleHRlbnNpb24tbGlzdEB0dS5iZXJyeSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "29", "sha256": "1yl2b9phvrgsdpkwqjfqpaqi2xcj5bcd4zabqkrfwngqsg17s85j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "42": {"version": "30", "sha256": "1hnidb1f6cawfhmkql4y8kz3rq0ibqcfk678yz1n12l2gp3vvvz3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "43": {"version": "34", "sha256": "0jq0c80y20d8rljn1478v537lch6klwir0gkzp35y03s1wj0ma36", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMzQKfQ=="}}} , {"uuid": "MaximizeToEmptyWorkspace-extension@kaisersite.de", "name": "Maximize To Empty Workspace", "pname": "maximize-to-empty-workspace", "description": "New and maximized windows will be moved to empty workspaces.\nSupports multiple monitors.", "link": "https://extensions.gnome.org/extension/3100/maximize-to-empty-workspace/", "shell_version_map": {"38": {"version": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "43": {"version": "12", "sha256": "13srjh0zhhc0v3sqsa2drksy8p0b3whfszbrwvjp1qgjd8k1rn9f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2Fpc2VyYWNtL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tYXhpbWl6ZS10by1lbXB0eS13b3Jrc3BhY2UiLAogICJ1dWlkIjogIk1heGltaXplVG9FbXB0eVdvcmtzcGFjZS1leHRlbnNpb25Aa2Fpc2Vyc2l0ZS5kZSIsCiAgInZlcnNpb24iOiAxMgp9"}}} -, {"uuid": "eye-extended@als.kz", "name": "Eye and Mouse Extended", "pname": "eye-extended", "description": "An eye on the top panel that follows your cursor.\nIt includes a mouse indicator to better keep track of your mouse location.", "link": "https://extensions.gnome.org/extension/3139/eye-extended/", "shell_version_map": {"38": {"version": "10", "sha256": "0jh8ic9krn8fqnaar3lwcvd255y5ibi1kdjmgw7vjwq42psnc1nd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRXllRXh0ZW5kZWQiLAogICJuYW1lIjogIkV5ZSBhbmQgTW91c2UgRXh0ZW5kZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAia3ouYWxzLmV5ZS1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4wIiwKICAgICIzLjM4LjAiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZXlsb3ZjaGlrb3YvZXllLWV4dGVuZGVkLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZXllLWV4dGVuZGVkQGFscy5reiIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "11", "sha256": "0z4bb82jkq2mqgbccz8y509va2rsrqbldk1xwwv02p4pnhmyb2xq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0z4bb82jkq2mqgbccz8y509va2rsrqbldk1xwwv02p4pnhmyb2xq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0z4bb82jkq2mqgbccz8y509va2rsrqbldk1xwwv02p4pnhmyb2xq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "43": {"version": "11", "sha256": "0z4bb82jkq2mqgbccz8y509va2rsrqbldk1xwwv02p4pnhmyb2xq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} +, {"uuid": "eye-extended@als.kz", "name": "Eye and Mouse Extended", "pname": "eye-extended", "description": "An eye on the top panel that follows your cursor.\nIt includes a mouse indicator to better keep track of your mouse location.", "link": "https://extensions.gnome.org/extension/3139/eye-extended/", "shell_version_map": {"38": {"version": "10", "sha256": "0jh8ic9krn8fqnaar3lwcvd255y5ibi1kdjmgw7vjwq42psnc1nd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRXllRXh0ZW5kZWQiLAogICJuYW1lIjogIkV5ZSBhbmQgTW91c2UgRXh0ZW5kZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAia3ouYWxzLmV5ZS1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4wIiwKICAgICIzLjM4LjAiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZXlsb3ZjaGlrb3YvZXllLWV4dGVuZGVkLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZXllLWV4dGVuZGVkQGFscy5reiIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "12", "sha256": "1a334plhay126wlkh4vn2z8b6kmibygz45rjvg38ridkkpqzjprb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "1a334plhay126wlkh4vn2z8b6kmibygz45rjvg38ridkkpqzjprb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "42": {"version": "12", "sha256": "1a334plhay126wlkh4vn2z8b6kmibygz45rjvg38ridkkpqzjprb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "43": {"version": "12", "sha256": "1a334plhay126wlkh4vn2z8b6kmibygz45rjvg38ridkkpqzjprb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGV5ZSBvbiB0aGUgdG9wIHBhbmVsIHRoYXQgZm9sbG93cyB5b3VyIGN1cnNvci5cbkl0IGluY2x1ZGVzIGEgbW91c2UgaW5kaWNhdG9yIHRvIGJldHRlciBrZWVwIHRyYWNrIG9mIHlvdXIgbW91c2UgbG9jYXRpb24uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZXllLWV4dGVuZGVkLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiRXllIGFuZCBNb3VzZSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leWUtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L2V5ZS1leHRlbmRlZC1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImV5ZS1leHRlbmRlZEBhbHMua3oiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} , {"uuid": "wireguard-indicator@gregos.me", "name": "Wireguard Indicator", "pname": "wireguard-indicator", "description": "Enable, disable, and view details of Wireguard.\nDeveloped by Gregos-Winus.", "link": "https://extensions.gnome.org/extension/3160/wireguard-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1r12pw550v3h5f6zxl0psnsx031b5c7sj374f9h078lwqs85wb8w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSwgZGlzYWJsZSwgYW5kIHZpZXcgZGV0YWlscyBvZiBXaXJlZ3VhcmQuXG5EZXZlbG9wZWQgYnkgR3JlZ29zLVdpbnVzLiIsCiAgIm5hbWUiOiAiV2lyZWd1YXJkIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3aXJlZ3VhcmQtaW5kaWNhdG9yQGdyZWdvcy5tZSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "no_activities@yaya.cout", "name": "No activities button", "pname": "no-activities-button", "description": "Hide the activities button", "link": "https://extensions.gnome.org/extension/3184/no-activities-button/", "shell_version_map": {"38": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}, "43": {"version": "4", "sha256": "1759h1yp2hndbksaqm2zid2lsca9zmxwfb5n8jrlx7rjfgr7cb11", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjdGl2aXRpZXMgYnV0dG9uIiwKICAibmFtZSI6ICJObyBhY3Rpdml0aWVzIGJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibm9fYWN0aXZpdGllc0B5YXlhLmNvdXQiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "blur-my-shell@aunetx", "name": "Blur my Shell", "pname": "blur-my-shell", "description": "Adds a blur look to different parts of the GNOME Shell, including the top panel, dash and overview.\n\nYou can support my work by sponsoring me on:\n- github: https://github.com/sponsors/aunetx\n- ko-fi: https://ko-fi.com/aunetx\n\nNote: if the extension shows an error after updating, please make sure to restart your session to see if it persists. This is due to a bug in gnome shell, which I can't fix by myself.", "link": "https://extensions.gnome.org/extension/3193/blur-my-shell/", "shell_version_map": {"38": {"version": "22", "sha256": "1ss5vhzjkp2bpllxpjlk1l2i8n7p4xjpzkn0q6jg3gd472kkanfx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWJsdXItbXktc2hlbGwiLAogICJ1dWlkIjogImJsdXItbXktc2hlbGxAYXVuZXR4IiwKICAidmVyc2lvbiI6IDIyCn0="}, "40": {"version": "29", "sha256": "09zflyqk5mlybc4avm812hqr32q0yzrkkw0qy5q4lbkdid7cpqpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "41": {"version": "29", "sha256": "09zflyqk5mlybc4avm812hqr32q0yzrkkw0qy5q4lbkdid7cpqpp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "42": {"version": "44", "sha256": "1cgr803nh5vmc62adsmxjmd5aba3ln4fxn3g4ynqfjql7s2ymkz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIm1lQGF1bmV0eC5kZXYiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdXItbXktc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogNDQKfQ=="}, "43": {"version": "44", "sha256": "1cgr803nh5vmc62adsmxjmd5aba3ln4fxn3g4ynqfjql7s2ymkz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBibHVyIGxvb2sgdG8gZGlmZmVyZW50IHBhcnRzIG9mIHRoZSBHTk9NRSBTaGVsbCwgaW5jbHVkaW5nIHRoZSB0b3AgcGFuZWwsIGRhc2ggYW5kIG92ZXJ2aWV3LlxuXG5Zb3UgY2FuIHN1cHBvcnQgbXkgd29yayBieSBzcG9uc29yaW5nIG1lIG9uOlxuLSBnaXRodWI6IGh0dHBzOi8vZ2l0aHViLmNvbS9zcG9uc29ycy9hdW5ldHhcbi0ga28tZmk6IGh0dHBzOi8va28tZmkuY29tL2F1bmV0eFxuXG5Ob3RlOiBpZiB0aGUgZXh0ZW5zaW9uIHNob3dzIGFuIGVycm9yIGFmdGVyIHVwZGF0aW5nLCBwbGVhc2UgbWFrZSBzdXJlIHRvIHJlc3RhcnQgeW91ciBzZXNzaW9uIHRvIHNlZSBpZiBpdCBwZXJzaXN0cy4gVGhpcyBpcyBkdWUgdG8gYSBidWcgaW4gZ25vbWUgc2hlbGwsIHdoaWNoIEkgY2FuJ3QgZml4IGJ5IG15c2VsZi4iLAogICJuYW1lIjogIkJsdXIgbXkgU2hlbGwiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIm1lQGF1bmV0eC5kZXYiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdXItbXktc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9nbm9tZS1zaGVsbC1leHRlbnNpb24tYmx1ci1teS1zaGVsbCIsCiAgInV1aWQiOiAiYmx1ci1teS1zaGVsbEBhdW5ldHgiLAogICJ2ZXJzaW9uIjogNDQKfQ=="}}} @@ -339,12 +339,12 @@ , {"uuid": "unmaximize_double_click@gonza.gmail.com", "name": "Unmaximize Double Click Panel", "pname": "unmaximize-double-click-panel", "description": "Unmaximize the current window on double click on the top panel. You can also maximize horizontally and vertically with middle and right click.", "link": "https://extensions.gnome.org/extension/3228/unmaximize-double-click-panel/", "shell_version_map": {"38": {"version": "7", "sha256": "1c1ri2qqkxc0aw47yci9ndplgqpx2i1dnpwlsjjrwqszdmm0nxwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VubWF4aW1pemUtZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bm1heGltaXplX2RvdWJsZV9jbGlja0Bnb256YS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "1c1ri2qqkxc0aw47yci9ndplgqpx2i1dnpwlsjjrwqszdmm0nxwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VubWF4aW1pemUtZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bm1heGltaXplX2RvdWJsZV9jbGlja0Bnb256YS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "1c1ri2qqkxc0aw47yci9ndplgqpx2i1dnpwlsjjrwqszdmm0nxwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VubWF4aW1pemUtZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bm1heGltaXplX2RvdWJsZV9jbGlja0Bnb256YS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "1c1ri2qqkxc0aw47yci9ndplgqpx2i1dnpwlsjjrwqszdmm0nxwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVubWF4aW1pemUgdGhlIGN1cnJlbnQgd2luZG93IG9uIGRvdWJsZSBjbGljayBvbiB0aGUgdG9wIHBhbmVsLiBZb3UgY2FuIGFsc28gbWF4aW1pemUgaG9yaXpvbnRhbGx5IGFuZCB2ZXJ0aWNhbGx5IHdpdGggbWlkZGxlIGFuZCByaWdodCBjbGljay4iLAogICJuYW1lIjogIlVubWF4aW1pemUgRG91YmxlIENsaWNrIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ29uemFhcmNyL3VubWF4aW1pemUtZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ1bm1heGltaXplX2RvdWJsZV9jbGlja0Bnb256YS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "unity-like-appswitcher@gonza.com", "name": "Unity-like App Switcher", "pname": "unity-like-app-switcher", "description": "A bigger and more colourfull AppSwitcher", "link": "https://extensions.gnome.org/extension/3231/unity-like-app-switcher/", "shell_version_map": {"38": {"version": "13", "sha256": "1f0izmzksy1vf4kaa8gwzz3pkjxihg2mzswn8mw50cybq5p596gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "13", "sha256": "1f0izmzksy1vf4kaa8gwzz3pkjxihg2mzswn8mw50cybq5p596gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "1f0izmzksy1vf4kaa8gwzz3pkjxihg2mzswn8mw50cybq5p596gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "1f0izmzksy1vf4kaa8gwzz3pkjxihg2mzswn8mw50cybq5p596gi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgYmlnZ2VyIGFuZCBtb3JlIGNvbG91cmZ1bGwgQXBwU3dpdGNoZXIiLAogICJuYW1lIjogIlVuaXR5LWxpa2UgQXBwIFN3aXRjaGVyIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJnb256YSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bml0eS13aW5kb3ctc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nb256YWFyY3IvdW5pdHktbGlrZS1zd2l0Y2hlci1nbm9tZS1leHQiLAogICJ1dWlkIjogInVuaXR5LWxpa2UtYXBwc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "ssh-quick-connect@ibrokemy.computer", "name": "SSH Quick Connect", "pname": "ssh-quick-connect", "description": "This extension puts an icon in the panel with a simple dropdown menu that launches items from your ssh configs", "link": "https://extensions.gnome.org/extension/3237/ssh-quick-connect/", "shell_version_map": {"40": {"version": "9", "sha256": "13rg6syi3m9ahkkhww51jhblir2jb8k5qv7ya97plgsnc3awh6p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgd2l0aCBhIHNpbXBsZSBkcm9wZG93biBtZW51IHRoYXQgbGF1bmNoZXMgaXRlbXMgZnJvbSB5b3VyIHNzaCBjb25maWdzIiwKICAibmFtZSI6ICJTU0ggUXVpY2sgQ29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vd3d3LmdpdGh1Yi5jb20vaWJyb2tlbXljb21wdXRlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3NoLXF1aWNrLWNvbm5lY3QiLAogICJ1dWlkIjogInNzaC1xdWljay1jb25uZWN0QGlicm9rZW15LmNvbXB1dGVyIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "13rg6syi3m9ahkkhww51jhblir2jb8k5qv7ya97plgsnc3awh6p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgd2l0aCBhIHNpbXBsZSBkcm9wZG93biBtZW51IHRoYXQgbGF1bmNoZXMgaXRlbXMgZnJvbSB5b3VyIHNzaCBjb25maWdzIiwKICAibmFtZSI6ICJTU0ggUXVpY2sgQ29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vd3d3LmdpdGh1Yi5jb20vaWJyb2tlbXljb21wdXRlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3NoLXF1aWNrLWNvbm5lY3QiLAogICJ1dWlkIjogInNzaC1xdWljay1jb25uZWN0QGlicm9rZW15LmNvbXB1dGVyIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "13rg6syi3m9ahkkhww51jhblir2jb8k5qv7ya97plgsnc3awh6p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgd2l0aCBhIHNpbXBsZSBkcm9wZG93biBtZW51IHRoYXQgbGF1bmNoZXMgaXRlbXMgZnJvbSB5b3VyIHNzaCBjb25maWdzIiwKICAibmFtZSI6ICJTU0ggUXVpY2sgQ29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vd3d3LmdpdGh1Yi5jb20vaWJyb2tlbXljb21wdXRlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3NoLXF1aWNrLWNvbm5lY3QiLAogICJ1dWlkIjogInNzaC1xdWljay1jb25uZWN0QGlicm9rZW15LmNvbXB1dGVyIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "13rg6syi3m9ahkkhww51jhblir2jb8k5qv7ya97plgsnc3awh6p8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgd2l0aCBhIHNpbXBsZSBkcm9wZG93biBtZW51IHRoYXQgbGF1bmNoZXMgaXRlbXMgZnJvbSB5b3VyIHNzaCBjb25maWdzIiwKICAibmFtZSI6ICJTU0ggUXVpY2sgQ29ubmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vd3d3LmdpdGh1Yi5jb20vaWJyb2tlbXljb21wdXRlci9nbm9tZS1zaGVsbC1leHRlbnNpb24tc3NoLXF1aWNrLWNvbm5lY3QiLAogICJ1dWlkIjogInNzaC1xdWljay1jb25uZWN0QGlicm9rZW15LmNvbXB1dGVyIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} -, {"uuid": "add-to-desktop@tommimon.github.com", "name": "Add to Desktop", "pname": "add-to-desktop", "description": "An easy way to create desktop app shortcut in gnome", "link": "https://extensions.gnome.org/extension/3240/add-to-desktop/", "shell_version_map": {"38": {"version": "5", "sha256": "0kchr5daz3s4q18s6aphfyb50wglmlgmjnh3i9ka6d219r0srh64", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLmJldGEiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tbWltb24vYWRkLXRvLWRlc2t0b3AiLAogICJ1dWlkIjogImFkZC10by1kZXNrdG9wQHRvbW1pbW9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "0kchr5daz3s4q18s6aphfyb50wglmlgmjnh3i9ka6d219r0srh64", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLmJldGEiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tbWltb24vYWRkLXRvLWRlc2t0b3AiLAogICJ1dWlkIjogImFkZC10by1kZXNrdG9wQHRvbW1pbW9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "6", "sha256": "04vk49629c9fhvix04h8r3mbnqyncvyzdkbm7bh3wyjhghnczbps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tbWltb24vYWRkLXRvLWRlc2t0b3AiLAogICJ1dWlkIjogImFkZC10by1kZXNrdG9wQHRvbW1pbW9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "8", "sha256": "07byzng0c6cgqrlphk1h0lxl80vw5w5njdncf4krykxh2idwvhkn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbW1pbW9uL2FkZC10by1kZXNrdG9wIiwKICAidXVpZCI6ICJhZGQtdG8tZGVza3RvcEB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "43": {"version": "8", "sha256": "07byzng0c6cgqrlphk1h0lxl80vw5w5njdncf4krykxh2idwvhkn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbW1pbW9uL2FkZC10by1kZXNrdG9wIiwKICAidXVpZCI6ICJhZGQtdG8tZGVza3RvcEB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} +, {"uuid": "add-to-desktop@tommimon.github.com", "name": "Add to Desktop", "pname": "add-to-desktop", "description": "An easy way to create desktop app shortcut in gnome", "link": "https://extensions.gnome.org/extension/3240/add-to-desktop/", "shell_version_map": {"38": {"version": "5", "sha256": "0kchr5daz3s4q18s6aphfyb50wglmlgmjnh3i9ka6d219r0srh64", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLmJldGEiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tbWltb24vYWRkLXRvLWRlc2t0b3AiLAogICJ1dWlkIjogImFkZC10by1kZXNrdG9wQHRvbW1pbW9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "0kchr5daz3s4q18s6aphfyb50wglmlgmjnh3i9ka6d219r0srh64", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwLmJldGEiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tbWltb24vYWRkLXRvLWRlc2t0b3AiLAogICJ1dWlkIjogImFkZC10by1kZXNrdG9wQHRvbW1pbW9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "6", "sha256": "04vk49629c9fhvix04h8r3mbnqyncvyzdkbm7bh3wyjhghnczbps", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVG9tbWltb24vYWRkLXRvLWRlc2t0b3AiLAogICJ1dWlkIjogImFkZC10by1kZXNrdG9wQHRvbW1pbW9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "9", "sha256": "0jdr9cyp2sc897qiplwz5rxp3m654h0c12wy9kn5kjpcspjbifl6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbW1pbW9uL2FkZC10by1kZXNrdG9wIiwKICAidXVpZCI6ICJhZGQtdG8tZGVza3RvcEB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "0jdr9cyp2sc897qiplwz5rxp3m654h0c12wy9kn5kjpcspjbifl6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgd2F5IHRvIGNyZWF0ZSBkZXNrdG9wIGFwcCBzaG9ydGN1dCBpbiBnbm9tZSIsCiAgIm5hbWUiOiAiQWRkIHRvIERlc2t0b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RvbW1pbW9uL2FkZC10by1kZXNrdG9wIiwKICAidXVpZCI6ICJhZGQtdG8tZGVza3RvcEB0b21taW1vbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "wifi-power-management-toggle@rthery", "name": "Wi-Fi Power Management Toggle", "pname": "wi-fi-power-management-toggle", "description": "Add a toggle to limit Wi-Fi power consumption (when supported by the card) in Gnome System Menu.", "link": "https://extensions.gnome.org/extension/3258/wi-fi-power-management-toggle/", "shell_version_map": {"38": {"version": "2", "sha256": "009r1pswkmisfw0zghk2cawx4qw6av5yldbnw7fcla13qpyj90zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBsaW1pdCBXaS1GaSBwb3dlciBjb25zdW1wdGlvbiAod2hlbiBzdXBwb3J0ZWQgYnkgdGhlIGNhcmQpIGluIEdub21lIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiV2ktRmkgUG93ZXIgTWFuYWdlbWVudCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3J0aGVyeS9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaS1wb3dlci1tYW5hZ2VtZW50LXRvZ2dsZSIsCiAgInV1aWQiOiAid2lmaS1wb3dlci1tYW5hZ2VtZW50LXRvZ2dsZUBydGhlcnkiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "009r1pswkmisfw0zghk2cawx4qw6av5yldbnw7fcla13qpyj90zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBsaW1pdCBXaS1GaSBwb3dlciBjb25zdW1wdGlvbiAod2hlbiBzdXBwb3J0ZWQgYnkgdGhlIGNhcmQpIGluIEdub21lIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiV2ktRmkgUG93ZXIgTWFuYWdlbWVudCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3J0aGVyeS9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaS1wb3dlci1tYW5hZ2VtZW50LXRvZ2dsZSIsCiAgInV1aWQiOiAid2lmaS1wb3dlci1tYW5hZ2VtZW50LXRvZ2dsZUBydGhlcnkiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "009r1pswkmisfw0zghk2cawx4qw6av5yldbnw7fcla13qpyj90zh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBsaW1pdCBXaS1GaSBwb3dlciBjb25zdW1wdGlvbiAod2hlbiBzdXBwb3J0ZWQgYnkgdGhlIGNhcmQpIGluIEdub21lIFN5c3RlbSBNZW51LiIsCiAgIm5hbWUiOiAiV2ktRmkgUG93ZXIgTWFuYWdlbWVudCBUb2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3J0aGVyeS9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaS1wb3dlci1tYW5hZ2VtZW50LXRvZ2dsZSIsCiAgInV1aWQiOiAid2lmaS1wb3dlci1tYW5hZ2VtZW50LXRvZ2dsZUBydGhlcnkiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "touchpad_window_switcher@gonza.com", "name": "Touchpad Window Switcher", "pname": "tocuhpad-window-switcher", "description": "3 fingers window switcher. To make it work on Xorg check the service on github.\n\nUp - down: toggle between overview and show desktop (Needs Super+D shorcut to be set on Xorg. Set it with `gsettings set org.gnome.desktop.wm.keybindings show-desktop 'd'`).\n\nYou can also change windows by going to the overview (up) and moving to the left and right, and choosing the window with down. The overview is modified so it’s shown in chronological order.\n", "link": "https://extensions.gnome.org/extension/3294/tocuhpad-window-switcher/", "shell_version_map": {"38": {"version": "8", "sha256": "1x016p30z0pci3qlhpmfqrsgy0vwcfxqladny66ppbb32qisbkac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIjMgZmluZ2VycyB3aW5kb3cgc3dpdGNoZXIuIFRvIG1ha2UgaXQgd29yayBvbiBYb3JnIGNoZWNrIHRoZSBzZXJ2aWNlIG9uIGdpdGh1Yi5cblxuVXAgLSBkb3duOiB0b2dnbGUgYmV0d2VlbiBvdmVydmlldyBhbmQgc2hvdyBkZXNrdG9wIChOZWVkcyBTdXBlcitEIHNob3JjdXQgdG8gYmUgc2V0IG9uIFhvcmcuIFNldCBpdCB3aXRoIGBnc2V0dGluZ3Mgc2V0IG9yZy5nbm9tZS5kZXNrdG9wLndtLmtleWJpbmRpbmdzIHNob3ctZGVza3RvcCAnPFN1cGVyPmQnYCkuXG5cbllvdSBjYW4gYWxzbyBjaGFuZ2Ugd2luZG93cyBieSBnb2luZyB0byB0aGUgb3ZlcnZpZXcgKHVwKSBhbmQgbW92aW5nIHRvIHRoZSBsZWZ0IGFuZCByaWdodCwgYW5kIGNob29zaW5nIHRoZSB3aW5kb3cgd2l0aCBkb3duLiBUaGUgb3ZlcnZpZXcgaXMgbW9kaWZpZWQgc28gaXRcdTIwMTlzIHNob3duIGluIGNocm9ub2xvZ2ljYWwgb3JkZXIuXG4iLAogICJuYW1lIjogIlRvdWNocGFkIFdpbmRvdyBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbnphYXJjci90b3VjaHBhZC13aW5kb3ctc3dpdGNoZXItZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ0b3VjaHBhZF93aW5kb3dfc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "gnome-shell-duckduckgo-search-provider@keithcirkel.co.uk", "name": "DuckDuckGo Search Provider", "pname": "duckduckgo-search-provider", "description": "Add DuckDuckGo search suggestions to Gnome Shell Search", "link": "https://extensions.gnome.org/extension/3306/duckduckgo-search-provider/", "shell_version_map": {"38": {"version": "4", "sha256": "1ydbdm68i38fbaiscmnkz1ywak072ppz93fiqa37fwgr7hsamxg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1ydbdm68i38fbaiscmnkz1ywak072ppz93fiqa37fwgr7hsamxg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1ydbdm68i38fbaiscmnkz1ywak072ppz93fiqa37fwgr7hsamxg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1ydbdm68i38fbaiscmnkz1ywak072ppz93fiqa37fwgr7hsamxg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "translate-indicator@athenstaedt.net", "name": "Translate Indicator", "pname": "translate-indicator", "description": "Translate extension for Gnome-Shell - based on translate-shell, inspired by Tudmotu's clipboard-indicator and gufoe's text-translator", "link": "https://extensions.gnome.org/extension/3318/translate-indicator/", "shell_version_map": {"38": {"version": "3", "sha256": "04c3hjbcbn8y9d94swmc3qiv63sjynn71jnwp08sgqa79nrn4cyg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsIC0gYmFzZWQgb24gdHJhbnNsYXRlLXNoZWxsLCBpbnNwaXJlZCBieSBUdWRtb3R1J3MgY2xpcGJvYXJkLWluZGljYXRvciBhbmQgZ3Vmb2UncyB0ZXh0LXRyYW5zbGF0b3IiLAogICJuYW1lIjogIlRyYW5zbGF0ZSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXZlbnV6L2dub21lLXRyYW5zbGF0ZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1pbmRpY2F0b3JAYXRoZW5zdGFlZHQubmV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "material-shell@papyelgringo", "name": "Material Shell", "pname": "material-shell", "description": "A modern desktop interface for Linux - packaged as an extension for GNOME Shell. Improve your user experience and get rid of the anarchy of traditional desktop workflows. Designed to simplify navigation and reduce the need to manipulate windows in order to improve productivity. It's meant to be 100% predictable and bring the benefits of tools coveted by professionals to everyone.", "link": "https://extensions.gnome.org/extension/3357/material-shell/", "shell_version_map": {"38": {"version": "12", "sha256": "1rjybqlgbjmflg21cm7js2gjzvdhw14lpzncpzwf18rh4mp2adnr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJBIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "28", "sha256": "1jyc7b8ckvdz50ayqivbqzxvwmmxf1dg9q81y4vwiy97ncd8bisl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiYTk3ODI0NyIsCiAgImRlc2NyaXB0aW9uIjogIkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyOAp9"}, "41": {"version": "28", "sha256": "1jyc7b8ckvdz50ayqivbqzxvwmmxf1dg9q81y4vwiy97ncd8bisl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiYTk3ODI0NyIsCiAgImRlc2NyaXB0aW9uIjogIkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyOAp9"}, "42": {"version": "28", "sha256": "1jyc7b8ckvdz50ayqivbqzxvwmmxf1dg9q81y4vwiy97ncd8bisl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiYTk3ODI0NyIsCiAgImRlc2NyaXB0aW9uIjogIkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyOAp9"}, "43": {"version": "28", "sha256": "1jyc7b8ckvdz50ayqivbqzxvwmmxf1dg9q81y4vwiy97ncd8bisl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiYTk3ODI0NyIsCiAgImRlc2NyaXB0aW9uIjogIkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyOAp9"}}} +, {"uuid": "material-shell@papyelgringo", "name": "Material Shell", "pname": "material-shell", "description": "EXPERIMENTAL SHELL - USE WITH CAUTION AND DISABLE OTHERS EXTENSIONS\nA modern desktop interface for Linux - packaged as an extension for GNOME Shell. Improve your user experience and get rid of the anarchy of traditional desktop workflows. Designed to simplify navigation and reduce the need to manipulate windows in order to improve productivity. It's meant to be 100% predictable and bring the benefits of tools coveted by professionals to everyone.", "link": "https://extensions.gnome.org/extension/3357/material-shell/", "shell_version_map": {"38": {"version": "12", "sha256": "0pd9clx3mqwhlfgx1ngflj9hnrz56vnv7kxw0d95ri74d1c4a2sd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJFWFBFUklNRU5UQUwgU0hFTEwgLSBVU0UgV0lUSCBDQVVUSU9OIEFORCBESVNBQkxFIE9USEVSUyBFWFRFTlNJT05TXG5BIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "31", "sha256": "0h00hkgycjrkf180xkvx1qy6v3pwc7lh6bf0nbnmkwjkkr5rdnz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiZDJkOTYwYyIsCiAgImRlc2NyaXB0aW9uIjogIkVYUEVSSU1FTlRBTCBTSEVMTCAtIFVTRSBXSVRIIENBVVRJT04gQU5EIERJU0FCTEUgT1RIRVJTIEVYVEVOU0lPTlNcbkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAzMQp9"}, "41": {"version": "31", "sha256": "0h00hkgycjrkf180xkvx1qy6v3pwc7lh6bf0nbnmkwjkkr5rdnz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiZDJkOTYwYyIsCiAgImRlc2NyaXB0aW9uIjogIkVYUEVSSU1FTlRBTCBTSEVMTCAtIFVTRSBXSVRIIENBVVRJT04gQU5EIERJU0FCTEUgT1RIRVJTIEVYVEVOU0lPTlNcbkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAzMQp9"}, "42": {"version": "31", "sha256": "0h00hkgycjrkf180xkvx1qy6v3pwc7lh6bf0nbnmkwjkkr5rdnz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiZDJkOTYwYyIsCiAgImRlc2NyaXB0aW9uIjogIkVYUEVSSU1FTlRBTCBTSEVMTCAtIFVTRSBXSVRIIENBVVRJT04gQU5EIERJU0FCTEUgT1RIRVJTIEVYVEVOU0lPTlNcbkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAzMQp9"}, "43": {"version": "31", "sha256": "0h00hkgycjrkf180xkvx1qy6v3pwc7lh6bf0nbnmkwjkkr5rdnz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJjb21taXQiOiAiZDJkOTYwYyIsCiAgImRlc2NyaXB0aW9uIjogIkVYUEVSSU1FTlRBTCBTSEVMTCAtIFVTRSBXSVRIIENBVVRJT04gQU5EIERJU0FCTEUgT1RIRVJTIEVYVEVOU0lPTlNcbkEgbW9kZXJuIGRlc2t0b3AgaW50ZXJmYWNlIGZvciBMaW51eCAtIHBhY2thZ2VkIGFzIGFuIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIEltcHJvdmUgeW91ciB1c2VyIGV4cGVyaWVuY2UgYW5kIGdldCByaWQgb2YgdGhlIGFuYXJjaHkgb2YgdHJhZGl0aW9uYWwgZGVza3RvcCB3b3JrZmxvd3MuIERlc2lnbmVkIHRvIHNpbXBsaWZ5IG5hdmlnYXRpb24gYW5kIHJlZHVjZSB0aGUgbmVlZCB0byBtYW5pcHVsYXRlIHdpbmRvd3MgaW4gb3JkZXIgdG8gaW1wcm92ZSBwcm9kdWN0aXZpdHkuIEl0J3MgbWVhbnQgdG8gYmUgMTAwJSBwcmVkaWN0YWJsZSBhbmQgYnJpbmcgdGhlIGJlbmVmaXRzIG9mIHRvb2xzIGNvdmV0ZWQgYnkgcHJvZmVzc2lvbmFscyB0byBldmVyeW9uZS4iLAogICJsYXlvdXRzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwubGF5b3V0cyIsCiAgIm5hbWUiOiAiTWF0ZXJpYWwgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAzMQp9"}}} , {"uuid": "proxyprofiles@massamany.github.com", "name": "Proxy Profiles", "pname": "proxy-profiles", "description": "Swich easily between several proxy profiles.", "link": "https://extensions.gnome.org/extension/3379/proxy-profiles/", "shell_version_map": {"38": {"version": "5", "sha256": "1b2mabrvpkadxc6v5fczamh2hqh7va2990k10awxy18c0vm3p5kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aWNoIGVhc2lseSBiZXR3ZWVuIHNldmVyYWwgcHJveHkgcHJvZmlsZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJveHlwcm9maWxlcyIsCiAgIm5hbWUiOiAiUHJveHkgUHJvZmlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFzc2FtYW55L3Byb3h5cHJvZmlsZXMiLAogICJ1dWlkIjogInByb3h5cHJvZmlsZXNAbWFzc2FtYW55LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1b2mabrvpkadxc6v5fczamh2hqh7va2990k10awxy18c0vm3p5kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aWNoIGVhc2lseSBiZXR3ZWVuIHNldmVyYWwgcHJveHkgcHJvZmlsZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJveHlwcm9maWxlcyIsCiAgIm5hbWUiOiAiUHJveHkgUHJvZmlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFzc2FtYW55L3Byb3h5cHJvZmlsZXMiLAogICJ1dWlkIjogInByb3h5cHJvZmlsZXNAbWFzc2FtYW55LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "galaxy-buds-battery@pemmoura", "name": "Galaxy Buds Battery", "pname": "galaxy-buds-battery", "description": "Gnome extension to display a battery indicator for Samsung Galaxy Buds family. Inspired by keyboard-battery (https://extensions.gnome.org/extension/2170/keyboard-battery/)\n\nUses the python script for Galaxy buds from ThePBone (https://github.com/ThePBone/GalaxyBuds-BatteryLevel)\nINSTALLATION\n\nThis extension requires Python 3.x!\n\nYou also need Bluez and PyBluez:\n\nFor debian based distributions install with:\n\nsudo apt install bluez python3-bluez\n\nFor Fedora install with:\n\nsudo dns install bluez python3-bluez", "link": "https://extensions.gnome.org/extension/3383/galaxy-buds-battery/", "shell_version_map": {"38": {"version": "6", "sha256": "0mi645cb0il5i13i64qdagalv91g4m7mv2mfza8hxhpks5r4pr81", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiB0byBkaXNwbGF5IGEgYmF0dGVyeSBpbmRpY2F0b3IgZm9yIFNhbXN1bmcgR2FsYXh5IEJ1ZHMgZmFtaWx5LiBJbnNwaXJlZCBieSBrZXlib2FyZC1iYXR0ZXJ5IChodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8yMTcwL2tleWJvYXJkLWJhdHRlcnkvKVxuXG5Vc2VzIHRoZSBweXRob24gc2NyaXB0IGZvciBHYWxheHkgYnVkcyBmcm9tIFRoZVBCb25lIChodHRwczovL2dpdGh1Yi5jb20vVGhlUEJvbmUvR2FsYXh5QnVkcy1CYXR0ZXJ5TGV2ZWwpXG5JTlNUQUxMQVRJT05cblxuVGhpcyBleHRlbnNpb24gcmVxdWlyZXMgUHl0aG9uIDMueCFcblxuWW91IGFsc28gbmVlZCBCbHVleiBhbmQgUHlCbHVlejpcblxuRm9yIGRlYmlhbiBiYXNlZCBkaXN0cmlidXRpb25zIGluc3RhbGwgd2l0aDpcblxuc3VkbyBhcHQgaW5zdGFsbCBibHVleiBweXRob24zLWJsdWV6XG5cbkZvciBGZWRvcmEgaW5zdGFsbCB3aXRoOlxuXG5zdWRvIGRucyBpbnN0YWxsIGJsdWV6IHB5dGhvbjMtYmx1ZXoiLAogICJuYW1lIjogIkdhbGF4eSBCdWRzIEJhdHRlcnkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZW1tb3VyYS9nYWxheHlidWRzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZ2FsYXh5LWJ1ZHMtYmF0dGVyeUBwZW1tb3VyYSIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "7", "sha256": "0wqx4wmxsfd2d3ssqddfmvaa7c3d6br5xfs0n17r76vmfmd09qkl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiB0byBkaXNwbGF5IGEgYmF0dGVyeSBpbmRpY2F0b3IgZm9yIFNhbXN1bmcgR2FsYXh5IEJ1ZHMgZmFtaWx5LiBJbnNwaXJlZCBieSBrZXlib2FyZC1iYXR0ZXJ5IChodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8yMTcwL2tleWJvYXJkLWJhdHRlcnkvKVxuXG5Vc2VzIHRoZSBweXRob24gc2NyaXB0IGZvciBHYWxheHkgYnVkcyBmcm9tIFRoZVBCb25lIChodHRwczovL2dpdGh1Yi5jb20vVGhlUEJvbmUvR2FsYXh5QnVkcy1CYXR0ZXJ5TGV2ZWwpXG5JTlNUQUxMQVRJT05cblxuVGhpcyBleHRlbnNpb24gcmVxdWlyZXMgUHl0aG9uIDMueCFcblxuWW91IGFsc28gbmVlZCBCbHVleiBhbmQgUHlCbHVlejpcblxuRm9yIGRlYmlhbiBiYXNlZCBkaXN0cmlidXRpb25zIGluc3RhbGwgd2l0aDpcblxuc3VkbyBhcHQgaW5zdGFsbCBibHVleiBweXRob24zLWJsdWV6XG5cbkZvciBGZWRvcmEgaW5zdGFsbCB3aXRoOlxuXG5zdWRvIGRucyBpbnN0YWxsIGJsdWV6IHB5dGhvbjMtYmx1ZXoiLAogICJuYW1lIjogIkdhbGF4eSBCdWRzIEJhdHRlcnkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGVtbW91cmEvZ2FsYXh5YnVkcy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImdhbGF4eS1idWRzLWJhdHRlcnlAcGVtbW91cmEiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "color-picker@tuberry", "name": "Color Picker", "pname": "color-picker", "description": "Simple color picker for gnome shell\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3396/color-picker/", "shell_version_map": {"38": {"version": "20", "sha256": "1ss4r8dpa7smxbyz41rw3wl1gy20bvy89xdvwfz6zfhv3db5vl86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yLXBpY2tlciIsCiAgIm5hbWUiOiAiQ29sb3IgUGlja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yLXBpY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvY29sb3ItcGlja2VyIiwKICAidXVpZCI6ICJjb2xvci1waWNrZXJAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "25", "sha256": "0lx4bs7yfqkphb5cwmakl6xjf14q89m0yn70a882drakfhzgnagw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yLXBpY2tlciIsCiAgIm5hbWUiOiAiQ29sb3IgUGlja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yLXBpY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2NvbG9yLXBpY2tlciIsCiAgInV1aWQiOiAiY29sb3ItcGlja2VyQHR1YmVycnkiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "27", "sha256": "1scc0cgdzrg9rmpr090myrsxhfgp03aqld9jh4grqbfza6lrz4jd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDI3Cn0="}, "42": {"version": "30", "sha256": "04dagpvpb535nq4l9nd7wjiv8p1npbzlbw8zi3zkp0r1hy4qxbll", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvY29sb3ItcGlja2VyIiwKICAidXVpZCI6ICJjb2xvci1waWNrZXJAdHViZXJyeSIsCiAgInZlcnNpb24iOiAzMAp9"}, "43": {"version": "34", "sha256": "00mpmx7yfzy9wram6abwm8m7dklk84m3z38r0p8zxp20p3rik660", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDM0Cn0="}}} @@ -405,7 +405,7 @@ , {"uuid": "wacom-indicator@fthx", "name": "Wacom Indicator", "pname": "wacom-indicator", "description": "Wacom tablet indicator in the top bar: connection state and power level.\n\n On click: open GNOME Settings Wacom section. On hover or every minute: update connection state and power level.\n\n Settings (in extension.js file headers): show/hide model label, refresh delay, update/do nothing on indicator hover, show/hide if disconnected.", "link": "https://extensions.gnome.org/extension/3809/wacom-indicator/", "shell_version_map": {"38": {"version": "7", "sha256": "1sda66n1s3d28jd98xcznw5ljv10iwndpcbq7bfm5hqzrk8zimid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhY29tIHRhYmxldCBpbmRpY2F0b3IgaW4gdGhlIHRvcCBiYXI6IGNvbm5lY3Rpb24gc3RhdGUgYW5kIHBvd2VyIGxldmVsLlxuXG4gT24gY2xpY2s6IG9wZW4gR05PTUUgU2V0dGluZ3MgV2Fjb20gc2VjdGlvbi4gT24gaG92ZXIgb3IgZXZlcnkgbWludXRlOiB1cGRhdGUgY29ubmVjdGlvbiBzdGF0ZSBhbmQgcG93ZXIgbGV2ZWwuXG5cbiBTZXR0aW5ncyAoaW4gZXh0ZW5zaW9uLmpzIGZpbGUgaGVhZGVycyk6IHNob3cvaGlkZSBtb2RlbCBsYWJlbCwgcmVmcmVzaCBkZWxheSwgdXBkYXRlL2RvIG5vdGhpbmcgb24gaW5kaWNhdG9yIGhvdmVyLCBzaG93L2hpZGUgaWYgZGlzY29ubmVjdGVkLiIsCiAgIm5hbWUiOiAiV2Fjb20gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd2Fjb20taW5kaWNhdG9yIiwKICAidXVpZCI6ICJ3YWNvbS1pbmRpY2F0b3JAZnRoeCIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "1sda66n1s3d28jd98xcznw5ljv10iwndpcbq7bfm5hqzrk8zimid", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhY29tIHRhYmxldCBpbmRpY2F0b3IgaW4gdGhlIHRvcCBiYXI6IGNvbm5lY3Rpb24gc3RhdGUgYW5kIHBvd2VyIGxldmVsLlxuXG4gT24gY2xpY2s6IG9wZW4gR05PTUUgU2V0dGluZ3MgV2Fjb20gc2VjdGlvbi4gT24gaG92ZXIgb3IgZXZlcnkgbWludXRlOiB1cGRhdGUgY29ubmVjdGlvbiBzdGF0ZSBhbmQgcG93ZXIgbGV2ZWwuXG5cbiBTZXR0aW5ncyAoaW4gZXh0ZW5zaW9uLmpzIGZpbGUgaGVhZGVycyk6IHNob3cvaGlkZSBtb2RlbCBsYWJlbCwgcmVmcmVzaCBkZWxheSwgdXBkYXRlL2RvIG5vdGhpbmcgb24gaW5kaWNhdG9yIGhvdmVyLCBzaG93L2hpZGUgaWYgZGlzY29ubmVjdGVkLiIsCiAgIm5hbWUiOiAiV2Fjb20gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd2Fjb20taW5kaWNhdG9yIiwKICAidXVpZCI6ICJ3YWNvbS1pbmRpY2F0b3JAZnRoeCIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "hibernate@dafne.rocks", "name": "System Action - Hibernate", "pname": "system-action-hibernate", "description": "A GNOME extension that adds the option to hibernate amongst other system actions", "link": "https://extensions.gnome.org/extension/3814/system-action-hibernate/", "shell_version_map": {"38": {"version": "9", "sha256": "0hp93b4s1lcvsc6fwda9mrwcv5bwqya178zhyqpx37fm7r7kz9vz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "0hp93b4s1lcvsc6fwda9mrwcv5bwqya178zhyqpx37fm7r7kz9vz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "0hp93b4s1lcvsc6fwda9mrwcv5bwqya178zhyqpx37fm7r7kz9vz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "0hp93b4s1lcvsc6fwda9mrwcv5bwqya178zhyqpx37fm7r7kz9vz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgZXh0ZW5zaW9uIHRoYXQgYWRkcyB0aGUgb3B0aW9uIHRvIGhpYmVybmF0ZSBhbW9uZ3N0IG90aGVyIHN5c3RlbSBhY3Rpb25zIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlQGRhZm5lLnJvY2tzIiwKICAibmFtZSI6ICJTeXN0ZW0gQWN0aW9uIC0gSGliZXJuYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2NvZGViZXJnLm9yZy9raXl1aS9nbm9tZS1zaGVsbC1oaWJlcm5hdGUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJoaWJlcm5hdGVAZGFmbmUucm9ja3MiLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "click-to-close-overview@l3nn4rt.github.io", "name": "Click to close overview", "pname": "click-to-close-overview", "description": "Close the overview by clicking empty space.", "link": "https://extensions.gnome.org/extension/3826/click-to-close-overview/", "shell_version_map": {"38": {"version": "3", "sha256": "17xd3k1xpsn8ma6f11f4sr26y5xbcs3hiw7lv1qqrn80lyjj2vz1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbDNubjRydC9jbGljay10by1jbG9zZS1vdmVydmlldyIsCiAgInV1aWQiOiAiY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "7", "sha256": "1pjp5yv27dvghdq74017brzqpk8jczmhw893wzw2id0nja2pjvqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2wzbm40cnQvY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXciLAogICJ1dWlkIjogImNsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3QGwzbm40cnQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "1pjp5yv27dvghdq74017brzqpk8jczmhw893wzw2id0nja2pjvqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2wzbm40cnQvY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXciLAogICJ1dWlkIjogImNsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3QGwzbm40cnQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "1pjp5yv27dvghdq74017brzqpk8jczmhw893wzw2id0nja2pjvqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2wzbm40cnQvY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXciLAogICJ1dWlkIjogImNsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3QGwzbm40cnQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "1pjp5yv27dvghdq74017brzqpk8jczmhw893wzw2id0nja2pjvqn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBieSBjbGlja2luZyBlbXB0eSBzcGFjZS4iLAogICJuYW1lIjogIkNsaWNrIHRvIGNsb3NlIG92ZXJ2aWV3IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2wzbm40cnQvY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXciLAogICJ1dWlkIjogImNsaWNrLXRvLWNsb3NlLW92ZXJ2aWV3QGwzbm40cnQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} -, {"uuid": "just-perfection-desktop@just-perfection", "name": "Just Perfection", "pname": "just-perfection", "description": "Tweak Tool to Customize GNOME Shell, Change the Behavior and Disable UI Elements\n\n- Accessibility Menu Visibility\n- Activities Button Icon Visibility\n- Activities button Visibility\n- Alt Tab Icon Size\n- Alt Tab Window Preview Icon Size\n- Alt Tab Window Preview Size\n- Always Show Workspace Switcher on Dynamic Workspaces (40, 41, 42)\n- Animation Speed or Disable it\n- App Gesture (3.36, 3.38)\n- Applications Button Visibility\n- App Menu Icon Visibility\n- App Menu Label Visibility\n- App Menu Visibility\n- Background Menu Visibility\n- Calendar Visibility\n- Clock Menu Position\n- Clock Menu Visibility\n- Dash Icon Size\n- Dash Separator Visibility (40, 41, 42)\n- Dash Visibility\n- Disable Type to Search\n- Double Super Key to App Grid\n- Events in Clock Menu Visibility\n- GNOME Shell Theme Override\n- Hot Corner (3.36, 3.38, 40)\n- Keyboard Layout Visibility\n- Looking Glass Size\n- Notification Banner Position\n- OSD Position\n- OSD Visibility\n- Panel Arrow Visibility (3.36, 3.38)\n- Panel Button Padding Size\n- Panel Height\n- Panel icon size \n- Panel Indicator Padding Size\n- Panel Notification icon Visibility\n- Panel Position\n- Panel Round Corner Size (3.36, 3.38, 40, 41)\n- Panel Visibility\n- Panel Visibility in Overview\n- Power Icon Visibility\n- Quick Settings Menu Visibility (43)\n- Ripple Box\n- Search Visibility\n- Startup Status(40, 41, 42)\n- System Menu (Aggregate Menu) Visibility (3.36, 3.38, 40, 41, 42)\n- Take Screenshot Button in Window Menu Visibility\n- Weather Visibility\n- Window Demands Attention Focus\n- Window Picker Caption Visibility\n- Window Picker Close Button Visibility\n- Window Picker Icon (40, 41, 42)\n- Workspace Background Corner Size in Overview (40, 41, 42)\n- Workspace Popup Visibility\n- Workspaces in app grid Visibility (40, 41, 42)\n- Workspace Switcher Size (40, 41, 42)\n- Workspace Switcher Visibility\n- Workspace Wraparound\n- World Clock Visibility", "link": "https://extensions.gnome.org/extension/3843/just-perfection/", "shell_version_map": {"38": {"version": "22", "sha256": "12ak9dxmzrrlgc9zjf3j7i6dl3gfqp4n95pqwfwcmvhv7nk20v16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIpXG4tIEFuaW1hdGlvbiBTcGVlZCBvciBEaXNhYmxlIGl0XG4tIEFwcCBHZXN0dXJlICgzLjM2LCAzLjM4KVxuLSBBcHBsaWNhdGlvbnMgQnV0dG9uIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgSWNvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IExhYmVsIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgVmlzaWJpbGl0eVxuLSBCYWNrZ3JvdW5kIE1lbnUgVmlzaWJpbGl0eVxuLSBDYWxlbmRhciBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggU2VwYXJhdG9yIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIpXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gRXZlbnRzIGluIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBHTk9NRSBTaGVsbCBUaGVtZSBPdmVycmlkZVxuLSBIb3QgQ29ybmVyICgzLjM2LCAzLjM4LCA0MClcbi0gS2V5Ym9hcmQgTGF5b3V0IFZpc2liaWxpdHlcbi0gTG9va2luZyBHbGFzcyBTaXplXG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkgKDMuMzYsIDMuMzgpXG4tIFBhbmVsIEJ1dHRvbiBQYWRkaW5nIFNpemVcbi0gUGFuZWwgSGVpZ2h0XG4tIFBhbmVsIGljb24gc2l6ZSBcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplICgzLjM2LCAzLjM4LCA0MCwgNDEpXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUXVpY2sgU2V0dGluZ3MgTWVudSBWaXNpYmlsaXR5ICg0Mylcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEsIDQyKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlIFdyYXBhcm91bmRcbi0gV29ybGQgQ2xvY2sgVmlzaWJpbGl0eSIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "22", "sha256": "12ak9dxmzrrlgc9zjf3j7i6dl3gfqp4n95pqwfwcmvhv7nk20v16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIpXG4tIEFuaW1hdGlvbiBTcGVlZCBvciBEaXNhYmxlIGl0XG4tIEFwcCBHZXN0dXJlICgzLjM2LCAzLjM4KVxuLSBBcHBsaWNhdGlvbnMgQnV0dG9uIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgSWNvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IExhYmVsIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgVmlzaWJpbGl0eVxuLSBCYWNrZ3JvdW5kIE1lbnUgVmlzaWJpbGl0eVxuLSBDYWxlbmRhciBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggU2VwYXJhdG9yIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIpXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gRXZlbnRzIGluIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBHTk9NRSBTaGVsbCBUaGVtZSBPdmVycmlkZVxuLSBIb3QgQ29ybmVyICgzLjM2LCAzLjM4LCA0MClcbi0gS2V5Ym9hcmQgTGF5b3V0IFZpc2liaWxpdHlcbi0gTG9va2luZyBHbGFzcyBTaXplXG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkgKDMuMzYsIDMuMzgpXG4tIFBhbmVsIEJ1dHRvbiBQYWRkaW5nIFNpemVcbi0gUGFuZWwgSGVpZ2h0XG4tIFBhbmVsIGljb24gc2l6ZSBcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplICgzLjM2LCAzLjM4LCA0MCwgNDEpXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUXVpY2sgU2V0dGluZ3MgTWVudSBWaXNpYmlsaXR5ICg0Mylcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEsIDQyKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlIFdyYXBhcm91bmRcbi0gV29ybGQgQ2xvY2sgVmlzaWJpbGl0eSIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "12ak9dxmzrrlgc9zjf3j7i6dl3gfqp4n95pqwfwcmvhv7nk20v16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIpXG4tIEFuaW1hdGlvbiBTcGVlZCBvciBEaXNhYmxlIGl0XG4tIEFwcCBHZXN0dXJlICgzLjM2LCAzLjM4KVxuLSBBcHBsaWNhdGlvbnMgQnV0dG9uIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgSWNvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IExhYmVsIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgVmlzaWJpbGl0eVxuLSBCYWNrZ3JvdW5kIE1lbnUgVmlzaWJpbGl0eVxuLSBDYWxlbmRhciBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggU2VwYXJhdG9yIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIpXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gRXZlbnRzIGluIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBHTk9NRSBTaGVsbCBUaGVtZSBPdmVycmlkZVxuLSBIb3QgQ29ybmVyICgzLjM2LCAzLjM4LCA0MClcbi0gS2V5Ym9hcmQgTGF5b3V0IFZpc2liaWxpdHlcbi0gTG9va2luZyBHbGFzcyBTaXplXG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkgKDMuMzYsIDMuMzgpXG4tIFBhbmVsIEJ1dHRvbiBQYWRkaW5nIFNpemVcbi0gUGFuZWwgSGVpZ2h0XG4tIFBhbmVsIGljb24gc2l6ZSBcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplICgzLjM2LCAzLjM4LCA0MCwgNDEpXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUXVpY2sgU2V0dGluZ3MgTWVudSBWaXNpYmlsaXR5ICg0Mylcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEsIDQyKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlIFdyYXBhcm91bmRcbi0gV29ybGQgQ2xvY2sgVmlzaWJpbGl0eSIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "12ak9dxmzrrlgc9zjf3j7i6dl3gfqp4n95pqwfwcmvhv7nk20v16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIpXG4tIEFuaW1hdGlvbiBTcGVlZCBvciBEaXNhYmxlIGl0XG4tIEFwcCBHZXN0dXJlICgzLjM2LCAzLjM4KVxuLSBBcHBsaWNhdGlvbnMgQnV0dG9uIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgSWNvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IExhYmVsIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgVmlzaWJpbGl0eVxuLSBCYWNrZ3JvdW5kIE1lbnUgVmlzaWJpbGl0eVxuLSBDYWxlbmRhciBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggU2VwYXJhdG9yIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIpXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gRXZlbnRzIGluIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBHTk9NRSBTaGVsbCBUaGVtZSBPdmVycmlkZVxuLSBIb3QgQ29ybmVyICgzLjM2LCAzLjM4LCA0MClcbi0gS2V5Ym9hcmQgTGF5b3V0IFZpc2liaWxpdHlcbi0gTG9va2luZyBHbGFzcyBTaXplXG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkgKDMuMzYsIDMuMzgpXG4tIFBhbmVsIEJ1dHRvbiBQYWRkaW5nIFNpemVcbi0gUGFuZWwgSGVpZ2h0XG4tIFBhbmVsIGljb24gc2l6ZSBcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplICgzLjM2LCAzLjM4LCA0MCwgNDEpXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUXVpY2sgU2V0dGluZ3MgTWVudSBWaXNpYmlsaXR5ICg0Mylcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEsIDQyKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlIFdyYXBhcm91bmRcbi0gV29ybGQgQ2xvY2sgVmlzaWJpbGl0eSIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "22", "sha256": "12ak9dxmzrrlgc9zjf3j7i6dl3gfqp4n95pqwfwcmvhv7nk20v16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIpXG4tIEFuaW1hdGlvbiBTcGVlZCBvciBEaXNhYmxlIGl0XG4tIEFwcCBHZXN0dXJlICgzLjM2LCAzLjM4KVxuLSBBcHBsaWNhdGlvbnMgQnV0dG9uIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgSWNvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IExhYmVsIFZpc2liaWxpdHlcbi0gQXBwIE1lbnUgVmlzaWJpbGl0eVxuLSBCYWNrZ3JvdW5kIE1lbnUgVmlzaWJpbGl0eVxuLSBDYWxlbmRhciBWaXNpYmlsaXR5XG4tIENsb2NrIE1lbnUgUG9zaXRpb25cbi0gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIERhc2ggSWNvbiBTaXplXG4tIERhc2ggU2VwYXJhdG9yIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIpXG4tIERhc2ggVmlzaWJpbGl0eVxuLSBEaXNhYmxlIFR5cGUgdG8gU2VhcmNoXG4tIERvdWJsZSBTdXBlciBLZXkgdG8gQXBwIEdyaWRcbi0gRXZlbnRzIGluIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBHTk9NRSBTaGVsbCBUaGVtZSBPdmVycmlkZVxuLSBIb3QgQ29ybmVyICgzLjM2LCAzLjM4LCA0MClcbi0gS2V5Ym9hcmQgTGF5b3V0IFZpc2liaWxpdHlcbi0gTG9va2luZyBHbGFzcyBTaXplXG4tIE5vdGlmaWNhdGlvbiBCYW5uZXIgUG9zaXRpb25cbi0gT1NEIFBvc2l0aW9uXG4tIE9TRCBWaXNpYmlsaXR5XG4tIFBhbmVsIEFycm93IFZpc2liaWxpdHkgKDMuMzYsIDMuMzgpXG4tIFBhbmVsIEJ1dHRvbiBQYWRkaW5nIFNpemVcbi0gUGFuZWwgSGVpZ2h0XG4tIFBhbmVsIGljb24gc2l6ZSBcbi0gUGFuZWwgSW5kaWNhdG9yIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBOb3RpZmljYXRpb24gaWNvbiBWaXNpYmlsaXR5XG4tIFBhbmVsIFBvc2l0aW9uXG4tIFBhbmVsIFJvdW5kIENvcm5lciBTaXplICgzLjM2LCAzLjM4LCA0MCwgNDEpXG4tIFBhbmVsIFZpc2liaWxpdHlcbi0gUGFuZWwgVmlzaWJpbGl0eSBpbiBPdmVydmlld1xuLSBQb3dlciBJY29uIFZpc2liaWxpdHlcbi0gUXVpY2sgU2V0dGluZ3MgTWVudSBWaXNpYmlsaXR5ICg0Mylcbi0gUmlwcGxlIEJveFxuLSBTZWFyY2ggVmlzaWJpbGl0eVxuLSBTdGFydHVwIFN0YXR1cyg0MCwgNDEsIDQyKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgQmFja2dyb3VuZCBDb3JuZXIgU2l6ZSBpbiBPdmVydmlldyAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFBvcHVwIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlcyBpbiBhcHAgZ3JpZCBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0Milcbi0gV29ya3NwYWNlIFN3aXRjaGVyIFZpc2liaWxpdHlcbi0gV29ya3NwYWNlIFdyYXBhcm91bmRcbi0gV29ybGQgQ2xvY2sgVmlzaWJpbGl0eSIsCiAgImdldHRleHQtZG9tYWluIjogImp1c3QtcGVyZmVjdGlvbiIsCiAgIm5hbWUiOiAiSnVzdCBQZXJmZWN0aW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmp1c3QtcGVyZmVjdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qcmFobWF0emFkZWgvanVzdC1wZXJmZWN0aW9uIiwKICAidXVpZCI6ICJqdXN0LXBlcmZlY3Rpb24tZGVza3RvcEBqdXN0LXBlcmZlY3Rpb24iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} +, {"uuid": "just-perfection-desktop@just-perfection", "name": "Just Perfection", "pname": "just-perfection", "description": "Tweak Tool to Customize GNOME Shell, Change the Behavior and Disable UI Elements\n\n- Accessibility Menu Visibility\n- Activities Button Icon Visibility\n- Activities button Visibility\n- Alt Tab Icon Size\n- Alt Tab Window Preview Icon Size\n- Alt Tab Window Preview Size\n- Always Show Workspace Switcher on Dynamic Workspaces (40, 41, 42, 43)\n- Animation Speed or Disable it\n- App Gesture (3.36, 3.38)\n- Applications Button Visibility\n- App Menu Icon Visibility\n- App Menu Label Visibility\n- App Menu Visibility\n- Background Menu Visibility\n- Calendar Visibility\n- Clock Menu Position\n- Clock Menu Visibility\n- Dash Icon Size\n- Dash Separator Visibility (40, 41, 42, 43)\n- Dash Visibility\n- Disable Type to Search\n- Double Super Key to App Grid\n- Events in Clock Menu Visibility\n- GNOME Shell Theme Override\n- Hot Corner (3.36, 3.38, 40)\n- Keyboard Layout Visibility\n- Looking Glass Size\n- Notification Banner Position\n- OSD Position\n- OSD Visibility\n- Panel Arrow Visibility (3.36, 3.38)\n- Panel Button Padding Size\n- Panel Height\n- Panel icon size \n- Panel Indicator Padding Size\n- Panel Notification icon Visibility\n- Panel Position\n- Panel Round Corner Size (3.36, 3.38, 40, 41)\n- Panel Visibility\n- Panel Visibility in Overview\n- Power Icon Visibility\n- Quick Settings Menu Visibility (43)\n- Ripple Box\n- Search Visibility\n- Startup Status(40, 41, 42, 43)\n- System Menu (Aggregate Menu) Visibility (3.36, 3.38, 40, 41, 42)\n- Take Screenshot Button in Window Menu Visibility\n- Weather Visibility\n- Window Demands Attention Focus\n- Window Picker Caption Visibility\n- Window Picker Close Button Visibility\n- Window Picker Icon (40, 41, 42, 43)\n- Workspace Background Corner Size in Overview (40, 41, 42, 43)\n- Workspace Popup Visibility\n- Workspaces in app grid Visibility (40, 41, 42, 43)\n- Workspace Switcher Size (40, 41, 42, 43)\n- Workspace Switcher Visibility\n- Workspace Wraparound\n- World Clock Visibility", "link": "https://extensions.gnome.org/extension/3843/just-perfection/", "shell_version_map": {"38": {"version": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}, "40": {"version": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}, "41": {"version": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}, "42": {"version": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}, "43": {"version": "22", "sha256": "04hzcwj6yhym6lkn08qgpjv7ycqldasn3jrgcmmgkrfx6hljf91g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR3ZWFrIFRvb2wgdG8gQ3VzdG9taXplIEdOT01FIFNoZWxsLCBDaGFuZ2UgdGhlIEJlaGF2aW9yIGFuZCBEaXNhYmxlIFVJIEVsZW1lbnRzXG5cbi0gQWNjZXNzaWJpbGl0eSBNZW51IFZpc2liaWxpdHlcbi0gQWN0aXZpdGllcyBCdXR0b24gSWNvbiBWaXNpYmlsaXR5XG4tIEFjdGl2aXRpZXMgYnV0dG9uIFZpc2liaWxpdHlcbi0gQWx0IFRhYiBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBJY29uIFNpemVcbi0gQWx0IFRhYiBXaW5kb3cgUHJldmlldyBTaXplXG4tIEFsd2F5cyBTaG93IFdvcmtzcGFjZSBTd2l0Y2hlciBvbiBEeW5hbWljIFdvcmtzcGFjZXMgKDQwLCA0MSwgNDIsIDQzKVxuLSBBbmltYXRpb24gU3BlZWQgb3IgRGlzYWJsZSBpdFxuLSBBcHAgR2VzdHVyZSAoMy4zNiwgMy4zOClcbi0gQXBwbGljYXRpb25zIEJ1dHRvbiBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IEljb24gVmlzaWJpbGl0eVxuLSBBcHAgTWVudSBMYWJlbCBWaXNpYmlsaXR5XG4tIEFwcCBNZW51IFZpc2liaWxpdHlcbi0gQmFja2dyb3VuZCBNZW51IFZpc2liaWxpdHlcbi0gQ2FsZW5kYXIgVmlzaWJpbGl0eVxuLSBDbG9jayBNZW51IFBvc2l0aW9uXG4tIENsb2NrIE1lbnUgVmlzaWJpbGl0eVxuLSBEYXNoIEljb24gU2l6ZVxuLSBEYXNoIFNlcGFyYXRvciBWaXNpYmlsaXR5ICg0MCwgNDEsIDQyLCA0Mylcbi0gRGFzaCBWaXNpYmlsaXR5XG4tIERpc2FibGUgVHlwZSB0byBTZWFyY2hcbi0gRG91YmxlIFN1cGVyIEtleSB0byBBcHAgR3JpZFxuLSBFdmVudHMgaW4gQ2xvY2sgTWVudSBWaXNpYmlsaXR5XG4tIEdOT01FIFNoZWxsIFRoZW1lIE92ZXJyaWRlXG4tIEhvdCBDb3JuZXIgKDMuMzYsIDMuMzgsIDQwKVxuLSBLZXlib2FyZCBMYXlvdXQgVmlzaWJpbGl0eVxuLSBMb29raW5nIEdsYXNzIFNpemVcbi0gTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvblxuLSBPU0QgUG9zaXRpb25cbi0gT1NEIFZpc2liaWxpdHlcbi0gUGFuZWwgQXJyb3cgVmlzaWJpbGl0eSAoMy4zNiwgMy4zOClcbi0gUGFuZWwgQnV0dG9uIFBhZGRpbmcgU2l6ZVxuLSBQYW5lbCBIZWlnaHRcbi0gUGFuZWwgaWNvbiBzaXplIFxuLSBQYW5lbCBJbmRpY2F0b3IgUGFkZGluZyBTaXplXG4tIFBhbmVsIE5vdGlmaWNhdGlvbiBpY29uIFZpc2liaWxpdHlcbi0gUGFuZWwgUG9zaXRpb25cbi0gUGFuZWwgUm91bmQgQ29ybmVyIFNpemUgKDMuMzYsIDMuMzgsIDQwLCA0MSlcbi0gUGFuZWwgVmlzaWJpbGl0eVxuLSBQYW5lbCBWaXNpYmlsaXR5IGluIE92ZXJ2aWV3XG4tIFBvd2VyIEljb24gVmlzaWJpbGl0eVxuLSBRdWljayBTZXR0aW5ncyBNZW51IFZpc2liaWxpdHkgKDQzKVxuLSBSaXBwbGUgQm94XG4tIFNlYXJjaCBWaXNpYmlsaXR5XG4tIFN0YXJ0dXAgU3RhdHVzKDQwLCA0MSwgNDIsIDQzKVxuLSBTeXN0ZW0gTWVudSAoQWdncmVnYXRlIE1lbnUpIFZpc2liaWxpdHkgKDMuMzYsIDMuMzgsIDQwLCA0MSwgNDIpXG4tIFRha2UgU2NyZWVuc2hvdCBCdXR0b24gaW4gV2luZG93IE1lbnUgVmlzaWJpbGl0eVxuLSBXZWF0aGVyIFZpc2liaWxpdHlcbi0gV2luZG93IERlbWFuZHMgQXR0ZW50aW9uIEZvY3VzXG4tIFdpbmRvdyBQaWNrZXIgQ2FwdGlvbiBWaXNpYmlsaXR5XG4tIFdpbmRvdyBQaWNrZXIgQ2xvc2UgQnV0dG9uIFZpc2liaWxpdHlcbi0gV2luZG93IFBpY2tlciBJY29uICg0MCwgNDEsIDQyLCA0Mylcbi0gV29ya3NwYWNlIEJhY2tncm91bmQgQ29ybmVyIFNpemUgaW4gT3ZlcnZpZXcgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgUG9wdXAgVmlzaWJpbGl0eVxuLSBXb3Jrc3BhY2VzIGluIGFwcCBncmlkIFZpc2liaWxpdHkgKDQwLCA0MSwgNDIsIDQzKVxuLSBXb3Jrc3BhY2UgU3dpdGNoZXIgU2l6ZSAoNDAsIDQxLCA0MiwgNDMpXG4tIFdvcmtzcGFjZSBTd2l0Y2hlciBWaXNpYmlsaXR5XG4tIFdvcmtzcGFjZSBXcmFwYXJvdW5kXG4tIFdvcmxkIENsb2NrIFZpc2liaWxpdHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJqdXN0LXBlcmZlY3Rpb24iLAogICJuYW1lIjogIkp1c3QgUGVyZmVjdGlvbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5qdXN0LXBlcmZlY3Rpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvanJhaG1hdHphZGVoL2p1c3QtcGVyZmVjdGlvbiIsCiAgInV1aWQiOiAianVzdC1wZXJmZWN0aW9uLWRlc2t0b3BAanVzdC1wZXJmZWN0aW9uIiwKICAidmVyc2lvbiI6IDIyCn0="}}} , {"uuid": "workspaces-bar@fthx", "name": "Workspaces Bar", "pname": "workspaces-bar", "description": "Replace 'Activities' button by all current workspaces buttons. Switch workspace or toggle overview by clicking on these buttons.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.", "link": "https://extensions.gnome.org/extension/3851/workspaces-bar/", "shell_version_map": {"38": {"version": "13", "sha256": "1pmbdzm5ingnqx1i6hd7br14fcmyss6nyrclq74ld5zbpzgy6sih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "1pmbdzm5ingnqx1i6hd7br14fcmyss6nyrclq74ld5zbpzgy6sih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "1pmbdzm5ingnqx1i6hd7br14fcmyss6nyrclq74ld5zbpzgy6sih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "1pmbdzm5ingnqx1i6hd7br14fcmyss6nyrclq74ld5zbpzgy6sih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgJ0FjdGl2aXRpZXMnIGJ1dHRvbiBieSBhbGwgY3VycmVudCB3b3Jrc3BhY2VzIGJ1dHRvbnMuIFN3aXRjaCB3b3Jrc3BhY2Ugb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2VzIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvd29ya3NwYWNlcy1iYXIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} , {"uuid": "scanlines-effect@muratcileli.com", "name": "Scanlines Effect", "pname": "scanlines-effect", "description": "Retro monitor / CRT TV effect.", "link": "https://extensions.gnome.org/extension/3860/scanlines-effect/", "shell_version_map": {"38": {"version": "1", "sha256": "1xcsd700s9hkqmrqlv56ldiya2jk0d46j8k4a4i3m9c6k40c5z7v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJldHJvIG1vbml0b3IgLyBDUlQgVFYgZWZmZWN0LiIsCiAgIm5hbWUiOiAiU2NhbmxpbmVzIEVmZmVjdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJjb20ubXVyYXRjaWxlbGkuc2NhbmxpbmVzLWVmZmVjdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211cmF0LWNpbGVsaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NhbmxpbmVzLWVmZmVjdCIsCiAgInV1aWQiOiAic2NhbmxpbmVzLWVmZmVjdEBtdXJhdGNpbGVsaS5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "workspaces-thumbnails-applet@blogdron", "name": "Workspaces Thumbnails Applet", "pname": "workspaces-thumbnails-applet", "description": "Notice!\n\nThis is a fork of the extension https://extensions.gnome.org/extension/2557/workspaces-thumbnails/ It hasn't been updated in a long time, but it only needs a small fix to work. Until the author fixes the problem, I will keep this fork. Please, if you have the opportunity to contact the author of the original extension, let him fix the problem for himself.\n\n\nPut an indicator on the panel showing all the workspaces thumbnails, allowing to switch between them or moving windows to another workspace.\n\n This is a very tiny fork of the original (GNOME official extension) Workspace Indicator, allowing to use it like when the Horizontal Workspaces extension is activated. The vertical workspaces layout is not modified; the workspaces layout is horizontal only in the top panel and the workspaces switcher in the overview is still showed. Please note that any global bug should be reported against the Workspace Indicator extension. https://extensions.gnome.org/extension/21/workspace-indicator", "link": "https://extensions.gnome.org/extension/3872/workspaces-thumbnails-applet/", "shell_version_map": {"38": {"version": "1", "sha256": "02823b6rfnibb0mhnx848pdxc3birw2aqp8607wjf93mvy5388hm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGljZSFcblxuVGhpcyBpcyBhIGZvcmsgb2YgdGhlIGV4dGVuc2lvbiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8yNTU3L3dvcmtzcGFjZXMtdGh1bWJuYWlscy8gSXQgaGFzbid0IGJlZW4gdXBkYXRlZCBpbiBhIGxvbmcgdGltZSwgYnV0IGl0IG9ubHkgbmVlZHMgYSBzbWFsbCBmaXggdG8gd29yay4gVW50aWwgdGhlIGF1dGhvciBmaXhlcyB0aGUgcHJvYmxlbSwgSSB3aWxsIGtlZXAgdGhpcyBmb3JrLiBQbGVhc2UsIGlmIHlvdSBoYXZlIHRoZSBvcHBvcnR1bml0eSB0byBjb250YWN0IHRoZSBhdXRob3Igb2YgdGhlIG9yaWdpbmFsIGV4dGVuc2lvbiwgbGV0IGhpbSBmaXggdGhlIHByb2JsZW0gZm9yIGhpbXNlbGYuXG5cblxuUHV0IGFuIGluZGljYXRvciBvbiB0aGUgcGFuZWwgc2hvd2luZyBhbGwgdGhlIHdvcmtzcGFjZXMgdGh1bWJuYWlscywgYWxsb3dpbmcgdG8gc3dpdGNoIGJldHdlZW4gdGhlbSBvciBtb3Zpbmcgd2luZG93cyB0byBhbm90aGVyIHdvcmtzcGFjZS5cblxuIFRoaXMgaXMgYSB2ZXJ5IHRpbnkgZm9yayBvZiB0aGUgb3JpZ2luYWwgKEdOT01FIG9mZmljaWFsIGV4dGVuc2lvbikgV29ya3NwYWNlIEluZGljYXRvciwgYWxsb3dpbmcgdG8gdXNlIGl0IGxpa2Ugd2hlbiB0aGUgSG9yaXpvbnRhbCBXb3Jrc3BhY2VzIGV4dGVuc2lvbiBpcyBhY3RpdmF0ZWQuIFRoZSB2ZXJ0aWNhbCB3b3Jrc3BhY2VzIGxheW91dCBpcyBub3QgbW9kaWZpZWQ7IHRoZSB3b3Jrc3BhY2VzIGxheW91dCBpcyBob3Jpem9udGFsIG9ubHkgaW4gdGhlIHRvcCBwYW5lbCBhbmQgdGhlIHdvcmtzcGFjZXMgc3dpdGNoZXIgaW4gdGhlIG92ZXJ2aWV3IGlzIHN0aWxsIHNob3dlZC4gUGxlYXNlIG5vdGUgdGhhdCBhbnkgZ2xvYmFsIGJ1ZyBzaG91bGQgYmUgcmVwb3J0ZWQgYWdhaW5zdCB0aGUgV29ya3NwYWNlIEluZGljYXRvciBleHRlbnNpb24uIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzIxL3dvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJleHRlbnNpb24taWQiOiAid29ya3NwYWNlcy10aHVtYm5haWxzLWFwcGxldCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIldvcmtzcGFjZXMgVGh1bWJuYWlscyBBcHBsZXQiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiLAogICAgImJsb2dkcm9uIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIndvcmtzcGFjZXMtdGh1bWJuYWlscy1hcHBsZXRAYmxvZ2Ryb24iLAogICJ2ZXJzaW9uIjogMQp9"}}} @@ -431,12 +431,12 @@ , {"uuid": "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com", "name": "GNOME Fuzzy App Search", "pname": "gnome-fuzzy-app-search", "description": "Fuzzy application search results for Gnome Search", "link": "https://extensions.gnome.org/extension/3956/gnome-fuzzy-app-search/", "shell_version_map": {"38": {"version": "18", "sha256": "1k79mlsck0j3phq59cmg5y5cs1ma1hs4n4d9q96r7wqlyxp6mc9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}, "40": {"version": "18", "sha256": "1k79mlsck0j3phq59cmg5y5cs1ma1hs4n4d9q96r7wqlyxp6mc9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}, "41": {"version": "18", "sha256": "1k79mlsck0j3phq59cmg5y5cs1ma1hs4n4d9q96r7wqlyxp6mc9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}, "42": {"version": "18", "sha256": "1k79mlsck0j3phq59cmg5y5cs1ma1hs4n4d9q96r7wqlyxp6mc9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}, "43": {"version": "18", "sha256": "1k79mlsck0j3phq59cmg5y5cs1ma1hs4n4d9q96r7wqlyxp6mc9q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL0N6YXJsaWUvZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgInV1aWQiOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaEBnbm9tZS1zaGVsbC1leHRlbnNpb25zLkN6YXJsaWUuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}}} , {"uuid": "e-ink-mode@fujimo-t.github.io", "name": "E Ink Mode", "pname": "e-ink-mode", "description": "Make desktop suitable for E Ink monitors.\n\nUnmaintenanced.\nPlease migrate to theme:\nhttps://github.com/fujimo-t/gnome-shell-theme-e-ink\nSee below to detail:\nhttps://github.com/fujimo-t/gnome-shell-extension-e-ink-mode/issues/3#issuecomment-1019159171", "link": "https://extensions.gnome.org/extension/3957/e-ink-mode/", "shell_version_map": {"40": {"version": "3", "sha256": "0khqna60a0vblygriiky0jzg92ib8i44i6wkr8s3vxi0bcfa2zhm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgZGVza3RvcCBzdWl0YWJsZSBmb3IgRSBJbmsgbW9uaXRvcnMuXG5cblVubWFpbnRlbmFuY2VkLlxuUGxlYXNlIG1pZ3JhdGUgdG8gdGhlbWU6XG5odHRwczovL2dpdGh1Yi5jb20vZnVqaW1vLXQvZ25vbWUtc2hlbGwtdGhlbWUtZS1pbmtcblNlZSBiZWxvdyB0byBkZXRhaWw6XG5odHRwczovL2dpdGh1Yi5jb20vZnVqaW1vLXQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWUtaW5rLW1vZGUvaXNzdWVzLzMjaXNzdWVjb21tZW50LTEwMTkxNTkxNzEiLAogICJuYW1lIjogIkUgSW5rIE1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnVqaW1vLXQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWUtaW5rLW1vZGUiLAogICJ1dWlkIjogImUtaW5rLW1vZGVAZnVqaW1vLXQuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "transparent-top-bar@ftpix.com", "name": "Transparent Top Bar (Adjustable transparency)", "pname": "transparent-top-bar-adjustable-transparency", "description": "Fork of: https://github.com/zhanghai/gnome-shell-extension-transparent-top-bar\n\nBring back the transparent top bar in GNOME Shell with adjustable transparency.\n\nDoes not work well with custom shell themes.", "link": "https://extensions.gnome.org/extension/3960/transparent-top-bar-adjustable-transparency/", "shell_version_map": {"38": {"version": "5", "sha256": "09mym8h6lpb53b18c72vzl2y7myl1xg1lyg9jryf3nijna9adnr9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "14", "sha256": "1z47lp7c5d0r4qzbfppnycy85xzlxig5m5kvl55shdi4mqjb56kj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "1z47lp7c5d0r4qzbfppnycy85xzlxig5m5kvl55shdi4mqjb56kj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "1z47lp7c5d0r4qzbfppnycy85xzlxig5m5kvl55shdi4mqjb56kj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "43": {"version": "14", "sha256": "1z47lp7c5d0r4qzbfppnycy85xzlxig5m5kvl55shdi4mqjb56kj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2Y6IGh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2hhaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tdHJhbnNwYXJlbnQtdG9wLWJhclxuXG5CcmluZyBiYWNrIHRoZSB0cmFuc3BhcmVudCB0b3AgYmFyIGluIEdOT01FIFNoZWxsIHdpdGggYWRqdXN0YWJsZSB0cmFuc3BhcmVuY3kuXG5cbkRvZXMgbm90IHdvcmsgd2VsbCB3aXRoIGN1c3RvbSBzaGVsbCB0aGVtZXMuIiwKICAibmFtZSI6ICJUcmFuc3BhcmVudCBUb3AgQmFyIChBZGp1c3RhYmxlIHRyYW5zcGFyZW5jeSkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGFtYXJpb3MvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXRvcC1iYXIiLAogICJ1dWlkIjogInRyYW5zcGFyZW50LXRvcC1iYXJAZnRwaXguY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} -, {"uuid": "improved-workspace-indicator@michaelaquilina.github.io", "name": "Improved Workspace Indicator", "pname": "improved-workspace-indicator", "description": "Slightly improved workspace indicator that shows both current and in use workspaces similar to i3/sway", "link": "https://extensions.gnome.org/extension/3968/improved-workspace-indicator/", "shell_version_map": {"38": {"version": "15", "sha256": "1vb2ayw0p3a9bjg5fi3sqxarshbpfp4b7ij7rvccijywciv86jxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "40": {"version": "15", "sha256": "1vb2ayw0p3a9bjg5fi3sqxarshbpfp4b7ij7rvccijywciv86jxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "1vb2ayw0p3a9bjg5fi3sqxarshbpfp4b7ij7rvccijywciv86jxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "15", "sha256": "1vb2ayw0p3a9bjg5fi3sqxarshbpfp4b7ij7rvccijywciv86jxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "43": {"version": "15", "sha256": "1vb2ayw0p3a9bjg5fi3sqxarshbpfp4b7ij7rvccijywciv86jxi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE1Cn0="}}} +, {"uuid": "improved-workspace-indicator@michaelaquilina.github.io", "name": "Improved Workspace Indicator", "pname": "improved-workspace-indicator", "description": "Slightly improved workspace indicator that shows both current and in use workspaces similar to i3/sway", "link": "https://extensions.gnome.org/extension/3968/improved-workspace-indicator/", "shell_version_map": {"38": {"version": "16", "sha256": "1g56fvxz8crjxy64l6dxa4ra0ni3bn3wwayy16yh1l6wcfsq9632", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "40": {"version": "16", "sha256": "1g56fvxz8crjxy64l6dxa4ra0ni3bn3wwayy16yh1l6wcfsq9632", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "41": {"version": "16", "sha256": "1g56fvxz8crjxy64l6dxa4ra0ni3bn3wwayy16yh1l6wcfsq9632", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "42": {"version": "16", "sha256": "1g56fvxz8crjxy64l6dxa4ra0ni3bn3wwayy16yh1l6wcfsq9632", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "43": {"version": "16", "sha256": "1g56fvxz8crjxy64l6dxa4ra0ni3bn3wwayy16yh1l6wcfsq9632", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNsaWdodGx5IGltcHJvdmVkIHdvcmtzcGFjZSBpbmRpY2F0b3IgdGhhdCBzaG93cyBib3RoIGN1cnJlbnQgYW5kIGluIHVzZSB3b3Jrc3BhY2VzIHNpbWlsYXIgdG8gaTMvc3dheSIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgV29ya3NwYWNlIEluZGljYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAibWljaGFlbGFxdWlsaW5hQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsQXF1aWxpbmEvaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvciIsCiAgInV1aWQiOiAiaW1wcm92ZWQtd29ya3NwYWNlLWluZGljYXRvckBtaWNoYWVsYXF1aWxpbmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="}}} , {"uuid": "gnome4synology@psasse.gmx.de", "name": "Movie Search provider for Synology®", "pname": "gnome-movie-search-provider-for-synology", "description": "search provider for movie titles on Synology® NAS including offline search (yet to come)", "link": "https://extensions.gnome.org/extension/3969/gnome-movie-search-provider-for-synology/", "shell_version_map": {"40": {"version": "14", "sha256": "133jgh7s8mdc4dbcwr623yyrpfb8nv96iggsk2kb18lkw2rcf3xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInNlYXJjaCBwcm92aWRlciBmb3IgbW92aWUgdGl0bGVzIG9uIFN5bm9sb2d5XHUwMGFlIE5BUyBpbmNsdWRpbmcgb2ZmbGluZSBzZWFyY2ggKHlldCB0byBjb21lKSIsCiAgIm5hbWUiOiAiTW92aWUgU2VhcmNoIHByb3ZpZGVyIGZvciBTeW5vbG9neVx1MDBhZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wc2Fzc2U3Mi9tb3ZpZXM0c3lub2xvZ3kiLAogICJ1dWlkIjogImdub21lNHN5bm9sb2d5QHBzYXNzZS5nbXguZGUiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "guillotine@fopdoodle.net", "name": "Guillotine", "pname": "guillotine", "description": "Guillotine is a gnome extension designed for efficiently carrying out executions of commands from a customizable menu. Simply speaking: it is a highly customizable menu that enables you to launch commands and toggle services.", "link": "https://extensions.gnome.org/extension/3981/guillotine/", "shell_version_map": {"40": {"version": "16", "sha256": "0xxlvifdkd9x0kgzrrvg3abgmgklzcy3bfs1x634myjbh5y13ws2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2VudGU3Ni9ndWlsbG90aW5lLyIsCiAgInV1aWQiOiAiZ3VpbGxvdGluZUBmb3Bkb29kbGUubmV0IiwKICAidmVyc2lvbiI6IDE2Cn0="}, "41": {"version": "16", "sha256": "0xxlvifdkd9x0kgzrrvg3abgmgklzcy3bfs1x634myjbh5y13ws2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2VudGU3Ni9ndWlsbG90aW5lLyIsCiAgInV1aWQiOiAiZ3VpbGxvdGluZUBmb3Bkb29kbGUubmV0IiwKICAidmVyc2lvbiI6IDE2Cn0="}, "42": {"version": "16", "sha256": "0xxlvifdkd9x0kgzrrvg3abgmgklzcy3bfs1x634myjbh5y13ws2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2VudGU3Ni9ndWlsbG90aW5lLyIsCiAgInV1aWQiOiAiZ3VpbGxvdGluZUBmb3Bkb29kbGUubmV0IiwKICAidmVyc2lvbiI6IDE2Cn0="}, "43": {"version": "16", "sha256": "0xxlvifdkd9x0kgzrrvg3abgmgklzcy3bfs1x634myjbh5y13ws2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2VudGU3Ni9ndWlsbG90aW5lLyIsCiAgInV1aWQiOiAiZ3VpbGxvdGluZUBmb3Bkb29kbGUubmV0IiwKICAidmVyc2lvbiI6IDE2Cn0="}}} , {"uuid": "shuzhi@tuberry", "name": "Shu Zhi", "pname": "shu-zhi", "description": "Wallpaper generation extension for GNOME Shell, inspired by Jizhi\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3985/shu-zhi/", "shell_version_map": {"38": {"version": "7", "sha256": "1yk39q1ydv7kmb8shi4cp7pf5zvpmj99gjl9svack4773dj9rrwi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogInNodXpoaSIsCiAgIm5hbWUiOiAiU2h1IFpoaSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV6aGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NodXpoaSIsCiAgInV1aWQiOiAic2h1emhpQHR1YmVycnkiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "17", "sha256": "1n0ajmm6d7y6kify6k9g3j2kc3ass9s7zyif5jhr1djzsi6knpq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "19", "sha256": "1ib82yf7gh97hygbrxccpsh75jpg65rp834vygi25kyf0b8fykff", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "21", "sha256": "1pbldn51jjfq45d3bl7nfciff1mn3krl7dhiwp9hqrp3hchlassd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyMQp9"}, "43": {"version": "23", "sha256": "1nsjpjjsllrdh2k6v9h06xm656b5dbq2vpxs7kqn4p7l8b0ycav4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyMwp9"}}} , {"uuid": "zilence@apankowski.github.com", "name": "Zilence", "pname": "zilence", "description": "Turns off notifications while sharing screen during a Zoom call", "link": "https://extensions.gnome.org/extension/3988/zilence/", "shell_version_map": {"38": {"version": "4", "sha256": "18iy39i5i8ii2salpxnyin0bwfckl6kp2fzkkij3fqd0pga1frix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICIyNTU1ZGNhYjYxZTZiODBhZGFiYjM2NDM5MzEwMmY5MGU3MzhiOTRmIiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcGFua293c2tpL3ppbGVuY2UiLAogICJ1dWlkIjogInppbGVuY2VAYXBhbmtvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "18iy39i5i8ii2salpxnyin0bwfckl6kp2fzkkij3fqd0pga1frix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICIyNTU1ZGNhYjYxZTZiODBhZGFiYjM2NDM5MzEwMmY5MGU3MzhiOTRmIiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcGFua293c2tpL3ppbGVuY2UiLAogICJ1dWlkIjogInppbGVuY2VAYXBhbmtvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "18iy39i5i8ii2salpxnyin0bwfckl6kp2fzkkij3fqd0pga1frix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICIyNTU1ZGNhYjYxZTZiODBhZGFiYjM2NDM5MzEwMmY5MGU3MzhiOTRmIiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hcGFua293c2tpL3ppbGVuY2UiLAogICJ1dWlkIjogInppbGVuY2VAYXBhbmtvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "bluetooth-battery@michalw.github.com", "name": "Bluetooth battery indicator", "pname": "bluetooth-battery", "description": "Bluetooth battery indicator", "link": "https://extensions.gnome.org/extension/3991/bluetooth-battery/", "shell_version_map": {"38": {"version": "26", "sha256": "07p56424nlhcs8rmbxyywc86jvhrr83hwzs1xq4jv338kiprp04j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "40": {"version": "26", "sha256": "07p56424nlhcs8rmbxyywc86jvhrr83hwzs1xq4jv338kiprp04j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "41": {"version": "26", "sha256": "07p56424nlhcs8rmbxyywc86jvhrr83hwzs1xq4jv338kiprp04j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "28", "sha256": "0w53wwjkg8vdisrpazb7k6m34jsf4ajhqrdszw5rnw2xy5yy6jwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}, "43": {"version": "28", "sha256": "0w53wwjkg8vdisrpazb7k6m34jsf4ajhqrdszw5rnw2xy5yy6jwg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOAp9"}}} +, {"uuid": "bluetooth-battery@michalw.github.com", "name": "Bluetooth battery indicator", "pname": "bluetooth-battery", "description": "Bluetooth battery indicator", "link": "https://extensions.gnome.org/extension/3991/bluetooth-battery/", "shell_version_map": {"38": {"version": "26", "sha256": "07p56424nlhcs8rmbxyywc86jvhrr83hwzs1xq4jv338kiprp04j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "40": {"version": "26", "sha256": "07p56424nlhcs8rmbxyywc86jvhrr83hwzs1xq4jv338kiprp04j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "41": {"version": "26", "sha256": "07p56424nlhcs8rmbxyywc86jvhrr83hwzs1xq4jv338kiprp04j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "29", "sha256": "040v90gk5j89zbfcc6nh9xkhk1amj8898pqd8wjybcnxwbf12wfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "43": {"version": "29", "sha256": "040v90gk5j89zbfcc6nh9xkhk1amj8898pqd8wjybcnxwbf12wfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWljaGFsVy9nbm9tZS1ibHVldG9vdGgtYmF0dGVyeS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImJsdWV0b290aC1iYXR0ZXJ5QG1pY2hhbHcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}}} , {"uuid": "gnome-extension-all-ip-addresses@havekes.eu", "name": "All IP Addresses", "pname": "all-ip-addresses", "description": "Show IP addresses for LAN, WAN IPv6 and VPN in the GNOME panel. Click on the address to cycle trough different interfaces.", "link": "https://extensions.gnome.org/extension/3994/all-ip-addresses/", "shell_version_map": {"38": {"version": "11", "sha256": "1zhps3jb7wgalssdxncifn9ksf2kd236h5wznqxn0hn58fq0gvcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "1zhps3jb7wgalssdxncifn9ksf2kd236h5wznqxn0hn58fq0gvcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "1zhps3jb7wgalssdxncifn9ksf2kd236h5wznqxn0hn58fq0gvcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "1zhps3jb7wgalssdxncifn9ksf2kd236h5wznqxn0hn58fq0gvcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}, "43": {"version": "11", "sha256": "1zhps3jb7wgalssdxncifn9ksf2kd236h5wznqxn0hn58fq0gvcq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiBJUHY2IGFuZCBWUE4gaW4gdGhlIEdOT01FIHBhbmVsLiBDbGljayBvbiB0aGUgYWRkcmVzcyB0byBjeWNsZSB0cm91Z2ggZGlmZmVyZW50IGludGVyZmFjZXMuIiwKICAibmFtZSI6ICJBbGwgSVAgQWRkcmVzc2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "app-grid-tweaks@Selenium-H", "name": "App Grid Tweaks", "pname": "app-grid-tweaks", "description": "Customize the application grid view.\n\nSet the rows, columns and the app icon size for a particular configuration to work.\nIf the screen space is out numbered, reduce the icon size to fit all the rows and columns.\nOr reduce the number of rows and columns.\n\nPress the Refresh button on the left of header bar to apply changes", "link": "https://extensions.gnome.org/extension/3997/app-grid-tweaks/", "shell_version_map": {"38": {"version": "4", "sha256": "17hriwcwhkjp3n20q7bm7iylr8862ghvnagf2xk0ci2hxwwbyc92", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuIiwKICAiZGVzY3JpcHRpb24iOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuXG5cblNldCB0aGUgcm93cywgY29sdW1ucyBhbmQgdGhlIGFwcCBpY29uIHNpemUgZm9yIGEgcGFydGljdWxhciBjb25maWd1cmF0aW9uIHRvIHdvcmsuXG5JZiB0aGUgc2NyZWVuIHNwYWNlIGlzIG91dCBudW1iZXJlZCwgcmVkdWNlIHRoZSBpY29uIHNpemUgdG8gZml0IGFsbCB0aGUgcm93cyBhbmQgY29sdW1ucy5cbk9yIHJlZHVjZSB0aGUgbnVtYmVyIG9mIHJvd3MgYW5kIGNvbHVtbnMuXG5cblByZXNzIHRoZSBSZWZyZXNoIGJ1dHRvbiBvbiB0aGUgbGVmdCBvZiBoZWFkZXIgYmFyIHRvIGFwcGx5IGNoYW5nZXMiLAogICJuYW1lIjogIkFwcCBHcmlkIFR3ZWFrcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHAtZ3JpZC10d2Vha3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJzdGF0dXMiOiAiIiwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TZWxlbml1bS1IL0FwcC1HcmlkLVR3ZWFrcyIsCiAgInV1aWQiOiAiYXBwLWdyaWQtdHdlYWtzQFNlbGVuaXVtLUgiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "17hriwcwhkjp3n20q7bm7iylr8862ghvnagf2xk0ci2hxwwbyc92", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuIiwKICAiZGVzY3JpcHRpb24iOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuXG5cblNldCB0aGUgcm93cywgY29sdW1ucyBhbmQgdGhlIGFwcCBpY29uIHNpemUgZm9yIGEgcGFydGljdWxhciBjb25maWd1cmF0aW9uIHRvIHdvcmsuXG5JZiB0aGUgc2NyZWVuIHNwYWNlIGlzIG91dCBudW1iZXJlZCwgcmVkdWNlIHRoZSBpY29uIHNpemUgdG8gZml0IGFsbCB0aGUgcm93cyBhbmQgY29sdW1ucy5cbk9yIHJlZHVjZSB0aGUgbnVtYmVyIG9mIHJvd3MgYW5kIGNvbHVtbnMuXG5cblByZXNzIHRoZSBSZWZyZXNoIGJ1dHRvbiBvbiB0aGUgbGVmdCBvZiBoZWFkZXIgYmFyIHRvIGFwcGx5IGNoYW5nZXMiLAogICJuYW1lIjogIkFwcCBHcmlkIFR3ZWFrcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHAtZ3JpZC10d2Vha3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJzdGF0dXMiOiAiIiwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TZWxlbml1bS1IL0FwcC1HcmlkLVR3ZWFrcyIsCiAgInV1aWQiOiAiYXBwLWdyaWQtdHdlYWtzQFNlbGVuaXVtLUgiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "17hriwcwhkjp3n20q7bm7iylr8862ghvnagf2xk0ci2hxwwbyc92", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1lbnQiOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuIiwKICAiZGVzY3JpcHRpb24iOiAiQ3VzdG9taXplIHRoZSBhcHBsaWNhdGlvbiBncmlkIHZpZXcuXG5cblNldCB0aGUgcm93cywgY29sdW1ucyBhbmQgdGhlIGFwcCBpY29uIHNpemUgZm9yIGEgcGFydGljdWxhciBjb25maWd1cmF0aW9uIHRvIHdvcmsuXG5JZiB0aGUgc2NyZWVuIHNwYWNlIGlzIG91dCBudW1iZXJlZCwgcmVkdWNlIHRoZSBpY29uIHNpemUgdG8gZml0IGFsbCB0aGUgcm93cyBhbmQgY29sdW1ucy5cbk9yIHJlZHVjZSB0aGUgbnVtYmVyIG9mIHJvd3MgYW5kIGNvbHVtbnMuXG5cblByZXNzIHRoZSBSZWZyZXNoIGJ1dHRvbiBvbiB0aGUgbGVmdCBvZiBoZWFkZXIgYmFyIHRvIGFwcGx5IGNoYW5nZXMiLAogICJuYW1lIjogIkFwcCBHcmlkIFR3ZWFrcyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hcHAtZ3JpZC10d2Vha3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJzdGF0dXMiOiAiIiwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TZWxlbml1bS1IL0FwcC1HcmlkLVR3ZWFrcyIsCiAgInV1aWQiOiAiYXBwLWdyaWQtdHdlYWtzQFNlbGVuaXVtLUgiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "babar@fthx", "name": "BaBar Task Bar", "pname": "babar", "description": "Task bar. App grid, favorites, workspaces and tasks in panel. Light extension.\n\n Replace 'Activities' button by all current workspaces and apps buttons. Switch workspace/app or toggle overview by clicking on these buttons. Drag and drop favorite, task, dash item or app grid item to any workspace (you cannot reorder tasks inside a workspace). Persistent window preview with right-click (right-click again or click on preview to close it). You can move this preview anywhere. Change 'Places' label to an icon. Settings in preferences UI.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.\n\n Changelog: https://github.com/fthx/babar/issues/2", "link": "https://extensions.gnome.org/extension/4000/babar/", "shell_version_map": {"38": {"version": "58", "sha256": "0sgsz9skc0d3rx9lap6g8fnmb5ki4ylr8s5f8yk5wkpvzvh3gkgy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBQZXJzaXN0ZW50IHdpbmRvdyBwcmV2aWV3IHdpdGggcmlnaHQtY2xpY2sgKHJpZ2h0LWNsaWNrIGFnYWluIG9yIGNsaWNrIG9uIHByZXZpZXcgdG8gY2xvc2UgaXQpLiBZb3UgY2FuIG1vdmUgdGhpcyBwcmV2aWV3IGFueXdoZXJlLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gU2V0dGluZ3MgaW4gcHJlZmVyZW5jZXMgVUkuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cbiBDaGFuZ2Vsb2c6IGh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JhYmFyL2lzc3Vlcy8yIiwKICAibmFtZSI6ICJCYUJhciBUYXNrIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXIiLAogICJ1dWlkIjogImJhYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "40": {"version": "58", "sha256": "0sgsz9skc0d3rx9lap6g8fnmb5ki4ylr8s5f8yk5wkpvzvh3gkgy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBQZXJzaXN0ZW50IHdpbmRvdyBwcmV2aWV3IHdpdGggcmlnaHQtY2xpY2sgKHJpZ2h0LWNsaWNrIGFnYWluIG9yIGNsaWNrIG9uIHByZXZpZXcgdG8gY2xvc2UgaXQpLiBZb3UgY2FuIG1vdmUgdGhpcyBwcmV2aWV3IGFueXdoZXJlLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gU2V0dGluZ3MgaW4gcHJlZmVyZW5jZXMgVUkuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cbiBDaGFuZ2Vsb2c6IGh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JhYmFyL2lzc3Vlcy8yIiwKICAibmFtZSI6ICJCYUJhciBUYXNrIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXIiLAogICJ1dWlkIjogImJhYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "41": {"version": "58", "sha256": "0sgsz9skc0d3rx9lap6g8fnmb5ki4ylr8s5f8yk5wkpvzvh3gkgy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBQZXJzaXN0ZW50IHdpbmRvdyBwcmV2aWV3IHdpdGggcmlnaHQtY2xpY2sgKHJpZ2h0LWNsaWNrIGFnYWluIG9yIGNsaWNrIG9uIHByZXZpZXcgdG8gY2xvc2UgaXQpLiBZb3UgY2FuIG1vdmUgdGhpcyBwcmV2aWV3IGFueXdoZXJlLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gU2V0dGluZ3MgaW4gcHJlZmVyZW5jZXMgVUkuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cbiBDaGFuZ2Vsb2c6IGh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JhYmFyL2lzc3Vlcy8yIiwKICAibmFtZSI6ICJCYUJhciBUYXNrIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXIiLAogICJ1dWlkIjogImJhYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}, "42": {"version": "58", "sha256": "0sgsz9skc0d3rx9lap6g8fnmb5ki4ylr8s5f8yk5wkpvzvh3gkgy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBQZXJzaXN0ZW50IHdpbmRvdyBwcmV2aWV3IHdpdGggcmlnaHQtY2xpY2sgKHJpZ2h0LWNsaWNrIGFnYWluIG9yIGNsaWNrIG9uIHByZXZpZXcgdG8gY2xvc2UgaXQpLiBZb3UgY2FuIG1vdmUgdGhpcyBwcmV2aWV3IGFueXdoZXJlLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gU2V0dGluZ3MgaW4gcHJlZmVyZW5jZXMgVUkuXG5cbiBZb3UgY2FuIHVzZSBuYW1lcyBmb3Igd29ya3NwYWNlczogdGhlcmUgYXJlIHR3byB3YXlzIGZvciB0aGF0LiAxKSBFZGl0IHRoZSBzdHJpbmcgYXJyYXkgJ29yZy5nbm9tZS5kZXNrdG9wLndtLnByZWZlcmVuY2VzLndvcmtzcGFjZS1uYW1lcycgZ3NldHRpbmdzIGtleSAodGhyb3VnaCBkY29uZiBlZGl0b3IsIGUuZy4pLiAyKSBVc2Ugb2ZmaWNpYWwgR05PTUUgZXh0ZW5zaW9uIFdvcmtzcGFjZXMgSW5kaWNhdG9yJ3Mgc2V0dGluZ3MuIFlvdSBkb24ndCBoYXZlIHRvIHdyaXRlIGEgbG9uZyBlbm91Z2ggbGlzdDogbnVtYmVycyBhcmUgZGlzcGxheWVkIGlmIG5vIHdvcmtzcGFjZSBuYW1lIGlzIGRlZmluZWQuXG5cbiBDaGFuZ2Vsb2c6IGh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2JhYmFyL2lzc3Vlcy8yIiwKICAibmFtZSI6ICJCYUJhciBUYXNrIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXIiLAogICJ1dWlkIjogImJhYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogNTgKfQ=="}}} @@ -452,6 +452,7 @@ , {"uuid": "screenshot-directory@fawtytoo", "name": "Screenshot Directory", "pname": "screenshot-directory", "description": "The default screenshot directory is ~/Pictures. This extension changes that to use whatever is set if you used the Gnome Screenshot app. This can be found in the dconf setting: /org/gnome/gnome-screenshot/last-save-directory. If that directory doesn't exist, the extension will use the Home directory instead.\n\nNote: If the dconf setting doesn't exist, you need to install the Gnome Screenshot app.\n\nThe idea was taken from the extension: Screenshot Locations.", "link": "https://extensions.gnome.org/extension/4031/screenshot-directory/", "shell_version_map": {"38": {"version": "8", "sha256": "1pmj9dx0103rk2zaia53q8rc461dj7ybfih9lnh8v1bcm2sjca3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBkZWZhdWx0IHNjcmVlbnNob3QgZGlyZWN0b3J5IGlzIH4vUGljdHVyZXMuIFRoaXMgZXh0ZW5zaW9uIGNoYW5nZXMgdGhhdCB0byB1c2Ugd2hhdGV2ZXIgaXMgc2V0IGlmIHlvdSB1c2VkIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC4gVGhpcyBjYW4gYmUgZm91bmQgaW4gdGhlIGRjb25mIHNldHRpbmc6IC9vcmcvZ25vbWUvZ25vbWUtc2NyZWVuc2hvdC9sYXN0LXNhdmUtZGlyZWN0b3J5LiBJZiB0aGF0IGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0aGUgZXh0ZW5zaW9uIHdpbGwgdXNlIHRoZSBIb21lIGRpcmVjdG9yeSBpbnN0ZWFkLlxuXG5Ob3RlOiBJZiB0aGUgZGNvbmYgc2V0dGluZyBkb2Vzbid0IGV4aXN0LCB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC5cblxuVGhlIGlkZWEgd2FzIHRha2VuIGZyb20gdGhlIGV4dGVuc2lvbjogU2NyZWVuc2hvdCBMb2NhdGlvbnMuIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IERpcmVjdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzY3JlZW5zaG90LWRpcmVjdG9yeUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "1pmj9dx0103rk2zaia53q8rc461dj7ybfih9lnh8v1bcm2sjca3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBkZWZhdWx0IHNjcmVlbnNob3QgZGlyZWN0b3J5IGlzIH4vUGljdHVyZXMuIFRoaXMgZXh0ZW5zaW9uIGNoYW5nZXMgdGhhdCB0byB1c2Ugd2hhdGV2ZXIgaXMgc2V0IGlmIHlvdSB1c2VkIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC4gVGhpcyBjYW4gYmUgZm91bmQgaW4gdGhlIGRjb25mIHNldHRpbmc6IC9vcmcvZ25vbWUvZ25vbWUtc2NyZWVuc2hvdC9sYXN0LXNhdmUtZGlyZWN0b3J5LiBJZiB0aGF0IGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0aGUgZXh0ZW5zaW9uIHdpbGwgdXNlIHRoZSBIb21lIGRpcmVjdG9yeSBpbnN0ZWFkLlxuXG5Ob3RlOiBJZiB0aGUgZGNvbmYgc2V0dGluZyBkb2Vzbid0IGV4aXN0LCB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC5cblxuVGhlIGlkZWEgd2FzIHRha2VuIGZyb20gdGhlIGV4dGVuc2lvbjogU2NyZWVuc2hvdCBMb2NhdGlvbnMuIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IERpcmVjdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzY3JlZW5zaG90LWRpcmVjdG9yeUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1pmj9dx0103rk2zaia53q8rc461dj7ybfih9lnh8v1bcm2sjca3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBkZWZhdWx0IHNjcmVlbnNob3QgZGlyZWN0b3J5IGlzIH4vUGljdHVyZXMuIFRoaXMgZXh0ZW5zaW9uIGNoYW5nZXMgdGhhdCB0byB1c2Ugd2hhdGV2ZXIgaXMgc2V0IGlmIHlvdSB1c2VkIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC4gVGhpcyBjYW4gYmUgZm91bmQgaW4gdGhlIGRjb25mIHNldHRpbmc6IC9vcmcvZ25vbWUvZ25vbWUtc2NyZWVuc2hvdC9sYXN0LXNhdmUtZGlyZWN0b3J5LiBJZiB0aGF0IGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0aGUgZXh0ZW5zaW9uIHdpbGwgdXNlIHRoZSBIb21lIGRpcmVjdG9yeSBpbnN0ZWFkLlxuXG5Ob3RlOiBJZiB0aGUgZGNvbmYgc2V0dGluZyBkb2Vzbid0IGV4aXN0LCB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC5cblxuVGhlIGlkZWEgd2FzIHRha2VuIGZyb20gdGhlIGV4dGVuc2lvbjogU2NyZWVuc2hvdCBMb2NhdGlvbnMuIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IERpcmVjdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzY3JlZW5zaG90LWRpcmVjdG9yeUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1pmj9dx0103rk2zaia53q8rc461dj7ybfih9lnh8v1bcm2sjca3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBkZWZhdWx0IHNjcmVlbnNob3QgZGlyZWN0b3J5IGlzIH4vUGljdHVyZXMuIFRoaXMgZXh0ZW5zaW9uIGNoYW5nZXMgdGhhdCB0byB1c2Ugd2hhdGV2ZXIgaXMgc2V0IGlmIHlvdSB1c2VkIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC4gVGhpcyBjYW4gYmUgZm91bmQgaW4gdGhlIGRjb25mIHNldHRpbmc6IC9vcmcvZ25vbWUvZ25vbWUtc2NyZWVuc2hvdC9sYXN0LXNhdmUtZGlyZWN0b3J5LiBJZiB0aGF0IGRpcmVjdG9yeSBkb2Vzbid0IGV4aXN0LCB0aGUgZXh0ZW5zaW9uIHdpbGwgdXNlIHRoZSBIb21lIGRpcmVjdG9yeSBpbnN0ZWFkLlxuXG5Ob3RlOiBJZiB0aGUgZGNvbmYgc2V0dGluZyBkb2Vzbid0IGV4aXN0LCB5b3UgbmVlZCB0byBpbnN0YWxsIHRoZSBHbm9tZSBTY3JlZW5zaG90IGFwcC5cblxuVGhlIGlkZWEgd2FzIHRha2VuIGZyb20gdGhlIGV4dGVuc2lvbjogU2NyZWVuc2hvdCBMb2NhdGlvbnMuIiwKICAibmFtZSI6ICJTY3JlZW5zaG90IERpcmVjdG9yeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzY3JlZW5zaG90LWRpcmVjdG9yeUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "x11gestures@joseexposito.github.io", "name": "X11 Gestures", "pname": "x11-gestures", "description": "Enable GNOME Shell multi-touch gestures on X11.\nRequires Touchégg https://github.com/JoseExposito/touchegg#readme", "link": "https://extensions.gnome.org/extension/4033/x11-gestures/", "shell_version_map": {"38": {"version": "15", "sha256": "0hls48z9vfmk7qhwxwj1y5sap3wms9jvnjjd8dnxfbqdz8018lby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9zZUV4cG9zaXRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi14MTFnZXN0dXJlcyIsCiAgInV1aWQiOiAieDExZ2VzdHVyZXNAam9zZWV4cG9zaXRvLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "15", "sha256": "0hls48z9vfmk7qhwxwj1y5sap3wms9jvnjjd8dnxfbqdz8018lby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9zZUV4cG9zaXRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi14MTFnZXN0dXJlcyIsCiAgInV1aWQiOiAieDExZ2VzdHVyZXNAam9zZWV4cG9zaXRvLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "0hls48z9vfmk7qhwxwj1y5sap3wms9jvnjjd8dnxfbqdz8018lby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9zZUV4cG9zaXRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi14MTFnZXN0dXJlcyIsCiAgInV1aWQiOiAieDExZ2VzdHVyZXNAam9zZWV4cG9zaXRvLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNQp9"}, "42": {"version": "15", "sha256": "0hls48z9vfmk7qhwxwj1y5sap3wms9jvnjjd8dnxfbqdz8018lby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9zZUV4cG9zaXRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi14MTFnZXN0dXJlcyIsCiAgInV1aWQiOiAieDExZ2VzdHVyZXNAam9zZWV4cG9zaXRvLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNQp9"}, "43": {"version": "15", "sha256": "0hls48z9vfmk7qhwxwj1y5sap3wms9jvnjjd8dnxfbqdz8018lby", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBHTk9NRSBTaGVsbCBtdWx0aS10b3VjaCBnZXN0dXJlcyBvbiBYMTEuXG5SZXF1aXJlcyBUb3VjaFx1MDBlOWdnIGh0dHBzOi8vZ2l0aHViLmNvbS9Kb3NlRXhwb3NpdG8vdG91Y2hlZ2cjcmVhZG1lIiwKICAibmFtZSI6ICJYMTEgR2VzdHVyZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSm9zZUV4cG9zaXRvL2dub21lLXNoZWxsLWV4dGVuc2lvbi14MTFnZXN0dXJlcyIsCiAgInV1aWQiOiAieDExZ2VzdHVyZXNAam9zZWV4cG9zaXRvLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNQp9"}}} , {"uuid": "get-out-of-the-way@michaelmob.com", "name": "Get Out Of The Way!", "pname": "get-out-of-the-way", "description": "Push 'Always-on-Top' windows out of the way of the focused window.", "link": "https://extensions.gnome.org/extension/4034/get-out-of-the-way/", "shell_version_map": {"38": {"version": "1", "sha256": "1jpjqi2l6wjn9zbgpck04gm9vbspi066chby1j6k9km6dwljfbk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1c2ggJ0Fsd2F5cy1vbi1Ub3AnIHdpbmRvd3Mgb3V0IG9mIHRoZSB3YXkgb2YgdGhlIGZvY3VzZWQgd2luZG93LiIsCiAgIm5hbWUiOiAiR2V0IE91dCBPZiBUaGUgV2F5ISIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnZXQtb3V0LW9mLXRoZS13YXlAbWljaGFlbG1vYi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "waktu-sholat@arpodungge.github.com", "name": "Waktu Sholat", "pname": "waktu-sholat", "description": "Waktu Sholat - Indonesia", "link": "https://extensions.gnome.org/extension/4036/waktu-sholat/", "shell_version_map": {"40": {"version": "4", "sha256": "1rykk6klv9kwy923rja05grrs10ignh3v05kzss01a2526d2afcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldha3R1IFNob2xhdCAtIEluZG9uZXNpYSIsCiAgIm5hbWUiOiAiV2FrdHUgU2hvbGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FycG9kdW5nZ2Uvd2FrdHUtc2hvbGF0IiwKICAidXVpZCI6ICJ3YWt0dS1zaG9sYXRAYXJwb2R1bmdnZS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1rykk6klv9kwy923rja05grrs10ignh3v05kzss01a2526d2afcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldha3R1IFNob2xhdCAtIEluZG9uZXNpYSIsCiAgIm5hbWUiOiAiV2FrdHUgU2hvbGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FycG9kdW5nZ2Uvd2FrdHUtc2hvbGF0IiwKICAidXVpZCI6ICJ3YWt0dS1zaG9sYXRAYXJwb2R1bmdnZS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "1rykk6klv9kwy923rja05grrs10ignh3v05kzss01a2526d2afcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldha3R1IFNob2xhdCAtIEluZG9uZXNpYSIsCiAgIm5hbWUiOiAiV2FrdHUgU2hvbGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FycG9kdW5nZ2Uvd2FrdHUtc2hvbGF0IiwKICAidXVpZCI6ICJ3YWt0dS1zaG9sYXRAYXJwb2R1bmdnZS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "1rykk6klv9kwy923rja05grrs10ignh3v05kzss01a2526d2afcn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldha3R1IFNob2xhdCAtIEluZG9uZXNpYSIsCiAgIm5hbWUiOiAiV2FrdHUgU2hvbGF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FycG9kdW5nZ2Uvd2FrdHUtc2hvbGF0IiwKICAidXVpZCI6ICJ3YWt0dS1zaG9sYXRAYXJwb2R1bmdnZS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "VPNStatus@jesusalc@intuivo.com", "name": "VPNStatus Indicator", "pname": "vpnstatus-indicator", "description": "displays the current state of VPNStatus VPN\n\nchecks, if /proc/net/route contains entries for device nmcli?, this is the VPNStatus network device.\n", "link": "https://extensions.gnome.org/extension/4039/vpnstatus-indicator/", "shell_version_map": {"38": {"version": "1", "sha256": "1y4ym6lpwfi03rc6186yjc7mns01q5nrwiqizghls7hiyfg3kqrn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImRpc3BsYXlzIHRoZSBjdXJyZW50IHN0YXRlIG9mIFZQTlN0YXR1cyBWUE5cblxuY2hlY2tzLCBpZiAvcHJvYy9uZXQvcm91dGUgY29udGFpbnMgZW50cmllcyBmb3IgZGV2aWNlIG5tY2xpPywgdGhpcyBpcyB0aGUgVlBOU3RhdHVzIG5ldHdvcmsgZGV2aWNlLlxuIiwKICAibmFtZSI6ICJWUE5TdGF0dXMgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIlZQTlN0YXR1c0BqZXN1c2FsY0BpbnR1aXZvLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "switchtwolayouts@qtmax.dev", "name": "Switch Two Layouts", "pname": "switch-two-layouts", "description": "This extension makes XKB shortcuts to switch keyboard layouts (such as Caps Lock, Ctrl+Shift, etc.) cycle between the two first layouts. The other ones still can be selected via the menu or using GNOME's shortcuts (Super+Space, Shift+Super+Space). It's useful when you have two primary layouts and more additional, which are used more rarely.", "link": "https://extensions.gnome.org/extension/4042/switch-two-layouts/", "shell_version_map": {"38": {"version": "5", "sha256": "1gf79zbbscw34ypybpy01f5p8ymdbcb3lhh3s62k9vi9cjpzqd4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzd2l0Y2h0d29sYXlvdXRzQHF0bWF4LmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "1gf79zbbscw34ypybpy01f5p8ymdbcb3lhh3s62k9vi9cjpzqd4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzd2l0Y2h0d29sYXlvdXRzQHF0bWF4LmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1gf79zbbscw34ypybpy01f5p8ymdbcb3lhh3s62k9vi9cjpzqd4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzd2l0Y2h0d29sYXlvdXRzQHF0bWF4LmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1gf79zbbscw34ypybpy01f5p8ymdbcb3lhh3s62k9vi9cjpzqd4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzd2l0Y2h0d29sYXlvdXRzQHF0bWF4LmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}, "43": {"version": "5", "sha256": "1gf79zbbscw34ypybpy01f5p8ymdbcb3lhh3s62k9vi9cjpzqd4x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzd2l0Y2h0d29sYXlvdXRzQHF0bWF4LmRldiIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "notification-dismiss@kronosoul.xyz", "name": "Dismiss Notifications on Right Click", "pname": "dismiss-notifications-on-right-click", "description": "Simple extension that removes notification popups when they are right clicked.", "link": "https://extensions.gnome.org/extension/4048/dismiss-notifications-on-right-click/", "shell_version_map": {"38": {"version": "1", "sha256": "19pdz3lg1ybmgvpahfwzzhwk8fyhm1sr3wawddz5z66i22spcgjj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImFwcGxpY2F0aW9uLWlkIjogIm9yZy5rcm9ub3NvdWwubm90aWZpY2F0aW9uLWRpc21pc3MiLAogICJkZXNjcmlwdGlvbiI6ICJTaW1wbGUgZXh0ZW5zaW9uIHRoYXQgcmVtb3ZlcyBub3RpZmljYXRpb24gcG9wdXBzIHdoZW4gdGhleSBhcmUgcmlnaHQgY2xpY2tlZC4iLAogICJleHRlbnNpb24taWQiOiAiZ2R0b29scyIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzZXRzIiwKICAibmFtZSI6ICJEaXNtaXNzIE5vdGlmaWNhdGlvbnMgb24gUmlnaHQgQ2xpY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiYWRtaW5Aa3Jvbm9zb3VsLnh5eiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4wIiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmxpcGsvIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tZGlzbWlzc0Brcm9ub3NvdWwueHl6IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} @@ -491,7 +492,7 @@ , {"uuid": "gnome-ui-tune@itstime.tech", "name": "Gnome 4x UI Improvements", "pname": "gnome-40-ui-improvements", "description": "Tunes gnome 40-43 Overview UI to make it more usable.\n\nChanges:\n- Search textbox is hidden by default and shown only when user begins to type-to-search\n- Scale of workspaces' thumbnails increased 2x (or 3x, configurable)\n- Restores wallpaper on workspaces' thumbnails. No more gray background\n- Show workspaces' thumbnails even when there is only one workspace\n- Firefox's PIP (picture in picture) window is now displayed on the overview screen\n\nAll modifications can be disabled in the extension's settings.\n\nATTENTION!\nAfter extension update, gnome-shell restart is required:\nX11: Alt+F2 => r\nWayland: logout => login", "link": "https://extensions.gnome.org/extension/4158/gnome-40-ui-improvements/", "shell_version_map": {"40": {"version": "13", "sha256": "0nbszy9bash509nqsvgmqvlbj8d3djbbbnc07jdn3qsq5m4ipyqp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLTQzIE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnggKG9yIDN4LCBjb25maWd1cmFibGUpXG4tIFJlc3RvcmVzIHdhbGxwYXBlciBvbiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzLiBObyBtb3JlIGdyYXkgYmFja2dyb3VuZFxuLSBTaG93IHdvcmtzcGFjZXMnIHRodW1ibmFpbHMgZXZlbiB3aGVuIHRoZXJlIGlzIG9ubHkgb25lIHdvcmtzcGFjZVxuLSBGaXJlZm94J3MgUElQIChwaWN0dXJlIGluIHBpY3R1cmUpIHdpbmRvdyBpcyBub3cgZGlzcGxheWVkIG9uIHRoZSBvdmVydmlldyBzY3JlZW5cblxuQWxsIG1vZGlmaWNhdGlvbnMgY2FuIGJlIGRpc2FibGVkIGluIHRoZSBleHRlbnNpb24ncyBzZXR0aW5ncy5cblxuQVRURU5USU9OIVxuQWZ0ZXIgZXh0ZW5zaW9uIHVwZGF0ZSwgZ25vbWUtc2hlbGwgcmVzdGFydCBpcyByZXF1aXJlZDpcblgxMTogQWx0K0YyID0+IHJcbldheWxhbmQ6IGxvZ291dCA9PiBsb2dpbiIsCiAgIm5hbWUiOiAiR25vbWUgNHggVUkgSW1wcm92ZW1lbnRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXVpLXR1bmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtdWktdHVuZSIsCiAgInV1aWQiOiAiZ25vbWUtdWktdHVuZUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "0nbszy9bash509nqsvgmqvlbj8d3djbbbnc07jdn3qsq5m4ipyqp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLTQzIE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnggKG9yIDN4LCBjb25maWd1cmFibGUpXG4tIFJlc3RvcmVzIHdhbGxwYXBlciBvbiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzLiBObyBtb3JlIGdyYXkgYmFja2dyb3VuZFxuLSBTaG93IHdvcmtzcGFjZXMnIHRodW1ibmFpbHMgZXZlbiB3aGVuIHRoZXJlIGlzIG9ubHkgb25lIHdvcmtzcGFjZVxuLSBGaXJlZm94J3MgUElQIChwaWN0dXJlIGluIHBpY3R1cmUpIHdpbmRvdyBpcyBub3cgZGlzcGxheWVkIG9uIHRoZSBvdmVydmlldyBzY3JlZW5cblxuQWxsIG1vZGlmaWNhdGlvbnMgY2FuIGJlIGRpc2FibGVkIGluIHRoZSBleHRlbnNpb24ncyBzZXR0aW5ncy5cblxuQVRURU5USU9OIVxuQWZ0ZXIgZXh0ZW5zaW9uIHVwZGF0ZSwgZ25vbWUtc2hlbGwgcmVzdGFydCBpcyByZXF1aXJlZDpcblgxMTogQWx0K0YyID0+IHJcbldheWxhbmQ6IGxvZ291dCA9PiBsb2dpbiIsCiAgIm5hbWUiOiAiR25vbWUgNHggVUkgSW1wcm92ZW1lbnRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXVpLXR1bmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9heHhhcHkvZ25vbWUtdWktdHVuZSIsCiAgInV1aWQiOiAiZ25vbWUtdWktdHVuZUBpdHN0aW1lLnRlY2giLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "15", "sha256": "0i0jz0blrvly0s5814vryixadbasg96nphqacp93k7farzshmd2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLTQzIE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnggKG9yIDN4LCBjb25maWd1cmFibGUpXG4tIFJlc3RvcmVzIHdhbGxwYXBlciBvbiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzLiBObyBtb3JlIGdyYXkgYmFja2dyb3VuZFxuLSBTaG93IHdvcmtzcGFjZXMnIHRodW1ibmFpbHMgZXZlbiB3aGVuIHRoZXJlIGlzIG9ubHkgb25lIHdvcmtzcGFjZVxuLSBGaXJlZm94J3MgUElQIChwaWN0dXJlIGluIHBpY3R1cmUpIHdpbmRvdyBpcyBub3cgZGlzcGxheWVkIG9uIHRoZSBvdmVydmlldyBzY3JlZW5cblxuQWxsIG1vZGlmaWNhdGlvbnMgY2FuIGJlIGRpc2FibGVkIGluIHRoZSBleHRlbnNpb24ncyBzZXR0aW5ncy5cblxuQVRURU5USU9OIVxuQWZ0ZXIgZXh0ZW5zaW9uIHVwZGF0ZSwgZ25vbWUtc2hlbGwgcmVzdGFydCBpcyByZXF1aXJlZDpcblgxMTogQWx0K0YyID0+IHJcbldheWxhbmQ6IGxvZ291dCA9PiBsb2dpbiIsCiAgIm5hbWUiOiAiR25vbWUgNHggVUkgSW1wcm92ZW1lbnRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXVpLXR1bmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F4eGFweS9nbm9tZS11aS10dW5lIiwKICAidXVpZCI6ICJnbm9tZS11aS10dW5lQGl0c3RpbWUudGVjaCIsCiAgInZlcnNpb24iOiAxNQp9"}, "43": {"version": "15", "sha256": "0i0jz0blrvly0s5814vryixadbasg96nphqacp93k7farzshmd2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLTQzIE92ZXJ2aWV3IFVJIHRvIG1ha2UgaXQgbW9yZSB1c2FibGUuXG5cbkNoYW5nZXM6XG4tIFNlYXJjaCB0ZXh0Ym94IGlzIGhpZGRlbiBieSBkZWZhdWx0IGFuZCBzaG93biBvbmx5IHdoZW4gdXNlciBiZWdpbnMgdG8gdHlwZS10by1zZWFyY2hcbi0gU2NhbGUgb2Ygd29ya3NwYWNlcycgdGh1bWJuYWlscyBpbmNyZWFzZWQgMnggKG9yIDN4LCBjb25maWd1cmFibGUpXG4tIFJlc3RvcmVzIHdhbGxwYXBlciBvbiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzLiBObyBtb3JlIGdyYXkgYmFja2dyb3VuZFxuLSBTaG93IHdvcmtzcGFjZXMnIHRodW1ibmFpbHMgZXZlbiB3aGVuIHRoZXJlIGlzIG9ubHkgb25lIHdvcmtzcGFjZVxuLSBGaXJlZm94J3MgUElQIChwaWN0dXJlIGluIHBpY3R1cmUpIHdpbmRvdyBpcyBub3cgZGlzcGxheWVkIG9uIHRoZSBvdmVydmlldyBzY3JlZW5cblxuQWxsIG1vZGlmaWNhdGlvbnMgY2FuIGJlIGRpc2FibGVkIGluIHRoZSBleHRlbnNpb24ncyBzZXR0aW5ncy5cblxuQVRURU5USU9OIVxuQWZ0ZXIgZXh0ZW5zaW9uIHVwZGF0ZSwgZ25vbWUtc2hlbGwgcmVzdGFydCBpcyByZXF1aXJlZDpcblgxMTogQWx0K0YyID0+IHJcbldheWxhbmQ6IGxvZ291dCA9PiBsb2dpbiIsCiAgIm5hbWUiOiAiR25vbWUgNHggVUkgSW1wcm92ZW1lbnRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLXVpLXR1bmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F4eGFweS9nbm9tZS11aS10dW5lIiwKICAidXVpZCI6ICJnbm9tZS11aS10dW5lQGl0c3RpbWUudGVjaCIsCiAgInZlcnNpb24iOiAxNQp9"}}} , {"uuid": "monitor-window-switcher@thefungusrocket.com", "name": "Monitor window switcher", "pname": "monitor-window-switcher", "description": "Improves the window switcher on dual (or more) monitor setups", "link": "https://extensions.gnome.org/extension/4164/monitor-window-switcher/", "shell_version_map": {"38": {"version": "6", "sha256": "0pazjbi0aikpnvnfxyamqy70xi1xclydyxdkf908c6ybwnc5956z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmVzIHRoZSB3aW5kb3cgc3dpdGNoZXIgb24gZHVhbCAob3IgbW9yZSkgbW9uaXRvciBzZXR1cHMiLAogICJuYW1lIjogIk1vbml0b3Igd2luZG93IHN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZWR6ZXBwZWxpbi9tb25pdG9yLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAibW9uaXRvci13aW5kb3ctc3dpdGNoZXJAdGhlZnVuZ3Vzcm9ja2V0LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "0pazjbi0aikpnvnfxyamqy70xi1xclydyxdkf908c6ybwnc5956z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmVzIHRoZSB3aW5kb3cgc3dpdGNoZXIgb24gZHVhbCAob3IgbW9yZSkgbW9uaXRvciBzZXR1cHMiLAogICJuYW1lIjogIk1vbml0b3Igd2luZG93IHN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZWR6ZXBwZWxpbi9tb25pdG9yLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAibW9uaXRvci13aW5kb3ctc3dpdGNoZXJAdGhlZnVuZ3Vzcm9ja2V0LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0pazjbi0aikpnvnfxyamqy70xi1xclydyxdkf908c6ybwnc5956z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkltcHJvdmVzIHRoZSB3aW5kb3cgc3dpdGNoZXIgb24gZHVhbCAob3IgbW9yZSkgbW9uaXRvciBzZXR1cHMiLAogICJuYW1lIjogIk1vbml0b3Igd2luZG93IHN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZWR6ZXBwZWxpbi9tb25pdG9yLXdpbmRvdy1zd2l0Y2hlciIsCiAgInV1aWQiOiAibW9uaXRvci13aW5kb3ctc3dpdGNoZXJAdGhlZnVuZ3Vzcm9ja2V0LmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "custom-hot-corners-extended@G-dH.github.com", "name": "Custom Hot Corners - Extended", "pname": "custom-hot-corners-extended", "description": "Give a function to any corner or edge of your monitors and expand your keyboard capabilities.\nMouse pointer pressure, clicks and scrolls over the monitor corners/edges or custom keyboard shortcuts can trigger any of dozens built-in actions that helps you navigate and control your desktop environment, or your own shell commands.\n\nSignificant part of available actions are visual adjustments (contrast, brightness, opacity) and color filters (red, green, desaturate, lightness and color inversions) , including correction filters for colorblind users and cb simulation filters for developers.\n\nRestart your Gnome Shell after each update of the extension to load new code, and reload this site to get rid of the error message, before you post a bug report.\n\nPlease report bugs/issues on GitHub page linked below as Extension Homepage.\nDo NOT use bug report form on this page, I will NOT respond to it.\n\nkeywords: keyboard shortcut, switch windows, overview, app grid, command, brightness, contrast, transparent, opacity, color effect, invert lightness, color tint, color blind filter, simulation, desaturate, night lights, dark theme, volume, mute, magnifier, zoom, screen keyboard, reader, large text, force close, kill -9, show desktop, reorder workspace, window thumbnail, preview, looking glass, custom menu, window, close workspace, switcher, hide panel", "link": "https://extensions.gnome.org/extension/4167/custom-hot-corners-extended/", "shell_version_map": {"38": {"version": "23", "sha256": "0ndi14lls6532kx3xnl9p3kdq6cnxp54z6xbkrpymy3d7y8qq7yq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "40": {"version": "23", "sha256": "0ndi14lls6532kx3xnl9p3kdq6cnxp54z6xbkrpymy3d7y8qq7yq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "41": {"version": "23", "sha256": "0ndi14lls6532kx3xnl9p3kdq6cnxp54z6xbkrpymy3d7y8qq7yq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "42": {"version": "23", "sha256": "0ndi14lls6532kx3xnl9p3kdq6cnxp54z6xbkrpymy3d7y8qq7yq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "43": {"version": "23", "sha256": "0ndi14lls6532kx3xnl9p3kdq6cnxp54z6xbkrpymy3d7y8qq7yq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIG1vbml0b3IgY29ybmVycy9lZGdlcyBvciBjdXN0b20ga2V5Ym9hcmQgc2hvcnRjdXRzIGNhbiB0cmlnZ2VyIGFueSBvZiBkb3plbnMgYnVpbHQtaW4gYWN0aW9ucyB0aGF0IGhlbHBzIHlvdSBuYXZpZ2F0ZSBhbmQgY29udHJvbCB5b3VyIGRlc2t0b3AgZW52aXJvbm1lbnQsIG9yIHlvdXIgb3duIHNoZWxsIGNvbW1hbmRzLlxuXG5TaWduaWZpY2FudCBwYXJ0IG9mIGF2YWlsYWJsZSBhY3Rpb25zIGFyZSB2aXN1YWwgYWRqdXN0bWVudHMgKGNvbnRyYXN0LCBicmlnaHRuZXNzLCBvcGFjaXR5KSBhbmQgY29sb3IgZmlsdGVycyAocmVkLCBncmVlbiwgZGVzYXR1cmF0ZSwgbGlnaHRuZXNzIGFuZCBjb2xvciBpbnZlcnNpb25zKSAsIGluY2x1ZGluZyBjb3JyZWN0aW9uIGZpbHRlcnMgZm9yIGNvbG9yYmxpbmQgdXNlcnMgYW5kIGNiIHNpbXVsYXRpb24gZmlsdGVycyBmb3IgZGV2ZWxvcGVycy5cblxuUmVzdGFydCB5b3VyIEdub21lIFNoZWxsIGFmdGVyIGVhY2ggdXBkYXRlIG9mIHRoZSBleHRlbnNpb24gdG8gbG9hZCBuZXcgY29kZSwgYW5kIHJlbG9hZCB0aGlzIHNpdGUgdG8gZ2V0IHJpZCBvZiB0aGUgZXJyb3IgbWVzc2FnZSwgYmVmb3JlIHlvdSBwb3N0IGEgYnVnIHJlcG9ydC5cblxuUGxlYXNlIHJlcG9ydCBidWdzL2lzc3VlcyBvbiBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLlxuRG8gTk9UIHVzZSBidWcgcmVwb3J0IGZvcm0gb24gdGhpcyBwYWdlLCBJIHdpbGwgTk9UIHJlc3BvbmQgdG8gaXQuXG5cbmtleXdvcmRzOiBrZXlib2FyZCBzaG9ydGN1dCwgc3dpdGNoIHdpbmRvd3MsIG92ZXJ2aWV3LCBhcHAgZ3JpZCwgY29tbWFuZCwgYnJpZ2h0bmVzcywgY29udHJhc3QsIHRyYW5zcGFyZW50LCBvcGFjaXR5LCBjb2xvciBlZmZlY3QsIGludmVydCBsaWdodG5lc3MsIGNvbG9yIHRpbnQsIGNvbG9yIGJsaW5kIGZpbHRlciwgc2ltdWxhdGlvbiwgZGVzYXR1cmF0ZSwgbmlnaHQgbGlnaHRzLCBkYXJrIHRoZW1lLCB2b2x1bWUsIG11dGUsIG1hZ25pZmllciwgem9vbSwgc2NyZWVuIGtleWJvYXJkLCByZWFkZXIsIGxhcmdlIHRleHQsIGZvcmNlIGNsb3NlLCBraWxsIC05LCBzaG93IGRlc2t0b3AsIHJlb3JkZXIgd29ya3NwYWNlLCB3aW5kb3cgdGh1bWJuYWlsLCBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCBjbG9zZSB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9jdXN0b20taG90LWNvcm5lcnMvdHJlZS9nZGgiLAogICJ1dWlkIjogImN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZEBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} -, {"uuid": "hass-gshell@geoph9-on-github", "name": "Home Assistant Extension", "pname": "home-assistant-extension", "description": "A simple gnome shell extension for Home Assistant. Check the README on github for additional help!\n\nMain points:\n- You need to provide the url of your hass, a long live access token obtained from your profile page (on your hass web instance) and the entity ids of the entities you want to have as togglable.\n- In order to add some local temperature/humidity sensor, you may also provide a temperature and/or a humidity entity id (which should match the corresponding ids of your hass instance).", "link": "https://extensions.gnome.org/extension/4170/home-assistant-extension/", "shell_version_map": {"38": {"version": "3", "sha256": "04p2hvxyyc1zv441sv0l1dcxbdvzqp46mii3zvw0nhq8jg5pz8rr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgIm5hbWUiOiAiSG9tZSBBc3Npc3RhbnQgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhhc3MtZGF0YSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dlb3BoOS9oYXNzLWdzaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImhhc3MtZ3NoZWxsQGdlb3BoOS1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "11", "sha256": "0jjjzcqdhprlbxk2aacb339spf3svpqyx9sz38cpw2xvy3hy6cy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgImdldHRleHQtZG9tYWluIjogImhhc3MtZ3NoZWxsIiwKICAibmFtZSI6ICJIb21lIEFzc2lzdGFudCBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGFzcy1kYXRhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "0jjjzcqdhprlbxk2aacb339spf3svpqyx9sz38cpw2xvy3hy6cy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgImdldHRleHQtZG9tYWluIjogImhhc3MtZ3NoZWxsIiwKICAibmFtZSI6ICJIb21lIEFzc2lzdGFudCBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGFzcy1kYXRhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "0jjjzcqdhprlbxk2aacb339spf3svpqyx9sz38cpw2xvy3hy6cy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgImdldHRleHQtZG9tYWluIjogImhhc3MtZ3NoZWxsIiwKICAibmFtZSI6ICJIb21lIEFzc2lzdGFudCBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGFzcy1kYXRhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxMQp9"}}} +, {"uuid": "hass-gshell@geoph9-on-github", "name": "Home Assistant Extension", "pname": "home-assistant-extension", "description": "A simple gnome shell extension for Home Assistant. Check the README on github for additional help!\n\nMain points:\n- You need to provide the url of your hass, a long live access token obtained from your profile page (on your hass web instance) and the entity ids of the entities you want to have as togglable.\n- In order to add some local temperature/humidity sensor, you may also provide a temperature and/or a humidity entity id (which should match the corresponding ids of your hass instance).", "link": "https://extensions.gnome.org/extension/4170/home-assistant-extension/", "shell_version_map": {"38": {"version": "3", "sha256": "04p2hvxyyc1zv441sv0l1dcxbdvzqp46mii3zvw0nhq8jg5pz8rr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgIm5hbWUiOiAiSG9tZSBBc3Npc3RhbnQgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhhc3MtZGF0YSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dlb3BoOS9oYXNzLWdzaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImhhc3MtZ3NoZWxsQGdlb3BoOS1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "11", "sha256": "0jjjzcqdhprlbxk2aacb339spf3svpqyx9sz38cpw2xvy3hy6cy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgImdldHRleHQtZG9tYWluIjogImhhc3MtZ3NoZWxsIiwKICAibmFtZSI6ICJIb21lIEFzc2lzdGFudCBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGFzcy1kYXRhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "0jjjzcqdhprlbxk2aacb339spf3svpqyx9sz38cpw2xvy3hy6cy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgImdldHRleHQtZG9tYWluIjogImhhc3MtZ3NoZWxsIiwKICAibmFtZSI6ICJIb21lIEFzc2lzdGFudCBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGFzcy1kYXRhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "0jjjzcqdhprlbxk2aacb339spf3svpqyx9sz38cpw2xvy3hy6cy5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgImdldHRleHQtZG9tYWluIjogImhhc3MtZ3NoZWxsIiwKICAibmFtZSI6ICJIb21lIEFzc2lzdGFudCBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGFzcy1kYXRhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2VvcGg5L2hhc3MtZ3NoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiaGFzcy1nc2hlbGxAZ2VvcGg5LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxMQp9"}, "43": {"version": "15", "sha256": "1wsc395r2qm6i1yhrp0vlbrc3clfda9msycsijii6jd713kfnq1l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgImdldHRleHQtZG9tYWluIjogImhhc3MtZ3NoZWxsIiwKICAibmFtZSI6ICJIb21lIEFzc2lzdGFudCBFeHRlbnNpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGFzcy1kYXRhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dlb3BoOS9oYXNzLWdzaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImhhc3MtZ3NoZWxsQGdlb3BoOS1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} , {"uuid": "clear-top-bar@superterran.net", "name": "Clear Top Bar", "pname": "clear-top-bar", "description": "Fully transparent topbar, pairs with the zhanghai transparent top bar extension to make bar opaque when window is maximized", "link": "https://extensions.gnome.org/extension/4173/clear-top-bar/", "shell_version_map": {"40": {"version": "6", "sha256": "1xfq9i816p0djfidimgci5xk1mjfrka0xrvxrs44lsqq109xf8pc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IHRyYW5zcGFyZW50IHRvcGJhciwgcGFpcnMgd2l0aCB0aGUgemhhbmdoYWkgdHJhbnNwYXJlbnQgdG9wIGJhciBleHRlbnNpb24gdG8gbWFrZSBiYXIgb3BhcXVlIHdoZW4gd2luZG93IGlzIG1heGltaXplZCIsCiAgIm5hbWUiOiAiQ2xlYXIgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1cGVydGVycmFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jbGVhci10b3AtYmFyIiwKICAidXVpZCI6ICJjbGVhci10b3AtYmFyQHN1cGVydGVycmFuLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1xfq9i816p0djfidimgci5xk1mjfrka0xrvxrs44lsqq109xf8pc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IHRyYW5zcGFyZW50IHRvcGJhciwgcGFpcnMgd2l0aCB0aGUgemhhbmdoYWkgdHJhbnNwYXJlbnQgdG9wIGJhciBleHRlbnNpb24gdG8gbWFrZSBiYXIgb3BhcXVlIHdoZW4gd2luZG93IGlzIG1heGltaXplZCIsCiAgIm5hbWUiOiAiQ2xlYXIgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1cGVydGVycmFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jbGVhci10b3AtYmFyIiwKICAidXVpZCI6ICJjbGVhci10b3AtYmFyQHN1cGVydGVycmFuLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "1xfq9i816p0djfidimgci5xk1mjfrka0xrvxrs44lsqq109xf8pc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZ1bGx5IHRyYW5zcGFyZW50IHRvcGJhciwgcGFpcnMgd2l0aCB0aGUgemhhbmdoYWkgdHJhbnNwYXJlbnQgdG9wIGJhciBleHRlbnNpb24gdG8gbWFrZSBiYXIgb3BhcXVlIHdoZW4gd2luZG93IGlzIG1heGltaXplZCIsCiAgIm5hbWUiOiAiQ2xlYXIgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1cGVydGVycmFuL2dub21lLXNoZWxsLWV4dGVuc2lvbi1jbGVhci10b3AtYmFyIiwKICAidXVpZCI6ICJjbGVhci10b3AtYmFyQHN1cGVydGVycmFuLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "systemd-manager@hardpixel.eu", "name": "Systemd Manager", "pname": "systemd-manager", "description": "Toggle systemd services on/off from a popup menu in the top gnome panel. Can be used to start services like apache2, mysql, postgres. It uses `pkexec' to run `sytemctl'. If you want to start services without entering a password you have to polkit policy file. An example policy file can be found in the github repository.", "link": "https://extensions.gnome.org/extension/4174/systemd-manager/", "shell_version_map": {"38": {"version": "12", "sha256": "1cjh0zdc7808jk37bxd2xydlmn2svm9f9sw2g8cwjrq77ss28qm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "1cjh0zdc7808jk37bxd2xydlmn2svm9f9sw2g8cwjrq77ss28qm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "1cjh0zdc7808jk37bxd2xydlmn2svm9f9sw2g8cwjrq77ss28qm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "1cjh0zdc7808jk37bxd2xydlmn2svm9f9sw2g8cwjrq77ss28qm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "1cjh0zdc7808jk37bxd2xydlmn2svm9f9sw2g8cwjrq77ss28qm2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYXJkcGl4ZWwvc3lzdGVtZC1tYW5hZ2VyIiwKICAidXVpZCI6ICJzeXN0ZW1kLW1hbmFnZXJAaGFyZHBpeGVsLmV1IiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"uuid": "auto-activities@acedron.github.io", "name": "Auto Activities (DEPRECATED)", "pname": "auto-activities", "description": "Show activities overview when there are no windows, or hide it when there are new windows.\n\n--DEPRECATED--\nDeprecated in favor of https://extensions.gnome.org/extension/5500/auto-activities", "link": "https://extensions.gnome.org/extension/4179/auto-activities/", "shell_version_map": {"40": {"version": "14", "sha256": "134yqy4rbg1svicfkgp5z6ni1w6vvjg5s7apa5j4ynkgycqmrlam", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG4tLURFUFJFQ0FURUQtLVxuRGVwcmVjYXRlZCBpbiBmYXZvciBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi81NTAwL2F1dG8tYWN0aXZpdGllcyIsCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIChERVBSRUNBVEVEKSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJhY2Vkcm9uc0B5YWhvby5jby5qcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NsZW9NZW5lemVzSnIvYXV0by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJhdXRvLWFjdGl2aXRpZXNAYWNlZHJvbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "134yqy4rbg1svicfkgp5z6ni1w6vvjg5s7apa5j4ynkgycqmrlam", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG4tLURFUFJFQ0FURUQtLVxuRGVwcmVjYXRlZCBpbiBmYXZvciBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi81NTAwL2F1dG8tYWN0aXZpdGllcyIsCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIChERVBSRUNBVEVEKSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJhY2Vkcm9uc0B5YWhvby5jby5qcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NsZW9NZW5lemVzSnIvYXV0by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJhdXRvLWFjdGl2aXRpZXNAYWNlZHJvbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "42": {"version": "14", "sha256": "134yqy4rbg1svicfkgp5z6ni1w6vvjg5s7apa5j4ynkgycqmrlam", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLlxuXG4tLURFUFJFQ0FURUQtLVxuRGVwcmVjYXRlZCBpbiBmYXZvciBvZiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi81NTAwL2F1dG8tYWN0aXZpdGllcyIsCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIChERVBSRUNBVEVEKSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJhY2Vkcm9uc0B5YWhvby5jby5qcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NsZW9NZW5lemVzSnIvYXV0by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJhdXRvLWFjdGl2aXRpZXNAYWNlZHJvbi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} @@ -501,7 +502,7 @@ , {"uuid": "dash-to-plank@hardpixel.eu", "name": "Dash to Plank", "pname": "dash-to-plank", "description": "GNOME Shell integration for Plank, the simplest dock on the planet. To use this extension, you must have Plank installed on your system.\n\nThis extension depends on Plank. To install it:\n- Debian/Ubuntu: apt install plank\n- Fedora/RHEL: dnf install plank\n- Arch: pacman -S plank\n\n** This extension does NOT WORK on WAYLAND.", "link": "https://extensions.gnome.org/extension/4198/dash-to-plank/", "shell_version_map": {"38": {"version": "14", "sha256": "00mgrjk4a8rxch0ghj7vjb2ddhc2bicbrnfxsddj6k57yclac0am", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXNoLXRvLXBsYW5rIiwKICAidXVpZCI6ICJkYXNoLXRvLXBsYW5rQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiAxNAp9"}, "40": {"version": "14", "sha256": "00mgrjk4a8rxch0ghj7vjb2ddhc2bicbrnfxsddj6k57yclac0am", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXNoLXRvLXBsYW5rIiwKICAidXVpZCI6ICJkYXNoLXRvLXBsYW5rQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "00mgrjk4a8rxch0ghj7vjb2ddhc2bicbrnfxsddj6k57yclac0am", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXNoLXRvLXBsYW5rIiwKICAidXVpZCI6ICJkYXNoLXRvLXBsYW5rQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiAxNAp9"}, "42": {"version": "14", "sha256": "00mgrjk4a8rxch0ghj7vjb2ddhc2bicbrnfxsddj6k57yclac0am", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXNoLXRvLXBsYW5rIiwKICAidXVpZCI6ICJkYXNoLXRvLXBsYW5rQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiAxNAp9"}, "43": {"version": "14", "sha256": "00mgrjk4a8rxch0ghj7vjb2ddhc2bicbrnfxsddj6k57yclac0am", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIFNoZWxsIGludGVncmF0aW9uIGZvciBQbGFuaywgdGhlIHNpbXBsZXN0IGRvY2sgb24gdGhlIHBsYW5ldC4gVG8gdXNlIHRoaXMgZXh0ZW5zaW9uLCB5b3UgbXVzdCBoYXZlIFBsYW5rIGluc3RhbGxlZCBvbiB5b3VyIHN5c3RlbS5cblxuVGhpcyBleHRlbnNpb24gZGVwZW5kcyBvbiBQbGFuay4gVG8gaW5zdGFsbCBpdDpcbi0gRGViaWFuL1VidW50dTogYXB0IGluc3RhbGwgcGxhbmtcbi0gRmVkb3JhL1JIRUw6IGRuZiBpbnN0YWxsIHBsYW5rXG4tIEFyY2g6IHBhY21hbiAtUyBwbGFua1xuXG4qKiBUaGlzIGV4dGVuc2lvbiBkb2VzIE5PVCBXT1JLIG9uIFdBWUxBTkQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaC10by1wbGFuayIsCiAgIm5hbWUiOiAiRGFzaCB0byBQbGFuayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoLXRvLXBsYW5rIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9kYXNoLXRvLXBsYW5rIiwKICAidXVpZCI6ICJkYXNoLXRvLXBsYW5rQGhhcmRwaXhlbC5ldSIsCiAgInZlcnNpb24iOiAxNAp9"}}} , {"uuid": "rrc@ogarcia.me", "name": "Remove Rounded Corners", "pname": "remove-rounded-corners", "description": "Removes rounded corners from main panel or top bar\n\nWARNING: From GNOME 42 onwards this extension is not needed since it no longer has rounded corners", "link": "https://extensions.gnome.org/extension/4201/remove-rounded-corners/", "shell_version_map": {"40": {"version": "5", "sha256": "1xi1al0kaqk381sf4p2q8lj0f7hbhirh523sy5h2510p4xwaybwi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgcm91bmRlZCBjb3JuZXJzIGZyb20gbWFpbiBwYW5lbCBvciB0b3AgYmFyXG5cbldBUk5JTkc6IEZyb20gR05PTUUgNDIgb253YXJkcyB0aGlzIGV4dGVuc2lvbiBpcyBub3QgbmVlZGVkIHNpbmNlIGl0IG5vIGxvbmdlciBoYXMgcm91bmRlZCBjb3JuZXJzIiwKICAibmFtZSI6ICJSZW1vdmUgUm91bmRlZCBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vZ2FyY2lhL3JlbW92ZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogInJyY0BvZ2FyY2lhLm1lIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1xi1al0kaqk381sf4p2q8lj0f7hbhirh523sy5h2510p4xwaybwi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgcm91bmRlZCBjb3JuZXJzIGZyb20gbWFpbiBwYW5lbCBvciB0b3AgYmFyXG5cbldBUk5JTkc6IEZyb20gR05PTUUgNDIgb253YXJkcyB0aGlzIGV4dGVuc2lvbiBpcyBub3QgbmVlZGVkIHNpbmNlIGl0IG5vIGxvbmdlciBoYXMgcm91bmRlZCBjb3JuZXJzIiwKICAibmFtZSI6ICJSZW1vdmUgUm91bmRlZCBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9vZ2FyY2lhL3JlbW92ZS1yb3VuZGVkLWNvcm5lcnMiLAogICJ1dWlkIjogInJyY0BvZ2FyY2lhLm1lIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "private-switcher@dziban.com", "name": "Private Switcher", "pname": "private-switcher", "description": "Simple extension that allows you do have independent app switcher (alt-tab) for each workspace.", "link": "https://extensions.gnome.org/extension/4204/private-switcher/", "shell_version_map": {"38": {"version": "1", "sha256": "1awjnic8zca2f6viah2l4ai0pyfdyisxna9ys1zzpya11rwj6jk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBhbGxvd3MgeW91IGRvIGhhdmUgaW5kZXBlbmRlbnQgYXBwIHN3aXRjaGVyIChhbHQtdGFiKSBmb3IgZWFjaCB3b3Jrc3BhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJpdmF0ZS1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiUHJpdmF0ZSBTd2l0Y2hlciIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcml2YXRlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tIiwKICAidXVpZCI6ICJwcml2YXRlLXN3aXRjaGVyQGR6aWJhbi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "1awjnic8zca2f6viah2l4ai0pyfdyisxna9ys1zzpya11rwj6jk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBhbGxvd3MgeW91IGRvIGhhdmUgaW5kZXBlbmRlbnQgYXBwIHN3aXRjaGVyIChhbHQtdGFiKSBmb3IgZWFjaCB3b3Jrc3BhY2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJpdmF0ZS1zd2l0Y2hlciIsCiAgIm5hbWUiOiAiUHJpdmF0ZSBTd2l0Y2hlciIsCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wcml2YXRlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC5iZXRhIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tIiwKICAidXVpZCI6ICJwcml2YXRlLXN3aXRjaGVyQGR6aWJhbi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "colosseum@sereneblue", "name": "Colosseum", "pname": "colosseum", "description": "View live scores for your favorite sports teams.", "link": "https://extensions.gnome.org/extension/4207/colosseum/", "shell_version_map": {"40": {"version": "11", "sha256": "0661a17dih6d6pfpilhnv70wsf5v4b8ixwvmbswllmd07x2791dw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0661a17dih6d6pfpilhnv70wsf5v4b8ixwvmbswllmd07x2791dw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0661a17dih6d6pfpilhnv70wsf5v4b8ixwvmbswllmd07x2791dw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "43": {"version": "11", "sha256": "0661a17dih6d6pfpilhnv70wsf5v4b8ixwvmbswllmd07x2791dw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} +, {"uuid": "colosseum@sereneblue", "name": "Colosseum", "pname": "colosseum", "description": "View live scores for your favorite sports teams.", "link": "https://extensions.gnome.org/extension/4207/colosseum/", "shell_version_map": {"40": {"version": "12", "sha256": "1bxcynflaray45x57zyhcfq4jbyfshs9pbikgvry5sp0ljvsmwvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "41": {"version": "12", "sha256": "1bxcynflaray45x57zyhcfq4jbyfshs9pbikgvry5sp0ljvsmwvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "42": {"version": "12", "sha256": "1bxcynflaray45x57zyhcfq4jbyfshs9pbikgvry5sp0ljvsmwvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "43": {"version": "12", "sha256": "1bxcynflaray45x57zyhcfq4jbyfshs9pbikgvry5sp0ljvsmwvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpZXcgbGl2ZSBzY29yZXMgZm9yIHlvdXIgZmF2b3JpdGUgc3BvcnRzIHRlYW1zLiIsCiAgIm5hbWUiOiAiQ29sb3NzZXVtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NlcmVuZWJsdWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNvbG9zc2V1bSIsCiAgInV1aWQiOiAiY29sb3NzZXVtQHNlcmVuZWJsdWUiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}}} , {"uuid": "gnome-plat-workspace@stonegate.me", "name": "Gnome 40 Flat Workspace", "pname": "gnome-40-plat-workspace", "description": "Remove shadow for workspace background in gnome 40.\nSource code https://github.com/stonega/gnome-extension-flat-workspace", "link": "https://extensions.gnome.org/extension/4215/gnome-40-plat-workspace/", "shell_version_map": {"40": {"version": "3", "sha256": "0ly2dab9c0l7w1axnqs7xk2szd5jm2ifgniz2snw5mwkr5pw76nb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBzaGFkb3cgZm9yIHdvcmtzcGFjZSBiYWNrZ3JvdW5kIGluIGdub21lIDQwLlxuU291cmNlIGNvZGUgaHR0cHM6Ly9naXRodWIuY29tL3N0b25lZ2EvZ25vbWUtZXh0ZW5zaW9uLWZsYXQtd29ya3NwYWNlIiwKICAibmFtZSI6ICJHbm9tZSA0MCBGbGF0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1wbGF0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZ25vbWUtcGxhdC13b3Jrc3BhY2VAc3RvbmVnYXRlLm1lIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "hotedge@jonathan.jdoda.ca", "name": "Hot Edge", "pname": "hot-edge", "description": "Add a hot edge that activates the overview to the bottom of the screen. This minimizes the pointer travel required to access the dash when using the new GNOME Shell 40 overview layout.\n\nNow with preference dialog!\n\nYou can find more documentation at https://github.com/jdoda/hotedge/blob/main/README.md and report issues at https://github.com/jdoda/hotedge/issues .", "link": "https://extensions.gnome.org/extension/4222/hot-edge/", "shell_version_map": {"40": {"version": "16", "sha256": "1h0bzw25arzd1rfdavl7b0xny078agl5cfp665xdkc89701q7wf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "1h0bzw25arzd1rfdavl7b0xny078agl5cfp665xdkc89701q7wf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAxNgp9"}, "42": {"version": "16", "sha256": "1h0bzw25arzd1rfdavl7b0xny078agl5cfp665xdkc89701q7wf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "1h0bzw25arzd1rfdavl7b0xny078agl5cfp665xdkc89701q7wf0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGhvdCBlZGdlIHRoYXQgYWN0aXZhdGVzIHRoZSBvdmVydmlldyB0byB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIFRoaXMgbWluaW1pemVzIHRoZSBwb2ludGVyIHRyYXZlbCByZXF1aXJlZCB0byBhY2Nlc3MgdGhlIGRhc2ggd2hlbiB1c2luZyB0aGUgbmV3IEdOT01FIFNoZWxsIDQwIG92ZXJ2aWV3IGxheW91dC5cblxuTm93IHdpdGggcHJlZmVyZW5jZSBkaWFsb2chXG5cbllvdSBjYW4gZmluZCBtb3JlIGRvY3VtZW50YXRpb24gYXQgaHR0cHM6Ly9naXRodWIuY29tL2pkb2RhL2hvdGVkZ2UvYmxvYi9tYWluL1JFQURNRS5tZCBhbmQgcmVwb3J0IGlzc3VlcyBhdCBodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZS9pc3N1ZXMgLiIsCiAgIm5hbWUiOiAiSG90IEVkZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamRvZGEvaG90ZWRnZSIsCiAgInV1aWQiOiAiaG90ZWRnZUBqb25hdGhhbi5qZG9kYS5jYSIsCiAgInZlcnNpb24iOiAxNgp9"}}} , {"uuid": "gnome-citeurl-search-provider@raindrum.github.io", "name": "Legal Citation Search", "pname": "gnome-citeurl-search-provider", "description": "This extension lets you look up U.S. state and federal laws and court cases by typing citations (like \"42 USC 1983\" or \"U.S. Constitution Art. I, Sec. 3\") into the search bar.\nBy default, the search supports the U.S. Code and federal constitution, as well as nearly all codified state laws and constitutions, among other sources of law. You can also add more types of citation by following the instructions on the GitHub page.", "link": "https://extensions.gnome.org/extension/4225/gnome-citeurl-search-provider/", "shell_version_map": {"38": {"version": "6", "sha256": "024d98642smciv5n2vc4l2f8rglfrv180paj1g2rrq9k4pvg6yym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IGxvb2sgdXAgVS5TLiBzdGF0ZSBhbmQgZmVkZXJhbCBsYXdzIGFuZCBjb3VydCBjYXNlcyBieSB0eXBpbmcgY2l0YXRpb25zIChsaWtlIFwiNDIgVVNDIDE5ODNcIiBvciBcIlUuUy4gQ29uc3RpdHV0aW9uIEFydC4gSSwgU2VjLiAzXCIpIGludG8gdGhlIHNlYXJjaCBiYXIuXG5CeSBkZWZhdWx0LCB0aGUgc2VhcmNoIHN1cHBvcnRzIHRoZSBVLlMuIENvZGUgYW5kIGZlZGVyYWwgY29uc3RpdHV0aW9uLCBhcyB3ZWxsIGFzIG5lYXJseSBhbGwgY29kaWZpZWQgc3RhdGUgbGF3cyBhbmQgY29uc3RpdHV0aW9ucywgYW1vbmcgb3RoZXIgc291cmNlcyBvZiBsYXcuIFlvdSBjYW4gYWxzbyBhZGQgbW9yZSB0eXBlcyBvZiBjaXRhdGlvbiBieSBmb2xsb3dpbmcgdGhlIGluc3RydWN0aW9ucyBvbiB0aGUgR2l0SHViIHBhZ2UuIiwKICAibmFtZSI6ICJMZWdhbCBDaXRhdGlvbiBTZWFyY2giLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFpbmRydW0vZ25vbWUtY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogImdub21lLWNpdGV1cmwtc2VhcmNoLXByb3ZpZGVyQHJhaW5kcnVtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "024d98642smciv5n2vc4l2f8rglfrv180paj1g2rrq9k4pvg6yym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGxldHMgeW91IGxvb2sgdXAgVS5TLiBzdGF0ZSBhbmQgZmVkZXJhbCBsYXdzIGFuZCBjb3VydCBjYXNlcyBieSB0eXBpbmcgY2l0YXRpb25zIChsaWtlIFwiNDIgVVNDIDE5ODNcIiBvciBcIlUuUy4gQ29uc3RpdHV0aW9uIEFydC4gSSwgU2VjLiAzXCIpIGludG8gdGhlIHNlYXJjaCBiYXIuXG5CeSBkZWZhdWx0LCB0aGUgc2VhcmNoIHN1cHBvcnRzIHRoZSBVLlMuIENvZGUgYW5kIGZlZGVyYWwgY29uc3RpdHV0aW9uLCBhcyB3ZWxsIGFzIG5lYXJseSBhbGwgY29kaWZpZWQgc3RhdGUgbGF3cyBhbmQgY29uc3RpdHV0aW9ucywgYW1vbmcgb3RoZXIgc291cmNlcyBvZiBsYXcuIFlvdSBjYW4gYWxzbyBhZGQgbW9yZSB0eXBlcyBvZiBjaXRhdGlvbiBieSBmb2xsb3dpbmcgdGhlIGluc3RydWN0aW9ucyBvbiB0aGUgR2l0SHViIHBhZ2UuIiwKICAibmFtZSI6ICJMZWdhbCBDaXRhdGlvbiBTZWFyY2giLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFpbmRydW0vZ25vbWUtY2l0ZXVybC1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogImdub21lLWNpdGV1cmwtc2VhcmNoLXByb3ZpZGVyQHJhaW5kcnVtLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA2Cn0="}}} @@ -518,12 +519,12 @@ , {"uuid": "rippleremove@slippinggitty", "name": "Ripple Remove", "pname": "ripple-remove", "description": "Removes the ripple effect from the Activities hot corner", "link": "https://extensions.gnome.org/extension/4264/ripple-remove/", "shell_version_map": {"40": {"version": "1", "sha256": "1dnk8nfnv5hp8c11fzhn5vscicij4lk9i1vz25fz6sjc3rn1a9pq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlIHJpcHBsZSBlZmZlY3QgZnJvbSB0aGUgQWN0aXZpdGllcyBob3QgY29ybmVyIiwKICAibmFtZSI6ICJSaXBwbGUgUmVtb3ZlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5zbGlwcGluZ2l0dHkucmlwcGxlcmVtb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJyaXBwbGVyZW1vdmVAc2xpcHBpbmdnaXR0eSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "quickmenu@slippinggitty", "name": "Quick Menu [DEAD]", "pname": "quick-menu", "description": "This is a fork of fedoramenu (which is a fork of Big Sur Menu by fausto) that scrubs references of Fedora by replacing the icon with the GNOME logo.\n\nQuick Menu is a panel applet similar to the Apple menu found on macOS.\n\nEDIT: This extension's purpose is dead. Check out Tofu Menu, which is fedoramenu, but with the ability to change the icon. https://extensions.gnome.org/extension/4272/tofu-menu/", "link": "https://extensions.gnome.org/extension/4266/quick-menu/", "shell_version_map": {"40": {"version": "1", "sha256": "1qla029n79366a7xvg2d9v0wa7272bqj40ggvbjrfsbd8x066aca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgaXMgYSBmb3JrIG9mIGZlZG9yYW1lbnUgKHdoaWNoIGlzIGEgZm9yayBvZiBCaWcgU3VyIE1lbnUgYnkgZmF1c3RvKSB0aGF0IHNjcnVicyByZWZlcmVuY2VzIG9mIEZlZG9yYSBieSByZXBsYWNpbmcgdGhlIGljb24gd2l0aCB0aGUgR05PTUUgbG9nby5cblxuUXVpY2sgTWVudSBpcyBhIHBhbmVsIGFwcGxldCBzaW1pbGFyIHRvIHRoZSBBcHBsZSBtZW51IGZvdW5kIG9uIG1hY09TLlxuXG5FRElUOiBUaGlzIGV4dGVuc2lvbidzIHB1cnBvc2UgaXMgZGVhZC4gQ2hlY2sgb3V0IFRvZnUgTWVudSwgd2hpY2ggaXMgZmVkb3JhbWVudSwgYnV0IHdpdGggdGhlIGFiaWxpdHkgdG8gY2hhbmdlIHRoZSBpY29uLiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80MjcyL3RvZnUtbWVudS8iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdWljay1tZW51IiwKICAibmFtZSI6ICJRdWljayBNZW51IFtERUFEXSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuc2xpcHBpbmdpdHR5LnF1aWNrLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2xpcHBpbmdHaXR0eS9xdWlja21lbnUiLAogICJ1dWlkIjogInF1aWNrbWVudUBzbGlwcGluZ2dpdHR5IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "show-desktop-applet@valent-in", "name": "Show Desktop Applet", "pname": "show-desktop-applet", "description": "Minimize/unminimize all open windows with a single click.\n\nForked from https://extensions.gnome.org/extension/1194/show-desktop-button/\n\nFeatures:\n- Windows-like behavior\n- Can be placed at the end of panel\n- Hotkey support (can be activated in settings)", "link": "https://extensions.gnome.org/extension/4267/show-desktop-applet/", "shell_version_map": {"38": {"version": "4", "sha256": "0c6dbpgjvx9i8hgh97agbglsq7mbwxl8sndl569hjsvjvk232j26", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmFsZW50LWluL1Nob3ctRGVza3RvcC1BcHBsZXQiLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1hcHBsZXRAdmFsZW50LWluIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0c6dbpgjvx9i8hgh97agbglsq7mbwxl8sndl569hjsvjvk232j26", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmFsZW50LWluL1Nob3ctRGVza3RvcC1BcHBsZXQiLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1hcHBsZXRAdmFsZW50LWluIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0c6dbpgjvx9i8hgh97agbglsq7mbwxl8sndl569hjsvjvk232j26", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmFsZW50LWluL1Nob3ctRGVza3RvcC1BcHBsZXQiLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1hcHBsZXRAdmFsZW50LWluIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0c6dbpgjvx9i8hgh97agbglsq7mbwxl8sndl569hjsvjvk232j26", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVmFsZW50LWluL1Nob3ctRGVza3RvcC1BcHBsZXQiLAogICJ1dWlkIjogInNob3ctZGVza3RvcC1hcHBsZXRAdmFsZW50LWluIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "AlphabeticalAppGrid@stuarthayhurst", "name": "Alphabetical App Grid", "pname": "alphabetical-app-grid", "description": "Restore the alphabetical ordering of the app grid", "link": "https://extensions.gnome.org/extension/4269/alphabetical-app-grid/", "shell_version_map": {"38": {"version": "26", "sha256": "1wgfip9lss2jlfjkqqklb65shzdvhdyaz7vnyz45cmadhsz9mcs0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNgp9"}, "40": {"version": "26", "sha256": "1wgfip9lss2jlfjkqqklb65shzdvhdyaz7vnyz45cmadhsz9mcs0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNgp9"}, "41": {"version": "26", "sha256": "1wgfip9lss2jlfjkqqklb65shzdvhdyaz7vnyz45cmadhsz9mcs0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNgp9"}, "42": {"version": "26", "sha256": "1wgfip9lss2jlfjkqqklb65shzdvhdyaz7vnyz45cmadhsz9mcs0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNgp9"}, "43": {"version": "26", "sha256": "1wgfip9lss2jlfjkqqklb65shzdvhdyaz7vnyz45cmadhsz9mcs0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNgp9"}}} +, {"uuid": "AlphabeticalAppGrid@stuarthayhurst", "name": "Alphabetical App Grid", "pname": "alphabetical-app-grid", "description": "Restore the alphabetical ordering of the app grid", "link": "https://extensions.gnome.org/extension/4269/alphabetical-app-grid/", "shell_version_map": {"38": {"version": "27", "sha256": "1j703nwbswfk6bg4gk7kr2rn36mwblygjgp7ba1abmb3b8n0ybim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNwp9"}, "40": {"version": "27", "sha256": "1j703nwbswfk6bg4gk7kr2rn36mwblygjgp7ba1abmb3b8n0ybim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "27", "sha256": "1j703nwbswfk6bg4gk7kr2rn36mwblygjgp7ba1abmb3b8n0ybim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNwp9"}, "42": {"version": "27", "sha256": "1j703nwbswfk6bg4gk7kr2rn36mwblygjgp7ba1abmb3b8n0ybim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNwp9"}, "43": {"version": "27", "sha256": "1j703nwbswfk6bg4gk7kr2rn36mwblygjgp7ba1abmb3b8n0ybim", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0dWFydGhheWh1cnN0L2FscGhhYmV0aWNhbC1ncmlkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiQWxwaGFiZXRpY2FsQXBwR3JpZEBzdHVhcnRoYXlodXJzdCIsCiAgInZlcnNpb24iOiAyNwp9"}}} , {"uuid": "tofumenu@tofu", "name": "Tofu Menu", "pname": "tofu-menu", "description": "Quick access menu for the GNOME panel with options that help ease the workflow for newcomers and power users alike.\n\nhttps://github.com/tofutech/tofumenu", "link": "https://extensions.gnome.org/extension/4272/tofu-menu/", "shell_version_map": {"40": {"version": "2", "sha256": "05ndbjvvz0v1y8iq6ngqylz4z1ld6q5ibhkr5dh24wqc4wiky30v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyBtZW51IGZvciB0aGUgR05PTUUgcGFuZWwgd2l0aCBvcHRpb25zIHRoYXQgaGVscCBlYXNlIHRoZSB3b3JrZmxvdyBmb3IgbmV3Y29tZXJzIGFuZCBwb3dlciB1c2VycyBhbGlrZS5cblxuaHR0cHM6Ly9naXRodWIuY29tL3RvZnV0ZWNoL3RvZnVtZW51IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmVkb3JhLW1lbnUiLAogICJuYW1lIjogIlRvZnUgTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcudG9mdS5mZWRvcmEtbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidG9mdW1lbnVAdG9mdSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "cryptostash@filidorwiese.nl", "name": "CryptoStash", "pname": "cryptostash", "description": "Keep an eye on the real time value of your crypto coins collections.\n\nYou can create multiple \"stashes\" (portfolios) of coins and monitor the accumulated value in USD or EUR. Or if you prefer, you can simply track the current value of your favorite coin.", "link": "https://extensions.gnome.org/extension/4276/cryptostash/", "shell_version_map": {"38": {"version": "4", "sha256": "0n1452ky1dppcxazgqxv5jc91l4piwp64rmc9b41ak3792j1sgbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvcl91cmwiOiAiaHR0cHM6Ly9maWxpZG9yd2llc2UubmwiLAogICJkZXNjcmlwdGlvbiI6ICJLZWVwIGFuIGV5ZSBvbiB0aGUgcmVhbCB0aW1lIHZhbHVlIG9mIHlvdXIgY3J5cHRvIGNvaW5zIGNvbGxlY3Rpb25zLlxuXG5Zb3UgY2FuIGNyZWF0ZSBtdWx0aXBsZSBcInN0YXNoZXNcIiAocG9ydGZvbGlvcykgb2YgY29pbnMgYW5kIG1vbml0b3IgdGhlIGFjY3VtdWxhdGVkIHZhbHVlIGluIFVTRCBvciBFVVIuIE9yIGlmIHlvdSBwcmVmZXIsIHlvdSBjYW4gc2ltcGx5IHRyYWNrIHRoZSBjdXJyZW50IHZhbHVlIG9mIHlvdXIgZmF2b3JpdGUgY29pbi4iLAogICJuYW1lIjogIkNyeXB0b1N0YXNoIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNyeXB0by1zdGFzaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ0YWciOiAxLjMsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmlsaWRvcndpZXNlL2dub21lLXNoZWxsLWNyeXB0by1zdGFzaCIsCiAgInV1aWQiOiAiY3J5cHRvc3Rhc2hAZmlsaWRvcndpZXNlLm5sIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "xmlfix@pwall.github.com", "name": "XML-Fix", "pname": "xml-fix", "description": "Fixes the XML-Codes displaying instead of the characters on notifications.", "link": "https://extensions.gnome.org/extension/4279/xml-fix/", "shell_version_map": {"38": {"version": "2", "sha256": "1c9qa3ky873hkckylsbv0s7q9bmsnia7h8mlc36i7xz7h1ml6fpx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeGVzIHRoZSBYTUwtQ29kZXMgZGlzcGxheWluZyBpbnN0ZWFkIG9mIHRoZSBjaGFyYWN0ZXJzIG9uIG5vdGlmaWNhdGlvbnMuIiwKICAibmFtZSI6ICJYTUwtRml4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUFdhbGwyMjIyL1hNTEZpeCIsCiAgInV1aWQiOiAieG1sZml4QHB3YWxsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "gnometoggle@foreverxml.github.io", "name": "Gnome Toggle", "pname": "gnome-toggle", "description": "Turn on your GNOME dark mode! (For up-to-date versions, download from GitHub.)", "link": "https://extensions.gnome.org/extension/4287/gnome-toggle/", "shell_version_map": {"38": {"version": "1", "sha256": "1a1qvrdq0xglr0lf4pglaxhn03k9qxhh77n4g0d51r419l4y6n2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1cm4gb24geW91ciBHTk9NRSBkYXJrIG1vZGUhIChGb3IgdXAtdG8tZGF0ZSB2ZXJzaW9ucywgZG93bmxvYWQgZnJvbSBHaXRIdWIuKSIsCiAgIm5hbWUiOiAiR25vbWUgVG9nZ2xlIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImZvcmV2ZXJ4bWxAdHV0YS5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mb3JldmVyeG1sL2dub21lLXRvZ2dsZSIsCiAgInV1aWQiOiAiZ25vbWV0b2dnbGVAZm9yZXZlcnhtbC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "1a1qvrdq0xglr0lf4pglaxhn03k9qxhh77n4g0d51r419l4y6n2r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1cm4gb24geW91ciBHTk9NRSBkYXJrIG1vZGUhIChGb3IgdXAtdG8tZGF0ZSB2ZXJzaW9ucywgZG93bmxvYWQgZnJvbSBHaXRIdWIuKSIsCiAgIm5hbWUiOiAiR25vbWUgVG9nZ2xlIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImZvcmV2ZXJ4bWxAdHV0YS5pbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mb3JldmVyeG1sL2dub21lLXRvZ2dsZSIsCiAgInV1aWQiOiAiZ25vbWV0b2dnbGVAZm9yZXZlcnhtbC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "instantworkspaceswitcher@amalantony.net", "name": "Disable Workspace Switch Animation for GNOME 40+", "pname": "disable-workspace-switch-animation-for-gnome-40", "description": "Disables the workspace switch animation while preserving all other animations - instantly switch between workspaces with keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4290/disable-workspace-switch-animation-for-gnome-40/", "shell_version_map": {"40": {"version": "6", "sha256": "0kc09n6xna31nb3k5m4wvfm2x3qxs04dcjygss3b1d8x6wm15ha9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWFsYW50b255L2dub21lLXNoZWxsLWV4dGVuc2lvbi1pbnN0YW50LXdvcmtzcGFjZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiaW5zdGFudHdvcmtzcGFjZXN3aXRjaGVyQGFtYWxhbnRvbnkubmV0IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0kc09n6xna31nb3k5m4wvfm2x3qxs04dcjygss3b1d8x6wm15ha9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWFsYW50b255L2dub21lLXNoZWxsLWV4dGVuc2lvbi1pbnN0YW50LXdvcmtzcGFjZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiaW5zdGFudHdvcmtzcGFjZXN3aXRjaGVyQGFtYWxhbnRvbnkubmV0IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "0kc09n6xna31nb3k5m4wvfm2x3qxs04dcjygss3b1d8x6wm15ha9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbWFsYW50b255L2dub21lLXNoZWxsLWV4dGVuc2lvbi1pbnN0YW50LXdvcmtzcGFjZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiaW5zdGFudHdvcmtzcGFjZXN3aXRjaGVyQGFtYWxhbnRvbnkubmV0IiwKICAidmVyc2lvbiI6IDYKfQ=="}}} +, {"uuid": "instantworkspaceswitcher@amalantony.net", "name": "Disable Workspace Switch Animation for GNOME 40+", "pname": "disable-workspace-switch-animation-for-gnome-40", "description": "Disables the workspace switch animation while preserving all other animations - instantly switch between workspaces with keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4290/disable-workspace-switch-animation-for-gnome-40/", "shell_version_map": {"40": {"version": "7", "sha256": "0mfqhg3d4iq4k7av8y5k780jb65qrqpb3mr6g090cr2vlk3ngw13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtYWxhbnRvbnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWluc3RhbnQtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJpbnN0YW50d29ya3NwYWNlc3dpdGNoZXJAYW1hbGFudG9ueS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0mfqhg3d4iq4k7av8y5k780jb65qrqpb3mr6g090cr2vlk3ngw13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtYWxhbnRvbnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWluc3RhbnQtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJpbnN0YW50d29ya3NwYWNlc3dpdGNoZXJAYW1hbGFudG9ueS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "0mfqhg3d4iq4k7av8y5k780jb65qrqpb3mr6g090cr2vlk3ngw13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtYWxhbnRvbnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWluc3RhbnQtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJpbnN0YW50d29ya3NwYWNlc3dpdGNoZXJAYW1hbGFudG9ueS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "0mfqhg3d4iq4k7av8y5k780jb65qrqpb3mr6g090cr2vlk3ngw13", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGVzIHRoZSB3b3Jrc3BhY2Ugc3dpdGNoIGFuaW1hdGlvbiB3aGlsZSBwcmVzZXJ2aW5nIGFsbCBvdGhlciBhbmltYXRpb25zIC0gaW5zdGFudGx5IHN3aXRjaCBiZXR3ZWVuIHdvcmtzcGFjZXMgd2l0aCBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIFdvcmtzcGFjZSBTd2l0Y2ggQW5pbWF0aW9uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIiwKICAgICI0NCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtYWxhbnRvbnkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWluc3RhbnQtd29ya3NwYWNlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJpbnN0YW50d29ya3NwYWNlc3dpdGNoZXJAYW1hbGFudG9ueS5uZXQiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "top-panel-notification-icons@5th0.github.com", "name": "Top Panel Notification Icons", "pname": "top-panel-notification-icons", "description": "Display notification icons in the Top", "link": "https://extensions.gnome.org/extension/4293/top-panel-notification-icons/", "shell_version_map": {"38": {"version": "1", "sha256": "0s84r45nc1kyv6sc6a9jbxv981f1ih8g2nfdzrzd33n3032f30px", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbm90aWZpY2F0aW9uIGljb25zIGluIHRoZSBUb3AiLAogICJuYW1lIjogIlRvcCBQYW5lbCBOb3RpZmljYXRpb24gSWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRvcC1wYW5lbC1ub3RpZmljYXRpb24taWNvbnNANXRoMC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "1", "sha256": "0s84r45nc1kyv6sc6a9jbxv981f1ih8g2nfdzrzd33n3032f30px", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbm90aWZpY2F0aW9uIGljb25zIGluIHRoZSBUb3AiLAogICJuYW1lIjogIlRvcCBQYW5lbCBOb3RpZmljYXRpb24gSWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInRvcC1wYW5lbC1ub3RpZmljYXRpb24taWNvbnNANXRoMC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "custom-menu-panel@AndreaBenini", "name": "custom-menu-panel", "pname": "custom-menu-panel", "description": "Quick custom menu for launching your favorite applications", "link": "https://extensions.gnome.org/extension/4295/custom-menu-panel/", "shell_version_map": {"40": {"version": "2", "sha256": "12d8p8cmsq93pmyd6y07jx7r0ls4h7pfqlhp8bvmsw48gmiv5sq8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGN1c3RvbSBtZW51IGZvciBsYXVuY2hpbmcgeW91ciBmYXZvcml0ZSBhcHBsaWNhdGlvbnMiLAogICJuYW1lIjogImN1c3RvbS1tZW51LXBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjdXN0b20tbWVudS1wYW5lbEBBbmRyZWFCZW5pbmkiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "clean-system-menu@astrapi.de", "name": "Clean System Menu", "pname": "clean-system-menu", "description": "Cleanup the System Menu from Power Options", "link": "https://extensions.gnome.org/extension/4298/clean-system-menu/", "shell_version_map": {"40": {"version": "4", "sha256": "1x3fvi8qbbbqa9nc5xqp7ql2djcrch2w5azw0xq1dampdgz1976q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsZWFudXAgdGhlIFN5c3RlbSBNZW51IGZyb20gUG93ZXIgT3B0aW9ucyIsCiAgIm5hbWUiOiAiQ2xlYW4gU3lzdGVtIE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvYXN0cmFwaS9jbGVhbi1zeXN0ZW0tbWVudSIsCiAgInV1aWQiOiAiY2xlYW4tc3lzdGVtLW1lbnVAYXN0cmFwaS5kZSIsCiAgInZlcnNpb24iOiA0Cn0="}}} @@ -538,14 +539,14 @@ , {"uuid": "apt-shortcuts@rx1310", "name": "Shortcuts for APT", "pname": "shortcuts-for-apt", "description": "A small extension that adds buttons to the panel to check for APT updates through the terminal without entering commands.\n\n", "link": "https://extensions.gnome.org/extension/4328/shortcuts-for-apt/", "shell_version_map": {"38": {"version": "2", "sha256": "0p4nzm6wv7akjywdis9prlvdg7y6660i7iby9c1ns865068s6i5m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgQVBUIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy5cblxuIiwKICAibmFtZSI6ICJTaG9ydGN1dHMgZm9yIEFQVCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXB0LXNob3J0Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "0p4nzm6wv7akjywdis9prlvdg7y6660i7iby9c1ns865068s6i5m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgQVBUIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy5cblxuIiwKICAibmFtZSI6ICJTaG9ydGN1dHMgZm9yIEFQVCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXB0LXNob3J0Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "ideapad-mode@annexhack.inceptive.ru", "name": "ideapad mode", "pname": "ideapad-mode", "description": "Chargning mode indicator for laptops. Allows to switch the charging mode from conservative or healthy to normal mode. Indicates also which mode you are using now. Works on Lenovo Slim 7.\n\nPlease Report Problems or issues on Gitlab at:\n\nhttps://gitlab.com/annexhack/conservation-mode-lenovo", "link": "https://extensions.gnome.org/extension/4331/ideapad-mode/", "shell_version_map": {"40": {"version": "4", "sha256": "13yrdgly54bbpx7f23h929mq86nyl716kpa426h4np08g8w4rzb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYXJnbmluZyBtb2RlIGluZGljYXRvciBmb3IgbGFwdG9wcy4gQWxsb3dzIHRvIHN3aXRjaCB0aGUgY2hhcmdpbmcgbW9kZSBmcm9tIGNvbnNlcnZhdGl2ZSBvciBoZWFsdGh5IHRvIG5vcm1hbCBtb2RlLiBJbmRpY2F0ZXMgYWxzbyB3aGljaCBtb2RlIHlvdSBhcmUgdXNpbmcgbm93LiBXb3JrcyBvbiBMZW5vdm8gU2xpbSA3LlxuXG5QbGVhc2UgUmVwb3J0IFByb2JsZW1zIG9yIGlzc3VlcyBvbiBHaXRsYWIgYXQ6XG5cbmh0dHBzOi8vZ2l0bGFiLmNvbS9hbm5leGhhY2svY29uc2VydmF0aW9uLW1vZGUtbGVub3ZvIiwKICAibmFtZSI6ICJpZGVhcGFkIG1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hbm5leGhhY2svY29uc2VydmF0aW9uLW1vZGUtbGVub3ZvIiwKICAidXVpZCI6ICJpZGVhcGFkLW1vZGVAYW5uZXhoYWNrLmluY2VwdGl2ZS5ydSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "13yrdgly54bbpx7f23h929mq86nyl716kpa426h4np08g8w4rzb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYXJnbmluZyBtb2RlIGluZGljYXRvciBmb3IgbGFwdG9wcy4gQWxsb3dzIHRvIHN3aXRjaCB0aGUgY2hhcmdpbmcgbW9kZSBmcm9tIGNvbnNlcnZhdGl2ZSBvciBoZWFsdGh5IHRvIG5vcm1hbCBtb2RlLiBJbmRpY2F0ZXMgYWxzbyB3aGljaCBtb2RlIHlvdSBhcmUgdXNpbmcgbm93LiBXb3JrcyBvbiBMZW5vdm8gU2xpbSA3LlxuXG5QbGVhc2UgUmVwb3J0IFByb2JsZW1zIG9yIGlzc3VlcyBvbiBHaXRsYWIgYXQ6XG5cbmh0dHBzOi8vZ2l0bGFiLmNvbS9hbm5leGhhY2svY29uc2VydmF0aW9uLW1vZGUtbGVub3ZvIiwKICAibmFtZSI6ICJpZGVhcGFkIG1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hbm5leGhhY2svY29uc2VydmF0aW9uLW1vZGUtbGVub3ZvIiwKICAidXVpZCI6ICJpZGVhcGFkLW1vZGVAYW5uZXhoYWNrLmluY2VwdGl2ZS5ydSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "13yrdgly54bbpx7f23h929mq86nyl716kpa426h4np08g8w4rzb1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYXJnbmluZyBtb2RlIGluZGljYXRvciBmb3IgbGFwdG9wcy4gQWxsb3dzIHRvIHN3aXRjaCB0aGUgY2hhcmdpbmcgbW9kZSBmcm9tIGNvbnNlcnZhdGl2ZSBvciBoZWFsdGh5IHRvIG5vcm1hbCBtb2RlLiBJbmRpY2F0ZXMgYWxzbyB3aGljaCBtb2RlIHlvdSBhcmUgdXNpbmcgbm93LiBXb3JrcyBvbiBMZW5vdm8gU2xpbSA3LlxuXG5QbGVhc2UgUmVwb3J0IFByb2JsZW1zIG9yIGlzc3VlcyBvbiBHaXRsYWIgYXQ6XG5cbmh0dHBzOi8vZ2l0bGFiLmNvbS9hbm5leGhhY2svY29uc2VydmF0aW9uLW1vZGUtbGVub3ZvIiwKICAibmFtZSI6ICJpZGVhcGFkIG1vZGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9hbm5leGhhY2svY29uc2VydmF0aW9uLW1vZGUtbGVub3ZvIiwKICAidXVpZCI6ICJpZGVhcGFkLW1vZGVAYW5uZXhoYWNrLmluY2VwdGl2ZS5ydSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "ubuntu-yaru-appearance@itzlightyhd", "name": "Ubuntu Appearance (GNOME 40)", "pname": "ubuntu-appearance-gnome-40", "description": "Adds a toggle between the default Ubuntu themes on GNOME 40. Forked from https://github.com/Muqtxdir/yaru-remix-theme-toggle.\n\nIt requires the `gnome-shell-extension-prefs` package installed on your Linux environment.", "link": "https://extensions.gnome.org/extension/4335/ubuntu-appearance-gnome-40/", "shell_version_map": {"40": {"version": "1", "sha256": "16068sihwydg99w82nw6qr3lrnq1vh8jl8fbr3q27i3zyds4xyja", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvcnMiOiBbCiAgICAiQXBleGllRGV2ZWxvcG1lbnQiLAogICAgIkl0ekxpZ2h0eUhEIgogIF0sCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSB0b2dnbGUgYmV0d2VlbiB0aGUgZGVmYXVsdCBVYnVudHUgdGhlbWVzIG9uIEdOT01FIDQwLiBGb3JrZWQgZnJvbSBodHRwczovL2dpdGh1Yi5jb20vTXVxdHhkaXIveWFydS1yZW1peC10aGVtZS10b2dnbGUuXG5cbkl0IHJlcXVpcmVzIHRoZSBgZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXByZWZzYCBwYWNrYWdlIGluc3RhbGxlZCBvbiB5b3VyIExpbnV4IGVudmlyb25tZW50LiIsCiAgIm5hbWUiOiAiVWJ1bnR1IEFwcGVhcmFuY2UgKEdOT01FIDQwKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BcGV4aWVEZXZlbG9wbWVudC91YnVudHUteWFydS1hcHBlYXJhbmNlIiwKICAidXVpZCI6ICJ1YnVudHUteWFydS1hcHBlYXJhbmNlQGl0emxpZ2h0eWhkIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} -, {"uuid": "desktopicons-neo@darkdemon", "name": "Desktop Icons: Neo", "pname": "desktop-icons-neo", "description": "This adds desktop icons to GNOME. A fork of Desktop Icons NG with a massive amount of customizations (like icon shapes and curved corners), features, bug fixes, and overall polish.", "link": "https://extensions.gnome.org/extension/4337/desktop-icons-neo/", "shell_version_map": {"38": {"version": "7", "sha256": "1gvpcgvx2d3mkyb4qzyw4d2gw6s700042ld033dix1v3isdb4sn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vREVNME5Bc3Npc3NhbjcvZGVza3RvcC1pY29ucy1uZW8iLAogICJ1dWlkIjogImRlc2t0b3BpY29ucy1uZW9AZGFya2RlbW9uIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "40": {"version": "7", "sha256": "1gvpcgvx2d3mkyb4qzyw4d2gw6s700042ld033dix1v3isdb4sn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vREVNME5Bc3Npc3NhbjcvZGVza3RvcC1pY29ucy1uZW8iLAogICJ1dWlkIjogImRlc2t0b3BpY29ucy1uZW9AZGFya2RlbW9uIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "1gvpcgvx2d3mkyb4qzyw4d2gw6s700042ld033dix1v3isdb4sn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vREVNME5Bc3Npc3NhbjcvZGVza3RvcC1pY29ucy1uZW8iLAogICJ1dWlkIjogImRlc2t0b3BpY29ucy1uZW9AZGFya2RlbW9uIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "1gvpcgvx2d3mkyb4qzyw4d2gw6s700042ld033dix1v3isdb4sn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vREVNME5Bc3Npc3NhbjcvZGVza3RvcC1pY29ucy1uZW8iLAogICJ1dWlkIjogImRlc2t0b3BpY29ucy1uZW9AZGFya2RlbW9uIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} +, {"uuid": "desktopicons-neo@darkdemon", "name": "Desktop Icons: Neo", "pname": "desktop-icons-neo", "description": "This adds desktop icons to GNOME. A fork of Desktop Icons NG with a massive amount of customizations (like icon shapes and curved corners), features, bug fixes, and overall polish.", "link": "https://extensions.gnome.org/extension/4337/desktop-icons-neo/", "shell_version_map": {"38": {"version": "8", "sha256": "1s60xyv7642w6b83g2npi3bfh6adpg4lja3f37adj7l3b7qf0pr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RFTTBOQXNzaXNzYW43L2Rlc2t0b3AtaWNvbnMtbmVvIiwKICAidXVpZCI6ICJkZXNrdG9waWNvbnMtbmVvQGRhcmtkZW1vbiIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "1s60xyv7642w6b83g2npi3bfh6adpg4lja3f37adj7l3b7qf0pr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RFTTBOQXNzaXNzYW43L2Rlc2t0b3AtaWNvbnMtbmVvIiwKICAidXVpZCI6ICJkZXNrdG9waWNvbnMtbmVvQGRhcmtkZW1vbiIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1s60xyv7642w6b83g2npi3bfh6adpg4lja3f37adj7l3b7qf0pr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RFTTBOQXNzaXNzYW43L2Rlc2t0b3AtaWNvbnMtbmVvIiwKICAidXVpZCI6ICJkZXNrdG9waWNvbnMtbmVvQGRhcmtkZW1vbiIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1s60xyv7642w6b83g2npi3bfh6adpg4lja3f37adj7l3b7qf0pr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RFTTBOQXNzaXNzYW43L2Rlc2t0b3AtaWNvbnMtbmVvIiwKICAidXVpZCI6ICJkZXNrdG9waWNvbnMtbmVvQGRhcmtkZW1vbiIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "1s60xyv7642w6b83g2npi3bfh6adpg4lja3f37adj7l3b7qf0pr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgYWRkcyBkZXNrdG9wIGljb25zIHRvIEdOT01FLiBBIGZvcmsgb2YgRGVza3RvcCBJY29ucyBORyB3aXRoIGEgbWFzc2l2ZSBhbW91bnQgb2YgY3VzdG9taXphdGlvbnMgKGxpa2UgaWNvbiBzaGFwZXMgYW5kIGN1cnZlZCBjb3JuZXJzKSwgZmVhdHVyZXMsIGJ1ZyBmaXhlcywgYW5kIG92ZXJhbGwgcG9saXNoLiIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29uczogTmVvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0RFTTBOQXNzaXNzYW43L2Rlc2t0b3AtaWNvbnMtbmVvIiwKICAidXVpZCI6ICJkZXNrdG9waWNvbnMtbmVvQGRhcmtkZW1vbiIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "allowlockedremotedesktop@kamens.us", "name": "Allow Locked Remote Desktop", "pname": "allow-locked-remote-desktop", "description": "Allow remote desktop connections when the screen is locked", "link": "https://extensions.gnome.org/extension/4338/allow-locked-remote-desktop/", "shell_version_map": {"38": {"version": "6", "sha256": "0imfg8camy52qnidh4b1yqdasmmc3xba6d96pa2skw388h71h40j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFsbG93bG9ja2VkcmVtb3RlZGVza3RvcEBrYW1lbnMudXMiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "0imfg8camy52qnidh4b1yqdasmmc3xba6d96pa2skw388h71h40j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFsbG93bG9ja2VkcmVtb3RlZGVza3RvcEBrYW1lbnMudXMiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0imfg8camy52qnidh4b1yqdasmmc3xba6d96pa2skw388h71h40j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFsbG93bG9ja2VkcmVtb3RlZGVza3RvcEBrYW1lbnMudXMiLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "8", "sha256": "1ba4jxyh4j2avqrzzlsablrr4kvpav19bixgr9gn9gni0mxmp8n3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhbGxvd2xvY2tlZHJlbW90ZWRlc2t0b3BAa2FtZW5zLnVzIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "43": {"version": "8", "sha256": "1ba4jxyh4j2avqrzzlsablrr4kvpav19bixgr9gn9gni0mxmp8n3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhbGxvd2xvY2tlZHJlbW90ZWRlc2t0b3BAa2FtZW5zLnVzIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "mumble-ping@maweil.github.com", "name": "MumblePing", "pname": "mumbleping", "description": "Displays how many users are currently online on a mumble server", "link": "https://extensions.gnome.org/extension/4341/mumbleping/", "shell_version_map": {"38": {"version": "4", "sha256": "10h3q3nbxi49scfdpr2q657fl3fkw6g90z3ggzncjmz9vpsmarzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hd2VpbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXVtYmxlLXBpbmciLAogICJ1dWlkIjogIm11bWJsZS1waW5nQG1hd2VpbC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "10h3q3nbxi49scfdpr2q657fl3fkw6g90z3ggzncjmz9vpsmarzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hd2VpbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXVtYmxlLXBpbmciLAogICJ1dWlkIjogIm11bWJsZS1waW5nQG1hd2VpbC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "10h3q3nbxi49scfdpr2q657fl3fkw6g90z3ggzncjmz9vpsmarzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hd2VpbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXVtYmxlLXBpbmciLAogICJ1dWlkIjogIm11bWJsZS1waW5nQG1hd2VpbC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "10h3q3nbxi49scfdpr2q657fl3fkw6g90z3ggzncjmz9vpsmarzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hd2VpbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXVtYmxlLXBpbmciLAogICJ1dWlkIjogIm11bWJsZS1waW5nQG1hd2VpbC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "10h3q3nbxi49scfdpr2q657fl3fkw6g90z3ggzncjmz9vpsmarzv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hd2VpbC9nbm9tZS1zaGVsbC1leHRlbnNpb24tbXVtYmxlLXBpbmciLAogICJ1dWlkIjogIm11bWJsZS1waW5nQG1hd2VpbC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "simply.workspaces@andyrichardson.dev", "name": "Simply Workspaces", "pname": "simply-workspaces", "description": "Workspace indication with an i3/polybar style.", "link": "https://extensions.gnome.org/extension/4343/simply-workspaces/", "shell_version_map": {"40": {"version": "7", "sha256": "0s3a4pzmq6wycnwv0gn8sjiwqxa3csssb136c8srghdraicvq3f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBseSBXb3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZHlyaWNoYXJkc29uL3NpbXBseS13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzaW1wbHkud29ya3NwYWNlc0BhbmR5cmljaGFyZHNvbi5kZXYiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0s3a4pzmq6wycnwv0gn8sjiwqxa3csssb136c8srghdraicvq3f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBseSBXb3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZHlyaWNoYXJkc29uL3NpbXBseS13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzaW1wbHkud29ya3NwYWNlc0BhbmR5cmljaGFyZHNvbi5kZXYiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "0s3a4pzmq6wycnwv0gn8sjiwqxa3csssb136c8srghdraicvq3f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBseSBXb3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZHlyaWNoYXJkc29uL3NpbXBseS13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzaW1wbHkud29ya3NwYWNlc0BhbmR5cmljaGFyZHNvbi5kZXYiLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "0s3a4pzmq6wycnwv0gn8sjiwqxa3csssb136c8srghdraicvq3f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBseSBXb3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZHlyaWNoYXJkc29uL3NpbXBseS13b3Jrc3BhY2VzIiwKICAidXVpZCI6ICJzaW1wbHkud29ya3NwYWNlc0BhbmR5cmljaGFyZHNvbi5kZXYiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "nonblockingswitcher@scottworley.com", "name": "Non-Blocking Switcher", "pname": "non-blocking-switcher", "description": "Application switching oughtn't stop all other keyboard shortcuts", "link": "https://extensions.gnome.org/extension/4347/non-blocking-switcher/", "shell_version_map": {"40": {"version": "2", "sha256": "05a59fi1454kxh2q8p5qp3an7ss243v3d67jm37k6xggwd59v5fn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpY2F0aW9uIHN3aXRjaGluZyBvdWdodG4ndCBzdG9wIGFsbCBvdGhlciBrZXlib2FyZCBzaG9ydGN1dHMiLAogICJuYW1lIjogIk5vbi1CbG9ja2luZyBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9jaHVjay9ub24tYmxvY2tpbmctc3dpdGNoZXIiLAogICJ1dWlkIjogIm5vbmJsb2NraW5nc3dpdGNoZXJAc2NvdHR3b3JsZXkuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "fluoroom-gnome-top-bar@fluoroom.github.com", "name": "fluoroom's Top Bar", "pname": "fluorooms-top-bar", "description": "Persistent top bar based on Gnome's default style, with some modifications.\n\nThis extension makes black background and screen corners persistent and makes buttons round, but it will respect your current theme's fonts, margins and icons.", "link": "https://extensions.gnome.org/extension/4350/fluorooms-top-bar/", "shell_version_map": {"40": {"version": "4", "sha256": "1gm6ijr66nrs4r7cp2ksdy4sppf3vrg88lvf1gs993q6r894li89", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBlcnNpc3RlbnQgdG9wIGJhciBiYXNlZCBvbiBHbm9tZSdzIGRlZmF1bHQgc3R5bGUsIHdpdGggc29tZSBtb2RpZmljYXRpb25zLlxuXG5UaGlzIGV4dGVuc2lvbiBtYWtlcyBibGFjayBiYWNrZ3JvdW5kIGFuZCBzY3JlZW4gY29ybmVycyBwZXJzaXN0ZW50IGFuZCBtYWtlcyBidXR0b25zIHJvdW5kLCBidXQgaXQgd2lsbCByZXNwZWN0IHlvdXIgY3VycmVudCB0aGVtZSdzIGZvbnRzLCBtYXJnaW5zIGFuZCBpY29ucy4iLAogICJuYW1lIjogImZsdW9yb29tJ3MgVG9wIEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbHVvcm9vbS9mbHVvcm9vbS1nbm9tZS10b3AtYmFyIiwKICAidXVpZCI6ICJmbHVvcm9vbS1nbm9tZS10b3AtYmFyQGZsdW9yb29tLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "mbpbat@prithvivishak.gmail.com", "name": "MacBook Battery Percentage Corrector", "pname": "macbook-battery-percentage-corrector", "description": "Corrects only the battery percentage shown in the panel aggregate menu.\nDoes not mess with UPower or other subsystems. Special thanks to @andenlol.", "link": "https://extensions.gnome.org/extension/4353/macbook-battery-percentage-corrector/", "shell_version_map": {"38": {"version": "3", "sha256": "1vaklxwql5n92iq47bw5p37libhgf5dr5lf6frvvmzwxwk6pha5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcnJlY3RzIG9ubHkgdGhlIGJhdHRlcnkgcGVyY2VudGFnZSBzaG93biBpbiB0aGUgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5Eb2VzIG5vdCBtZXNzIHdpdGggVVBvd2VyIG9yIG90aGVyIHN1YnN5c3RlbXMuIFNwZWNpYWwgdGhhbmtzIHRvIEBhbmRlbmxvbC4iLAogICJuYW1lIjogIk1hY0Jvb2sgQmF0dGVyeSBQZXJjZW50YWdlIENvcnJlY3RvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcHZwdWJsaWMvbWJwYmF0L3NyYy9tYXN0ZXIvIiwKICAidXVpZCI6ICJtYnBiYXRAcHJpdGh2aXZpc2hhay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1vaklxwql5n92iq47bw5p37libhgf5dr5lf6frvvmzwxwk6pha5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcnJlY3RzIG9ubHkgdGhlIGJhdHRlcnkgcGVyY2VudGFnZSBzaG93biBpbiB0aGUgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5Eb2VzIG5vdCBtZXNzIHdpdGggVVBvd2VyIG9yIG90aGVyIHN1YnN5c3RlbXMuIFNwZWNpYWwgdGhhbmtzIHRvIEBhbmRlbmxvbC4iLAogICJuYW1lIjogIk1hY0Jvb2sgQmF0dGVyeSBQZXJjZW50YWdlIENvcnJlY3RvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcHZwdWJsaWMvbWJwYmF0L3NyYy9tYXN0ZXIvIiwKICAidXVpZCI6ICJtYnBiYXRAcHJpdGh2aXZpc2hhay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1vaklxwql5n92iq47bw5p37libhgf5dr5lf6frvvmzwxwk6pha5y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcnJlY3RzIG9ubHkgdGhlIGJhdHRlcnkgcGVyY2VudGFnZSBzaG93biBpbiB0aGUgcGFuZWwgYWdncmVnYXRlIG1lbnUuXG5Eb2VzIG5vdCBtZXNzIHdpdGggVVBvd2VyIG9yIG90aGVyIHN1YnN5c3RlbXMuIFNwZWNpYWwgdGhhbmtzIHRvIEBhbmRlbmxvbC4iLAogICJuYW1lIjogIk1hY0Jvb2sgQmF0dGVyeSBQZXJjZW50YWdlIENvcnJlY3RvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvcHZwdWJsaWMvbWJwYmF0L3NyYy9tYXN0ZXIvIiwKICAidXVpZCI6ICJtYnBiYXRAcHJpdGh2aXZpc2hhay5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "top-bar-organizer@julian.gse.jsts.xyz", "name": "Top Bar Organizer", "pname": "top-bar-organizer", "description": "Organize the items of the top (menu)bar.\nThis extension required Gnome Shell version 40.\nOrganize the items by going into the extensions settings.\n\n!!! Please make sure you're fully on Gnome 40 / you're using a distribution, which is fully on Gnome 40, since otherwise this extension might not work correctly. This was the case for Manjaro Stable until recently and is probably the case for Ubuntu 21.04 right now. !!!", "link": "https://extensions.gnome.org/extension/4356/top-bar-organizer/", "shell_version_map": {"40": {"version": "3", "sha256": "121a8r063ifv4lv5s07pglxj4h90n3lp6f0jyw4lnbg38v0nqv28", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci5cblRoaXMgZXh0ZW5zaW9uIHJlcXVpcmVkIEdub21lIFNoZWxsIHZlcnNpb24gNDAuXG5Pcmdhbml6ZSB0aGUgaXRlbXMgYnkgZ29pbmcgaW50byB0aGUgZXh0ZW5zaW9ucyBzZXR0aW5ncy5cblxuISEhIFBsZWFzZSBtYWtlIHN1cmUgeW91J3JlIGZ1bGx5IG9uIEdub21lIDQwIC8geW91J3JlIHVzaW5nIGEgZGlzdHJpYnV0aW9uLCB3aGljaCBpcyBmdWxseSBvbiBHbm9tZSA0MCwgc2luY2Ugb3RoZXJ3aXNlIHRoaXMgZXh0ZW5zaW9uIG1pZ2h0IG5vdCB3b3JrIGNvcnJlY3RseS4gVGhpcyB3YXMgdGhlIGNhc2UgZm9yIE1hbmphcm8gU3RhYmxlIHVudGlsIHJlY2VudGx5IGFuZCBpcyBwcm9iYWJseSB0aGUgY2FzZSBmb3IgVWJ1bnR1IDIxLjA0IHJpZ2h0IG5vdy4gISEhIiwKICAibmFtZSI6ICJUb3AgQmFyIE9yZ2FuaXplciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50b3AtYmFyLW9yZ2FuaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9qdWxpYW5zY2hhY2hlci90b3AtYmFyLW9yZ2FuaXplciIsCiAgInV1aWQiOiAidG9wLWJhci1vcmdhbml6ZXJAanVsaWFuLmdzZS5qc3RzLnh5eiIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "top-bar-organizer@julian.gse.jsts.xyz", "name": "Top Bar Organizer", "pname": "top-bar-organizer", "description": "Organize the items of the top (menu)bar.", "link": "https://extensions.gnome.org/extension/4356/top-bar-organizer/", "shell_version_map": {"40": {"version": "3", "sha256": "143gkzalaqzp1bjydy9dm1mi0k2sql8m77yj57gxb854bbipymqs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHRoZSBpdGVtcyBvZiB0aGUgdG9wIChtZW51KWJhci4iLAogICJuYW1lIjogIlRvcCBCYXIgT3JnYW5pemVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRvcC1iYXItb3JnYW5pemVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2p1bGlhbnNjaGFjaGVyL3RvcC1iYXItb3JnYW5pemVyIiwKICAidXVpZCI6ICJ0b3AtYmFyLW9yZ2FuaXplckBqdWxpYW4uZ3NlLmpzdHMueHl6IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "fullscreen-avoider@noobsai.github.com", "name": "Fullscreen Avoider", "pname": "fullscreen-avoider", "description": "Moves the top panel to the secondary monitor if the primary is in fullscreen", "link": "https://extensions.gnome.org/extension/4362/fullscreen-avoider/", "shell_version_map": {"38": {"version": "4", "sha256": "10vm28p2xpvwhzyjw1yfpgsbhahg1w673n73kq9ndx5vlnf9fji9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL05vb2JzYWkvZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAidXVpZCI6ICJmdWxsc2NyZWVuLWF2b2lkZXJAbm9vYnNhaS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "8", "sha256": "0f952h27gziw0wnjdcbvzcyrxd382rzi5rvjfs660r5vr8d7yzjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL2Z1bGxzY3JlZW4tYXZvaWRlciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0f952h27gziw0wnjdcbvzcyrxd382rzi5rvjfs660r5vr8d7yzjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL2Z1bGxzY3JlZW4tYXZvaWRlciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0f952h27gziw0wnjdcbvzcyrxd382rzi5rvjfs660r5vr8d7yzjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL2Z1bGxzY3JlZW4tYXZvaWRlciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0f952h27gziw0wnjdcbvzcyrxd382rzi5rvjfs660r5vr8d7yzjz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmVzIHRoZSB0b3AgcGFuZWwgdG8gdGhlIHNlY29uZGFyeSBtb25pdG9yIGlmIHRoZSBwcmltYXJ5IGlzIGluIGZ1bGxzY3JlZW4iLAogICJleHRlbnNpb24taWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiRnVsbHNjcmVlbiBBdm9pZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmZ1bGxzY3JlZW4tYXZvaWRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Ob29ic2FpL2Z1bGxzY3JlZW4tYXZvaWRlciIsCiAgInV1aWQiOiAiZnVsbHNjcmVlbi1hdm9pZGVyQG5vb2JzYWkuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "shell-isw@zamraky.cz", "name": "MSI Fan Control", "pname": "msi-fan-control", "description": "Use isw to change MSI laptop fan settings", "link": "https://extensions.gnome.org/extension/4363/msi-fan-control/", "shell_version_map": {"38": {"version": "1", "sha256": "0pl9dxwkw47r4c0f5sxjhh8bxl82r0sjlwsji7pwypkb6m0hh342", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBpc3cgdG8gY2hhbmdlIE1TSSBsYXB0b3AgZmFuIHNldHRpbmdzIiwKICAibmFtZSI6ICJNU0kgRmFuIENvbnRyb2wiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic2hlbGwtaXN3QHphbXJha3kuY3oiLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "nepalidate@kritishdhaubanjar.gmail.com", "name": "Nepali Date", "pname": "nepali-date", "description": "Show Today's Nepali Date", "link": "https://extensions.gnome.org/extension/4366/nepali-date/", "shell_version_map": {"40": {"version": "3", "sha256": "0b1lqfvdplrrsraz9k49k6j26pl6r9azmj3icn818rcf7avin18y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgVG9kYXkncyBOZXBhbGkgRGF0ZSIsCiAgIm5hbWUiOiAiTmVwYWxpIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tyaXRpc2gtZGhhdWJhbmphci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmVwYWxpLWRhdGUiLAogICJ1dWlkIjogIm5lcGFsaWRhdGVAa3JpdGlzaGRoYXViYW5qYXIuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0b1lqfvdplrrsraz9k49k6j26pl6r9azmj3icn818rcf7avin18y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgVG9kYXkncyBOZXBhbGkgRGF0ZSIsCiAgIm5hbWUiOiAiTmVwYWxpIERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tyaXRpc2gtZGhhdWJhbmphci9nbm9tZS1zaGVsbC1leHRlbnNpb24tbmVwYWxpLWRhdGUiLAogICJ1dWlkIjogIm5lcGFsaWRhdGVAa3JpdGlzaGRoYXViYW5qYXIuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} @@ -601,9 +602,9 @@ , {"uuid": "autohide-volume@unboiled.info", "name": "Autohide Volume", "pname": "autohide-volume", "description": "Autohide volume indicator when muted", "link": "https://extensions.gnome.org/extension/4539/autohide-volume/", "shell_version_map": {"41": {"version": "3", "sha256": "1qmnzs0a620nd5zvaqhrbp2b4rzz85x67cfsvswj4qxj8ha38b5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZCIsCiAgIm5hbWUiOiAiQXV0b2hpZGUgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS90MTg0MjU2L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvaGlkZS12b2x1bWUiLAogICJ1dWlkIjogImF1dG9oaWRlLXZvbHVtZUB1bmJvaWxlZC5pbmZvIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1qmnzs0a620nd5zvaqhrbp2b4rzz85x67cfsvswj4qxj8ha38b5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZCIsCiAgIm5hbWUiOiAiQXV0b2hpZGUgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS90MTg0MjU2L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvaGlkZS12b2x1bWUiLAogICJ1dWlkIjogImF1dG9oaWRlLXZvbHVtZUB1bmJvaWxlZC5pbmZvIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "1qmnzs0a620nd5zvaqhrbp2b4rzz85x67cfsvswj4qxj8ha38b5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZCIsCiAgIm5hbWUiOiAiQXV0b2hpZGUgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS90MTg0MjU2L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hdXRvaGlkZS12b2x1bWUiLAogICJ1dWlkIjogImF1dG9oaWRlLXZvbHVtZUB1bmJvaWxlZC5pbmZvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "cloudflare@adam.gadmz", "name": "Cloudflare", "pname": "cloudflare", "description": "Warp Connect", "link": "https://extensions.gnome.org/extension/4542/cloudflare/", "shell_version_map": {"38": {"version": "10", "sha256": "0lr2g0hmaw7v4h538rg3mxmnds8nnmbs0h0k816s4dkwmx45pyb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdW9uZ2dpYWtoYW5oYi9DbG91ZGZsYXJlX0dOT01FX0V4dGVuc2lvbiIsCiAgInV1aWQiOiAiY2xvdWRmbGFyZUBhZGFtLmdhZG16IiwKICAidmVyc2lvbiI6IDEwCn0="}, "40": {"version": "10", "sha256": "0lr2g0hmaw7v4h538rg3mxmnds8nnmbs0h0k816s4dkwmx45pyb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdW9uZ2dpYWtoYW5oYi9DbG91ZGZsYXJlX0dOT01FX0V4dGVuc2lvbiIsCiAgInV1aWQiOiAiY2xvdWRmbGFyZUBhZGFtLmdhZG16IiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0lr2g0hmaw7v4h538rg3mxmnds8nnmbs0h0k816s4dkwmx45pyb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdW9uZ2dpYWtoYW5oYi9DbG91ZGZsYXJlX0dOT01FX0V4dGVuc2lvbiIsCiAgInV1aWQiOiAiY2xvdWRmbGFyZUBhZGFtLmdhZG16IiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "0lr2g0hmaw7v4h538rg3mxmnds8nnmbs0h0k816s4dkwmx45pyb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiV2FycCBDb25uZWN0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsb3VkZmxhcmUiLAogICJuYW1lIjogIkNsb3VkZmxhcmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdW9uZ2dpYWtoYW5oYi9DbG91ZGZsYXJlX0dOT01FX0V4dGVuc2lvbiIsCiAgInV1aWQiOiAiY2xvdWRmbGFyZUBhZGFtLmdhZG16IiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "dell-command-configure-menu@vsimkus.github.io", "name": "Dell Command Configure menu", "pname": "dell-command-configure-menu", "description": "Adds submenu in gnome shell to access Dell Command Configure options.\n\nCurrently, only battery charge settings are implemented.\n\nThe Dell Command Configure tool must be installed separately from Dell https://www.dell.com/support/kbdoc/en-uk/000178000/dell-command-configure#Downloads.", "link": "https://extensions.gnome.org/extension/4545/dell-command-configure-menu/", "shell_version_map": {"38": {"version": "3", "sha256": "0mf9vibjzq1l9g6f3y7l7hx6dvqxbasdyhbrc8vfbczy9lar4v7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdnNpbWt1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51IiwKICAidXVpZCI6ICJkZWxsLWNvbW1hbmQtY29uZmlndXJlLW1lbnVAdnNpbWt1cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "8", "sha256": "1v0k79pvzsh57zdys41lrp9vy5n6fcq0vfnliavqizc2rhnf9xdn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZzaW1rdXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgInV1aWQiOiAiZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51QHZzaW1rdXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1v0k79pvzsh57zdys41lrp9vy5n6fcq0vfnliavqizc2rhnf9xdn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZzaW1rdXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgInV1aWQiOiAiZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51QHZzaW1rdXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "1v0k79pvzsh57zdys41lrp9vy5n6fcq0vfnliavqizc2rhnf9xdn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgc3VibWVudSBpbiBnbm9tZSBzaGVsbCB0byBhY2Nlc3MgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBvcHRpb25zLlxuXG5DdXJyZW50bHksIG9ubHkgYmF0dGVyeSBjaGFyZ2Ugc2V0dGluZ3MgYXJlIGltcGxlbWVudGVkLlxuXG5UaGUgRGVsbCBDb21tYW5kIENvbmZpZ3VyZSB0b29sIG11c3QgYmUgaW5zdGFsbGVkIHNlcGFyYXRlbHkgZnJvbSBEZWxsIGh0dHBzOi8vd3d3LmRlbGwuY29tL3N1cHBvcnQva2Jkb2MvZW4tdWsvMDAwMTc4MDAwL2RlbGwtY29tbWFuZC1jb25maWd1cmUjRG93bmxvYWRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgIm5hbWUiOiAiRGVsbCBDb21tYW5kIENvbmZpZ3VyZSBtZW51IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlbGxjb21tYW5kY29uZmlndXJlbWVudSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZzaW1rdXMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRlbGwtY29tbWFuZC1jb25maWd1cmUtbWVudSIsCiAgInV1aWQiOiAiZGVsbC1jb21tYW5kLWNvbmZpZ3VyZS1tZW51QHZzaW1rdXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} -, {"uuid": "tactile@lundal.io", "name": "Tactile", "pname": "tactile", "description": "Tile windows on a custom grid using your keyboard. Type Super-T to show the grid, then type two tiles (or the same tile twice) to move the active window.\n\nThe grid can be up to 4x3 (corresponding to one hand on the keyboard) and each row/column can be weighted to take up more or less space.", "link": "https://extensions.gnome.org/extension/4548/tactile/", "shell_version_map": {"38": {"version": "23", "sha256": "04g5sk23iafi63qym3mpm2vfr9x3pbwvwsabv8qs6x83z3ynj7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDIzCn0="}, "40": {"version": "23", "sha256": "04g5sk23iafi63qym3mpm2vfr9x3pbwvwsabv8qs6x83z3ynj7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "04g5sk23iafi63qym3mpm2vfr9x3pbwvwsabv8qs6x83z3ynj7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDIzCn0="}, "42": {"version": "23", "sha256": "04g5sk23iafi63qym3mpm2vfr9x3pbwvwsabv8qs6x83z3ynj7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDIzCn0="}, "43": {"version": "23", "sha256": "04g5sk23iafi63qym3mpm2vfr9x3pbwvwsabv8qs6x83z3ynj7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDIzCn0="}}} +, {"uuid": "tactile@lundal.io", "name": "Tactile", "pname": "tactile", "description": "Tile windows on a custom grid using your keyboard. Type Super-T to show the grid, then type two tiles (or the same tile twice) to move the active window.\n\nThe grid can be up to 4x3 (corresponding to one hand on the keyboard) and each row/column can be weighted to take up more or less space.", "link": "https://extensions.gnome.org/extension/4548/tactile/", "shell_version_map": {"38": {"version": "24", "sha256": "0k4xk8vgqd4j1cp5kkk8i7qv4d4d6jmgji434ckkm3vjx64nrzwp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "40": {"version": "24", "sha256": "0k4xk8vgqd4j1cp5kkk8i7qv4d4d6jmgji434ckkm3vjx64nrzwp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "41": {"version": "24", "sha256": "0k4xk8vgqd4j1cp5kkk8i7qv4d4d6jmgji434ckkm3vjx64nrzwp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "42": {"version": "24", "sha256": "0k4xk8vgqd4j1cp5kkk8i7qv4d4d6jmgji434ckkm3vjx64nrzwp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "43": {"version": "24", "sha256": "0k4xk8vgqd4j1cp5kkk8i7qv4d4d6jmgji434ckkm3vjx64nrzwp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbHVuZGFsL3RhY3RpbGUiLAogICJ1dWlkIjogInRhY3RpbGVAbHVuZGFsLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} , {"uuid": "killapp@adam.gadmz", "name": "Kill App", "pname": "kill-app", "description": "Force quit or kill application", "link": "https://extensions.gnome.org/extension/4551/kill-app/", "shell_version_map": {"38": {"version": "5", "sha256": "1d768xi63z8917p0m67wdy5vmv514yq6p3m84qyzk5lv084h5x0y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvS2lsbGFwcF9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImtpbGxhcHBAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "1d768xi63z8917p0m67wdy5vmv514yq6p3m84qyzk5lv084h5x0y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvS2lsbGFwcF9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImtpbGxhcHBAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1d768xi63z8917p0m67wdy5vmv514yq6p3m84qyzk5lv084h5x0y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvS2lsbGFwcF9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImtpbGxhcHBAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1d768xi63z8917p0m67wdy5vmv514yq6p3m84qyzk5lv084h5x0y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJBZGFtIiwKICAiZGVzY3JpcHRpb24iOiAiRm9yY2UgcXVpdCBvciBraWxsIGFwcGxpY2F0aW9uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWtpbGxhcHAiLAogICJuYW1lIjogIktpbGwgQXBwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZHVvbmdnaWFraGFuaGIvS2lsbGFwcF9HTk9NRV9FeHRlbnNpb24iLAogICJ1dWlkIjogImtpbGxhcHBAYWRhbS5nYWRteiIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"uuid": "hotkeys-popup@pimsnel.com", "name": "Hotkeys Popup", "pname": "hotkeys-popup", "description": "Pop-up cheatsheet with currently configured keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4553/hotkeys-popup/", "shell_version_map": {"40": {"version": "5", "sha256": "1nygr81qcg62imd28cb360l1n49b2q64c3az9w6n46zx04bk1y0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL21pcG1pcC5naXRodWIuaW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1ob3RrZXlzLXBvcHVwLyIsCiAgInV1aWQiOiAiaG90a2V5cy1wb3B1cEBwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1nygr81qcg62imd28cb360l1n49b2q64c3az9w6n46zx04bk1y0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL21pcG1pcC5naXRodWIuaW8vZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1ob3RrZXlzLXBvcHVwLyIsCiAgInV1aWQiOiAiaG90a2V5cy1wb3B1cEBwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"uuid": "hotkeys-popup@pimsnel.com", "name": "Hotkeys Popup", "pname": "hotkeys-popup", "description": "Pop-up cheatsheet with currently configured keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4553/hotkeys-popup/", "shell_version_map": {"40": {"version": "9", "sha256": "0phywsc05w93nlm0lmmzizf0ci7a8h8hrarnvnl853fx8b11vfy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhvdGtleXMtcG9wdXBAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "0phywsc05w93nlm0lmmzizf0ci7a8h8hrarnvnl853fx8b11vfy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhvdGtleXMtcG9wdXBAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "0phywsc05w93nlm0lmmzizf0ci7a8h8hrarnvnl853fx8b11vfy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhvdGtleXMtcG9wdXBAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "0phywsc05w93nlm0lmmzizf0ci7a8h8hrarnvnl853fx8b11vfy4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBvcC11cCBjaGVhdHNoZWV0IHdpdGggY3VycmVudGx5IGNvbmZpZ3VyZWQga2V5Ym9hcmQgc2hvcnRjdXRzLiIsCiAgImdldHRleHQtZG9tYWluIjogImhvdGtleXMtcG9wdXAiLAogICJuYW1lIjogIkhvdGtleXMgUG9wdXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG90a2V5cy1wb3B1cCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhvdGtleXMtcG9wdXBAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "inotch@alynx.one", "name": "iNotch", "pname": "inotch", "description": "Add a useless notch to your screen.", "link": "https://extensions.gnome.org/extension/4556/inotch/", "shell_version_map": {"40": {"version": "3", "sha256": "0x4zx4ph20maf5gw08j0j6v2whvviqs220vlr903nbcc5cxy7yil", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHVzZWxlc3Mgbm90Y2ggdG8geW91ciBzY3JlZW4uIiwKICAibmFtZSI6ICJpTm90Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FseW54WmhvdS9nbm9tZS1zaGVsbC1leHRlbnNpb24taW5vdGNoLyIsCiAgInV1aWQiOiAiaW5vdGNoQGFseW54Lm9uZSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "0x4zx4ph20maf5gw08j0j6v2whvviqs220vlr903nbcc5cxy7yil", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHVzZWxlc3Mgbm90Y2ggdG8geW91ciBzY3JlZW4uIiwKICAibmFtZSI6ICJpTm90Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0FseW54WmhvdS9nbm9tZS1zaGVsbC1leHRlbnNpb24taW5vdGNoLyIsCiAgInV1aWQiOiAiaW5vdGNoQGFseW54Lm9uZSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "quick-lang-switch@ankostis.gmail.com", "name": "Quick Lang Switch", "pname": "quick-lang-switch", "description": "Quickly switch keyboard language layout without showing the switcher popup.\n\nThe language switcher popup by default takes ~0.7sec to appear, meaning that roughly 2-4 strokes are lost till the switch completes. This affects heavily users typing languages with non-latin based alphabets (e.g. Greek, Cyrilic, Arabic, Japanese), particularly when writting technical documents.\nThis extension reduces the switching time to 1/10th of a second (on a 2019 PC).", "link": "https://extensions.gnome.org/extension/4559/quick-lang-switch/", "shell_version_map": {"38": {"version": "6", "sha256": "0shl17zj6qlpsfxahyn8vipkdfbj9bbidcx4p94argysjjsvx5jn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiIsCiAgIm5hbWUiOiAiUXVpY2sgTGFuZyBTd2l0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5rb3N0aXMvZ25vbWUtc2hlbGwtcXVpY2stbGFuZy1zd2l0Y2giLAogICJ1dWlkIjogInF1aWNrLWxhbmctc3dpdGNoQGFua29zdGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "0shl17zj6qlpsfxahyn8vipkdfbj9bbidcx4p94argysjjsvx5jn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiIsCiAgIm5hbWUiOiAiUXVpY2sgTGFuZyBTd2l0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5rb3N0aXMvZ25vbWUtc2hlbGwtcXVpY2stbGFuZy1zd2l0Y2giLAogICJ1dWlkIjogInF1aWNrLWxhbmctc3dpdGNoQGFua29zdGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0shl17zj6qlpsfxahyn8vipkdfbj9bbidcx4p94argysjjsvx5jn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiIsCiAgIm5hbWUiOiAiUXVpY2sgTGFuZyBTd2l0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5rb3N0aXMvZ25vbWUtc2hlbGwtcXVpY2stbGFuZy1zd2l0Y2giLAogICJ1dWlkIjogInF1aWNrLWxhbmctc3dpdGNoQGFua29zdGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "0shl17zj6qlpsfxahyn8vipkdfbj9bbidcx4p94argysjjsvx5jn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiIsCiAgIm5hbWUiOiAiUXVpY2sgTGFuZyBTd2l0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5rb3N0aXMvZ25vbWUtc2hlbGwtcXVpY2stbGFuZy1zd2l0Y2giLAogICJ1dWlkIjogInF1aWNrLWxhbmctc3dpdGNoQGFua29zdGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "0shl17zj6qlpsfxahyn8vipkdfbj9bbidcx4p94argysjjsvx5jn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc3dpdGNoIGtleWJvYXJkIGxhbmd1YWdlIGxheW91dCB3aXRob3V0IHNob3dpbmcgdGhlIHN3aXRjaGVyIHBvcHVwLlxuXG5UaGUgbGFuZ3VhZ2Ugc3dpdGNoZXIgcG9wdXAgYnkgZGVmYXVsdCB0YWtlcyB+MC43c2VjIHRvIGFwcGVhciwgbWVhbmluZyB0aGF0IHJvdWdobHkgMi00IHN0cm9rZXMgYXJlIGxvc3QgdGlsbCB0aGUgc3dpdGNoIGNvbXBsZXRlcy4gVGhpcyBhZmZlY3RzIGhlYXZpbHkgdXNlcnMgdHlwaW5nIGxhbmd1YWdlcyB3aXRoIG5vbi1sYXRpbiBiYXNlZCBhbHBoYWJldHMgKGUuZy4gR3JlZWssIEN5cmlsaWMsIEFyYWJpYywgSmFwYW5lc2UpLCBwYXJ0aWN1bGFybHkgd2hlbiB3cml0dGluZyB0ZWNobmljYWwgZG9jdW1lbnRzLlxuVGhpcyBleHRlbnNpb24gcmVkdWNlcyB0aGUgc3dpdGNoaW5nIHRpbWUgdG8gMS8xMHRoIG9mIGEgc2Vjb25kIChvbiBhIDIwMTkgUEMpLiIsCiAgIm5hbWUiOiAiUXVpY2sgTGFuZyBTd2l0Y2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5rb3N0aXMvZ25vbWUtc2hlbGwtcXVpY2stbGFuZy1zd2l0Y2giLAogICJ1dWlkIjogInF1aWNrLWxhbmctc3dpdGNoQGFua29zdGlzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "ssh-connect-menu@edavidf", "name": "SSH Connect Menu", "pname": "ssh-connect-menu", "description": "This extension puts an icon in the panel with a simple dropdown menu that launches items from your ~.ssh/config. \n\nThis is a fork of original by Josh Martens (https://extensions.gnome.org/extension/3237/ssh-quick-connect/) for Gnome 40 compatible changes that Josh made but did not upload here for quick/easy install/remove. Besides this description, uuid, name, and version number, no changes were made.", "link": "https://extensions.gnome.org/extension/4564/ssh-connect-menu/", "shell_version_map": {"40": {"version": "1", "sha256": "1s85qm4gzsywr5wagvkwag2344iandh57gc7cj00wlx34y642kpr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgd2l0aCBhIHNpbXBsZSBkcm9wZG93biBtZW51IHRoYXQgbGF1bmNoZXMgaXRlbXMgZnJvbSB5b3VyIH4uc3NoL2NvbmZpZy4gXG5cblRoaXMgaXMgYSBmb3JrIG9mIG9yaWdpbmFsIGJ5IEpvc2ggTWFydGVucyAoaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzIzNy9zc2gtcXVpY2stY29ubmVjdC8pIGZvciBHbm9tZSA0MCBjb21wYXRpYmxlIGNoYW5nZXMgdGhhdCBKb3NoIG1hZGUgYnV0IGRpZCBub3QgdXBsb2FkIGhlcmUgZm9yIHF1aWNrL2Vhc3kgaW5zdGFsbC9yZW1vdmUuIEJlc2lkZXMgdGhpcyBkZXNjcmlwdGlvbiwgdXVpZCwgbmFtZSwgYW5kIHZlcnNpb24gbnVtYmVyLCBubyBjaGFuZ2VzIHdlcmUgbWFkZS4iLAogICJuYW1lIjogIlNTSCBDb25uZWN0IE1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5naXRodWIuY29tL0VEYXZpZEYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNzaC1xdWljay1jb25uZWN0IiwKICAidXVpZCI6ICJzc2gtY29ubmVjdC1tZW51QGVkYXZpZGYiLAogICJ2ZXJzaW9uIjogMQp9"}}} @@ -639,15 +640,15 @@ , {"uuid": "cloudflare-warp-gnome@harshan01", "name": "Cloudflare 1.1.1.1 WARP Switcher", "pname": "cloudflare-1111-warp-switcher", "description": "Unofficial Cloudflare 1.1.1.1 WARP Switcher extension for GNOME shell", "link": "https://extensions.gnome.org/extension/4670/cloudflare-1111-warp-switcher/", "shell_version_map": {"38": {"version": "6", "sha256": "1zq03ih8ahc5xkfcn7wdjs6dpmhswvdm55bds9wzchscs041sfrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xvdWRmbGFyZS13YXJwLXN3aXRjaGVyLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJzaGFuMDEvQ2xvdWRmbGFyZS1XQVJQLUdOT01FLVN3aXRjaGVyIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtZ25vbWVAaGFyc2hhbjAxIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "1zq03ih8ahc5xkfcn7wdjs6dpmhswvdm55bds9wzchscs041sfrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xvdWRmbGFyZS13YXJwLXN3aXRjaGVyLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJzaGFuMDEvQ2xvdWRmbGFyZS1XQVJQLUdOT01FLVN3aXRjaGVyIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtZ25vbWVAaGFyc2hhbjAxIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1zq03ih8ahc5xkfcn7wdjs6dpmhswvdm55bds9wzchscs041sfrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xvdWRmbGFyZS13YXJwLXN3aXRjaGVyLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJzaGFuMDEvQ2xvdWRmbGFyZS1XQVJQLUdOT01FLVN3aXRjaGVyIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtZ25vbWVAaGFyc2hhbjAxIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "1zq03ih8ahc5xkfcn7wdjs6dpmhswvdm55bds9wzchscs041sfrg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVub2ZmaWNpYWwgQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIgZXh0ZW5zaW9uIGZvciBHTk9NRSBzaGVsbCIsCiAgIm5hbWUiOiAiQ2xvdWRmbGFyZSAxLjEuMS4xIFdBUlAgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2xvdWRmbGFyZS13YXJwLXN3aXRjaGVyLmdzY2hlbWEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9IYXJzaGFuMDEvQ2xvdWRmbGFyZS1XQVJQLUdOT01FLVN3aXRjaGVyIiwKICAidXVpZCI6ICJjbG91ZGZsYXJlLXdhcnAtZ25vbWVAaGFyc2hhbjAxIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "alt-tab-move-mouse@buzztaiki.github.com", "name": "Alt-Tab Move Mouse", "pname": "alt-tab-move-mouse", "description": "Move mouse pointer onto active window after Alt-Tab. This extension is workaround of some sloppy focus problems", "link": "https://extensions.gnome.org/extension/4673/alt-tab-move-mouse/", "shell_version_map": {"40": {"version": "2", "sha256": "0ncpa84dh632wix9cdfiaykzz3d2k3kz1wsbh7y5kwmsib2rjp1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgbW91c2UgcG9pbnRlciBvbnRvIGFjdGl2ZSB3aW5kb3cgYWZ0ZXIgQWx0LVRhYi4gVGhpcyBleHRlbnNpb24gaXMgd29ya2Fyb3VuZCBvZiBzb21lIHNsb3BweSBmb2N1cyBwcm9ibGVtcyIsCiAgIm5hbWUiOiAiQWx0LVRhYiBNb3ZlIE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnV6enRhaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLW1vdmUtbW91c2UiLAogICJ1dWlkIjogImFsdC10YWItbW92ZS1tb3VzZUBidXp6dGFpa2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "0ncpa84dh632wix9cdfiaykzz3d2k3kz1wsbh7y5kwmsib2rjp1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgbW91c2UgcG9pbnRlciBvbnRvIGFjdGl2ZSB3aW5kb3cgYWZ0ZXIgQWx0LVRhYi4gVGhpcyBleHRlbnNpb24gaXMgd29ya2Fyb3VuZCBvZiBzb21lIHNsb3BweSBmb2N1cyBwcm9ibGVtcyIsCiAgIm5hbWUiOiAiQWx0LVRhYiBNb3ZlIE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnV6enRhaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLW1vdmUtbW91c2UiLAogICJ1dWlkIjogImFsdC10YWItbW92ZS1tb3VzZUBidXp6dGFpa2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "0ncpa84dh632wix9cdfiaykzz3d2k3kz1wsbh7y5kwmsib2rjp1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgbW91c2UgcG9pbnRlciBvbnRvIGFjdGl2ZSB3aW5kb3cgYWZ0ZXIgQWx0LVRhYi4gVGhpcyBleHRlbnNpb24gaXMgd29ya2Fyb3VuZCBvZiBzb21lIHNsb3BweSBmb2N1cyBwcm9ibGVtcyIsCiAgIm5hbWUiOiAiQWx0LVRhYiBNb3ZlIE1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnV6enRhaWtpL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbHQtdGFiLW1vdmUtbW91c2UiLAogICJ1dWlkIjogImFsdC10YWItbW92ZS1tb3VzZUBidXp6dGFpa2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "Server@sven.kramer", "name": "Server", "pname": "server", "description": "A simple Indicator that shows my home-server status (online / offline) on the main panel. Furthermore a wake on lan can be triggered. For WOL functionality, its necessary that you have 'wakeonlan' installed. This extension is only tested with Gnome 40+. Didnt test it yet with older versions.", "link": "https://extensions.gnome.org/extension/4676/server/", "shell_version_map": {"38": {"version": "3", "sha256": "1dcy5kw5797wjjdg85hc16vh82c3xjs2xdn3m573rqs3fjayy507", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiBUaGlzIGV4dGVuc2lvbiBpcyBvbmx5IHRlc3RlZCB3aXRoIEdub21lIDQwKy4gRGlkbnQgdGVzdCBpdCB5ZXQgd2l0aCBvbGRlciB2ZXJzaW9ucy4iLAogICJuYW1lIjogIlNlcnZlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5TZXJ2ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJTZXJ2ZXJAc3Zlbi5rcmFtZXIiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1dcy5kw5797wjjdg85hc16vh82c3xjs2xdn3m573rqs3fjayy507", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiBUaGlzIGV4dGVuc2lvbiBpcyBvbmx5IHRlc3RlZCB3aXRoIEdub21lIDQwKy4gRGlkbnQgdGVzdCBpdCB5ZXQgd2l0aCBvbGRlciB2ZXJzaW9ucy4iLAogICJuYW1lIjogIlNlcnZlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5TZXJ2ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJTZXJ2ZXJAc3Zlbi5rcmFtZXIiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1dcy5kw5797wjjdg85hc16vh82c3xjs2xdn3m573rqs3fjayy507", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiBUaGlzIGV4dGVuc2lvbiBpcyBvbmx5IHRlc3RlZCB3aXRoIEdub21lIDQwKy4gRGlkbnQgdGVzdCBpdCB5ZXQgd2l0aCBvbGRlciB2ZXJzaW9ucy4iLAogICJuYW1lIjogIlNlcnZlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5TZXJ2ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJTZXJ2ZXJAc3Zlbi5rcmFtZXIiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "burn-my-windows@schneegans.github.com", "name": "Burn My Windows", "pname": "burn-my-windows", "description": "Disintegrate your windows with style.", "link": "https://extensions.gnome.org/extension/4679/burn-my-windows/", "shell_version_map": {"38": {"version": "23", "sha256": "1ysna2sabvnniz4x0rwk1bqfhmrxwh2dsfa0jwaqp56r2nd72w25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "40": {"version": "23", "sha256": "1ysna2sabvnniz4x0rwk1bqfhmrxwh2dsfa0jwaqp56r2nd72w25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "41": {"version": "23", "sha256": "1ysna2sabvnniz4x0rwk1bqfhmrxwh2dsfa0jwaqp56r2nd72w25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "42": {"version": "23", "sha256": "1ysna2sabvnniz4x0rwk1bqfhmrxwh2dsfa0jwaqp56r2nd72w25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}, "43": {"version": "23", "sha256": "1ysna2sabvnniz4x0rwk1bqfhmrxwh2dsfa0jwaqp56r2nd72w25", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} +, {"uuid": "burn-my-windows@schneegans.github.com", "name": "Burn My Windows", "pname": "burn-my-windows", "description": "Disintegrate your windows with style.", "link": "https://extensions.gnome.org/extension/4679/burn-my-windows/", "shell_version_map": {"38": {"version": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "40": {"version": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "42": {"version": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "43": {"version": "25", "sha256": "0wck691kf340w8ibmban8zx6xs02h39fdi2cvg8mwzzhbrrisdk3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2ludGVncmF0ZSB5b3VyIHdpbmRvd3Mgd2l0aCBzdHlsZS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJidXJuLW15LXdpbmRvd3MiLAogICJuYW1lIjogIkJ1cm4gTXkgV2luZG93cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5idXJuLW15LXdpbmRvd3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2NobmVlZ2Fucy9CdXJuLU15LVdpbmRvd3MiLAogICJ1dWlkIjogImJ1cm4tbXktd2luZG93c0BzY2huZWVnYW5zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} , {"uuid": "babar-lite@fthx", "name": "BaBar Lite", "pname": "babar-task-bar-lite-for-gnome-40", "description": "Task bar. App grid, favorites, workspaces and tasks in panel. Light extension.\n\n Replace 'Activities' button by all current workspaces and apps buttons. Switch workspace/app or toggle overview by clicking on these buttons. Drag and drop favorite, task, dash item or app grid item to any workspace (you cannot reorder tasks inside a workspace). Change 'Places' label to an icon. No settings, use BaBar classic for that.\n\n You can use names for workspaces: there are two ways for that. 1) Edit the string array 'org.gnome.desktop.wm.preferences.workspace-names' gsettings key (through dconf editor, e.g.). 2) Use official GNOME extension Workspaces Indicator's settings. You don't have to write a long enough list: numbers are displayed if no workspace name is defined.", "link": "https://extensions.gnome.org/extension/4681/babar-task-bar-lite-for-gnome-40/", "shell_version_map": {"40": {"version": "2", "sha256": "01m48bwpn1as90ahpnl9ari3s2bj8423032nw12ac45wwcnb9yvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gTm8gc2V0dGluZ3MsIHVzZSBCYUJhciBjbGFzc2ljIGZvciB0aGF0LlxuXG4gWW91IGNhbiB1c2UgbmFtZXMgZm9yIHdvcmtzcGFjZXM6IHRoZXJlIGFyZSB0d28gd2F5cyBmb3IgdGhhdC4gMSkgRWRpdCB0aGUgc3RyaW5nIGFycmF5ICdvcmcuZ25vbWUuZGVza3RvcC53bS5wcmVmZXJlbmNlcy53b3Jrc3BhY2UtbmFtZXMnIGdzZXR0aW5ncyBrZXkgKHRocm91Z2ggZGNvbmYgZWRpdG9yLCBlLmcuKS4gMikgVXNlIG9mZmljaWFsIEdOT01FIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEluZGljYXRvcidzIHNldHRpbmdzLiBZb3UgZG9uJ3QgaGF2ZSB0byB3cml0ZSBhIGxvbmcgZW5vdWdoIGxpc3Q6IG51bWJlcnMgYXJlIGRpc3BsYXllZCBpZiBubyB3b3Jrc3BhY2UgbmFtZSBpcyBkZWZpbmVkLiIsCiAgIm5hbWUiOiAiQmFCYXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXItbGl0ZSIsCiAgInV1aWQiOiAiYmFiYXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "01m48bwpn1as90ahpnl9ari3s2bj8423032nw12ac45wwcnb9yvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gTm8gc2V0dGluZ3MsIHVzZSBCYUJhciBjbGFzc2ljIGZvciB0aGF0LlxuXG4gWW91IGNhbiB1c2UgbmFtZXMgZm9yIHdvcmtzcGFjZXM6IHRoZXJlIGFyZSB0d28gd2F5cyBmb3IgdGhhdC4gMSkgRWRpdCB0aGUgc3RyaW5nIGFycmF5ICdvcmcuZ25vbWUuZGVza3RvcC53bS5wcmVmZXJlbmNlcy53b3Jrc3BhY2UtbmFtZXMnIGdzZXR0aW5ncyBrZXkgKHRocm91Z2ggZGNvbmYgZWRpdG9yLCBlLmcuKS4gMikgVXNlIG9mZmljaWFsIEdOT01FIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEluZGljYXRvcidzIHNldHRpbmdzLiBZb3UgZG9uJ3QgaGF2ZSB0byB3cml0ZSBhIGxvbmcgZW5vdWdoIGxpc3Q6IG51bWJlcnMgYXJlIGRpc3BsYXllZCBpZiBubyB3b3Jrc3BhY2UgbmFtZSBpcyBkZWZpbmVkLiIsCiAgIm5hbWUiOiAiQmFCYXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXItbGl0ZSIsCiAgInV1aWQiOiAiYmFiYXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "01m48bwpn1as90ahpnl9ari3s2bj8423032nw12ac45wwcnb9yvj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBBcHAgZ3JpZCwgZmF2b3JpdGVzLCB3b3Jrc3BhY2VzIGFuZCB0YXNrcyBpbiBwYW5lbC4gTGlnaHQgZXh0ZW5zaW9uLlxuXG4gUmVwbGFjZSAnQWN0aXZpdGllcycgYnV0dG9uIGJ5IGFsbCBjdXJyZW50IHdvcmtzcGFjZXMgYW5kIGFwcHMgYnV0dG9ucy4gU3dpdGNoIHdvcmtzcGFjZS9hcHAgb3IgdG9nZ2xlIG92ZXJ2aWV3IGJ5IGNsaWNraW5nIG9uIHRoZXNlIGJ1dHRvbnMuIERyYWcgYW5kIGRyb3AgZmF2b3JpdGUsIHRhc2ssIGRhc2ggaXRlbSBvciBhcHAgZ3JpZCBpdGVtIHRvIGFueSB3b3Jrc3BhY2UgKHlvdSBjYW5ub3QgcmVvcmRlciB0YXNrcyBpbnNpZGUgYSB3b3Jrc3BhY2UpLiBDaGFuZ2UgJ1BsYWNlcycgbGFiZWwgdG8gYW4gaWNvbi4gTm8gc2V0dGluZ3MsIHVzZSBCYUJhciBjbGFzc2ljIGZvciB0aGF0LlxuXG4gWW91IGNhbiB1c2UgbmFtZXMgZm9yIHdvcmtzcGFjZXM6IHRoZXJlIGFyZSB0d28gd2F5cyBmb3IgdGhhdC4gMSkgRWRpdCB0aGUgc3RyaW5nIGFycmF5ICdvcmcuZ25vbWUuZGVza3RvcC53bS5wcmVmZXJlbmNlcy53b3Jrc3BhY2UtbmFtZXMnIGdzZXR0aW5ncyBrZXkgKHRocm91Z2ggZGNvbmYgZWRpdG9yLCBlLmcuKS4gMikgVXNlIG9mZmljaWFsIEdOT01FIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEluZGljYXRvcidzIHNldHRpbmdzLiBZb3UgZG9uJ3QgaGF2ZSB0byB3cml0ZSBhIGxvbmcgZW5vdWdoIGxpc3Q6IG51bWJlcnMgYXJlIGRpc3BsYXllZCBpZiBubyB3b3Jrc3BhY2UgbmFtZSBpcyBkZWZpbmVkLiIsCiAgIm5hbWUiOiAiQmFCYXIgTGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvYmFiYXItbGl0ZSIsCiAgInV1aWQiOiAiYmFiYXItbGl0ZUBmdGh4IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "useless-gaps@pimsnel.com", "name": "Useless Gaps", "pname": "useless-gaps", "description": "For aesthetic purposes adds useless gaps around tiled and maximized windows", "link": "https://extensions.gnome.org/extension/4684/useless-gaps/", "shell_version_map": {"38": {"version": "9", "sha256": "00h9p7vhv23r8jb00pwkw5vfjdz21p1hdfhn288jld6kdj4w00zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "9", "sha256": "00h9p7vhv23r8jb00pwkw5vfjdz21p1hdfhn288jld6kdj4w00zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "00h9p7vhv23r8jb00pwkw5vfjdz21p1hdfhn288jld6kdj4w00zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "00h9p7vhv23r8jb00pwkw5vfjdz21p1hdfhn288jld6kdj4w00zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "00h9p7vhv23r8jb00pwkw5vfjdz21p1hdfhn288jld6kdj4w00zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}}} +, {"uuid": "useless-gaps@pimsnel.com", "name": "Useless Gaps", "pname": "useless-gaps", "description": "For aesthetic purposes adds useless gaps around tiled and maximized windows", "link": "https://extensions.gnome.org/extension/4684/useless-gaps/", "shell_version_map": {"38": {"version": "9", "sha256": "00h9p7vhv23r8jb00pwkw5vfjdz21p1hdfhn288jld6kdj4w00zd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "0b5gblslp47qiazgg56rxzcsk8si5bycnimlxbykqa64i27kriaj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93cyIsCiAgImdldHRleHQtZG9tYWluIjogInVzZWxlc3MtZ2FwcyIsCiAgIm5hbWUiOiAiVXNlbGVzcyBHYXBzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZWxlc3MtZ2FwcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy11c2VsZXNzLWdhcHMiLAogICJ1dWlkIjogInVzZWxlc3MtZ2Fwc0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "serverstatus@footeware.ca", "name": "Server Status Indicator", "pname": "server-status-indicator", "description": "Indicator displaying status of entered web server urls, green for up, red for down.", "link": "https://extensions.gnome.org/extension/4687/server-status-indicator/", "shell_version_map": {"40": {"version": "8", "sha256": "1mm2b6fwx58yvcq8fkxrkcb5bcm4ak8al5jw0939mwr8fjhgd13s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1mm2b6fwx58yvcq8fkxrkcb5bcm4ak8al5jw0939mwr8fjhgd13s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NyYWlnRm9vdGUvY2EuZm9vdGV3YXJlLmdub21lc2hlbGwuc2VydmVyc3RhdHVzLmdpdCIsCiAgInV1aWQiOiAic2VydmVyc3RhdHVzQGZvb3Rld2FyZS5jYSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "9", "sha256": "19afjjkkga6ky7ixc03ga7fyg49jkqld01v05pq5jrbf1bhzgvcf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRvciBkaXNwbGF5aW5nIHN0YXR1cyBvZiBlbnRlcmVkIHdlYiBzZXJ2ZXIgdXJscywgZ3JlZW4gZm9yIHVwLCByZWQgZm9yIGRvd24uIiwKICAibmFtZSI6ICJTZXJ2ZXIgU3RhdHVzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zZXJ2ZXJzdGF0dXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIiwKICAgICI0My4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ3JhaWdGb290ZS9jYS5mb290ZXdhcmUuZ25vbWVzaGVsbC5zZXJ2ZXJzdGF0dXMuZ2l0IiwKICAidXVpZCI6ICJzZXJ2ZXJzdGF0dXNAZm9vdGV3YXJlLmNhIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "focus-follows-workspace@christopher.luebbemeier.gmail.com", "name": "Focus Follows Workspace", "pname": "focus-follows-workspace", "description": "Focus the primary monitor after switching workspaces via keyboard", "link": "https://extensions.gnome.org/extension/4688/focus-follows-workspace/", "shell_version_map": {"41": {"version": "3", "sha256": "0hvfl7ip07cvnbgk1yc10x11yc80x7mqwxgrayfl1n7qw6j0b4lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NocmlzdG9waGVyLWwvZm9jdXMtZm9sbG93cy13b3Jrc3BhY2UiLAogICJ1dWlkIjogImZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlQGNocmlzdG9waGVyLmx1ZWJiZW1laWVyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0hvfl7ip07cvnbgk1yc10x11yc80x7mqwxgrayfl1n7qw6j0b4lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NocmlzdG9waGVyLWwvZm9jdXMtZm9sbG93cy13b3Jrc3BhY2UiLAogICJ1dWlkIjogImZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlQGNocmlzdG9waGVyLmx1ZWJiZW1laWVyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0hvfl7ip07cvnbgk1yc10x11yc80x7mqwxgrayfl1n7qw6j0b4lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NocmlzdG9waGVyLWwvZm9jdXMtZm9sbG93cy13b3Jrc3BhY2UiLAogICJ1dWlkIjogImZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlQGNocmlzdG9waGVyLmx1ZWJiZW1laWVyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "pip-on-top@rafostar.github.com", "name": "PiP on top", "pname": "pip-on-top", "description": "Makes \"Picture-in-Picture\" windows stay on top (even on Wayland session). Compatible with Firefox and Clapper media player.", "link": "https://extensions.gnome.org/extension/4691/pip-on-top/", "shell_version_map": {"38": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "5", "sha256": "1z0alar9zlxd13klapnfggpsiws77pjfjhb1p3fymak4h492k3ra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "1z0alar9zlxd13klapnfggpsiws77pjfjhb1p3fymak4h492k3ra", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1JhZm9zdGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1waXAtb24tdG9wIiwKICAidXVpZCI6ICJwaXAtb24tdG9wQHJhZm9zdGFyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "roundedSystemMenuButtons@pratap.fastmail.fm", "name": "Rounded System Menu Buttons", "pname": "rounded-system-menu-buttons", "description": "Rounded System Menu Buttons", "link": "https://extensions.gnome.org/extension/4693/rounded-system-menu-buttons/", "shell_version_map": {"38": {"version": "17", "sha256": "1cwjyw4sc4i4vdm458qdnjzvmiqyz9vscicwarsd9cvik57p44f5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1BSQVRBUC1LVU1BUi9yb3VuZGVkLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJ1dWlkIjogInJvdW5kZWRTeXN0ZW1NZW51QnV0dG9uc0BwcmF0YXAuZmFzdG1haWwuZm0iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "40": {"version": "20", "sha256": "044a1vp619lvxrnxiv4af2z4m9x18aqhp97g22wh4y3h8ns5ds8h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvcm91bmRlZC1zeXN0ZW0tbWVudS1idXR0b25zIiwKICAidXVpZCI6ICJyb3VuZGVkU3lzdGVtTWVudUJ1dHRvbnNAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "044a1vp619lvxrnxiv4af2z4m9x18aqhp97g22wh4y3h8ns5ds8h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvcm91bmRlZC1zeXN0ZW0tbWVudS1idXR0b25zIiwKICAidXVpZCI6ICJyb3VuZGVkU3lzdGVtTWVudUJ1dHRvbnNAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIwCn0="}, "42": {"version": "20", "sha256": "044a1vp619lvxrnxiv4af2z4m9x18aqhp97g22wh4y3h8ns5ds8h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvcm91bmRlZC1zeXN0ZW0tbWVudS1idXR0b25zIiwKICAidXVpZCI6ICJyb3VuZGVkU3lzdGVtTWVudUJ1dHRvbnNAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDIwCn0="}}} , {"uuid": "static-background@denizaksimsek.com", "name": "Static background in overview", "pname": "static-background-in-overview", "description": "The background, always clearly visible.", "link": "https://extensions.gnome.org/extension/4696/static-background-in-overview/", "shell_version_map": {"40": {"version": "3", "sha256": "06ndnyv988v6m2rns8rf56axygh2hj00l5103fqkrgq122cvxw02", "metadata": "ewogICAgIm5hbWUiIDogIlN0YXRpYyBiYWNrZ3JvdW5kIGluIG92ZXJ2aWV3IiwKICAgICJkZXNjcmlwdGlvbiIgOiAiVGhlIGJhY2tncm91bmQsIGFsd2F5cyBjbGVhcmx5IHZpc2libGUuIiwKICAgICJvcmlnaW5hbC1hdXRob3IiOiAicmVucy5hbHRodWlzQGdtYWlsLmNvbSIsCiAgICAic2hlbGwtdmVyc2lvbiIgOiBbCiAgICAgICAgIjQwIiwKICAgICAgICAiNDEiLAogICAgICAgICI0MiIKICAgIF0sCiAgICAidXJsIiA6ICJodHRwczovL2dpdGh1Yi5jb20vZHo0ay9nbm9tZS1zdGF0aWMtYmFja2dyb3VuZCIsCiAgICAidXVpZCIgOiAic3RhdGljLWJhY2tncm91bmRAZGVuaXpha3NpbXNlay5jb20iLAogICAgInZlcnNpb24iIDogMwp9Cg=="}, "41": {"version": "3", "sha256": "06ndnyv988v6m2rns8rf56axygh2hj00l5103fqkrgq122cvxw02", "metadata": "ewogICAgIm5hbWUiIDogIlN0YXRpYyBiYWNrZ3JvdW5kIGluIG92ZXJ2aWV3IiwKICAgICJkZXNjcmlwdGlvbiIgOiAiVGhlIGJhY2tncm91bmQsIGFsd2F5cyBjbGVhcmx5IHZpc2libGUuIiwKICAgICJvcmlnaW5hbC1hdXRob3IiOiAicmVucy5hbHRodWlzQGdtYWlsLmNvbSIsCiAgICAic2hlbGwtdmVyc2lvbiIgOiBbCiAgICAgICAgIjQwIiwKICAgICAgICAiNDEiLAogICAgICAgICI0MiIKICAgIF0sCiAgICAidXJsIiA6ICJodHRwczovL2dpdGh1Yi5jb20vZHo0ay9nbm9tZS1zdGF0aWMtYmFja2dyb3VuZCIsCiAgICAidXVpZCIgOiAic3RhdGljLWJhY2tncm91bmRAZGVuaXpha3NpbXNlay5jb20iLAogICAgInZlcnNpb24iIDogMwp9Cg=="}, "42": {"version": "3", "sha256": "06ndnyv988v6m2rns8rf56axygh2hj00l5103fqkrgq122cvxw02", "metadata": "ewogICAgIm5hbWUiIDogIlN0YXRpYyBiYWNrZ3JvdW5kIGluIG92ZXJ2aWV3IiwKICAgICJkZXNjcmlwdGlvbiIgOiAiVGhlIGJhY2tncm91bmQsIGFsd2F5cyBjbGVhcmx5IHZpc2libGUuIiwKICAgICJvcmlnaW5hbC1hdXRob3IiOiAicmVucy5hbHRodWlzQGdtYWlsLmNvbSIsCiAgICAic2hlbGwtdmVyc2lvbiIgOiBbCiAgICAgICAgIjQwIiwKICAgICAgICAiNDEiLAogICAgICAgICI0MiIKICAgIF0sCiAgICAidXJsIiA6ICJodHRwczovL2dpdGh1Yi5jb20vZHo0ay9nbm9tZS1zdGF0aWMtYmFja2dyb3VuZCIsCiAgICAidXVpZCIgOiAic3RhdGljLWJhY2tncm91bmRAZGVuaXpha3NpbXNlay5jb20iLAogICAgInZlcnNpb24iIDogMwp9Cg=="}}} -, {"uuid": "highlight-focus@pimsnel.com", "name": "Highlight Focus", "pname": "highlight-focus", "description": "Highlights the focussed window with a temporary border", "link": "https://extensions.gnome.org/extension/4699/highlight-focus/", "shell_version_map": {"38": {"version": "3", "sha256": "0rrcx03vljp9xzcsr3qa6wp2swhgcchx61lzr1fdq5y5g62g42iz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "0rrcx03vljp9xzcsr3qa6wp2swhgcchx61lzr1fdq5y5g62g42iz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0rrcx03vljp9xzcsr3qa6wp2swhgcchx61lzr1fdq5y5g62g42iz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0rrcx03vljp9xzcsr3qa6wp2swhgcchx61lzr1fdq5y5g62g42iz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "0rrcx03vljp9xzcsr3qa6wp2swhgcchx61lzr1fdq5y5g62g42iz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "highlight-focus@pimsnel.com", "name": "Highlight Focus", "pname": "highlight-focus", "description": "Highlights the focussed window with a temporary border", "link": "https://extensions.gnome.org/extension/4699/highlight-focus/", "shell_version_map": {"38": {"version": "3", "sha256": "0rrcx03vljp9xzcsr3qa6wp2swhgcchx61lzr1fdq5y5g62g42iz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "7", "sha256": "0lw1qghggvvnxnkj41grc59v24bh73phj5rwi37lh973cs29yif1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0lw1qghggvvnxnkj41grc59v24bh73phj5rwi37lh973cs29yif1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "0lw1qghggvvnxnkj41grc59v24bh73phj5rwi37lh973cs29yif1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "0lw1qghggvvnxnkj41grc59v24bh73phj5rwi37lh973cs29yif1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgImdldHRleHQtZG9tYWluIjogImhpZ2hsaWdoLWZvY3VzIiwKICAibmFtZSI6ICJIaWdobGlnaHQgRm9jdXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlnaGxpZ2h0LWZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pcG1pcC9nbm9tZS1zaGVsbC1leHRlbnNpb25zLWhpZ2hsaWdodC1mb2N1cyIsCiAgInV1aWQiOiAiaGlnaGxpZ2h0LWZvY3VzQHBpbXNuZWwuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "awesome-tiles@velitasali.com", "name": "Awesome Tiles", "pname": "awesome-tiles", "description": "Tile windows using keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4702/awesome-tiles/", "shell_version_map": {"40": {"version": "8", "sha256": "16xvdmlm7fgy81igyrxd29mfxih10f35vmiqcna8kvsnzxs77cp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "16xvdmlm7fgy81igyrxd29mfxih10f35vmiqcna8kvsnzxs77cp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "16xvdmlm7fgy81igyrxd29mfxih10f35vmiqcna8kvsnzxs77cp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "16xvdmlm7fgy81igyrxd29mfxih10f35vmiqcna8kvsnzxs77cp9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdmVsaXRhc2FsaS9nbm9tZS1hd2Vzb21lLXRpbGVzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYXdlc29tZS10aWxlc0B2ZWxpdGFzYWxpLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "dock-from-dash@fthx", "name": "Dock from Dash", "pname": "dock-from-dash", "description": "Dock for GNOME Shell 40+. Does use native GNOME Shell Dash. Very light extension.\n\n Hover the bottom of your screen and GNOME Shell dash will appear without overview and will hide when you leave the dash. Native GNOME Shell click behavior is modified: intelligent minimize if one window is open, cycle if several windows are open. Scroll on the dock to change workspace. Some preferences in UI (thanks @rastersoft).\n\n I'm not notified of messages here, please report bugs only through GitHub.", "link": "https://extensions.gnome.org/extension/4703/dock-from-dash/", "shell_version_map": {"40": {"version": "62", "sha256": "1s5ml7hg04650l43yl4zm3nbqlfzcbkp58xik4f39v0s91scia2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogaW50ZWxsaWdlbnQgbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBjeWNsZSBpZiBzZXZlcmFsIHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "41": {"version": "62", "sha256": "1s5ml7hg04650l43yl4zm3nbqlfzcbkp58xik4f39v0s91scia2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogaW50ZWxsaWdlbnQgbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBjeWNsZSBpZiBzZXZlcmFsIHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "42": {"version": "62", "sha256": "1s5ml7hg04650l43yl4zm3nbqlfzcbkp58xik4f39v0s91scia2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogaW50ZWxsaWdlbnQgbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBjeWNsZSBpZiBzZXZlcmFsIHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNjIKfQ=="}, "43": {"version": "62", "sha256": "1s5ml7hg04650l43yl4zm3nbqlfzcbkp58xik4f39v0s91scia2x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogaW50ZWxsaWdlbnQgbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBjeWNsZSBpZiBzZXZlcmFsIHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvZG9jay1mcm9tLWRhc2giLAogICJ1dWlkIjogImRvY2stZnJvbS1kYXNoQGZ0aHgiLAogICJ2ZXJzaW9uIjogNjIKfQ=="}}} , {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": "Close open windows gracefully and save them as a session. And you can restore them when necessary manually or automatically at startup. Most importantly, it supports both X11 and Wayland!\n\nMain features:\n- Close open windows gracefully\n- Close apps with multiple windows gracefully via `ydotool` so you don't lose sessions of this app. Please see https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager#how-to-restore-a-session-at-startup to learn how to make `Close by rules` work\n- Save open windows\n- Restore session(s)\n- Restore a session at startup. Please note that this feature is disabled by default. See https://github.com/nlpsuge/gnome-shell-extension-another-window-session-manager#how-to-restore-a-session-at-startup to learn how to enable and use it\n- Restore window state, including Always on Top, Always on Visible Workspace and maximization\n- Restore window workspace, size and position\n- Restore 2 column window tiling\n- Stash all supported window states so that those states will be restored after gnome shell restarts via `Alt+F2 then type r` or `killall -3 gnome-shell`.\n- Move windows to their own workspace according to a saved session\n- Support multi-monitor\n- Remove saved session to trash\n- Search saved session by the session name fuzzily", "link": "https://extensions.gnome.org/extension/4709/another-window-session-manager/", "shell_version_map": {"40": {"version": "31", "sha256": "0sa8km3jchfizyf4w5gybxbc9l33bz4wyamywhbw6c5ifvbb7nny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "41": {"version": "31", "sha256": "0sa8km3jchfizyf4w5gybxbc9l33bz4wyamywhbw6c5ifvbb7nny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "42": {"version": "31", "sha256": "0sa8km3jchfizyf4w5gybxbc9l33bz4wyamywhbw6c5ifvbb7nny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "43": {"version": "31", "sha256": "0sa8km3jchfizyf4w5gybxbc9l33bz4wyamywhbw6c5ifvbb7nny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIG9wZW4gd2luZG93cyBncmFjZWZ1bGx5IGFuZCBzYXZlIHRoZW0gYXMgYSBzZXNzaW9uLiBBbmQgeW91IGNhbiByZXN0b3JlIHRoZW0gd2hlbiBuZWNlc3NhcnkgbWFudWFsbHkgb3IgYXV0b21hdGljYWxseSBhdCBzdGFydHVwLiBNb3N0IGltcG9ydGFudGx5LCBpdCBzdXBwb3J0cyBib3RoIFgxMSBhbmQgV2F5bGFuZCFcblxuTWFpbiBmZWF0dXJlczpcbi0gQ2xvc2Ugb3BlbiB3aW5kb3dzIGdyYWNlZnVsbHlcbi0gQ2xvc2UgYXBwcyB3aXRoIG11bHRpcGxlIHdpbmRvd3MgZ3JhY2VmdWxseSB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBSZXN0b3JlIDIgY29sdW1uIHdpbmRvdyB0aWxpbmdcbi0gU3Rhc2ggYWxsIHN1cHBvcnRlZCB3aW5kb3cgc3RhdGVzIHNvIHRoYXQgdGhvc2Ugc3RhdGVzIHdpbGwgYmUgcmVzdG9yZWQgYWZ0ZXIgZ25vbWUgc2hlbGwgcmVzdGFydHMgdmlhIGBBbHQrRjIgdGhlbiB0eXBlIHJgIG9yIGBraWxsYWxsIC0zIGdub21lLXNoZWxsYC5cbi0gTW92ZSB3aW5kb3dzIHRvIHRoZWlyIG93biB3b3Jrc3BhY2UgYWNjb3JkaW5nIHRvIGEgc2F2ZWQgc2Vzc2lvblxuLSBTdXBwb3J0IG11bHRpLW1vbml0b3Jcbi0gUmVtb3ZlIHNhdmVkIHNlc3Npb24gdG8gdHJhc2hcbi0gU2VhcmNoIHNhdmVkIHNlc3Npb24gYnkgdGhlIHNlc3Npb24gbmFtZSBmdXp6aWx5IiwKICAibmFtZSI6ICJBbm90aGVyIFdpbmRvdyBTZXNzaW9uIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}}} @@ -674,13 +675,13 @@ , {"uuid": "ssh-tray@mario.cardia.com.br", "name": "SSH Tray", "pname": "ssh-tray", "description": "Simple SSH extension to allow you to connect to your hosts at ~/.ssh/config and ~/ssh/know_hosts file from Gnome top bar.", "link": "https://extensions.gnome.org/extension/4779/ssh-tray/", "shell_version_map": {"41": {"version": "1", "sha256": "1c7ndcv3bnsc95sijdkq39fshybpaq9fqdk3gvwm1lx40r1ibgih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBTU0ggZXh0ZW5zaW9uIHRvIGFsbG93IHlvdSB0byBjb25uZWN0IHRvIHlvdXIgaG9zdHMgYXQgfi8uc3NoL2NvbmZpZyBhbmQgfi9zc2gva25vd19ob3N0cyBmaWxlIGZyb20gR25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIlNTSCBUcmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzc2gtdHJheUBtYXJpby5jYXJkaWEuY29tLmJyIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "glasa@lyrahgames.github.io", "name": "Glasa", "pname": "glasa", "description": "This extension puts an icon in the panel consisting of two comic-like eyes following the cursor.", "link": "https://extensions.gnome.org/extension/4780/glasa/", "shell_version_map": {"38": {"version": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "7", "sha256": "1nkv8bjsjdp4scklmpn7f74fhnyqd65dvhlplzn54qad74afdjdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1nkv8bjsjdp4scklmpn7f74fhnyqd65dvhlplzn54qad74afdjdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "10", "sha256": "1c41wpif8vndhqs11bjjdhpmg7ma0ifwg9nblj85s0wbin369yvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgImdldHRleHQtZG9tYWluIjogImdsYXNhIiwKICAibmFtZSI6ICJHbGFzYSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbGFzYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlyYWhnYW1lcy9nbm9tZS1leHRlbnNpb24tZ2xhc2EiLAogICJ1dWlkIjogImdsYXNhQGx5cmFoZ2FtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEwCn0="}, "43": {"version": "10", "sha256": "1c41wpif8vndhqs11bjjdhpmg7ma0ifwg9nblj85s0wbin369yvv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgImdldHRleHQtZG9tYWluIjogImdsYXNhIiwKICAibmFtZSI6ICJHbGFzYSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbGFzYSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlyYWhnYW1lcy9nbm9tZS1leHRlbnNpb24tZ2xhc2EiLAogICJ1dWlkIjogImdsYXNhQGx5cmFoZ2FtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "avatar@pawel.swiszcz.com", "name": "Avatar", "pname": "avatar", "description": "Add Avatar, MPRIS and Top image into the panel. Options to change: \n * Avatar (horizontal/vertical, shades, visibility of username and hostname) \n * Primary buttons \n * MPRIS \n * Top image (can be Your own image from system) ", "link": "https://extensions.gnome.org/extension/4782/avatar/", "shell_version_map": {"41": {"version": "22", "sha256": "0flak21wzrwyc4q32shpg7pxfbbbas634yy5lkq4jjfqpgka3f33", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBBdmF0YXIsIE1QUklTIGFuZCBUb3AgaW1hZ2UgaW50byB0aGUgcGFuZWwuIE9wdGlvbnMgdG8gY2hhbmdlOiBcbiAqIEF2YXRhciAoaG9yaXpvbnRhbC92ZXJ0aWNhbCwgc2hhZGVzLCB2aXNpYmlsaXR5IG9mIHVzZXJuYW1lIGFuZCBob3N0bmFtZSkgXG4gKiBQcmltYXJ5IGJ1dHRvbnMgXG4gKiBNUFJJUyBcbiAqIFRvcCBpbWFnZSAoY2FuIGJlIFlvdXIgb3duIGltYWdlIGZyb20gc3lzdGVtKSAiLAogICJuYW1lIjogIkF2YXRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Bhd2Vsc3dpc3pjei9BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhdmF0YXJAcGF3ZWwuc3dpc3pjei5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "0flak21wzrwyc4q32shpg7pxfbbbas634yy5lkq4jjfqpgka3f33", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBBdmF0YXIsIE1QUklTIGFuZCBUb3AgaW1hZ2UgaW50byB0aGUgcGFuZWwuIE9wdGlvbnMgdG8gY2hhbmdlOiBcbiAqIEF2YXRhciAoaG9yaXpvbnRhbC92ZXJ0aWNhbCwgc2hhZGVzLCB2aXNpYmlsaXR5IG9mIHVzZXJuYW1lIGFuZCBob3N0bmFtZSkgXG4gKiBQcmltYXJ5IGJ1dHRvbnMgXG4gKiBNUFJJUyBcbiAqIFRvcCBpbWFnZSAoY2FuIGJlIFlvdXIgb3duIGltYWdlIGZyb20gc3lzdGVtKSAiLAogICJuYW1lIjogIkF2YXRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Bhd2Vsc3dpc3pjei9BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhdmF0YXJAcGF3ZWwuc3dpc3pjei5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "22", "sha256": "0flak21wzrwyc4q32shpg7pxfbbbas634yy5lkq4jjfqpgka3f33", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBBdmF0YXIsIE1QUklTIGFuZCBUb3AgaW1hZ2UgaW50byB0aGUgcGFuZWwuIE9wdGlvbnMgdG8gY2hhbmdlOiBcbiAqIEF2YXRhciAoaG9yaXpvbnRhbC92ZXJ0aWNhbCwgc2hhZGVzLCB2aXNpYmlsaXR5IG9mIHVzZXJuYW1lIGFuZCBob3N0bmFtZSkgXG4gKiBQcmltYXJ5IGJ1dHRvbnMgXG4gKiBNUFJJUyBcbiAqIFRvcCBpbWFnZSAoY2FuIGJlIFlvdXIgb3duIGltYWdlIGZyb20gc3lzdGVtKSAiLAogICJuYW1lIjogIkF2YXRhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Bhd2Vsc3dpc3pjei9BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhdmF0YXJAcGF3ZWwuc3dpc3pjei5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} -, {"uuid": "default-workspace@mateusrodcosta.com", "name": "Default Workspace", "pname": "default-workspace", "description": "Switches to the specified workspace on login.\nUseful for fixed number of workspace setups where the first workspace isn't the main one.", "link": "https://extensions.gnome.org/extension/4783/default-workspace/", "shell_version_map": {"40": {"version": "2", "sha256": "05s1bzh917vv3j7xfx2gljwfzxkb9lsvp8zgcgch75hfvywvpgb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "05s1bzh917vv3j7xfx2gljwfzxkb9lsvp8zgcgch75hfvywvpgb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "default-workspace@mateusrodcosta.com", "name": "Default Workspace", "pname": "default-workspace", "description": "Switches to the specified workspace on login.\nUseful for fixed number of workspace setups where the first workspace isn't the main one.", "link": "https://extensions.gnome.org/extension/4783/default-workspace/", "shell_version_map": {"40": {"version": "3", "sha256": "0717gyz1cwgl859jg9ij0902jy53cik6rx58hglv3828lvfg7qyv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdGV1c1JvZENvc3RhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWZhdWx0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZGVmYXVsdC13b3Jrc3BhY2VAbWF0ZXVzcm9kY29zdGEuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0717gyz1cwgl859jg9ij0902jy53cik6rx58hglv3828lvfg7qyv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdGV1c1JvZENvc3RhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWZhdWx0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZGVmYXVsdC13b3Jrc3BhY2VAbWF0ZXVzcm9kY29zdGEuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0717gyz1cwgl859jg9ij0902jy53cik6rx58hglv3828lvfg7qyv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdGV1c1JvZENvc3RhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWZhdWx0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZGVmYXVsdC13b3Jrc3BhY2VAbWF0ZXVzcm9kY29zdGEuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "0717gyz1cwgl859jg9ij0902jy53cik6rx58hglv3828lvfg7qyv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01hdGV1c1JvZENvc3RhL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZWZhdWx0LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiZGVmYXVsdC13b3Jrc3BhY2VAbWF0ZXVzcm9kY29zdGEuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "alt-mouse@eexpss.gmail.com", "name": "Alt Mouse", "pname": "alt-mouse", "description": "* Alt + Mouse control window\nDetailed instructions are on the home page and in config interface. \nDisable desktop BackgroundMenu, Disable Panel dragMode. \nAdd a gap at right screen edge. \nAdd Top-Left and Top-Right corner as hot coner.", "link": "https://extensions.gnome.org/extension/4786/alt-mouse/", "shell_version_map": {"40": {"version": "12", "sha256": "1kcsbvvm6wigw0h2d23rx4vsqdawa7m5gfynjdc9xzxn3q8sxx0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQWx0ICsgTW91c2UgY29udHJvbCB3aW5kb3dcbkRldGFpbGVkIGluc3RydWN0aW9ucyBhcmUgb24gdGhlIGhvbWUgcGFnZSBhbmQgaW4gY29uZmlnIGludGVyZmFjZS4gXG5EaXNhYmxlIGRlc2t0b3AgQmFja2dyb3VuZE1lbnUsIERpc2FibGUgUGFuZWwgZHJhZ01vZGUuIFxuQWRkIGEgZ2FwIGF0IHJpZ2h0IHNjcmVlbiBlZGdlLiBcbkFkZCBUb3AtTGVmdCBhbmQgVG9wLVJpZ2h0IGNvcm5lciBhcyBob3QgY29uZXIuIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "1kcsbvvm6wigw0h2d23rx4vsqdawa7m5gfynjdc9xzxn3q8sxx0b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQWx0ICsgTW91c2UgY29udHJvbCB3aW5kb3dcbkRldGFpbGVkIGluc3RydWN0aW9ucyBhcmUgb24gdGhlIGhvbWUgcGFnZSBhbmQgaW4gY29uZmlnIGludGVyZmFjZS4gXG5EaXNhYmxlIGRlc2t0b3AgQmFja2dyb3VuZE1lbnUsIERpc2FibGUgUGFuZWwgZHJhZ01vZGUuIFxuQWRkIGEgZ2FwIGF0IHJpZ2h0IHNjcmVlbiBlZGdlLiBcbkFkZCBUb3AtTGVmdCBhbmQgVG9wLVJpZ2h0IGNvcm5lciBhcyBob3QgY29uZXIuIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1hbHQtbW91c2UiLAogICJ1dWlkIjogImFsdC1tb3VzZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "24", "sha256": "1j20kzq4va9s0jpvcm2y91wjk0c772mx4xk1rmr49hy1rb2crdpc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQWx0ICsgTW91c2UgY29udHJvbCB3aW5kb3dcbkRldGFpbGVkIGluc3RydWN0aW9ucyBhcmUgb24gdGhlIGhvbWUgcGFnZSBhbmQgaW4gY29uZmlnIGludGVyZmFjZS4gXG5EaXNhYmxlIGRlc2t0b3AgQmFja2dyb3VuZE1lbnUsIERpc2FibGUgUGFuZWwgZHJhZ01vZGUuIFxuQWRkIGEgZ2FwIGF0IHJpZ2h0IHNjcmVlbiBlZGdlLiBcbkFkZCBUb3AtTGVmdCBhbmQgVG9wLVJpZ2h0IGNvcm5lciBhcyBob3QgY29uZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx0LW1vdXNlIiwKICAibmFtZSI6ICJBbHQgTW91c2UiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWx0LW1vdXNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLWFsdC1tb3VzZSIsCiAgInV1aWQiOiAiYWx0LW1vdXNlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}}} , {"uuid": "workspace-switcher-manager@G-dH.github.com", "name": "Workspace Switcher Manager", "pname": "workspace-switcher-manager", "description": "Make the workspace switcher popup useful! Customize your workspace switcher behavior and the content, dimensions, position, orientation and colors of its popup indicator.\n\n- all GNOME workspace related options at one place\n- allows to switch workspaces orientation to horizontal or vertical\n- adds workspace switcher 'Wraparoud' and 'Ignore Last (empty) Workspace' options\n- allows to disable or customize switcher popup\n- allows adding content to the workspace switcher popup - Workspace Name, Current Application Name, Workspace Index\n- workspace switcher popup appearance customization includes position on screen, timings, size, colors , orientation.\n\nPlease, report bugs on the GitHub page linked below.", "link": "https://extensions.gnome.org/extension/4788/workspace-switcher-manager/", "shell_version_map": {"38": {"version": "9", "sha256": "1pd5a520rfnf4hcpdqxq7z5c7691qh07685as6s9ssvfdzhxxf61", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgYXQgb25lIHBsYWNlXG4tIGFsbG93cyB0byBzd2l0Y2ggd29ya3NwYWNlcyBvcmllbnRhdGlvbiB0byBob3Jpem9udGFsIG9yIHZlcnRpY2FsXG4tIGFkZHMgd29ya3NwYWNlIHN3aXRjaGVyICdXcmFwYXJvdWQnIGFuZCAnSWdub3JlIExhc3QgKGVtcHR5KSBXb3Jrc3BhY2UnIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbi5cblxuUGxlYXNlLCByZXBvcnQgYnVncyBvbiB0aGUgR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "1pd5a520rfnf4hcpdqxq7z5c7691qh07685as6s9ssvfdzhxxf61", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgYXQgb25lIHBsYWNlXG4tIGFsbG93cyB0byBzd2l0Y2ggd29ya3NwYWNlcyBvcmllbnRhdGlvbiB0byBob3Jpem9udGFsIG9yIHZlcnRpY2FsXG4tIGFkZHMgd29ya3NwYWNlIHN3aXRjaGVyICdXcmFwYXJvdWQnIGFuZCAnSWdub3JlIExhc3QgKGVtcHR5KSBXb3Jrc3BhY2UnIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbi5cblxuUGxlYXNlLCByZXBvcnQgYnVncyBvbiB0aGUgR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "1pd5a520rfnf4hcpdqxq7z5c7691qh07685as6s9ssvfdzhxxf61", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgYXQgb25lIHBsYWNlXG4tIGFsbG93cyB0byBzd2l0Y2ggd29ya3NwYWNlcyBvcmllbnRhdGlvbiB0byBob3Jpem9udGFsIG9yIHZlcnRpY2FsXG4tIGFkZHMgd29ya3NwYWNlIHN3aXRjaGVyICdXcmFwYXJvdWQnIGFuZCAnSWdub3JlIExhc3QgKGVtcHR5KSBXb3Jrc3BhY2UnIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbi5cblxuUGxlYXNlLCByZXBvcnQgYnVncyBvbiB0aGUgR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "1pd5a520rfnf4hcpdqxq7z5c7691qh07685as6s9ssvfdzhxxf61", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgYXQgb25lIHBsYWNlXG4tIGFsbG93cyB0byBzd2l0Y2ggd29ya3NwYWNlcyBvcmllbnRhdGlvbiB0byBob3Jpem9udGFsIG9yIHZlcnRpY2FsXG4tIGFkZHMgd29ya3NwYWNlIHN3aXRjaGVyICdXcmFwYXJvdWQnIGFuZCAnSWdub3JlIExhc3QgKGVtcHR5KSBXb3Jrc3BhY2UnIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbi5cblxuUGxlYXNlLCByZXBvcnQgYnVncyBvbiB0aGUgR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "43": {"version": "9", "sha256": "1pd5a520rfnf4hcpdqxq7z5c7691qh07685as6s9ssvfdzhxxf61", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgYXQgb25lIHBsYWNlXG4tIGFsbG93cyB0byBzd2l0Y2ggd29ya3NwYWNlcyBvcmllbnRhdGlvbiB0byBob3Jpem9udGFsIG9yIHZlcnRpY2FsXG4tIGFkZHMgd29ya3NwYWNlIHN3aXRjaGVyICdXcmFwYXJvdWQnIGFuZCAnSWdub3JlIExhc3QgKGVtcHR5KSBXb3Jrc3BhY2UnIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbi5cblxuUGxlYXNlLCByZXBvcnQgYnVncyBvbiB0aGUgR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3dvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlckBHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "compare@eexpss.gmail.com", "name": "Compare or Open", "pname": "compare-filedir-from-clip", "description": "Copy/Select two Dirs/Files from anywhere such as `nautilus` or `gnome-terminal`, and then compare them (use `meld`) or open with Ctrl-O or open with context-menu.", "link": "https://extensions.gnome.org/extension/4789/compare-filedir-from-clip/", "shell_version_map": {"40": {"version": "15", "sha256": "0is8y6cs3qfaljlmyfhjpp71fbd98bizldf0rhrblm91mjfhqi3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "0is8y6cs3qfaljlmyfhjpp71fbd98bizldf0rhrblm91mjfhqi3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "15", "sha256": "0is8y6cs3qfaljlmyfhjpp71fbd98bizldf0rhrblm91mjfhqi3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvcHkvU2VsZWN0IHR3byBEaXJzL0ZpbGVzIGZyb20gYW55d2hlcmUgc3VjaCBhcyBgbmF1dGlsdXNgIG9yIGBnbm9tZS10ZXJtaW5hbGAsIGFuZCB0aGVuIGNvbXBhcmUgdGhlbSAodXNlIGBtZWxkYCkgb3Igb3BlbiB3aXRoIEN0cmwtTyBvciBvcGVuIHdpdGggY29udGV4dC1tZW51LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbXBhcmUiLAogICJuYW1lIjogIkNvbXBhcmUgb3IgT3BlbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb21wYXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY29tcGFyZSIsCiAgInV1aWQiOiAiY29tcGFyZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE1Cn0="}}} , {"uuid": "freq-boost-switch@metal03326", "name": "Frequency Boost Switch", "pname": "frequency-boost-switch", "description": "Add a toggle to enable/disable CPU frequency boost in Gnome Power Profiles menu.", "link": "https://extensions.gnome.org/extension/4792/frequency-boost-switch/", "shell_version_map": {"41": {"version": "6", "sha256": "0yrrh10n7nkj8x1kmsndqlwcv5crad77a52vmq1xbcb24m3aswgp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWV0YWwwMzMyNi9nbm9tZS1mcmVxdWVuY3ktYm9vc3Qtc3dpdGNoIiwKICAidXVpZCI6ICJmcmVxLWJvb3N0LXN3aXRjaEBtZXRhbDAzMzI2IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "8", "sha256": "0ldkfawgpdzzicr7ja1v1lyjg38pw0mh2i91gm3bdf9wxln4d6j7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogOAp9"}, "43": {"version": "9", "sha256": "0fj1bc209l2zz8cwllxm5nadd0hmvikf9d1ydfwc25l201czl68m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "pop-launcher-super-key@ManeLippert", "name": "Pop Launcher Super-Key", "pname": "pop-launcher-super-key", "description": "Binds Pop-Launcher on Super-Key (Fork of Pop-Cosmic Extension)\n\nSince Pop!_OS moves to its own desktop enviroment (COSMIC DE) and I left linux behind me this extension will not get continued.\n\n! Requirements ! : Pop-Launcher and Pop-Shell have to be installed on used OS", "link": "https://extensions.gnome.org/extension/4797/pop-launcher-super-key/", "shell_version_map": {"38": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}, "43": {"version": "5", "sha256": "03mdqjmlf4zhcp2lim1skzdvr0c90gd4mfmrdiw6bqks8k7ma8n1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJpbmRzIFBvcC1MYXVuY2hlciBvbiBTdXBlci1LZXkgKEZvcmsgb2YgUG9wLUNvc21pYyBFeHRlbnNpb24pXG5cblNpbmNlIFBvcCFfT1MgbW92ZXMgdG8gaXRzIG93biBkZXNrdG9wIGVudmlyb21lbnQgKENPU01JQyBERSkgYW5kIEkgbGVmdCBsaW51eCBiZWhpbmQgbWUgdGhpcyBleHRlbnNpb24gd2lsbCBub3QgZ2V0IGNvbnRpbnVlZC5cblxuISBSZXF1aXJlbWVudHMgISA6IFBvcC1MYXVuY2hlciBhbmQgUG9wLVNoZWxsIGhhdmUgdG8gYmUgaW5zdGFsbGVkIG9uIHVzZWQgT1MiLAogICJuYW1lIjogIlBvcCBMYXVuY2hlciBTdXBlci1LZXkiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIlN5c3RlbTc2IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"uuid": "thinkpad-battery-threshold@marcosdalvarez.org", "name": "Thinkpad Battery Threshold", "pname": "thinkpad-battery-threshold", "description": "Enable/Disable battery threshold on Lenovo Thinkpad laptops.\n\nIf you mainly use the system with the AC power adapter connected and only use the battery sporadically, you can increase battery life by setting the maximum charge value to less than 100%. This is useful because batteries that are used sporadically have a longer lifespan when kept at less than full charge.", "link": "https://extensions.gnome.org/extension/4798/thinkpad-battery-threshold/", "shell_version_map": {"41": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "18", "sha256": "1acwj8f349bwjk4f0vb4dpbc9344njx4vi0cwr4bfhvycg2fczrd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJjb3NkYWx2YXJlei90aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZC1leHRlbnNpb24iLAogICJ1dWlkIjogInRoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgInZlcnNpb24iOiAxOAp9"}}} +, {"uuid": "thinkpad-battery-threshold@marcosdalvarez.org", "name": "Thinkpad Battery Threshold", "pname": "thinkpad-battery-threshold", "description": "Enable/Disable battery threshold on Lenovo Thinkpad laptops.\n\nIf you mainly use the system with the AC power adapter connected and only use the battery sporadically, you can increase battery life by setting the maximum charge value to less than 100%. This is useful because batteries that are used sporadically have a longer lifespan when kept at less than full charge.", "link": "https://extensions.gnome.org/extension/4798/thinkpad-battery-threshold/", "shell_version_map": {"41": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "07l1vgv9zhyh8q2h0gnn69x7h8gfn8x9q34p9lab7w08s4zn2rnb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL21hcmNvc2RhbHZhcmV6L3RoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "19", "sha256": "1sas1z00r0ygbx8jhhj7wlixzjf8qwnfifdmiwcljwrdxvm8a2kh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tYXJjb3NkYWx2YXJlei90aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZC1leHRlbnNpb24iLAogICJ1dWlkIjogInRoaW5rcGFkLWJhdHRlcnktdGhyZXNob2xkQG1hcmNvc2RhbHZhcmV6Lm9yZyIsCiAgInZlcnNpb24iOiAxOQp9"}}} , {"uuid": "lock-screen-message@advendradeswanta.gitlab.com", "name": "Lock Screen Message", "pname": "lock-screen-message", "description": "Simple extension that let's you add your message to the lock screen (unlockDialog)", "link": "https://extensions.gnome.org/extension/4801/lock-screen-message/", "shell_version_map": {"40": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "0hkr6gm7kr69fc4zjb8rddwj75jpbpvqz4wpkfl659wjn4980s3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBleHRlbnNpb24gdGhhdCBsZXQncyB5b3UgYWRkIHlvdXIgbWVzc2FnZSB0byB0aGUgbG9jayBzY3JlZW4gKHVubG9ja0RpYWxvZykiLAogICJuYW1lIjogIkxvY2sgU2NyZWVuIE1lc3NhZ2UiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmxvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BZHZlbmRyYURlc3dhbnRhL2xvY2stc2NyZWVuLW1lc3NhZ2UiLAogICJ1dWlkIjogImxvY2stc2NyZWVuLW1lc3NhZ2VAYWR2ZW5kcmFkZXN3YW50YS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "panel-corners@aunetx", "name": "Panel corners", "pname": "panel-corners", "description": "A GNOME shell extension to keep the old topbar corners, which were removed for GNOME 42. It also allows you to customize the rounded corners, even if you use GNOME 40 or 41.\n\nIt is widely based on already existing gnome-shell code, and on a merge request by Alexander Mikhaylenko: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1328", "link": "https://extensions.gnome.org/extension/4805/panel-corners/", "shell_version_map": {"40": {"version": "3", "sha256": "0piacfxwa5ca5cnvrz0s8pqykfixynmvvdmh1rznfsh407v1kw1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0piacfxwa5ca5cnvrz0s8pqykfixynmvvdmh1rznfsh407v1kw1v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdW5ldHgvcGFuZWwtY29ybmVycyIsCiAgInV1aWQiOiAicGFuZWwtY29ybmVyc0BhdW5ldHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "6", "sha256": "1fzfl8c28cmc0a26gx9xyyk78lapgfc2x2ykgwaq8mgz86vap4f6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9wYW5lbC1jb3JuZXJzIiwKICAidXVpZCI6ICJwYW5lbC1jb3JuZXJzQGF1bmV0eCIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1fzfl8c28cmc0a26gx9xyyk78lapgfc2x2ykgwaq8mgz86vap4f6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F1bmV0eC9wYW5lbC1jb3JuZXJzIiwKICAidXVpZCI6ICJwYW5lbC1jb3JuZXJzQGF1bmV0eCIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "WhatWatch@Zappo-II.github.io", "name": "What Watch", "pname": "what-watch", "description": "Shows a customizeable analog desktop clock.\nPlease visit the GitHub repository for documentation and to report any issues.", "link": "https://extensions.gnome.org/extension/4806/what-watch/", "shell_version_map": {"38": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "43": {"version": "6", "sha256": "11xlh4c5ypivw3hln0z7qm40xz6yn5yp4rlfz2a2lam3z2664nwd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgY3VzdG9taXplYWJsZSBhbmFsb2cgZGVza3RvcCBjbG9jay5cblBsZWFzZSB2aXNpdCB0aGUgR2l0SHViIHJlcG9zaXRvcnkgZm9yIGRvY3VtZW50YXRpb24gYW5kIHRvIHJlcG9ydCBhbnkgaXNzdWVzLiIsCiAgIm5hbWUiOiAiV2hhdCBXYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy56YXBwb2lpLndoYXR3YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9aYXBwby1JSS9XaGF0V2F0Y2giLAogICJ1dWlkIjogIldoYXRXYXRjaEBaYXBwby1JSS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}}} @@ -713,13 +714,13 @@ , {"uuid": "overview-clicking@mechtifs", "name": "Overview Clicking", "pname": "overview-clicking", "description": "Close the overview or show up application grid by left/right clicking empty space. Forked from click-to-close-overview@l3nn4rt.github.io.", "link": "https://extensions.gnome.org/extension/4898/overview-clicking/", "shell_version_map": {"40": {"version": "1", "sha256": "10f08rn9m66ynrs5jsgxg4qzrimcjdslgs36s8fgcblr5r31kw8i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBvciBzaG93IHVwIGFwcGxpY2F0aW9uIGdyaWQgYnkgbGVmdC9yaWdodCBjbGlja2luZyBlbXB0eSBzcGFjZS4gRm9ya2VkIGZyb20gY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8uIiwKICAibmFtZSI6ICJPdmVydmlldyBDbGlja2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lY2h0aWZzL292ZXJ2aWV3LWNsaWNraW5nIiwKICAidXVpZCI6ICJvdmVydmlldy1jbGlja2luZ0BtZWNodGlmcyIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "10f08rn9m66ynrs5jsgxg4qzrimcjdslgs36s8fgcblr5r31kw8i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBvciBzaG93IHVwIGFwcGxpY2F0aW9uIGdyaWQgYnkgbGVmdC9yaWdodCBjbGlja2luZyBlbXB0eSBzcGFjZS4gRm9ya2VkIGZyb20gY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8uIiwKICAibmFtZSI6ICJPdmVydmlldyBDbGlja2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lY2h0aWZzL292ZXJ2aWV3LWNsaWNraW5nIiwKICAidXVpZCI6ICJvdmVydmlldy1jbGlja2luZ0BtZWNodGlmcyIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "10f08rn9m66ynrs5jsgxg4qzrimcjdslgs36s8fgcblr5r31kw8i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHRoZSBvdmVydmlldyBvciBzaG93IHVwIGFwcGxpY2F0aW9uIGdyaWQgYnkgbGVmdC9yaWdodCBjbGlja2luZyBlbXB0eSBzcGFjZS4gRm9ya2VkIGZyb20gY2xpY2stdG8tY2xvc2Utb3ZlcnZpZXdAbDNubjRydC5naXRodWIuaW8uIiwKICAibmFtZSI6ICJPdmVydmlldyBDbGlja2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21lY2h0aWZzL292ZXJ2aWV3LWNsaWNraW5nIiwKICAidXVpZCI6ICJvdmVydmlldy1jbGlja2luZ0BtZWNodGlmcyIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "speed@eexpss.gmail.com", "name": "Screen Net Speed", "pname": "screen-net-speed", "description": "* Animation net speed show on the screen. You can click it to have fun and pass the time. Can be turned on / off at any time.\nScroll Mouse on panel icon, can change the shape.", "link": "https://extensions.gnome.org/extension/4901/screen-net-speed/", "shell_version_map": {"40": {"version": "6", "sha256": "18wr7jxydm4394bjais986q9qrx8w0kmljyy56z93hmj45pwq0c2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQW5pbWF0aW9uIG5ldCBzcGVlZCBzaG93IG9uIHRoZSBzY3JlZW4uIFlvdSBjYW4gY2xpY2sgaXQgdG8gaGF2ZSBmdW4gYW5kIHBhc3MgdGhlIHRpbWUuIENhbiBiZSB0dXJuZWQgb24gLyBvZmYgYXQgYW55IHRpbWUuXG5TY3JvbGwgTW91c2Ugb24gcGFuZWwgaWNvbiwgY2FuIGNoYW5nZSB0aGUgc2hhcGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2NyZWVuLW5ldC1zcGVlZCIsCiAgIm5hbWUiOiAiU2NyZWVuIE5ldCBTcGVlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLXNwZWVkIiwKICAidXVpZCI6ICJzcGVlZEBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "18wr7jxydm4394bjais986q9qrx8w0kmljyy56z93hmj45pwq0c2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQW5pbWF0aW9uIG5ldCBzcGVlZCBzaG93IG9uIHRoZSBzY3JlZW4uIFlvdSBjYW4gY2xpY2sgaXQgdG8gaGF2ZSBmdW4gYW5kIHBhc3MgdGhlIHRpbWUuIENhbiBiZSB0dXJuZWQgb24gLyBvZmYgYXQgYW55IHRpbWUuXG5TY3JvbGwgTW91c2Ugb24gcGFuZWwgaWNvbiwgY2FuIGNoYW5nZSB0aGUgc2hhcGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2NyZWVuLW5ldC1zcGVlZCIsCiAgIm5hbWUiOiAiU2NyZWVuIE5ldCBTcGVlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLXNwZWVkIiwKICAidXVpZCI6ICJzcGVlZEBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "18wr7jxydm4394bjais986q9qrx8w0kmljyy56z93hmj45pwq0c2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogQW5pbWF0aW9uIG5ldCBzcGVlZCBzaG93IG9uIHRoZSBzY3JlZW4uIFlvdSBjYW4gY2xpY2sgaXQgdG8gaGF2ZSBmdW4gYW5kIHBhc3MgdGhlIHRpbWUuIENhbiBiZSB0dXJuZWQgb24gLyBvZmYgYXQgYW55IHRpbWUuXG5TY3JvbGwgTW91c2Ugb24gcGFuZWwgaWNvbiwgY2FuIGNoYW5nZSB0aGUgc2hhcGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2NyZWVuLW5ldC1zcGVlZCIsCiAgIm5hbWUiOiAiU2NyZWVuIE5ldCBTcGVlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLXNwZWVkIiwKICAidXVpZCI6ICJzcGVlZEBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "addshutbutton@jerom@olika.ovh", "name": "Add Shutdown Button", "pname": "add-shutdown-button", "description": "Add a button power off", "link": "https://extensions.gnome.org/extension/4905/add-shutdown-button/", "shell_version_map": {"40": {"version": "4", "sha256": "1mjwpm8078d4n2ff5rsq4plp5fhsf91k1f2zar6f5jf650bzz6rh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJ1dHRvbiBwb3dlciBvZmYiLAogICJuYW1lIjogIkFkZCBTaHV0ZG93biBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhZGRzaHV0YnV0dG9uQGplcm9tQG9saWthLm92aCIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1mjwpm8078d4n2ff5rsq4plp5fhsf91k1f2zar6f5jf650bzz6rh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGJ1dHRvbiBwb3dlciBvZmYiLAogICJuYW1lIjogIkFkZCBTaHV0ZG93biBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhZGRzaHV0YnV0dG9uQGplcm9tQG9saWthLm92aCIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "eepresetselector@ulville.github.io", "name": "EasyEffects Preset Selector", "pname": "easyeffects-preset-selector", "description": "Quickly show and load EasyEffects Presets", "link": "https://extensions.gnome.org/extension/4907/easyeffects-preset-selector/", "shell_version_map": {"38": {"version": "13", "sha256": "189ahrsmgw6j4b8nhh25587dw50cqzqz3f1q32w26wpspyx32x7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "13", "sha256": "189ahrsmgw6j4b8nhh25587dw50cqzqz3f1q32w26wpspyx32x7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "189ahrsmgw6j4b8nhh25587dw50cqzqz3f1q32w26wpspyx32x7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "189ahrsmgw6j4b8nhh25587dw50cqzqz3f1q32w26wpspyx32x7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEzCn0="}, "43": {"version": "13", "sha256": "189ahrsmgw6j4b8nhh25587dw50cqzqz3f1q32w26wpspyx32x7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEzCn0="}}} +, {"uuid": "eepresetselector@ulville.github.io", "name": "EasyEffects Preset Selector", "pname": "easyeffects-preset-selector", "description": "Quickly show and load EasyEffects Presets\n\n# What's Changed in version 14:\n- If there are a ton of presets or screen resolution is low, the list of presets would overflow the screen area. This update fixes it by placing presets into scrollable menu sections in case of an overflow.", "link": "https://extensions.gnome.org/extension/4907/easyeffects-preset-selector/", "shell_version_map": {"38": {"version": "14", "sha256": "0ck8kwxkn7a24p73sixzjzxvmlck69a8v515riksqsrb6hh0zjgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzXG5cbiMgV2hhdCdzIENoYW5nZWQgaW4gdmVyc2lvbiAxNDpcbi0gSWYgdGhlcmUgYXJlIGEgdG9uIG9mIHByZXNldHMgb3Igc2NyZWVuIHJlc29sdXRpb24gaXMgbG93LCB0aGUgbGlzdCBvZiBwcmVzZXRzIHdvdWxkIG92ZXJmbG93IHRoZSBzY3JlZW4gYXJlYS4gVGhpcyB1cGRhdGUgZml4ZXMgaXQgYnkgcGxhY2luZyBwcmVzZXRzIGludG8gc2Nyb2xsYWJsZSBtZW51IHNlY3Rpb25zIGluIGNhc2Ugb2YgYW4gb3ZlcmZsb3cuIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "40": {"version": "14", "sha256": "0ck8kwxkn7a24p73sixzjzxvmlck69a8v515riksqsrb6hh0zjgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzXG5cbiMgV2hhdCdzIENoYW5nZWQgaW4gdmVyc2lvbiAxNDpcbi0gSWYgdGhlcmUgYXJlIGEgdG9uIG9mIHByZXNldHMgb3Igc2NyZWVuIHJlc29sdXRpb24gaXMgbG93LCB0aGUgbGlzdCBvZiBwcmVzZXRzIHdvdWxkIG92ZXJmbG93IHRoZSBzY3JlZW4gYXJlYS4gVGhpcyB1cGRhdGUgZml4ZXMgaXQgYnkgcGxhY2luZyBwcmVzZXRzIGludG8gc2Nyb2xsYWJsZSBtZW51IHNlY3Rpb25zIGluIGNhc2Ugb2YgYW4gb3ZlcmZsb3cuIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "0ck8kwxkn7a24p73sixzjzxvmlck69a8v515riksqsrb6hh0zjgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzXG5cbiMgV2hhdCdzIENoYW5nZWQgaW4gdmVyc2lvbiAxNDpcbi0gSWYgdGhlcmUgYXJlIGEgdG9uIG9mIHByZXNldHMgb3Igc2NyZWVuIHJlc29sdXRpb24gaXMgbG93LCB0aGUgbGlzdCBvZiBwcmVzZXRzIHdvdWxkIG92ZXJmbG93IHRoZSBzY3JlZW4gYXJlYS4gVGhpcyB1cGRhdGUgZml4ZXMgaXQgYnkgcGxhY2luZyBwcmVzZXRzIGludG8gc2Nyb2xsYWJsZSBtZW51IHNlY3Rpb25zIGluIGNhc2Ugb2YgYW4gb3ZlcmZsb3cuIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "0ck8kwxkn7a24p73sixzjzxvmlck69a8v515riksqsrb6hh0zjgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzXG5cbiMgV2hhdCdzIENoYW5nZWQgaW4gdmVyc2lvbiAxNDpcbi0gSWYgdGhlcmUgYXJlIGEgdG9uIG9mIHByZXNldHMgb3Igc2NyZWVuIHJlc29sdXRpb24gaXMgbG93LCB0aGUgbGlzdCBvZiBwcmVzZXRzIHdvdWxkIG92ZXJmbG93IHRoZSBzY3JlZW4gYXJlYS4gVGhpcyB1cGRhdGUgZml4ZXMgaXQgYnkgcGxhY2luZyBwcmVzZXRzIGludG8gc2Nyb2xsYWJsZSBtZW51IHNlY3Rpb25zIGluIGNhc2Ugb2YgYW4gb3ZlcmZsb3cuIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "43": {"version": "14", "sha256": "0ck8kwxkn7a24p73sixzjzxvmlck69a8v515riksqsrb6hh0zjgl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzXG5cbiMgV2hhdCdzIENoYW5nZWQgaW4gdmVyc2lvbiAxNDpcbi0gSWYgdGhlcmUgYXJlIGEgdG9uIG9mIHByZXNldHMgb3Igc2NyZWVuIHJlc29sdXRpb24gaXMgbG93LCB0aGUgbGlzdCBvZiBwcmVzZXRzIHdvdWxkIG92ZXJmbG93IHRoZSBzY3JlZW4gYXJlYS4gVGhpcyB1cGRhdGUgZml4ZXMgaXQgYnkgcGxhY2luZyBwcmVzZXRzIGludG8gc2Nyb2xsYWJsZSBtZW51IHNlY3Rpb25zIGluIGNhc2Ugb2YgYW4gb3ZlcmZsb3cuIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWx2aWxsZS9lZXByZXNldHNlbGVjdG9yIiwKICAidXVpZCI6ICJlZXByZXNldHNlbGVjdG9yQHVsdmlsbGUuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "gnomehub@gnome-hub.github.io", "name": "gnomehub", "pname": "gnomehub", "description": "An all in one extension which catagorizes notifications and displays system information", "link": "https://extensions.gnome.org/extension/4913/gnomehub/", "shell_version_map": {"38": {"version": "6", "sha256": "15dgj0jbfhsa0p87gi0ai6c55kj4nj9yz5ydpzamwy69k9jjjcd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsbCBpbiBvbmUgZXh0ZW5zaW9uIHdoaWNoIGNhdGFnb3JpemVzIG5vdGlmaWNhdGlvbnMgYW5kIGRpc3BsYXlzIHN5c3RlbSBpbmZvcm1hdGlvbiIsCiAgIm5hbWUiOiAiZ25vbWVodWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dub21lLWh1Yi5naXRodWIuaW8vIiwKICAidXVpZCI6ICJnbm9tZWh1YkBnbm9tZS1odWIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "15dgj0jbfhsa0p87gi0ai6c55kj4nj9yz5ydpzamwy69k9jjjcd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGFsbCBpbiBvbmUgZXh0ZW5zaW9uIHdoaWNoIGNhdGFnb3JpemVzIG5vdGlmaWNhdGlvbnMgYW5kIGRpc3BsYXlzIHN5c3RlbSBpbmZvcm1hdGlvbiIsCiAgIm5hbWUiOiAiZ25vbWVodWIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dub21lLWh1Yi5naXRodWIuaW8vIiwKICAidXVpZCI6ICJnbm9tZWh1YkBnbm9tZS1odWIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "volume_scroller@noskoski", "name": "Volume Scroller", "pname": "volume-scroller", "description": "Scroll up or down in the Top Bar to adjust volume.", "link": "https://extensions.gnome.org/extension/4916/volume-scroller/", "shell_version_map": {"38": {"version": "2", "sha256": "0524g5yc4k0sgdy1v6dah5y3nrf95zdl94nmqp5x77nwmdxvdpqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9za29za2kvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAbm9za29za2kiLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "0524g5yc4k0sgdy1v6dah5y3nrf95zdl94nmqp5x77nwmdxvdpqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9za29za2kvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAbm9za29za2kiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "0524g5yc4k0sgdy1v6dah5y3nrf95zdl94nmqp5x77nwmdxvdpqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9za29za2kvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAbm9za29za2kiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "0524g5yc4k0sgdy1v6dah5y3nrf95zdl94nmqp5x77nwmdxvdpqm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB1cCBvciBkb3duIGluIHRoZSBUb3AgQmFyIHRvIGFkanVzdCB2b2x1bWUuIiwKICAibmFtZSI6ICJWb2x1bWUgU2Nyb2xsZXIiLAogICJvcmlnaW5hbC1hdXRob3IiOiAidHJmbHlubjg5QHBtLm1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbm9za29za2kvZ25vbWUtc2hlbGwtdm9sdW1lLXNjcm9sbGVyIiwKICAidXVpZCI6ICJ2b2x1bWVfc2Nyb2xsZXJAbm9za29za2kiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "weather@eexpss.gmail.com", "name": "Weather", "pname": "weather", "description": "Animation Weather. \nMouse 1: show weather\nMouse 2: refresh weather\nMouse 3: dismiss\nScrollUp: increase day\nScrollDown: decrease day\nAdded i18n date, weather, temperature", "link": "https://extensions.gnome.org/extension/4919/weather/", "shell_version_map": {"40": {"version": "3", "sha256": "1ygk3jab26axk6wdn63wgfqlglrppyxwxh443bnwg1vyi3f6sz1a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXlcbkFkZGVkIGkxOG4gZGF0ZSwgd2VhdGhlciwgdGVtcGVyYXR1cmUiLAogICJuYW1lIjogIldlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy13ZWF0aGVyIiwKICAidXVpZCI6ICJ3ZWF0aGVyQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1ygk3jab26axk6wdn63wgfqlglrppyxwxh443bnwg1vyi3f6sz1a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXlcbkFkZGVkIGkxOG4gZGF0ZSwgd2VhdGhlciwgdGVtcGVyYXR1cmUiLAogICJuYW1lIjogIldlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy13ZWF0aGVyIiwKICAidXVpZCI6ICJ3ZWF0aGVyQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "13", "sha256": "05mijfwd5pxsf45bk1ld3g18dvdni41gz0yvq1bm944igp3wnqki", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXlcbkFkZGVkIGkxOG4gZGF0ZSwgd2VhdGhlciwgdGVtcGVyYXR1cmUiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3ZWF0aGVyIiwKICAibmFtZSI6ICJXZWF0aGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3Mtd2VhdGhlciIsCiAgInV1aWQiOiAid2VhdGhlckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "whiteborder@aaronbpaden.gmail.com", "name": "White Border Overlay", "pname": "white-border-overlay", "description": "Draw a white border around the desktop to enable (hopefully) universal application support for the Sinden Lightgun.", "link": "https://extensions.gnome.org/extension/4922/white-border-overlay/", "shell_version_map": {"38": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0jja1rwask9w4namal50pknprydqyskmz6hnpfvwz0v2d7398ksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Fhcm9uQlBhZGVuL3doaXRlYm9yZGVyLWFhcm9uYnBhZGVuLmdtYWlsLmNvbSIsCiAgInV1aWQiOiAid2hpdGVib3JkZXJAYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "git@eexpss.gmail.com", "name": "Git Monitor", "pname": "git", "description": "## monitor git directory for changes.\n> Working with a lot of git directories, I always forgot commit.\n### Panel Icon\n- Mouse 2, force refresh (re-read config file, check git dirs, refresh menu).\n- Mouse 3, open configfile. config file is `~/.config/git-monitor.json`.\n### Menu Item\n- Directory: Mouse 1 opened in the Files(Nautilus), Mouse 3 open in the gnome-terminal.\n- Files: Mouse 1, opened with `git difftool`, eg `meld`. Mouse 3, open file.", "link": "https://extensions.gnome.org/extension/4925/git/", "shell_version_map": {"40": {"version": "6", "sha256": "1ad7cavpbzkxqpk667gvqm74sls13ypyfsd7hps35bhjy00q2h6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIG1vbml0b3IgZ2l0IGRpcmVjdG9yeSBmb3IgY2hhbmdlcy5cbj4gV29ya2luZyB3aXRoIGEgbG90IG9mIGdpdCBkaXJlY3RvcmllcywgSSBhbHdheXMgZm9yZ290IGNvbW1pdC5cbiMjIyBQYW5lbCBJY29uXG4tIE1vdXNlIDIsIGZvcmNlIHJlZnJlc2ggKHJlLXJlYWQgY29uZmlnIGZpbGUsIGNoZWNrIGdpdCBkaXJzLCByZWZyZXNoIG1lbnUpLlxuLSBNb3VzZSAzLCBvcGVuIGNvbmZpZ2ZpbGUuIGNvbmZpZyBmaWxlIGlzIGB+Ly5jb25maWcvZ2l0LW1vbml0b3IuanNvbmAuXG4jIyMgTWVudSBJdGVtXG4tIERpcmVjdG9yeTogTW91c2UgMSBvcGVuZWQgaW4gdGhlIEZpbGVzKE5hdXRpbHVzKSwgTW91c2UgMyBvcGVuIGluIHRoZSBnbm9tZS10ZXJtaW5hbC5cbi0gRmlsZXM6IE1vdXNlIDEsIG9wZW5lZCB3aXRoIGBnaXQgZGlmZnRvb2xgLCBlZyBgbWVsZGAuIE1vdXNlIDMsIG9wZW4gZmlsZS4iLAogICJuYW1lIjogIkdpdCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtZ2l0IiwKICAidXVpZCI6ICJnaXRAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1ad7cavpbzkxqpk667gvqm74sls13ypyfsd7hps35bhjy00q2h6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIG1vbml0b3IgZ2l0IGRpcmVjdG9yeSBmb3IgY2hhbmdlcy5cbj4gV29ya2luZyB3aXRoIGEgbG90IG9mIGdpdCBkaXJlY3RvcmllcywgSSBhbHdheXMgZm9yZ290IGNvbW1pdC5cbiMjIyBQYW5lbCBJY29uXG4tIE1vdXNlIDIsIGZvcmNlIHJlZnJlc2ggKHJlLXJlYWQgY29uZmlnIGZpbGUsIGNoZWNrIGdpdCBkaXJzLCByZWZyZXNoIG1lbnUpLlxuLSBNb3VzZSAzLCBvcGVuIGNvbmZpZ2ZpbGUuIGNvbmZpZyBmaWxlIGlzIGB+Ly5jb25maWcvZ2l0LW1vbml0b3IuanNvbmAuXG4jIyMgTWVudSBJdGVtXG4tIERpcmVjdG9yeTogTW91c2UgMSBvcGVuZWQgaW4gdGhlIEZpbGVzKE5hdXRpbHVzKSwgTW91c2UgMyBvcGVuIGluIHRoZSBnbm9tZS10ZXJtaW5hbC5cbi0gRmlsZXM6IE1vdXNlIDEsIG9wZW5lZCB3aXRoIGBnaXQgZGlmZnRvb2xgLCBlZyBgbWVsZGAuIE1vdXNlIDMsIG9wZW4gZmlsZS4iLAogICJuYW1lIjogIkdpdCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtZ2l0IiwKICAidXVpZCI6ICJnaXRAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "1ad7cavpbzkxqpk667gvqm74sls13ypyfsd7hps35bhjy00q2h6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiMjIG1vbml0b3IgZ2l0IGRpcmVjdG9yeSBmb3IgY2hhbmdlcy5cbj4gV29ya2luZyB3aXRoIGEgbG90IG9mIGdpdCBkaXJlY3RvcmllcywgSSBhbHdheXMgZm9yZ290IGNvbW1pdC5cbiMjIyBQYW5lbCBJY29uXG4tIE1vdXNlIDIsIGZvcmNlIHJlZnJlc2ggKHJlLXJlYWQgY29uZmlnIGZpbGUsIGNoZWNrIGdpdCBkaXJzLCByZWZyZXNoIG1lbnUpLlxuLSBNb3VzZSAzLCBvcGVuIGNvbmZpZ2ZpbGUuIGNvbmZpZyBmaWxlIGlzIGB+Ly5jb25maWcvZ2l0LW1vbml0b3IuanNvbmAuXG4jIyMgTWVudSBJdGVtXG4tIERpcmVjdG9yeTogTW91c2UgMSBvcGVuZWQgaW4gdGhlIEZpbGVzKE5hdXRpbHVzKSwgTW91c2UgMyBvcGVuIGluIHRoZSBnbm9tZS10ZXJtaW5hbC5cbi0gRmlsZXM6IE1vdXNlIDEsIG9wZW5lZCB3aXRoIGBnaXQgZGlmZnRvb2xgLCBlZyBgbWVsZGAuIE1vdXNlIDMsIG9wZW4gZmlsZS4iLAogICJuYW1lIjogIkdpdCBNb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtZ2l0IiwKICAidXVpZCI6ICJnaXRAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} -, {"uuid": "mprisLabel@moon-0xff.github.com", "name": "Mpris Label", "pname": "mpris-label", "description": "Displays a label in the top bar with metadata from an mpris compatible source. It works with Spotify, Vlc, Rhythmbox, Chromium based browsers and (probably) any mpris compatible player.", "link": "https://extensions.gnome.org/extension/4928/mpris-label/", "shell_version_map": {"38": {"version": "7", "sha256": "19ijpvf4vrdsgbyjai47ra5h627h1zrn2b6dvi867g84ga7nyd9v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "19ijpvf4vrdsgbyjai47ra5h627h1zrn2b6dvi867g84ga7nyd9v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "19ijpvf4vrdsgbyjai47ra5h627h1zrn2b6dvi867g84ga7nyd9v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "19ijpvf4vrdsgbyjai47ra5h627h1zrn2b6dvi867g84ga7nyd9v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "19ijpvf4vrdsgbyjai47ra5h627h1zrn2b6dvi867g84ga7nyd9v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBJdCB3b3JrcyB3aXRoIFNwb3RpZnksIFZsYywgUmh5dGhtYm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Nb29uLTB4ZmYvZ25vbWUtbXByaXMtbGFiZWwiLAogICJ1dWlkIjogIm1wcmlzTGFiZWxAbW9vbi0weGZmLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "mprisLabel@moon-0xff.github.com", "name": "Mpris Label", "pname": "mpris-label", "description": "Display in your panel the (song)title, album and/or artist name available from an mpris compatible player, such as Spotify, Vlc, Rhythmbox, Firefox, Chromium and many more. Lots of features and very customizable!\n\nLast update: Version 12 (Jan 26 2023)\n- Fixes issues with the panel position being \"stolen\" by other extensions\n- Adds filters to allow/disallow specified mpris sources\n- Adds tooltips(hints) for various options\n\nAny feedback is gladly welcomed!", "link": "https://extensions.gnome.org/extension/4928/mpris-label/", "shell_version_map": {"38": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "40": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "41": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "42": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}, "43": {"version": "12", "sha256": "1a12m9ih7p58375l8s9f3cdib7z7hk1z0lmk3ny7hpp94wgvnsyz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW4geW91ciBwYW5lbCB0aGUgKHNvbmcpdGl0bGUsIGFsYnVtIGFuZC9vciBhcnRpc3QgbmFtZSBhdmFpbGFibGUgZnJvbSBhbiBtcHJpcyBjb21wYXRpYmxlIHBsYXllciwgc3VjaCBhcyBTcG90aWZ5LCBWbGMsIFJoeXRobWJveCwgRmlyZWZveCwgQ2hyb21pdW0gYW5kIG1hbnkgbW9yZS4gTG90cyBvZiBmZWF0dXJlcyBhbmQgdmVyeSBjdXN0b21pemFibGUhXG5cbkxhc3QgdXBkYXRlOiBWZXJzaW9uIDEyIChKYW4gMjYgMjAyMylcbi0gRml4ZXMgaXNzdWVzIHdpdGggdGhlIHBhbmVsIHBvc2l0aW9uIGJlaW5nIFwic3RvbGVuXCIgYnkgb3RoZXIgZXh0ZW5zaW9uc1xuLSBBZGRzIGZpbHRlcnMgdG8gYWxsb3cvZGlzYWxsb3cgc3BlY2lmaWVkIG1wcmlzIHNvdXJjZXNcbi0gQWRkcyB0b29sdGlwcyhoaW50cykgZm9yIHZhcmlvdXMgb3B0aW9uc1xuXG5BbnkgZmVlZGJhY2sgaXMgZ2xhZGx5IHdlbGNvbWVkISIsCiAgIm5hbWUiOiAiTXByaXMgTGFiZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEyCn0="}}} , {"uuid": "captivate@rensoliemans.nl", "name": "Captivate", "pname": "captivate", "description": "Activate your CapsLock button.\nUsing gnome-tweaks, remap your CapsLock to a Menu key, and then this extension works perfectly. Alternatively, choose a different key in the extension settings.\n\nDon't forget to log out and in again if you're updating the extension manually.", "link": "https://extensions.gnome.org/extension/4932/captivate/", "shell_version_map": {"40": {"version": "6", "sha256": "1lpaq3pbhg0c90xbvhwi9hz8m5nzvfgw14g61wg7f8fc17a7s77i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIHlvdXIgQ2Fwc0xvY2sgYnV0dG9uLlxuVXNpbmcgZ25vbWUtdHdlYWtzLCByZW1hcCB5b3VyIENhcHNMb2NrIHRvIGEgTWVudSBrZXksIGFuZCB0aGVuIHRoaXMgZXh0ZW5zaW9uIHdvcmtzIHBlcmZlY3RseS4gQWx0ZXJuYXRpdmVseSwgY2hvb3NlIGEgZGlmZmVyZW50IGtleSBpbiB0aGUgZXh0ZW5zaW9uIHNldHRpbmdzLlxuXG5Eb24ndCBmb3JnZXQgdG8gbG9nIG91dCBhbmQgaW4gYWdhaW4gaWYgeW91J3JlIHVwZGF0aW5nIHRoZSBleHRlbnNpb24gbWFudWFsbHkuIiwKICAibmFtZSI6ICJDYXB0aXZhdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FwdGl2YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmVuc29saWVtYW5zL2NhcHRpdmF0ZSIsCiAgInV1aWQiOiAiY2FwdGl2YXRlQHJlbnNvbGllbWFucy5ubCIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "1lpaq3pbhg0c90xbvhwi9hz8m5nzvfgw14g61wg7f8fc17a7s77i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIHlvdXIgQ2Fwc0xvY2sgYnV0dG9uLlxuVXNpbmcgZ25vbWUtdHdlYWtzLCByZW1hcCB5b3VyIENhcHNMb2NrIHRvIGEgTWVudSBrZXksIGFuZCB0aGVuIHRoaXMgZXh0ZW5zaW9uIHdvcmtzIHBlcmZlY3RseS4gQWx0ZXJuYXRpdmVseSwgY2hvb3NlIGEgZGlmZmVyZW50IGtleSBpbiB0aGUgZXh0ZW5zaW9uIHNldHRpbmdzLlxuXG5Eb24ndCBmb3JnZXQgdG8gbG9nIG91dCBhbmQgaW4gYWdhaW4gaWYgeW91J3JlIHVwZGF0aW5nIHRoZSBleHRlbnNpb24gbWFudWFsbHkuIiwKICAibmFtZSI6ICJDYXB0aXZhdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FwdGl2YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmVuc29saWVtYW5zL2NhcHRpdmF0ZSIsCiAgInV1aWQiOiAiY2FwdGl2YXRlQHJlbnNvbGllbWFucy5ubCIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "1lpaq3pbhg0c90xbvhwi9hz8m5nzvfgw14g61wg7f8fc17a7s77i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIHlvdXIgQ2Fwc0xvY2sgYnV0dG9uLlxuVXNpbmcgZ25vbWUtdHdlYWtzLCByZW1hcCB5b3VyIENhcHNMb2NrIHRvIGEgTWVudSBrZXksIGFuZCB0aGVuIHRoaXMgZXh0ZW5zaW9uIHdvcmtzIHBlcmZlY3RseS4gQWx0ZXJuYXRpdmVseSwgY2hvb3NlIGEgZGlmZmVyZW50IGtleSBpbiB0aGUgZXh0ZW5zaW9uIHNldHRpbmdzLlxuXG5Eb24ndCBmb3JnZXQgdG8gbG9nIG91dCBhbmQgaW4gYWdhaW4gaWYgeW91J3JlIHVwZGF0aW5nIHRoZSBleHRlbnNpb24gbWFudWFsbHkuIiwKICAibmFtZSI6ICJDYXB0aXZhdGUiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY2FwdGl2YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmVuc29saWVtYW5zL2NhcHRpdmF0ZSIsCiAgInV1aWQiOiAiY2FwdGl2YXRlQHJlbnNvbGllbWFucy5ubCIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "goto-previous-workspaces@zubarev.net", "name": "Switch workspaces to previous", "pname": "switch-workspaces-to-previous", "description": "move to previous workspace", "link": "https://extensions.gnome.org/extension/4935/switch-workspaces-to-previous/", "shell_version_map": {"38": {"version": "1", "sha256": "0f2ri8w9zh49z81ya12rrfclmljhgv05yl30s0jbgafi9im396cv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG8gcHJldmlvdXMgd29ya3NwYWNlIiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyB0byBwcmV2aW91cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiYW5kcmV5QHp1YmFyZXYubmV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvdG8tcHJldmlvdXMtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6eW9za29sL2dub21lLXNoZWxsLWV4dGVuc2lvbi1nb3RvLXByZXZpb3VzLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogImdvdG8tcHJldmlvdXMtd29ya3NwYWNlc0B6dWJhcmV2Lm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "0f2ri8w9zh49z81ya12rrfclmljhgv05yl30s0jbgafi9im396cv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG8gcHJldmlvdXMgd29ya3NwYWNlIiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyB0byBwcmV2aW91cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiYW5kcmV5QHp1YmFyZXYubmV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvdG8tcHJldmlvdXMtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6eW9za29sL2dub21lLXNoZWxsLWV4dGVuc2lvbi1nb3RvLXByZXZpb3VzLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogImdvdG8tcHJldmlvdXMtd29ya3NwYWNlc0B6dWJhcmV2Lm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "0f2ri8w9zh49z81ya12rrfclmljhgv05yl30s0jbgafi9im396cv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG8gcHJldmlvdXMgd29ya3NwYWNlIiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyB0byBwcmV2aW91cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiYW5kcmV5QHp1YmFyZXYubmV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvdG8tcHJldmlvdXMtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6eW9za29sL2dub21lLXNoZWxsLWV4dGVuc2lvbi1nb3RvLXByZXZpb3VzLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogImdvdG8tcHJldmlvdXMtd29ya3NwYWNlc0B6dWJhcmV2Lm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "0f2ri8w9zh49z81ya12rrfclmljhgv05yl30s0jbgafi9im396cv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG8gcHJldmlvdXMgd29ya3NwYWNlIiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyB0byBwcmV2aW91cyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiYW5kcmV5QHp1YmFyZXYubmV0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdvdG8tcHJldmlvdXMtd29ya3NwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6eW9za29sL2dub21lLXNoZWxsLWV4dGVuc2lvbi1nb3RvLXByZXZpb3VzLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogImdvdG8tcHJldmlvdXMtd29ya3NwYWNlc0B6dWJhcmV2Lm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "draw-on-your-screen2@zhrexl.github.com", "name": "Draw On Your Screen 2", "pname": "draw-on-you-screen-2", "description": "This is a fork from Abakk Draw On Your Screen. Start drawing with Super+Alt+D and save your beautiful work by taking a screenshot", "link": "https://extensions.gnome.org/extension/4937/draw-on-you-screen-2/", "shell_version_map": {"40": {"version": "1", "sha256": "052v97bj47dxmm5gpz0yqbkdkfrqmf03mq3q2qpippzy6lmf7h7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZGlyIjogImRyYXctb24teW91ci1zY3JlZW4iLAogICJkZXNjcmlwdGlvbiI6ICJUaGlzIGlzIGEgZm9yayBmcm9tIEFiYWtrIERyYXcgT24gWW91ciBTY3JlZW4uIFN0YXJ0IGRyYXdpbmcgd2l0aCBTdXBlcitBbHQrRCBhbmQgc2F2ZSB5b3VyIGJlYXV0aWZ1bCB3b3JrIGJ5IHRha2luZyBhIHNjcmVlbnNob3QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcmF3LW9uLXlvdXItc2NyZWVuIiwKICAibmFtZSI6ICJEcmF3IE9uIFlvdXIgU2NyZWVuIDIiLAogICJwZXJzaXN0ZW50LWZpbGUtbmFtZSI6ICJwZXJzaXN0ZW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyYXctb24teW91ci1zY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJzdmctZmlsZS1uYW1lIjogIkRyYXdPbllvdXJTY3JlZW4iLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3pocmV4bC9EcmF3T25Zb3VyU2NyZWVuMiIsCiAgInV1aWQiOiAiZHJhdy1vbi15b3VyLXNjcmVlbjJAemhyZXhsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "052v97bj47dxmm5gpz0yqbkdkfrqmf03mq3q2qpippzy6lmf7h7a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZGlyIjogImRyYXctb24teW91ci1zY3JlZW4iLAogICJkZXNjcmlwdGlvbiI6ICJUaGlzIGlzIGEgZm9yayBmcm9tIEFiYWtrIERyYXcgT24gWW91ciBTY3JlZW4uIFN0YXJ0IGRyYXdpbmcgd2l0aCBTdXBlcitBbHQrRCBhbmQgc2F2ZSB5b3VyIGJlYXV0aWZ1bCB3b3JrIGJ5IHRha2luZyBhIHNjcmVlbnNob3QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcmF3LW9uLXlvdXItc2NyZWVuIiwKICAibmFtZSI6ICJEcmF3IE9uIFlvdXIgU2NyZWVuIDIiLAogICJwZXJzaXN0ZW50LWZpbGUtbmFtZSI6ICJwZXJzaXN0ZW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyYXctb24teW91ci1zY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJzdmctZmlsZS1uYW1lIjogIkRyYXdPbllvdXJTY3JlZW4iLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3pocmV4bC9EcmF3T25Zb3VyU2NyZWVuMiIsCiAgInV1aWQiOiAiZHJhdy1vbi15b3VyLXNjcmVlbjJAemhyZXhsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "42": {"version": "3", "sha256": "0kh895fvimv9xibznnigg3filyba9k2s883y3zn9xqpkj9lsf9qb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZGlyIjogImRyYXctb24teW91ci1zY3JlZW4iLAogICJkZXNjcmlwdGlvbiI6ICJUaGlzIGlzIGEgZm9yayBmcm9tIEFiYWtrIERyYXcgT24gWW91ciBTY3JlZW4uIFN0YXJ0IGRyYXdpbmcgd2l0aCBTdXBlcitBbHQrRCBhbmQgc2F2ZSB5b3VyIGJlYXV0aWZ1bCB3b3JrIGJ5IHRha2luZyBhIHNjcmVlbnNob3QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcmF3LW9uLXlvdXItc2NyZWVuIiwKICAibmFtZSI6ICJEcmF3IE9uIFlvdXIgU2NyZWVuIDIiLAogICJwZXJzaXN0ZW50LWZpbGUtbmFtZSI6ICJwZXJzaXN0ZW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyYXctb24teW91ci1zY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJzdmctZmlsZS1uYW1lIjogIkRyYXdPbllvdXJTY3JlZW4iLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3pocmV4bC9EcmF3T25Zb3VyU2NyZWVuMiIsCiAgInV1aWQiOiAiZHJhdy1vbi15b3VyLXNjcmVlbjJAemhyZXhsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "0kh895fvimv9xibznnigg3filyba9k2s883y3zn9xqpkj9lsf9qb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRhdGEtZGlyIjogImRyYXctb24teW91ci1zY3JlZW4iLAogICJkZXNjcmlwdGlvbiI6ICJUaGlzIGlzIGEgZm9yayBmcm9tIEFiYWtrIERyYXcgT24gWW91ciBTY3JlZW4uIFN0YXJ0IGRyYXdpbmcgd2l0aCBTdXBlcitBbHQrRCBhbmQgc2F2ZSB5b3VyIGJlYXV0aWZ1bCB3b3JrIGJ5IHRha2luZyBhIHNjcmVlbnNob3QiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkcmF3LW9uLXlvdXItc2NyZWVuIiwKICAibmFtZSI6ICJEcmF3IE9uIFlvdXIgU2NyZWVuIDIiLAogICJwZXJzaXN0ZW50LWZpbGUtbmFtZSI6ICJwZXJzaXN0ZW50IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRyYXctb24teW91ci1zY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJzdmctZmlsZS1uYW1lIjogIkRyYXdPbllvdXJTY3JlZW4iLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3pocmV4bC9EcmF3T25Zb3VyU2NyZWVuMiIsCiAgInV1aWQiOiAiZHJhdy1vbi15b3VyLXNjcmVlbjJAemhyZXhsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} @@ -736,11 +737,11 @@ , {"uuid": "nextcloud-folder@cosinus.org", "name": "Nextcloud Folder", "pname": "nextcloud-folder", "description": "Simple and lightweight GNOME 42+ extension to open Nextcloud folder in one click.", "link": "https://extensions.gnome.org/extension/4983/nextcloud-folder/", "shell_version_map": {"42": {"version": "5", "sha256": "0hmkpvd3lsq2wgvn3s2lg14yya80gwbfzncqv7xkwdcxj74kssqa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbGlnaHR3ZWlnaHQgR05PTUUgNDIrIGV4dGVuc2lvbiB0byBvcGVuIE5leHRjbG91ZCBmb2xkZXIgaW4gb25lIGNsaWNrLiIsCiAgIm5hbWUiOiAiTmV4dGNsb3VkIEZvbGRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXh0Y2xvdWQtZm9sZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGVzY2RiL25leHRjbG91ZC1mb2xkZXIiLAogICJ1dWlkIjogIm5leHRjbG91ZC1mb2xkZXJAY29zaW51cy5vcmciLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "0hmkpvd3lsq2wgvn3s2lg14yya80gwbfzncqv7xkwdcxj74kssqa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbGlnaHR3ZWlnaHQgR05PTUUgNDIrIGV4dGVuc2lvbiB0byBvcGVuIE5leHRjbG91ZCBmb2xkZXIgaW4gb25lIGNsaWNrLiIsCiAgIm5hbWUiOiAiTmV4dGNsb3VkIEZvbGRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXh0Y2xvdWQtZm9sZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGVzY2RiL25leHRjbG91ZC1mb2xkZXIiLAogICJ1dWlkIjogIm5leHRjbG91ZC1mb2xkZXJAY29zaW51cy5vcmciLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "php-laravel-valet@rahulhaque", "name": "PHP Laravel Valet", "pname": "php-laravel-valet", "description": "A PHP Laravel Valet status indicator and manager.", "link": "https://extensions.gnome.org/extension/4985/php-laravel-valet/", "shell_version_map": {"40": {"version": "4", "sha256": "0h1hfh8i6sqzi0dy0sbh35s7flncqwpsxha4yr1bgrmg2a0gshzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUEhQIExhcmF2ZWwgVmFsZXQgc3RhdHVzIGluZGljYXRvciBhbmQgbWFuYWdlci4iLAogICJuYW1lIjogIlBIUCBMYXJhdmVsIFZhbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFodWxoYXF1ZS9waHAtbGFyYXZlbC12YWxldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBocC1sYXJhdmVsLXZhbGV0QHJhaHVsaGFxdWUiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0h1hfh8i6sqzi0dy0sbh35s7flncqwpsxha4yr1bgrmg2a0gshzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUEhQIExhcmF2ZWwgVmFsZXQgc3RhdHVzIGluZGljYXRvciBhbmQgbWFuYWdlci4iLAogICJuYW1lIjogIlBIUCBMYXJhdmVsIFZhbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFodWxoYXF1ZS9waHAtbGFyYXZlbC12YWxldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBocC1sYXJhdmVsLXZhbGV0QHJhaHVsaGFxdWUiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "0h1hfh8i6sqzi0dy0sbh35s7flncqwpsxha4yr1bgrmg2a0gshzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUEhQIExhcmF2ZWwgVmFsZXQgc3RhdHVzIGluZGljYXRvciBhbmQgbWFuYWdlci4iLAogICJuYW1lIjogIlBIUCBMYXJhdmVsIFZhbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFodWxoYXF1ZS9waHAtbGFyYXZlbC12YWxldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBocC1sYXJhdmVsLXZhbGV0QHJhaHVsaGFxdWUiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "Home-Server@sven.kramer", "name": "Home-Server", "pname": "home-server", "description": "A simple Indicator that shows my home-server status (online / offline) on the main panel. Furthermore a wake on lan can be triggered. For WOL functionality, its necessary that you have 'wakeonlan' installed.", "link": "https://extensions.gnome.org/extension/4989/home-server/", "shell_version_map": {"38": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "dash2dock-lite@icedman.github.com", "name": "Dash2Dock Lite", "pname": "dash2dock-lite", "description": "The Animated & Effectful Dock", "link": "https://extensions.gnome.org/extension/4994/dash2dock-lite/", "shell_version_map": {"40": {"version": "25", "sha256": "11qz2fv5fq1y64rk9ap0l6wclir7wpz3pz170mxidwp6lmdjhys2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "25", "sha256": "11qz2fv5fq1y64rk9ap0l6wclir7wpz3pz170mxidwp6lmdjhys2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "42": {"version": "25", "sha256": "11qz2fv5fq1y64rk9ap0l6wclir7wpz3pz170mxidwp6lmdjhys2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "43": {"version": "25", "sha256": "11qz2fv5fq1y64rk9ap0l6wclir7wpz3pz170mxidwp6lmdjhys2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjUKfQ=="}}} +, {"uuid": "dash2dock-lite@icedman.github.com", "name": "Dash2Dock Lite", "pname": "dash2dock-lite", "description": "The Animated & Effectful Dock", "link": "https://extensions.gnome.org/extension/4994/dash2dock-lite/", "shell_version_map": {"40": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "41": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "42": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}, "43": {"version": "27", "sha256": "06cj6qw18kz8zx15g062f708iyy9w5802va50sk5d6lfsap2a3m7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSBBbmltYXRlZCAmIEVmZmVjdGZ1bCBEb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL2Rhc2gyZG9jay1saXRlIiwKICAidXVpZCI6ICJkYXNoMmRvY2stbGl0ZUBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjcKfQ=="}}} , {"uuid": "animate@eexpss.gmail.com", "name": "animate", "pname": "animate", "description": "Animated small man run through the screen. Scroll mouse can change deferent character. You can use your PNG characters instead of the original ones.", "link": "https://extensions.gnome.org/extension/4995/animate/", "shell_version_map": {"40": {"version": "4", "sha256": "1p110wz7wdr51z2fsn6z72lcnln13h8lfbw9a00hs9qb0y71qf5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGVkIHNtYWxsIG1hbiBydW4gdGhyb3VnaCB0aGUgc2NyZWVuLiBTY3JvbGwgbW91c2UgY2FuIGNoYW5nZSBkZWZlcmVudCBjaGFyYWN0ZXIuIFlvdSBjYW4gdXNlIHlvdXIgUE5HIGNoYXJhY3RlcnMgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgb25lcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhbmltYXRlIiwKICAibmFtZSI6ICJhbmltYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtYW5pbWF0ZSIsCiAgInV1aWQiOiAiYW5pbWF0ZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1p110wz7wdr51z2fsn6z72lcnln13h8lfbw9a00hs9qb0y71qf5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGVkIHNtYWxsIG1hbiBydW4gdGhyb3VnaCB0aGUgc2NyZWVuLiBTY3JvbGwgbW91c2UgY2FuIGNoYW5nZSBkZWZlcmVudCBjaGFyYWN0ZXIuIFlvdSBjYW4gdXNlIHlvdXIgUE5HIGNoYXJhY3RlcnMgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgb25lcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhbmltYXRlIiwKICAibmFtZSI6ICJhbmltYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtYW5pbWF0ZSIsCiAgInV1aWQiOiAiYW5pbWF0ZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "1p110wz7wdr51z2fsn6z72lcnln13h8lfbw9a00hs9qb0y71qf5q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGVkIHNtYWxsIG1hbiBydW4gdGhyb3VnaCB0aGUgc2NyZWVuLiBTY3JvbGwgbW91c2UgY2FuIGNoYW5nZSBkZWZlcmVudCBjaGFyYWN0ZXIuIFlvdSBjYW4gdXNlIHlvdXIgUE5HIGNoYXJhY3RlcnMgaW5zdGVhZCBvZiB0aGUgb3JpZ2luYWwgb25lcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhbmltYXRlIiwKICAibmFtZSI6ICJhbmltYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3MtYW5pbWF0ZSIsCiAgInV1aWQiOiAiYW5pbWF0ZUBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "legacyschemeautoswitcher@joshimukul29.gmail.com", "name": "Legacy (GTK3) Theme Scheme Auto Switcher", "pname": "legacy-gtk3-theme-scheme-auto-switcher", "description": "Change the GTK3 theme to light/dark variant based on the system color scheme on Gnome 42", "link": "https://extensions.gnome.org/extension/4998/legacy-gtk3-theme-scheme-auto-switcher/", "shell_version_map": {"42": {"version": "4", "sha256": "022drnhrqmgpgfsikxwhy82bds27mr8h1wxm2hh4pry6smmdgx2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUgb24gR25vbWUgNDIiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211a3VsMjkvbGVnYWN5LXRoZW1lLWF1dG8tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJsZWdhY3lzY2hlbWVhdXRvc3dpdGNoZXJAam9zaGltdWt1bDI5LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "022drnhrqmgpgfsikxwhy82bds27mr8h1wxm2hh4pry6smmdgx2d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUgb24gR25vbWUgNDIiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL211a3VsMjkvbGVnYWN5LXRoZW1lLWF1dG8tc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJsZWdhY3lzY2hlbWVhdXRvc3dpdGNoZXJAam9zaGltdWt1bDI5LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "dash-to-dock-cosmic-@halfmexicanhalfamazing@gmail.com", "name": "Dash to Dock for COSMIC", "pname": "dash-to-dock-for-cosmic", "description": "A Dash to Dock fork for the COSMIC/GNOME Shell, fixes conflict with Cosmic Workspace. It prevents Cosmic Workspaces from breaking after suspend.\n\nAdds Features:\nDock Alignment\nCustom Border Radius\nCustom Margins", "link": "https://extensions.gnome.org/extension/5004/dash-to-dock-for-cosmic/", "shell_version_map": {"40": {"version": "20", "sha256": "0gr31f557aas7dgm67gcmdhgnw0iyih4lwckbhsz62i7c6v43f3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC5cblxuQWRkcyBGZWF0dXJlczpcbkRvY2sgQWxpZ25tZW50XG5DdXN0b20gQm9yZGVyIFJhZGl1c1xuQ3VzdG9tIE1hcmdpbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "0gr31f557aas7dgm67gcmdhgnw0iyih4lwckbhsz62i7c6v43f3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC5cblxuQWRkcyBGZWF0dXJlczpcbkRvY2sgQWxpZ25tZW50XG5DdXN0b20gQm9yZGVyIFJhZGl1c1xuQ3VzdG9tIE1hcmdpbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "42": {"version": "20", "sha256": "0gr31f557aas7dgm67gcmdhgnw0iyih4lwckbhsz62i7c6v43f3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC5cblxuQWRkcyBGZWF0dXJlczpcbkRvY2sgQWxpZ25tZW50XG5DdXN0b20gQm9yZGVyIFJhZGl1c1xuQ3VzdG9tIE1hcmdpbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "43": {"version": "20", "sha256": "0gr31f557aas7dgm67gcmdhgnw0iyih4lwckbhsz62i7c6v43f3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC5cblxuQWRkcyBGZWF0dXJlczpcbkRvY2sgQWxpZ25tZW50XG5DdXN0b20gQm9yZGVyIFJhZGl1c1xuQ3VzdG9tIE1hcmdpbnMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9oYWxmbWV4aWNhbi9kYXNoLXRvLWRvY2stcG9wL3RyZWUvdWJ1bnR1LWRvY2siLAogICJ1dWlkIjogImRhc2gtdG8tZG9jay1jb3NtaWMtQGhhbGZtZXhpY2FuaGFsZmFtYXppbmdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}}} -, {"uuid": "rclone-manager@germanztz.com", "name": "rclone-manager", "pname": "rclone-manager", "description": "Is like Dropbox sync client but for more than 30 services, adds an indicator to the top panel so you can manage the rclone profiles configured in your system, perform operations such as mount as remote, watch for file modifications, sync with remote storage, navigate it's main folder. Also, it shows the status of each profile so you can supervise the operations, and provides an easy access log of events. Backup and restore the rclone configuration file, so you won't have to configure all your devices one by one", "link": "https://extensions.gnome.org/extension/5006/rclone-manager/", "shell_version_map": {"40": {"version": "7", "sha256": "04wpr0qjlgwsdax3j91sp2ihwpprk5imfahmhbcvy1pcc5a68b94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dlcm1hbnp0ei9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmNsb25lLW1hbmFnZXIiLAogICJ1dWlkIjogInJjbG9uZS1tYW5hZ2VyQGdlcm1hbnp0ei5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "04wpr0qjlgwsdax3j91sp2ihwpprk5imfahmhbcvy1pcc5a68b94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dlcm1hbnp0ei9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmNsb25lLW1hbmFnZXIiLAogICJ1dWlkIjogInJjbG9uZS1tYW5hZ2VyQGdlcm1hbnp0ei5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "rclone-manager@germanztz.com", "name": "rclone-manager", "pname": "rclone-manager", "description": "Is like Dropbox sync client but for more than 30 services, adds an indicator to the top panel so you can manage the rclone profiles configured in your system, perform operations such as mount as remote, watch for file modifications, sync with remote storage, navigate it's main folder. Also, it shows the status of each profile so you can supervise the operations, and provides an easy access log of events. Backup and restore the rclone configuration file, so you won't have to configure all your devices one by one", "link": "https://extensions.gnome.org/extension/5006/rclone-manager/", "shell_version_map": {"40": {"version": "8", "sha256": "1idgrrqcp4pk65b212bwabq0fycsp9amc59svk986izprbmrsysy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "1idgrrqcp4pk65b212bwabq0fycsp9amc59svk986izprbmrsysy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "43": {"version": "8", "sha256": "1idgrrqcp4pk65b212bwabq0fycsp9amc59svk986izprbmrsysy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIklzIGxpa2UgRHJvcGJveCBzeW5jIGNsaWVudCBidXQgZm9yIG1vcmUgdGhhbiAzMCBzZXJ2aWNlcywgYWRkcyBhbiBpbmRpY2F0b3IgdG8gdGhlIHRvcCBwYW5lbCBzbyB5b3UgY2FuIG1hbmFnZSB0aGUgcmNsb25lIHByb2ZpbGVzIGNvbmZpZ3VyZWQgaW4geW91ciBzeXN0ZW0sIHBlcmZvcm0gb3BlcmF0aW9ucyBzdWNoIGFzIG1vdW50IGFzIHJlbW90ZSwgd2F0Y2ggZm9yIGZpbGUgbW9kaWZpY2F0aW9ucywgc3luYyB3aXRoIHJlbW90ZSBzdG9yYWdlLCBuYXZpZ2F0ZSBpdCdzIG1haW4gZm9sZGVyLiBBbHNvLCBpdCBzaG93cyB0aGUgc3RhdHVzIG9mIGVhY2ggcHJvZmlsZSBzbyB5b3UgY2FuIHN1cGVydmlzZSB0aGUgb3BlcmF0aW9ucywgYW5kIHByb3ZpZGVzIGFuIGVhc3kgYWNjZXNzIGxvZyBvZiBldmVudHMuIEJhY2t1cCBhbmQgcmVzdG9yZSB0aGUgcmNsb25lIGNvbmZpZ3VyYXRpb24gZmlsZSwgc28geW91IHdvbid0IGhhdmUgdG8gY29uZmlndXJlIGFsbCB5b3VyIGRldmljZXMgb25lIGJ5IG9uZSIsCiAgIm5hbWUiOiAicmNsb25lLW1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9nZXJtYW56dHovZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXJjbG9uZS1tYW5hZ2VyIiwKICAidXVpZCI6ICJyY2xvbmUtbWFuYWdlckBnZXJtYW56dHouY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "GPU_profile_selector@lorenzo9904.gmail.com", "name": "GPU profile selector", "pname": "gpu-profile-selector", "description": "You need also envycontrol(https://github.com/geminis3/envycontrol) for making this extension working. This is a simple gnome-shell extension which provides a simple way to switch between GPU profiles on Nvidia Optimus systems (i.e laptops with Intel + Nvidia or AMD + Nvidia configurations) in a few clicks.", "link": "https://extensions.gnome.org/extension/5009/gpu-profile-selector/", "shell_version_map": {"38": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "43": {"version": "13", "sha256": "1ad0swz0nh0srpkxcrwa33y70i94m8082slgp6f1pvynw8g79yq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdSBuZWVkIGFsc28gZW52eWNvbnRyb2woaHR0cHM6Ly9naXRodWIuY29tL2dlbWluaXMzL2Vudnljb250cm9sKSBmb3IgbWFraW5nIHRoaXMgZXh0ZW5zaW9uIHdvcmtpbmcuIFRoaXMgaXMgYSBzaW1wbGUgZ25vbWUtc2hlbGwgZXh0ZW5zaW9uIHdoaWNoIHByb3ZpZGVzIGEgc2ltcGxlIHdheSB0byBzd2l0Y2ggYmV0d2VlbiBHUFUgcHJvZmlsZXMgb24gTnZpZGlhIE9wdGltdXMgc3lzdGVtcyAoaS5lIGxhcHRvcHMgd2l0aCBJbnRlbCArIE52aWRpYSBvciBBTUQgKyBOdmlkaWEgY29uZmlndXJhdGlvbnMpIGluIGEgZmV3IGNsaWNrcy4iLAogICJuYW1lIjogIkdQVSBwcm9maWxlIHNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xvcmVuem9Nb3JlbGxpL0dQVV9wcm9maWxlX3NlbGVjdG9yIiwKICAidXVpZCI6ICJHUFVfcHJvZmlsZV9zZWxlY3RvckBsb3JlbnpvOTkwNC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} , {"uuid": "username-to-activities@deserts", "name": "Replace Activities text with username", "pname": "replce-activities-text-with-username", "description": "Replace Activities text with username.\nThis is a fork of Replace Activities Text by pratap@fastmail.fm", "link": "https://extensions.gnome.org/extension/5010/replce-activities-text-with-username/", "shell_version_map": {"38": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}, "43": {"version": "4", "sha256": "1maijvklrzknhxayg72gbrrx410vkbvc7na1gn3kx9yxm8ckikbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUuXG5UaGlzIGlzIGEgZm9yayBvZiBSZXBsYWNlIEFjdGl2aXRpZXMgVGV4dCBieSBwcmF0YXBAZmFzdG1haWwuZm0iLAogICJuYW1lIjogIlJlcGxhY2UgQWN0aXZpdGllcyB0ZXh0IHdpdGggdXNlcm5hbWUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAicHJhdGFwQGZhc3RtYWlsLmZtIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rlc2VydHN0c3VuZy91c2VybmFtZS10by1hY3Rpdml0aWVzIiwKICAidXVpZCI6ICJ1c2VybmFtZS10by1hY3Rpdml0aWVzQGRlc2VydHMiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "overview-dash-hide@rokenz05.github.com", "name": "Overview Dash Hide", "pname": "overview-dash-hide", "description": "Hide dash to dock in activities overview", "link": "https://extensions.gnome.org/extension/5013/overview-dash-hide/", "shell_version_map": {"42": {"version": "1", "sha256": "1i0s0gjyml0q8lz08pwh1nva2yrf5vydpcrz2ncz46qvpjhik7dm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgZGFzaCB0byBkb2NrIGluIGFjdGl2aXRpZXMgb3ZlcnZpZXciLAogICJuYW1lIjogIk92ZXJ2aWV3IERhc2ggSGlkZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAib3ZlcnZpZXctZGFzaC1oaWRlQHJva2VuejA1LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} @@ -754,7 +755,7 @@ , {"uuid": "SomaFm-Radio@cajhne.gmail.com", "name": "SomaFM internet radio", "pname": "somafm-internet-radio", "description": "Listen to SomaFm free internet radio in your GNOME desktop\n\n* Featues:\n- 32+ Channels\n- Volume slider\n- Favorites menu\n- Good sound quality\n- Supports most gnome-shell versions\n- Channel logos\n\n* Requirements:\n- Gstreamer and plugins:\nYou need to install 'gstreamer' and multimedia codecs/plugins for your distro.\n\n* Donation\nYou can donate if you like my work :)\n\nBTC: 1KXJPJSmXUocieC3neRZEDakpzfcyumLqS\nBCH : qzzmzegfy76r5glpj26jzq2xly2cczsmfyrn66ax8q\nETHER: 0xb6178080c8f0792e6370959909199647e26b8457", "link": "https://extensions.gnome.org/extension/5064/somafm-internet-radio/", "shell_version_map": {"38": {"version": "1", "sha256": "0k92wz17isih4sph7ssidcjddi7r4xvcha1pi9vb7dnwrhc6x1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby5cblxuKiBEb25hdGlvblxuWW91IGNhbiBkb25hdGUgaWYgeW91IGxpa2UgbXkgd29yayA6KVxuXG5CVEM6IDFLWEpQSlNtWFVvY2llQzNuZVJaRURha3B6ZmN5dW1McVNcbkJDSCA6IHF6em16ZWdmeTc2cjVnbHBqMjZqenEyeGx5MmNjenNtZnlybjY2YXg4cVxuRVRIRVI6IDB4YjYxNzgwODBjOGYwNzkyZTYzNzA5NTk5MDkxOTk2NDdlMjZiODQ1NyIsCiAgIm5hbWUiOiAiU29tYUZNIGludGVybmV0IHJhZGlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AY2FqaG5lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "0k92wz17isih4sph7ssidcjddi7r4xvcha1pi9vb7dnwrhc6x1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby5cblxuKiBEb25hdGlvblxuWW91IGNhbiBkb25hdGUgaWYgeW91IGxpa2UgbXkgd29yayA6KVxuXG5CVEM6IDFLWEpQSlNtWFVvY2llQzNuZVJaRURha3B6ZmN5dW1McVNcbkJDSCA6IHF6em16ZWdmeTc2cjVnbHBqMjZqenEyeGx5MmNjenNtZnlybjY2YXg4cVxuRVRIRVI6IDB4YjYxNzgwODBjOGYwNzkyZTYzNzA5NTk5MDkxOTk2NDdlMjZiODQ1NyIsCiAgIm5hbWUiOiAiU29tYUZNIGludGVybmV0IHJhZGlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AY2FqaG5lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "0k92wz17isih4sph7ssidcjddi7r4xvcha1pi9vb7dnwrhc6x1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby5cblxuKiBEb25hdGlvblxuWW91IGNhbiBkb25hdGUgaWYgeW91IGxpa2UgbXkgd29yayA6KVxuXG5CVEM6IDFLWEpQSlNtWFVvY2llQzNuZVJaRURha3B6ZmN5dW1McVNcbkJDSCA6IHF6em16ZWdmeTc2cjVnbHBqMjZqenEyeGx5MmNjenNtZnlybjY2YXg4cVxuRVRIRVI6IDB4YjYxNzgwODBjOGYwNzkyZTYzNzA5NTk5MDkxOTk2NDdlMjZiODQ1NyIsCiAgIm5hbWUiOiAiU29tYUZNIGludGVybmV0IHJhZGlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AY2FqaG5lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "0k92wz17isih4sph7ssidcjddi7r4xvcha1pi9vb7dnwrhc6x1hg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby5cblxuKiBEb25hdGlvblxuWW91IGNhbiBkb25hdGUgaWYgeW91IGxpa2UgbXkgd29yayA6KVxuXG5CVEM6IDFLWEpQSlNtWFVvY2llQzNuZVJaRURha3B6ZmN5dW1McVNcbkJDSCA6IHF6em16ZWdmeTc2cjVnbHBqMjZqenEyeGx5MmNjenNtZnlybjY2YXg4cVxuRVRIRVI6IDB4YjYxNzgwODBjOGYwNzkyZTYzNzA5NTk5MDkxOTk2NDdlMjZiODQ1NyIsCiAgIm5hbWUiOiAiU29tYUZNIGludGVybmV0IHJhZGlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwOi8vZ2l0aHViLmNvbS9UaGVXZWlyZERldi9zb21hZm0tcmFkaW8tZ25vbWUtZXh0IiwKICAidXVpZCI6ICJTb21hRm0tUmFkaW9AY2FqaG5lLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "dollar-clp@albolea.github.com", "name": "Dollar-CLP", "pname": "dollar-clp", "description": "(USD US Dollar) converted to (CLP Peso Chileno). Updates are received every 30 seconds and are based on information provided by AwesomeAPI API, which can be consulted directly by accessing the address https://docs.awesomeapi.com.br. (based on michael.mattos's Dollar https://extensions.gnome.org/extension/4573/dollar/)", "link": "https://extensions.gnome.org/extension/5066/dollar-clp/", "shell_version_map": {"38": {"version": "2", "sha256": "0lc7mx77qvxx2q04bljza8pv1p98sv5qyi7rpbmr572yalxmsyv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKENMUCBQZXNvIENoaWxlbm8pLiBVcGRhdGVzIGFyZSByZWNlaXZlZCBldmVyeSAzMCBzZWNvbmRzIGFuZCBhcmUgYmFzZWQgb24gaW5mb3JtYXRpb24gcHJvdmlkZWQgYnkgQXdlc29tZUFQSSBBUEksIHdoaWNoIGNhbiBiZSBjb25zdWx0ZWQgZGlyZWN0bHkgYnkgYWNjZXNzaW5nIHRoZSBhZGRyZXNzIGh0dHBzOi8vZG9jcy5hd2Vzb21lYXBpLmNvbS5ici4gKGJhc2VkIG9uIG1pY2hhZWwubWF0dG9zJ3MgRG9sbGFyIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ1NzMvZG9sbGFyLykiLAogICJuYW1lIjogIkRvbGxhci1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL2RvbGxhci1jbHAiLAogICJ1dWlkIjogImRvbGxhci1jbHBAYWxib2xlYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "0lc7mx77qvxx2q04bljza8pv1p98sv5qyi7rpbmr572yalxmsyv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKENMUCBQZXNvIENoaWxlbm8pLiBVcGRhdGVzIGFyZSByZWNlaXZlZCBldmVyeSAzMCBzZWNvbmRzIGFuZCBhcmUgYmFzZWQgb24gaW5mb3JtYXRpb24gcHJvdmlkZWQgYnkgQXdlc29tZUFQSSBBUEksIHdoaWNoIGNhbiBiZSBjb25zdWx0ZWQgZGlyZWN0bHkgYnkgYWNjZXNzaW5nIHRoZSBhZGRyZXNzIGh0dHBzOi8vZG9jcy5hd2Vzb21lYXBpLmNvbS5ici4gKGJhc2VkIG9uIG1pY2hhZWwubWF0dG9zJ3MgRG9sbGFyIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ1NzMvZG9sbGFyLykiLAogICJuYW1lIjogIkRvbGxhci1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL2RvbGxhci1jbHAiLAogICJ1dWlkIjogImRvbGxhci1jbHBAYWxib2xlYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0lc7mx77qvxx2q04bljza8pv1p98sv5qyi7rpbmr572yalxmsyv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKENMUCBQZXNvIENoaWxlbm8pLiBVcGRhdGVzIGFyZSByZWNlaXZlZCBldmVyeSAzMCBzZWNvbmRzIGFuZCBhcmUgYmFzZWQgb24gaW5mb3JtYXRpb24gcHJvdmlkZWQgYnkgQXdlc29tZUFQSSBBUEksIHdoaWNoIGNhbiBiZSBjb25zdWx0ZWQgZGlyZWN0bHkgYnkgYWNjZXNzaW5nIHRoZSBhZGRyZXNzIGh0dHBzOi8vZG9jcy5hd2Vzb21lYXBpLmNvbS5ici4gKGJhc2VkIG9uIG1pY2hhZWwubWF0dG9zJ3MgRG9sbGFyIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ1NzMvZG9sbGFyLykiLAogICJuYW1lIjogIkRvbGxhci1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL2RvbGxhci1jbHAiLAogICJ1dWlkIjogImRvbGxhci1jbHBAYWxib2xlYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "0lc7mx77qvxx2q04bljza8pv1p98sv5qyi7rpbmr572yalxmsyv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihVU0QgVVMgRG9sbGFyKSBjb252ZXJ0ZWQgdG8gKENMUCBQZXNvIENoaWxlbm8pLiBVcGRhdGVzIGFyZSByZWNlaXZlZCBldmVyeSAzMCBzZWNvbmRzIGFuZCBhcmUgYmFzZWQgb24gaW5mb3JtYXRpb24gcHJvdmlkZWQgYnkgQXdlc29tZUFQSSBBUEksIHdoaWNoIGNhbiBiZSBjb25zdWx0ZWQgZGlyZWN0bHkgYnkgYWNjZXNzaW5nIHRoZSBhZGRyZXNzIGh0dHBzOi8vZG9jcy5hd2Vzb21lYXBpLmNvbS5ici4gKGJhc2VkIG9uIG1pY2hhZWwubWF0dG9zJ3MgRG9sbGFyIGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQ1NzMvZG9sbGFyLykiLAogICJuYW1lIjogIkRvbGxhci1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL2RvbGxhci1jbHAiLAogICJ1dWlkIjogImRvbGxhci1jbHBAYWxib2xlYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "real-clp@albolea.github.com", "name": "Real-CLP", "pname": "real-clp", "description": "(BRL Brazil Real) converted to (CLP Peso Chileno). Updates are received every 30 seconds and are based on information provided by AwesomeAPI API, which can be consulted directly by accessing the address https://docs.awesomeapi.com.br. (based on michael.mattos's Dollar https://extensions.gnome.org/extension/4573/dollar/)", "link": "https://extensions.gnome.org/extension/5069/real-clp/", "shell_version_map": {"38": {"version": "1", "sha256": "1kapkrz86qgxssas6wvf2rqmja0528j70b0dm9lhr88ya8rv4y93", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihCUkwgQnJhemlsIFJlYWwpIGNvbnZlcnRlZCB0byAoQ0xQIFBlc28gQ2hpbGVubykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMgYW5kIGFyZSBiYXNlZCBvbiBpbmZvcm1hdGlvbiBwcm92aWRlZCBieSBBd2Vzb21lQVBJIEFQSSwgd2hpY2ggY2FuIGJlIGNvbnN1bHRlZCBkaXJlY3RseSBieSBhY2Nlc3NpbmcgdGhlIGFkZHJlc3MgaHR0cHM6Ly9kb2NzLmF3ZXNvbWVhcGkuY29tLmJyLiAoYmFzZWQgb24gbWljaGFlbC5tYXR0b3MncyBEb2xsYXIgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDU3My9kb2xsYXIvKSIsCiAgIm5hbWUiOiAiUmVhbC1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL3JlYWwtY2xwIiwKICAidXVpZCI6ICJyZWFsLWNscEBhbGJvbGVhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "1kapkrz86qgxssas6wvf2rqmja0528j70b0dm9lhr88ya8rv4y93", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihCUkwgQnJhemlsIFJlYWwpIGNvbnZlcnRlZCB0byAoQ0xQIFBlc28gQ2hpbGVubykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMgYW5kIGFyZSBiYXNlZCBvbiBpbmZvcm1hdGlvbiBwcm92aWRlZCBieSBBd2Vzb21lQVBJIEFQSSwgd2hpY2ggY2FuIGJlIGNvbnN1bHRlZCBkaXJlY3RseSBieSBhY2Nlc3NpbmcgdGhlIGFkZHJlc3MgaHR0cHM6Ly9kb2NzLmF3ZXNvbWVhcGkuY29tLmJyLiAoYmFzZWQgb24gbWljaGFlbC5tYXR0b3MncyBEb2xsYXIgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDU3My9kb2xsYXIvKSIsCiAgIm5hbWUiOiAiUmVhbC1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL3JlYWwtY2xwIiwKICAidXVpZCI6ICJyZWFsLWNscEBhbGJvbGVhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "1kapkrz86qgxssas6wvf2rqmja0528j70b0dm9lhr88ya8rv4y93", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihCUkwgQnJhemlsIFJlYWwpIGNvbnZlcnRlZCB0byAoQ0xQIFBlc28gQ2hpbGVubykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMgYW5kIGFyZSBiYXNlZCBvbiBpbmZvcm1hdGlvbiBwcm92aWRlZCBieSBBd2Vzb21lQVBJIEFQSSwgd2hpY2ggY2FuIGJlIGNvbnN1bHRlZCBkaXJlY3RseSBieSBhY2Nlc3NpbmcgdGhlIGFkZHJlc3MgaHR0cHM6Ly9kb2NzLmF3ZXNvbWVhcGkuY29tLmJyLiAoYmFzZWQgb24gbWljaGFlbC5tYXR0b3MncyBEb2xsYXIgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDU3My9kb2xsYXIvKSIsCiAgIm5hbWUiOiAiUmVhbC1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL3JlYWwtY2xwIiwKICAidXVpZCI6ICJyZWFsLWNscEBhbGJvbGVhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "42": {"version": "1", "sha256": "1kapkrz86qgxssas6wvf2rqmja0528j70b0dm9lhr88ya8rv4y93", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIihCUkwgQnJhemlsIFJlYWwpIGNvbnZlcnRlZCB0byAoQ0xQIFBlc28gQ2hpbGVubykuIFVwZGF0ZXMgYXJlIHJlY2VpdmVkIGV2ZXJ5IDMwIHNlY29uZHMgYW5kIGFyZSBiYXNlZCBvbiBpbmZvcm1hdGlvbiBwcm92aWRlZCBieSBBd2Vzb21lQVBJIEFQSSwgd2hpY2ggY2FuIGJlIGNvbnN1bHRlZCBkaXJlY3RseSBieSBhY2Nlc3NpbmcgdGhlIGFkZHJlc3MgaHR0cHM6Ly9kb2NzLmF3ZXNvbWVhcGkuY29tLmJyLiAoYmFzZWQgb24gbWljaGFlbC5tYXR0b3MncyBEb2xsYXIgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vNDU3My9kb2xsYXIvKSIsCiAgIm5hbWUiOiAiUmVhbC1DTFAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbGJvbGVhL3JlYWwtY2xwIiwKICAidXVpZCI6ICJyZWFsLWNscEBhbGJvbGVhLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "one-thing@github.com", "name": "One Thing", "pname": "one-thing", "description": "Put a single task or goal in your menu bar", "link": "https://extensions.gnome.org/extension/5072/one-thing/", "shell_version_map": {"38": {"version": "4", "sha256": "1bbxd87gj8wv79z1flcija6gsrl0jycnfya5mn92vqmkarjs1sn9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vb25lLXRoaW5nIiwKICAidXVpZCI6ICJvbmUtdGhpbmdAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1bbxd87gj8wv79z1flcija6gsrl0jycnfya5mn92vqmkarjs1sn9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vb25lLXRoaW5nIiwKICAidXVpZCI6ICJvbmUtdGhpbmdAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "5", "sha256": "18qxzc6qcdgzfbb5ffbc4gn5kp3mzggwk6bdxzy1gvcmbg9lnk7j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW50ZWhlbWVyc29uL29uZS10aGluZyIsCiAgInV1aWQiOiAib25lLXRoaW5nQGdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "43": {"version": "5", "sha256": "18qxzc6qcdgzfbb5ffbc4gn5kp3mzggwk6bdxzy1gvcmbg9lnk7j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW50ZWhlbWVyc29uL29uZS10aGluZyIsCiAgInV1aWQiOiAib25lLXRoaW5nQGdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} +, {"uuid": "one-thing@github.com", "name": "One Thing", "pname": "one-thing", "description": "Put a single task or goal in your menu bar", "link": "https://extensions.gnome.org/extension/5072/one-thing/", "shell_version_map": {"38": {"version": "9", "sha256": "0idcih4hqy18r215vpxlfpi7ar9vk2nkw7bd204rn9lhlj3rlvj7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vb25lLXRoaW5nIiwKICAidXVpZCI6ICJvbmUtdGhpbmdAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "9", "sha256": "0idcih4hqy18r215vpxlfpi7ar9vk2nkw7bd204rn9lhlj3rlvj7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vb25lLXRoaW5nIiwKICAidXVpZCI6ICJvbmUtdGhpbmdAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "0idcih4hqy18r215vpxlfpi7ar9vk2nkw7bd204rn9lhlj3rlvj7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vb25lLXRoaW5nIiwKICAidXVpZCI6ICJvbmUtdGhpbmdAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "0idcih4hqy18r215vpxlfpi7ar9vk2nkw7bd204rn9lhlj3rlvj7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vb25lLXRoaW5nIiwKICAidXVpZCI6ICJvbmUtdGhpbmdAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "0idcih4hqy18r215vpxlfpi7ar9vk2nkw7bd204rn9lhlj3rlvj7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlB1dCBhIHNpbmdsZSB0YXNrIG9yIGdvYWwgaW4geW91ciBtZW51IGJhciIsCiAgIm5hbWUiOiAiT25lIFRoaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbnRlaGVtZXJzb24vb25lLXRoaW5nIiwKICAidXVpZCI6ICJvbmUtdGhpbmdAZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}}} , {"uuid": "vpn-toggler@rheddes.nl", "name": "VPN Toggler", "pname": "vpn-toggler", "description": "A forked version of (https://extensions.gnome.org/extension/4061/custom-vpn-toggler/).\nVPN Toggler (and indicator) allows to see the status of a VPN (with its icon), see IP address associated and permit to start and stop VPN (from a menu).\n\nThis plugin required an additional script to interact with VPN. \nAn example for Open VPN is available on extension repository. \nFollow the link to Extension Web Site and see README.", "link": "https://extensions.gnome.org/extension/5075/vpn-toggler/", "shell_version_map": {"42": {"version": "2", "sha256": "1xxxqzr8q6zjrvkdhlkq8nfa5nv56sdnm1fyl3nxv453hfhdqmzs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZm9ya2VkIHZlcnNpb24gb2YgKGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQwNjEvY3VzdG9tLXZwbi10b2dnbGVyLykuXG5WUE4gVG9nZ2xlciAoYW5kIGluZGljYXRvcikgYWxsb3dzIHRvIHNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSwgc2VlIElQIGFkZHJlc3MgYXNzb2NpYXRlZCBhbmQgcGVybWl0IHRvIHN0YXJ0IGFuZCBzdG9wIFZQTiAoZnJvbSBhIG1lbnUpLlxuXG5UaGlzIHBsdWdpbiByZXF1aXJlZCBhbiBhZGRpdGlvbmFsIHNjcmlwdCB0byBpbnRlcmFjdCB3aXRoIFZQTi4gXG5BbiBleGFtcGxlIGZvciBPcGVuIFZQTiBpcyBhdmFpbGFibGUgb24gZXh0ZW5zaW9uIHJlcG9zaXRvcnkuIFxuRm9sbG93IHRoZSBsaW5rIHRvIEV4dGVuc2lvbiBXZWIgU2l0ZSBhbmQgc2VlIFJFQURNRS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ2cG4tdG9nZ2xlckByaGVkZGVzLm5sIiwKICAibmFtZSI6ICJWUE4gVG9nZ2xlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52cG4tdG9nZ2xlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SaGVkZGVzL3Zwbi10b2dnbGVyIiwKICAidXVpZCI6ICJ2cG4tdG9nZ2xlckByaGVkZGVzLm5sIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "mozillavpn@inytar.github.com", "name": "Mozilla VPN Indicator", "pname": "mozilla-vpn-indicator", "description": "Toggle Mozilla VPN\n\nA simple indicator that can be used together with the Mozilla VPN linuxdaemon (https://github.com/mozilla-mobile/mozilla-vpn-client) to activate and deactivate the VPN.\n\nThis extension is in no way associated with Mozilla.", "link": "https://extensions.gnome.org/extension/5078/mozilla-vpn-indicator/", "shell_version_map": {"40": {"version": "1", "sha256": "18wq3m5ifvzwhj3pidfs2vnx0pj7w602iqizfgvp572qpxj6xayd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBNb3ppbGxhIFZQTlxuXG5BIHNpbXBsZSBpbmRpY2F0b3IgdGhhdCBjYW4gYmUgdXNlZCB0b2dldGhlciB3aXRoIHRoZSBNb3ppbGxhIFZQTiBsaW51eGRhZW1vbiAoaHR0cHM6Ly9naXRodWIuY29tL21vemlsbGEtbW9iaWxlL21vemlsbGEtdnBuLWNsaWVudCkgdG8gYWN0aXZhdGUgYW5kIGRlYWN0aXZhdGUgdGhlIFZQTi5cblxuVGhpcyBleHRlbnNpb24gaXMgaW4gbm8gd2F5IGFzc29jaWF0ZWQgd2l0aCBNb3ppbGxhLiIsCiAgIm5hbWUiOiAiTW96aWxsYSBWUE4gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW55dGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb3ppbGxhLXZwbiIsCiAgInV1aWQiOiAibW96aWxsYXZwbkBpbnl0YXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "18wq3m5ifvzwhj3pidfs2vnx0pj7w602iqizfgvp572qpxj6xayd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBNb3ppbGxhIFZQTlxuXG5BIHNpbXBsZSBpbmRpY2F0b3IgdGhhdCBjYW4gYmUgdXNlZCB0b2dldGhlciB3aXRoIHRoZSBNb3ppbGxhIFZQTiBsaW51eGRhZW1vbiAoaHR0cHM6Ly9naXRodWIuY29tL21vemlsbGEtbW9iaWxlL21vemlsbGEtdnBuLWNsaWVudCkgdG8gYWN0aXZhdGUgYW5kIGRlYWN0aXZhdGUgdGhlIFZQTi5cblxuVGhpcyBleHRlbnNpb24gaXMgaW4gbm8gd2F5IGFzc29jaWF0ZWQgd2l0aCBNb3ppbGxhLiIsCiAgIm5hbWUiOiAiTW96aWxsYSBWUE4gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW55dGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb3ppbGxhLXZwbiIsCiAgInV1aWQiOiAibW96aWxsYXZwbkBpbnl0YXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "18wq3m5ifvzwhj3pidfs2vnx0pj7w602iqizfgvp572qpxj6xayd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBNb3ppbGxhIFZQTlxuXG5BIHNpbXBsZSBpbmRpY2F0b3IgdGhhdCBjYW4gYmUgdXNlZCB0b2dldGhlciB3aXRoIHRoZSBNb3ppbGxhIFZQTiBsaW51eGRhZW1vbiAoaHR0cHM6Ly9naXRodWIuY29tL21vemlsbGEtbW9iaWxlL21vemlsbGEtdnBuLWNsaWVudCkgdG8gYWN0aXZhdGUgYW5kIGRlYWN0aXZhdGUgdGhlIFZQTi5cblxuVGhpcyBleHRlbnNpb24gaXMgaW4gbm8gd2F5IGFzc29jaWF0ZWQgd2l0aCBNb3ppbGxhLiIsCiAgIm5hbWUiOiAiTW96aWxsYSBWUE4gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW55dGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb3ppbGxhLXZwbiIsCiAgInV1aWQiOiAibW96aWxsYXZwbkBpbnl0YXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "this.simple-indication-of-workspaces@azate.email", "name": "Simple indication of workspaces", "pname": "simple-indication-of-workspaces", "description": "Workspace indication with an i3/polybar style.", "link": "https://extensions.gnome.org/extension/5081/simple-indication-of-workspaces/", "shell_version_map": {"42": {"version": "3", "sha256": "1xh6kgbb7lvlv6w663yz8a6jw93j5njjxqlgivjiq1s2rhhg3pqw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBsZSBpbmRpY2F0aW9uIG9mIHdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6YXRlL3NpbXBsZS1pbmRpY2F0aW9uLW9mLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInRoaXMuc2ltcGxlLWluZGljYXRpb24tb2Ytd29ya3NwYWNlc0BhemF0ZS5lbWFpbCIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "1xh6kgbb7lvlv6w663yz8a6jw93j5njjxqlgivjiq1s2rhhg3pqw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBsZSBpbmRpY2F0aW9uIG9mIHdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2F6YXRlL3NpbXBsZS1pbmRpY2F0aW9uLW9mLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInRoaXMuc2ltcGxlLWluZGljYXRpb24tb2Ytd29ya3NwYWNlc0BhemF0ZS5lbWFpbCIsCiAgInZlcnNpb24iOiAzCn0="}}} @@ -765,11 +766,11 @@ , {"uuid": "gnome-shellext-hide-lock@adyrosebrigg", "name": "Hide Lock item in System Menu", "pname": "hide-lock-item-in-system-menu", "description": "Hides the \"Lock\" option from the system menu dropdown in the top right.", "link": "https://extensions.gnome.org/extension/5091/hide-lock-item-in-system-menu/", "shell_version_map": {"42": {"version": "2", "sha256": "0ab3yc5z9yhvp21145cfgh88sby4x464argy12c80anyhf55zm79", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBcIkxvY2tcIiBvcHRpb24gZnJvbSB0aGUgc3lzdGVtIG1lbnUgZHJvcGRvd24gaW4gdGhlIHRvcCByaWdodC4iLAogICJuYW1lIjogIkhpZGUgTG9jayBpdGVtIGluIFN5c3RlbSBNZW51IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FkeXJvc2VicmlnZy9nbm9tZS1zaGVsbGV4dC1oaWRlLWxvY2siLAogICJ1dWlkIjogImdub21lLXNoZWxsZXh0LWhpZGUtbG9ja0BhZHlyb3NlYnJpZ2ciLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "favorites-apps-indicator@zecarneiro.pt", "name": "Favorites Apps Indicator", "pname": "favorites-apps-indicator", "description": "Your favorites commands and Apps Menu Indicator", "link": "https://extensions.gnome.org/extension/5096/favorites-apps-indicator/", "shell_version_map": {"42": {"version": "4", "sha256": "1hxb94bniwk0gvd4dk193rhjsqhawpcm3x5vi5djflqhc37bjzp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdXIgZmF2b3JpdGVzIGNvbW1hbmRzIGFuZCBBcHBzIE1lbnUgSW5kaWNhdG9yIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgQXBwcyBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkpvc1x1MDBlOSBNLiBDLiBOb3JvbmhhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3plY2FybmVpcm8vZmF2b3JpdGVzLWFwcHMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJmYXZvcml0ZXMtYXBwcy1pbmRpY2F0b3JAemVjYXJuZWlyby5wdCIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "hot-bottom@fthx", "name": "Hot Bottom", "pname": "hot-bottom", "description": "Enter overview when you hover the bottom of the screen. Very light extension.\n\n For GNOME Shell 40+. The width of the show zone is the same as the Gnome Shell dash.\n\n I'm not notified of messages here, please report bugs only through GitHub.", "link": "https://extensions.gnome.org/extension/5099/hot-bottom/", "shell_version_map": {"40": {"version": "3", "sha256": "1d50ibjfr9dzhpi45crxikrlqn2jlrqm2krsyfpdma8bqk1d3l7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVudGVyIG92ZXJ2aWV3IHdoZW4geW91IGhvdmVyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBGb3IgR05PTUUgU2hlbGwgNDArLiBUaGUgd2lkdGggb2YgdGhlIHNob3cgem9uZSBpcyB0aGUgc2FtZSBhcyB0aGUgR25vbWUgU2hlbGwgZGFzaC5cblxuIEknbSBub3Qgbm90aWZpZWQgb2YgbWVzc2FnZXMgaGVyZSwgcGxlYXNlIHJlcG9ydCBidWdzIG9ubHkgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJIb3QgQm90dG9tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaG90LWJvdHRvbSIsCiAgInV1aWQiOiAiaG90LWJvdHRvbUBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1d50ibjfr9dzhpi45crxikrlqn2jlrqm2krsyfpdma8bqk1d3l7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVudGVyIG92ZXJ2aWV3IHdoZW4geW91IGhvdmVyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBGb3IgR05PTUUgU2hlbGwgNDArLiBUaGUgd2lkdGggb2YgdGhlIHNob3cgem9uZSBpcyB0aGUgc2FtZSBhcyB0aGUgR25vbWUgU2hlbGwgZGFzaC5cblxuIEknbSBub3Qgbm90aWZpZWQgb2YgbWVzc2FnZXMgaGVyZSwgcGxlYXNlIHJlcG9ydCBidWdzIG9ubHkgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJIb3QgQm90dG9tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaG90LWJvdHRvbSIsCiAgInV1aWQiOiAiaG90LWJvdHRvbUBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1d50ibjfr9dzhpi45crxikrlqn2jlrqm2krsyfpdma8bqk1d3l7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVudGVyIG92ZXJ2aWV3IHdoZW4geW91IGhvdmVyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBGb3IgR05PTUUgU2hlbGwgNDArLiBUaGUgd2lkdGggb2YgdGhlIHNob3cgem9uZSBpcyB0aGUgc2FtZSBhcyB0aGUgR25vbWUgU2hlbGwgZGFzaC5cblxuIEknbSBub3Qgbm90aWZpZWQgb2YgbWVzc2FnZXMgaGVyZSwgcGxlYXNlIHJlcG9ydCBidWdzIG9ubHkgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJIb3QgQm90dG9tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaG90LWJvdHRvbSIsCiAgInV1aWQiOiAiaG90LWJvdHRvbUBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "1d50ibjfr9dzhpi45crxikrlqn2jlrqm2krsyfpdma8bqk1d3l7h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVudGVyIG92ZXJ2aWV3IHdoZW4geW91IGhvdmVyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBGb3IgR05PTUUgU2hlbGwgNDArLiBUaGUgd2lkdGggb2YgdGhlIHNob3cgem9uZSBpcyB0aGUgc2FtZSBhcyB0aGUgR25vbWUgU2hlbGwgZGFzaC5cblxuIEknbSBub3Qgbm90aWZpZWQgb2YgbWVzc2FnZXMgaGVyZSwgcGxlYXNlIHJlcG9ydCBidWdzIG9ubHkgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJIb3QgQm90dG9tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaG90LWJvdHRvbSIsCiAgInV1aWQiOiAiaG90LWJvdHRvbUBmdGh4IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "docker@stickman_0x00.com", "name": "Docker", "pname": "docker", "description": "Quick access to Docker and Docker Compose.", "link": "https://extensions.gnome.org/extension/5103/docker/", "shell_version_map": {"42": {"version": "16", "sha256": "19fv89mhh9xsdqhc8sgyq9fplc71svjm6f09n7z0578dcwkl75cy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zdGlja21hbl8weDAwL2dub21lX3NoZWxsX2V4dGVuc2lvbl9kb2NrZXIiLAogICJ1dWlkIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "19fv89mhh9xsdqhc8sgyq9fplc71svjm6f09n7z0578dcwkl75cy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zdGlja21hbl8weDAwL2dub21lX3NoZWxsX2V4dGVuc2lvbl9kb2NrZXIiLAogICJ1dWlkIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}}} -, {"uuid": "reboottouefi@ubaygd.com", "name": "RebootToUEFI", "pname": "reboottouefi", "description": "Reboot system into UEFI", "link": "https://extensions.gnome.org/extension/5105/reboottouefi/", "shell_version_map": {"42": {"version": "9", "sha256": "0f24likzn2min23l03ayn71qb3n3cl2fks7w6ijdwd7c7ns1k27d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9VYmF5R0QvcmVib290dG91ZWZpIiwKICAidXVpZCI6ICJyZWJvb3R0b3VlZmlAdWJheWdkLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "43": {"version": "9", "sha256": "0f24likzn2min23l03ayn71qb3n3cl2fks7w6ijdwd7c7ns1k27d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9VYmF5R0QvcmVib290dG91ZWZpIiwKICAidXVpZCI6ICJyZWJvb3R0b3VlZmlAdWJheWdkLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}}} +, {"uuid": "docker@stickman_0x00.com", "name": "Docker", "pname": "docker", "description": "Quick access to Docker and Docker Compose.", "link": "https://extensions.gnome.org/extension/5103/docker/", "shell_version_map": {"42": {"version": "17", "sha256": "1rz50l9119hdhznh3mm1pfm00rn7rw7xzlxfigf0m8xsfh179zyq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zdGlja21hbl8weDAwL2dub21lX3NoZWxsX2V4dGVuc2lvbl9kb2NrZXIiLAogICJ1dWlkIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "43": {"version": "17", "sha256": "1rz50l9119hdhznh3mm1pfm00rn7rw7xzlxfigf0m8xsfh179zyq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBEb2NrZXIgYW5kIERvY2tlciBDb21wb3NlLiIsCiAgIm5hbWUiOiAiRG9ja2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zdGlja21hbl8weDAwL2dub21lX3NoZWxsX2V4dGVuc2lvbl9kb2NrZXIiLAogICJ1dWlkIjogImRvY2tlckBzdGlja21hbl8weDAwLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}}} +, {"uuid": "reboottouefi@ubaygd.com", "name": "RebootToUEFI", "pname": "reboottouefi", "description": "Reboot system into UEFI", "link": "https://extensions.gnome.org/extension/5105/reboottouefi/", "shell_version_map": {"42": {"version": "10", "sha256": "0khvq6yahpbs82ikh4c33wq3wyaij7ijjvss9x55v9c4n1iym16d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9VYmF5R0QvcmVib290dG91ZWZpIiwKICAidXVpZCI6ICJyZWJvb3R0b3VlZmlAdWJheWdkLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "0khvq6yahpbs82ikh4c33wq3wyaij7ijjvss9x55v9c4n1iym16d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9VYmF5R0QvcmVib290dG91ZWZpIiwKICAidXVpZCI6ICJyZWJvb3R0b3VlZmlAdWJheWdkLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "touch-ux@dblandford.com", "name": "Touch-UX", "pname": "touch-ux", "description": "Provides a swipe up gesture bar and a status bar shortcut to force the on screen keyboard to show in scenarios that it does not automatically show when expected.", "link": "https://extensions.gnome.org/extension/5108/touch-ux/", "shell_version_map": {"42": {"version": "3", "sha256": "1vjchsz0jml0qaj2mz0khsagacxz1m60ypcjnymh3swrx9lj765m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByb3ZpZGVzIGEgc3dpcGUgdXAgZ2VzdHVyZSBiYXIgYW5kIGEgc3RhdHVzIGJhciBzaG9ydGN1dCB0byBmb3JjZSB0aGUgb24gc2NyZWVuIGtleWJvYXJkIHRvIHNob3cgaW4gc2NlbmFyaW9zIHRoYXQgaXQgZG9lcyBub3QgYXV0b21hdGljYWxseSBzaG93IHdoZW4gZXhwZWN0ZWQuIiwKICAibmFtZSI6ICJUb3VjaC1VWCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9EYW5pZWwtQmxhbmRmb3JkL1RvdWNoLVVYIiwKICAidXVpZCI6ICJ0b3VjaC11eEBkYmxhbmRmb3JkLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "display-scale-switcher@knokelmaat.gitlab.com", "name": "Display Scale Switcher", "pname": "display-scale-switcher", "description": "Quickly change the display scaling factor from the system menu.", "link": "https://extensions.gnome.org/extension/5111/display-scale-switcher/", "shell_version_map": {"42": {"version": "1", "sha256": "14yd0xzgqvqxq1s11pbspqn1y1sqjsdgq2giqkwf8r1n2rn1wc94", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IHNjYWxpbmcgZmFjdG9yIGZyb20gdGhlIHN5c3RlbSBtZW51LiIsCiAgIm5hbWUiOiAiRGlzcGxheSBTY2FsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9rbm9rZWxtYWF0L2Rpc3BsYXktc2NhbGUtc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LXNjYWxlLXN3aXRjaGVyQGtub2tlbG1hYXQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "43": {"version": "3", "sha256": "0lkyfzks9l7y784rswadfg831rfqk5jknzzg5pvbjqhyk6v22cc7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IHNjYWxpbmcgZmFjdG9yIGZyb20gdGhlIHN5c3RlbSBtZW51LiIsCiAgIm5hbWUiOiAiRGlzcGxheSBTY2FsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9rbm9rZWxtYWF0L2Rpc3BsYXktc2NhbGUtc3dpdGNoZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkaXNwbGF5LXNjYWxlLXN3aXRjaGVyQGtub2tlbG1hYXQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "tailscale-status@maxgallup.github.com", "name": "Tailscale Status", "pname": "tailscale-status", "description": "Manage Tailscale connections and check status from desktop read more at https://github.com/maxgallup/tailscale-status/blob/main/README.md", "link": "https://extensions.gnome.org/extension/5112/tailscale-status/", "shell_version_map": {"42": {"version": "16", "sha256": "1f69xhqy5qddqwswqsrq97jc0x65d5r95a38vp6vwkmdxlpf67sv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}, "43": {"version": "16", "sha256": "1f69xhqy5qddqwswqsrq97jc0x65d5r95a38vp6vwkmdxlpf67sv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNgp9"}}} +, {"uuid": "tailscale-status@maxgallup.github.com", "name": "Tailscale Status", "pname": "tailscale-status", "description": "Manage Tailscale connections and check status from desktop read more at https://github.com/maxgallup/tailscale-status/blob/main/README.md", "link": "https://extensions.gnome.org/extension/5112/tailscale-status/", "shell_version_map": {"42": {"version": "17", "sha256": "0s9fp09c9f0fnmqncmdia8gghmllgmv006iy3q63jq4cpy5978k9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "43": {"version": "17", "sha256": "0s9fp09c9f0fnmqncmdia8gghmllgmv006iy3q63jq4cpy5978k9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cyIsCiAgInV1aWQiOiAidGFpbHNjYWxlLXN0YXR1c0BtYXhnYWxsdXAuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}}} , {"uuid": "simple-timer@majortomvr.github.com", "name": "Simple Timer", "pname": "simple-timer", "description": "Simple Timer is a Gnome Shell Extension that adds a Timer to the Panel.", "link": "https://extensions.gnome.org/extension/5115/simple-timer/", "shell_version_map": {"41": {"version": "1", "sha256": "1k1qxygahg7h5x5g2b6c13j0hnv0sy9k82nw45ixjkzmfrx99pr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "7", "sha256": "1zvw5mr36rcbs1qhkk8arss44g9f3qmgvasy16n4bxl5p0hzr2q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWpvcnRvbVZSL3NpbXBsZS10aW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInNpbXBsZS10aW1lckBtYWpvcnRvbXZyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "43": {"version": "7", "sha256": "1zvw5mr36rcbs1qhkk8arss44g9f3qmgvasy16n4bxl5p0hzr2q6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVubG9jay1kaWFsb2ciLAogICAgInVzZXIiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYWpvcnRvbVZSL3NpbXBsZS10aW1lci1leHRlbnNpb24iLAogICJ1dWlkIjogInNpbXBsZS10aW1lckBtYWpvcnRvbXZyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "translate-assistant@atareao.es", "name": "Translate assistant", "pname": "translate-assistant", "description": "Translate with DeepL Translator", "link": "https://extensions.gnome.org/extension/5124/translate-assistant/", "shell_version_map": {"42": {"version": "6", "sha256": "0rql3ax7m3pr8g5h7iadl4isa2wv2wyzl9n0nihwf2js19i6ya97", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3aXRoIERlZXBMIFRyYW5zbGF0b3IiLAogICJleHRlbnNpb24taWQiOiAidHJhbnNsYXRlLWFzc2lzdGFudEBhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHJhbnNsYXRlLWFzc2lzdGFudEBhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJ0cmFuc2xhdGUtYXNzaXN0YW50LWljb24iLAogICJuYW1lIjogIlRyYW5zbGF0ZSBhc3Npc3RhbnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNsYXRlLWFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL3RyYW5zbGF0ZS1hc3Npc3RhbnQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1hc3Npc3RhbnRAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "stand-with-ukraine@vshut", "name": "Stand With Ukraine", "pname": "stand-with-ukraine", "description": "Displays Ukraine emoji flag in the top panel and provides menu with useful links.", "link": "https://extensions.gnome.org/extension/5126/stand-with-ukraine/", "shell_version_map": {"38": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} @@ -777,7 +778,7 @@ , {"uuid": "dashbar@fthx", "name": "DashBar", "pname": "dashbar", "description": "Task bar. Very light extension.\n\n Features:\n\n - Hide overview at start-up.\n\n - Scroll on taskbar to change workspace.\n\n - Show apps button (left click to enter overview, right click to show apps overview).\n\n - GNOME Shell dash items in top bar (left click to toggle or cycle, right click to show app menu, middle click to open new window).\n\n - Drag'n'drop favorites.\n\n - Remove 'Activities' button.\n\n - Change 'Places' extension label to an icon.\n\n No settings. If you want customization through preferences UI, please consider BaBar or Dash to Panel.\n\n ----------\n\n Please report any bug only through GitHub, I'm not notified here.", "link": "https://extensions.gnome.org/extension/5143/dashbar/", "shell_version_map": {"42": {"version": "13", "sha256": "0pp6fiza9wq170r95fasb97qw9jxd606q958xxnb9r23zrnsijnh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi5cblxuIEZlYXR1cmVzOlxuXG4gLSBIaWRlIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLlxuXG4gLSBTY3JvbGwgb24gdGFza2JhciB0byBjaGFuZ2Ugd29ya3NwYWNlLlxuXG4gLSBTaG93IGFwcHMgYnV0dG9uIChsZWZ0IGNsaWNrIHRvIGVudGVyIG92ZXJ2aWV3LCByaWdodCBjbGljayB0byBzaG93IGFwcHMgb3ZlcnZpZXcpLlxuXG4gLSBHTk9NRSBTaGVsbCBkYXNoIGl0ZW1zIGluIHRvcCBiYXIgKGxlZnQgY2xpY2sgdG8gdG9nZ2xlIG9yIGN5Y2xlLCByaWdodCBjbGljayB0byBzaG93IGFwcCBtZW51LCBtaWRkbGUgY2xpY2sgdG8gb3BlbiBuZXcgd2luZG93KS5cblxuIC0gRHJhZyduJ2Ryb3AgZmF2b3JpdGVzLlxuXG4gLSBSZW1vdmUgJ0FjdGl2aXRpZXMnIGJ1dHRvbi5cblxuIC0gQ2hhbmdlICdQbGFjZXMnIGV4dGVuc2lvbiBsYWJlbCB0byBhbiBpY29uLlxuXG4gTm8gc2V0dGluZ3MuIElmIHlvdSB3YW50IGN1c3RvbWl6YXRpb24gdGhyb3VnaCBwcmVmZXJlbmNlcyBVSSwgcGxlYXNlIGNvbnNpZGVyIEJhQmFyIG9yIERhc2ggdG8gUGFuZWwuXG5cbiAtLS0tLS0tLS0tXG5cbiBQbGVhc2UgcmVwb3J0IGFueSBidWcgb25seSB0aHJvdWdoIEdpdEh1YiwgSSdtIG5vdCBub3RpZmllZCBoZXJlLiIsCiAgIm5hbWUiOiAiRGFzaEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9kYXNoYmFyIiwKICAidXVpZCI6ICJkYXNoYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "43": {"version": "13", "sha256": "0pp6fiza9wq170r95fasb97qw9jxd606q958xxnb9r23zrnsijnh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi5cblxuIEZlYXR1cmVzOlxuXG4gLSBIaWRlIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLlxuXG4gLSBTY3JvbGwgb24gdGFza2JhciB0byBjaGFuZ2Ugd29ya3NwYWNlLlxuXG4gLSBTaG93IGFwcHMgYnV0dG9uIChsZWZ0IGNsaWNrIHRvIGVudGVyIG92ZXJ2aWV3LCByaWdodCBjbGljayB0byBzaG93IGFwcHMgb3ZlcnZpZXcpLlxuXG4gLSBHTk9NRSBTaGVsbCBkYXNoIGl0ZW1zIGluIHRvcCBiYXIgKGxlZnQgY2xpY2sgdG8gdG9nZ2xlIG9yIGN5Y2xlLCByaWdodCBjbGljayB0byBzaG93IGFwcCBtZW51LCBtaWRkbGUgY2xpY2sgdG8gb3BlbiBuZXcgd2luZG93KS5cblxuIC0gRHJhZyduJ2Ryb3AgZmF2b3JpdGVzLlxuXG4gLSBSZW1vdmUgJ0FjdGl2aXRpZXMnIGJ1dHRvbi5cblxuIC0gQ2hhbmdlICdQbGFjZXMnIGV4dGVuc2lvbiBsYWJlbCB0byBhbiBpY29uLlxuXG4gTm8gc2V0dGluZ3MuIElmIHlvdSB3YW50IGN1c3RvbWl6YXRpb24gdGhyb3VnaCBwcmVmZXJlbmNlcyBVSSwgcGxlYXNlIGNvbnNpZGVyIEJhQmFyIG9yIERhc2ggdG8gUGFuZWwuXG5cbiAtLS0tLS0tLS0tXG5cbiBQbGVhc2UgcmVwb3J0IGFueSBidWcgb25seSB0aHJvdWdoIEdpdEh1YiwgSSdtIG5vdCBub3RpZmllZCBoZXJlLiIsCiAgIm5hbWUiOiAiRGFzaEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9kYXNoYmFyIiwKICAidXVpZCI6ICJkYXNoYmFyQGZ0aHgiLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} , {"uuid": "extended-screen@free-bots.github.io", "name": "Extended Screen", "pname": "extended-screen", "description": "Enables Gnome's hidden extending screen feature. Available at version 42+.", "link": "https://extensions.gnome.org/extension/5146/extended-screen/", "shell_version_map": {"42": {"version": "3", "sha256": "0d9svp0wqawkxvaikj6jhrqjzhs3xc7w6wml57x82036b9krmv6y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgR25vbWUncyBoaWRkZW4gZXh0ZW5kaW5nIHNjcmVlbiBmZWF0dXJlLiBBdmFpbGFibGUgYXQgdmVyc2lvbiA0MisuIiwKICAibmFtZSI6ICJFeHRlbmRlZCBTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyZWUtYm90cy9leHRlbmRlZC1zY3JlZW4iLAogICJ1dWlkIjogImV4dGVuZGVkLXNjcmVlbkBmcmVlLWJvdHMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "43": {"version": "3", "sha256": "0d9svp0wqawkxvaikj6jhrqjzhs3xc7w6wml57x82036b9krmv6y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgR25vbWUncyBoaWRkZW4gZXh0ZW5kaW5nIHNjcmVlbiBmZWF0dXJlLiBBdmFpbGFibGUgYXQgdmVyc2lvbiA0MisuIiwKICAibmFtZSI6ICJFeHRlbmRlZCBTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZyZWUtYm90cy9leHRlbmRlZC1zY3JlZW4iLAogICJ1dWlkIjogImV4dGVuZGVkLXNjcmVlbkBmcmVlLWJvdHMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "waylandorx11@injcristianrojas.github.com", "name": "Wayland or X11", "pname": "wayland-or-x11", "description": "Am I using Wayland or X11?", "link": "https://extensions.gnome.org/extension/5149/wayland-or-x11/", "shell_version_map": {"40": {"version": "8", "sha256": "0lq5cxv6v3qf31yd4mdj58s32dk9xnr0b244k86xrdafpd4xjp9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFtIEkgdXNpbmcgV2F5bGFuZCBvciBYMTE/IiwKICAibmFtZSI6ICJXYXlsYW5kIG9yIFgxMSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL3dheWxhbmRvcngxMSIsCiAgInV1aWQiOiAid2F5bGFuZG9yeDExQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0lq5cxv6v3qf31yd4mdj58s32dk9xnr0b244k86xrdafpd4xjp9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFtIEkgdXNpbmcgV2F5bGFuZCBvciBYMTE/IiwKICAibmFtZSI6ICJXYXlsYW5kIG9yIFgxMSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL3dheWxhbmRvcngxMSIsCiAgInV1aWQiOiAid2F5bGFuZG9yeDExQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0lq5cxv6v3qf31yd4mdj58s32dk9xnr0b244k86xrdafpd4xjp9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFtIEkgdXNpbmcgV2F5bGFuZCBvciBYMTE/IiwKICAibmFtZSI6ICJXYXlsYW5kIG9yIFgxMSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL3dheWxhbmRvcngxMSIsCiAgInV1aWQiOiAid2F5bGFuZG9yeDExQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0lq5cxv6v3qf31yd4mdj58s32dk9xnr0b244k86xrdafpd4xjp9h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFtIEkgdXNpbmcgV2F5bGFuZCBvciBYMTE/IiwKICAibmFtZSI6ICJXYXlsYW5kIG9yIFgxMSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL3dheWxhbmRvcngxMSIsCiAgInV1aWQiOiAid2F5bGFuZG9yeDExQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"uuid": "azclock@azclock.gitlab.com", "name": "Desktop Clock", "pname": "desktop-clock", "description": "Add a clock to the desktop!", "link": "https://extensions.gnome.org/extension/5156/desktop-clock/", "shell_version_map": {"42": {"version": "3", "sha256": "02a94xfc2myh952lx3wjnxmgwzw5rh92f8b8ylmvz74vfm4rfwl6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXpjbG9jayIsCiAgInV1aWQiOiAiYXpjbG9ja0BhemNsb2NrLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "02a94xfc2myh952lx3wjnxmgwzw5rh92f8b8ylmvz74vfm4rfwl6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wISIsCiAgImdldHRleHQtZG9tYWluIjogImF6Y2xvY2siLAogICJuYW1lIjogIkRlc2t0b3AgQ2xvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXpjbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXpjbG9jayIsCiAgInV1aWQiOiAiYXpjbG9ja0BhemNsb2NrLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"uuid": "azclock@azclock.gitlab.com", "name": "Desktop Clock", "pname": "desktop-clock", "description": "Add a clock to the desktop!\n\nAnalog and Digital clock styles available. Highly customizable.\n\nDigital clock labels support markup, allowing you to style individual components on each label.\n\nNote: Temporarily turn off Desktop Icons to move the clock around.", "link": "https://extensions.gnome.org/extension/5156/desktop-clock/", "shell_version_map": {"42": {"version": "4", "sha256": "11nc2r4vdckqhcwrc2ry7zzs1ypmshqfpg5n3l1fj9ja9rnpyplv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wIVxuXG5BbmFsb2cgYW5kIERpZ2l0YWwgY2xvY2sgc3R5bGVzIGF2YWlsYWJsZS4gSGlnaGx5IGN1c3RvbWl6YWJsZS5cblxuRGlnaXRhbCBjbG9jayBsYWJlbHMgc3VwcG9ydCBtYXJrdXAsIGFsbG93aW5nIHlvdSB0byBzdHlsZSBpbmRpdmlkdWFsIGNvbXBvbmVudHMgb24gZWFjaCBsYWJlbC5cblxuTm90ZTogVGVtcG9yYXJpbHkgdHVybiBvZmYgRGVza3RvcCBJY29ucyB0byBtb3ZlIHRoZSBjbG9jayBhcm91bmQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXpjbG9jayIsCiAgIm5hbWUiOiAiRGVza3RvcCBDbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hemNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hemNsb2NrIiwKICAidXVpZCI6ICJhemNsb2NrQGF6Y2xvY2suZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "11nc2r4vdckqhcwrc2ry7zzs1ypmshqfpg5n3l1fj9ja9rnpyplv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wIVxuXG5BbmFsb2cgYW5kIERpZ2l0YWwgY2xvY2sgc3R5bGVzIGF2YWlsYWJsZS4gSGlnaGx5IGN1c3RvbWl6YWJsZS5cblxuRGlnaXRhbCBjbG9jayBsYWJlbHMgc3VwcG9ydCBtYXJrdXAsIGFsbG93aW5nIHlvdSB0byBzdHlsZSBpbmRpdmlkdWFsIGNvbXBvbmVudHMgb24gZWFjaCBsYWJlbC5cblxuTm90ZTogVGVtcG9yYXJpbHkgdHVybiBvZmYgRGVza3RvcCBJY29ucyB0byBtb3ZlIHRoZSBjbG9jayBhcm91bmQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYXpjbG9jayIsCiAgIm5hbWUiOiAiRGVza3RvcCBDbG9jayIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hemNsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9BbmRyZXdaYWVjaC9hemNsb2NrIiwKICAidXVpZCI6ICJhemNsb2NrQGF6Y2xvY2suZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "since-indicator@atareao.es", "name": "Since Indicator", "pname": "since-indicator", "description": "A simple menubar app for GNOME Shell that tracks how long you've been using your computer uninterruptedly", "link": "https://extensions.gnome.org/extension/5158/since-indicator/", "shell_version_map": {"40": {"version": "3", "sha256": "0ddrbs8c95v3lhgs1pllhb89ddwlkzavdfgsijw1w5pjcxrq4hn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dG9yIjogIkxvcmVuem8gQ2FyYm9uZWxsIiwKICAiY29weXJpZ2h0IjogIjIwMjIiLAogICJkZXNjcmlwdGlvbiI6ICJBIHNpbXBsZSBtZW51YmFyIGFwcCBmb3IgR05PTUUgU2hlbGwgdGhhdCB0cmFja3MgaG93IGxvbmcgeW91J3ZlIGJlZW4gdXNpbmcgeW91ciBjb21wdXRlciB1bmludGVycnVwdGVkbHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzaW5jZS1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgImljb24iOiAic2luY2UtaW5kaWNhdG9yIiwKICAibmFtZSI6ICJTaW5jZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2luY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5hdGFyZWFvLmVzL2FwbGljYWNpb24vc2luY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzaW5jZS1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "0ddrbs8c95v3lhgs1pllhb89ddwlkzavdfgsijw1w5pjcxrq4hn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dG9yIjogIkxvcmVuem8gQ2FyYm9uZWxsIiwKICAiY29weXJpZ2h0IjogIjIwMjIiLAogICJkZXNjcmlwdGlvbiI6ICJBIHNpbXBsZSBtZW51YmFyIGFwcCBmb3IgR05PTUUgU2hlbGwgdGhhdCB0cmFja3MgaG93IGxvbmcgeW91J3ZlIGJlZW4gdXNpbmcgeW91ciBjb21wdXRlciB1bmludGVycnVwdGVkbHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzaW5jZS1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgImljb24iOiAic2luY2UtaW5kaWNhdG9yIiwKICAibmFtZSI6ICJTaW5jZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2luY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5hdGFyZWFvLmVzL2FwbGljYWNpb24vc2luY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzaW5jZS1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0ddrbs8c95v3lhgs1pllhb89ddwlkzavdfgsijw1w5pjcxrq4hn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dG9yIjogIkxvcmVuem8gQ2FyYm9uZWxsIiwKICAiY29weXJpZ2h0IjogIjIwMjIiLAogICJkZXNjcmlwdGlvbiI6ICJBIHNpbXBsZSBtZW51YmFyIGFwcCBmb3IgR05PTUUgU2hlbGwgdGhhdCB0cmFja3MgaG93IGxvbmcgeW91J3ZlIGJlZW4gdXNpbmcgeW91ciBjb21wdXRlciB1bmludGVycnVwdGVkbHkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzaW5jZS1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgImljb24iOiAic2luY2UtaW5kaWNhdG9yIiwKICAibmFtZSI6ICJTaW5jZSBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2luY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5hdGFyZWFvLmVzL2FwbGljYWNpb24vc2luY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJzaW5jZS1pbmRpY2F0b3JAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "dollar-to-brl", "name": "Dollar", "pname": "dollar", "description": "Convert Dollar USD to Real BRL using API AWESOMEAPI https://docs.awesomeapi.com.br.", "link": "https://extensions.gnome.org/extension/5159/dollar/", "shell_version_map": {"41": {"version": "4", "sha256": "1aqvgf1inrjz6m4x44dm5r3x0xmj8xmi8mjyr91kjh2n76h3afn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgRG9sbGFyIFVTRCB0byBSZWFsIEJSTCB1c2luZyBBUEkgQVdFU09NRUFQSSBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsRGVNYXR0b3MvZG9sbGFyLXRvLWJybCIsCiAgInV1aWQiOiAiZG9sbGFyLXRvLWJybCIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1aqvgf1inrjz6m4x44dm5r3x0xmj8xmi8mjyr91kjh2n76h3afn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgRG9sbGFyIFVTRCB0byBSZWFsIEJSTCB1c2luZyBBUEkgQVdFU09NRUFQSSBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsRGVNYXR0b3MvZG9sbGFyLXRvLWJybCIsCiAgInV1aWQiOiAiZG9sbGFyLXRvLWJybCIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "1aqvgf1inrjz6m4x44dm5r3x0xmj8xmi8mjyr91kjh2n76h3afn6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnZlcnQgRG9sbGFyIFVTRCB0byBSZWFsIEJSTCB1c2luZyBBUEkgQVdFU09NRUFQSSBodHRwczovL2RvY3MuYXdlc29tZWFwaS5jb20uYnIuIiwKICAibmFtZSI6ICJEb2xsYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiLAogICAgIjQyLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWVsRGVNYXR0b3MvZG9sbGFyLXRvLWJybCIsCiAgInV1aWQiOiAiZG9sbGFyLXRvLWJybCIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "noa11y@popov895.ukr.net", "name": "No a11y", "pname": "no-a11y", "description": "Hide the accessibility button on the top bar.", "link": "https://extensions.gnome.org/extension/5162/no-a11y/", "shell_version_map": {"42": {"version": "2", "sha256": "0bczyngw6zzprf7c6ih78j100wc9dvv3inxc8aqdmxqv291z7qwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L25vYTExeSIsCiAgInV1aWQiOiAibm9hMTF5QHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "0bczyngw6zzprf7c6ih78j100wc9dvv3inxc8aqdmxqv291z7qwy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BvcG92ODk1L25vYTExeSIsCiAgInV1aWQiOiAibm9hMTF5QHBvcG92ODk1LnVrci5uZXQiLAogICJ2ZXJzaW9uIjogMgp9"}}} @@ -815,12 +816,12 @@ , {"uuid": "desktop-zoom@colin.kinlo.ch", "name": "Desktop Zoom", "pname": "desktop-zoom", "description": "Scroll to zoom gnome desktop.\n\nUsage: Hold Alt and Scroll\n\nCursor must not be over a window (must be over background or top bar).\nMagnifier / zoom must be enabled in accessibility.\n\nTo disable zoom after removing the extension, disable zoom in gnomes accessibility settings:\nhttps://help.gnome.org/users/gnome-help/stable/a11y-mag.html.en\n\nReport issues on GITHUB.COM", "link": "https://extensions.gnome.org/extension/5297/desktop-zoom/", "shell_version_map": {"42": {"version": "6", "sha256": "14vi9jzdcnc9srsf8r4x38ymcjjxjl8xyb49rndcb3ldbr60wxpj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB0byB6b29tIGdub21lIGRlc2t0b3AuXG5cblVzYWdlOiBIb2xkIEFsdCBhbmQgU2Nyb2xsXG5cbkN1cnNvciBtdXN0IG5vdCBiZSBvdmVyIGEgd2luZG93IChtdXN0IGJlIG92ZXIgYmFja2dyb3VuZCBvciB0b3AgYmFyKS5cbk1hZ25pZmllciAvIHpvb20gbXVzdCBiZSBlbmFibGVkIGluIGFjY2Vzc2liaWxpdHkuXG5cblRvIGRpc2FibGUgem9vbSBhZnRlciByZW1vdmluZyB0aGUgZXh0ZW5zaW9uLCBkaXNhYmxlIHpvb20gaW4gZ25vbWVzIGFjY2Vzc2liaWxpdHkgc2V0dGluZ3M6XG5odHRwczovL2hlbHAuZ25vbWUub3JnL3VzZXJzL2dub21lLWhlbHAvc3RhYmxlL2ExMXktbWFnLmh0bWwuZW5cblxuUmVwb3J0IGlzc3VlcyBvbiBHSVRIVUIuQ09NIiwKICAibmFtZSI6ICJEZXNrdG9wIFpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NvbGluS2lubG9jaC9kZXNrdG9wLXpvb20tZ25vbWUtc2hlbGwiLAogICJ1dWlkIjogImRlc2t0b3Atem9vbUBjb2xpbi5raW5sby5jaCIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "14vi9jzdcnc9srsf8r4x38ymcjjxjl8xyb49rndcb3ldbr60wxpj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNjcm9sbCB0byB6b29tIGdub21lIGRlc2t0b3AuXG5cblVzYWdlOiBIb2xkIEFsdCBhbmQgU2Nyb2xsXG5cbkN1cnNvciBtdXN0IG5vdCBiZSBvdmVyIGEgd2luZG93IChtdXN0IGJlIG92ZXIgYmFja2dyb3VuZCBvciB0b3AgYmFyKS5cbk1hZ25pZmllciAvIHpvb20gbXVzdCBiZSBlbmFibGVkIGluIGFjY2Vzc2liaWxpdHkuXG5cblRvIGRpc2FibGUgem9vbSBhZnRlciByZW1vdmluZyB0aGUgZXh0ZW5zaW9uLCBkaXNhYmxlIHpvb20gaW4gZ25vbWVzIGFjY2Vzc2liaWxpdHkgc2V0dGluZ3M6XG5odHRwczovL2hlbHAuZ25vbWUub3JnL3VzZXJzL2dub21lLWhlbHAvc3RhYmxlL2ExMXktbWFnLmh0bWwuZW5cblxuUmVwb3J0IGlzc3VlcyBvbiBHSVRIVUIuQ09NIiwKICAibmFtZSI6ICJEZXNrdG9wIFpvb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NvbGluS2lubG9jaC9kZXNrdG9wLXpvb20tZ25vbWUtc2hlbGwiLAogICJ1dWlkIjogImRlc2t0b3Atem9vbUBjb2xpbi5raW5sby5jaCIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "zoomwayland@polyte.de", "name": "Zoom Wayland Extension", "pname": "zoom-wayland-extension", "description": "Enables Zoom Screensharing under Wayland", "link": "https://extensions.gnome.org/extension/5302/zoom-wayland-extension/", "shell_version_map": {"42": {"version": "1", "sha256": "0dnd2mi0aq2ddgp7kvc8vbsl61yi3akawp97wi38z1nbbqflgmag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgWm9vbSBTY3JlZW5zaGFyaW5nIHVuZGVyIFdheWxhbmQiLAogICJuYW1lIjogIlpvb20gV2F5bGFuZCBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanVsaWFucG9sbG1hbm4vem9vbS13YXlsYW5kLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiem9vbXdheWxhbmRAcG9seXRlLmRlIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "firefox-pip@bennypowers.com", "name": "Firefox PiP Always on Top", "pname": "firefox-pip-always-on-top", "description": "Ensure that Firefox Picture-in-Picture window are always on top", "link": "https://extensions.gnome.org/extension/5306/firefox-pip-always-on-top/", "shell_version_map": {"42": {"version": "3", "sha256": "0473sbsjp7qg1cla28s5r9rrpg3qa2fk015h3gv101ndn32mfs6l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuc3VyZSB0aGF0IEZpcmVmb3ggUGljdHVyZS1pbi1QaWN0dXJlIHdpbmRvdyBhcmUgYWx3YXlzIG9uIHRvcCIsCiAgIm5hbWUiOiAiRmlyZWZveCBQaVAgQWx3YXlzIG9uIFRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmVubnlwb3dlcnMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZpcmVmb3gtcGlwIiwKICAidXVpZCI6ICJmaXJlZm94LXBpcEBiZW5ueXBvd2Vycy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "0473sbsjp7qg1cla28s5r9rrpg3qa2fk015h3gv101ndn32mfs6l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuc3VyZSB0aGF0IEZpcmVmb3ggUGljdHVyZS1pbi1QaWN0dXJlIHdpbmRvdyBhcmUgYWx3YXlzIG9uIHRvcCIsCiAgIm5hbWUiOiAiRmlyZWZveCBQaVAgQWx3YXlzIG9uIFRvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmVubnlwb3dlcnMvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZpcmVmb3gtcGlwIiwKICAidXVpZCI6ICJmaXJlZm94LXBpcEBiZW5ueXBvd2Vycy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "activitiesworkspacename@ahmafi.ir", "name": "Activities Workspace Name", "pname": "activities-workspace-name", "description": "Replace Activities Text with Current Workspace Name", "link": "https://extensions.gnome.org/extension/5311/activities-workspace-name/", "shell_version_map": {"42": {"version": "1", "sha256": "1syxsxw713ly8a2fbppvad91hw0i94bgi8xa0h5za87y34qqd7gz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBUZXh0IHdpdGggQ3VycmVudCBXb3Jrc3BhY2UgTmFtZSIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBXb3Jrc3BhY2UgTmFtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9haG1hZmkvZ25vbWUtYWN0aXZpdGllcy13b3Jrc3BhY2UtbmFtZSIsCiAgInV1aWQiOiAiYWN0aXZpdGllc3dvcmtzcGFjZW5hbWVAYWhtYWZpLmlyIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} +, {"uuid": "activitiesworkspacename@ahmafi.ir", "name": "Activities Workspace Name", "pname": "activities-workspace-name", "description": "Replace Activities Text with Current Workspace Name", "link": "https://extensions.gnome.org/extension/5311/activities-workspace-name/", "shell_version_map": {"42": {"version": "2", "sha256": "0rdzh3g4sl5fcl736qw864lkkp9gcdlha5kny48mcxwqh48zlv1f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBUZXh0IHdpdGggQ3VycmVudCBXb3Jrc3BhY2UgTmFtZSIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBXb3Jrc3BhY2UgTmFtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWhtYWZpL2dub21lLWFjdGl2aXRpZXMtd29ya3NwYWNlLW5hbWUiLAogICJ1dWlkIjogImFjdGl2aXRpZXN3b3Jrc3BhY2VuYW1lQGFobWFmaS5pciIsCiAgInZlcnNpb24iOiAyCn0="}, "43": {"version": "2", "sha256": "0rdzh3g4sl5fcl736qw864lkkp9gcdlha5kny48mcxwqh48zlv1f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgQWN0aXZpdGllcyBUZXh0IHdpdGggQ3VycmVudCBXb3Jrc3BhY2UgTmFtZSIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBXb3Jrc3BhY2UgTmFtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWhtYWZpL2dub21lLWFjdGl2aXRpZXMtd29ya3NwYWNlLW5hbWUiLAogICJ1dWlkIjogImFjdGl2aXRpZXN3b3Jrc3BhY2VuYW1lQGFobWFmaS5pciIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "webfeed@xynium.github.com", "name": "WebFeed", "pname": "webfeed", "description": "RSS and Atom Feed reader for GNOME Shell", "link": "https://extensions.gnome.org/extension/5321/webfeed/", "shell_version_map": {"42": {"version": "6", "sha256": "0p6cv0hrpd52s215w3ilhkdyqb2x97j1kijcpw4byiajfkvqc1i6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJTUyBhbmQgQXRvbSBGZWVkIHJlYWRlciBmb3IgR05PTUUgU2hlbGwiLAogICJuYW1lIjogIldlYkZlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS93ZWJmZWVkIiwKICAidXVpZCI6ICJ3ZWJmZWVkQHh5bml1bS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "43": {"version": "8", "sha256": "15nngcapwcf80fv6dqp8mxlbzxd1n4rv73blfyvvzxxwh0inbhg9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJTUyBhbmQgQXRvbSBGZWVkIHJlYWRlciBmb3IgR05PTUUgU2hlbGwiLAogICJuYW1lIjogIldlYkZlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veHluaXVtL3dlYmZlZWQiLAogICJ1dWlkIjogIndlYmZlZWRAeHluaXVtLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "pingindic@xynium.github.com", "name": "PingIndic", "pname": "pingindic", "description": "show network ping delay", "link": "https://extensions.gnome.org/extension/5330/pingindic/", "shell_version_map": {"42": {"version": "3", "sha256": "0f4kgq5qagv39s98bdyncfs9jwcd6lm5bnjb1qcfhr3364rd0yab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInNob3cgbmV0d29yayBwaW5nIGRlbGF5IiwKICAibmFtZSI6ICJQaW5nSW5kaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS9waW5naW5kaWMiLAogICJ1dWlkIjogInBpbmdpbmRpY0B4eW5pdW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0f4kgq5qagv39s98bdyncfs9jwcd6lm5bnjb1qcfhr3364rd0yab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInNob3cgbmV0d29yayBwaW5nIGRlbGF5IiwKICAibmFtZSI6ICJQaW5nSW5kaWMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3h5bml1bS9waW5naW5kaWMiLAogICJ1dWlkIjogInBpbmdpbmRpY0B4eW5pdW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "power-profile-indicator@laux.wtf", "name": "Power Profiles Indicator", "pname": "power-profile-indicator", "description": "a simple indicator in the system icons area of the top panel that represent the current power profile", "link": "https://extensions.gnome.org/extension/5335/power-profile-indicator/", "shell_version_map": {"40": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "43": {"version": "9", "sha256": "0011yqa1v2ymfczzmd2vckmqdpk1wapdzhg6l7453fnd25v7xxa9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImEgc2ltcGxlIGluZGljYXRvciBpbiB0aGUgc3lzdGVtIGljb25zIGFyZWEgb2YgdGhlIHRvcCBwYW5lbCB0aGF0IHJlcHJlc2VudCB0aGUgY3VycmVudCBwb3dlciBwcm9maWxlIiwKICAibmFtZSI6ICJQb3dlciBQcm9maWxlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtaW5kaWNhdG9yQGxhdXgud3RmIiwKICAidXVpZC1kZXYiOiAicG93ZXItcHJvZmlsZS1pbmRpY2F0b3ItZGV2QGxhdXgud3RmIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} -, {"uuid": "widgets@aylur", "name": "Aylur's Widgets", "pname": "aylurs-widgets", "description": "My set of extensions: Battery Bar, Dash Board, DateMenu Mod, Media Player, Power Menu, Workspace Indicator, Notification Indicator, Modified Quick Settings, Background Clock.\n Disclaimer: this extension contains copyrighted icons.", "link": "https://extensions.gnome.org/extension/5338/aylurs-widgets/", "shell_version_map": {"42": {"version": "17", "sha256": "1x480zhlhnfhifwcxghg05bwa84mhnk360ihbvavrfdp7pcs6z8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "43": {"version": "17", "sha256": "1x480zhlhnfhifwcxghg05bwa84mhnk360ihbvavrfdp7pcs6z8k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} -, {"uuid": "supergfxctl-gex@asus-linux.org", "name": "supergfxctl-gex", "pname": "supergfxctl-gex", "description": "supergfxctl-gex is a frontend for supergfxctl that was born inside the asus-linux.org community. supergfxctl is required for this extension to work. It is tested on a variaty of laptops including Intel / Nvidia, AMD / Nvidia, Intel / AMD and AMD / AMD GPU combinations.\n\nIt is a platform agnostic tool for hybrid graphics laptops.\n\nsupergfxctl gets packages by the community for Fedora and Arch. But without much of a hastle can be compiled for every systemd based Linux distribution.\n\nTo learn more about it, please have a look at:\n\nhttps://gitlab.com/asus-linux/supergfxctl\nhttps://asus-linux.org/", "link": "https://extensions.gnome.org/extension/5344/supergfxctl-gex/", "shell_version_map": {"40": {"version": "22", "sha256": "1wfgxshafzm1p2i3f2xyr16ak2sgmvyxc61pslh11qd3d23xchbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJzdXBlcmdmeGN0bC1nZXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VwZXJnZnhjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInN1cGVyZ2Z4Y3RsIjogIjUuMC4xIiwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3VwZXJnZnhjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAic3VwZXJnZnhjdGwtZ2V4LWRldkBhc3VzLWxpbnV4Lm9yZyIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "22", "sha256": "1wfgxshafzm1p2i3f2xyr16ak2sgmvyxc61pslh11qd3d23xchbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJzdXBlcmdmeGN0bC1nZXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VwZXJnZnhjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInN1cGVyZ2Z4Y3RsIjogIjUuMC4xIiwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3VwZXJnZnhjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAic3VwZXJnZnhjdGwtZ2V4LWRldkBhc3VzLWxpbnV4Lm9yZyIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "22", "sha256": "1wfgxshafzm1p2i3f2xyr16ak2sgmvyxc61pslh11qd3d23xchbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJzdXBlcmdmeGN0bC1nZXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VwZXJnZnhjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInN1cGVyZ2Z4Y3RsIjogIjUuMC4xIiwKICAidXJsIjogIiIsCiAgInV1aWQiOiAic3VwZXJnZnhjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAic3VwZXJnZnhjdGwtZ2V4LWRldkBhc3VzLWxpbnV4Lm9yZyIsCiAgInZlcnNpb24iOiAyMgp9"}, "43": {"version": "24", "sha256": "00ax6sfmh0lqkwd6z4xb1gizrs8wi08frzgpxpxj0ax20vyp7h21", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJzdXBlcmdmeGN0bC1nZXgiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VwZXJnZnhjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjQKfQ=="}}} +, {"uuid": "widgets@aylur", "name": "Aylur's Widgets", "pname": "aylurs-widgets", "description": "My set of extensions: Battery Bar, Dash Board, DateMenu Mod, Media Player, Power Menu, Workspace Indicator, Notification Indicator, Modified Quick Settings, Background Clock.\n Disclaimer: this extension contains copyrighted icons.", "link": "https://extensions.gnome.org/extension/5338/aylurs-widgets/", "shell_version_map": {"42": {"version": "18", "sha256": "1772n3d3q601jkbhv4iwjfxgzy105iz4zr3mbp9zrhyha4xy390s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE4Cn0="}, "43": {"version": "18", "sha256": "1772n3d3q601jkbhv4iwjfxgzy105iz4zr3mbp9zrhyha4xy390s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk15IHNldCBvZiBleHRlbnNpb25zOiBCYXR0ZXJ5IEJhciwgRGFzaCBCb2FyZCwgRGF0ZU1lbnUgTW9kLCBNZWRpYSBQbGF5ZXIsIFBvd2VyIE1lbnUsIFdvcmtzcGFjZSBJbmRpY2F0b3IsIE5vdGlmaWNhdGlvbiBJbmRpY2F0b3IsIE1vZGlmaWVkIFF1aWNrIFNldHRpbmdzLCBCYWNrZ3JvdW5kIENsb2NrLlxuIERpc2NsYWltZXI6IHRoaXMgZXh0ZW5zaW9uIGNvbnRhaW5zIGNvcHlyaWdodGVkIGljb25zLiIsCiAgIm5hbWUiOiAiQXlsdXIncyBXaWRnZXRzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF5bHVycy13aWRnZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1leHRlbnNpb25zIiwKICAidXVpZCI6ICJ3aWRnZXRzQGF5bHVyIiwKICAidmVyc2lvbiI6IDE4Cn0="}}} +, {"uuid": "supergfxctl-gex@asus-linux.org", "name": "Super Graphics Control", "pname": "supergfxctl-gex", "description": "supergfxctl-gex is a frontend for supergfxctl that was born inside the asus-linux.org community. supergfxctl is required for this extension to work. It is tested on a variaty of laptops including Intel / Nvidia, AMD / Nvidia, Intel / AMD and AMD / AMD GPU combinations.\n\nIt is a platform agnostic tool for hybrid graphics laptops.\n\nsupergfxctl gets packages by the community for Fedora and Arch. But without much of a hastle can be compiled for every systemd based Linux distribution.\n\nTo learn more about it, please have a look at:\n\nhttps://gitlab.com/asus-linux/supergfxctl\nhttps://asus-linux.org/", "link": "https://extensions.gnome.org/extension/5344/supergfxctl-gex/", "shell_version_map": {"40": {"version": "22", "sha256": "04g3fjpdblxh25jlygzww79a6zzzrhgs113575jrnmwcrxq4vgmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "04g3fjpdblxh25jlygzww79a6zzzrhgs113575jrnmwcrxq4vgmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "04g3fjpdblxh25jlygzww79a6zzzrhgs113575jrnmwcrxq4vgmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJzdXBlcmdmeGN0bCI6ICI1LjAuMSIsCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN1cGVyZ2Z4Y3RsLWdleEBhc3VzLWxpbnV4Lm9yZyIsCiAgInV1aWQtZGV2IjogInN1cGVyZ2Z4Y3RsLWdleC1kZXZAYXN1cy1saW51eC5vcmciLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "43": {"version": "24", "sha256": "1xd0mlbca2cg6nxysv8x4kiqkwsb3dw3qw3rv87i81b6n5v26y7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInN1cGVyZ2Z4Y3RsLWdleCBpcyBhIGZyb250ZW5kIGZvciBzdXBlcmdmeGN0bCB0aGF0IHdhcyBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LiBzdXBlcmdmeGN0bCBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gd29yay4gSXQgaXMgdGVzdGVkIG9uIGEgdmFyaWF0eSBvZiBsYXB0b3BzIGluY2x1ZGluZyBJbnRlbCAvIE52aWRpYSwgQU1EIC8gTnZpZGlhLCBJbnRlbCAvIEFNRCBhbmQgQU1EIC8gQU1EIEdQVSBjb21iaW5hdGlvbnMuXG5cbkl0IGlzIGEgcGxhdGZvcm0gYWdub3N0aWMgdG9vbCBmb3IgaHlicmlkIGdyYXBoaWNzIGxhcHRvcHMuXG5cbnN1cGVyZ2Z4Y3RsIGdldHMgcGFja2FnZXMgYnkgdGhlIGNvbW11bml0eSBmb3IgRmVkb3JhIGFuZCBBcmNoLiBCdXQgd2l0aG91dCBtdWNoIG9mIGEgaGFzdGxlIGNhbiBiZSBjb21waWxlZCBmb3IgZXZlcnkgc3lzdGVtZCBiYXNlZCBMaW51eCBkaXN0cmlidXRpb24uXG5cblRvIGxlYXJuIG1vcmUgYWJvdXQgaXQsIHBsZWFzZSBoYXZlIGEgbG9vayBhdDpcblxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvc3VwZXJnZnhjdGxcbmh0dHBzOi8vYXN1cy1saW51eC5vcmcvIiwKICAibmFtZSI6ICJTdXBlciBHcmFwaGljcyBDb250cm9sIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyZ2Z4Y3RsLWdleCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAic3VwZXJnZnhjdGwiOiAiNS4wLjEiLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzdXBlcmdmeGN0bC1nZXhAYXN1cy1saW51eC5vcmciLAogICJ1dWlkLWRldiI6ICJzdXBlcmdmeGN0bC1nZXgtZGV2QGFzdXMtbGludXgub3JnIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} , {"uuid": "dotspaces@charlieqle", "name": "Dotspaces", "pname": "dotspaces", "description": "A simple workspace switcher", "link": "https://extensions.gnome.org/extension/5347/dotspaces/", "shell_version_map": {"42": {"version": "6", "sha256": "1drw6hyhc9cfwyz49xbspyh42k9pgwvwnlmqbkcxskn7ljjxw5lp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHdvcmtzcGFjZSBzd2l0Y2hlciIsCiAgIm5hbWUiOiAiRG90c3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvdHNwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hhcmxpZVFMZS9nbm9tZS1leHRlbnNpb24tZG90c3BhY2VzIiwKICAidXVpZCI6ICJkb3RzcGFjZXNAY2hhcmxpZXFsZSIsCiAgInZlcnNpb24iOiA2Cn0="}, "43": {"version": "6", "sha256": "1drw6hyhc9cfwyz49xbspyh42k9pgwvwnlmqbkcxskn7ljjxw5lp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIHdvcmtzcGFjZSBzd2l0Y2hlciIsCiAgIm5hbWUiOiAiRG90c3BhY2VzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRvdHNwYWNlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hhcmxpZVFMZS9nbm9tZS1leHRlbnNpb24tZG90c3BhY2VzIiwKICAidXVpZCI6ICJkb3RzcGFjZXNAY2hhcmxpZXFsZSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "window-state-manager@kishorv06.github.io", "name": "Window State Manager", "pname": "window-state-manager", "description": "Automatically remember and restore window state and positions. Useful when using Gnome with wayland in a multi-monitor setup. Some applications won't remember their location when monitors are connected or disconnected. This extension solves that problem by saving window state periodically and restoring it when screen arrangement is changed.", "link": "https://extensions.gnome.org/extension/5353/window-state-manager/", "shell_version_map": {"42": {"version": "3", "sha256": "0f6mcn8kkgkdhaa354jy1hhn474iw6f99wbq4pn5y8qdvc12wzsh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tpc2hvcnYwNi93aW5kb3ctc3RhdGUtbWFuYWdlciIsCiAgInV1aWQiOiAid2luZG93LXN0YXRlLW1hbmFnZXJAa2lzaG9ydjA2LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "0f6mcn8kkgkdhaa354jy1hhn474iw6f99wbq4pn5y8qdvc12wzsh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgcmVtZW1iZXIgYW5kIHJlc3RvcmUgd2luZG93IHN0YXRlIGFuZCBwb3NpdGlvbnMuIFVzZWZ1bCB3aGVuIHVzaW5nIEdub21lIHdpdGggd2F5bGFuZCBpbiBhIG11bHRpLW1vbml0b3Igc2V0dXAuIFNvbWUgYXBwbGljYXRpb25zIHdvbid0IHJlbWVtYmVyIHRoZWlyIGxvY2F0aW9uIHdoZW4gbW9uaXRvcnMgYXJlIGNvbm5lY3RlZCBvciBkaXNjb25uZWN0ZWQuIFRoaXMgZXh0ZW5zaW9uIHNvbHZlcyB0aGF0IHByb2JsZW0gYnkgc2F2aW5nIHdpbmRvdyBzdGF0ZSBwZXJpb2RpY2FsbHkgYW5kIHJlc3RvcmluZyBpdCB3aGVuIHNjcmVlbiBhcnJhbmdlbWVudCBpcyBjaGFuZ2VkLiIsCiAgIm5hbWUiOiAiV2luZG93IFN0YXRlIE1hbmFnZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tpc2hvcnYwNi93aW5kb3ctc3RhdGUtbWFuYWdlciIsCiAgInV1aWQiOiAid2luZG93LXN0YXRlLW1hbmFnZXJAa2lzaG9ydjA2LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "vpn-status@peterroux.com", "name": "VPN Status", "pname": "vpn-status", "description": "A VPN Status indicator.", "link": "https://extensions.gnome.org/extension/5356/vpn-status/", "shell_version_map": {"38": {"version": "2", "sha256": "09qfrs7wi5sn8dgz7806x3wqfyq62f1gfl0jfwwnypkmcqc7rigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlBOIFN0YXR1cyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJWUE4gU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidnBuLXN0YXR1c0BwZXRlcnJvdXguY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "09qfrs7wi5sn8dgz7806x3wqfyq62f1gfl0jfwwnypkmcqc7rigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlBOIFN0YXR1cyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJWUE4gU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidnBuLXN0YXR1c0BwZXRlcnJvdXguY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "09qfrs7wi5sn8dgz7806x3wqfyq62f1gfl0jfwwnypkmcqc7rigv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgVlBOIFN0YXR1cyBpbmRpY2F0b3IuIiwKICAibmFtZSI6ICJWUE4gU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidnBuLXN0YXR1c0BwZXRlcnJvdXguY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} @@ -830,14 +831,14 @@ , {"uuid": "external-ip-extension@ipcan.cyou", "name": "Show External IP", "pname": "show-external-ip-thisipcancyou", "description": "Displays your external IP in the Toolbar and sends a system notification if changed. \n\nThis extension is handy for those work at different locations or with different VPNs to quickly see your public IP and country. It uses the free thisipcan.cyou service to check at regular intervals and whenever computer network events occur (like switching networks or locations).", "link": "https://extensions.gnome.org/extension/5368/show-external-ip-thisipcancyou/", "shell_version_map": {"40": {"version": "15", "sha256": "0k4jlhdhfv46f12wa112yw81kp4fmz2g2mj772vjbqb7cid7gdf1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jd2l0dGVuYmVyZy90aGlzaXBjYW4uY3lvdSIsCiAgInV1aWQiOiAiZXh0ZXJuYWwtaXAtZXh0ZW5zaW9uQGlwY2FuLmN5b3UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "0k4jlhdhfv46f12wa112yw81kp4fmz2g2mj772vjbqb7cid7gdf1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jd2l0dGVuYmVyZy90aGlzaXBjYW4uY3lvdSIsCiAgInV1aWQiOiAiZXh0ZXJuYWwtaXAtZXh0ZW5zaW9uQGlwY2FuLmN5b3UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "42": {"version": "15", "sha256": "0k4jlhdhfv46f12wa112yw81kp4fmz2g2mj772vjbqb7cid7gdf1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jd2l0dGVuYmVyZy90aGlzaXBjYW4uY3lvdSIsCiAgInV1aWQiOiAiZXh0ZXJuYWwtaXAtZXh0ZW5zaW9uQGlwY2FuLmN5b3UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "43": {"version": "15", "sha256": "0k4jlhdhfv46f12wa112yw81kp4fmz2g2mj772vjbqb7cid7gdf1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgZXh0ZXJuYWwgSVAgaW4gdGhlIFRvb2xiYXIgYW5kIHNlbmRzIGEgc3lzdGVtIG5vdGlmaWNhdGlvbiBpZiBjaGFuZ2VkLiBcblxuVGhpcyBleHRlbnNpb24gaXMgaGFuZHkgZm9yIHRob3NlIHdvcmsgYXQgZGlmZmVyZW50IGxvY2F0aW9ucyBvciB3aXRoIGRpZmZlcmVudCBWUE5zIHRvIHF1aWNrbHkgc2VlIHlvdXIgcHVibGljIElQIGFuZCBjb3VudHJ5LiBJdCB1c2VzIHRoZSBmcmVlIHRoaXNpcGNhbi5jeW91IHNlcnZpY2UgdG8gY2hlY2sgYXQgcmVndWxhciBpbnRlcnZhbHMgYW5kIHdoZW5ldmVyIGNvbXB1dGVyIG5ldHdvcmsgZXZlbnRzIG9jY3VyIChsaWtlIHN3aXRjaGluZyBuZXR3b3JrcyBvciBsb2NhdGlvbnMpLiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVybmFsLWlwLW5vdGlmaWNhdGlvbiIsCiAgIm5hbWUiOiAiU2hvdyBFeHRlcm5hbCBJUCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jd2l0dGVuYmVyZy90aGlzaXBjYW4uY3lvdSIsCiAgInV1aWQiOiAiZXh0ZXJuYWwtaXAtZXh0ZW5zaW9uQGlwY2FuLmN5b3UiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} , {"uuid": "usd-bra@bramba.github.com", "name": "USD-BRA", "pname": "usd-bra", "description": "An easy and clean viewer of USD -> BRL currency. In which it is easy to understand if the currency is increasing or decreasing.", "link": "https://extensions.gnome.org/extension/5371/usd-bra/", "shell_version_map": {"42": {"version": "4", "sha256": "125ch4b675zddx46lj59f4jb8g5s6mq4aqv3vk21bbmnb05zzk5r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVhc3kgYW5kIGNsZWFuIHZpZXdlciBvZiBVU0QgLT4gQlJMIGN1cnJlbmN5LiBJbiB3aGljaCBpdCBpcyBlYXN5IHRvIHVuZGVyc3RhbmQgaWYgdGhlIGN1cnJlbmN5IGlzIGluY3JlYXNpbmcgb3IgZGVjcmVhc2luZy4iLAogICJuYW1lIjogIlVTRC1CUkEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQnJhbWJhNy9VU0QtQlJBIiwKICAidXVpZCI6ICJ1c2QtYnJhQGJyYW1iYS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "gnome-pushover-messages-unofficial@iwont.cyou", "name": "Pushover Message Notifications", "pname": "pushover-message-notifications", "description": "Displays Pushover Notifications within GNOME and within your tray. Privacy respecting unofficial client.", "link": "https://extensions.gnome.org/extension/5377/pushover-message-notifications/", "shell_version_map": {"40": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0q6wzq2m0pjfcgf0jrbf2ygagikdmmgrkx561fw1fb23332v1f8g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFB1c2hvdmVyIE5vdGlmaWNhdGlvbnMgd2l0aGluIEdOT01FIGFuZCB3aXRoaW4geW91ciB0cmF5LiBQcml2YWN5IHJlc3BlY3RpbmcgdW5vZmZpY2lhbCBjbGllbnQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtcHVzaG92ZXItbWVzc2FnZXMtdW5vZmZpY2lhbCIsCiAgIm5hbWUiOiAiUHVzaG92ZXIgTWVzc2FnZSBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2N3aXR0ZW5iZXJnL2dub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWwiLAogICJ1dWlkIjogImdub21lLXB1c2hvdmVyLW1lc3NhZ2VzLXVub2ZmaWNpYWxAaXdvbnQuY3lvdSIsCiAgInZlcnNpb24iOiA4Cn0="}}} -, {"uuid": "notification-filter@asynclink.org", "name": "Notification Filter", "pname": "notification-filter", "description": "Filter out notifications by their text content to block them from appearing.\nIf you've ever been annoyed by certain notifications distracting you, this extension gives you more fine tuned control of which notifications to prevent from showing up.\n\nGives you the ability to filter by both the title and body content, use regex matching, and add multiple different filters.\n\nNote: Only prevents new notifications from appearing, does not remove existing notifications.", "link": "https://extensions.gnome.org/extension/5380/notification-filter/", "shell_version_map": {"40": {"version": "2", "sha256": "1933q2vywyc26kggdrhy0p3p137k0zb2rav4cdzqlz1hz9savjw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3B5YnVnL05vdGlmeUZpbHRlci1Hbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWZpbHRlckBhc3luY2xpbmsub3JnIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1933q2vywyc26kggdrhy0p3p137k0zb2rav4cdzqlz1hz9savjw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3B5YnVnL05vdGlmeUZpbHRlci1Hbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWZpbHRlckBhc3luY2xpbmsub3JnIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "1933q2vywyc26kggdrhy0p3p137k0zb2rav4cdzqlz1hz9savjw5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3B5YnVnL05vdGlmeUZpbHRlci1Hbm9tZUV4dGVuc2lvbiIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLWZpbHRlckBhc3luY2xpbmsub3JnIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "notification-filter@asynclink.org", "name": "Notification Filter", "pname": "notification-filter", "description": "Filter out notifications by their text content to block them from appearing.\nIf you've ever been annoyed by certain notifications distracting you, this extension gives you more fine tuned control of which notifications to prevent from showing up.\n\nGives you the ability to filter by both the title and body content, use regex matching, and add multiple different filters.\n\nNote: Only prevents new notifications from appearing, does not remove existing notifications.", "link": "https://extensions.gnome.org/extension/5380/notification-filter/", "shell_version_map": {"40": {"version": "3", "sha256": "19jry9hg34i1i1f3r5v7pg9vplfhf27c1rvrnqqwld4qzpp5g0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "19jry9hg34i1i1f3r5v7pg9vplfhf27c1rvrnqqwld4qzpp5g0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "19jry9hg34i1i1f3r5v7pg9vplfhf27c1rvrnqqwld4qzpp5g0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "19jry9hg34i1i1f3r5v7pg9vplfhf27c1rvrnqqwld4qzpp5g0p4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpbHRlciBvdXQgbm90aWZpY2F0aW9ucyBieSB0aGVpciB0ZXh0IGNvbnRlbnQgdG8gYmxvY2sgdGhlbSBmcm9tIGFwcGVhcmluZy5cbklmIHlvdSd2ZSBldmVyIGJlZW4gYW5ub3llZCBieSBjZXJ0YWluIG5vdGlmaWNhdGlvbnMgZGlzdHJhY3RpbmcgeW91LCB0aGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgbW9yZSBmaW5lIHR1bmVkIGNvbnRyb2wgb2Ygd2hpY2ggbm90aWZpY2F0aW9ucyB0byBwcmV2ZW50IGZyb20gc2hvd2luZyB1cC5cblxuR2l2ZXMgeW91IHRoZSBhYmlsaXR5IHRvIGZpbHRlciBieSBib3RoIHRoZSB0aXRsZSBhbmQgYm9keSBjb250ZW50LCB1c2UgcmVnZXggbWF0Y2hpbmcsIGFuZCBhZGQgbXVsdGlwbGUgZGlmZmVyZW50IGZpbHRlcnMuXG5cbk5vdGU6IE9ubHkgcHJldmVudHMgbmV3IG5vdGlmaWNhdGlvbnMgZnJvbSBhcHBlYXJpbmcsIGRvZXMgbm90IHJlbW92ZSBleGlzdGluZyBub3RpZmljYXRpb25zLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEZpbHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub3RpZmljYXRpb24tZmlsdGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NweWJ1Zy9Ob3RpZnlGaWx0ZXItR25vbWVFeHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1maWx0ZXJAYXN5bmNsaW5rLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "evpn-assistant@xytrexl.com", "name": "ExpressVPN - EVPN Shell Assistant", "pname": "evpn-shell-assistant", "description": "Allows ExpressVPN to be controlled through the GNOME shell.", "link": "https://extensions.gnome.org/extension/5385/evpn-shell-assistant/", "shell_version_map": {"42": {"version": "3", "sha256": "07ag6pk024xhhbxyrn5vrfmg1qx6rfyf5xnl6fhcp3rardzkakgr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBFeHByZXNzVlBOIHRvIGJlIGNvbnRyb2xsZWQgdGhyb3VnaCB0aGUgR05PTUUgc2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWV2cG4tYXNzaXN0YW50IiwKICAibmFtZSI6ICJFeHByZXNzVlBOIC0gRVZQTiBTaGVsbCBBc3Npc3RhbnQiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiU3R1YXJ0IEdpbG1vdXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXZwbi1hc3Npc3RhbnQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0amFtZXNnaWxtb3VyL2V2cG4tYXNzaXN0YW50IiwKICAidXVpZCI6ICJldnBuLWFzc2lzdGFudEB4eXRyZXhsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "screen-rotate@shyzus.github.io", "name": "Screen Rotate", "pname": "screen-rotate", "description": "Enable screen rotation regardless of touch mode. Fork of Screen Autorotate by Kosmospredanie.", "link": "https://extensions.gnome.org/extension/5389/screen-rotate/", "shell_version_map": {"40": {"version": "8", "sha256": "0xwbwiz203ml083hi5i52872dfhb3kkqx0fvnm9rdm16rs4gnxx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0xwbwiz203ml083hi5i52872dfhb3kkqx0fvnm9rdm16rs4gnxx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "0xwbwiz203ml083hi5i52872dfhb3kkqx0fvnm9rdm16rs4gnxx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "0xwbwiz203ml083hi5i52872dfhb3kkqx0fvnm9rdm16rs4gnxx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZSBzY3JlZW4gcm90YXRpb24gcmVnYXJkbGVzcyBvZiB0b3VjaCBtb2RlLiBGb3JrIG9mIFNjcmVlbiBBdXRvcm90YXRlIGJ5IEtvc21vc3ByZWRhbmllLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zY3JlZW4tcm90YXRlIiwKICAibmFtZSI6ICJTY3JlZW4gUm90YXRlIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zY3JlZW4tcm90YXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NoeXp1cy9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2NyZWVuLWF1dG9yb3RhdGUiLAogICJ1dWlkIjogInNjcmVlbi1yb3RhdGVAc2h5enVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "devtools@romix.ch", "name": "Dev Tools", "pname": "dev-tools", "description": "Generate random UUID and current time in milliseconds as a shell extension.", "link": "https://extensions.gnome.org/extension/5393/dev-tools/", "shell_version_map": {"42": {"version": "7", "sha256": "15pvi8vi6dpv53g46cdlcxlnybvvvjw851dzqd810kg3alb2jw81", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIHJhbmRvbSBVVUlEIGFuZCBjdXJyZW50IHRpbWUgaW4gbWlsbGlzZWNvbmRzIGFzIGEgc2hlbGwgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiRGV2IFRvb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yb21peGNoL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZXYtdG9vbHMiLAogICJ1dWlkIjogImRldnRvb2xzQHJvbWl4LmNoIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "43": {"version": "7", "sha256": "15pvi8vi6dpv53g46cdlcxlnybvvvjw851dzqd810kg3alb2jw81", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYXRlIHJhbmRvbSBVVUlEIGFuZCBjdXJyZW50IHRpbWUgaW4gbWlsbGlzZWNvbmRzIGFzIGEgc2hlbGwgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiRGV2IFRvb2xzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yb21peGNoL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZXYtdG9vbHMiLAogICJ1dWlkIjogImRldnRvb2xzQHJvbWl4LmNoIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "inhibit-suspend@charlieqle", "name": "Inhibit Suspend", "pname": "inhibit-suspend", "description": "Inhibit autosuspend at the press of a button", "link": "https://extensions.gnome.org/extension/5397/inhibit-suspend/", "shell_version_map": {"43": {"version": "3", "sha256": "0xp3b7i46lsvxkgsk3z3lx1k1zymnwm8hnsl1v39j01zsxyh2fnj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluaGliaXQgYXV0b3N1c3BlbmQgYXQgdGhlIHByZXNzIG9mIGEgYnV0dG9uIiwKICAibmFtZSI6ICJJbmhpYml0IFN1c3BlbmQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW5oaWJpdC1zdXNwZW5kIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0NoYXJsaWVRTGUvZ25vbWUtZXh0ZW5zaW9uLWluaGliaXQtc3VzcGVuZCIsCiAgInV1aWQiOiAiaW5oaWJpdC1zdXNwZW5kQGNoYXJsaWVxbGUiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "gtk3-theme-switcher@charlieqle", "name": "GTK3 Theme Switcher", "pname": "gtk3-theme-switcher", "description": "A simple GTK 3.0 theme switcher", "link": "https://extensions.gnome.org/extension/5401/gtk3-theme-switcher/", "shell_version_map": {"42": {"version": "1", "sha256": "1vm6hcjgq5mzibrwx9dm6iyiz6hmp5vm3qi8jj1w28ylhrvr7hfb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdUSyAzLjAgdGhlbWUgc3dpdGNoZXIiLAogICJuYW1lIjogIkdUSzMgVGhlbWUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrMy10aGVtZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hhcmxpZVFMZS9nbm9tZS1leHRlbnNpb24tZ3RrMy10aGVtZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZ3RrMy10aGVtZS1zd2l0Y2hlckBjaGFybGllcWxlIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "43": {"version": "1", "sha256": "1vm6hcjgq5mzibrwx9dm6iyiz6hmp5vm3qi8jj1w28ylhrvr7hfb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEdUSyAzLjAgdGhlbWUgc3dpdGNoZXIiLAogICJuYW1lIjogIkdUSzMgVGhlbWUgU3dpdGNoZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZ3RrMy10aGVtZS1zd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQ2hhcmxpZVFMZS9nbm9tZS1leHRlbnNpb24tZ3RrMy10aGVtZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZ3RrMy10aGVtZS1zd2l0Y2hlckBjaGFybGllcWxlIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "grand-theft-focus@zalckos.github.com", "name": "Grand Theft Focus", "pname": "grand-theft-focus", "description": "Removes the 'Window is ready' notification and brings the window into focus instead.", "link": "https://extensions.gnome.org/extension/5410/grand-theft-focus/", "shell_version_map": {"40": {"version": "2", "sha256": "0slaqwhzk7y4z11s59y6x8qahsaahfs63z4v2n7ms45ri3387qmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phbGNrb3MvR3JhbmRUaGVmdEZvY3VzIiwKICAidXVpZCI6ICJncmFuZC10aGVmdC1mb2N1c0B6YWxja29zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "0slaqwhzk7y4z11s59y6x8qahsaahfs63z4v2n7ms45ri3387qmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phbGNrb3MvR3JhbmRUaGVmdEZvY3VzIiwKICAidXVpZCI6ICJncmFuZC10aGVmdC1mb2N1c0B6YWxja29zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "0slaqwhzk7y4z11s59y6x8qahsaahfs63z4v2n7ms45ri3387qmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phbGNrb3MvR3JhbmRUaGVmdEZvY3VzIiwKICAidXVpZCI6ICJncmFuZC10aGVmdC1mb2N1c0B6YWxja29zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "0slaqwhzk7y4z11s59y6x8qahsaahfs63z4v2n7ms45ri3387qmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgYnJpbmdzIHRoZSB3aW5kb3cgaW50byBmb2N1cyBpbnN0ZWFkLiIsCiAgImxpY2Vuc2UiOiAiR1BMdjMiLAogICJuYW1lIjogIkdyYW5kIFRoZWZ0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phbGNrb3MvR3JhbmRUaGVmdEZvY3VzIiwKICAidXVpZCI6ICJncmFuZC10aGVmdC1mb2N1c0B6YWxja29zLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} -, {"uuid": "wifiqrcode@glerro.pm.me", "name": "Wifi QrCode", "pname": "wifi-qrcode", "description": "This extension add a switch to the WiFi menu, in the GNOME system menu, that show a QrCode of the active connection.\n\nThis can be useful for quickly connecting devices capable of reading QrCode and applying the settings to the system, without having to type in the name and the password of the WiFi. (e.g. Android Smartphone).", "link": "https://extensions.gnome.org/extension/5416/wifi-qrcode/", "shell_version_map": {"40": {"version": "1", "sha256": "1nvi0miv40l31an8xvkbkja8v249mhzj7gdivypiik7i4mq7r6l4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFyQ29kZSBvZiB0aGUgYWN0aXZlIGNvbm5lY3Rpb24uXG5cblRoaXMgY2FuIGJlIHVzZWZ1bCBmb3IgcXVpY2tseSBjb25uZWN0aW5nIGRldmljZXMgY2FwYWJsZSBvZiByZWFkaW5nIFFyQ29kZSBhbmQgYXBwbHlpbmcgdGhlIHNldHRpbmdzIHRvIHRoZSBzeXN0ZW0sIHdpdGhvdXQgaGF2aW5nIHRvIHR5cGUgaW4gdGhlIG5hbWUgYW5kIHRoZSBwYXNzd29yZCBvZiB0aGUgV2lGaS4gKGUuZy4gQW5kcm9pZCBTbWFydHBob25lKS4iLAogICJuYW1lIjogIldpZmkgUXJDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "1nvi0miv40l31an8xvkbkja8v249mhzj7gdivypiik7i4mq7r6l4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFyQ29kZSBvZiB0aGUgYWN0aXZlIGNvbm5lY3Rpb24uXG5cblRoaXMgY2FuIGJlIHVzZWZ1bCBmb3IgcXVpY2tseSBjb25uZWN0aW5nIGRldmljZXMgY2FwYWJsZSBvZiByZWFkaW5nIFFyQ29kZSBhbmQgYXBwbHlpbmcgdGhlIHNldHRpbmdzIHRvIHRoZSBzeXN0ZW0sIHdpdGhvdXQgaGF2aW5nIHRvIHR5cGUgaW4gdGhlIG5hbWUgYW5kIHRoZSBwYXNzd29yZCBvZiB0aGUgV2lGaS4gKGUuZy4gQW5kcm9pZCBTbWFydHBob25lKS4iLAogICJuYW1lIjogIldpZmkgUXJDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMQp9"}, "42": {"version": "1", "sha256": "1nvi0miv40l31an8xvkbkja8v249mhzj7gdivypiik7i4mq7r6l4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFyQ29kZSBvZiB0aGUgYWN0aXZlIGNvbm5lY3Rpb24uXG5cblRoaXMgY2FuIGJlIHVzZWZ1bCBmb3IgcXVpY2tseSBjb25uZWN0aW5nIGRldmljZXMgY2FwYWJsZSBvZiByZWFkaW5nIFFyQ29kZSBhbmQgYXBwbHlpbmcgdGhlIHNldHRpbmdzIHRvIHRoZSBzeXN0ZW0sIHdpdGhvdXQgaGF2aW5nIHRvIHR5cGUgaW4gdGhlIG5hbWUgYW5kIHRoZSBwYXNzd29yZCBvZiB0aGUgV2lGaS4gKGUuZy4gQW5kcm9pZCBTbWFydHBob25lKS4iLAogICJuYW1lIjogIldpZmkgUXJDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMQp9"}, "43": {"version": "1", "sha256": "1nvi0miv40l31an8xvkbkja8v249mhzj7gdivypiik7i4mq7r6l4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFyQ29kZSBvZiB0aGUgYWN0aXZlIGNvbm5lY3Rpb24uXG5cblRoaXMgY2FuIGJlIHVzZWZ1bCBmb3IgcXVpY2tseSBjb25uZWN0aW5nIGRldmljZXMgY2FwYWJsZSBvZiByZWFkaW5nIFFyQ29kZSBhbmQgYXBwbHlpbmcgdGhlIHNldHRpbmdzIHRvIHRoZSBzeXN0ZW0sIHdpdGhvdXQgaGF2aW5nIHRvIHR5cGUgaW4gdGhlIG5hbWUgYW5kIHRoZSBwYXNzd29yZCBvZiB0aGUgV2lGaS4gKGUuZy4gQW5kcm9pZCBTbWFydHBob25lKS4iLAogICJuYW1lIjogIldpZmkgUXJDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "wifiqrcode@glerro.pm.me", "name": "Wifi QR Code", "pname": "wifi-qrcode", "description": "This extension add a switch to the WiFi menu, in the GNOME system menu, that show a QR Code of the active connection.\n\nThis can be useful for quickly connecting devices capable of reading QR Code and applying the settings to the system, without having to type in the name and the password of the WiFi. (e.g. Android Smartphone).", "link": "https://extensions.gnome.org/extension/5416/wifi-qrcode/", "shell_version_map": {"40": {"version": "3", "sha256": "1yxfmqbyqi9mn48zhmqakgi2r3z9axcmiy643br0n27pfcrfca9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiIsCiAgIm5hbWUiOiAiV2lmaSBRUiBDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1yxfmqbyqi9mn48zhmqakgi2r3z9axcmiy643br0n27pfcrfca9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiIsCiAgIm5hbWUiOiAiV2lmaSBRUiBDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "1yxfmqbyqi9mn48zhmqakgi2r3z9axcmiy643br0n27pfcrfca9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiIsCiAgIm5hbWUiOiAiV2lmaSBRUiBDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "1yxfmqbyqi9mn48zhmqakgi2r3z9axcmiy643br0n27pfcrfca9s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFkZCBhIHN3aXRjaCB0byB0aGUgV2lGaSBtZW51LCBpbiB0aGUgR05PTUUgc3lzdGVtIG1lbnUsIHRoYXQgc2hvdyBhIFFSIENvZGUgb2YgdGhlIGFjdGl2ZSBjb25uZWN0aW9uLlxuXG5UaGlzIGNhbiBiZSB1c2VmdWwgZm9yIHF1aWNrbHkgY29ubmVjdGluZyBkZXZpY2VzIGNhcGFibGUgb2YgcmVhZGluZyBRUiBDb2RlIGFuZCBhcHBseWluZyB0aGUgc2V0dGluZ3MgdG8gdGhlIHN5c3RlbSwgd2l0aG91dCBoYXZpbmcgdG8gdHlwZSBpbiB0aGUgbmFtZSBhbmQgdGhlIHBhc3N3b3JkIG9mIHRoZSBXaUZpLiAoZS5nLiBBbmRyb2lkIFNtYXJ0cGhvbmUpLiIsCiAgIm5hbWUiOiAiV2lmaSBRUiBDb2RlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24td2lmaXFyY29kZSIsCiAgInV1aWQiOiAid2lmaXFyY29kZUBnbGVycm8ucG0ubWUiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "eos-desktop@endlessm.com", "name": "Endless Desktop", "pname": "endless-desktop", "description": "Endless OS signature desktop", "link": "https://extensions.gnome.org/extension/5419/endless-desktop/", "shell_version_map": {"41": {"version": "2", "sha256": "07wg7nab34bvhqnlfdni622c5r3pvlq04dly8spk53nxdwvisckr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuZGxlc3MgT1Mgc2lnbmF0dXJlIGRlc2t0b3AiLAogICJuYW1lIjogIkVuZGxlc3MgRGVza3RvcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJjb20uZW5kbGVzc20uZGVza3RvcC1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1kZXNrdG9wLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWRlc2t0b3BAZW5kbGVzc20uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "07wg7nab34bvhqnlfdni622c5r3pvlq04dly8spk53nxdwvisckr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuZGxlc3MgT1Mgc2lnbmF0dXJlIGRlc2t0b3AiLAogICJuYW1lIjogIkVuZGxlc3MgRGVza3RvcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJjb20uZW5kbGVzc20uZGVza3RvcC1leHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VuZGxlc3NtL2Vvcy1kZXNrdG9wLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZW9zLWRlc2t0b3BAZW5kbGVzc20uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "batterytime@typeof.pw", "name": "Battery Time", "pname": "battery-time", "description": "Get estimated battery remaining time back on quick menu.\n\nWhen computer is on battery or is charging, the remaining time or time to full will be shown in quick menu.", "link": "https://extensions.gnome.org/extension/5425/battery-time/", "shell_version_map": {"43": {"version": "1", "sha256": "1wv56yaws3vrpwp0hr7s9gb4w8kwrnwhirwd7k3i5vvf7w707d3j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBlc3RpbWF0ZWQgYmF0dGVyeSByZW1haW5pbmcgdGltZSBiYWNrIG9uIHF1aWNrIG1lbnUuXG5cbldoZW4gY29tcHV0ZXIgaXMgb24gYmF0dGVyeSBvciBpcyBjaGFyZ2luZywgdGhlIHJlbWFpbmluZyB0aW1lIG9yIHRpbWUgdG8gZnVsbCB3aWxsIGJlIHNob3duIGluIHF1aWNrIG1lbnUuIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFRpbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9tb2tlL2JhdHRlcnlfdGltZSIsCiAgInV1aWQiOiAiYmF0dGVyeXRpbWVAdHlwZW9mLnB3IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "onedrive@diegomerida.com", "name": "One Drive Resurrect", "pname": "one-drive-resurrect", "description": "One Drive extension. This extension is not affiliated, funded, or in any way associated with Microsoft and OneDrive.", "link": "https://extensions.gnome.org/extension/5428/one-drive-resurrect/", "shell_version_map": {"41": {"version": "8", "sha256": "1ymldaf55blbj7b3wicskjbb6gc4fy98jcljbayzi94kfvdxg6vy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24uIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIE1pY3Jvc29mdCBhbmQgT25lRHJpdmUuIiwKICAibmFtZSI6ICJPbmUgRHJpdmUgUmVzdXJyZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ3N0cm95ZXIvb25lRHJpdmUiLAogICJ1dWlkIjogIm9uZWRyaXZlQGRpZWdvbWVyaWRhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1ymldaf55blbj7b3wicskjbb6gc4fy98jcljbayzi94kfvdxg6vy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24uIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIE1pY3Jvc29mdCBhbmQgT25lRHJpdmUuIiwKICAibmFtZSI6ICJPbmUgRHJpdmUgUmVzdXJyZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ3N0cm95ZXIvb25lRHJpdmUiLAogICJ1dWlkIjogIm9uZWRyaXZlQGRpZWdvbWVyaWRhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "43": {"version": "8", "sha256": "1ymldaf55blbj7b3wicskjbb6gc4fy98jcljbayzi94kfvdxg6vy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZSBEcml2ZSBleHRlbnNpb24uIFRoaXMgZXh0ZW5zaW9uIGlzIG5vdCBhZmZpbGlhdGVkLCBmdW5kZWQsIG9yIGluIGFueSB3YXkgYXNzb2NpYXRlZCB3aXRoIE1pY3Jvc29mdCBhbmQgT25lRHJpdmUuIiwKICAibmFtZSI6ICJPbmUgRHJpdmUgUmVzdXJyZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGllZ3N0cm95ZXIvb25lRHJpdmUiLAogICJ1dWlkIjogIm9uZWRyaXZlQGRpZWdvbWVyaWRhLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} @@ -846,7 +847,7 @@ , {"uuid": "quick-settings-tweaks@qwreey", "name": "Quick Settings Tweaker", "pname": "quick-settings-tweaker", "description": "Let's tweak gnome 43's quick settings! You can add Media Controls, Notifications, Volume Mixer on quick settings and remove useless buttons!", "link": "https://extensions.gnome.org/extension/5446/quick-settings-tweaker/", "shell_version_map": {"43": {"version": "17", "sha256": "1b3x4zqfyzph7x3r3kr3m2m07hralfazpazx5950iiscmx5s4cbg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCdzIHR3ZWFrIGdub21lIDQzJ3MgcXVpY2sgc2V0dGluZ3MhIFlvdSBjYW4gYWRkIE1lZGlhIENvbnRyb2xzLCBOb3RpZmljYXRpb25zLCBWb2x1bWUgTWl4ZXIgb24gcXVpY2sgc2V0dGluZ3MgYW5kIHJlbW92ZSB1c2VsZXNzIGJ1dHRvbnMhIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicXVpY2stc2V0dGluZ3MtdHdlYWtzIiwKICAibmFtZSI6ICJRdWljayBTZXR0aW5ncyBUd2Vha2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnF1aWNrLXNldHRpbmdzLXR3ZWFrcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9xd3JlZXk3NS9xdWljay1zZXR0aW5ncy10d2Vha3MiLAogICJ1dWlkIjogInF1aWNrLXNldHRpbmdzLXR3ZWFrc0Bxd3JlZXkiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "osd-volume-number@deminder", "name": "OSD Volume Number", "pname": "osd-volume-number", "description": "Replace the on-screen-display volume level icon with a number.", "link": "https://extensions.gnome.org/extension/5461/osd-volume-number/", "shell_version_map": {"42": {"version": "1", "sha256": "1lfqac0md0zlgg55rlji8ahqviv4a5d6jhgbrnqbwsjnv5845fdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAibmFtZSI6ICJPU0QgVm9sdW1lIE51bWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvb3NkLXZvbHVtZS1udW1iZXIiLAogICJ1dWlkIjogIm9zZC12b2x1bWUtbnVtYmVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "43": {"version": "1", "sha256": "1lfqac0md0zlgg55rlji8ahqviv4a5d6jhgbrnqbwsjnv5845fdg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIG9uLXNjcmVlbi1kaXNwbGF5IHZvbHVtZSBsZXZlbCBpY29uIHdpdGggYSBudW1iZXIuIiwKICAibmFtZSI6ICJPU0QgVm9sdW1lIE51bWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRGVtaW5kZXIvb3NkLXZvbHVtZS1udW1iZXIiLAogICJ1dWlkIjogIm9zZC12b2x1bWUtbnVtYmVyQGRlbWluZGVyIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "next-up@artisticat1.github.com", "name": "Next Up", "pname": "next-up", "description": "Show your next calendar event in the status bar", "link": "https://extensions.gnome.org/extension/5465/next-up/", "shell_version_map": {"42": {"version": "2", "sha256": "1p8r4lly20azdl82a2724gdj0rczinccch509dhzvb2j859y7xqh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgeW91ciBuZXh0IGNhbGVuZGFyIGV2ZW50IGluIHRoZSBzdGF0dXMgYmFyIiwKICAibmFtZSI6ICJOZXh0IFVwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FydGlzdGljYXQxL2dub21lLW5leHQtdXAiLAogICJ1dWlkIjogIm5leHQtdXBAYXJ0aXN0aWNhdDEuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "weatheroclock@CleoMenezesJr.github.io", "name": "Weather O'Clock", "pname": "weather-oclock", "description": "Display the current Weather on the left side of the clock without de-centering it from the panel. GNOME Weather is required for this extension to function.", "link": "https://extensions.gnome.org/extension/5470/weather-oclock/", "shell_version_map": {"42": {"version": "2", "sha256": "1d795m2sgjbwks5hwld5lcblni8ymyhy63b1z6lww8rjr6zwvk9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgV2VhdGhlciBvbiB0aGUgbGVmdCBzaWRlIG9mIHRoZSBjbG9jayB3aXRob3V0IGRlLWNlbnRlcmluZyBpdCBmcm9tIHRoZSBwYW5lbC4gR05PTUUgV2VhdGhlciBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gZnVuY3Rpb24uIiwKICAibmFtZSI6ICJXZWF0aGVyIE8nQ2xvY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiSmFzb25MRzE5NzlAZ2l0aHViLmlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLW9jbG9jayIsCiAgInV1aWQiOiAid2VhdGhlcm9jbG9ja0BDbGVvTWVuZXplc0pyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "43": {"version": "2", "sha256": "1d795m2sgjbwks5hwld5lcblni8ymyhy63b1z6lww8rjr6zwvk9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgV2VhdGhlciBvbiB0aGUgbGVmdCBzaWRlIG9mIHRoZSBjbG9jayB3aXRob3V0IGRlLWNlbnRlcmluZyBpdCBmcm9tIHRoZSBwYW5lbC4gR05PTUUgV2VhdGhlciBpcyByZXF1aXJlZCBmb3IgdGhpcyBleHRlbnNpb24gdG8gZnVuY3Rpb24uIiwKICAibmFtZSI6ICJXZWF0aGVyIE8nQ2xvY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiSmFzb25MRzE5NzlAZ2l0aHViLmlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLW9jbG9jayIsCiAgInV1aWQiOiAid2VhdGhlcm9jbG9ja0BDbGVvTWVuZXplc0pyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "weatheroclock@CleoMenezesJr.github.io", "name": "Weather O'Clock", "pname": "weather-oclock", "description": "Display the current weather inside the pill next to the clock. GNOME Weather is required for this extension to work.", "link": "https://extensions.gnome.org/extension/5470/weather-oclock/", "shell_version_map": {"42": {"version": "5", "sha256": "1r30cicw43vj8rwm7sw2bshi41239sgmw5nypnjr20a2k7f6rw7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbnNpZGUgdGhlIHBpbGwgbmV4dCB0byB0aGUgY2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuIiwKICAibmFtZSI6ICJXZWF0aGVyIE8nQ2xvY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiSmFzb25MRzE5NzlAZ2l0aHViLmlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL3dlYXRoZXItb2Nsb2NrIiwKICAidXVpZCI6ICJ3ZWF0aGVyb2Nsb2NrQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "43": {"version": "5", "sha256": "1r30cicw43vj8rwm7sw2bshi41239sgmw5nypnjr20a2k7f6rw7i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBpbnNpZGUgdGhlIHBpbGwgbmV4dCB0byB0aGUgY2xvY2suIEdOT01FIFdlYXRoZXIgaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIHdvcmsuIiwKICAibmFtZSI6ICJXZWF0aGVyIE8nQ2xvY2siLAogICJvcmlnaW5hbC1hdXRob3IiOiAiSmFzb25MRzE5NzlAZ2l0aHViLmlvIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9DbGVvTWVuZXplc0pyL3dlYXRoZXItb2Nsb2NrIiwKICAidXVpZCI6ICJ3ZWF0aGVyb2Nsb2NrQENsZW9NZW5lemVzSnIuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "appmenu-color-icon@arahiko-ayami.github.com", "name": "Color App Menu Icon for GNOME 40+", "pname": "color-app-menu-icon-for-gnome-40", "description": "Replace the symbolic application menu icon with the regular one. An alternative version of yanbab's extension that supports GNOME 40 and higher", "link": "https://extensions.gnome.org/extension/5473/color-app-menu-icon-for-gnome-40/", "shell_version_map": {"38": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "40": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "1ixv4by9gf6xygz2hm584wp1bbgqz90cc1cmvld3hc0d6pr03arz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2UgdGhlIHN5bWJvbGljIGFwcGxpY2F0aW9uIG1lbnUgaWNvbiB3aXRoIHRoZSByZWd1bGFyIG9uZS4gQW4gYWx0ZXJuYXRpdmUgdmVyc2lvbiBvZiB5YW5iYWIncyBleHRlbnNpb24gdGhhdCBzdXBwb3J0cyBHTk9NRSA0MCBhbmQgaGlnaGVyIiwKICAibmFtZSI6ICJDb2xvciBBcHAgTWVudSBJY29uIGZvciBHTk9NRSA0MCsiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJhaGlrby1heWFtaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tcmVndWxhci1hcHBtZW51LWljb24iLAogICJ1dWlkIjogImFwcG1lbnUtY29sb3ItaWNvbkBhcmFoaWtvLWF5YW1pLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "toggle-workspace-span@arngo.github.com", "name": "Toggle workspace span", "pname": "toggle-workspace-span", "description": "Toggle workspaces spanning displays (aka \"Workspaces on primary display only/Workspaces on all displays\").\n\nThe button can be set to show either on the panel or in the quick settings menu.", "link": "https://extensions.gnome.org/extension/5482/toggle-workspace-span/", "shell_version_map": {"43": {"version": "2", "sha256": "19wca76p0rx2qm1dh1yz5rhrdfkdqf0s470d6lhlaj0c8j86bjr2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB3b3Jrc3BhY2VzIHNwYW5uaW5nIGRpc3BsYXlzIChha2EgXCJXb3Jrc3BhY2VzIG9uIHByaW1hcnkgZGlzcGxheSBvbmx5L1dvcmtzcGFjZXMgb24gYWxsIGRpc3BsYXlzXCIpLlxuXG5UaGUgYnV0dG9uIGNhbiBiZSBzZXQgdG8gc2hvdyBlaXRoZXIgb24gdGhlIHBhbmVsIG9yIGluIHRoZSBxdWljayBzZXR0aW5ncyBtZW51LiIsCiAgIm5hbWUiOiAiVG9nZ2xlIHdvcmtzcGFjZSBzcGFuIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FybmdvL2dub21lLXNoZWxsLWV4dGVuc2lvbi10b2dnbGUtd29ya3NwYWNlLXNwYW4iLAogICJ1dWlkIjogInRvZ2dsZS13b3Jrc3BhY2Utc3BhbkBhcm5nby5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "search-light@icedman.github.com", "name": "Search Light", "pname": "search-light", "description": "Take the apps search out of overview", "link": "https://extensions.gnome.org/extension/5489/search-light/", "shell_version_map": {"42": {"version": "11", "sha256": "0rb37fbv9782sybh4yzscddzf7n3ir0v44dsp8jcg1bay3wc7m6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldyIsCiAgImdldHRleHQtZG9tYWluIjogInNlYXJjaC1saWdodCIsCiAgIm5hbWUiOiAiU2VhcmNoIExpZ2h0IiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlYXJjaC1saWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9zZWFyY2gtbGlnaHQiLAogICJ1dWlkIjogInNlYXJjaC1saWdodEBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "43": {"version": "11", "sha256": "0rb37fbv9782sybh4yzscddzf7n3ir0v44dsp8jcg1bay3wc7m6n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRha2UgdGhlIGFwcHMgc2VhcmNoIG91dCBvZiBvdmVydmlldyIsCiAgImdldHRleHQtZG9tYWluIjogInNlYXJjaC1saWdodCIsCiAgIm5hbWUiOiAiU2VhcmNoIExpZ2h0IiwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNlYXJjaC1saWdodCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9zZWFyY2gtbGlnaHQiLAogICJ1dWlkIjogInNlYXJjaC1saWdodEBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} @@ -869,15 +870,27 @@ , {"uuid": "window-app-switcher-on-active-monitor@NiKnights.com", "name": "Window/App switcher on active monitor", "pname": "monitor-window-switcher-2", "description": "GNOME shell extension that puts the Window/App switcher on the active monitor (monitor with the cursor).\n\nThis extension is a fork of https://github.com/gedzeppelin/monitor-window-switcher.", "link": "https://extensions.gnome.org/extension/5568/monitor-window-switcher-2/", "shell_version_map": {"38": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "43": {"version": "3", "sha256": "1723ixhw6xksp8s9apx8s69pn85b45gf1v39q9gy5x8dagw2hz6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdOT01FIHNoZWxsIGV4dGVuc2lvbiB0aGF0IHB1dHMgdGhlIFdpbmRvdy9BcHAgc3dpdGNoZXIgb24gdGhlIGFjdGl2ZSBtb25pdG9yIChtb25pdG9yIHdpdGggdGhlIGN1cnNvcikuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGEgZm9yayBvZiBodHRwczovL2dpdGh1Yi5jb20vZ2VkemVwcGVsaW4vbW9uaXRvci13aW5kb3ctc3dpdGNoZXIuIiwKICAibmFtZSI6ICJXaW5kb3cvQXBwIHN3aXRjaGVyIG9uIGFjdGl2ZSBtb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xlcGEyMi93aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAidXVpZCI6ICJ3aW5kb3ctYXBwLXN3aXRjaGVyLW9uLWFjdGl2ZS1tb25pdG9yQE5pS25pZ2h0cy5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "focus-window@chris.al", "name": "Focus Window", "pname": "focus-window", "description": "Do you want a pulldown mode on your terminal without having to switch to tilda or guake? Do you want to focus your Spotify app or email client with a single shortcut key? Then this extension is for you!\n\nThis extension allows one to create various shortcuts for applications, enabling the ability to have one shortcut that triggers both the launch and focus of an application window.", "link": "https://extensions.gnome.org/extension/5571/focus-window/", "shell_version_map": {"42": {"version": "1", "sha256": "1lyz695wqn8zlcbdk9f0c94jmxq9czgnc71s9cndd6vw73pz7z4j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvIHlvdSB3YW50IGEgcHVsbGRvd24gbW9kZSBvbiB5b3VyIHRlcm1pbmFsIHdpdGhvdXQgaGF2aW5nIHRvIHN3aXRjaCB0byB0aWxkYSBvciBndWFrZT8gRG8geW91IHdhbnQgdG8gZm9jdXMgeW91ciBTcG90aWZ5IGFwcCBvciBlbWFpbCBjbGllbnQgd2l0aCBhIHNpbmdsZSBzaG9ydGN1dCBrZXk/IFRoZW4gdGhpcyBleHRlbnNpb24gaXMgZm9yIHlvdSFcblxuVGhpcyBleHRlbnNpb24gYWxsb3dzIG9uZSB0byBjcmVhdGUgdmFyaW91cyBzaG9ydGN1dHMgZm9yIGFwcGxpY2F0aW9ucywgZW5hYmxpbmcgdGhlIGFiaWxpdHkgdG8gaGF2ZSBvbmUgc2hvcnRjdXQgdGhhdCB0cmlnZ2VycyBib3RoIHRoZSBsYXVuY2ggYW5kIGZvY3VzIG9mIGFuIGFwcGxpY2F0aW9uIHdpbmRvdy4iLAogICJuYW1lIjogIkZvY3VzIFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wY2Jvd2Vycy9mb2N1cy13aW5kb3ciLAogICJ1dWlkIjogImZvY3VzLXdpbmRvd0BjaHJpcy5hbCIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "power-profile-switcher@eliapasquali.github.io", "name": "Power Profile Switcher", "pname": "power-profile-switcher", "description": "Automatically switch between power profiles based on power supply and percentage.", "link": "https://extensions.gnome.org/extension/5575/power-profile-switcher/", "shell_version_map": {"42": {"version": "3", "sha256": "1ixv6vl03z8129mygf6hpcgfvyqh1ykjz648d589mpi1nkf32dww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgIm5hbWUiOiAiUG93ZXIgUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWxpYXBhc3F1YWxpL3Bvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtc3dpdGNoZXJAZWxpYXBhc3F1YWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "1ixv6vl03z8129mygf6hpcgfvyqh1ykjz648d589mpi1nkf32dww", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgc3dpdGNoIGJldHdlZW4gcG93ZXIgcHJvZmlsZXMgYmFzZWQgb24gcG93ZXIgc3VwcGx5IGFuZCBwZXJjZW50YWdlLiIsCiAgIm5hbWUiOiAiUG93ZXIgUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWxpYXBhc3F1YWxpL3Bvd2VyLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogInBvd2VyLXByb2ZpbGUtc3dpdGNoZXJAZWxpYXBhc3F1YWxpLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "colorblind-filters@G-dH.github.com", "name": "Colorblind Filters", "pname": "colorblind-filters", "description": "Color filters that should help color-blind users and also developers.\nThe menu includes correction filters and also simulation filters that can show you what color-blind people see. Included are filters for Protanopia, Deuteranopia and Tritanopia, filter strength is adjustable. Available are also filters for desaturation, channel mix, and lightness and color inversions.\n\nPrimary mouse button click on the panel button toggles active filter, secondary click opens configuration menu, middle click toggles high-contrast correction if available and scroll switches filters.\n\nDiscussions and bug reports on the GitHub page linked below, please.", "link": "https://extensions.gnome.org/extension/5589/colorblind-filters/", "shell_version_map": {"38": {"version": "10", "sha256": "0nsga204fkmdnscdipxixiq4fc28wp47s1s2vsn1xm928zdz051p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "0nsga204fkmdnscdipxixiq4fc28wp47s1s2vsn1xm928zdz051p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0nsga204fkmdnscdipxixiq4fc28wp47s1s2vsn1xm928zdz051p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "0nsga204fkmdnscdipxixiq4fc28wp47s1s2vsn1xm928zdz051p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "43": {"version": "10", "sha256": "0nsga204fkmdnscdipxixiq4fc28wp47s1s2vsn1xm928zdz051p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} +, {"uuid": "colorblind-filters@G-dH.github.com", "name": "Colorblind Filters", "pname": "colorblind-filters", "description": "Color filters that should help color-blind users and also developers.\nThe menu includes correction filters and also simulation filters that can show you what color-blind people see. Included are filters for Protanopia, Deuteranopia and Tritanopia, filter strength is adjustable. Available are also filters for desaturation, channel mix, and lightness and color inversions.\n\nPrimary mouse button click on the panel button toggles active filter, secondary click opens configuration menu, middle click toggles high-contrast correction if available and scroll switches filters.\n\nDiscussions and bug reports on the GitHub page linked below, please.", "link": "https://extensions.gnome.org/extension/5589/colorblind-filters/", "shell_version_map": {"38": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "41": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "42": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "43": {"version": "13", "sha256": "19csbc6gxlkq539qk1qxlp1wqzf4q34a90m4cv12q7yi5z2dysxn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbG9yIGZpbHRlcnMgdGhhdCBzaG91bGQgaGVscCBjb2xvci1ibGluZCB1c2VycyBhbmQgYWxzbyBkZXZlbG9wZXJzLlxuVGhlIG1lbnUgaW5jbHVkZXMgY29ycmVjdGlvbiBmaWx0ZXJzIGFuZCBhbHNvIHNpbXVsYXRpb24gZmlsdGVycyB0aGF0IGNhbiBzaG93IHlvdSB3aGF0IGNvbG9yLWJsaW5kIHBlb3BsZSBzZWUuIEluY2x1ZGVkIGFyZSBmaWx0ZXJzIGZvciBQcm90YW5vcGlhLCBEZXV0ZXJhbm9waWEgYW5kIFRyaXRhbm9waWEsIGZpbHRlciBzdHJlbmd0aCBpcyBhZGp1c3RhYmxlLiBBdmFpbGFibGUgYXJlIGFsc28gZmlsdGVycyBmb3IgZGVzYXR1cmF0aW9uLCBjaGFubmVsIG1peCwgYW5kIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucy5cblxuUHJpbWFyeSBtb3VzZSBidXR0b24gY2xpY2sgb24gdGhlIHBhbmVsIGJ1dHRvbiB0b2dnbGVzIGFjdGl2ZSBmaWx0ZXIsIHNlY29uZGFyeSBjbGljayBvcGVucyBjb25maWd1cmF0aW9uIG1lbnUsIG1pZGRsZSBjbGljayB0b2dnbGVzIGhpZ2gtY29udHJhc3QgY29ycmVjdGlvbiBpZiBhdmFpbGFibGUgYW5kIHNjcm9sbCBzd2l0Y2hlcyBmaWx0ZXJzLlxuXG5EaXNjdXNzaW9ucyBhbmQgYnVnIHJlcG9ydHMgb24gdGhlIEdpdEh1YiBwYWdlIGxpbmtlZCBiZWxvdywgcGxlYXNlLiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yYmxpbmQtZmlsdGVycyIsCiAgIm5hbWUiOiAiQ29sb3JibGluZCBGaWx0ZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2dub21lLWNvbG9yYmxpbmQtZmlsdGVycyIsCiAgInV1aWQiOiAiY29sb3JibGluZC1maWx0ZXJzQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} +, {"uuid": "focused-window-dbus@flexagoon.com", "name": "Focused Window D-Bus", "pname": "focused-window-d-bus", "description": "Exposes a D-Bus method to get active window title and class", "link": "https://extensions.gnome.org/extension/5592/focused-window-d-bus/", "shell_version_map": {"43": {"version": "2", "sha256": "148xqala2fkjgvzn4nnq0nhq8vp6nc2yfrimg3cpwlgp2zi0g7cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cG9zZXMgYSBELUJ1cyBtZXRob2QgdG8gZ2V0IGFjdGl2ZSB3aW5kb3cgdGl0bGUgYW5kIGNsYXNzIiwKICAibmFtZSI6ICJGb2N1c2VkIFdpbmRvdyBELUJ1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbGV4YWdvb24vZm9jdXNlZC13aW5kb3ctZGJ1cyIsCiAgInV1aWQiOiAiZm9jdXNlZC13aW5kb3ctZGJ1c0BmbGV4YWdvb24uY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "multimonitorswap@dvrlabs.tv", "name": "Multi Monitor Swap ", "pname": "multi-monitor-swap", "description": "Swap windows between monitors.", "link": "https://extensions.gnome.org/extension/5597/multi-monitor-swap/", "shell_version_map": {"40": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}, "43": {"version": "12", "sha256": "03izg1r7zszz2cs2q1qq92r7kqha9wkgbh1ggii011lpdyryarqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3YXAgd2luZG93cyBiZXR3ZWVuIG1vbml0b3JzLiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvciBTd2FwICIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kdnJsYWJzL211bHRpbW9uaXRvcnN3YXAiLAogICJ1dWlkIjogIm11bHRpbW9uaXRvcnN3YXBAZHZybGFicy50diIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "osktouchpad@francescocaracciolo.uno", "name": "OSK/Touchpad inverse toggle", "pname": "osktouchpad-inverse-toggle", "description": "This extension enables On Screek Keyboard from accessibility settings when touchpad is turned off, and disables it when it's on. Useful for 2 in 1 when tablet mode is not properly recognized.", "link": "https://extensions.gnome.org/extension/5603/osktouchpad-inverse-toggle/", "shell_version_map": {"40": {"version": "3", "sha256": "09l4m6vb5gg8msmgzqq257ch43j4krspsidg0i23zjwd4s6a88ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgT24gU2NyZWVrIEtleWJvYXJkIGZyb20gYWNjZXNzaWJpbGl0eSBzZXR0aW5ncyB3aGVuIHRvdWNocGFkIGlzIHR1cm5lZCBvZmYsIGFuZCBkaXNhYmxlcyBpdCB3aGVuIGl0J3Mgb24uIFVzZWZ1bCBmb3IgMiBpbiAxIHdoZW4gdGFibGV0IG1vZGUgaXMgbm90IHByb3Blcmx5IHJlY29nbml6ZWQuIiwKICAibmFtZSI6ICJPU0svVG91Y2hwYWQgaW52ZXJzZSB0b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRnJhbmNlc2NvQ2FyYWNjaW9sby9PU0stVG91Y2hwYWQtaW52ZXJzZS10b2dnbGUtR25vbWUtRXh0IiwKICAidXVpZCI6ICJvc2t0b3VjaHBhZEBmcmFuY2VzY29jYXJhY2Npb2xvLnVubyIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "09l4m6vb5gg8msmgzqq257ch43j4krspsidg0i23zjwd4s6a88ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgT24gU2NyZWVrIEtleWJvYXJkIGZyb20gYWNjZXNzaWJpbGl0eSBzZXR0aW5ncyB3aGVuIHRvdWNocGFkIGlzIHR1cm5lZCBvZmYsIGFuZCBkaXNhYmxlcyBpdCB3aGVuIGl0J3Mgb24uIFVzZWZ1bCBmb3IgMiBpbiAxIHdoZW4gdGFibGV0IG1vZGUgaXMgbm90IHByb3Blcmx5IHJlY29nbml6ZWQuIiwKICAibmFtZSI6ICJPU0svVG91Y2hwYWQgaW52ZXJzZSB0b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRnJhbmNlc2NvQ2FyYWNjaW9sby9PU0stVG91Y2hwYWQtaW52ZXJzZS10b2dnbGUtR25vbWUtRXh0IiwKICAidXVpZCI6ICJvc2t0b3VjaHBhZEBmcmFuY2VzY29jYXJhY2Npb2xvLnVubyIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "09l4m6vb5gg8msmgzqq257ch43j4krspsidg0i23zjwd4s6a88ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgT24gU2NyZWVrIEtleWJvYXJkIGZyb20gYWNjZXNzaWJpbGl0eSBzZXR0aW5ncyB3aGVuIHRvdWNocGFkIGlzIHR1cm5lZCBvZmYsIGFuZCBkaXNhYmxlcyBpdCB3aGVuIGl0J3Mgb24uIFVzZWZ1bCBmb3IgMiBpbiAxIHdoZW4gdGFibGV0IG1vZGUgaXMgbm90IHByb3Blcmx5IHJlY29nbml6ZWQuIiwKICAibmFtZSI6ICJPU0svVG91Y2hwYWQgaW52ZXJzZSB0b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRnJhbmNlc2NvQ2FyYWNjaW9sby9PU0stVG91Y2hwYWQtaW52ZXJzZS10b2dnbGUtR25vbWUtRXh0IiwKICAidXVpZCI6ICJvc2t0b3VjaHBhZEBmcmFuY2VzY29jYXJhY2Npb2xvLnVubyIsCiAgInZlcnNpb24iOiAzCn0="}, "43": {"version": "3", "sha256": "09l4m6vb5gg8msmgzqq257ch43j4krspsidg0i23zjwd4s6a88ac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGVuYWJsZXMgT24gU2NyZWVrIEtleWJvYXJkIGZyb20gYWNjZXNzaWJpbGl0eSBzZXR0aW5ncyB3aGVuIHRvdWNocGFkIGlzIHR1cm5lZCBvZmYsIGFuZCBkaXNhYmxlcyBpdCB3aGVuIGl0J3Mgb24uIFVzZWZ1bCBmb3IgMiBpbiAxIHdoZW4gdGFibGV0IG1vZGUgaXMgbm90IHByb3Blcmx5IHJlY29nbml6ZWQuIiwKICAibmFtZSI6ICJPU0svVG91Y2hwYWQgaW52ZXJzZSB0b2dnbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRnJhbmNlc2NvQ2FyYWNjaW9sby9PU0stVG91Y2hwYWQtaW52ZXJzZS10b2dnbGUtR25vbWUtRXh0IiwKICAidXVpZCI6ICJvc2t0b3VjaHBhZEBmcmFuY2VzY29jYXJhY2Npb2xvLnVubyIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "tado-gnome-shell-extension@fio.ie", "name": "Tado°", "pname": "tado", "description": "Manages Tado° home heating. This extension is not affiliated, funded, or in any way associated with Tado", "link": "https://extensions.gnome.org/extension/5606/tado/", "shell_version_map": {"43": {"version": "2", "sha256": "13znn7h22x1vgvnpm3jy1bn0ihad4wxnq8f46p798hpd5m180xgf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZXMgVGFkb1x1MDBiMCBob21lIGhlYXRpbmcuICAgVGhpcyBleHRlbnNpb24gaXMgbm90IGFmZmlsaWF0ZWQsIGZ1bmRlZCwgb3IgaW4gYW55IHdheSBhc3NvY2lhdGVkIHdpdGggVGFkbyIsCiAgIm5hbWUiOiAiVGFkb1x1MDBiMCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kbXpvbmVpbGwvdGFkby1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRhZG8tZ25vbWUtc2hlbGwtZXh0ZW5zaW9uQGZpby5pZSIsCiAgInZlcnNpb24iOiAyCn0="}}} -, {"uuid": "indicate-focus@leleat-on-github", "name": "Focus Indicator", "pname": "focus-indicator", "description": "Indicate the focus after switching workspaces", "link": "https://extensions.gnome.org/extension/5612/focus-indicator/", "shell_version_map": {"43": {"version": "5", "sha256": "0dyhbip716bksvr9dp7hybsvyq89x34654178h9dn810xfq8c06z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlIHRoZSBmb2N1cyBhZnRlciBzd2l0Y2hpbmcgd29ya3NwYWNlcyIsCiAgIm5hbWUiOiAiRm9jdXMgSW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmluZGljYXRlLWZvY3VzLXByb3RvdHlwZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvZm9jdXMtaW5kaWNhdG9yLXByb3RvdHlwZSIsCiAgInV1aWQiOiAiaW5kaWNhdGUtZm9jdXNAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"uuid": "tado-gnome-shell-extension@fio.ie", "name": "Tado°", "pname": "tado", "description": "Manages Tado° home heating. This extension is not affiliated, funded, or in any way associated with Tado", "link": "https://extensions.gnome.org/extension/5606/tado/", "shell_version_map": {"43": {"version": "7", "sha256": "1259rvgj9lbb354avj76wdgizg01cas4fj7wdnd7j8qlgx0k68yz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZXMgVGFkb1x1MDBiMCBob21lIGhlYXRpbmcuICBUaGlzIGV4dGVuc2lvbiBpcyBub3QgYWZmaWxpYXRlZCwgZnVuZGVkLCBvciBpbiBhbnkgd2F5IGFzc29jaWF0ZWQgd2l0aCBUYWRvIiwKICAibmFtZSI6ICJUYWRvXHUwMGIwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Rtem9uZWlsbC90YWRvLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidGFkby1nbm9tZS1zaGVsbC1leHRlbnNpb25AZmlvLmllIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} +, {"uuid": "indicate-focus@leleat-on-github", "name": "Focus Indicator", "pname": "focus-indicator", "description": "See https://discourse.gnome.org/t/window-focus-call-for-testing/13277/78. The experiment ended.", "link": "https://extensions.gnome.org/extension/5612/focus-indicator/", "shell_version_map": {"43": {"version": "10", "sha256": "019wv94p74ynyqgg1jarrb36k648vpxv4n7wyp45x2nxxnxm5g8l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSBodHRwczovL2Rpc2NvdXJzZS5nbm9tZS5vcmcvdC93aW5kb3ctZm9jdXMtY2FsbC1mb3ItdGVzdGluZy8xMzI3Ny83OC4gVGhlIGV4cGVyaW1lbnQgZW5kZWQuIiwKICAibmFtZSI6ICJGb2N1cyBJbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW5kaWNhdGUtZm9jdXMtcHJvdG90eXBlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9mb2N1cy1pbmRpY2F0b3ItcHJvdG90eXBlIiwKICAidXVpZCI6ICJpbmRpY2F0ZS1mb2N1c0BsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "battery-indicator@jgotti.org", "name": "Battery indicator (upower)", "pname": "battery-indicator-upower", "description": "Display battery level indicators for connected devices (such as mouse, keyboard, game controller, touchpad ...) as reported by upower.\n\nDefault refresh time is 5 minutes but can be changed in settings. Informations that are displayed in italic reflect information that upower report as \"should ignore\", as sometimes informations reported by upower are not that reliable. \n\nAdditionnaly you can simply click devices in the popup menu to set their display in the indicator, the checkmark reflect whether it will be displayed or not (will always display at least on device).\n\nmore info at https://github.com/malko/battery-indicator-upower", "link": "https://extensions.gnome.org/extension/5615/battery-indicator-upower/", "shell_version_map": {"42": {"version": "4", "sha256": "19cv0nw6h14r2qh72z267kfb9w72ml1j2lx5d26gpa4k2r5dzwf6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYmF0dGVyeSBsZXZlbCBpbmRpY2F0b3JzIGZvciBjb25uZWN0ZWQgZGV2aWNlcyAoc3VjaCBhcyBtb3VzZSwga2V5Ym9hcmQsIGdhbWUgY29udHJvbGxlciwgdG91Y2hwYWQgLi4uKSBhcyByZXBvcnRlZCBieSB1cG93ZXIuXG5cbkRlZmF1bHQgcmVmcmVzaCB0aW1lIGlzIDUgbWludXRlcyBidXQgY2FuIGJlIGNoYW5nZWQgaW4gc2V0dGluZ3MuICBJbmZvcm1hdGlvbnMgdGhhdCBhcmUgZGlzcGxheWVkIGluIGl0YWxpYyByZWZsZWN0IGluZm9ybWF0aW9uIHRoYXQgdXBvd2VyIHJlcG9ydCBhcyBcInNob3VsZCBpZ25vcmVcIiwgYXMgc29tZXRpbWVzIGluZm9ybWF0aW9ucyByZXBvcnRlZCBieSB1cG93ZXIgYXJlIG5vdCB0aGF0IHJlbGlhYmxlLiBcblxuQWRkaXRpb25uYWx5IHlvdSBjYW4gc2ltcGx5IGNsaWNrIGRldmljZXMgaW4gdGhlIHBvcHVwIG1lbnUgdG8gc2V0IHRoZWlyIGRpc3BsYXkgaW4gdGhlIGluZGljYXRvciwgdGhlIGNoZWNrbWFyayByZWZsZWN0IHdoZXRoZXIgaXQgd2lsbCBiZSBkaXNwbGF5ZWQgb3Igbm90ICh3aWxsIGFsd2F5cyBkaXNwbGF5IGF0IGxlYXN0IG9uIGRldmljZSkuXG5cbm1vcmUgaW5mbyBhdCBodHRwczovL2dpdGh1Yi5jb20vbWFsa28vYmF0dGVyeS1pbmRpY2F0b3ItdXBvd2VyIiwKICAibmFtZSI6ICJCYXR0ZXJ5IGluZGljYXRvciAodXBvd2VyKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci11cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbGtvL2JhdHRlcnktaW5kaWNhdG9yLXVwb3dlciIsCiAgInV1aWQiOiAiYmF0dGVyeS1pbmRpY2F0b3JAamdvdHRpLm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}, "43": {"version": "4", "sha256": "19cv0nw6h14r2qh72z267kfb9w72ml1j2lx5d26gpa4k2r5dzwf6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgYmF0dGVyeSBsZXZlbCBpbmRpY2F0b3JzIGZvciBjb25uZWN0ZWQgZGV2aWNlcyAoc3VjaCBhcyBtb3VzZSwga2V5Ym9hcmQsIGdhbWUgY29udHJvbGxlciwgdG91Y2hwYWQgLi4uKSBhcyByZXBvcnRlZCBieSB1cG93ZXIuXG5cbkRlZmF1bHQgcmVmcmVzaCB0aW1lIGlzIDUgbWludXRlcyBidXQgY2FuIGJlIGNoYW5nZWQgaW4gc2V0dGluZ3MuICBJbmZvcm1hdGlvbnMgdGhhdCBhcmUgZGlzcGxheWVkIGluIGl0YWxpYyByZWZsZWN0IGluZm9ybWF0aW9uIHRoYXQgdXBvd2VyIHJlcG9ydCBhcyBcInNob3VsZCBpZ25vcmVcIiwgYXMgc29tZXRpbWVzIGluZm9ybWF0aW9ucyByZXBvcnRlZCBieSB1cG93ZXIgYXJlIG5vdCB0aGF0IHJlbGlhYmxlLiBcblxuQWRkaXRpb25uYWx5IHlvdSBjYW4gc2ltcGx5IGNsaWNrIGRldmljZXMgaW4gdGhlIHBvcHVwIG1lbnUgdG8gc2V0IHRoZWlyIGRpc3BsYXkgaW4gdGhlIGluZGljYXRvciwgdGhlIGNoZWNrbWFyayByZWZsZWN0IHdoZXRoZXIgaXQgd2lsbCBiZSBkaXNwbGF5ZWQgb3Igbm90ICh3aWxsIGFsd2F5cyBkaXNwbGF5IGF0IGxlYXN0IG9uIGRldmljZSkuXG5cbm1vcmUgaW5mbyBhdCBodHRwczovL2dpdGh1Yi5jb20vbWFsa28vYmF0dGVyeS1pbmRpY2F0b3ItdXBvd2VyIiwKICAibmFtZSI6ICJCYXR0ZXJ5IGluZGljYXRvciAodXBvd2VyKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iYXR0ZXJ5LWluZGljYXRvci11cG93ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hbGtvL2JhdHRlcnktaW5kaWNhdG9yLXVwb3dlciIsCiAgInV1aWQiOiAiYmF0dGVyeS1pbmRpY2F0b3JAamdvdHRpLm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "visualizer@sound.org", "name": "Sound Visualizer", "pname": "sound-visualizer", "description": "A Real Time Sound Visualizer Based On Gstreamer\nFor any Issues,Bugs and Suggestions please open an issue on Github", "link": "https://extensions.gnome.org/extension/5624/sound-visualizer/", "shell_version_map": {"38": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "43": {"version": "4", "sha256": "0zqajjn48gpyvcikiqj2qrl369a5j8rh6m51knfgr9ma6z78akx5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUmVhbCBUaW1lIFNvdW5kIFZpc3VhbGl6ZXIgQmFzZWQgT24gR3N0cmVhbWVyXG5Gb3IgYW55IElzc3VlcyxCdWdzIGFuZCBTdWdnZXN0aW9ucyBwbGVhc2Ugb3BlbiBhbiBpc3N1ZSBvbiBHaXRodWIiLAogICJuYW1lIjogIlNvdW5kIFZpc3VhbGl6ZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmlzdWFsaXplciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYWloYW4yMDAwL3Zpc3VhbGl6ZXIiLAogICJ1dWlkIjogInZpc3VhbGl6ZXJAc291bmQub3JnIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "device-power-indicator@ranger-ross.github.io", "name": "Device Power Indicator", "pname": "device-power-indicator", "description": "Shows device power percentage for keyboards and mice", "link": "https://extensions.gnome.org/extension/5627/device-power-indicator/", "shell_version_map": {"41": {"version": "2", "sha256": "1q3wvh734chckca8h4zyhwc681k6xdqfaz7lbsmchy3arfhw4w0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGRldmljZSBwb3dlciBwZXJjZW50YWdlIGZvciBrZXlib2FyZHMgYW5kIG1pY2UiLAogICJuYW1lIjogIkRldmljZSBQb3dlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYW5nZXItcm9zcy9nbm9tZS1kZXZpY2UtcG93ZXItaW5kaWNhdG9yIiwKICAidXVpZCI6ICJkZXZpY2UtcG93ZXItaW5kaWNhdG9yQHJhbmdlci1yb3NzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "1q3wvh734chckca8h4zyhwc681k6xdqfaz7lbsmchy3arfhw4w0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGRldmljZSBwb3dlciBwZXJjZW50YWdlIGZvciBrZXlib2FyZHMgYW5kIG1pY2UiLAogICJuYW1lIjogIkRldmljZSBQb3dlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYW5nZXItcm9zcy9nbm9tZS1kZXZpY2UtcG93ZXItaW5kaWNhdG9yIiwKICAidXVpZCI6ICJkZXZpY2UtcG93ZXItaW5kaWNhdG9yQHJhbmdlci1yb3NzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "43": {"version": "2", "sha256": "1q3wvh734chckca8h4zyhwc681k6xdqfaz7lbsmchy3arfhw4w0h", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGRldmljZSBwb3dlciBwZXJjZW50YWdlIGZvciBrZXlib2FyZHMgYW5kIG1pY2UiLAogICJuYW1lIjogIkRldmljZSBQb3dlciBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yYW5nZXItcm9zcy9nbm9tZS1kZXZpY2UtcG93ZXItaW5kaWNhdG9yIiwKICAidXVpZCI6ICJkZXZpY2UtcG93ZXItaW5kaWNhdG9yQHJhbmdlci1yb3NzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "imageoverlay@nw.nwhirschfeld.de", "name": "Image Overlay", "pname": "image-overlay", "description": "This GNOME Shell extension allows you to configure multiple images as overlays and bind them to keyboard shortcuts. Possible use cases include quickly accessing cheat sheets or covering your work.", "link": "https://extensions.gnome.org/extension/5630/image-overlay/", "shell_version_map": {"43": {"version": "2", "sha256": "10b748x6kjrmwbwdsbsz1ld2cs9kyvz5qxckw43r33n98h33i2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIGFsbG93cyB5b3UgdG8gY29uZmlndXJlIG11bHRpcGxlIGltYWdlcyBhcyBvdmVybGF5cyBhbmQgYmluZCB0aGVtIHRvIGtleWJvYXJkIHNob3J0Y3V0cy4gUG9zc2libGUgdXNlIGNhc2VzIGluY2x1ZGUgcXVpY2tseSBhY2Nlc3NpbmcgY2hlYXQgc2hlZXRzIG9yIGNvdmVyaW5nIHlvdXIgd29yay4iLAogICJuYW1lIjogIkltYWdlIE92ZXJsYXkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaW1hZ2VvdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL253aGlyc2NoZmVsZC9JbWFnZS1PdmVybGF5IiwKICAidXVpZCI6ICJpbWFnZW92ZXJsYXlAbncubndoaXJzY2hmZWxkLmRlIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "stonks@0x41ndrea.gitlab.com", "name": "Stonks", "pname": "stonks", "description": "Stonks is an extension for tracking the latest price of your favourite stocks using finance.yahoo.com API", "link": "https://extensions.gnome.org/extension/5633/stonks/", "shell_version_map": {"43": {"version": "2", "sha256": "11i0x7gakgq9q84548zhmdncm0l8dhjyhn9cpgxs92cvlqhyd4yx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0b25rcyBpcyBhbiBleHRlbnNpb24gZm9yIHRyYWNraW5nIHRoZSBsYXRlc3QgcHJpY2Ugb2YgeW91ciBmYXZvdXJpdGUgc3RvY2tzIHVzaW5nIGZpbmFuY2UueWFob28uY29tIEFQSSIsCiAgIm5hbWUiOiAiU3RvbmtzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tLzB4NDFuZHJlYS9nbm9tZS1zaGVsbC1zdG9ua3MiLAogICJ1dWlkIjogInN0b25rc0AweDQxbmRyZWEuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "shortcutbutton@antoine-meloche.github.com", "name": "Shortcut Button", "pname": "shortcut-button", "description": "A Button to execute a command in your shell panel", "link": "https://extensions.gnome.org/extension/5636/shortcut-button/", "shell_version_map": {"42": {"version": "3", "sha256": "1ikvqpiznnmm3ykf84v6i9xj8dximnyyfa6ykmq7cdps0qa9fx1x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQnV0dG9uIHRvIGV4ZWN1dGUgYSBjb21tYW5kIGluIHlvdXIgc2hlbGwgcGFuZWwiLAogICJuYW1lIjogIlNob3J0Y3V0IEJ1dHRvbiIsCiAgInByZWZzX3NjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG9ydGN1dGJ1dHRvbi5nc2NoZW1hLnhtbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbnRvaW5lLU1lbG9jaGUvU2hvcnRjdXRCdXR0b24iLAogICJ1dWlkIjogInNob3J0Y3V0YnV0dG9uQGFudG9pbmUtbWVsb2NoZS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "viewsplit@model-map.github.io", "name": "View Split", "pname": "view-split", "description": "Maximize your productivity with View Split, the window management tool that allows you to split windows into top, left, bottom, and right sections", "link": "https://extensions.gnome.org/extension/5651/view-split/", "shell_version_map": {"42": {"version": "2", "sha256": "1cikisv38s91qa399q2bvc4jdz0ysb016bh6paca4av2vkaig89i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1heGltaXplIHlvdXIgcHJvZHVjdGl2aXR5IHdpdGggVmlldyBTcGxpdCwgdGhlIHdpbmRvdyBtYW5hZ2VtZW50IHRvb2wgdGhhdCBhbGxvd3MgeW91IHRvIHNwbGl0IHdpbmRvd3MgaW50byB0b3AsIGxlZnQsIGJvdHRvbSwgYW5kIHJpZ2h0IHNlY3Rpb25zIiwKICAibmFtZSI6ICJWaWV3IFNwbGl0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21vZGVsLW1hcC92aWV3LXNwbGl0LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidmlld3NwbGl0QG1vZGVsLW1hcC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "floating-panel-usedbymyself@wpism", "name": "Floating Panel-onlyusedbymyself", "pname": "floating-panel", "description": "Floats the panel, if there is a window nearby or maximised, it defloats.", "link": "https://extensions.gnome.org/extension/5657/floating-panel/", "shell_version_map": {"40": {"version": "1", "sha256": "1l54zy5j5i3wslys8034j29lyn1jqv4qxa1hvamxzbvkd7dxj13b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwtb25seXVzZWRieW15c2VsZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmctcGFuZWwiLAogICJ1dWlkIjogImZsb2F0aW5nLXBhbmVsLXVzZWRieW15c2VsZkB3cGlzbSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "1l54zy5j5i3wslys8034j29lyn1jqv4qxa1hvamxzbvkd7dxj13b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwtb25seXVzZWRieW15c2VsZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmctcGFuZWwiLAogICJ1dWlkIjogImZsb2F0aW5nLXBhbmVsLXVzZWRieW15c2VsZkB3cGlzbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "1l54zy5j5i3wslys8034j29lyn1jqv4qxa1hvamxzbvkd7dxj13b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwtb25seXVzZWRieW15c2VsZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmctcGFuZWwiLAogICJ1dWlkIjogImZsb2F0aW5nLXBhbmVsLXVzZWRieW15c2VsZkB3cGlzbSIsCiAgInZlcnNpb24iOiAxCn0="}, "43": {"version": "1", "sha256": "1l54zy5j5i3wslys8034j29lyn1jqv4qxa1hvamxzbvkd7dxj13b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZsb2F0cyB0aGUgcGFuZWwsIGlmIHRoZXJlIGlzIGEgd2luZG93IG5lYXJieSBvciBtYXhpbWlzZWQsIGl0IGRlZmxvYXRzLiIsCiAgIm5hbWUiOiAiRmxvYXRpbmcgUGFuZWwtb25seXVzZWRieW15c2VsZiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BeWx1ci9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmctcGFuZWwiLAogICJ1dWlkIjogImZsb2F0aW5nLXBhbmVsLXVzZWRieW15c2VsZkB3cGlzbSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "weatherornot@somepaulo.github.io", "name": "Weather or Not", "pname": "weather-or-not", "description": "Display the current weather beside the clock (while also keeping it centered) and click the indicator to open GNOME Weather, which is required for this extension to function properly.\n\nThis is a fork of the Weather O'Clock extension.", "link": "https://extensions.gnome.org/extension/5660/weather-or-not/", "shell_version_map": {"42": {"version": "2", "sha256": "0i34m4s1rrkgmmb8kqwcmbm9fq3k7q91rvhv7znxp46yrk447j4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBiZXNpZGUgdGhlIGNsb2NrICh3aGlsZSBhbHNvIGtlZXBpbmcgaXQgY2VudGVyZWQpIGFuZCBjbGljayB0aGUgaW5kaWNhdG9yIHRvIG9wZW4gR05PTUUgV2VhdGhlciwgd2hpY2ggaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uIHByb3Blcmx5LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgV2VhdGhlciBPJ0Nsb2NrIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIldlYXRoZXIgb3IgTm90IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNvbWVwYXVsb0BkdWNrLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29tZXBhdWxvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLW9yLW5vdCIsCiAgInV1aWQiOiAid2VhdGhlcm9ybm90QHNvbWVwYXVsby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}, "43": {"version": "2", "sha256": "0i34m4s1rrkgmmb8kqwcmbm9fq3k7q91rvhv7znxp46yrk447j4q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGN1cnJlbnQgd2VhdGhlciBiZXNpZGUgdGhlIGNsb2NrICh3aGlsZSBhbHNvIGtlZXBpbmcgaXQgY2VudGVyZWQpIGFuZCBjbGljayB0aGUgaW5kaWNhdG9yIHRvIG9wZW4gR05PTUUgV2VhdGhlciwgd2hpY2ggaXMgcmVxdWlyZWQgZm9yIHRoaXMgZXh0ZW5zaW9uIHRvIGZ1bmN0aW9uIHByb3Blcmx5LlxuXG5UaGlzIGlzIGEgZm9yayBvZiB0aGUgV2VhdGhlciBPJ0Nsb2NrIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIldlYXRoZXIgb3IgTm90IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInNvbWVwYXVsb0BkdWNrLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc29tZXBhdWxvL2dub21lLXNoZWxsLWV4dGVuc2lvbi13ZWF0aGVyLW9yLW5vdCIsCiAgInV1aWQiOiAid2VhdGhlcm9ybm90QHNvbWVwYXVsby5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "cscotun0-ip-address@cjthedj97.github.com", "name": "cscotun0 IP Address", "pname": "cscotun0-ip-address", "description": "Show cscotun0 IP address on GNOME panel. Do not show loopback addresses (127.0.0.0/8) or other network interface IP addresses. Please install moreutils package as a dependency. Forked from https://github.com/AdamantisSpinae/gnome-extension-tun0-ip-address and modified tunnel interface it looks at.", "link": "https://extensions.gnome.org/extension/5663/cscotun0-ip-address/", "shell_version_map": {"40": {"version": "1", "sha256": "10rfpikf5m3ch39ki44x0vs85jwf9rdj6d1jdr5wwr5jhplz09af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3Njb3R1bjAgSVAgYWRkcmVzcyBvbiBHTk9NRSBwYW5lbC4gRG8gbm90IHNob3cgbG9vcGJhY2sgYWRkcmVzc2VzICgxMjcuMC4wLjAvOCkgb3Igb3RoZXIgbmV0d29yayBpbnRlcmZhY2UgSVAgYWRkcmVzc2VzLiBQbGVhc2UgaW5zdGFsbCBtb3JldXRpbHMgcGFja2FnZSBhcyBhIGRlcGVuZGVuY3kuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9BZGFtYW50aXNTcGluYWUvZ25vbWUtZXh0ZW5zaW9uLXR1bjAtaXAtYWRkcmVzcyBhbmQgbW9kaWZpZWQgdHVubmVsIGludGVyZmFjZSBpdCBsb29rcyBhdC4iLAogICJuYW1lIjogImNzY290dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2p0aGVkajk3L2dub21lLWV4dGVuc2lvbi1jc2NvdHVuMC1pcC1hZGRyZXNzLyIsCiAgInV1aWQiOiAiY3Njb3R1bjAtaXAtYWRkcmVzc0BjanRoZWRqOTcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "10rfpikf5m3ch39ki44x0vs85jwf9rdj6d1jdr5wwr5jhplz09af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3Njb3R1bjAgSVAgYWRkcmVzcyBvbiBHTk9NRSBwYW5lbC4gRG8gbm90IHNob3cgbG9vcGJhY2sgYWRkcmVzc2VzICgxMjcuMC4wLjAvOCkgb3Igb3RoZXIgbmV0d29yayBpbnRlcmZhY2UgSVAgYWRkcmVzc2VzLiBQbGVhc2UgaW5zdGFsbCBtb3JldXRpbHMgcGFja2FnZSBhcyBhIGRlcGVuZGVuY3kuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9BZGFtYW50aXNTcGluYWUvZ25vbWUtZXh0ZW5zaW9uLXR1bjAtaXAtYWRkcmVzcyBhbmQgbW9kaWZpZWQgdHVubmVsIGludGVyZmFjZSBpdCBsb29rcyBhdC4iLAogICJuYW1lIjogImNzY290dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2p0aGVkajk3L2dub21lLWV4dGVuc2lvbi1jc2NvdHVuMC1pcC1hZGRyZXNzLyIsCiAgInV1aWQiOiAiY3Njb3R1bjAtaXAtYWRkcmVzc0BjanRoZWRqOTcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "10rfpikf5m3ch39ki44x0vs85jwf9rdj6d1jdr5wwr5jhplz09af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3Njb3R1bjAgSVAgYWRkcmVzcyBvbiBHTk9NRSBwYW5lbC4gRG8gbm90IHNob3cgbG9vcGJhY2sgYWRkcmVzc2VzICgxMjcuMC4wLjAvOCkgb3Igb3RoZXIgbmV0d29yayBpbnRlcmZhY2UgSVAgYWRkcmVzc2VzLiBQbGVhc2UgaW5zdGFsbCBtb3JldXRpbHMgcGFja2FnZSBhcyBhIGRlcGVuZGVuY3kuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9BZGFtYW50aXNTcGluYWUvZ25vbWUtZXh0ZW5zaW9uLXR1bjAtaXAtYWRkcmVzcyBhbmQgbW9kaWZpZWQgdHVubmVsIGludGVyZmFjZSBpdCBsb29rcyBhdC4iLAogICJuYW1lIjogImNzY290dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2p0aGVkajk3L2dub21lLWV4dGVuc2lvbi1jc2NvdHVuMC1pcC1hZGRyZXNzLyIsCiAgInV1aWQiOiAiY3Njb3R1bjAtaXAtYWRkcmVzc0BjanRoZWRqOTcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "43": {"version": "1", "sha256": "10rfpikf5m3ch39ki44x0vs85jwf9rdj6d1jdr5wwr5jhplz09af", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3Njb3R1bjAgSVAgYWRkcmVzcyBvbiBHTk9NRSBwYW5lbC4gRG8gbm90IHNob3cgbG9vcGJhY2sgYWRkcmVzc2VzICgxMjcuMC4wLjAvOCkgb3Igb3RoZXIgbmV0d29yayBpbnRlcmZhY2UgSVAgYWRkcmVzc2VzLiBQbGVhc2UgaW5zdGFsbCBtb3JldXRpbHMgcGFja2FnZSBhcyBhIGRlcGVuZGVuY3kuIEZvcmtlZCBmcm9tIGh0dHBzOi8vZ2l0aHViLmNvbS9BZGFtYW50aXNTcGluYWUvZ25vbWUtZXh0ZW5zaW9uLXR1bjAtaXAtYWRkcmVzcyBhbmQgbW9kaWZpZWQgdHVubmVsIGludGVyZmFjZSBpdCBsb29rcyBhdC4iLAogICJuYW1lIjogImNzY290dW4wIElQIEFkZHJlc3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2p0aGVkajk3L2dub21lLWV4dGVuc2lvbi1jc2NvdHVuMC1pcC1hZGRyZXNzLyIsCiAgInV1aWQiOiAiY3Njb3R1bjAtaXAtYWRkcmVzc0BjanRoZWRqOTcuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "gnome-compact-top-bar@metehan-arslan.github.io", "name": "Compact Top Bar", "pname": "compact-top-bar", "description": "Adds transparency effects (including notification tray) and slims the top bar for more space. See github page for more screenshots.", "link": "https://extensions.gnome.org/extension/5669/compact-top-bar/", "shell_version_map": {"40": {"version": "1", "sha256": "18chjxyrbd4y8xki0fwzbig7s6sy3bc9rgfy2cpnd5084sb6gjxb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdHJhbnNwYXJlbmN5IGVmZmVjdHMgKGluY2x1ZGluZyBub3RpZmljYXRpb24gdHJheSkgYW5kIHNsaW1zIHRoZSB0b3AgYmFyIGZvciBtb3JlIHNwYWNlLiBTZWUgZ2l0aHViIHBhZ2UgZm9yIG1vcmUgc2NyZWVuc2hvdHMuIiwKICAibmFtZSI6ICJDb21wYWN0IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWV0ZWhhbi1hcnNsYW4vZ25vbWUtY29tcGFjdC10b3AtYmFyIiwKICAidXVpZCI6ICJnbm9tZS1jb21wYWN0LXRvcC1iYXJAbWV0ZWhhbi1hcnNsYW4uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "41": {"version": "1", "sha256": "18chjxyrbd4y8xki0fwzbig7s6sy3bc9rgfy2cpnd5084sb6gjxb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdHJhbnNwYXJlbmN5IGVmZmVjdHMgKGluY2x1ZGluZyBub3RpZmljYXRpb24gdHJheSkgYW5kIHNsaW1zIHRoZSB0b3AgYmFyIGZvciBtb3JlIHNwYWNlLiBTZWUgZ2l0aHViIHBhZ2UgZm9yIG1vcmUgc2NyZWVuc2hvdHMuIiwKICAibmFtZSI6ICJDb21wYWN0IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWV0ZWhhbi1hcnNsYW4vZ25vbWUtY29tcGFjdC10b3AtYmFyIiwKICAidXVpZCI6ICJnbm9tZS1jb21wYWN0LXRvcC1iYXJAbWV0ZWhhbi1hcnNsYW4uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "42": {"version": "1", "sha256": "18chjxyrbd4y8xki0fwzbig7s6sy3bc9rgfy2cpnd5084sb6gjxb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdHJhbnNwYXJlbmN5IGVmZmVjdHMgKGluY2x1ZGluZyBub3RpZmljYXRpb24gdHJheSkgYW5kIHNsaW1zIHRoZSB0b3AgYmFyIGZvciBtb3JlIHNwYWNlLiBTZWUgZ2l0aHViIHBhZ2UgZm9yIG1vcmUgc2NyZWVuc2hvdHMuIiwKICAibmFtZSI6ICJDb21wYWN0IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWV0ZWhhbi1hcnNsYW4vZ25vbWUtY29tcGFjdC10b3AtYmFyIiwKICAidXVpZCI6ICJnbm9tZS1jb21wYWN0LXRvcC1iYXJAbWV0ZWhhbi1hcnNsYW4uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "43": {"version": "1", "sha256": "18chjxyrbd4y8xki0fwzbig7s6sy3bc9rgfy2cpnd5084sb6gjxb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdHJhbnNwYXJlbmN5IGVmZmVjdHMgKGluY2x1ZGluZyBub3RpZmljYXRpb24gdHJheSkgYW5kIHNsaW1zIHRoZSB0b3AgYmFyIGZvciBtb3JlIHNwYWNlLiBTZWUgZ2l0aHViIHBhZ2UgZm9yIG1vcmUgc2NyZWVuc2hvdHMuIiwKICAibmFtZSI6ICJDb21wYWN0IFRvcCBCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWV0ZWhhbi1hcnNsYW4vZ25vbWUtY29tcGFjdC10b3AtYmFyIiwKICAidXVpZCI6ICJnbm9tZS1jb21wYWN0LXRvcC1iYXJAbWV0ZWhhbi1hcnNsYW4uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} +, {"uuid": "persistent-notifications@AlexeyReshetnyak", "name": "Persistent Notifications", "pname": "persistent-notifications", "description": "Never hide a new notification, except if you close it.", "link": "https://extensions.gnome.org/extension/5672/persistent-notifications/", "shell_version_map": {"40": {"version": "1", "sha256": "0y0vk8dva14yfbgdss00sl42wdwbf5mhpc9vhapbl773fdr5l2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbm90aWZpY2F0aW9uLCBleGNlcHQgaWYgeW91IGNsb3NlIGl0LiIsCiAgIm5hbWUiOiAiUGVyc2lzdGVudCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxleGV5UmVzaGV0bnlhay9wZXJzaXN0ZW50LW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogInBlcnNpc3RlbnQtbm90aWZpY2F0aW9uc0BBbGV4ZXlSZXNoZXRueWFrIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "42": {"version": "1", "sha256": "0y0vk8dva14yfbgdss00sl42wdwbf5mhpc9vhapbl773fdr5l2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbm90aWZpY2F0aW9uLCBleGNlcHQgaWYgeW91IGNsb3NlIGl0LiIsCiAgIm5hbWUiOiAiUGVyc2lzdGVudCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxleGV5UmVzaGV0bnlhay9wZXJzaXN0ZW50LW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogInBlcnNpc3RlbnQtbm90aWZpY2F0aW9uc0BBbGV4ZXlSZXNoZXRueWFrIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "43": {"version": "1", "sha256": "0y0vk8dva14yfbgdss00sl42wdwbf5mhpc9vhapbl773fdr5l2c7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbm90aWZpY2F0aW9uLCBleGNlcHQgaWYgeW91IGNsb3NlIGl0LiIsCiAgIm5hbWUiOiAiUGVyc2lzdGVudCBOb3RpZmljYXRpb25zIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWxleGV5UmVzaGV0bnlhay9wZXJzaXN0ZW50LW5vdGlmaWNhdGlvbnMiLAogICJ1dWlkIjogInBlcnNpc3RlbnQtbm90aWZpY2F0aW9uc0BBbGV4ZXlSZXNoZXRueWFrIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} +, {"uuid": "azclock336@andreasplesch.gitlab.com", "name": "Desktop Clock Legacy", "pname": "desktop-clock-legacy", "description": "Add a clock to the desktop ! Please use dconf-editor to change settings.\nThis extension is a simple fork of the 'Desktop Clock' extension modified to work with Gnome Shell 3.36. This requires removal of the Settings dialog.", "link": "https://extensions.gnome.org/extension/5678/desktop-clock-legacy/", "shell_version_map": {"38": {"version": "2", "sha256": "03579g03wyp52fhf6rpszc91zqfw99afqvgf87nifb8bcf05mbyg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICJmNjk1Yjc4ZTgwMGQ0OTdlODUyYmVlZWU3YWJhNDRhMGU5ZWMzMDczIiwKICAiZGVzY3JpcHRpb24iOiAiQWRkIGEgY2xvY2sgdG8gdGhlIGRlc2t0b3AgISBQbGVhc2UgdXNlIGRjb25mLWVkaXRvciB0byBjaGFuZ2Ugc2V0dGluZ3MuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIHNpbXBsZSBmb3JrIG9mIHRoZSAnRGVza3RvcCBDbG9jaycgZXh0ZW5zaW9uIG1vZGlmaWVkIHRvIHdvcmsgd2l0aCBHbm9tZSBTaGVsbCAzLjM2LiBUaGlzIHJlcXVpcmVzIHJlbW92YWwgb2YgdGhlIFNldHRpbmdzIGRpYWxvZy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhemNsb2NrIiwKICAibmFtZSI6ICJEZXNrdG9wIENsb2NrIExlZ2FjeSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hemNsb2NrMzM2IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYW5kcmVhc3BsZXNjaC9hemNsb2NrXzMuMzYiLAogICJ1dWlkIjogImF6Y2xvY2szMzZAYW5kcmVhc3BsZXNjaC5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "gnome-one-window-wonderland@jqno.nl", "name": "One Window Wonderland", "pname": "one-window-wonderland", "description": "Automatically maximizes new windows, leaving 'useless gaps' around them", "link": "https://extensions.gnome.org/extension/5696/one-window-wonderland/", "shell_version_map": {"43": {"version": "2", "sha256": "0sva4ilwxcsb59wgz1c82gjv50s28p468s65mdk1rb43icvhns9n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgbWF4aW1pemVzIG5ldyB3aW5kb3dzLCBsZWF2aW5nICd1c2VsZXNzIGdhcHMnIGFyb3VuZCB0aGVtIiwKICAibmFtZSI6ICJPbmUgV2luZG93IFdvbmRlcmxhbmQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vanFuby9nbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmQvIiwKICAidXVpZCI6ICJnbm9tZS1vbmUtd2luZG93LXdvbmRlcmxhbmRAanFuby5ubCIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "otp-keys@osmank3.net", "name": "OTP keys", "pname": "otp-keys", "description": "Show and copy otp keys", "link": "https://extensions.gnome.org/extension/5697/otp-keys/", "shell_version_map": {"43": {"version": "3", "sha256": "1vax3zqhahaf1k7d4rgd9zwdziiib2zphkxm4ybd7xp034gs2kgx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYW5kIGNvcHkgb3RwIGtleXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdHAta2V5cyIsCiAgIm5hbWUiOiAiT1RQIGtleXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vb3NtYW5rMy9vdHAta2V5cyIsCiAgInV1aWQiOiAib3RwLWtleXNAb3NtYW5rMy5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"uuid": "replace-activities-label@leleat-on-github", "name": "Replace Activities Label", "pname": "replace-activities-label", "description": "Remove the AppMenu, replace the activities label with 3 dots and animate them as a loading spinner.", "link": "https://extensions.gnome.org/extension/5706/replace-activities-label/", "shell_version_map": {"43": {"version": "1", "sha256": "1qcipdm0vzll5322si9hxirqlhar6ajs7vqbwcpq8h1n6s1ll55y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSB0aGUgQXBwTWVudSwgcmVwbGFjZSB0aGUgYWN0aXZpdGllcyBsYWJlbCB3aXRoIDMgZG90cyBhbmQgYW5pbWF0ZSB0aGVtIGFzIGEgbG9hZGluZyBzcGlubmVyLiIsCiAgIm5hbWUiOiAiUmVwbGFjZSBBY3Rpdml0aWVzIExhYmVsIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJlcGxhY2UtYWN0aXZpdGllcy1sYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDMiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvcmVwbGFjZS1hY3Rpdml0aWVzLWxhYmVsIiwKICAidXVpZCI6ICJyZXBsYWNlLWFjdGl2aXRpZXMtbGFiZWxAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "pin-app-folders-to-dash@fcusr.github.com", "name": "Pin App Folders to Dash", "pname": "pin-app-folders-to-dash", "description": "Allow to pin app folders to dash.", "link": "https://extensions.gnome.org/extension/5709/pin-app-folders-to-dash/", "shell_version_map": {"43": {"version": "1", "sha256": "1n19dd1mjgdrggpkq9c25khfx8lyknf00y44fs7jxnpkixja8lwi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHRvIHBpbiBhcHAgZm9sZGVycyB0byBkYXNoLiIsCiAgIm5hbWUiOiAiUGluIEFwcCBGb2xkZXJzIHRvIERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmN1c3IvcGluLWFwcC1mb2xkZXJzLXRvLWRhc2giLAogICJ1dWlkIjogInBpbi1hcHAtZm9sZGVycy10by1kYXNoQGZjdXNyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} ] diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 90ef25fcca..9018df07e9 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "ftJ0KJz1ykELHJKxU3BQpcNi99szmaMrU0PQ3nBGbkk="; + sha256 = "we6/QJPzNrSJ+5HHMO2mcdpo7vZeYZehKYqVRseImZ8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix index d1ba5d8082..e2b3334306 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/geary/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { webkitgtk_4_1 ]; - checkInputs = [ + nativeCheckInputs = [ dbus gnutls # for certtool cacert # trust store for glib-networking diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix index bc54591ebd..adee04a0df 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , appstream-glib , clutter , gjs @@ -22,26 +21,18 @@ }: stdenv.mkDerivation rec { - version = "43.0"; + version = "43.1"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-F+AWTYVK145RzJ1Zldh4Q4R/hN/D7aXO3SIJ1t6ClWs="; + sha256 = "sha256-wOxhaYWX76jSur3uh75vDfAedbiLh2ikoMuobCZx3jE="; }; patches = [ ./fix-paths.patch - - # Build against GCR 4. - # Patch was temporarily reverted. - # https://github.com/Keruspe/GPaste/pull/409 - (fetchpatch { - url = "https://github.com/Keruspe/GPaste/commit/0378cb4a657042ce5321f1d9728cff31e55bede6.patch"; - sha256 = "0Ngr+/fS5/wICR84GEiE0pXEXQ/f/3G59lDivH167m8="; - }) ]; # TODO: switch to substituteAll with placeholder @@ -79,6 +70,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ + "-Dgcr3=false" # Build with gcr4 "-Dcontrol-center-keybindings-dir=${placeholder "out"}/share/gnome-control-center/keybindings" "-Ddbus-services-dir=${placeholder "out"}/share/dbus-1/services" "-Dsystemd-user-unit-dir=${placeholder "out"}/etc/systemd/user" diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/misc/metacity/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/misc/metacity/default.nix index 460dbfdb38..3b141c501a 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/misc/metacity/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/misc/metacity/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "metacity"; - version = "3.46.0"; + version = "3.46.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "S6d36ThUe/zL+azKCWdXTEZkMCLgVMk6AzQZyzzHwew="; + sha256 = "ALpJ92EgiPKzuuynnEXrKjBCPC5Ke+pAFYcr6uJd1sU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix index 27e4107924..0012e2501c 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix @@ -9,6 +9,7 @@ , libgtop , libXdamage , libXpresent +, libXres , libstartup_notification , gnome , glib @@ -20,11 +21,11 @@ stdenv.mkDerivation rec { pname = "marco"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01avxrg2fc6grfrp6hl8b0im4scy9xf6011swfrhli87ig6hhg7n"; + sha256 = "tPpVUL+J1Pnv9a5ufWFQ42YaItUw1q3cZ1e86N0qXT0="; }; nativeBuildInputs = [ @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { libgtop libXdamage libXpresent + libXres libstartup_notification gtk3 gnome.zenity diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix index 6516db101e..4d3c09a9f2 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -25,15 +25,21 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "4.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-6QWvDBhOxoK8HjmygV92WPDgq2Jbk4igWDbXrXc7/FQ="; + sha256 = "sha256-ToRY27qB/cNKjKW22MTEojxxOXMBfO1LUusy/pXKJ9A="; }; + patches = [ + # Having a working nix packagekit backend will supersede this. + # https://github.com/NixOS/nixpkgs/issues/177946 + ./disable-packagekit-backend.patch + ]; + nativeBuildInputs = [ dbus # for pkg-config meson diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch new file mode 100644 index 0000000000..76d6245628 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch @@ -0,0 +1,167 @@ +diff --git a/src/Application.vala b/src/Application.vala +index a1c4e0d4..35555946 100644 +--- a/src/Application.vala ++++ b/src/Application.vala +@@ -180,9 +180,6 @@ public class AppCenter.App : Gtk.Application { + } + + public override void activate () { +- if (fake_update_packages != null) { +- AppCenterCore.PackageKitBackend.get_default ().fake_packages = fake_update_packages; +- } + + var client = AppCenterCore.Client.get_default (); + +@@ -200,12 +197,6 @@ public class AppCenter.App : Gtk.Application { + + if (local_path != null) { + var file = File.new_for_commandline_arg (local_path); +- +- try { +- local_package = AppCenterCore.PackageKitBackend.get_default ().add_local_component_file (file); +- } catch (Error e) { +- warning ("Failed to load local AppStream XML file: %s", e.message); +- } + } + + if (active_window == null) { +diff --git a/src/Core/BackendAggregator.vala b/src/Core/BackendAggregator.vala +index 1747cd3b..20077394 100644 +--- a/src/Core/BackendAggregator.vala ++++ b/src/Core/BackendAggregator.vala +@@ -26,8 +26,6 @@ public class AppCenterCore.BackendAggregator : Backend, Object { + + construct { + backends = new Gee.ArrayList (); +- backends.add (PackageKitBackend.get_default ()); +- backends.add (UbuntuDriversBackend.get_default ()); + backends.add (FlatpakBackend.get_default ()); + + unowned Gtk.Application app = (Gtk.Application) GLib.Application.get_default (); +diff --git a/src/Core/Package.vala b/src/Core/Package.vala +index 40fa8262..e6b90dd9 100644 +--- a/src/Core/Package.vala ++++ b/src/Core/Package.vala +@@ -327,23 +327,13 @@ public class AppCenterCore.Package : Object { + public string origin_description { + owned get { + unowned string origin = component.get_origin (); +- if (backend is PackageKitBackend) { +- if (origin == APPCENTER_PACKAGE_ORIGIN) { +- return _("AppCenter"); +- } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) { +- return _("elementary Updates"); +- } else if (origin.has_prefix ("ubuntu-")) { +- return _("Ubuntu (non-curated)"); +- } +- } else if (backend is FlatpakBackend) { ++ if (backend is FlatpakBackend) { + var fp_package = this as FlatpakPackage; + if (fp_package == null) { + return origin; + } + + return fp_package.remote_title; +- } else if (backend is UbuntuDriversBackend) { +- return _("Ubuntu Drivers"); + } + + return _("Unknown Origin (non-curated)"); +@@ -435,9 +425,7 @@ public class AppCenterCore.Package : Object { + + // The version on a PackageKit package comes from the package not AppStream, so only reset the version + // on other backends +- if (!(backend is PackageKitBackend)) { +- _latest_version = null; +- } ++ _latest_version = null; + + this.component = component; + } +diff --git a/src/Core/UpdateManager.vala b/src/Core/UpdateManager.vala +index 4d844abc..457137eb 100644 +--- a/src/Core/UpdateManager.vala ++++ b/src/Core/UpdateManager.vala +@@ -71,35 +71,9 @@ public class AppCenterCore.UpdateManager : Object { + installed_package.update_state (); + } + +- Pk.Results pk_updates; +- unowned PackageKitBackend client = PackageKitBackend.get_default (); +- try { +- pk_updates = yield client.get_updates (cancellable); +- } catch (Error e) { +- warning ("Unable to get updates from PackageKit backend: %s", e.message); +- return 0; +- } +- + uint os_count = 0; + string os_desc = ""; + +- var package_array = pk_updates.get_package_array (); +- debug ("PackageKit backend reports %d updates", package_array.length); +- +- package_array.foreach ((pk_package) => { +- var pkg_name = pk_package.get_name (); +- debug ("Added %s to OS updates", pkg_name); +- os_count++; +- unowned string pkg_summary = pk_package.get_summary (); +- unowned string pkg_version = pk_package.get_version (); +- os_desc += Markup.printf_escaped ( +- " • %s\n\t%s\n\t%s\n", +- pkg_name, +- pkg_summary, +- _("Version: %s").printf (pkg_version) +- ); +- }); +- + os_updates.component.set_pkgnames ({}); + os_updates.change_information.clear_update_info (); + +@@ -207,30 +181,13 @@ public class AppCenterCore.UpdateManager : Object { + count += 1; + } + +- pk_updates.get_details_array ().foreach ((pk_detail) => { +- var pk_package = new Pk.Package (); +- try { +- pk_package.set_id (pk_detail.get_package_id ()); +- var pkg_name = pk_package.get_name (); +- +- var pkgnames = os_updates.component.pkgnames; +- pkgnames += pkg_name; +- os_updates.component.pkgnames = pkgnames; +- +- os_updates.change_information.updatable_packages.@set (client, pk_package.get_id ()); +- os_updates.change_information.size += pk_detail.size; +- } catch (Error e) { +- critical (e.message); +- } +- }); +- + os_updates.update_state (); + runtime_updates.update_state (); + return count; + } + + public void update_restart_state () { +- var should_restart = restart_file.query_exists () || PackageKitBackend.get_default ().is_restart_required (); ++ var should_restart = restart_file.query_exists (); + + if (should_restart) { + if (!restart_required) { +diff --git a/src/meson.build b/src/meson.build +index e0ef5342..14319492 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -12,10 +12,8 @@ appcenter_files = files( + 'Core/FlatpakBackend.vala', + 'Core/Job.vala', + 'Core/Package.vala', +- 'Core/PackageKitBackend.vala', + 'Core/ScreenshotCache.vala', + 'Core/Task.vala', +- 'Core/UbuntuDriversBackend.vala', + 'Core/UpdateManager.vala', + 'Dialogs/InstallFailDialog.vala', + 'Dialogs/StripeDialog.vala', diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 4a33fc2e04..388feb83cf 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -28,21 +28,21 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "6.2.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = "code"; rev = version; - sha256 = "sha256-QhJNRhYgGbPMd7B1X3kG+pnC/lGUoF7gc7O1PdG49LI="; + sha256 = "sha256-6ZOdlOCIDy5aWQre15+SrTH/vhY9OeTffY/uTSroELc="; }; patches = [ - # Fix drag and drop of accented text and between tabs - # https://github.com/elementary/code/pull/1194 + # Fix global search action disabled at startup + # https://github.com/elementary/code/pull/1254 (fetchpatch { - url = "https://github.com/elementary/code/commit/1ed7b590768ea9cb5b4658e27d9dc7ac224442ae.patch"; - sha256 = "sha256-VrYcEbkzQKi5gFB/Vw/0NITZvSXKXfuEv2R3m0VALVM="; + url = "https://github.com/elementary/code/commit/1e75388b07c060cc10ecd612076f235b1833fab8.patch"; + sha256 = "sha256-8Djh1orMcmICdYwQFENJCaYlXK0E52NhCmuhlHCz7oM="; }) ]; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index c984824a8c..31cf6d12eb 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -41,8 +41,8 @@ stdenv.mkDerivation rec { # build: support webkit2gtk-4.1 # https://github.com/elementary/mail/pull/794 (fetchpatch { - url = "https://github.com/elementary/mail/commit/7d4878543b27251664852c708d54abc1e4580eab.patch"; - sha256 = "sha256-yl6Bzjinp+ti/aX+t22GibGeQFtharZNk3MmbuJm0Tk="; + url = "https://github.com/elementary/mail/commit/9e6eb73a8420c9bf327e59c25e7e6d8fa87d480a.patch"; + sha256 = "sha256-idkVymePLa7vgfuou0HIrbWRCaWAgZliDcp4HyZBArs="; }) ]; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch deleted file mode 100644 index 657ea7a260..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/add-wallpaper-option.patch +++ /dev/null @@ -1,82 +0,0 @@ -From cc47fa33893e6840463ef8d59f9f4de4b7563726 Mon Sep 17 00:00:00 2001 -From: Bobby Rong -Date: Sat, 4 Dec 2021 22:00:38 +0800 -Subject: [PATCH] Add meson option for overlaying logo on wallpaper - ---- - meson.build | 8 ++++++++ - meson_options.txt | 1 + - src/Views/OperatingSystemView.vala | 8 ++++++++ - 3 files changed, 17 insertions(+) - create mode 100644 meson_options.txt - -diff --git a/meson.build b/meson.build -index 2125de6e..cbe3cadd 100644 ---- a/meson.build -+++ b/meson.build -@@ -20,6 +20,14 @@ add_project_arguments( - vapi_dir = join_paths(meson.current_source_dir(), 'vapi') - add_project_arguments(['--vapidir', vapi_dir], language: 'vala') - -+vala_flags = [] -+ -+if get_option('wallpaper') -+ vala_flags += ['--define', 'WALLPAPER'] -+endif -+ -+add_project_arguments(vala_flags, language: 'vala') -+ - subdir('data') - subdir('src') - subdir('po') -diff --git a/meson_options.txt b/meson_options.txt -new file mode 100644 -index 00000000..8cef0bb3 ---- /dev/null -+++ b/meson_options.txt -@@ -0,0 +1 @@ -+option('wallpaper', type : 'boolean', value : true, description : 'Overlay logo on default wallpaper') -diff --git a/src/Views/OperatingSystemView.vala b/src/Views/OperatingSystemView.vala -index fdb92e7e..6110d1aa 100644 ---- a/src/Views/OperatingSystemView.vala -+++ b/src/Views/OperatingSystemView.vala -@@ -39,6 +39,7 @@ public class About.OperatingSystemView : Gtk.Grid { - logo_icon_name = "distributor-logo"; - } - -+#if WALLPAPER - var logo = new Hdy.Avatar (128, "", false) { - // In case the wallpaper can't be loaded, we don't want an icon or text - icon_name = "invalid-icon-name", -@@ -53,6 +54,7 @@ public class About.OperatingSystemView : Gtk.Grid { - } - }); - logo.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); -+#endif - - var icon = new Gtk.Image () { - icon_name = logo_icon_name + "-symbolic", -@@ -64,9 +66,11 @@ public class About.OperatingSystemView : Gtk.Grid { - icon_style_context.add_class ("logo"); - icon_style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - -+#if WALLPAPER - var logo_overlay = new Gtk.Overlay (); - logo_overlay.add (logo); - logo_overlay.add_overlay (icon); -+#endif - - // Intentionally not using GLib.OsInfoKey.PRETTY_NAME here because we - // want more granular control over text formatting -@@ -145,7 +149,11 @@ public class About.OperatingSystemView : Gtk.Grid { - valign = Gtk.Align.CENTER, - vexpand = true - }; -+#if WALLPAPER - software_grid.attach (logo_overlay, 0, 0, 1, 4); -+#else -+ software_grid.attach (icon, 0, 0, 1, 4); -+#endif - software_grid.attach (title, 1, 0, 3); - - software_grid.attach (kernel_version_label, 1, 2, 3); diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 786539d567..3c9fc107a9 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -8,32 +8,27 @@ , vala , libgee , libgtop +, libgudev , libhandy , granite , gtk3 , switchboard +, udisks2 , fwupd , appstream }: stdenv.mkDerivation rec { pname = "switchboard-plug-about"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-/8K3xSbzlagOT0zHdXNwEERJP88C+H2I6qJHXwdlTS4="; + sha256 = "sha256-MJybc2yAchU6qMqkoRz45QdhR7bj/UFk2nyxcBivsHI="; }; - patches = [ - # Introduces a wallpaper meson flag. - # The wallpapaper path does not exist on NixOS, let's just remove the wallpaper. - # https://github.com/elementary/switchboard-plug-about/pull/236 - ./add-wallpaper-option.patch - ]; - nativeBuildInputs = [ meson ninja @@ -48,12 +43,14 @@ stdenv.mkDerivation rec { gtk3 libgee libgtop + libgudev libhandy switchboard + udisks2 ]; mesonFlags = [ - # This option is introduced in add-wallpaper-option.patch + # Does not play nice with the nix-snowflake logo "-Dwallpaper=false" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch index 550aefbb1f..ead8bafaa1 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch @@ -263,7 +263,7 @@ deleted file mode 100644 index 275c302..0000000 --- a/src/InputMethod/Installer/InstallList.vala +++ /dev/null -@@ -1,73 +0,0 @@ +@@ -1,75 +0,0 @@ -/* -* 2019-2020 elementary, Inc. (https://elementary.io) -* @@ -306,7 +306,7 @@ index 275c302..0000000 - case KO: - return { "ibus-hangul" }; - case ZH: -- return { "ibus-cangjie", "ibus-chewing", "ibus-pinyin" }; +- return { "ibus-cangjie", "ibus-chewing", "ibus-pinyin", "ibus-rime" }; - default: - assert_not_reached (); - } @@ -328,6 +328,8 @@ index 275c302..0000000 - return ZH; - case "ibus-pinyin": - return ZH; +- case "ibus-rime": +- return ZH; - default: - assert_not_reached (); - } diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 8b7ec684db..5ff6a7de4b 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , substituteAll , meson @@ -23,20 +24,33 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; - version = "2.7.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-ge87rctbd7iR9x9Xq4sMIC09DiPHbpbWBgMZUuJNWbw="; + sha256 = "sha256-DofAOv7sCe7RAJpgz9PEYm+C8RAl0a1KgFm9jToMsEY="; }; patches = [ ./0001-Remove-Install-Unlisted-Engines-function.patch (substituteAll { src = ./fix-paths.patch; - inherit ibus onboard; + inherit ibus onboard libgnomekbd; + }) + + # Revert schema key change that requires new GSD and Gala. + # TODO(@bobby285271): drop these in #196511. + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-keyboard/commit/555e9650bb8f74a7664e2393c589fe6664954a88.patch"; + sha256 = "sha256-koSTYLPRh9rOyxmJPtrj/fPuu2jb1SKZu6BwKsMvAmc="; + revert = true; + }) + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-keyboard/commit/6ebd57673b45cc64e1caf895134efc0d5f6cf2be.patch"; + sha256 = "sha256-Ezsh0t1/909MHCB2EJEnl4kcnXngshNYgrmqUQsfsaY="; + revert = true; }) ]; @@ -55,7 +69,6 @@ stdenv.mkDerivation rec { gtk3 ibus libgee - libgnomekbd libhandy libxklavier switchboard diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch index 0b5c8b8fd2..bed4ca5573 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch @@ -24,3 +24,16 @@ index 75d2d805..b86252a4 100644 appinfo.launch (null, null); } catch (Error e) { warning ("Unable to launch onboard-settings: %s", e.message); +diff --git a/src/Dialogs/AddLayoutDialog.vala b/src/Dialogs/AddLayoutDialog.vala +index 7c2efda3..de77094f 100644 +--- a/src/Dialogs/AddLayoutDialog.vala ++++ b/src/Dialogs/AddLayoutDialog.vala +@@ -197,7 +197,7 @@ public class Pantheon.Keyboard.LayoutPage.AddLayoutDialog : Granite.Dialog { + }); + + keyboard_map_button.clicked.connect (() => { +- string command = "gkbd-keyboard-display \"--layout=" + layout_id + "\""; ++ string command = "@libgnomekbd@/bin/gkbd-keyboard-display \"--layout=" + layout_id + "\""; + try { + AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE).launch (null, null); + } catch (Error e) { diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 52c92888f9..11268ab814 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -28,10 +28,10 @@ stdenv.mkDerivation rec { patches = [ # build: support evolution-data-server 3.45 - # https://github.com/elementary/switchboard-plug-onlineaccounts/pull/244 + # https://github.com/elementary/switchboard-plug-onlineaccounts/pull/248 (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch"; - sha256 = "sha256-C7woN4shPrVlSWZeW0Fz+xFi5CTQd2K5BsF5YeI9x0Y="; + url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/08faf7b4241547b7900596af12a03d816712a808.patch"; + sha256 = "sha256-QLe+NPHuo3hLM9n1f4hT5IK4nkWtYSe91L1wVSBzw6k="; }) ]; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 7a9a0dd8fb..cd151ee194 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-icon-theme"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "icons"; rev = version; - sha256 = "sha256-SMeVu4RbXodbxtVkQE2tvv6LaVWzrq7UBlwmi30ns2Q="; + sha256 = "sha256-Hh7RiD85N48IpO2sfWSybhS7kJYXH4VOhQ6PVIP9IS8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix index d0ee4a0d1c..a140d9cdcb 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/third-party/pantheon-tweaks/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pantheon-tweaks"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "pantheon-tweaks"; repo = pname; rev = version; - sha256 = "sha256-L/3PrkfWOGYtqeH/DajGEGCsF5yYnWuESxUTfROSHQ4="; + sha256 = "sha256-wj9bvcES8JAgDtW0Damfd8VQNLK+SCFTDVWp/nYGcgI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix index 6396b7c6c5..dcc5c7f7cf 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/default.nix @@ -130,7 +130,7 @@ let kdeplasma-addons = callPackage ./kdeplasma-addons.nix { }; kgamma5 = callPackage ./kgamma5.nix { }; khotkeys = callPackage ./khotkeys.nix { }; - kinfocenter = callPackage ./kinfocenter.nix { }; + kinfocenter = callPackage ./kinfocenter { }; kmenuedit = callPackage ./kmenuedit.nix { }; kpipewire = callPackage ./kpipewire.nix { }; kscreen = callPackage ./kscreen.nix { }; diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix deleted file mode 100644 index c63d22858a..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ mkDerivation -, lib -, extra-cmake-modules -, kdoctools -, qtbase -, kcmutils -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kdbusaddons -, kdeclarative -, ki18n -, kiconthemes -, kio -, kirigami2 -, kpackage -, kservice -, kwayland -, kwidgetsaddons -, kxmlgui -, solid -, systemsettings -, libraw1394 -, libGLU -, pciutils -}: - -mkDerivation { - pname = "kinfocenter"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcmutils - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdeclarative - ki18n - kiconthemes - kio - kirigami2 - kpackage - kservice - kwayland - kwidgetsaddons - kxmlgui - solid - systemsettings - - libraw1394 - libGLU - pciutils - ]; - preFixup = '' - # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in - # the same directory, while it is actually located in a completely different - # store path - ln -sf ${lib.getBin systemsettings}/bin/systemsettings5 $out/bin/kinfocenter - ''; -} diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch b/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch new file mode 100644 index 0000000000..c6cf9bd8d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch @@ -0,0 +1,51 @@ +diff --git a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in +index f591b9c..e883212 100644 +--- a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in ++++ b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in +@@ -63,6 +63,6 @@ + "Name[x-test]": "xxWindow Managerxx", + "Name[zh_CN]": "窗口管理器" + }, +- "TryExec": "@QtBinariesDir@/qdbus", ++ "TryExec": "@qdbus@", + "X-KDE-KInfoCenter-Category": "graphical_information" + } +diff --git a/Modules/kwinsupportinfo/main.cpp b/Modules/kwinsupportinfo/main.cpp +index 667c079..b727b67 100644 +--- a/Modules/kwinsupportinfo/main.cpp ++++ b/Modules/kwinsupportinfo/main.cpp +@@ -19,7 +19,7 @@ public: + explicit KCMKWinSupportInfo(QObject *parent, const KPluginMetaData &data, const QVariantList &args) + : ConfigModule(parent, data, args) + { +- auto outputContext = new CommandOutputContext(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"), ++ auto outputContext = new CommandOutputContext(QStringLiteral("@qdbus@"), + {QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")}, + parent); + qmlRegisterSingletonInstance("org.kde.kinfocenter.kwinsupportinfo.private", 1, 0, "InfoOutputContext", outputContext); +diff --git a/Modules/xserver/kcm_xserver.json b/Modules/xserver/kcm_xserver.json +index 04acd6b..24b8f36 100644 +--- a/Modules/xserver/kcm_xserver.json ++++ b/Modules/xserver/kcm_xserver.json +@@ -130,7 +130,7 @@ + "Name[zh_CN]": "X 服务器", + "Name[zh_TW]": "X 伺服器" + }, +- "TryExec": "xdpyinfo", ++ "TryExec": "@xdpyinfo@", + "X-DocPath": "kinfocenter/graphical.html#xserver", + "X-KDE-KInfoCenter-Category": "graphical_information", + "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information", +diff --git a/Modules/xserver/main.cpp b/Modules/xserver/main.cpp +index c406ff7..a261b90 100644 +--- a/Modules/xserver/main.cpp ++++ b/Modules/xserver/main.cpp +@@ -17,7 +17,7 @@ public: + explicit KCMXServer(QObject *parent, const KPluginMetaData &data, const QVariantList &args) + : ConfigModule(parent, data, args) + { +- auto outputContext = new CommandOutputContext(QStringLiteral("xdpyinfo"), {}, parent); ++ auto outputContext = new CommandOutputContext(QStringLiteral("@xdpyinfo@"), {}, parent); + qmlRegisterSingletonInstance("org.kde.kinfocenter.xserver.private", 1, 0, "InfoOutputContext", outputContext); + + auto *about = new KAboutData(QStringLiteral("kcm_xserver"), i18nc("@label kcm name", "X-Server"), QStringLiteral("1.0"), QString(), KAboutLicense::GPL); diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter/default.nix new file mode 100644 index 0000000000..222e785582 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kinfocenter/default.nix @@ -0,0 +1,104 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, kdoctools +, qtbase +, qttools +, kcmutils +, kcompletion +, kconfig +, kconfigwidgets +, kcoreaddons +, kdbusaddons +, kdeclarative +, ki18n +, kiconthemes +, kio +, kirigami2 +, kpackage +, kservice +, kwayland +, kwidgetsaddons +, kxmlgui +, solid +, systemsettings +, dmidecode +, fwupd +, libraw1394 +, libusb1 +, libGLU +, pciutils +, smartmontools +, util-linux +, vulkan-tools +, wayland-utils +, xdpyinfo +}: + +let + inherit (lib) getBin getExe; + + qdbus = "${getBin qttools}/bin/qdbus"; + +in +mkDerivation { + pname = "kinfocenter"; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + buildInputs = [ + kcmutils + kcompletion + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kdeclarative + ki18n + kiconthemes + kio + kirigami2 + kpackage + kservice + kwayland + kwidgetsaddons + kxmlgui + solid + systemsettings + + dmidecode + fwupd + libraw1394 + libusb1 + libGLU + pciutils + smartmontools + util-linux + vulkan-tools + wayland-utils + xdpyinfo + ]; + + patches = [ + ./0001-tool-paths.patch + ]; + + postPatch = '' + for f in Modules/kwinsupportinfo/{kcm_kwinsupportinfo.json.in,main.cpp}; do + substituteInPlace $f \ + --replace "@qdbus@" "${qdbus}" + done + + for f in Modules/xserver/{kcm_xserver.json,main.cpp}; do + substituteInPlace $f \ + --replace "@xdpyinfo@" "${getExe xdpyinfo}" + done + ''; + + # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in + # the same directory, while it is actually located in a completely different + # store path + preFixup = '' + ln -sf ${lib.getExe systemsettings} $out/bin/kinfocenter + ''; +} diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/systemsettings.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/systemsettings.nix index 94d8f92ac4..1c438df1b8 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/systemsettings.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/systemsettings.nix @@ -45,4 +45,5 @@ mkDerivation { plasma-workspace ]; outputs = [ "bin" "dev" "out" ]; + meta.mainProgram = "systemsettings5"; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index 8e08a2baa4..f0129fe900 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -12,10 +12,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.10.2"; + version = "1.10.3"; odd-unstable = false; - sha256 = "sha256-UpfQgKcrxFm7VvMEVV4fsvRnJPZSLJWexx9lZlFWJW8="; + sha256 = "sha256-L+qlxzNgjsoMi+VsbOFG7L/IITbF1iqMWqujhk0rAcA="; buildInputs = [ exo diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index 9bbc524eab..4eb6786ffd 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -1,14 +1,32 @@ -{ lib, mkXfceDerivation, exo, gtk3, libxfce4ui, xfconf, libwnck, libXmu }: +{ lib +, mkXfceDerivation +, exo +, gtk3 +, libxfce4ui +, xfconf +, libwnck +, libXmu +}: mkXfceDerivation { category = "apps"; pname = "xfce4-taskmanager"; version = "1.5.5"; + odd-unstable = false; sha256 = "sha256-worHYB9qibRxMaCYQ0+nHA9CSTColewgahyrXiPOnQA="; - nativeBuildInputs = [ exo ]; - buildInputs = [ gtk3 libxfce4ui xfconf libwnck libXmu ]; + nativeBuildInputs = [ + exo + ]; + + buildInputs = [ + gtk3 + libxfce4ui + xfconf + libwnck + libXmu + ]; meta = with lib; { description = "Easy to use task manager for Xfce"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4util/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4util/default.nix index a2bdee37eb..efc917ab1f 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4util/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/libxfce4util/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "libxfce4util"; - version = "4.18.0"; + version = "4.18.1"; - sha256 = "sha256-m4O/vTFqzkF6rzyGVw8xdwcX7S/SyOSJo8aCZjniXAw="; + sha256 = "sha256-nqASXyHR7wNiNPorlz2ix+Otyir6I9KCCr1vfS6GO8E="; nativeBuildInputs = [ gobject-introspection vala ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix index c64a696031..f4dfebb422 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.18.1"; + version = "4.18.3"; - sha256 = "sha256-n624TZGygFrOjkQ9fUVJUetRV8JDXYSg89tOHm4Va+M="; + sha256 = "sha256-sYn1gBzqEFcB3jHWxmoqqv0Cxa3mui/j0kgBqJMgJrc="; nativeBuildInputs = [ docbook_xsl diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix index d76523a94c..155e312420 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -2,7 +2,6 @@ , mkXfceDerivation , exo , garcon -, glib , gobject-introspection , gtk3 , libdbusmenu-gtk3 @@ -17,9 +16,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.18.0"; + version = "4.18.1"; - sha256 = "sha256-CnZk0Ca3IG6nmiwe7eIvPqpzJgRZHIyqeoTA5cPpU7s="; + sha256 = "sha256-5GJO8buOTnRGnm3+kesrZjTprCY1qiyookpW6dzI2AE="; nativeBuildInputs = [ gobject-introspection @@ -37,7 +36,6 @@ mkXfceDerivation { ]; propagatedBuildInputs = [ - glib gtk3 libxfce4util ]; @@ -49,9 +47,6 @@ mkXfceDerivation { --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; - # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - meta = with lib; { description = "Panel for the Xfce desktop environment"; maintainers = with maintainers; [ ] ++ teams.xfce.members; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfdesktop/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfdesktop/default.nix index 7d67741657..ed36d2b92b 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfdesktop"; - version = "4.18.0"; + version = "4.18.1"; - sha256 = "sha256-HZVu5UVLKDCWaUpw1SV8E0JLGRG946w4QLlA51rg/Bo="; + sha256 = "sha256-33G7X5kA3MCNJ9Aq9ZCafP0Qm/46iUmLFB8clhKwDz8="; buildInputs = [ exo diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/default.nix index 6ac1199314..5dc21338a7 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/default.nix @@ -25,7 +25,9 @@ makeScopeWithSplicing mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; - automakeAddFlags = pkgs.makeSetupHook { } ./automakeAddFlags.sh; + automakeAddFlags = pkgs.makeSetupHook { + name = "xfce-automake-add-flags-hook"; + } ./automakeAddFlags.sh; #### CORE diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix index 5202f7f54c..eaf090c348 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-datetime-plugin/default.nix @@ -9,10 +9,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-datetime-plugin"; - version = "0.8.2"; + version = "0.8.3"; rev-prefix = "xfce4-datetime-plugin-"; - sha256 = "sha256-ov4Wh9Pj01u0NrjDn5p+qXlD2LY3gEUC1e/jPjkn4xQ="; + sha256 = "sha256-dpN5ZN7VjgO1GQ6v8NXuBKACyIwIosaiVGtmLEb6auI="; nativeBuildInputs = [ gettext diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 0dc3d3a81a..a1027c752d 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.7.1"; + version = "2.7.2"; rev-prefix = "v"; odd-unstable = false; - sha256 = "sha256-aN8PwH5YIbjiyS5tTcU2AU4LAYC2tBStDxhCXi/dvkQ="; + sha256 = "sha256-yp8NpBVgqEv34qmDMKPdy53awgSLtYfeaw1JrxENFps="; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix b/third_party/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix index d1afa55387..eb70517c82 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/build-erlang-mk.nix @@ -17,8 +17,6 @@ , ... }@attrs: -with lib; - let debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "+debug_info"; @@ -107,4 +105,4 @@ let }; }); in -fix pkg +lib.fix pkg diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/build-hex.nix b/third_party/nixpkgs/pkgs/development/beam-modules/build-hex.nix index 1ebe3760ec..b5d20fa977 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/build-hex.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/build-hex.nix @@ -5,8 +5,6 @@ , hexPkg ? name , ... }@attrs: -with lib; - let pkg = self: builder (attrs // { @@ -17,4 +15,4 @@ let }; }); in - fix pkg + lib.fix pkg diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/build-mix.nix b/third_party/nixpkgs/pkgs/development/beam-modules/build-mix.nix index 6b6ef7ce35..081d4988ba 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/build-mix.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/build-mix.nix @@ -15,7 +15,6 @@ , ... }@attrs: -with lib; let shell = drv: stdenv.mkDerivation { name = "interactive-shell-${drv.name}"; @@ -90,5 +89,5 @@ let }; }); in -fix pkg +lib.fix pkg diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/build-rebar3.nix b/third_party/nixpkgs/pkgs/development/beam-modules/build-rebar3.nix index 0dfd68f099..43d613d072 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/build-rebar3.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/build-rebar3.nix @@ -16,8 +16,6 @@ , ... }@attrs: -with lib; - let debugInfoFlag = lib.optionalString (enableDebugInfo || erlang.debugInfo) "debug-info"; @@ -30,7 +28,7 @@ let buildInputs = [ drv ]; }; - customPhases = filterAttrs + customPhases = lib.filterAttrs (_: v: v != null) { inherit setupHook configurePhase buildPhase installPhase; }; @@ -40,7 +38,7 @@ let inherit version; buildInputs = buildInputs ++ [ erlang rebar3 openssl libyaml ]; - propagatedBuildInputs = unique beamDeps; + propagatedBuildInputs = lib.unique beamDeps; inherit src; @@ -85,4 +83,4 @@ let }; } // customPhases); in -fix pkg +lib.fix pkg diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/default.nix index 86f7d94eed..23982fb2a7 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/default.nix @@ -43,7 +43,7 @@ let elvis-erlang = callPackage ./elvis-erlang { }; # BEAM-based languages. - elixir = elixir_1_13; + elixir = elixir_1_14; elixir_1_14 = lib'.callElixir ../interpreters/elixir/1.14.nix { inherit erlang; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/pin.json b/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/pin.json index bd206eb1d1..79909f98b7 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/pin.json +++ b/third_party/nixpkgs/pkgs/development/beam-modules/elixir-ls/pin.json @@ -1,5 +1,5 @@ { - "version": "0.12.0", - "sha256": "sha256-ZieKL98EUT3RbZ1UZkhrnXjg3N0RATKB69F8D7IWnJ8=", - "depsSha256": "sha256-Otm8koWrDYxodfliIe+q4U+39eStR5umEKnQQmOOGeA=" + "version": "0.13.0", + "sha256": "sha256-eUAlnEKhoJ3j2Ii2EBL620jv3aGeMJcWoMMG+vWIdm4=", + "depsSha256": "sha256-fAt9BpEE9truGWpor0BttVd9aNZlgQ6UTorIEcJ82wM=" } diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix index de7d0497d0..34f3edd943 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib, erlang }: let - version = "0.41.2"; + version = "0.46.1"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -24,7 +24,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-LUgiQtK0OsdTmg1jEdxJ0x+39U3PXoFYsGlOv4l7/Ig="; + sha256 = "sha256-UiXnamLl6Brp+XOsoldeahNxJ9OKEUgSs1WLRmB9yL8="; rev = version; }; releaseType = "escript"; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/fetch-hex.nix b/third_party/nixpkgs/pkgs/development/beam-modules/fetch-hex.nix index 9c2ed1ea22..9d7e18ce24 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/fetch-hex.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/fetch-hex.nix @@ -6,8 +6,6 @@ , meta ? { } }: -with lib; - stdenv.mkDerivation ({ pname = "hex-source-${pkg}"; inherit version; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix b/third_party/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix index eee8f3729b..b253e16761 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/fetch-rebar-deps.nix @@ -7,8 +7,6 @@ , meta ? { } }: -with lib; - stdenv.mkDerivation ({ pname = "rebar-deps-${name}"; inherit version; diff --git a/third_party/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix b/third_party/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix index 59771c3402..b884809505 100644 --- a/third_party/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix +++ b/third_party/nixpkgs/pkgs/development/beam-modules/rebar3-release.nix @@ -22,15 +22,13 @@ , ... }@attrs: -with lib; - let shell = drv: stdenv.mkDerivation { name = "interactive-shell-${drv.pname}"; buildInputs = [ drv ]; }; - customPhases = filterAttrs + customPhases = lib.filterAttrs (_: v: v != null) { inherit setupHook configurePhase buildPhase installPhase; }; @@ -105,4 +103,4 @@ let } // (if attrs ? passthru then attrs.passthru else { })); } // customPhases); in -fix pkg +lib.fix pkg diff --git a/third_party/nixpkgs/pkgs/development/compilers/aspectj/default.nix b/third_party/nixpkgs/pkgs/development/compilers/aspectj/default.nix index 8bc1e37ad3..9c7e8e3d0a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/aspectj/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/aspectj/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [jre]; meta = { - homepage = "http://www.eclipse.org/aspectj/"; + homepage = "https://www.eclipse.org/aspectj/"; description = "A seamless aspect-oriented extension to the Java programming language"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix index 96483df724..3dbc61be41 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix @@ -4,25 +4,25 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "109"; + version = "111"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "sha256-HMPoiuTvYhTDaBUfSOfh/Dt4FdO9jGqUaFpi92pnscI="; + sha256 = "sha256-wSwLs/YvrH7nswDSbtR6onOMArCdPE2zi6G7oA10U4Y="; }; patches = [ - # https://github.com/WebAssembly/binaryen/pull/4321 + # https://github.com/WebAssembly/binaryen/pull/5378 (fetchpatch { - url = "https://github.com/WebAssembly/binaryen/commit/93b8849d9f98ef7ed812938ff0b3219819c2be77.patch"; - sha256 = "sha256-Duan/B9A+occ5Lj2SbRX793xIfhzHbdYPI5PyTNCZoU="; + url = "https://github.com/WebAssembly/binaryen/commit/a96fe1a8422140072db7ad7db421378b87898a0d.patch"; + sha256 = "sha256-Wred1IoRxcQBi0nLBWpiUSgt2ApGoGsq9GkoO3mSS6o="; }) - # https://github.com/WebAssembly/binaryen/pull/4913 + # https://github.com/WebAssembly/binaryen/pull/5391 (fetchpatch { - url = "https://github.com/WebAssembly/binaryen/commit/b70fe755aa4c90727edfd91dc0a9a51febf0239d.patch"; - sha256 = "sha256-kjPLbdiMVQepSJ7J1gK6dRSMI/2SsH39k7W5AMOIrkM="; + url = "https://github.com/WebAssembly/binaryen/commit/f92350d2949934c0e0ce4a27ec8b799ac2a85e45.patch"; + sha256 = "sha256-fBwdGSIPjF2WKNnD8I0/2hnQvqevdk3NS9fAxutkZG0="; }) ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { fi ''; - checkInputs = [ gtest lit nodejs filecheck ]; + nativeCheckInputs = [ gtest lit nodejs filecheck ]; checkPhase = '' LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib python3 ../check.py $tests ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/blueprint/default.nix b/third_party/nixpkgs/pkgs/development/compilers/blueprint/default.nix index 425ea5766f..0016c8a2c7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/blueprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/blueprint/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ gtk4 ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix index d6accbdbf1..4970d02e32 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ gmp-static verilog ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix b/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix index 2fa280fc89..b68ffc045f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix @@ -23,7 +23,7 @@ llvmPackages.stdenv.mkDerivation rec { llvmPackages.lld ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/builder.sh b/third_party/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/builder.sh index 5f41a36263..cb56eabc5d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/builder.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/4/fetchegg/builder.sh @@ -1,10 +1,8 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting egg ${eggName} (version $version) into $out" +echo "exporting egg ${eggName} (version $version) into $out" mkdir -p $out chicken-install -r "${eggName}:${version}" cp -r ${eggName}/* $out/ - -stopNest diff --git a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/fetchegg/builder.sh b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/fetchegg/builder.sh index f02e017577..34c9de3723 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/chicken/5/fetchegg/builder.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/chicken/5/fetchegg/builder.sh @@ -1,11 +1,9 @@ if [ -e .attrs.sh ]; then source .attrs.sh; fi source $stdenv/setup -header "exporting egg ${eggName} (version $version) into $out" +echo "exporting egg ${eggName} (version $version) into $out" mkdir -p $out CHICKEN_EGG_CACHE=. chicken-install -r "${eggName}:${version}" rm ${eggName}/{STATUS,TIMESTAMP} cp -r ${eggName}/* $out/ - -stopNest diff --git a/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix b/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix index 2d445d94f6..9470db3d38 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; CXXFLAGS = lib.optionalString stdenv.isDarwin "-D_BOOST_LGAMMA"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix index b3fa16f641..173cd93f34 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -4,6 +4,7 @@ , fetchurl , fetchpatch , lib +, substituteAll # Dependencies , boehmgc , coreutils @@ -15,6 +16,7 @@ , libiconv , libxml2 , libyaml +, libffi , llvmPackages , makeWrapper , openssl @@ -32,7 +34,7 @@ let archs = { x86_64-linux = "linux-x86_64"; i686-linux = "linux-i686"; - x86_64-darwin = "darwin-x86_64"; + x86_64-darwin = "darwin-universal"; aarch64-darwin = "darwin-universal"; aarch64-linux = "linux-aarch64"; }; @@ -40,11 +42,13 @@ let arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported"); isAarch64Darwin = stdenv.system == "aarch64-darwin"; - checkInputs = [ git gmp openssl readline libxml2 libyaml ]; + nativeCheckInputs = [ git gmp openssl readline libxml2 libyaml libffi ]; binaryUrl = version: rel: if arch == archs.aarch64-linux then "https://dev.alpinelinux.org/archive/crystal/crystal-${version}-aarch64-alpine-linux-musl.tar.gz" + else if arch == archs.x86_64-darwin && lib.versionOlder version "1.2.0" then + "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-darwin-x86_64.tar.gz" else "https://github.com/crystal-lang/crystal/releases/download/${version}/crystal-${version}-${toString rel}-${arch}.tar.gz"; @@ -64,12 +68,11 @@ let patchShebangs $out/bin/crystal ''; - meta.broken = lib.versionOlder version "1.2.0" && isAarch64Darwin; + meta.platforms = lib.attrNames sha256s; }; commonBuildInputs = extraBuildInputs: [ boehmgc - libatomic_ops pcre libevent libyaml @@ -85,7 +88,7 @@ let , binary , doCheck ? true , extraBuildInputs ? [ ] - , buildFlags ? [ "all" "docs" ] + , buildFlags ? [ "all" "docs" "release=1"] }: lib.fix (compiler: stdenv.mkDerivation { pname = "crystal"; @@ -98,7 +101,13 @@ let inherit sha256; }; - patches = lib.optionals (lib.versionOlder version "1.2.0") [ + patches = [ + (substituteAll { + src = ./tzdata.patch; + inherit tzdata; + }) + ] + ++ lib.optionals (lib.versionOlder version "1.2.0") [ # add support for DWARF5 debuginfo, fixes builds on recent compilers # the PR is 8 commits from 2019, so just fetch the whole thing # and hope it doesn't change @@ -113,6 +122,7 @@ let postPatch = '' export TMP=$(mktemp -d) export HOME=$TMP + export TMPDIR=$TMP mkdir -p $HOME/test # Add dependency of crystal to docs to avoid issue on flag changes between releases @@ -120,11 +130,6 @@ let substituteInPlace Makefile \ --replace 'docs: ## Generate standard library documentation' 'docs: crystal ## Generate standard library documentation' - substituteInPlace src/crystal/system/unix/time.cr \ - --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo - - ln -sf spec/compiler spec/std - mkdir -p $TMP/crystal substituteInPlace spec/std/file_spec.cr \ @@ -147,6 +152,11 @@ let # See https://github.com/crystal-lang/crystal/issues/8629 substituteInPlace spec/std/socket/udp_socket_spec.cr \ --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' + + '' + lib.optionalString (stdenv.isDarwin && lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.7.0") '' + # See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277 + substituteInPlace spec/compiler/loader/unix_spec.cr \ + --replace 'it "parses file paths"' 'pending "parses file paths"' ''; # Defaults are 4 @@ -154,6 +164,7 @@ let export CRYSTAL_WORKERS=$NIX_BUILD_CORES export threads=$NIX_BUILD_CORES export CRYSTAL_CACHE_DIR=$TMP + export MACOSX_DEPLOYMENT_TARGET=10.11 ''; @@ -163,13 +174,16 @@ let makeFlags = [ "CRYSTAL_CONFIG_VERSION=${version}" + "progress=1" ]; LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; FLAGS = [ - "--release" "--single-module" # needed for deterministic builds + ] ++ lib.optionals (lib.versionAtLeast version "1.3.0" && lib.versionOlder version "1.6.1") [ + # ffi is only used by the interpreter and its spec are broken on < 1.6.1 + "-Dwithout_ffi" ]; # This makes sure we don't keep depending on the previous version of @@ -216,62 +230,49 @@ let checkTarget = "compiler_spec"; preCheck = '' - export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH - export PATH=${lib.makeBinPath checkInputs}:$PATH + export LIBRARY_PATH=${lib.makeLibraryPath nativeCheckInputs}:$LIBRARY_PATH + export PATH=${lib.makeBinPath nativeCheckInputs}:$PATH ''; + passthru.buildBinary = binary; passthru.buildCrystalPackage = callPackage ./build-package.nix { crystal = compiler; }; meta = with lib; { - broken = stdenv.isDarwin && (isAarch64Darwin -> lib.versionOlder version "1.2.0"); + inherit (binary.meta) platforms; description = "A compiled language with Ruby like syntax and type inference"; homepage = "https://crystal-lang.org/"; license = licenses.asl20; maintainers = with maintainers; [ david50407 manveru peterhoeg ]; - platforms = let archNames = builtins.attrNames archs; in - if (lib.versionOlder version "1.2.0") then remove "aarch64-darwin" archNames else archNames; }; }) ); in rec { - binaryCrystal_1_0 = genericBinary { - version = "1.0.0"; - sha256s = { - x86_64-linux = "1949argajiyqyq09824yj3wjyv88gd8wbf20xh895saqfykiq880"; - i686-linux = "0w0f4fwr2ijhx59i7ppicbh05hfmq7vffmgl7lal6im945m29vch"; - x86_64-darwin = "01n0rf8zh551vv8wq3h0ifnsai0fz9a77yq87xx81y9dscl9h099"; - aarch64-linux = "0sns7l4q3z82qi3dc2r4p63f4s8hvifqzgq56ykwyrvawynjhd53"; - }; - }; - binaryCrystal_1_2 = genericBinary { - version = "1.2.0"; + version = "1.2.2"; sha256s = { - aarch64-darwin = "1hrs8cpjxdkcf8mr9qgzilwbg6bakq87sd4yydfsk2f4pqd6g7nf"; + x86_64-linux = "sha256-sW5nhihW/6Dkq95i3vJNWs2D1CtQhujhxVbgQCAas6E="; + aarch64-darwin = "sha256-4VB4yYGl1/YeYSsHOZq7fdeQ8IQMfloAPhEU0iKrvxs="; + x86_64-darwin = "sha256-4VB4yYGl1/YeYSsHOZq7fdeQ8IQMfloAPhEU0iKrvxs="; + aarch64-linux = "sha256-QgPKUDFyodqY1+b85AybSpbbr0RmfISdNpB08Wf34jo="; }; }; - crystal_1_0 = generic { - version = "1.0.0"; - sha256 = "sha256-RI+a3w6Rr+uc5jRf7xw0tOenR+q6qii/ewWfID6dbQ8="; - binary = binaryCrystal_1_0; - }; - - crystal_1_1 = generic { - version = "1.1.1"; - sha256 = "sha256-hhhT3reia8acZiPsflwfuD638Ll2JiXwMfES1TyGyNQ="; - binary = crystal_1_0; - }; - crystal_1_2 = generic { version = "1.2.2"; sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; - binary = if isAarch64Darwin then binaryCrystal_1_2 else crystal_1_1; + binary = binaryCrystal_1_2; + extraBuildInputs = [ libatomic_ops ]; }; - crystal = crystal_1_2; + crystal_1_7 = generic { + version = "1.7.2"; + sha256 = "sha256-Bwd9Gmtwa/0oLhps3fc8GqBlB4o31LCR1Sf98Pz4i90="; + binary = binaryCrystal_1_2; + }; + + crystal = crystal_1_7; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/tzdata.patch b/third_party/nixpkgs/pkgs/development/compilers/crystal/tzdata.patch new file mode 100644 index 0000000000..b687336753 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/tzdata.patch @@ -0,0 +1,12 @@ +diff --git a/src/crystal/system/unix/time.cr b/src/crystal/system/unix/time.cr +index 333b66075..1c29a0e55 100644 +--- a/src/crystal/system/unix/time.cr ++++ b/src/crystal/system/unix/time.cr +@@ -43,6 +43,7 @@ module Crystal::System::Time + # Many systems use /usr/share/zoneinfo, Solaris 2 has + # /usr/share/lib/zoneinfo, IRIX 6 has /usr/lib/locale/TZ. + ZONE_SOURCES = { ++ "@tzdata@/share/zoneinfo/", + "/usr/share/zoneinfo/", + "/usr/share/lib/zoneinfo/", + "/usr/lib/locale/TZ/", diff --git a/third_party/nixpkgs/pkgs/development/compilers/dale/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dale/default.nix index 7feb364976..816e8e08f4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dale/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dale/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config llvm_13.dev ]; buildInputs = [ libffi llvm_13 ]; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; checkTarget = "tests"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dmd/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/dmd/generic.nix index d4bb8bb628..c1fb9abf77 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dmd/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dmd/generic.nix @@ -151,6 +151,13 @@ stdenv.mkDerivation rec { git ]; + # Workaround cc-wrapper's --sysroot= value for `staging-next`: it + # breaks library lookup via RUNPATH: + # ld: warning: libm.so.6, needed by ./generated/linux/release/64/lib.so, not found (try using -rpath or -rpath-link) + # ld: /build/druntime/generated/linux/release/64/libdruntime.so: undefined reference to `log10@GLIBC_2.2.5' + # TODO(trofi): remove the workaround once cc-wrapper is fixed. + NIX_CFLAGS_COMPILE = [ "--sysroot=/" ]; + buildInputs = [ curl tzdata @@ -158,7 +165,7 @@ stdenv.mkDerivation rec { Foundation ]; - checkInputs = [ + nativeCheckInputs = [ gdb ] ++ lib.optionals (lib.versionOlder version "2.089.0") [ unzip @@ -213,7 +220,7 @@ stdenv.mkDerivation rec { NIX_ENFORCE_PURITY= \ make -C phobos -f posix.mak unittest $checkFlags -j$checkJobs DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$PWD" - runHook postBuild + runHook postCheck ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix index c2cb6eb378..fddcbcea46 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/default.nix @@ -28,7 +28,6 @@ let ## Files in versions/ are generated automatically by update.sh ## dotnet_3_1 = import ./versions/3.1.nix (buildAttrs // { icu = icu70; }); - dotnet_5_0 = import ./versions/5.0.nix (buildAttrs // { inherit icu; }); dotnet_6_0 = import ./versions/6.0.nix (buildAttrs // { inherit icu; }); dotnet_7_0 = import ./versions/7.0.nix (buildAttrs // { inherit icu; }); in @@ -38,7 +37,8 @@ rec { combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; # EOL - sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; - sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; - sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; -} // dotnet_3_1 // dotnet_5_0 // dotnet_6_0 // dotnet_7_0 + sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; + sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; +} // dotnet_3_1 // dotnet_6_0 // dotnet_7_0 diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/5.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/5.0.nix deleted file mode 100644 index 64da95920d..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/5.0.nix +++ /dev/null @@ -1,137 +0,0 @@ -{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: - -# v5.0 (eol) -{ - aspnetcore_5_0 = buildAspNetCore { - inherit icu; - version = "5.0.17"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a2b96f83-e22a-4fa6-a10e-709b3effac9a/0d6ade6c0ceebc8ef7dbf2b1a6d86f17/aspnetcore-runtime-5.0.17-linux-x64.tar.gz"; - sha512 = "d8e87804e9e86273c6512785bd5a6f0e834ff3f4bbebc11c4fcdf16ab4fdfabd0d981a756955267c1aa9bbeec596de3728ce9b2e6415d2d80daef0d999a5df6d"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6eb8aee2-cbea-4c4f-9bb9-ea6229ec229b/d6c438e5071c359ad995134f0a33e731/aspnetcore-runtime-5.0.17-linux-arm64.tar.gz"; - sha512 = "ac1a9d89f1b730dfdca9c2e48373ef21f8f9316014eefbe6b11516f8195d3b3efc4e482883774b74ea2ff1cb77174a2cb471bd1157ab5b7d71621e3026c38e9b"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/25e4817f-6fd0-46dc-be0d-d819445bac5c/a8fa228c872df683741c8a79745f8fb3/aspnetcore-runtime-5.0.17-osx-x64.tar.gz"; - sha512 = "bb0c43c723090fa2d8a0255e6fc8c004ebe7baf2d5d56e22ad2e6336a67fe415333d451e459c8857c0ccb5819d998232c9617bf45f222559d4b8891b0af41f20"; - }; - }; - }; - - runtime_5_0 = buildNetRuntime { - inherit icu; - version = "5.0.17"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e77438f6-865f-45e0-9a52-3e4b04aa609f/024a880ed4bfbfd3b9f222fec0b6aaff/dotnet-runtime-5.0.17-linux-x64.tar.gz"; - sha512 = "a9c4784930a977abbc42aff1337dda06ec588c1ec4769a59f9fcab4d5df4fc9efe65f8e61e5433db078f67a94ea2dfe870c32c482a50d4c16283ffacacff4261"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6690730f-cf10-40f1-9d4d-4c0d002f22d0/e117133858f190c169873200b8d7b9d7/dotnet-runtime-5.0.17-linux-arm64.tar.gz"; - sha512 = "99cb11871924d3abedcc9c8079c54bc0c550203c7cbe4e349ed70d4355f40e4620b68d90b797e6461d898c06bed6953580e2cd4ad01483e5de107ca5a3409610"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/39326cf0-dc7f-42a3-9f7a-fe30c75c7a7f/33cbce552148e13d47120fe4502f5b5e/dotnet-runtime-5.0.17-osx-x64.tar.gz"; - sha512 = "31add512418640f98bc9511509db2049a2674c7725169d26be89218a02ac7972e03e5d6be5a3d45a0dfa764e6eade503a8f4957b7b198ec6ad412e423d95f1b9"; - }; - }; - }; - - sdk_5_0 = buildNetSdk { - inherit icu; - version = "5.0.408"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/904da7d0-ff02-49db-bd6b-5ea615cbdfc5/966690e36643662dcc65e3ca2423041e/dotnet-sdk-5.0.408-linux-x64.tar.gz"; - sha512 = "abbf22c420df2d8398d1616efa3d31e1b8f96130697746c45ad68668676d12e65ec3b4dd75f28a5dc7607da58b6e369693c0e658def15ce2431303c28e99db55"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/d4b71fac-a2fd-4516-ac58-100fb09d796a/e79d6c2a8040b59bf49c0d167ae70a7b/dotnet-sdk-5.0.408-linux-arm64.tar.gz"; - sha512 = "50f23d7aca91051d8b7c37f1a76b1eb51e6fe73e017d98558d757a6b9699e4237d401ce81515c1601b8c21eb62fee4e0b4f0bbed8967eefa3ceba75fc242f01b"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4aeecc7c-7ffa-418f-9362-cf5eb3ed0396/055d5e6064a9fdecd7d906f5f262373d/dotnet-sdk-5.0.408-osx-x64.tar.gz"; - sha512 = "3fdd4deac2809b00c0f669d5488000ac1b9a47dee6ab7b31167d7cec4759a10ee347fd4f52090a40684e5ecc1e1f57eb99c558e561edfd1436a2f77fc1c1a0b2"; - }; - }; - packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "5.0.17"; sha256 = "0mfawgcc23r44a1r7ynafxwga6jzn0f0z5ys03qssrvlcdsb376x"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "5.0.17"; sha256 = "183xgqzlwd5lhacxdwcjl8vcq7r7xypv0hddps9k32mmmwf83d8h"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "5.0.17"; sha256 = "0i5pp1smjkyhiyhcbkyc3cxz0sx9204bfml8wsdy7bxznbh2gkmw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "5.0.17"; sha256 = "1fmd9jq2nzy63hjh4sa6zl636wpgwr3r8ahzln5w14m9k87lfdbk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.17"; sha256 = "066fwdlssbv556zd9w1x87x1j8j4kafj9rxyy0692bssdb4gcyc8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.17"; sha256 = "1qvvqf8mmzzc7a7fhx324dprnbxhknr3qxspb2xhsn3yyg44xn2d"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "5.0.17"; sha256 = "1gzf2gv4z9bn1cr1kpqpf1jf7m0p0wd1pxq5ndylq6bw353yglk1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "5.0.17"; sha256 = "1lml70ln9bfjrfjf3jbxfzd5kgd4cp4h7v052md5ja364g7lalsy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.17"; sha256 = "0j90fri15c05lw96xybgvqkysfm7g8grhkrg25g75vhi6ni2ricj"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "5.0.17"; sha256 = "1bdb887xvgxsmphys83zp9skn848p1r8viclc8p29w1rby4wi19i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "5.0.17"; sha256 = "0y90p765sj54clf2bwrka99w73g8b9550b4qvyilqggzydl1c1hk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "5.0.17"; sha256 = "07v7vyqm556xr1ypkazfp6gh6drgf20zkwbhkpja8bwdcr6lphbb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "5.0.17"; sha256 = "0sbzlzhazh31s63hw9553hk9j56fxssncmfgidiyh0dg73aacrsp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "5.0.17"; sha256 = "1qxphvlr882rvmj71y2imnf6r3hh4ln2n138qjyv1z129dp2g4y1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "5.0.17"; sha256 = "1lc2jhr4ikffi5ylyf8f6ya6k0hdj0wp1l0017grrwd4m5ajj4vv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.17"; sha256 = "02g5w41ivrw3n6cy3l3ixhcl8bw1fsv4bzs2m34k9h5fqmliaf3c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "5.0.17"; sha256 = "07rfkxpf6rp8x0lybl8hx40mk09w5gjrr9djkjcp8lvjgzidnxq9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "5.0.17"; sha256 = "1i7wka56n3akr96jrkj37jx98bwxfzhpx5705930v50izligd08x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.17"; sha256 = "15f1kqlpp1d05dhg3dfya32vvzbpj6c7gxds947f10jb0hqlnhdj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "5.0.17"; sha256 = "1j1334zxv815ksdnllnbwwsbwnimjlpknjmqy1riy2zpswxlfkz6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "5.0.17"; sha256 = "0mmgd6nacx4fzf0w02ch0qxa43vrv6wfspykxsy2bkpvrnvr8xr9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "5.0.17"; sha256 = "16whaq82pj6fqa0vam3a0va9ly843aa1z12hza040vn6252kk9fq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "5.0.17"; sha256 = "1zavnwqvn2f7lhb880wgv02anrvqsh6l34w72knwd31irggph08l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "5.0.17"; sha256 = "173r2srcbad2prrw3l914scmdks3mghxgszvlwypdjnv0f2szgvv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.17"; sha256 = "0jgcfs3jc98jfyaaamssznckbpnaygplk8pjsp6dswpansz5bnnq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.17"; sha256 = "1ph5kx18syinp8bpzw80bgq3njl65gwzws727xcmxnysgm7snmjp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "5.0.17"; sha256 = "0m4jhn70parwnl18fql0sk9sf14y8cf08xw6x2cm5bfhnc9jvjny"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "5.0.17"; sha256 = "1af20jkv73767b4fy18s2dvjncaca1ny0csyr7wbhvqfs59y3n1x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.17"; sha256 = "0llhsi03wyp2yjqy0snywqgwjgam91i4nsf5lc9kaxkk5h6vj1a0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "5.0.17"; sha256 = "0xvprbjwd3fymddvavsy7wk5q2hp45hdi10qz4rdbmns23vqkzmf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "0vhvxpba3i9ffp4gp56l3rnlhq9yg07n3dv5qi89zb90vgyqjh1p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "074c9byxwmndfdavxn103220f5gklaaxc9wj7zpb5v3yr3ads30f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "03jkkpsy2zjfp722fa2fcnpk2g6jzy0bn9vip5c39k78y5pz29x6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1ih6c104skp9q17i2dnsma45l6nv5c62vv2i1988dcjw2v0sl98m"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "0gwsxd1l0n32xnw0lyjixj2634iyygdb8pd7chydsr3qk8njxnpk"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0x5dhn1jkwqnd0cki1vi97rhyfac6w79hvh9dxvnkn2k04sbps8q"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1ipx3qn78z6gi415c4fa9wgy8k75aifbml6ys1c9ghl6yxbv0fd0"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1wgbx648yndl0hh8vx6sflfwjyr5pfhi7vj7v19l6vxnrr1096w7"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "17jc8jc2dk1g8996jpq3k0g6c5inijivxkbz0grxrgr5jbyiv19y"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0ydn40qn6cs6f20byvmc9j008s6csxjbh6jh5w4q995vipcmcpcj"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0bw08wlf96vcyix850y8jips1glrz2cbj647af4d7gggw8p3wwzw"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0xsqyw848scwcz09pgc719776q712xabx4xv47srzij34p2pq7np"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "00b0vipypjai4l8icr74kjhglxx2xlc3nw3vyiwisg52l9zyby66"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "1cdgd4p5zr1mzz9hlb5mj946zfa1vn9wya5y2bhqn9y4ak831wzp"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "17v8m4fxm4q40z49a2h4lw9dawg6pwfv4s2dskzc23ggcjgr6dp1"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1fbqi92prqmvxx0rx7vhl10l665jmmhb2ng5jndimggydb0ckpqh"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1rijxkzzk65xs9z2ygs13h0rhw1cli5vwshmvs1gfnwhhn8ic0gx"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "02mxvpm2zs5jvawigvxlnrw6si4zwj6qlcas99m9xdmm8yqq22cm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0c1lcl3yy88vdfw12c7h0ww596qfjd5f8l2mn7mlqs6i3f864bkg"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0w0wg9ah7vngvpyds67l6qhizpkdf2r6m6cqyyvv3s5dw5l8rxin"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "17yy7605vkfz0f4h58005gdfg6fnjxlcnq0vg0hrxsgbdqmd7p1i"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0av25fgkdl7zvn44wp8gqx2xl2mdlv1f9cgxzp7xk5yq8f7ynxpq"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1smhmdfq0jlv1gq18hdaj0y9yzkvqzmki19c0b3j5b76yxxxpbwz"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0n0cdb9zpdb4h4v6r265pqmqg8c94ydywvna6jp1c6qhqlr0qk39"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1s2n2sx29c8rx549zizj8yrddjl98a7vwvxw56y0jvvbwphr9gz4"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "19m66yvv0hnmyrmx2l4drbls0fcib75fxq2csdx6p8gd54bnrsh3"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0bcnlsxcrvhybcjbb9879njx0c4z76y7djx4643g1rpjnkcrj9ww"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1bf95h2f0dmpmv7z7961zia5vaqvmjq3wkf6iil9jxv4z674624w"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "02q593q09mwwh23m86048vc7b7an7pqch5nd86d4hxzkamnpnpsa"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "16vzxywfj88gjcwfnmcb6b50ld8dp46i4pqiwwcy7yz15xgdhbm2"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "1ix5lg2j5ihdfp9j3jdxc042g4syjzc4bafid465j52h6znsm6wm"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0w30v8r26cg427n5glm9nz6r10baalkqq5icqqxkq71hmh8fsjqb"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "168iq4hdp6bhdpgqa1mir1bygmh2ggwkys1r82d6kpl2lzbxjy28"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "18jpw2wbrb1b941729lb7hiq4yfq2z53pcxwz4mpgawnr58y0562"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "0ig464fcsj2jr0p02f6slifwf1m0408g95npm0vccf5ww1nbgkpi"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0qj5avmjrvabxzimprg4m54k3p6zkwrhbpv0byc8c9gbi47s323j"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "05ghz164lpff7n8mrxs7jm2h8n3clsg4w953zrag3k5ry9j36m9c"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "0azgs542mbg69jlc81529i2z5m728w8sc2i9m5dx15hvxqqqcjiz"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "12n1kcgcv5z8hkvjqfk0n705kcipbai4sgcwiimi52xpaf34xw8m"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "0b1s2m0a7xcdzfz22x6k7v5hkca90azdjk6pw7wwdnvszwq26nxp"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "5.0.17"; sha256 = "1sjpq07swgj0isdgyh6p2yb254qb9781lv44xfhj6nz7mx2yhdh1"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "5.0.17"; sha256 = "1gnzrqdp26d7pwwz29gm4qb09n2zsb767qkhbwkifcsyxlwi6m0f"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "5.0.17"; sha256 = "089jww13gaf7x7yd9d3qkyx9iq8abcp3r147hd9nblh561c9bzbg"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "5.0.17"; sha256 = "1nycl1rayk0fhaakpj6q9rfp2lv3dpl7pziavmd9kcfryz952ff5"; }) - ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix index 04772db63f..b33feb56c9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -4,178 +4,178 @@ { aspnetcore_7_0 = buildAspNetCore { inherit icu; - version = "7.0.1"; + version = "7.0.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6f0e5e7f-cf41-4ece-a728-eab7894157cc/b043910ee98786617d99cef8e8914c23/aspnetcore-runtime-7.0.1-linux-x64.tar.gz"; - sha512 = "8265cc0f35591ba58b4c6e12378048b72d1a767c56fe29fe9b495c4ec537ed43ee30890412ae2d52b15a732bc164894d10fa8a59407073d41ac62a3fe6254f81"; + url = "https://download.visualstudio.microsoft.com/download/pr/1d8c4b4c-aec9-451b-9bd3-bf7cdbd28477/def6c1a7a9cfd4590698d4f338da2803/aspnetcore-runtime-7.0.2-linux-x64.tar.gz"; + sha512 = "d3b6c845030069581b3bfd739e3918ce77ae76c8e2e57b8e6c33c9134c46bc8c09fa9b74abdbc917c614c7d09ecbac149b0db1be2e045d26d82c61d976279b49"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e3d97ec5-f36c-45e5-bd0f-c58b0c468ec2/0b97b0983d826f854d9328165393bf1e/aspnetcore-runtime-7.0.1-linux-arm64.tar.gz"; - sha512 = "e80bb0756ba23ebeff96b5e97758a4c74f2bea29b718860e795d62402604c42ec9b544e89e94662a037bc0a68a967b93a2e6321dfd3c4416cde47cf188f67186"; + url = "https://download.visualstudio.microsoft.com/download/pr/f88ac12a-fcc7-4f69-baf9-17cfbd9b316e/8745af53d52c38afc5c9fc171cf3c7b2/aspnetcore-runtime-7.0.2-linux-arm64.tar.gz"; + sha512 = "43ad795456b6d7a1f566113aaca4d7817dc4ff9cc893cab48e01d2d9685a1febdf397dfbc774fa7adc30bac7884dbd60980fe6b95efbc9497cf3228688c123c3"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3d8f8533-29b6-44b4-9b12-12dd99e8380a/70eda23293055dfa566386c4b6e71ebc/aspnetcore-runtime-7.0.1-osx-x64.tar.gz"; - sha512 = "ce0f100cb4494c6133e2710ed92da8c7c7e7fd5626dd22052d9864c22ef4eec88b1418ce7357cbeea4349f12672efa3fe9bae5f3d41614b8fd70930b872844b5"; + url = "https://download.visualstudio.microsoft.com/download/pr/035d61f7-0418-4834-8364-eec4d3c3d112/b1fd356e10f14ee2c930e023654186f3/aspnetcore-runtime-7.0.2-osx-x64.tar.gz"; + sha512 = "a6e867fa4a9774231c736dd61e54efd8f62dc29fdcae6be298023ee86fbc8d75867d58d5968ffe566a497dfc1b10ef0104194af495d5cad48871e989b1bc2778"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0c8fce04-9135-4e2d-af4f-ef8b23a1e467/67493d21915b734225ded1ac7c311005/aspnetcore-runtime-7.0.1-osx-arm64.tar.gz"; - sha512 = "d804532c874279653fc329f23d246dd76aa375acf508de141e5c1d9d89e353f7085e53f1898cefd1d21d4bf98a719d658207b9d08c35bbc2f23d2759fe7cccf4"; + url = "https://download.visualstudio.microsoft.com/download/pr/42ad7951-d95e-4d52-8427-9ff58cdb0c16/f6256fba5b7484979737f34f7fa1e0ac/aspnetcore-runtime-7.0.2-osx-arm64.tar.gz"; + sha512 = "4538a57c6bea5d3137ec44286b17a4ab0df4b5c946db3e9bb50bd97cc0bff6f7ba6f1eb951d77e9f77d3727af7bf04105076f74f2c8b64005b1175f1c8f5cd94"; }; }; }; runtime_7_0 = buildNetRuntime { inherit icu; - version = "7.0.1"; + version = "7.0.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0b330412-234f-48c5-957c-c3c8c854a400/8d9a07cc153fd16a828d78c136b47e6f/dotnet-runtime-7.0.1-linux-x64.tar.gz"; - sha512 = "db79b221f6bfa4d56fe0e2b7c237612bd74a81deb18f038ab7226b9e06eaea6e90909f1493f0ab4cf7778b6544b8aaa1295ece1c4a9f1fe39ca44bbfaced46c7"; + url = "https://download.visualstudio.microsoft.com/download/pr/83524cc2-60fb-4e49-8769-e9ecb1af8e46/a28b17808ffe21483b2f719091a0544f/dotnet-runtime-7.0.2-linux-x64.tar.gz"; + sha512 = "56f7f471052b955968b9a4caa27299ac003e0347ae80e8ef23de87d28a2707bdf7ceb70467cc3e9f0c80928a779841dd7e1392ed6b06e66a7a9cda696d5c0a1e"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/038c1cc9-fcd5-4a0e-9547-acab08b0a4ee/c56e6ec6012bc6e9f52897166d543872/dotnet-runtime-7.0.1-linux-arm64.tar.gz"; - sha512 = "53e9b03326c2fdb8d2366a97f3cfbeca4f0f497b82cf665d5d4543f5d0fa8a177c53e8f48597f79072e962e3c7ef6baaca96143c2f775be52071e8ebbae88f34"; + url = "https://download.visualstudio.microsoft.com/download/pr/38d90a87-4b35-46e8-a4c7-5c4ae15eeb96/77b1c221366f3c748c226edf25a65577/dotnet-runtime-7.0.2-linux-arm64.tar.gz"; + sha512 = "dece1d39074dde28aa61f51f3d932ee5328c9ec2c5e6c9830e304bc768e3253b5fab3eb2e27752d39547d68c29666440fe5c96f0fb0b8e503b93f55429df544f"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/45a4345a-ed55-49a9-ab5b-4e85e94f489f/54011a3f9000b22ecb3a823f8f1a6f7a/dotnet-runtime-7.0.1-osx-x64.tar.gz"; - sha512 = "bec337234d04da6530437bd13ec59e0112c4cf951402e0a5ff79c60c93498701e5b5abc6dffc5afa5ccfb214eb879d278ee5beaac8f4f7043ae183157a7ab476"; + url = "https://download.visualstudio.microsoft.com/download/pr/4106c55b-9371-47c6-be04-cffe46c334d8/ad559a1e388d9384ae07381ffccdf26c/dotnet-runtime-7.0.2-osx-x64.tar.gz"; + sha512 = "6fde32130590d18d6bfd73fd3c2cd01f3ed6c2b3316285f64fb0bcc8889707e0a6e1415f796f5553486a89ef817628add27c64b69ea41c6cf4cd9fe811caa10f"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/14304a5c-0fb7-42c4-b838-e5e9c9dc9d16/7da30cc174d04e0e5d3de1a3bb134eb7/dotnet-runtime-7.0.1-osx-arm64.tar.gz"; - sha512 = "2a4e583ed1a2c32de6feb25019eb9fe4fbe26d0cc1ab45a2c7f93db61ffdeef86e37a8af5b36fff0729d649743206986374173dbc0db84d5c0f13b308e40c96b"; + url = "https://download.visualstudio.microsoft.com/download/pr/42056f30-aea1-456c-94c0-77eafd2cdbec/ddf45ed3e6c84305aa584a35344f5338/dotnet-runtime-7.0.2-osx-arm64.tar.gz"; + sha512 = "c8ee455a364a53d0945bf76096bcc568a45b843bc5b313392ab9a07f1e25b16110a411a2d4bb3b6632891cd4ea5147597c93065097bdcbd5038107382c84c9bb"; }; }; }; sdk_7_0 = buildNetSdk { inherit icu; - version = "7.0.101"; + version = "7.0.102"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/7fe73a07-575d-4cb4-b2d3-c23d89e5085f/d8b2b7e1c0ed99c1144638d907c6d152/dotnet-sdk-7.0.101-linux-x64.tar.gz"; - sha512 = "cf289ad0e661c38dcda7f415b3078a224e8347528448429d62c0f354ee951f4e7bef9cceaf3db02fb52b5dd7be987b7a4327ca33fb9239b667dc1c41c678095c"; + url = "https://download.visualstudio.microsoft.com/download/pr/c646b288-5d5b-4c9c-a95b-e1fad1c0d95d/e13d71d48b629fe3a85f5676deb09e2d/dotnet-sdk-7.0.102-linux-x64.tar.gz"; + sha512 = "7667aae20a9e50d31d1fc004cdc5cb033d2682d3aa793dde28fa2869de5ac9114e8215a87447eb734e87073cfe9496c1c9b940133567f12b3a7dea31a813967f"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/caa0e6fb-770c-4b21-ba55-30154a7a9e11/3231af451861147352aaf43cf23b16ea/dotnet-sdk-7.0.101-linux-arm64.tar.gz"; - sha512 = "b0874f4167e9792802b46a7ddcf3a7f7bf7329eb3699d4308b1cdd45ef32678962bbd0ccfd186e48e11cac3b198c4415ceac2f5e546d5fcdf0cecb05810863f7"; + url = "https://download.visualstudio.microsoft.com/download/pr/72ec0dc2-f425-48c3-97f1-dc83740ba400/78e8fa01fa9987834fa01c19a23dd2e7/dotnet-sdk-7.0.102-linux-arm64.tar.gz"; + sha512 = "a98abed737214bd61266d1a5d5096ae34537c6bef04696670d88684e9783bab6f6d45823f775648d723c4e031b1bd341f771baa6b265d2b6e5f5158213721627"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/58c27f9f-f988-4a42-be1a-0747657952f0/32c855c8c0ff149e4b3662ff3bc3e632/dotnet-sdk-7.0.101-osx-x64.tar.gz"; - sha512 = "f08a2137c37386ed9408106d10a3bac5f1a12dd3535e20e4384a96193b82fc27c15ba0ccc47e9bd7a12e533a3e9f0e220a08a220887cd12c678fed476ee12bb5"; + url = "https://download.visualstudio.microsoft.com/download/pr/91c41b31-cf90-4771-934b-6928bbb48aaf/76e95bac2a4cb3fd50c920fd1601527c/dotnet-sdk-7.0.102-osx-x64.tar.gz"; + sha512 = "b7a66a6dc9e6648a97a2697103f2a53f37cab42d7dbd62b1f6ce5b347ca6cc7e45e5474ddb546e10f1e49ac27b20c0f58936093decf779941afd2ff761ecf872"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/d9df94f7-3ea2-41b6-abde-dcb9caa87056/9df759093dcdbc1a1b98feede2da8aaa/dotnet-sdk-7.0.101-osx-arm64.tar.gz"; - sha512 = "586b5a8f32601ffb8466e0135561a02105766388997bab92a428b4567ffca961dba540d4f6fe237f3a4ea068dd4bf3c9050c8557c0cb7e25f4c020fe0a62377a"; + url = "https://download.visualstudio.microsoft.com/download/pr/d0c47b58-a384-46b3-8fce-bd9188541858/dbfe7b537396b747255e65c0fbc9641e/dotnet-sdk-7.0.102-osx-arm64.tar.gz"; + sha512 = "bc95a0215e88540bd52098453f348edb01ffec11ccfc44c7c017bfae5243ce2f0a50f4bb06cc6c3a622c9fc27b89f026be172c2d1bfb8ba62ed007071d5224b5"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.1"; sha256 = "11r444zxpaaijcxqdnc8vlm9g3mppkx8k35y7bjdinbj998jyhlv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.1"; sha256 = "1dl7yzg9a9pq9jrbbipp055laq4glk7wdwhl60iyvj7gr2icpljq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.1"; sha256 = "0psndv4171db3vqqqqvb3mca94qx411hy6cllrz0d931jydcdlna"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.1"; sha256 = "0yhjzj801xbgawi3qs87i2yv64aqf82xa36vmn37bs1dp8ikjh8h"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.1"; sha256 = "1qlkw8jlsrgx47mbvkgdqhi8qhx2j4xjbpiiaxrm2k6cdrjqqrla"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.1"; sha256 = "05prp8fnbb59ydqfgxszb1n1xa39pynzyfwwnlpjfqn0hvryh4b6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.1"; sha256 = "1z0zc164vdcb1lf4jmrsqi261l6nw8bk82y112k4mwf6fcrfqjki"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.1"; sha256 = "1wakpdw6a0arnig5rykl6k33jwp1bm7k4cawdnqhzgvq9yrhnbb8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.1"; sha256 = "0cp1qqmdgya3nc8pxbvg9nzmxcqrv26v8jpl7fpr9wvswsdm3ywr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.1"; sha256 = "1w1m89b2fmgza8fggskm2mpz3pq6f9cskqvr5wf3538s0dm3zai7"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.1"; sha256 = "0rg6rh71ja5slaxx8gzmj74q0x4sij5b0437y236abyph5x8f3df"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.1"; sha256 = "1ic0wbsbs917ab37f9a3w37png5fc3p5cqiw3z6zd7dkjlxxnvqd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.1"; sha256 = "0vpqvwbv2rzbim24aqz840si89h9xbbq5h6z8m79gn47ijw4awvz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.1"; sha256 = "1hc6mmvrzvm5pl9smvk8x9x5balsyqcd928js8291qq9pw7dpc85"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.1"; sha256 = "0j5d7gr7m0dcmzsnxbw6q65c58bryj8kc1qfmr0xd99yj55lnmq4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.1"; sha256 = "11s3r9f2zgdmjim8pylp7fwm4l3pd73l0lcfdfy9h90vz3wj9dzh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.1"; sha256 = "10ni736mgmkgm1j19y6r4rrmph1f079mbydfclmf546705ssvkvp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.1"; sha256 = "184pyrr7w4i616lf41w2y4f4m2cm2m2b087v1ry1walwhazrrryw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.1"; sha256 = "0hp3b1pfj5x2xfri8nyw5kp3ggqxgjcw7njiijxpm2yg1zj269a5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.1"; sha256 = "1qy27qq6zavpa9c71hizyhp6byv4vc477r4j9iwm4shvvpyp7aad"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.1"; sha256 = "1r83c0xixij72ll58v68yads7pjfmywx0ygffd8zjmz9djxgiip0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.1"; sha256 = "1kic306b2v7n706zw4nz788an3zl316i617fdh66zkqr43kl2w5v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.1"; sha256 = "1rmdq8mipx2agyn5m1y43s650vfjxqvr96ldcgvpggs8npab7466"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.1"; sha256 = "0rlqlh326ascnqw5qfx2zyf8mvgjyf3rqyg3j7xgw0w3bwlba1ip"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.1"; sha256 = "01370xwprc3m2xgz2fs217qnm35lg5m2hh81kah0hz793dhmqcfb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.1"; sha256 = "17y7mnnzb88bpldmakwz2jqyg49c2dwk7qn4s7w67ckmggaswh4f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.1"; sha256 = "0dx0j3fikadb0ydn4ncjqsvbz14ladgmpvm9zz3n4v2y5ry0pa4a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.1"; sha256 = "0qclazx1zyr324cp2ssdrh3640sna47fyl9rnxq63jkw3n5cl7hz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.1"; sha256 = "1jj9zrblah88m1f1vm53x4gdw5671gr4zdnra0vfawwzy8rbx69k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.1"; sha256 = "0myvn4yzhljm1kr5m1b3i0hxkzfrg4nbhv49413171vwic4p8n5q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.1"; sha256 = "0zj328ka130sya394y65bnipl3mpf8nl0mapap74jnqrhbki69a8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.1"; sha256 = "04n49c643d6rksxs09h383his9m5ljaz42a00fhzw1mb4pzm88a5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.1"; sha256 = "1il3f59nbwp9gvwwpwbv7kw7dv35kh2shj030vpykq9h6ch2k2rn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "1651k4klgaa2q0rpknq5vzn0wg8sq5snx1c493sz013gbzqpq5jw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "14n1zg5bhx4yc22c3razj24rbj7h0yxlwrwzgdi51ix8gzb7nzp3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0pj24ma1533z90s96x9v0bya6macvp95ggpy0h8ixymav44fkk9k"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "0ykb419lln5zdnsn9jc6kgy65wm58g7pyy11v6iycrpmbcpkb1m2"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "0754m46v1amvrvaq0yfn7lh08iwnknizis2n9qqkf0xpj32sqah5"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "0ir054hafvyf4s8fycz4bifdar9g0ss11r5dgq5m178xsjgfnhib"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "1dpbxsacbxlp6rbshdwvbrw31wz17bpmipf0svgps7py448xnqy2"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "00rabsskqgf8dcypyi48095zqqgayzhnx5zfxfa22i63cky54x0s"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "00xj1w3acbxjdasywngp2gnsxn16plf31v0vvjfwah38xzrw2qyx"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "0miri63x3fjnbliiq8724mc8bzj2kng1mss1x0rgq1rjgdb0bimx"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "1gi49a224p9slzw96607h2i95qnkjdj81kp9f2541cr47zvlslll"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "085jdd3fjj0mda4y7v6wyp21zvzg1kc21acljk8lk264cq6ckbi5"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "1fpm8faqhh4s1y4qnm4byrpvq1zlhm1brpi7vg1w7zl4y1g3wr7l"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "1xf6bn2kacdz4qjdhnwbkp6lg7l8g6xjii8vgrnpq36jm62gc4kp"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0wbpwi7v0hxbn28xkqccr1wsl82qp2j41jd819cm7amaikvqy30s"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "0sswz7ly4g22gchqh9pg9vvrkvcnb1l49sbbkjs870cyvalid9rn"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "1naqnqgw2r97q7nv5wfgdlv40g0x77fl8j777mf3plvq8y72r3rh"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "0w67rjis62ggjfail7ikx4j7wh4kqxp5fsfa9ig2j02fd63pgla3"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0275280n8vipl3szwnk0rg0ziwvpn1pdppdpac41yq8wm8vcz6js"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "080k0ayvvcg5n31p360sygmvwjbs5597dvrnl0v61nml1xh3bhb4"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "0dgyl7jkddd7pz3hsvq46ia5bq3pm8ldszrb4ylcz0c1x04fk71j"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "0v90h8zcxd917qfqfl565ch0bxhlpr6fv6d11qbyxgankpxv39cg"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "068n96asl9r3546yynv47sw8rzqj51a9f5s6phnf44213kj43kbm"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "0ldnczqjs785vivdfy1va8lfmq4zakdi9s1lbz5cc9mlj4fxnzpp"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "0g3b4pjk4895ldix2ka1c9frgkkj0dy37i88z16sgdf9liszay69"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "0qr0c891sqyd4v32xpfhafycq8ix56my508jsnq58xfpi79flhlw"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0m0ffmmjgf9sqj2yy4m9zijsy4y9kig5j28mrmgkhypbv310lhwj"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "1shp6ikrd2cck7jv0lxbpy5dq02hy8pihcqwn931zkrwcz54ci1q"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "08s3xxiqdfz980l85gvizwr1i4r5izmzll4543sr2qd8f2yldpdx"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "1i2xkjdp2szjbg4spczv8jv4kp2c9c172g2xqp1idsvbh3qmmi4v"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0xgjm43mbdj939l3kksmcs2haz7p0lyw9iw7nvvd82m9gi3lf85r"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "1g538a6qay31bk7w918rb2m5davxhvv69rhk1s7yizmsnh4ib5j1"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "0gjlk1ra5ihp7ymv4dhar9j3skcb7m55zjd1x734z5qxchvwzf2h"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "04lfhpy7k77vplwa2mpmynrwrw6m3k8qk7cb35xb7bdi6x736r6q"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0p3j3xip46dnr04zrdb9s0nf6hx32k1p00xiawra79k9jwm49m9g"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "0jhy162fx1iy75iph5l03yvj04j3jhjlbfslvra4c4xkmy1dc6x9"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "0aljg6nmz03d1wzyqdb2xhfbbrm93c91kqxj6y1f9zl7sx1ih9h7"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "1bq4bcc5p1b37b5ygbi4zzy3w4n10w7n36ghd08f24mqilsa1cq9"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0d14ppfhxd235qapgnfzxg28i9l1sz2rpx6rskc92znf86vr8r7h"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "0ghc0shad29864mx76g81q04r5wvk2kghlm3x9d59wj0z0afdc9h"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "19gqgvy18m8rwmgyc4pmdgzdrg8kxjqdhrn8d5gv0jx37yfk6mv8"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "1s2zq4lhs9wallnzwq60kd0f6pyp0rlasqhrdrias2yw4jcvyxb1"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "15kcczvqq7k3rw7l2hddhy8w0s4xyzars9fi01w7saj9fqzak043"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "17li6mdg3nbx67riypfz7s71nkp2gph5myalav3n3v1pnl2ddhiq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.1"; sha256 = "0xj7chxs3vcbas6sw1hydpvdri7snwvqc2vi06ll1jsy5nsp1z3r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.1"; sha256 = "04r740hqz53an4mww7w138qv14v1c0665829lf23zipqrrhj0am3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.1"; sha256 = "0hlw4d555j1gmc1gmpnqqwmmxm1p3dw5nr6z9wakmr8wbhlij9hp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.1"; sha256 = "0bavrg11l8pkvbxp5z3scvdi2knnpi2jhx2z2z00162kyvwsnbm6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.1"; sha256 = "1zbzc6xnbky56qc0sjdc6k4cmn764xnq2cnpxx85anxq7l4brf00"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.1"; sha256 = "189zljg2czvs4jaqfascm143j7mmpfvp19kr1m9z7nl55fa04mm3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.1"; sha256 = "0xpb9asinhck23y9lnpkk3iqj4j12v1fsp4m4j5dfc26ncnq86mb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.1"; sha256 = "0cqmpf8h8vwxzhfw5fg27xbs630dallss1pz1993bn41nq6f7ydj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.1"; sha256 = "10jqwp8fqy6mr4hx4vsn0zvb7rbgh800zh1csa6fq2hyk783vmii"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.1"; sha256 = "1h0l6b79878ixr96yr9gpinjn65l86kr15jrl58dl8dzq5dgkiqi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.1"; sha256 = "01x9aj4010n9j0lspsczzqirbp1yydqffcswxwgrfrqg1yjhp687"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.1"; sha256 = "1w3hrd6c6662972sx8swhw66b1j2rgmdxva221n8c3bl64y9yrcp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.1"; sha256 = "0vqi937b3qzcj68cz6r9pd9ad13qkbhwdfapj1s55glwkb0a2rwn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.1"; sha256 = "02h3186ysfgqr9mrg8yznic27s82k43va4dx1bfy6rjkq8s2qa5n"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "08cw0dgskfvb27y29d4vgmz4z3yp8fkla12h31py5d499443yaa6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "062kb0cw912l8z1aymsw9sv5v9lcn1j5ynqi8p6jbm4qz4m5kmfg"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "0j8i1gymlyr2zg28zml0pgg0ziv35wsvhiixjqy40bg1w77p14wy"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "08cx11n5m9iv6nashba76m0xz28sh0mc74vbak2xnskhmkapv42f"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.1"; sha256 = "0c4y89pjw5gdla0lnl95xxj3gz5jhxnh96h31f6c1b754f7fcjiq"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.1"; sha256 = "015l0vin9fwfxyqaws8b7ikbdj949gdrpgb01sxb6zk830y27n60"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.1"; sha256 = "1v04f0g159x7di9na4ydkljwijz7ly4v1ws3n5h6m0yf5r5plv5x"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.1"; sha256 = "0v61px8250kzbd2dsl823m32g68j96ga3br1001x237w09qmpwjc"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.1"; sha256 = "0f572aariwr3mncgyhf015l3a3rj98j0xwlama9mvhaqjvj9pahg"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.1"; sha256 = "0bb22j0mld6f85056rnfb2wy3js4hq1f6lcxgfckb3lcpdv3hbny"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.1"; sha256 = "1gjbvjx6kf84gmwakazkz8r7sg61ls7n6lqkh4ny8py45nacr85v"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.1"; sha256 = "0sg4cjj235jwpj8kk85178qnx869xrw69abda9gfczkyzzfyww2i"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.1"; sha256 = "1caj3ipvszwz2xbfh8hmcp03b0swq2haiplvch5z1a986gp336g0"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.1"; sha256 = "08z02n5632qd7jhk3w5pwyp2lgaj0w7ch966vddqn7b11mzhrspy"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.1"; sha256 = "0s8ky64iwn1pcj3pb0myw0m9d07grxcy4f47aj7baplgq6l14z89"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.2"; sha256 = "1yzxfrn3sikcl5xv7l69yly00xs483q5vr5wgp08vrlzgcgyb2rr"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.2"; sha256 = "07m4dxmgl7fcid7crkb51qsrizw66ax0l1zzq1gan7pbyny9gip7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.2"; sha256 = "0vgi12pg0xl0abmzmw0mb29030djg5bk9lqxs1sm6m4sk7137l93"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.2"; sha256 = "1wapqdaw5k9aqzfdhs4y0avrinfcya2y301qbdr92i3p11i7hccf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.2"; sha256 = "1bfs9vgl46zzb59lja3a2phqshspxc9dw4ldc1vqm255isjwyq3c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.2"; sha256 = "17bpwdpw6b5v1fqiih1c8jb8cklw7wvlfnsw6zy0ac6z67dylyin"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.2"; sha256 = "14mmkyg8pi1i7k2i0zqfqvkn5al2k39n6sv2rc6961y7436a7vmd"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.2"; sha256 = "0j4jzc99az94drwgfzf672hjm8ia1hq7dzhq7i0c8ny4xzdqidwq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.2"; sha256 = "1ngxdxn3x54pf97vzrn8f89nr16yrzdbl92mp07jmr1z3k5sdb0k"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.2"; sha256 = "1lgxj2x6gcyn1c67h8231w1xx4a9alldp0nfkw97298453gnzqg0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.2"; sha256 = "0162avkqlg4am99jh7a98bv8r4mr3c5r5yrxng8wgyf6n6k7ymy9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.2"; sha256 = "0lns56ppla5xgvval5m84j41yaynbzqfvivfqxw88haxay33nlb9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.2"; sha256 = "0al7s0nscy1941wpvmc2lnrrknpiai6s4p2w2hy75kay4ipcbg97"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.2"; sha256 = "1y8wm5jl5ly30ccfff5kjhnmlyacpk0ykipphvgb6whd8fnck8ph"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.2"; sha256 = "0sjhr5rkk1jv3i9ddgf9k5lk9pclkn0gs961xn2bvjcslm99ns2p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.2"; sha256 = "0jdh1hrwvdq5llma5p1ammhrwgw8y7iw2qqy5rpkmn4jp08lg2k0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.2"; sha256 = "1f5qlp1m9mjs6c72a2kdc1f2hq0spwqxhcdyf8wpb6bg4bb80p20"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.2"; sha256 = "0sfgwgvikpvf1zbzdqmbvi830ri28xgag39x658qk46yp1a13405"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.2"; sha256 = "17nmc7jymlsxmrdh7jvwmcn9cpfzs04yzcwgigq5bvqiqj809px4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.2"; sha256 = "1z0g31wr1rwf09v1pyrd2vjdxri0h2f1w9m69pwkx0n255584b4w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.2"; sha256 = "1b82hk8s3z380vkyzi8w4n3hznjp3x8dh7hrdwyqyb5v7l8lipw5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.2"; sha256 = "10raq3bpnsy9jsni5bb96zkmx4i1l72h2gzv8jvw9basygqqvk8x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.2"; sha256 = "0liiy8m17bcn5gydpzbnxl79g2mfpsq2d2c67l0hwqqn5w1zv2a4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.2"; sha256 = "0lpwyxhxi1ir52lg31kynzldk5pk6qxawy22izdwlw7fhmwkm0sf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.2"; sha256 = "0cbwhjiwj0lhn6chqz3msymlsqhlpmvdwbhd9r499mfjj0isrpq4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.2"; sha256 = "1iijrsbib1ipihm01dinpd8kklckravn5i40b8whynbpcqi8avhx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.2"; sha256 = "0z1lrxnzbjq18fzy1h77rbyfv2amwzwvfzibdaqv0r9xgrzspvdj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.2"; sha256 = "09agcf1z06z816y40lv0n7mq7njjc48i5dr1xsdiwk587kljp71v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.2"; sha256 = "0h6sbb8iand170cdrr5y6a4kmlhd7s21h1jz8c1idjp7p3i2i8x1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.2"; sha256 = "10ddf1b2m8p16hfz16073w1dzlacx9v1mk62vgnbyyv20g4a4gs1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.2"; sha256 = "0z1yjx7s19m52cliy4f7mwi0y4knba2qadg1qma0d90l7i0wc3v3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.2"; sha256 = "1lf4vkn635xilfzz183yn9byyjfxhdgvchngm34j6jj4pi70d0k2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.2"; sha256 = "1j5wmnxanzkngxz9klaf6bd2chc3fk8z6j6sksmrkd46ykrpbxc4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0ay93vi625b7f4rmg6ff9qjhjy0zjvv906ygmg9irghn97qqy283"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1jnxlw78wqdgcq645aai02vxmgghb0dxhkp33c9qpm5c264vlznl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "07bl45jhg07bfx0f5n755h9wcg3b1igjahy3c45j5d9m5c8avh64"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1b40nzkjgv30v15n9dmgph976i883vpi85djmibvrlk7mah66j5k"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0ig879a4yl5n1xh0i0s7cikf2zkrx1wzb0amqv5ml4pk0ryik4sd"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "04mpy53rw19677ba57l77vk26xmfp5vdgqniqwpqga236sahl3v7"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "081csjhs37m6qspm7mrc3sj7jsn685y1xjkc4wxbypdvqsn43smi"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "139r2lsi1yx5g7d3g62kch1vfyxgfwbyr4gps1q0w4fi0s26qaai"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0rkpicqfbvd1c6l32kzvimw5i4fff8pachazvfqdqp2w98qik4g2"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1x73cdb6as4vh4hldql1p5cys94x8lxgmyygb1bj82l1brgqlqzr"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "1cl8ppl19gb442a00g2bf6szbn70wlr465a98q6xg5h5b92a4z1y"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1lch9mwj3jw8zfaz93pg6j3mviw28bm3ll9z3bdv0spkp1d2gy0p"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "1f3jxldxcy3zjc8ya6lcz68ki8ih5q60vkcv8p9v9qbjbcf3x2qg"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "0kqhpf54jv80in1ypygl3mmdbf1miypn7bdp4d26wrq7anfhr1id"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "1r0hq5w5kn1vr3br7ayg60rf17cxa8jmllmj9cc8rqndpjj04qv1"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "0y5jxxr967xx54wvrrxix9c4i49lx9jlj2dr1y76hywl5rib9xff"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0xxkdjdssvxwnmfkdrn4qpb1y9yfwdrzzm6xwdhj8gcfjbyxv8l8"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "0cl0xinjkk6qjcff015rjarni4z71q1d56d9y7jnp7z9sxbqcpmx"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "15sr4ispkd1zbbp4xz08vpb24p5pbc2avgn7mk502g9y2a87xszq"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1iga8qsq38q182p9awjvgf7301f0y0sbzkx2mvgrp3ppy7rz1jvi"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "01kixadmk3zji3cmqimdg9zzaz2jyfkz8dfd5ll78mdl3qcl341z"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1rvnsiiygy1z01qgl64id93j2nhgi20bc4iwqaaqhzwdgh2600mw"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0ywkdjisj0dsi9f2wyx8faly6zjwhgnzgxvbblfg01saxkqanfrg"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "0wg2vsp7hs2rqh48q2qkb83a4ga5z6awadyn1zkvmxdzrxyk9kry"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "14vq3sndmmfk3x5pfl3q9pcrv2865xpsbmc5i017qah3x1x74i7l"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1i3awdr5dp3jcqkhjkipqy13qdbpgi98cncb9m3jfnnsc36mb732"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "160qg0ar7ja7s3vbh5za28an5xabqdgh7gnnv48baswxm4bls8ds"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1iv0fy0hg62l0r9696f18m9k1fi9qm9pvabq3ahn1nksqmdqjbp8"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0nrnyb6bpqb48rd2pymm0b20rwxpy2yja8ch0l1gzsw0d28ma5c6"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1ys6rfj02vf9jspl7kmyif593kn6mmkyhdncvwpp2fbiip8vxgc4"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0sn7h66y8jxcd17fpfzcysyyic2bgf3jw2ljlgr8v3ags726kn0w"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1hzfjrrav3pxvx0jryyj6kli7q22w2q5zaix6ij4nml7g3d0ygzr"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "1qwnlz65s9jpl0gr5avfc1krvy9m6d9iprjb4hr8v38gj17q4xxy"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1n4fjjrb2yc7d11p8l7z9x09xx2421diiv2i78wygmkz0czdlw48"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0yl9yn4i1lhf76yl92izxzi6x9s6srdbwdh4kcwnwxcszf201gkk"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "09387pgs6qvfs71ll648lyyj7i6wrc98sgh77rr2nhmaw2b3gaq5"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "1jngriv8cfn05njhc97h16048z35686526a3p0iim1xi1zqga5vj"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "1hlqn3qdjcjnfwp40hlnjb747pic0lhwc6xvcnly1a9zgk387sg8"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "1jbaqhrqpm696d40swrjj9l19q47rmixzfzbxwm4xgjf2pnrjarc"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "0ar8bydq0arfa0ky6xwfqnjvdn86rfkw7v7v9ga2x51h3n60i149"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0dj6f5fph9m4ym1jcg21v101qj4spzb0qwq0wn79sgd54jia1mfl"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "0iwdwxqy08j7arbfjjj5bx3x4w0fdwhzmwbzidkhgzvqq634n7d0"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0j29f9bfa6hxqs32xy58kwbmqqnbz4b29w2l82ip9w9s8yvjvci3"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1gql9hl2li508sndlvf7hgi0bf74qghbyzyilw6xad88gnvr04vf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.2"; sha256 = "0j9x85vd9lar3mkdxknas1fsvnbxr2713p88qdf6p5zvv2fc2jlw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.2"; sha256 = "1bc3kf8yp6hpmp6layigxz2yzfgdclwgjx621lgg4qiq4xs3sddn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.2"; sha256 = "17kz2565nr7c4737pi3p4kfr1qxrq6gzr3mg3mbm2ky75a2mh016"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.2"; sha256 = "16pvajh1x6pvqrlq1lbzdhin4r5a4ws77zgvf3bp11a85kv7dj1w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.2"; sha256 = "0pmzq9z9d0fflk3zjakc1jjxw66n3wnswm224i0hah02vza2xyia"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.2"; sha256 = "1962bjgwn15p3fh8c1797mhz01bz024mn81dy3dmym755m1mx7c5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.2"; sha256 = "0lxr8agz52wkdm2jd3lz1fkiwqbfkr8rvaxmp65sfzbzs8zmj3dl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.2"; sha256 = "0rcq6fxq8z5xc5nmm2l7zal6c9fqj3vva29b0hwnp8ijk6s2srya"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.2"; sha256 = "1fl418xx0nf5vr6pi3wx257aixiblw70lpsafvjc9f10saihshdj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.2"; sha256 = "1n2b3lpnzc83wyf9pb5cp54hsk0shhww6kh9jd9gw9g89j8la9x7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.2"; sha256 = "0raacw2a86d00q0ky8802c4nhgvik4dls7073dd1mjpmkdc9k8ki"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.2"; sha256 = "14x7cl7dxdy689rkg296rncmzqdv1wsz6axnlf76ywfix5aakh89"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.2"; sha256 = "106n3vwyr2cbgx5a27xy13zp6j943jmmzb0dyj2w3kjmwzdgbjqd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.2"; sha256 = "00y48dbl81d08bcgmy0xfnnr9rp9qnq3w6cad3n151nszz7m3i3f"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "1kl99n29m17ab5vg7k14d9ivsaqpwalbqdxchcfsqxnghby84cia"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "02fbrm2d1000s2ql17c0lcdqv0bacnvgx0kq401yqyirlh5ls0n0"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0bld37hmv1jnxg3w3lkigpk3iy0s1yxryfdd9l4q8my0bpxbdi11"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "055vc0vkbvllqq945py1av0qqcp7a7wvgd6qhazv9d5kyx6hg7dq"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.2"; sha256 = "0wppab4l04l23vizk235wvz5niqhv06v929zdr9gi3zg12ajcw8w"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.2"; sha256 = "0y0rr56sm2ij1mrkq9s5j55w49lh4blxg3s5wwxpb5sxrlwl9ygy"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.2"; sha256 = "0w3hx2bla0pj5g0kjjlhwr65r93fppyb2cl1prr43aq560a766gq"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.2"; sha256 = "1kd4mjd2wygsmlrgy2syvlrf17nd6y5w2bqq42pj4d1xa8i3p7rq"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "1a3hywbyc4hd37pr5cyggxhgr1g69yrphwsyi0h0ylypz7njd721"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "1dalxbgxzc45qj2l7xmhnkzm3jfv4lmbvcd8rvhsm6xh2xq1qhnk"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "019zv2jsw9l440s7c6ybb2jaabkv4l1499vzbks3k55gb7985amz"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "0qmkv3dfrqw8j13cwy3ky3bd5jbs781p4x4m0y2sw6rmfccv7xn0"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "0lmncf55nigri5ivfrlzilx0x6m39pg62nld42zwv3bsncmnfjm3"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "1s14lx6qpfah60rpzxjpinlab98j5kvl8nrmi7g3hjzigf3iflm1"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.2"; sha256 = "1pa8j2n09y062grblkq3ihy22gl71b91pff6ad0d8v7q5821ax2z"; }) ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/eli/default.nix b/third_party/nixpkgs/pkgs/development/compilers/eli/default.nix index 869d7fdeed..9931e45c9b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/eli/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/eli/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { construction with extensive libraries implementing common tasks, yet handling arbitrary special cases. Output is the C subset of C++. ''; - homepage = "http://eli-project.sourceforge.net/"; + homepage = "https://eli-project.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ timokau ]; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix b/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix index 3daaccd7e0..02b1f6f03b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler , jre, binaryen , llvmPackages -, symlinkJoin, makeWrapper, substituteAll +, symlinkJoin, makeWrapper, substituteAll, fetchpatch , buildNpmPackage , emscripten }: @@ -44,6 +44,16 @@ stdenv.mkDerivation rec { src = ./0001-emulate-clang-sysroot-include-logic.patch; resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/"; }) + # https://github.com/emscripten-core/emscripten/pull/18219 + (fetchpatch { + url = "https://github.com/emscripten-core/emscripten/commit/afbc14950f021513c59cbeaced8807ef8253530a.patch"; + sha256 = "sha256-+gJNTQJng9rWcGN3GAcMBB0YopKPnRp/r8CN9RSTClU="; + }) + # https://github.com/emscripten-core/emscripten/pull/18220 + (fetchpatch { + url = "https://github.com/emscripten-core/emscripten/commit/852982318f9fb692ba1dd1173f62e1eb21ae61ca.patch"; + sha256 = "sha256-hmIOtpRx3PD3sDAahUcreSydydqcdSqArYvyLGgUgd8="; + }) ]; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/flasm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/flasm/default.nix index 02ee366423..c1d2cfedc9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flasm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flasm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Assembler and disassembler for Flash (SWF) bytecode"; - homepage = "http://flasm.sourceforge.net/"; + homepage = "https://flasm.sourceforge.net/"; license = licenses.bsd2; maintainers = with maintainers; [ siraben ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix b/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix index 8ee5da4078..531107ddd4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/flutter/flutter.nix @@ -85,7 +85,7 @@ let ''; doInstallCheck = true; - installCheckInputs = [ which ]; + nativeInstallCheckInputs = [ which ]; installCheckPhase = '' runHook preInstallCheck diff --git a/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix b/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix index e38f416b26..d084889dca 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeScript, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }: +{ lib, stdenv, writeScript, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles, removeReferencesTo }: stdenv.mkDerivation rec { pname = "fstar"; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles + removeReferencesTo ] ++ (with ocamlPackages; [ ocaml findlib @@ -55,6 +56,10 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/fstarlib ''; postInstall = '' + # Remove build artifacts + find $out -name _build -type d | xargs -I{} rm -rf "{}" + remove-references-to -t '${ocamlPackages.ocaml}' $out/bin/fstar.exe + wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" installShellCompletion --bash .completion/bash/fstar.exe.bash installShellCompletion --fish .completion/fish/fstar.exe.fish diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix index b2c2ac9875..76374201f4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix @@ -13,7 +13,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -51,8 +51,14 @@ let majorVersion = "10"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = [ ] - ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + patches = [ + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied @@ -202,7 +208,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib @@ -222,6 +228,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch new file mode 100644 index 0000000000..787862fbcf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch @@ -0,0 +1,20 @@ +--- a/gcc/config/avr/avr.c 2022-10-08 19:18:33.000000000 +0200 ++++ b/gcc/config/avr/avr.patched.c 2022-10-08 19:19:34.000000000 +0200 +@@ -10196,7 +10196,7 @@ + to track need of __do_copy_data. */ + + static void +-avr_output_data_section_asm_op (const void *data) ++avr_output_data_section_asm_op (const char *data) + { + avr_need_copy_data_p = true; + +@@ -10209,7 +10209,7 @@ + to track need of __do_clear_bss. */ + + static void +-avr_output_bss_section_asm_op (const void *data) ++avr_output_bss_section_asm_op (const char *data) + { + avr_need_clear_bss_p = true; + diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix index 0724eedc29..1d3dff7c6f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix @@ -13,7 +13,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -51,8 +51,14 @@ let majorVersion = "11"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = - optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + patches = [ + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied @@ -72,6 +78,8 @@ let majorVersion = "11"; sha256 = "sha256-LFAXUEoYD7YeCG8V9mWanygyQOI7U5OhCRIKOVCCDAg="; }) ] + # https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808 + ++ optional (stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch # Obtain latest patch with ../update-mcfgthread-patches.sh ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch; @@ -206,7 +214,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib @@ -226,6 +234,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix index 4287e4d67d..3fe6620987 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix @@ -13,7 +13,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , libucontext ? null @@ -250,7 +250,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib @@ -270,6 +270,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix index e0c30f35a1..810706ed0f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix @@ -12,7 +12,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkg-config ? null @@ -207,7 +207,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl cloog enableLTO @@ -227,6 +227,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix index d886cc84ec..e25af867e5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix @@ -12,7 +12,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkg-config ? null @@ -227,7 +227,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl cloog enableLTO @@ -247,6 +247,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index f82070153b..450b233103 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix @@ -14,7 +14,7 @@ , texinfo ? null , flex , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , gnatboot ? null @@ -64,6 +64,13 @@ let majorVersion = "6"; patches = optionals (!stdenv.targetPlatform.isRedox) [ ../use-source-date-epoch.patch ./0001-Fix-build-for-glibc-2.31.patch + + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langAda ../gnat-cflags.patch @@ -238,7 +245,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib @@ -258,6 +265,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix index 076eec21a1..a0465e8bdd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix @@ -11,7 +11,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , enableMultilib ? false @@ -56,6 +56,13 @@ let majorVersion = "7"; ./gcc8-asan-glibc-2.34.patch ./0001-Fix-build-for-glibc-2.31.patch + + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optionals targetPlatform.isNetBSD [ @@ -206,7 +213,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib @@ -226,6 +233,7 @@ stdenv.mkDerivation ({ ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix index 18054c8c19..03fb9fb120 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix @@ -11,7 +11,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , enableMultilib ? false @@ -46,8 +46,14 @@ let majorVersion = "8"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = - optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + patches = [ + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied @@ -188,7 +194,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib @@ -206,6 +212,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix index 7cdde48667..317c77ea83 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix @@ -13,7 +13,7 @@ , enableLTO ? !stdenv.hostPlatform.isStatic , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which, patchelf +, gmp, mpfr, libmpc, gettext, which, patchelf, binutils , isl ? null # optional, for the Graphite optimization framework. , zlib ? null , gnatboot ? null @@ -55,9 +55,14 @@ let majorVersion = "9"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = - [ ] - ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + patches = [ + # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 + (fetchurl { + name = "fix-bug-80431.patch"; + url = "https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=de31f5445b12fd9ab9969dc536d821fe6f0edad0"; + sha256 = "0sd52c898msqg7m316zp0ryyj7l326cjcn2y19dcxqp15r74qj0g"; + }) + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional targetPlatform.isNetBSD ../libstdc++-netbsd-ctypes.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv-gcc9.patch @@ -201,7 +206,7 @@ stdenv.mkDerivation ({ crossStageStatic libcCross threadsCross version - gmp mpfr libmpc isl + binutils gmp mpfr libmpc isl enableLTO enableMultilib @@ -221,6 +226,7 @@ stdenv.mkDerivation ({ }; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; + targetPlatformConfig = targetPlatform.config; buildFlags = optional (targetPlatform == hostPlatform && hostPlatform == buildPlatform) diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh b/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh index 113bd83ea5..dd5a8de76e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh @@ -203,6 +203,17 @@ preInstall() { ln -s lib "$out/${targetConfig}/lib32" ln -s lib "${!outputLib}/${targetConfig}/lib32" fi + + # cc-wrappers uses --sysroot=/nix/store/does/not/exist as a way to + # drop default sysheaders search path. Unfortunately that switches + # clang++ into searching libraries in gcc in cross-compiler paths: + # from ${!outputLib}/lib (native) + # to ${!outputLib}/${targetPlatformConfig}/lib + # We create the symlink to make both native and cross paths + # available even if the toolchain is not the cross-compiler. + if [ ! -e ${!outputLib}/${targetPlatformConfig} ] ; then + ln -s . ${!outputLib}/${targetPlatformConfig} + fi } @@ -240,25 +251,6 @@ postInstall() { # More dependencies with the previous gcc or some libs (gccbug stores the build command line) rm -rf $out/bin/gccbug - if [[ buildConfig == *"linux"* ]]; then - # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out - for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); do - PREV_RPATH=`patchelf --print-rpath "$i"` - NEW_RPATH=`echo "$PREV_RPATH" | sed 's,:[^:]*bootstrap-tools/lib,,g'` - patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK - done - fi - - if [[ targetConfig == *"linux"* ]]; then - # For some reason, when building for linux on darwin, the libs retain - # RPATH to $out. - for i in "$lib"/"$targetConfig"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do - PREV_RPATH=`patchelf --print-rpath "$i"` - NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"` - patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK - done - fi - if type "install_name_tool"; then for i in "${!outputLib}"/lib/*.*.dylib "${!outputLib}"/lib/*.so.[0-9]; do install_name_tool -id "$i" "$i" || true diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix index 8e444d54bf..25e5914844 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -5,7 +5,7 @@ , threadsCross , version -, gmp, mpfr, libmpc, isl +, binutils, gmp, mpfr, libmpc, isl , cloog ? null , enableLTO @@ -51,7 +51,7 @@ let crossConfigureFlags = # Ensure that -print-prog-name is able to find the correct programs. [ - "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" + "--with-as=${if targetPackages.stdenv.cc.bintools.isLLVM then binutils else targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as" "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++ (if crossStageStatic then [ @@ -94,10 +94,6 @@ let # libsanitizer requires netrom/netrom.h which is not # available in uclibc. "--disable-libsanitizer" - ] ++ lib.optionals (targetPlatform.libc == "uclibc") [ - # In uclibc cases, libgomp needs an additional '-ldl' - # and as I don't know how to pass it, I disable libgomp. - "--disable-libgomp" ] ++ lib.optional (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") "--with-newlib" ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" ); @@ -123,7 +119,7 @@ let # or ${with_sysroot}${native_system_header_dir} # While native build (build == host == target) uses passed headers # path as is: - # ${native_system_header_dir} + # ${with_build_sysroot}${native_system_header_dir} # # Nixpkgs uses flat directory structure for both native and cross # cases. As a result libc headers don't get found for cross case diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix index 4cd22a358e..57e0db560a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4-binary.nix @@ -263,20 +263,6 @@ stdenv.mkDerivation rec { lib.optionalString stdenv.isLinux '' find . -type f -executable -exec patchelf \ --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; - '' + - # The hadrian install Makefile uses 'xxx' as a temporary placeholder in path - # substitution. Which can break the build if the store path / prefix happens - # to contain this string. This will be fixed with 9.2.3 bindists. - # https://gitlab.haskell.org/ghc/ghc/-/issues/21402 - '' - # Detect hadrian Makefile by checking for the target that has the problem - if grep '^update_package_db' ghc-${version}*/Makefile > /dev/null; then - echo Hadrian bindist, applying workaround for xxx path substitution. - # based on https://gitlab.haskell.org/ghc/ghc/-/commit/dd5fecb0e2990b192d92f4dfd7519ecb33164fad.patch - substituteInPlace ghc-${version}*/Makefile --replace 'xxx' '\0xxx\0' - else - echo Not a hadrian bindist, not applying xxx path workaround. - fi ''; # fix for `configure: error: Your linker is affected by binutils #16177` diff --git a/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix b/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix index 388059f2fc..0df621fdb6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go-jsonnet/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-FgQYnas0qkIedRAA8ApZXLzEylg6PS6+8zzl7j+yOeI="; }; - vendorSha256 = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI="; + vendorHash = "sha256-j1fTOUpLx34TgzW94A/BctLrg9XoTtb3cBizhVJoEEI="; patches = [ # See https://github.com/google/go-jsonnet/issues/653. diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix index b6f0c371cb..3c089f0292 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix @@ -17,7 +17,8 @@ }: let - goBootstrap = buildPackages.callPackage ./bootstrap116.nix { }; + useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap116.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo118Module; }; @@ -113,7 +114,7 @@ stdenv.mkDerivation rec { GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix index 28cced9451..84a6059581 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix @@ -17,7 +17,8 @@ }: let - goBootstrap = buildPackages.callPackage ./bootstrap116.nix { }; + useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap116.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo119Module; }; @@ -45,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.19.4"; + version = "1.19.5"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-7adNtKxJSACj5m7nhOSVv7ubjlNd+SSosBsagCi382g="; + sha256 = "sha256-jkhujoWigfxc4/C+3FudLb9idtfbCyXT7ANPMT2gN18="; }; strictDeps = true; @@ -113,7 +114,7 @@ stdenv.mkDerivation rec { GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix index 009ecb8bf4..a8c441813f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.20.nix @@ -17,7 +17,8 @@ }: let - goBootstrap = buildPackages.callPackage ./bootstrap117.nix { }; + useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap117.nix { }; skopeoTest = skopeo.override { buildGoModule = buildGo120Module; }; @@ -45,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.20rc3"; + version = "1.20"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-iMSJjeo/vu1Mi/CXZCXyxx27EdodN7U3TdR2JjKOMYs="; + sha256 = "sha256-Oin/BCG+r2MpKSuKRjEcn78GyAAHfO3e9ft/jVsazjM="; }; strictDeps = true; @@ -113,7 +114,7 @@ stdenv.mkDerivation rec { GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; - GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/update.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/update.nix index 05963150ea..8bb31c792d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/update.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/update.nix @@ -67,6 +67,7 @@ let "ruby-installable-svm" = ".jar"; "wasm-installable-svm" = ".jar"; "python-installable-svm" = ".jar"; + "js-installable-svm" = ".jar"; }.${productName}; # getProductSuffix :: String -> String @@ -77,6 +78,7 @@ let "ruby-installable-svm" = "https://github.com/oracle/truffleruby/releases/download"; "wasm-installable-svm" = "https://github.com/graalvm/graalvm-ce-builds/releases/download"; "python-installable-svm" = "https://github.com/graalvm/graalpython/releases/download"; + "js-installable-svm" = "https://github.com/oracle/graaljs/releases/download"; }.${productName}; # getDevUrl :: String diff --git a/third_party/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix b/third_party/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix index 38f29cb320..b998266487 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gwt/2.4.0.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://www.gwtproject.org/"; + homepage = "https://www.gwtproject.org/"; description = "A development toolkit for building and optimizing complex browser-based applications"; license = lib.licenses.asl20; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix b/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix index 7f413877a5..2760eb268c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/idris2/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { buildFlags = [ "bootstrap" "SCHEME=scheme" ]; checkTarget = "test"; - checkInputs = [ gambit nodejs ]; # racket ]; + nativeCheckInputs = [ gambit nodejs ]; # racket ]; checkFlags = [ "INTERACTIVE=" ]; # TODO: Move this into its own derivation, such that this can be changed diff --git a/third_party/nixpkgs/pkgs/development/compilers/inklecate/default.nix b/third_party/nixpkgs/pkgs/development/compilers/inklecate/default.nix index 58ec15b682..ac32e29549 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/inklecate/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/inklecate/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "inklecate"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "inkle"; repo = "ink"; rev = "v${version}"; - sha256 = "00lagmwsbxap5mgnw4gndpavmv3xsgincdaq1zvw7fkc3vn3pxqc"; + hash = "sha512-aUjjT5Qf64wrKRn1vkwJadMOBWMkvsXUjtZ7S3/ZWAh1CCDkQNO84mSbtbVc9ny0fKeJEqaDX2tJNwq7pYqAbA=="; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; @@ -24,8 +24,8 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; executables = [ "inklecate" ]; - dotnet-runtime = dotnetCorePackages.runtime_3_1; - dotnet-sdk = dotnetCorePackages.sdk_3_1; + dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-runtime = dotnetCorePackages.runtime_6_0; meta = with lib; { description = "Compiler for ink, inkle's scripting language"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/inklecate/deps.nix b/third_party/nixpkgs/pkgs/development/compilers/inklecate/deps.nix index e873809a45..f3a17967e2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/inklecate/deps.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/inklecate/deps.nix @@ -2,45 +2,4 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) ] diff --git a/third_party/nixpkgs/pkgs/development/compilers/intercal/default.nix b/third_party/nixpkgs/pkgs/development/compilers/intercal/default.nix index 54641d45bc..1fde0f320c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/intercal/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/intercal/default.nix @@ -3,7 +3,6 @@ , bison, flex , makeWrapper }: -with lib; stdenv.mkDerivation rec { pname = "intercal"; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ick --suffix PATH ':' ${stdenv.cc}/bin ''; - meta = { + meta = with lib; { description = "The original esoteric programming language"; longDescription = '' INTERCAL, an abbreviation for "Compiler Language With No diff --git a/third_party/nixpkgs/pkgs/development/compilers/jasmin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jasmin/default.nix index c61f267bf1..01f09772a8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jasmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jasmin/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An assembler for the Java Virtual Machine"; - homepage = "http://jasmin.sourceforge.net/"; + homepage = "https://jasmin.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/jasmin/files/latest/download"; license = licenses.bsd3; maintainers = with maintainers; [ fgaz ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix index 2d42d69775..5702ba2a2e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -30,7 +30,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { pname = "jetbrains-jdk-jcef"; javaVersion = "17.0.5"; - build = "653.14"; + build = "653.25"; # To get the new tag: # git clone https://github.com/jetbrains/jetbrainsruntime # cd jetbrainsruntime @@ -43,7 +43,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { owner = "JetBrains"; repo = "JetBrainsRuntime"; rev = "jb${version}"; - hash = "sha256-7Nx7Y12oMfs4zeQMSfnUaDCW1xJYMEkcoTapSpmVCfU="; + hash = "sha256-/3NzluFpzKC8mFQxrKY9WlgBh9asbEE7lrGJy/ZJXRU="; }; BOOT_JDK = openjdk17-bootstrap.home; diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix index 79203ce7e0..cf72457a14 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ninjin raskin ]; + maintainers = with lib.maintainers; [ raskin ]; platforms = [ "x86_64-linux" ]; mainProgram = "julia"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.8-bin.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.8-bin.nix index 198eeb4455..24eac49df9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/1.8-bin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/1.8-bin.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { homepage = "https://julialang.org"; # Bundled and linked with various GPL code, although Julia itself is MIT. license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ ninjin raskin nickcao wegank ]; + maintainers = with lib.maintainers; [ raskin nickcao wegank ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "julia"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/kind2/default.nix b/third_party/nixpkgs/pkgs/development/compilers/kind2/default.nix index 7e84d78e0d..f3ed8a45b8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/kind2/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/kind2/default.nix @@ -1,36 +1,33 @@ { lib , rustPlatform , fetchCrate -, pkg-config -, openssl , stdenv -, Security +, darwin }: rustPlatform.buildRustPackage rec { pname = "kind2"; - version = "0.2.79"; + version = "0.3.7"; src = fetchCrate { inherit pname version; - sha256 = "sha256-QRPk7BpGVvhGHcDxCWJtJp5d3QOq72ESt5VbaSq5jBU="; + sha256 = "sha256-ZG0BbGcjQBqeNTqfy7WweVHK7sUuKeQSsFi9KIsyIE4="; }; - cargoSha256 = "sha256-i7RAJmhUQzjMe9w7z7hPrpiap64L12Shu4DL+e5A6oc="; + cargoSha256 = "sha256-j64L3HNk2r+MH9eDHWT/ARJ9DT4CchcuVxtIYYVsDxo="; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; - - # these tests are flaky - checkFlags = [ - "--skip=test_checker" - "--skip=test_run_hvm" + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Security + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + darwin.apple_sdk_11_0.frameworks.CoreFoundation ]; + # requires nightly features + RUSTC_BOOTSTRAP = true; + meta = with lib; { description = "A functional programming language and proof assistant"; - homepage = "https://github.com/kindelia/kind2"; + homepage = "https://github.com/kindelia/kind"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix index 69a8cb3931..72f4a95911 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix @@ -96,7 +96,7 @@ ocamlPackages.buildDunePackage rec { zarith_stubs_js ]; - checkInputs = [ + nativeCheckInputs = [ cacert ocamlPackages.ca-certs ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/bintools/default.nix index a9d4f5fffc..1eb7215c00 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/bintools/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix index 10db99e899..f4120cb91c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix @@ -31,7 +31,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -110,7 +110,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -147,7 +147,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -157,7 +157,7 @@ let echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) '' + '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' echo "-lunwind" >> $out/nix-support/cc-ldflags '' + lib.optionalString stdenv.targetPlatform.isWasm '' echo "-fno-exceptions" >> $out/nix-support/cc-cflags diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libcxx/default.nix index 0c0f535f74..cc029ea657 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libcxx/default.nix @@ -1,7 +1,11 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic }: +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation { pname = "libcxx"; inherit version; @@ -37,13 +41,13 @@ stdenv.mkDerivation { ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" @@ -60,13 +64,14 @@ stdenv.mkDerivation { abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${libcxxabi}/lib/$abiName $file + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file done done ''; passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libcxxabi/default.nix index d62422fc9a..d59191dfd7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/libcxxabi/default.nix @@ -67,6 +67,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/bintools/default.nix index a9d4f5fffc..1eb7215c00 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/bintools/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix index ae9b81ac1a..c950beef0e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix @@ -33,7 +33,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -125,7 +125,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -162,7 +162,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -172,7 +172,7 @@ let echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) '' + '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' echo "-lunwind" >> $out/nix-support/cc-ldflags '' + lib.optionalString stdenv.targetPlatform.isWasm '' echo "-fno-exceptions" >> $out/nix-support/cc-cflags diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxx/default.nix index 237bbd4e06..3e77e03b12 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxx/default.nix @@ -1,7 +1,11 @@ -{ lib, stdenv, llvm_meta, fetch, fetchpatch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, fetch, fetchpatch, cmake, python3, llvm, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic }: +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation { pname = "libcxx"; inherit version; @@ -42,10 +46,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optionals stdenv.hostPlatform.isWasm [ @@ -76,13 +80,14 @@ stdenv.mkDerivation { abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${libcxxabi}/lib/$abiName $file + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file done done ''; passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxxabi/default.nix index ed0efe28a1..77f7e14118 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxxabi/default.nix @@ -71,6 +71,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools/default.nix index a9d4f5fffc..1eb7215c00 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix index 132a98b9d7..da3beccbe3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix @@ -34,7 +34,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -113,7 +113,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -154,7 +154,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -164,7 +164,7 @@ let echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) '' + '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' echo "-lunwind" >> $out/nix-support/cc-ldflags '' + lib.optionalString stdenv.targetPlatform.isWasm '' echo "-fno-exceptions" >> $out/nix-support/cc-cflags diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix index ef90eedb38..40bff3c116 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxx/default.nix @@ -1,7 +1,11 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, llvm, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, fetch, cmake, python3, llvm, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic }: +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation { pname = "libcxx"; inherit version; @@ -30,10 +34,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optionals stdenv.hostPlatform.isWasm [ @@ -51,13 +55,14 @@ stdenv.mkDerivation { abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${libcxxabi}/lib/$abiName $file + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file done done ''; passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix index 41c559a52e..bab39a5272 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/default.nix @@ -69,6 +69,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/bintools/default.nix index 13223f051b..b6ee7b4dc2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/bintools/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix index e62db1bc2c..3fc459eb7f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix @@ -36,7 +36,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -114,7 +114,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -154,7 +154,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -164,7 +164,7 @@ let echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) '' + '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' echo "-lunwind" >> $out/nix-support/cc-ldflags '' + lib.optionalString stdenv.targetPlatform.isWasm '' echo "-fno-exceptions" >> $out/nix-support/cc-cflags diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix index f6b76901de..b18c9da18f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, llvm_meta, src, cmake, python3, fixDarwinDylibNames, version -, libcxxabi +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic # If headersOnly is true, the resulting package would only include the headers. @@ -10,6 +11,8 @@ , headersOnly ? false }: +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation rec { pname = if headersOnly then "cxx-headers" else "libcxx"; inherit version; @@ -32,9 +35,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = lib.optionals (!headersOnly) [ libcxxabi ]; + buildInputs = lib.optionals (!headersOnly) [ cxxabi ]; - cmakeFlags = [ "-DLIBCXX_CXX_ABI=libcxxabi" ] + cmakeFlags = [ "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optionals stdenv.hostPlatform.isWasm [ @@ -55,7 +58,7 @@ stdenv.mkDerivation rec { abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${libcxxabi}/lib/$abiName $file + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file done done ''; @@ -71,6 +74,7 @@ stdenv.mkDerivation rec { passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix index bced2ccb78..06137ab067 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/default.nix @@ -66,6 +66,10 @@ stdenv.mkDerivation rec { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix index 0cdc79a4a5..32e96212fa 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ ncurses ] ++ [ zlib ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; patches = [ # When cross-compiling we configure llvm-config-native with an approximation diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix index 13223f051b..b6ee7b4dc2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix index 26c0e23942..5d14c2f5f9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix @@ -36,7 +36,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -114,7 +114,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -154,7 +154,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -167,7 +167,7 @@ let ] ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" ++ lib.optional - (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) + (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/default.nix index c623d41f92..3e42a8b1e4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxx/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, llvm_meta , monorepoSrc, runCommand , cmake, python3, fixDarwinDylibNames, version -, libcxxabi +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic # If headersOnly is true, the resulting package would only include the headers. @@ -16,6 +17,8 @@ let basename = "libcxx"; in +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation rec { pname = basename + lib.optionalString headersOnly "-headers"; inherit version; @@ -48,9 +51,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = lib.optionals (!headersOnly) [ libcxxabi ]; + buildInputs = lib.optionals (!headersOnly) [ cxxabi ]; - cmakeFlags = [ "-DLIBCXX_CXX_ABI=libcxxabi" ] + cmakeFlags = [ "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optionals stdenv.hostPlatform.isWasm [ @@ -71,13 +74,14 @@ stdenv.mkDerivation rec { abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${libcxxabi}/lib/$abiName $file + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file done done ''; passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/default.nix index 3be2f964ab..30cc34a8c0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/default.nix @@ -85,6 +85,10 @@ stdenv.mkDerivation rec { ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix index 1134f0a6ab..5437735f78 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; patches = [ ./gnu-install-dirs.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/bintools/default.nix new file mode 100644 index 0000000000..303faf7bbb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/bintools/default.nix @@ -0,0 +1,40 @@ +{ runCommand, stdenv, llvm, lld, version }: + +let + prefix = + if stdenv.hostPlatform != stdenv.targetPlatform + then "${stdenv.targetPlatform.config}-" + else ""; +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' + mkdir -p $out/bin + for prog in ${lld}/bin/*; do + ln -s $prog $out/bin/${prefix}$(basename $prog) + done + for prog in ${llvm}/bin/*; do + ln -sf $prog $out/bin/${prefix}$(basename $prog) + done + + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}dlltool + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-cxxfilt $out/bin/${prefix}c++filt + ln -s ${llvm}/bin/llvm-debuginfod $out/bin/${prefix}debuginfod + ln -s ${llvm}/bin/llvm-debuginfod-find $out/bin/${prefix}debuginfod-find + ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp + ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm + ln -s ${llvm}/bin/llvm-objcopy $out/bin/${prefix}objcopy + ln -s ${llvm}/bin/llvm-objcopy $out/bin/${prefix}strip + ln -s ${llvm}/bin/llvm-objdump $out/bin/${prefix}objdump + ln -s ${llvm}/bin/llvm-rc $out/bin/${prefix}windres + ln -s ${llvm}/bin/llvm-readobj $out/bin/${prefix}readelf + ln -s ${llvm}/bin/llvm-size $out/bin/${prefix}size + ln -s ${llvm}/bin/llvm-strings $out/bin/${prefix}strings + ln -s ${llvm}/bin/llvm-symbolizer $out/bin/${prefix}addr2line + + ln -s ${lld}/bin/lld $out/bin/${prefix}ld +'' diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/clang/default.nix new file mode 100644 index 0000000000..b0671150a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/clang/default.nix @@ -0,0 +1,129 @@ +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, substituteAll, cmake, ninja, libxml2, libllvm, version, python3 +, buildLlvmTools +, fixDarwinDylibNames +, enableManpages ? false +}: + +let + self = stdenv.mkDerivation (rec { + pname = "clang"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/clang-tools-extra "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ cmake ninja python3 ] + ++ lib.optional enableManpages python3.pkgs.sphinx + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + + buildInputs = [ libxml2 libllvm ]; + + cmakeFlags = [ + "-DCLANG_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/clang" + "-DCLANGD_BUILD_XPC=OFF" + "-DLLVM_ENABLE_RTTI=ON" + ] ++ lib.optionals enableManpages [ + "-DCLANG_INCLUDE_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DCLANG_TABLEGEN=${buildLlvmTools.libclang.dev}/bin/clang-tblgen" + ]; + + patches = [ + ./purity.patch + # https://reviews.llvm.org/D51899 + ./gnu-install-dirs.patch + (substituteAll { + src = ../../clang-11-12-LLVMgold-path.patch; + libllvmLibdir = "${libllvm.lib}/lib"; + }) + ]; + + postPatch = '' + (cd tools && ln -s ../../clang-tools-extra extra) + + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ + -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ + lib/Driver/ToolChains/*.cpp + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp + ''; + + outputs = [ "out" "lib" "dev" "python" ]; + + postInstall = '' + ln -sv $out/bin/clang $out/bin/cpp + + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + moveToOutput "lib/libclang-cpp.*" "$lib" + substituteInPlace $dev/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi + mv $out/share/clang/*.py $python/share/clang + rm $out/bin/c-index-test + patchShebangs $python/bin + + mkdir -p $dev/bin + cp bin/clang-tblgen $dev/bin + ''; + + passthru = { + isClang = true; + inherit libllvm; + }; + + meta = llvm_meta // { + homepage = "https://clang.llvm.org/"; + description = "A C language family frontend for LLVM"; + longDescription = '' + The Clang project provides a language front-end and tooling + infrastructure for languages in the C language family (C, C++, Objective + C/C++, OpenCL, CUDA, and RenderScript) for the LLVM project. + It aims to deliver amazingly fast compiles, extremely useful error and + warning messages and to provide a platform for building great source + level tools. The Clang Static Analyzer and clang-tidy are tools that + automatically find bugs in your code, and are great examples of the sort + of tools that can be built using the Clang frontend as a library to + parse C/C++ code. + ''; + mainProgram = "clang"; + }; + } // lib.optionalAttrs enableManpages { + pname = "clang-manpages"; + + ninjaFlags = [ "docs-clang-man" ]; + + installPhase = '' + mkdir -p $out/share/man/man1 + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man page for Clang ${version}"; + }; + }); +in self diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/clang/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/clang/gnu-install-dirs.patch new file mode 100644 index 0000000000..f767c56836 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/clang/gnu-install-dirs.patch @@ -0,0 +1,105 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c27beec313d7..480f13e73c9f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -78,15 +78,17 @@ if(CLANG_BUILT_STANDALONE) + if (NOT LLVM_CONFIG_FOUND) + # Pull values from LLVMConfig.cmake. We can drop this once the llvm-config + # path is removed. +- set(MAIN_INCLUDE_DIR "${LLVM_INCLUDE_DIR}") ++ set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS}) + set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}") + # N.B. this is just a default value, the CACHE PATHs below can be overriden. + set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm") + set(TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR}") + set(LIBRARY_DIR "${LLVM_LIBRARY_DIR}") ++ else() ++ set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}") + endif() + +- set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include") ++ set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed") + set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree") + set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree") + set(LLVM_TOOLS_BINARY_DIR "${TOOLS_BINARY_DIR}" CACHE PATH "Path to llvm/bin") +@@ -128,7 +130,7 @@ if(CLANG_BUILT_STANDALONE) + set(LLVM_INCLUDE_TESTS ON) + endif() + +- include_directories("${LLVM_BINARY_DIR}/include" "${LLVM_MAIN_INCLUDE_DIR}") ++ include_directories(${LLVM_INCLUDE_DIRS}) + link_directories("${LLVM_LIBRARY_DIR}") + + set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin ) +diff --git a/cmake/modules/AddClang.cmake b/cmake/modules/AddClang.cmake +index 21ac332e4f5f..b16c314bd1e2 100644 +--- a/cmake/modules/AddClang.cmake ++++ b/cmake/modules/AddClang.cmake +@@ -119,8 +119,8 @@ macro(add_clang_library name) + install(TARGETS ${lib} + COMPONENT ${lib} + ${export_to_clangtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + if (NOT LLVM_ENABLE_IDE) +diff --git a/lib/Headers/CMakeLists.txt b/lib/Headers/CMakeLists.txt +index 6e2060991b92..b9bc930d26b8 100644 +--- a/lib/Headers/CMakeLists.txt ++++ b/lib/Headers/CMakeLists.txt +@@ -420,7 +420,7 @@ add_header_target("openmp-resource-headers" ${openmp_wrapper_files}) + add_header_target("windows-resource-headers" ${windows_only_files}) + add_header_target("utility-resource-headers" ${utility_files}) + +-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) ++set(header_install_dir ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include) + + ############################################################# + # Install rules for the catch-all clang-resource-headers target +diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt +index 8d95d0900e8c..ebc70ff7526d 100644 +--- a/tools/libclang/CMakeLists.txt ++++ b/tools/libclang/CMakeLists.txt +@@ -180,7 +180,7 @@ foreach(PythonVersion ${CLANG_PYTHON_BINDINGS_VERSIONS}) + COMPONENT + libclang-python-bindings + DESTINATION +- "lib${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") ++ "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/python${PythonVersion}/site-packages") + endforeach() + if(NOT LLVM_ENABLE_IDE) + add_custom_target(libclang-python-bindings) +diff --git a/tools/scan-build-py/CMakeLists.txt b/tools/scan-build-py/CMakeLists.txt +index 061dc7ef4dd9..adc54b2edc32 100644 +--- a/tools/scan-build-py/CMakeLists.txt ++++ b/tools/scan-build-py/CMakeLists.txt +@@ -88,7 +88,7 @@ foreach(lib ${LibScanbuild}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/${lib}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/${lib}) + install(PROGRAMS lib/libscanbuild/${lib} +- DESTINATION lib/libscanbuild ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild" + COMPONENT scan-build-py) + endforeach() + +@@ -106,7 +106,7 @@ foreach(resource ${LibScanbuildResources}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libscanbuild/resources/${resource}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libscanbuild/resources/${resource}) + install(PROGRAMS lib/libscanbuild/resources/${resource} +- DESTINATION lib/libscanbuild/resources ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libscanbuild/resources" + COMPONENT scan-build-py) + endforeach() + +@@ -122,7 +122,7 @@ foreach(lib ${LibEar}) + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lib/libear/${lib}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/lib/libear/${lib}) + install(PROGRAMS lib/libear/${lib} +- DESTINATION lib/libear ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/libear" + COMPONENT scan-build-py) + endforeach() + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/clang/purity.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/clang/purity.patch new file mode 100644 index 0000000000..1c94f293eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/clang/purity.patch @@ -0,0 +1,29 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -487,13 +487,7 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + } else { + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); + +- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE && +- !Args.hasArg(options::OPT_r)) { +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + +- ToolChain.getDynamicLinker(Args))); +- } + } + + CmdArgs.push_back("-o"); +-- +2.11.0 diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/X86-support-extension.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/X86-support-extension.patch new file mode 100644 index 0000000000..07013e5a68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/X86-support-extension.patch @@ -0,0 +1,21 @@ +diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt +index 3a66dd9c3fb..7efc85d9f9f 100644 +--- a/lib/builtins/CMakeLists.txt ++++ b/lib/builtins/CMakeLists.txt +@@ -348,4 +348,8 @@ if (NOT MSVC) + ++ set(i486_SOURCES ${i386_SOURCES}) ++ set(i586_SOURCES ${i386_SOURCES}) ++ set(i686_SOURCES ${i386_SOURCES}) ++ + if (WIN32) + set(i386_SOURCES + ${i386_SOURCES} +@@ -723,6 +723,7 @@ else () + endif() + + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) ++ message("arch: ${arch}") + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported + if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch new file mode 100644 index 0000000000..ca1c2332ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch @@ -0,0 +1,32 @@ +diff -ur a/cmake/builtin-config-ix.cmake b/cmake/builtin-config-ix.cmake +--- a/cmake/builtin-config-ix.cmake @llvm 15.0.6 ++++ b/cmake/builtin-config-ix.cmake +@@ -46,7 +46,7 @@ + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv8m.main armv8.1m.main) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l armv8m.main armv8.1m.main) + set(AVR avr) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt +--- a/lib/builtins/CMakeLists.txt @llvm 15.0.6 ++++ b/lib/builtins/CMakeLists.txt +@@ -565,6 +565,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -734,7 +735,7 @@ + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em|armv8m.main|armv8.1m.main)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em|armv8m.main|armv8.1m.main)$") + string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") + check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) + if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/darwin-targetconditionals.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/darwin-targetconditionals.patch new file mode 100644 index 0000000000..425dc2af01 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/darwin-targetconditionals.patch @@ -0,0 +1,71 @@ +diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp +--- a/lib/sanitizer_common/sanitizer_mac.cpp ++++ b/lib/sanitizer_common/sanitizer_mac.cpp +@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { + // Offset example: + // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 + constexpr u16 GetOSMajorKernelOffset() { +- if (TARGET_OS_OSX) return 4; +- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; +- if (TARGET_OS_WATCH) return 13; ++#if TARGET_OS_OSX ++ return 4; ++#endif ++#if TARGET_OS_IOS || TARGET_OS_TV ++ return 6; ++#endif ++#if TARGET_OS_WATCH ++ return 13; ++#endif + } + + using VersStr = char[64]; +@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { + u16 os_major = kernel_major - offset; + + const char *format = "%d.0"; +- if (TARGET_OS_OSX) { +- if (os_major >= 16) { // macOS 11+ +- os_major -= 5; +- } else { // macOS 10.15 and below +- format = "10.%d"; +- } ++#if TARGET_OS_OSX ++ if (os_major >= 16) { // macOS 11+ ++ os_major -= 5; ++ } else { // macOS 10.15 and below ++ format = "10.%d"; + } ++#endif + return internal_snprintf(vers, sizeof(VersStr), format, os_major); + } + +@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { + // Aligned versions example: + // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 + static void MapToMacos(u16 *major, u16 *minor) { +- if (TARGET_OS_OSX) +- return; +- +- if (TARGET_OS_IOS || TARGET_OS_TV) ++#if !TARGET_OS_OSX ++#if TARGET_OS_IOS || TARGET_OS_TV + *major += 2; +- else if (TARGET_OS_WATCH) ++#elif TARGET_OS_WATCH + *major += 9; +- else ++#else + UNREACHABLE("unsupported platform"); ++#endif + + if (*major >= 16) { // macOS 11+ + *major -= 5; +@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { + *minor = *major; + *major = 10; + } ++#endif + } + + static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/default.nix new file mode 100644 index 0000000000..722a5bd90c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -0,0 +1,156 @@ +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake, ninja, python3, xcbuild, libllvm, libcxxabi, libxcrypt +, doFakeLibgcc ? stdenv.hostPlatform.isFreeBSD +}: + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + haveLibc = stdenv.cc.libc != null; + inherit (stdenv.hostPlatform) isMusl isGnu; + + baseName = "compiler-rt"; + + src = runCommand "${baseName}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${baseName} "$out" + ''; +in + +stdenv.mkDerivation { + pname = baseName + lib.optionalString (haveLibc) "-libc"; + inherit version; + + inherit src; + sourceRoot = "${src.name}/${baseName}"; + + nativeBuildInputs = [ cmake ninja python3 libllvm.dev ] + ++ lib.optional stdenv.isDarwin xcbuild.xcrun; + buildInputs = lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + + NIX_CFLAGS_COMPILE = [ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ]; + + cmakeFlags = [ + "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" + "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" + "-DCMAKE_ASM_COMPILER_TARGET=${stdenv.hostPlatform.config}" + ] ++ lib.optionals (haveLibc && stdenv.hostPlatform.libc == "glibc") [ + "-DSANITIZER_COMMON_CFLAGS=-I${libxcrypt}/include" + ] ++ lib.optionals (useLLVM || bareMetal || isMusl) [ + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + "-DCOMPILER_RT_BUILD_MEMPROF=OFF" + "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary + ] ++ lib.optionals (useLLVM || bareMetal) [ + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + "-DCOMPILER_RT_BAREMETAL_BUILD=ON" + "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}" + ] ++ lib.optionals (useLLVM && !haveLibc) [ + "-DCMAKE_C_FLAGS=-nodefaultlibs" + ] ++ lib.optionals (useLLVM) [ + "-DCOMPILER_RT_BUILD_BUILTINS=ON" + #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program + "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY" + ] ++ lib.optionals (bareMetal) [ + "-DCOMPILER_RT_OS_DIR=baremetal" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + "-DDARWIN_macosx_OVERRIDE_SDK_VERSION=ON" + "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}" + "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}" + + # `COMPILER_RT_DEFAULT_TARGET_ONLY` does not apply to Darwin: + # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/base-config-ix.cmake#L153 + "-DCOMPILER_RT_ENABLE_IOS=OFF" + ]; + + outputs = [ "out" "dev" ]; + + patches = [ + ./X86-support-extension.patch # Add support for i486 i586 i686 by reusing i386 config + ./gnu-install-dirs.patch + # ld-wrapper dislikes `-rpath-link //nix/store`, so we normalize away the + # extra `/`. + ./normalize-var.patch + # Prevent a compilation error on darwin + ./darwin-targetconditionals.patch + # See: https://github.com/NixOS/nixpkgs/pull/186575 + ../../common/compiler-rt/darwin-plistbuddy-workaround.patch + # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 + ./armv7l.patch + ] + # The `compiler-rt` build inspects `ld` to figure out whether it needs to + # explicitly call `codesign`: + # https://github.com/llvm/llvm-project/blob/27ef42bec80b6c010b7b3729ed0528619521a690/compiler-rt/cmake/Modules/AddCompilerRT.cmake#L409-L422 + # + # In our case, despite (currently) having an `ld` version than 609, we don't + # need an explicit codesigning step because `postLinkSignHook` handles this + # for us. + # + # Unfortunately there isn't an easy way to override + # `NEED_EXPLICIT_ADHOC_CODESIGN`. + # + # Adding `codesign` as a build input also doesn't currently work because, as + # of this writing, `codesign` in nixpkgs doesn't support the `--sign` alias + # which the `compiler-rt` build uses. See here for context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272116014 + # + # So, for now, we patch `compiler-rt` to skip the explicit codesigning step. + ++ lib.optional stdenv.hostPlatform.isDarwin ./skip-explicit-codesign.patch; + + # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks + # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra + # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd + # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by + # a flag and turn the flag off during the stdenv build. + postPatch = lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(ARM64 arm64 arm64e)' 'set(ARM64)' + substituteInPlace cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + '' + lib.optionalString (useLLVM) '' + substituteInPlace lib/builtins/int_util.c \ + --replace "#include " "" + substituteInPlace lib/builtins/clear_cache.c \ + --replace "#include " "" + substituteInPlace lib/builtins/cpu_model.c \ + --replace "#include " "" + ''; + + # Hack around weird upsream RPATH bug + postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + ln -s "$out/lib"/*/* "$out/lib" + '' + lib.optionalString (useLLVM) '' + ln -s $out/lib/*/clang_rt.crtbegin-*.o $out/lib/crtbegin.o + ln -s $out/lib/*/clang_rt.crtend-*.o $out/lib/crtend.o + ln -s $out/lib/*/clang_rt.crtbegin_shared-*.o $out/lib/crtbeginS.o + ln -s $out/lib/*/clang_rt.crtend_shared-*.o $out/lib/crtendS.o + '' + lib.optionalString doFakeLibgcc '' + ln -s $out/lib/freebsd/libclang_rt.builtins-*.a $out/lib/libgcc.a + ''; + + meta = llvm_meta // { + homepage = "https://compiler-rt.llvm.org/"; + description = "Compiler runtime libraries"; + longDescription = '' + The compiler-rt project provides highly tuned implementations of the + low-level code generator support routines like "__fixunsdfdi" and other + calls generated when a target doesn't have a short sequence of native + instructions to implement a core IR operation. It also provides + implementations of run-time libraries for dynamic testing tools such as + AddressSanitizer, ThreadSanitizer, MemorySanitizer, and DataFlowSanitizer. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/gnu-install-dirs.patch new file mode 100644 index 0000000000..f3b1f63a7d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/gnu-install-dirs.patch @@ -0,0 +1,20 @@ +diff --git a/cmake/base-config-ix.cmake b/cmake/base-config-ix.cmake +index 8a6219568b3f..30ee68a47ccf 100644 +--- a/cmake/base-config-ix.cmake ++++ b/cmake/base-config-ix.cmake +@@ -100,13 +100,13 @@ endif() + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" lib) ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + else(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(COMPILER_RT_OUTPUT_LIBRARY_DIR + ${COMPILER_RT_OUTPUT_DIR}/lib/${COMPILER_RT_OS_DIR}) +- extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "lib/${COMPILER_RT_OS_DIR}") ++ extend_path(default_install_path "${COMPILER_RT_INSTALL_PATH}" "${CMAKE_INSTALL_LIBDIR}/${COMPILER_RT_OS_DIR}") + set(COMPILER_RT_INSTALL_LIBRARY_DIR "${default_install_path}" CACHE PATH + "Path where built compiler-rt libraries should be installed.") + endif() diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/normalize-var.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/normalize-var.patch new file mode 100644 index 0000000000..135cf625ef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/normalize-var.patch @@ -0,0 +1,16 @@ +diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +index f1f46fb9599c..6f19e69507ba 100644 +--- a/cmake/Modules/CompilerRTUtils.cmake ++++ b/cmake/Modules/CompilerRTUtils.cmake +@@ -302,8 +302,9 @@ macro(load_llvm_config) + # Get some LLVM variables from LLVMConfig. + include("${LLVM_CMAKE_PATH}/LLVMConfig.cmake") + +- set(LLVM_LIBRARY_OUTPUT_INTDIR +- ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX}) ++ get_filename_component(LLVM_LIBRARY_OUTPUT_INTDIR ++ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib${LLVM_LIBDIR_SUFFIX} ++ REALPATH) + endif() + endmacro() + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/skip-explicit-codesign.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/skip-explicit-codesign.patch new file mode 100644 index 0000000000..894a74e74d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/compiler-rt/skip-explicit-codesign.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake +--- a/cmake/Modules/AddCompilerRT.cmake ++++ b/cmake/Modules/AddCompilerRT.cmake +@@ -406,7 +406,7 @@ function(add_compiler_rt_runtime name type) + if (HAD_ERROR) + message(FATAL_ERROR "${CMAKE_LINKER} failed with status ${HAD_ERROR}") + endif() +- set(NEED_EXPLICIT_ADHOC_CODESIGN 1) ++ set(NEED_EXPLICIT_ADHOC_CODESIGN 0) # `postLinkSignHook` handles this for us + if ("${LD_V_OUTPUT}" MATCHES ".*ld64-([0-9.]+).*") + string(REGEX REPLACE ".*ld64-([0-9.]+).*" "\\1" HOST_LINK_VERSION ${LD_V_OUTPUT}) + if (HOST_LINK_VERSION VERSION_GREATER_EQUAL 609) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix new file mode 100644 index 0000000000..db98f2854a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/default.nix @@ -0,0 +1,354 @@ +{ lowPrio, newScope, pkgs, lib, stdenv, stdenvNoCC, cmake, ninja +, gccForLibs, preLibcCrossHeaders +, libxml2, python3, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross +, targetLlvm +# This is the default binutils, but with *this* version of LLD rather +# than the default LLVM verion's, if LLD is the choice. We use these for +# the `useLLVM` bootstrapping below. +, bootBintoolsNoLibc ? + if stdenv.targetPlatform.linker == "lld" + then null + else pkgs.bintoolsNoLibc +, bootBintools ? + if stdenv.targetPlatform.linker == "lld" + then null + else pkgs.bintools +, darwin +# LLVM release information; specify one of these but not both: +, gitRelease ? null + # i.e.: + # { + # version = /* i.e. "15.0.0" */; + # rev = /* commit SHA */; + # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; + # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; + # } +, officialRelease ? { version = "15.0.7"; sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; } + # i.e.: + # { + # version = /* i.e. "15.0.0" */; + # candidate = /* optional; if specified, should be: "rcN" */ + # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; + # } +# By default, we'll try to fetch a release from `github:llvm/llvm-project` +# corresponding to the `gitRelease` or `officialRelease` specified. +# +# You can provide your own LLVM source by specifying this arg but then it's up +# to you to make sure that the LLVM repo given matches the release configuration +# specified. +, monorepoSrc ? null +}: + +assert let + int = a: if a then 1 else 0; + xor = a: b: ((builtins.bitXor (int a) (int b)) == 1); +in + lib.assertMsg + (xor + (gitRelease != null) + (officialRelease != null)) + ("must specify `gitRelease` or `officialRelease`" + + (lib.optionalString (gitRelease != null) " — not both")); +let + monorepoSrc' = monorepoSrc; +in let + releaseInfo = if gitRelease != null then rec { + original = gitRelease; + release_version = original.version; + version = gitRelease.rev-version; + } else rec { + original = officialRelease; + release_version = original.version; + version = if original ? candidate then + "${release_version}-${original.candidate}" + else + release_version; + }; + + monorepoSrc = if monorepoSrc' != null then + monorepoSrc' + else let + sha256 = releaseInfo.original.sha256; + rev = if gitRelease != null then + gitRelease.rev + else + "llvmorg-${releaseInfo.version}"; + in fetchFromGitHub { + owner = "llvm"; + repo = "llvm-project"; + inherit rev sha256; + }; + + inherit (releaseInfo) release_version version; + + llvm_meta = { + license = with lib.licenses; [ ncsa llvm-exception ]; + maintainers = lib.teams.llvm.members; + platforms = lib.platforms.all; + }; + + tools = lib.makeExtensible (tools: let + callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; }); + mkExtraBuildCommands0 = cc: '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc.lib}/lib/clang/${release_version}/include" "$rsrc" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + ''; + mkExtraBuildCommands = cc: mkExtraBuildCommands0 cc + '' + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share" + ''; + + bintoolsNoLibc' = + if bootBintoolsNoLibc == null + then tools.bintoolsNoLibc + else bootBintoolsNoLibc; + bintools' = + if bootBintools == null + then tools.bintools + else bootBintools; + + in { + + libllvm = callPackage ./llvm { + inherit llvm_meta; + }; + + # `llvm` historically had the binaries. When choosing an output explicitly, + # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* + llvm = tools.libllvm.out // { outputSpecified = false; }; + + libclang = callPackage ./clang { + inherit llvm_meta; + }; + + clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + + llvm-manpages = lowPrio (tools.libllvm.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + clang-manpages = lowPrio (tools.libclang.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + lldb-manpages = lowPrio (tools.lldb.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + # pick clang appropriate for package set we are targeting + clang = + /**/ if stdenv.targetPlatform.useLLVM or false then tools.clangUseLLVM + else if (pkgs.targetPackages.stdenv or stdenv).cc.isGNU then tools.libstdcxxClang + else tools.libcxxClang; + + libstdcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper. + libcxx = null; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + libcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + extraPackages = [ + libcxx.cxxabi + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + lld = callPackage ./lld { + inherit llvm_meta; + }; + + lldb = callPackage ./lldb { + inherit llvm_meta; + inherit (darwin) libobjc bootstrap_cmds; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa; + }; + + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + + bintools-unwrapped = callPackage ./bintools {}; + + bintoolsNoLibc = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + libc = preLibcCrossHeaders; + }; + + bintools = wrapBintoolsWith { + bintools = tools.bintools-unwrapped; + }; + + clangUseLLVM = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + bintools = bintools'; + extraPackages = [ + libcxx.cxxabi + targetLlvmLibraries.compiler-rt + ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = mkExtraBuildCommands cc; + nixSupport.cc-cflags = + [ "-rtlib=compiler-rt" + "-Wno-unused-command-line-argument" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ] + ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" + ++ lib.optional + (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) + "-lunwind" + ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; + }; + + clangNoLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + nixSupport.cc-cflags = [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + "-nostdlib++" + ]; + }; + + clangNoLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + nixSupport.cc-cflags = [ + "-rtlib=compiler-rt" + "-B${targetLlvmLibraries.compiler-rt}/lib" + ]; + }; + + clangNoCompilerRt = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintoolsNoLibc'; + extraPackages = [ ]; + extraBuildCommands = mkExtraBuildCommands0 cc; + nixSupport.cc-cflags = [ "-nostartfiles" ]; + }; + + clangNoCompilerRtWithLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = bintools'; + extraPackages = [ ]; + extraBuildCommands = mkExtraBuildCommands0 cc; + }; + + }); + + libraries = lib.makeExtensible (libraries: let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc; }); + in { + + compiler-rt-libc = callPackage ./compiler-rt { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc + else stdenv; + }; + + compiler-rt-no-libc = callPackage ./compiler-rt { + inherit llvm_meta; + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildLlvmTools.clangNoCompilerRt + else stdenv; + }; + + # N.B. condition is safe because without useLLVM both are the same. + compiler-rt = if stdenv.hostPlatform.isAndroid + then libraries.compiler-rt-libc + else libraries.compiler-rt-no-libc; + + stdenv = overrideCC stdenv buildLlvmTools.clang; + + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; + + libcxxabi = let + # CMake will "require" a compiler capable of compiling C++ programs + # cxx-header's build does not actually use one so it doesn't really matter + # what stdenv we use here, as long as CMake is happy. + cxx-headers = callPackage ./libcxx { + inherit llvm_meta; + # Note that if we use the regular stdenv here we'll get cycle errors + # when attempting to use this compiler in the stdenv. + # + # The final stdenv pulls `cxx-headers` from the package set where + # hostPlatform *is* the target platform which means that `stdenv` at + # that point attempts to use this toolchain. + # + # So, we use `stdenv_` (the stdenv containing `clang` from this package + # set, defined below) to sidestep this issue. + # + # Because we only use `cxx-headers` in `libcxxabi` (which depends on the + # clang stdenv _anyways_), this is okay. + stdenv = stdenv_; + headersOnly = true; + }; + + # `libcxxabi` *doesn't* need a compiler with a working C++ stdlib but it + # *does* need a relatively modern C++ compiler (see: + # https://releases.llvm.org/15.0.0/projects/libcxx/docs/index.html#platform-and-compiler-support). + # + # So, we use the clang from this LLVM package set, like libc++ + # "boostrapping builds" do: + # https://releases.llvm.org/15.0.0/projects/libcxx/docs/BuildingLibcxx.html#bootstrapping-build + # + # We cannot use `clangNoLibcxx` because that contains `compiler-rt` which, + # on macOS, depends on `libcxxabi`, thus forming a cycle. + stdenv_ = overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc; + in callPackage ./libcxxabi { + stdenv = stdenv_; + inherit llvm_meta cxx-headers; + }; + + # Like `libcxxabi` above, `libcxx` requires a fairly modern C++ compiler, + # so: we use the clang from this LLVM package set instead of the regular + # stdenv's compiler. + libcxx = callPackage ./libcxx { + inherit llvm_meta; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + }; + + libunwind = callPackage ./libunwind { + inherit llvm_meta; + stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcxx; + }; + + openmp = callPackage ./openmp { + inherit llvm_meta targetLlvm; + }; + }); + +in { inherit tools libraries release_version; } // libraries // tools diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxx/default.nix new file mode 100644 index 0000000000..7762df2938 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxx/default.nix @@ -0,0 +1,107 @@ +{ lib, stdenv, llvm_meta +, monorepoSrc, runCommand +, cmake, ninja, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt +, enableShared ? !stdenv.hostPlatform.isStatic + +# If headersOnly is true, the resulting package would only include the headers. +# Use this to break the circular dependency between libcxx and libcxxabi. +# +# Some context: +# https://reviews.llvm.org/rG1687f2bbe2e2aaa092f942d4a97d41fad43eedfb +, headersOnly ? false +}: + +let + basename = "libcxx"; +in + +assert stdenv.isDarwin -> cxxabi.libName == "c++abi"; + +stdenv.mkDerivation rec { + pname = basename + lib.optionalString headersOnly "-headers"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${basename} "$out" + mkdir -p "$out/libcxxabi" + cp -r ${monorepoSrc}/libcxxabi/include "$out/libcxxabi" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + cp -r ${monorepoSrc}/third-party "$out" + cp -r ${monorepoSrc}/runtimes "$out" + ''; + + sourceRoot = "${src.name}/runtimes"; + + outputs = [ "out" ] ++ lib.optional (!headersOnly) "dev"; + + prePatch = '' + cd ../${basename} + chmod -R u+w . + ''; + + patches = [ + ./gnu-install-dirs.patch + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + ../../libcxx-0001-musl-hacks.patch + ]; + + postPatch = '' + cd ../runtimes + ''; + + preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' + patchShebangs utils/cat_files.py + ''; + + nativeBuildInputs = [ cmake ninja python3 ] + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + buildInputs = lib.optionals (!headersOnly) [ cxxabi ]; + + cmakeFlags = let + # See: https://libcxx.llvm.org/BuildingLibcxx.html#cmdoption-arg-libcxx-cxx-abi-string + libcxx_cxx_abi_opt = { + "c++abi" = "system-libcxxabi"; + "cxxrt" = "libcxxrt"; + }.${cxxabi.libName} or (throw "unknown cxxabi: ${cxxabi.libName} (${cxxabi.pname})"); + in [ + "-DLLVM_ENABLE_RUNTIMES=libcxx" + "-DLIBCXX_CXX_ABI=${if headersOnly then "none" else libcxx_cxx_abi_opt}" + ] ++ lib.optional (!headersOnly && cxxabi.libName == "c++abi") "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi.dev}/include/c++/v1" + ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" + ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXX_ENABLE_THREADS=OFF" + "-DLIBCXX_ENABLE_FILESYSTEM=OFF" + "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" + # If we're only building the headers we don't actually *need* a functioning + # C/C++ compiler: + ++ lib.optionals (headersOnly) [ + "-DCMAKE_C_COMPILER_WORKS=ON" + "-DCMAKE_CXX_COMPILER_WORKS=ON" + ]; + + ninjaFlags = lib.optional headersOnly "generate-cxx-headers"; + installTargets = lib.optional headersOnly "install-cxx-headers"; + + passthru = { + isLLVM = true; + inherit cxxabi; + }; + + meta = llvm_meta // { + homepage = "https://libcxx.llvm.org/"; + description = "C++ standard library"; + longDescription = '' + libc++ is an implementation of the C++ standard library, targeting C++11, + C++14 and above. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxx/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxx/gnu-install-dirs.patch new file mode 100644 index 0000000000..daee5bdd0e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxx/gnu-install-dirs.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 74eff2002fc9..c935d10878bb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -419,7 +419,7 @@ if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXX_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) + set(LIBCXX_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1") + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LLVM_BINARY_DIR}/include/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1") +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libc++ libraries should be installed.") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}/c++/v1" CACHE PATH + "Path where target-specific libc++ headers should be installed.") +@@ -436,7 +436,7 @@ else() + set(LIBCXX_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1") + endif() + set(LIBCXX_GENERATED_INCLUDE_TARGET_DIR "${LIBCXX_GENERATED_INCLUDE_DIR}") +- set(LIBCXX_INSTALL_LIBRARY_DIR lib${LIBCXX_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXX_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXX_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++ libraries should be installed.") + set(LIBCXX_INSTALL_INCLUDE_TARGET_DIR "${LIBCXX_INSTALL_INCLUDE_DIR}" CACHE PATH + "Path where target-specific libc++ headers should be installed.") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/default.nix new file mode 100644 index 0000000000..fd99f4553c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/default.nix @@ -0,0 +1,105 @@ +{ lib, stdenv, llvm_meta, cmake, ninja, python3 +, monorepoSrc, runCommand, fetchpatch +, cxx-headers, libunwind, version +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "libcxxabi"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx/src" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/include "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/src/include "$out/libcxx/src" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + cp -r ${monorepoSrc}/runtimes "$out" + ''; + + sourceRoot = "${src.name}/runtimes"; + + outputs = [ "out" "dev" ]; + + postUnpack = lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + '' + lib.optionalString stdenv.hostPlatform.isWasm '' + patch -p1 -d llvm -i ${./wasm.patch} + ''; + + prePatch = '' + cd ../${pname} + chmod -R u+w . + ''; + + patches = [ + ./gnu-install-dirs.patch + + # https://reviews.llvm.org/D132298, Allow building libcxxabi alone + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/e6a0800532bb409f6d1c62f3698bdd6994a877dc.patch"; + sha256 = "1xyjd56m4pfwq8p3xh6i8lhkk9kq15jaml7qbhxdf87z4jjkk63a"; + stripLen = 1; + }) + ]; + + postPatch = '' + cd ../runtimes + ''; + + nativeBuildInputs = [ cmake ninja python3 ]; + buildInputs = lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isWasm) libunwind; + + cmakeFlags = [ + "-DLLVM_ENABLE_RUNTIMES=libcxxabi" + "-DLIBCXXABI_LIBCXX_INCLUDES=${cxx-headers}/include/c++/v1" + + # `libcxxabi`'s build does not need a toolchain with a c++ stdlib attached + # (we specify the headers it should use explicitly above). + # + # CMake however checks for this anyways; this flag tells it not to. See: + # https://github.com/llvm/llvm-project/blob/4bd3f3759259548e159aeba5c76efb9a0864e6fa/llvm/runtimes/CMakeLists.txt#L243 + "-DCMAKE_CXX_COMPILER_WORKS=ON" + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ] ++ lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXXABI_ENABLE_THREADS=OFF" + "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + ] ++ lib.optionals (!enableShared) [ + "-DLIBCXXABI_ENABLE_SHARED=OFF" + ]; + + preInstall = lib.optionalString stdenv.isDarwin '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + ''; + + postInstall = '' + mkdir -p "$dev/include" + install -m 644 ../../${pname}/include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" + ''; + + passthru = { + libName = "c++abi"; + }; + + meta = llvm_meta // { + homepage = "https://libcxxabi.llvm.org/"; + description = "Provides C++ standard library support"; + longDescription = '' + libc++abi is a new implementation of low level support for a standard C++ library. + ''; + maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/gnu-install-dirs.patch new file mode 100644 index 0000000000..fa587612aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/gnu-install-dirs.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b8326d08d23a..a1e36f713161 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -187,7 +187,7 @@ set(LIBCXXABI_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBCXXABI_HEADER_DIR ${LLVM_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libc++abi libraries should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBCXXABI_LIBRARY_DIR /${LIBCXXABI_LIBDIR_SUBDIR}) +@@ -201,7 +201,7 @@ else() + set(LIBCXXABI_HEADER_DIR ${CMAKE_BINARY_DIR}) + set(LIBCXXABI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBCXXABI_LIBDIR_SUFFIX}) + endif() +- set(LIBCXXABI_INSTALL_LIBRARY_DIR lib${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBCXXABI_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBCXXABI_LIBDIR_SUFFIX} CACHE PATH + "Path where built libc++abi libraries should be installed.") + endif() + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/wasm.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/wasm.patch new file mode 100644 index 0000000000..4ebfe46aa8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/wasm.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake +index 15497d405e0..33f7f18193a 100644 +--- a/cmake/modules/HandleLLVMOptions.cmake ++++ b/cmake/modules/HandleLLVMOptions.cmake +@@ -127,7 +127,10 @@ else(WIN32) + set(LLVM_HAVE_LINK_VERSION_SCRIPT 1) + endif() + else(FUCHSIA OR UNIX) +- MESSAGE(SEND_ERROR "Unable to determine platform") ++ if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi") ++ else() ++ MESSAGE(SEND_ERROR "Unable to determine platform") ++ endif() + endif(FUCHSIA OR UNIX) + endif(WIN32) + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libunwind/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libunwind/default.nix new file mode 100644 index 0000000000..dd14e2acaf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libunwind/default.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, llvm_meta, version +, monorepoSrc, runCommand +, cmake +, ninja +, python3 +, enableShared ? !stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "libunwind"; + inherit version; + + # I am not so comfortable giving libc++ and friends the whole monorepo as + # requested, so I filter it to what is needed. + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx" + cp -r ${monorepoSrc}/libcxx/utils "$out/libcxx" + mkdir -p "$out/llvm" + cp -r ${monorepoSrc}/llvm/cmake "$out/llvm" + cp -r ${monorepoSrc}/llvm/utils "$out/llvm" + cp -r ${monorepoSrc}/runtimes "$out" + ''; + + sourceRoot = "${src.name}/runtimes"; + + prePatch = '' + cd ../${pname} + chmod -R u+w . + ''; + + patches = [ + ./gnu-install-dirs.patch + ]; + + postPatch = '' + cd ../runtimes + ''; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ninja python3 ]; + + cmakeFlags = [ + "-DLLVM_ENABLE_RUNTIMES=libunwind" + ] ++ lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; + + meta = llvm_meta // { + # Details: https://github.com/llvm/llvm-project/blob/main/libunwind/docs/index.rst + homepage = "https://clang.llvm.org/docs/Toolchain.html#unwind-library"; + description = "LLVM's unwinder library"; + longDescription = '' + The unwind library provides a family of _Unwind_* functions implementing + the language-neutral stack unwinding portion of the Itanium C++ ABI (Level + I). It is a dependency of the C++ ABI library, and sometimes is a + dependency of other runtimes. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libunwind/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libunwind/gnu-install-dirs.patch new file mode 100644 index 0000000000..edfb2a8760 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/libunwind/gnu-install-dirs.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5a06805f05f1..86a50329e6a8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -117,7 +117,7 @@ set(LIBUNWIND_INSTALL_RUNTIME_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH + + if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE) + set(LIBUNWIND_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/${LLVM_DEFAULT_TARGET_TRIPLE}) +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}/${LLVM_DEFAULT_TARGET_TRIPLE} CACHE PATH + "Path where built libunwind libraries should be installed.") + if(LIBCXX_LIBDIR_SUBDIR) + string(APPEND LIBUNWIND_LIBRARY_DIR /${LIBUNWIND_LIBDIR_SUBDIR}) +@@ -129,7 +129,7 @@ else() + else() + set(LIBUNWIND_LIBRARY_DIR ${CMAKE_BINARY_DIR}/lib${LIBUNWIND_LIBDIR_SUFFIX}) + endif() +- set(LIBUNWIND_INSTALL_LIBRARY_DIR lib${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH ++ set(LIBUNWIND_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}${LIBUNWIND_LIBDIR_SUFFIX} CACHE PATH + "Path where built libunwind libraries should be installed.") + endif() + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lld/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lld/default.nix new file mode 100644 index 0000000000..e8bca769de --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lld/default.nix @@ -0,0 +1,55 @@ +{ lib, stdenv, llvm_meta +, buildLlvmTools +, monorepoSrc, runCommand +, cmake +, ninja +, libxml2 +, libllvm +, version +}: + +stdenv.mkDerivation rec { + pname = "lld"; + inherit version; + + # Blank llvm dir just so relative path works + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + mkdir -p "$out/libunwind" + cp -r ${monorepoSrc}/libunwind/include "$out/libunwind" + mkdir -p "$out/llvm" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./gnu-install-dirs.patch + ]; + + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ libllvm libxml2 ]; + + cmakeFlags = [ + "-DLLD_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/lld" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ]; + LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; + + outputs = [ "out" "lib" "dev" ]; + + meta = llvm_meta // { + homepage = "https://lld.llvm.org/"; + description = "The LLVM linker (unwrapped)"; + longDescription = '' + LLD is a linker from the LLVM project that is a drop-in replacement for + system linkers and runs much faster than them. It also provides features + that are useful for toolchain developers. + The linker supports ELF (Unix), PE/COFF (Windows), Mach-O (macOS), and + WebAssembly in descending order of completeness. Internally, LLD consists + of several different linkers. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lld/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lld/gnu-install-dirs.patch new file mode 100644 index 0000000000..ea62b2ad50 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lld/gnu-install-dirs.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dcc649629a4b..58dca54642e4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -70,13 +70,15 @@ if(LLD_BUILT_STANDALONE) + if (NOT LLVM_CONFIG_FOUND) + # Pull values from LLVMConfig.cmake. We can drop this once the llvm-config + # path is removed. +- set(MAIN_INCLUDE_DIR "${LLVM_INCLUDE_DIR}") ++ set(INCLUDE_DIRS ${LLVM_INCLUDE_DIRS}) + set(LLVM_OBJ_DIR "${LLVM_BINARY_DIR}") + # N.B. this is just a default value, the CACHE PATHs below can be overridden. + set(MAIN_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm") ++ else() ++ set(INCLUDE_DIRS "${LLVM_BINARY_DIR}/include" "${MAIN_INCLUDE_DIR}") + endif() + +- set(LLVM_MAIN_INCLUDE_DIR "${MAIN_INCLUDE_DIR}" CACHE PATH "Path to llvm/include") ++ set(LLVM_INCLUDE_DIRS ${INCLUDE_DIRS} CACHE PATH "Path to llvm/include and any other header dirs needed") + set(LLVM_BINARY_DIR "${LLVM_OBJ_ROOT}" CACHE PATH "Path to LLVM build tree") + set(LLVM_MAIN_SRC_DIR "${MAIN_SRC_DIR}" CACHE PATH "Path to LLVM source tree") + +@@ -95,7 +97,7 @@ if(LLD_BUILT_STANDALONE) + + set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") + +- include_directories("${LLVM_BINARY_DIR}/include" ${LLVM_INCLUDE_DIRS}) ++ include_directories(${LLVM_INCLUDE_DIRS}) + link_directories(${LLVM_LIBRARY_DIRS}) + + if(LLVM_INCLUDE_TESTS) +diff --git a/cmake/modules/AddLLD.cmake b/cmake/modules/AddLLD.cmake +index d3924f7243d4..42a7cd62281c 100644 +--- a/cmake/modules/AddLLD.cmake ++++ b/cmake/modules/AddLLD.cmake +@@ -18,8 +18,8 @@ macro(add_lld_library name) + install(TARGETS ${name} + COMPONENT ${name} + ${export_to_lldtargets} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + if (${ARG_SHARED} AND NOT CMAKE_CONFIGURATION_TYPES) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/cpu_subtype_arm64e_replacement.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/cpu_subtype_arm64e_replacement.patch new file mode 100644 index 0000000000..20d35c9f3e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/cpu_subtype_arm64e_replacement.patch @@ -0,0 +1,12 @@ +diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm +--- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm ++++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm +@@ -233,7 +233,7 @@ void HostInfoMacOSX::ComputeHostArchitectureSupport(ArchSpec &arch_32, + len = sizeof(is_64_bit_capable); + ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0); + +- if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) { ++ if (cputype == CPU_TYPE_ARM64 && cpusubtype == ((cpu_subtype_t) 2)) { // CPU_SUBTYPE_ARM64E is not available in the macOS 10.12 headers + // The arm64e architecture is a preview. Pretend the host architecture + // is arm64. + cpusubtype = CPU_SUBTYPE_ARM64_ALL; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/default.nix new file mode 100644 index 0000000000..4b50b79cf6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/default.nix @@ -0,0 +1,186 @@ +{ lib, stdenv, llvm_meta +, runCommand +, monorepoSrc +, cmake +, ninja +, zlib +, ncurses +, swig +, which +, libedit +, libxml2 +, libllvm +, libclang +, python3 +, version +, libobjc +, xpc +, Foundation +, bootstrap_cmds +, Carbon +, Cocoa +, lit +, makeWrapper +, darwin +, enableManpages ? false +, lua5_3 +}: + +# TODO: we build the python bindings but don't expose them as a python package +# TODO: expose the vscode extension? + +stdenv.mkDerivation (rec { + pname = "lldb"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./procfs.patch + (runCommand "resource-dir.patch" { + clangLibDir = "${libclang.lib}/lib"; + } '' + substitute '${./resource-dir.patch}' "$out" --subst-var clangLibDir + '') + ./gnu-install-dirs.patch + ] + # This is a stopgap solution if/until the macOS SDK used for x86_64 is + # updated. + # + # The older 10.12 SDK used on x86_64 as of this writing has a `mach/machine.h` + # header that does not define `CPU_SUBTYPE_ARM64E` so we replace the one use + # of this preprocessor symbol in `lldb` with its expansion. + # + # See here for some context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + ++ lib.optional ( + stdenv.targetPlatform.isDarwin + && !stdenv.targetPlatform.isAarch64 + && (lib.versionOlder darwin.apple_sdk.sdk.version "11.0") + ) ./cpu_subtype_arm64e_replacement.patch; + + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ + cmake ninja python3 which swig lit makeWrapper lua5_3 + ] ++ lib.optionals enableManpages [ + python3.pkgs.sphinx python3.pkgs.recommonmark + ]; + + buildInputs = [ + ncurses + zlib + libedit + libxml2 + libllvm + ] ++ lib.optionals stdenv.isDarwin [ + libobjc + xpc + Foundation + bootstrap_cmds + Carbon + Cocoa + ] + # The older libSystem used on x86_64 macOS is missing the + # `` header which `lldb` uses. + # + # We copy this header over from macOS 10.12 SDK. + # + # See here for context: + # https://github.com/NixOS/nixpkgs/pull/194634#issuecomment-1272129132 + ++ lib.optional ( + stdenv.targetPlatform.isDarwin + && !stdenv.targetPlatform.isAarch64 + ) ( + runCommand "bsm-audit-session-header" { } '' + install -Dm444 \ + "${lib.getDev darwin.apple_sdk.sdk}/include/bsm/audit_session.h" \ + "$out/include/bsm/audit_session.h" + '' + ); + + hardeningDisable = [ "format" ]; + + cmakeFlags = [ + "-DLLDB_INCLUDE_TESTS=${if doCheck then "YES" else "NO"}" + "-DLLVM_ENABLE_RTTI=OFF" + "-DClang_DIR=${libclang.dev}/lib/cmake" + "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" + ] ++ lib.optionals stdenv.isDarwin [ + "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + ] ++ lib.optionals enableManpages [ + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + + # docs reference `automodapi` but it's not added to the extensions list when + # only building the manpages: + # https://github.com/llvm/llvm-project/blob/af6ec9200b09039573d85e349496c4f5b17c3d7f/lldb/docs/conf.py#L54 + # + # so, we just ignore the resulting errors + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ lib.optionals doCheck [ + "-DLLDB_TEST_C_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" + "-DLLDB_TEST_CXX_COMPILER=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++" + ]; + + doCheck = false; + + installCheckPhase = '' + if [ ! -e "$lib/${python3.sitePackages}/lldb/_lldb.so" ] ; then + return 1; + fi + ''; + + postInstall = '' + wrapProgram $out/bin/lldb --prefix PYTHONPATH : $lib/${python3.sitePackages}/ + + # Editor support + # vscode: + install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json + mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ''; + + meta = llvm_meta // { + homepage = "https://lldb.llvm.org/"; + description = "A next-generation high-performance debugger"; + longDescription = '' + LLDB is a next generation, high-performance debugger. It is built as a set + of reusable components which highly leverage existing libraries in the + larger LLVM Project, such as the Clang expression parser and LLVM + disassembler. + ''; + }; +} // lib.optionalAttrs enableManpages { + pname = "lldb-manpages"; + + ninjaFlags = [ "docs-lldb-man" ]; + + propagatedBuildInputs = []; + + # manually install lldb man page + installPhase = '' + mkdir -p $out/share/man/man1 + install docs/man/lldb.1 -t $out/share/man/man1/ + ''; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man pages for LLDB ${version}"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/gnu-install-dirs.patch new file mode 100644 index 0000000000..4388f5c7f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/gnu-install-dirs.patch @@ -0,0 +1,23 @@ +diff --git a/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake +index 3291a7c808e1..b27d27ce6a87 100644 +--- a/cmake/modules/AddLLDB.cmake ++++ b/cmake/modules/AddLLDB.cmake +@@ -109,7 +109,7 @@ function(add_lldb_library name) + endif() + + if(PARAM_SHARED) +- set(install_dest lib${LLVM_LIBDIR_SUFFIX}) ++ set(install_dest ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(PARAM_INSTALL_PREFIX) + set(install_dest ${PARAM_INSTALL_PREFIX}) + endif() +diff --git a/tools/intel-features/CMakeLists.txt b/tools/intel-features/CMakeLists.txt +index 7d48491ec89a..c04543585588 100644 +--- a/tools/intel-features/CMakeLists.txt ++++ b/tools/intel-features/CMakeLists.txt +@@ -30,4 +30,4 @@ add_lldb_library(lldbIntelFeatures SHARED + ) + + install(TARGETS lldbIntelFeatures +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/procfs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/procfs.patch new file mode 100644 index 0000000000..7b200e8650 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/procfs.patch @@ -0,0 +1,46 @@ +--- a/source/Plugins/Process/Linux/Procfs.h ++++ b/source/Plugins/Process/Linux/Procfs.h +@@ -10,6 +10,13 @@ + // sys/procfs.h on Android/Linux for all supported architectures. + + #include ++#include ++ ++// on i686 preprocessor symbols with these register names are defined as ++// numeric constants; these symbols clash with identifier names used in ++// `llvm/Support/VirtualFileSystem.h` and `llvm/ADT/SmallVector.h` ++#undef FS ++#undef CS + + #include "lldb/lldb-types.h" + +@@ -17,23 +24,13 @@ + + #include + +-#ifdef __ANDROID__ +-#if defined(__arm64__) || defined(__aarch64__) +-typedef unsigned long elf_greg_t; +-typedef elf_greg_t +- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; +-typedef struct user_fpsimd_state elf_fpregset_t; +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#elif defined(__mips__) +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#endif +-#else // __ANDROID__ ++#if !defined(__GLIBC__) && defined(__powerpc__) ++#define pt_regs musl_pt_regs ++#include ++#undef pt_regs ++#else + #include +-#endif // __ANDROID__ ++#endif + + namespace lldb_private { + namespace process_linux { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/resource-dir.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/resource-dir.patch new file mode 100644 index 0000000000..e0db80afeb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/lldb/resource-dir.patch @@ -0,0 +1,13 @@ +diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake +index 37364341ff8b..7f74c1a3e257 100644 +--- a/cmake/modules/LLDBConfig.cmake ++++ b/cmake/modules/LLDBConfig.cmake +@@ -257,7 +257,7 @@ if (NOT TARGET clang-resource-headers) + # Iterate over the possible places where the external resource directory + # could be and pick the first that exists. + foreach(CANDIDATE "${Clang_DIR}/../.." "${LLVM_DIR}" "${LLVM_LIBRARY_DIRS}" +- "${LLVM_BUILD_LIBRARY_DIR}" ++ "${LLVM_BUILD_LIBRARY_DIR}" "@clangLibDir@" + "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}") + # Build the resource directory path by appending 'clang/'. + set(CANDIDATE_RESOURCE_DIR "${CANDIDATE}/clang/${LLDB_CLANG_RESOURCE_DIR_NAME}") diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix new file mode 100644 index 0000000000..e0b79a9acf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/default.nix @@ -0,0 +1,429 @@ +{ lib, stdenv, llvm_meta +, pkgsBuildBuild +, monorepoSrc +, runCommand +, fetchpatch +, cmake +, darwin +, ninja +, python3 +, python3Packages +, libffi +, libbfd +, libpfm +, libxml2 +, ncurses +, version +, release_version +, zlib +, which +, sysctl +, buildLlvmTools +, debugVersion ? false +, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) + && (stdenv.hostPlatform == stdenv.buildPlatform) +, enableManpages ? false +, enableSharedLibraries ? !stdenv.hostPlatform.isStatic +, enablePFM ? stdenv.isLinux /* PFM only supports Linux */ + # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + # broken for the armv7l builder + && !stdenv.hostPlatform.isAarch +, enablePolly ? true +} @args: + +let + inherit (lib) optional optionals optionalString; + + # Used when creating a version-suffixed symlink of libLLVM.dylib + shortVersion = with lib; + concatStringsSep "." (take 1 (splitString "." release_version)); + + # Ordinarily we would just the `doCheck` and `checkDeps` functionality + # `mkDerivation` gives us to manage our test dependencies (instead of breaking + # out `doCheck` as a package level attribute). + # + # Unfortunately `lit` does not forward `$PYTHONPATH` to children processes, in + # particular the children it uses to do feature detection. + # + # This means that python deps we add to `checkDeps` (which the python + # interpreter is made aware of via `$PYTHONPATH` – populated by the python + # setup hook) are not picked up by `lit` which causes it to skip tests. + # + # Adding `python3.withPackages (ps: [ ... ])` to `checkDeps` also doesn't work + # because this package is shadowed in `$PATH` by the regular `python3` + # package. + # + # So, we "manually" assemble one python derivation for the package to depend + # on, taking into account whether checks are enabled or not: + python = if doCheck then + # Note that we _explicitly_ ask for a python interpreter for our host + # platform here; the splicing that would ordinarily take care of this for + # us does not seem to work once we use `withPackages`. + let + checkDeps = ps: with ps; [ psutil ]; + in pkgsBuildBuild.targetPackages.python3.withPackages checkDeps + else python3; + +in stdenv.mkDerivation (rec { + pname = "llvm"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} ('' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + cp -r ${monorepoSrc}/third-party "$out" + '' + lib.optionalString enablePolly '' + chmod u+w "$out/${pname}/tools" + cp -r ${monorepoSrc}/polly "$out/${pname}/tools" + ''); + + sourceRoot = "${src.name}/${pname}"; + + outputs = [ "out" "lib" "dev" "python" ]; + + nativeBuildInputs = [ cmake ninja python ] + ++ optionals enableManpages [ + # Note: we intentionally use `python3Packages` instead of `python3.pkgs`; + # splicing does *not* work with the latter. (TODO: fix) + python3Packages.sphinx python3Packages.recommonmark + ]; + + buildInputs = [ libxml2 libffi ] + ++ optional enablePFM libpfm; # exegesis + + propagatedBuildInputs = [ ncurses zlib ]; + + nativeCheckInputs = [ + which + ] ++ lib.optional stdenv.isDarwin sysctl; + + patches = [ + ./gnu-install-dirs.patch + + # Running the tests involves invoking binaries (like `opt`) that depend on + # the LLVM dylibs and reference them by absolute install path (i.e. their + # nix store path). + # + # Because we have not yet run the install phase (we're running these tests + # as part of `checkPhase` instead of `installCheckPhase`) these absolute + # paths do not exist yet; to work around this we point the loader (`ld` on + # unix, `dyld` on macOS) at the `lib` directory which will later become this + # package's `lib` output. + # + # Previously we would just set `LD_LIBRARY_PATH` to include the build `lib` + # dir but: + # - this doesn't generalize well to other platforms; `lit` doesn't forward + # `DYLD_LIBRARY_PATH` (macOS): + # + https://github.com/llvm/llvm-project/blob/0d89963df354ee309c15f67dc47c8ab3cb5d0fb2/llvm/utils/lit/lit/TestingConfig.py#L26 + # - even if `lit` forwarded this env var, we actually cannot set + # `DYLD_LIBRARY_PATH` in the child processes `lit` launches because + # `DYLD_LIBRARY_PATH` (and `DYLD_FALLBACK_LIBRARY_PATH`) is cleared for + # "protected processes" (i.e. the python interpreter that runs `lit`): + # https://stackoverflow.com/a/35570229 + # - other LLVM subprojects deal with this issue by having their `lit` + # configuration set these env vars for us; it makes sense to do the same + # for LLVM: + # + https://github.com/llvm/llvm-project/blob/4c106cfdf7cf7eec861ad3983a3dd9a9e8f3a8ae/clang-tools-extra/test/Unit/lit.cfg.py#L22-L31 + # + # !!! TODO: look into upstreaming this patch + ./llvm-lit-cfg-add-libs-to-dylib-path.patch + + # `lit` has a mode where it executes run lines as a shell script which is + # constructs; this is problematic for macOS because it means that there's + # another process in between `lit` and the binaries being tested. As noted + # above, this means that `DYLD_LIBRARY_PATH` is cleared which means that our + # tests fail with dyld errors. + # + # To get around this we patch `lit` to reintroduce `DYLD_LIBRARY_PATH`, when + # present in the test configuration. + # + # It's not clear to me why this isn't an issue for LLVM developers running + # on macOS (nothing about this _seems_ nix specific).. + ./lit-shell-script-runner-set-dyld-library-path.patch + ] ++ lib.optionals enablePolly [ + ./gnu-install-dirs-polly.patch + + # Just like the `llvm-lit-cfg` patch, but for `polly`. + ./polly-lit-cfg-add-libs-to-dylib-path.patch + ]; + + postPatch = optionalString stdenv.isDarwin '' + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ + --replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + + # As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick + # this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7 + rm test/MC/ELF/cfi-version.ll + + # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) + # and thus fails under the sandbox: + substituteInPlace unittests/Support/Host.cpp \ + --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" + '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' + # This test tries to call the intrinsics `@llvm.roundeven.f32` and + # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` + # and `roundeven` on x86_64 macOS. + # + # However these functions are glibc specific so the test fails: + # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html + # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html + # + # TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it + # pass there? + substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ + --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ + --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" + + # This test fails on darwin x86_64 because `sw_vers` reports a different + # macOS version than what LLVM finds by reading + # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into + # the sandbox on macOS). + # + # The `sw_vers` provided by nixpkgs reports the macOS version associated + # with the `CoreFoundation` framework with which it was built. Because + # nixpkgs pins the SDK for `aarch64-darwin` and `x86_64-darwin` what + # `sw_vers` reports is not guaranteed to match the macOS version of the host + # that's building this derivation. + # + # Astute readers will note that we only _patch_ this test on aarch64-darwin + # (to use the nixpkgs provided `sw_vers`) instead of disabling it outright. + # So why does this test pass on aarch64? + # + # Well, it seems that `sw_vers` on aarch64 actually links against the _host_ + # CoreFoundation framework instead of the nixpkgs provided one. + # + # Not entirely sure what the right fix is here. I'm assuming aarch64 + # `sw_vers` doesn't intentionally link against the host `CoreFoundation` + # (still digging into how this ends up happening, will follow up) but that + # aside I think the more pertinent question is: should we be patching LLVM's + # macOS version detection logic to use `sw_vers` instead of reading host + # paths? This *is* a way in which details about builder machines can creep + # into the artifacts that are produced, affecting reproducibility, but it's + # not clear to me when/where/for what this even gets used in LLVM. + # + # TODO(@rrbutani): fix/follow-up + substituteInPlace unittests/Support/Host.cpp \ + --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" + + # This test fails with a `dysmutil` crash; have not yet dug into what's + # going on here (TODO(@rrbutani)). + rm test/tools/dsymutil/ARM/obfuscated.test + '' + '' + # FileSystem permissions tests fail with various special bits + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + rm unittests/Support/Path.cpp + substituteInPlace unittests/IR/CMakeLists.txt \ + --replace "PassBuilderCallbacksTest.cpp" "" + rm unittests/IR/PassBuilderCallbacksTest.cpp + rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test + '' + optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -i ${../../TLI-musl.patch} + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "add_subdirectory(DynamicLibrary)" "" + rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + # valgrind unhappy with musl or glibc, but fails w/musl only + rm test/CodeGen/AArch64/wineh4.mir + '' + optionalString stdenv.hostPlatform.isAarch32 '' + # skip failing X86 test cases on 32-bit ARM + rm test/DebugInfo/X86/convert-debugloc.ll + rm test/DebugInfo/X86/convert-inlined.ll + rm test/DebugInfo/X86/convert-linked.ll + rm test/tools/dsymutil/X86/op-convert.test + rm test/tools/gold/X86/split-dwarf.ll + rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s + rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s + + # !!! Note: these tests are removed in LLVM 16. + # + # See here for context: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999790443 + rm test/CodeGen/RISCV/rv32zbp.ll + rm test/CodeGen/RISCV/rv64zbp.ll + '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' + # Seems to require certain floating point hardware (NEON?) + rm test/ExecutionEngine/frem.ll + '' + '' + patchShebangs test/BugPoint/compile-custom.ll.py + ''; + + preConfigure = '' + # Workaround for configure flags that need to have spaces + cmakeFlagsArray+=( + -DLLVM_LIT_ARGS="-svj''${NIX_BUILD_CORES} --no-progress-bar" + ) + ''; + + # Defensive check: some paths (that we make symlinks to) depend on the release + # version, for example: + # - https://github.com/llvm/llvm-project/blob/406bde9a15136254f2b10d9ef3a42033b3cb1b16/clang/lib/Headers/CMakeLists.txt#L185 + # + # So we want to sure that the version in the source matches the release + # version we were given. + # + # We do this check here, in the LLVM build, because it happens early. + postConfigure = let + v = lib.versions; + major = v.major release_version; + minor = v.minor release_version; + patch = v.patch release_version; + in '' + # $1: part, $2: expected + check_version() { + part="''${1^^}" + part="$(cat include/llvm/Config/llvm-config.h | grep "#define LLVM_VERSION_''${part} " | cut -d' ' -f3)" + + if [[ "$part" != "$2" ]]; then + echo >&2 \ + "mismatch in the $1 version! we have version ${release_version}" \ + "and expected the $1 version to be '$2'; the source has '$part' instead" + exit 3 + fi + } + + check_version major ${major} + check_version minor ${minor} + check_version patch ${patch} + ''; + + # E.g. mesa.drivers use the build-id as a cache key (see #93946): + LDFLAGS = optionalString (enableSharedLibraries && !stdenv.isDarwin) "-Wl,--build-id=sha1"; + + cmakeFlags = with stdenv; let + # These flags influence llvm-config's BuildVariables.inc in addition to the + # general build. We need to make sure these are also passed via + # CROSS_TOOLCHAIN_FLAGS_NATIVE when cross-compiling or llvm-config-native + # will return different results from the cross llvm-config. + # + # Some flags don't need to be repassed because LLVM already does so (like + # CMAKE_BUILD_TYPE), others are irrelevant to the result. + flagsForLlvmConfig = [ + "-DLLVM_INSTALL_PACKAGE_DIR=${placeholder "dev"}/lib/cmake/llvm" + "-DLLVM_ENABLE_RTTI=ON" + ] ++ optionals enableSharedLibraries [ + "-DLLVM_LINK_LLVM_DYLIB=ON" + ]; + in flagsForLlvmConfig ++ [ + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_ENABLE_DUMP=ON" + ] ++ optionals stdenv.hostPlatform.isStatic [ + # Disables building of shared libs, -fPIC is still injected by cc-wrapper + "-DLLVM_ENABLE_PIC=OFF" + "-DLLVM_BUILD_STATIC=ON" + "-DLLVM_LINK_LLVM_DYLIB=off" + # libxml2 needs to be disabled because the LLVM build system ignores its .la + # file and doesn't link zlib as well. + # https://github.com/ClangBuiltLinux/tc-build/issues/150#issuecomment-845418812 + "-DLLVM_ENABLE_LIBXML2=OFF" + ] ++ optionals enableManpages [ + "-DLLVM_BUILD_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ optionals (!isDarwin) [ + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" + ] ++ optionals isDarwin [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DCAN_TARGET_i386=false" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCMAKE_CROSSCOMPILING=True" + "-DLLVM_TABLEGEN=${buildLlvmTools.llvm}/bin/llvm-tblgen" + ( + let + nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc; + nativeBintools = nativeCC.bintools.bintools; + nativeToolchainFlags = [ + "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc" + "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++" + "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar" + "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip" + "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib" + ]; + # We need to repass the custom GNUInstallDirs values, otherwise CMake + # will choose them for us, leading to wrong results in llvm-config-native + nativeInstallFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" + "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" + "-DCMAKE_INSTALL_LIBDIR=${placeholder "lib"}/lib" + "-DCMAKE_INSTALL_LIBEXECDIR=${placeholder "lib"}/libexec" + ]; + in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=" + + lib.concatStringsSep ";" (lib.concatLists [ + flagsForLlvmConfig + nativeToolchainFlags + nativeInstallFlags + ]) + ) + ]; + + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer + moveToOutput "bin/llvm-config*" "$dev" + substituteInPlace "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/lib" "$lib/lib/lib" \ + --replace "$out/bin/llvm-config" "$dev/bin/llvm-config" + substituteInPlace "$dev/lib/cmake/llvm/LLVMConfig.cmake" \ + --replace 'set(LLVM_BINARY_DIR "''${LLVM_INSTALL_PREFIX}")' 'set(LLVM_BINARY_DIR "'"$lib"'")' + '' + + optionalString (stdenv.isDarwin && enableSharedLibraries) '' + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native + ''; + + inherit doCheck; + + checkTarget = "check-all"; + + # For the update script: + passthru.monorepoSrc = monorepoSrc; + + requiredSystemFeatures = [ "big-parallel" ]; + meta = llvm_meta // { + homepage = "https://llvm.org/"; + description = "A collection of modular and reusable compiler and toolchain technologies"; + longDescription = '' + The LLVM Project is a collection of modular and reusable compiler and + toolchain technologies. Despite its name, LLVM has little to do with + traditional virtual machines. The name "LLVM" itself is not an acronym; it + is the full name of the project. + LLVM began as a research project at the University of Illinois, with the + goal of providing a modern, SSA-based compilation strategy capable of + supporting both static and dynamic compilation of arbitrary programming + languages. Since then, LLVM has grown to be an umbrella project consisting + of a number of subprojects, many of which are being used in production by + a wide variety of commercial and open source projects as well as being + widely used in academic research. Code in the LLVM project is licensed + under the "Apache 2.0 License with LLVM exceptions". + ''; + }; +} // lib.optionalAttrs enableManpages { + pname = "llvm-manpages"; + + propagatedBuildInputs = []; + + ninjaFlags = [ "docs-llvm-man" ]; + installTargets = [ "install-docs-llvm-man" ]; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta = llvm_meta // { + description = "man pages for LLVM ${version}"; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs-polly.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs-polly.patch new file mode 100644 index 0000000000..b01363e98a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs-polly.patch @@ -0,0 +1,19 @@ +This is the one remaining Polly install dirs related change that hasn't made it +into upstream yet; previously this patch file also included: +https://reviews.llvm.org/D117541 + +diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macros.cmake +index 518a09b45a42..bd9d6f5542ad 100644 +--- a/tools/polly/cmake/polly_macros.cmake ++++ b/tools/polly/cmake/polly_macros.cmake +@@ -44,8 +44,8 @@ macro(add_polly_library name) + if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") + install(TARGETS ${name} + EXPORT LLVMExports +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + endif() + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) + endmacro(add_polly_library) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs.patch new file mode 100644 index 0000000000..0ef317af8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/gnu-install-dirs.patch @@ -0,0 +1,138 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 45399dc0537e..5d946e9e6583 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -942,7 +942,7 @@ if (NOT TENSORFLOW_AOT_PATH STREQUAL "") + add_subdirectory(${TENSORFLOW_AOT_PATH}/xla_aot_runtime_src + ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/tf_runtime) + install(TARGETS tf_xla_runtime EXPORT LLVMExports +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} COMPONENT tf_xla_runtime) + set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS tf_xla_runtime) + # Once we add more modules, we should handle this more automatically. + if (DEFINED LLVM_OVERRIDE_MODEL_HEADER_INLINERSIZEMODEL) +diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake +index 057431208322..56f0dcb258da 100644 +--- a/cmake/modules/AddLLVM.cmake ++++ b/cmake/modules/AddLLVM.cmake +@@ -844,8 +844,8 @@ macro(add_llvm_library name) + get_target_export_arg(${name} LLVM export_to_llvmexports ${umbrella}) + install(TARGETS ${name} + ${export_to_llvmexports} +- LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} +- ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX} COMPONENT ${name} ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" COMPONENT ${name} + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT ${name}) + + if (NOT LLVM_ENABLE_IDE) +@@ -2007,7 +2007,7 @@ function(llvm_install_library_symlink name dest type) + set(full_name ${CMAKE_${type}_LIBRARY_PREFIX}${name}${CMAKE_${type}_LIBRARY_SUFFIX}) + set(full_dest ${CMAKE_${type}_LIBRARY_PREFIX}${dest}${CMAKE_${type}_LIBRARY_SUFFIX}) + +- set(output_dir lib${LLVM_LIBDIR_SUFFIX}) ++ set(output_dir ${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + if(WIN32 AND "${type}" STREQUAL "SHARED") + set(output_dir "${CMAKE_INSTALL_BINDIR}") + endif() +@@ -2271,15 +2271,15 @@ function(llvm_setup_rpath name) + + if (APPLE) + set(_install_name_dir INSTALL_NAME_DIR "@rpath") +- set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "@loader_path/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS) + # $ORIGIN is not interpreted at link time by aix ld. + # Since BUILD_SHARED_LIBS is only recommended for use by developers, + # hardcode the rpath to build/install lib dir first in this mode. + # FIXME: update this when there is better solution. +- set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "${LLVM_LIBRARY_OUTPUT_INTDIR}" "${CMAKE_INSTALL_FULL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + elseif(UNIX) +- set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) ++ set(_install_rpath "\$ORIGIN/../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" ${extra_libdir}) + if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)") + set_property(TARGET ${name} APPEND_STRING PROPERTY + LINK_FLAGS " -Wl,-z,origin ") +diff --git a/cmake/modules/AddOCaml.cmake b/cmake/modules/AddOCaml.cmake +index 891c9e6d618c..8d963f3b0069 100644 +--- a/cmake/modules/AddOCaml.cmake ++++ b/cmake/modules/AddOCaml.cmake +@@ -147,9 +147,9 @@ function(add_ocaml_library name) + endforeach() + + if( APPLE ) +- set(ocaml_rpath "@executable_path/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "@executable_path/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + elseif( UNIX ) +- set(ocaml_rpath "\\$ORIGIN/../../../lib${LLVM_LIBDIR_SUFFIX}") ++ set(ocaml_rpath "\\$ORIGIN/../../../${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + endif() + list(APPEND ocaml_flags "-ldopt" "-Wl,-rpath,${ocaml_rpath}") + +diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt +index d4b0ab959148..26ed981fd09f 100644 +--- a/cmake/modules/CMakeLists.txt ++++ b/cmake/modules/CMakeLists.txt +@@ -128,7 +128,7 @@ set(LLVM_CONFIG_INCLUDE_DIRS + ) + list(REMOVE_DUPLICATES LLVM_CONFIG_INCLUDE_DIRS) + +-extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "lib\${LLVM_LIBDIR_SUFFIX}") ++extend_path(LLVM_CONFIG_LIBRARY_DIR "\${LLVM_INSTALL_PREFIX}" "${CMAKE_INSTALL_LIBDIR}\${LLVM_LIBDIR_SUFFIX}") + set(LLVM_CONFIG_LIBRARY_DIRS + "${LLVM_CONFIG_LIBRARY_DIR}" + # FIXME: Should there be other entries here? +diff --git a/docs/CMake.rst b/docs/CMake.rst +index 879b7b231d4c..9c31d14e8950 100644 +--- a/docs/CMake.rst ++++ b/docs/CMake.rst +@@ -250,7 +250,7 @@ description is in `LLVM-related variables`_ below. + **LLVM_LIBDIR_SUFFIX**:STRING + Extra suffix to append to the directory where libraries are to be + installed. On a 64-bit architecture, one could use ``-DLLVM_LIBDIR_SUFFIX=64`` +- to install libraries to ``/usr/lib64``. ++ to install libraries to ``/usr/lib64``. See also ``CMAKE_INSTALL_LIBDIR``. + + **LLVM_PARALLEL_{COMPILE,LINK}_JOBS**:STRING + Building the llvm toolchain can use a lot of resources, particularly +@@ -284,6 +284,10 @@ manual, or execute ``cmake --help-variable VARIABLE_NAME``. + The path to install executables, relative to the *CMAKE_INSTALL_PREFIX*. + Defaults to "bin". + ++**CMAKE_INSTALL_LIBDIR**:PATH ++ The path to install libraries, relative to the *CMAKE_INSTALL_PREFIX*. ++ Defaults to "lib". ++ + **CMAKE_INSTALL_INCLUDEDIR**:PATH + The path to install header files, relative to the *CMAKE_INSTALL_PREFIX*. + Defaults to "include". +diff --git a/tools/llvm-config/BuildVariables.inc.in b/tools/llvm-config/BuildVariables.inc.in +index 370005cd8d7d..7e790bc52111 100644 +--- a/tools/llvm-config/BuildVariables.inc.in ++++ b/tools/llvm-config/BuildVariables.inc.in +@@ -23,6 +23,7 @@ + #define LLVM_CXXFLAGS "@LLVM_CXXFLAGS@" + #define LLVM_BUILDMODE "@LLVM_BUILDMODE@" + #define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@" ++#define LLVM_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@" + #define LLVM_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@" + #define LLVM_INSTALL_PACKAGE_DIR "@LLVM_INSTALL_PACKAGE_DIR@" + #define LLVM_TARGETS_BUILT "@LLVM_TARGETS_BUILT@" +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 2c6c55f89d38..f6d2068a0827 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -369,7 +369,11 @@ int main(int argc, char **argv) { + sys::fs::make_absolute(ActivePrefix, Path); + ActiveBinDir = std::string(Path.str()); + } +- ActiveLibDir = ActivePrefix + "/lib" + LLVM_LIBDIR_SUFFIX; ++ { ++ SmallString<256> Path(LLVM_INSTALL_LIBDIR LLVM_LIBDIR_SUFFIX); ++ sys::fs::make_absolute(ActivePrefix, Path); ++ ActiveLibDir = std::string(Path.str()); ++ } + { + SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR); + sys::fs::make_absolute(ActivePrefix, Path); diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/lit-shell-script-runner-set-dyld-library-path.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/lit-shell-script-runner-set-dyld-library-path.patch new file mode 100644 index 0000000000..32f1d13a9d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/lit-shell-script-runner-set-dyld-library-path.patch @@ -0,0 +1,26 @@ +diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py +index 0242e0b75af3..d732011306f7 100644 +--- a/utils/lit/lit/TestRunner.py ++++ b/utils/lit/lit/TestRunner.py +@@ -1029,6 +1029,12 @@ def executeScript(test, litConfig, tmpBase, commands, cwd): + f.write('@echo off\n') + f.write('\n@if %ERRORLEVEL% NEQ 0 EXIT\n'.join(commands)) + else: ++ # This env var is *purged* when invoking subprocesses so we have to ++ # manually set it from within the bash script in order for the commands ++ # in run lines to see this var: ++ if "DYLD_LIBRARY_PATH" in test.config.environment: ++ f.write(f'export DYLD_LIBRARY_PATH="{test.config.environment["DYLD_LIBRARY_PATH"]}"\n') ++ + for i, ln in enumerate(commands): + match = re.match(kPdbgRegex, ln) + if match: +@@ -1363,7 +1369,7 @@ def applySubstitutions(script, substitutions, conditions={}, + return processed + + process = processLine if recursion_limit is None else processLineToFixedPoint +- ++ + return [unescapePercents(process(ln)) for ln in script] + + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 0000000000..d824516c0a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/llvm-lit-cfg-add-libs-to-dylib-path.patch @@ -0,0 +1,79 @@ +diff --git a/test/Unit/lit.cfg.py b/test/Unit/lit.cfg.py +index 81e8dc04acea..479ff95681e2 100644 +--- a/test/Unit/lit.cfg.py ++++ b/test/Unit/lit.cfg.py +@@ -3,6 +3,7 @@ + # Configuration file for the 'lit' test runner. + + import os ++import platform + import subprocess + + import lit.formats +@@ -55,3 +56,26 @@ if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir): + # Win32 may use %SYSTEMDRIVE% during file system shell operations, so propogate. + if sys.platform == 'win32' and 'SYSTEMDRIVE' in os.environ: + config.environment['SYSTEMDRIVE'] = os.environ['SYSTEMDRIVE'] ++ ++# Add the LLVM dynamic libs to the platform-specific loader search path env var: ++# ++# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. ++def find_shlibpath_var(): ++ if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']: ++ yield 'LD_LIBRARY_PATH' ++ elif platform.system() == 'Darwin': ++ yield 'DYLD_LIBRARY_PATH' ++ elif platform.system() == 'Windows': ++ yield 'PATH' ++ elif platform.system() == 'AIX': ++ yield 'LIBPATH' ++ ++for shlibpath_var in find_shlibpath_var(): ++ shlibpath = os.path.pathsep.join( ++ (config.shlibdir, ++ config.environment.get(shlibpath_var, ''))) ++ config.environment[shlibpath_var] = shlibpath ++ break ++else: ++ lit_config.warning("unable to inject shared library path on '{}'" ++ .format(platform.system())) +diff --git a/test/lit.cfg.py b/test/lit.cfg.py +index 75a38b4c5dad..856fc75c9d74 100644 +--- a/test/lit.cfg.py ++++ b/test/lit.cfg.py +@@ -42,6 +42,26 @@ llvm_config.with_environment('PATH', config.llvm_tools_dir, append_path=True) + llvm_config.with_system_environment( + ['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP']) + ++# Add the LLVM dynamic libs to the platform-specific loader search path env var: ++# ++# TODO: this is copied from `clang`'s `lit.cfg.py`; should unify.. ++def find_shlibpath_var(): ++ if platform.system() in ['Linux', 'FreeBSD', 'NetBSD', 'OpenBSD', 'SunOS']: ++ yield 'LD_LIBRARY_PATH' ++ elif platform.system() == 'Darwin': ++ yield 'DYLD_LIBRARY_PATH' ++ elif platform.system() == 'Windows': ++ yield 'PATH' ++ elif platform.system() == 'AIX': ++ yield 'LIBPATH' ++ ++for shlibpath_var in find_shlibpath_var(): ++ shlibpath = config.llvm_shlib_dir ++ llvm_config.with_environment(shlibpath_var, shlibpath, append_path = True) ++ break ++else: ++ lit_config.warning("unable to inject shared library path on '{}'" ++ .format(platform.system())) + + # Set up OCAMLPATH to include newly built OCaml libraries. + top_ocaml_lib = os.path.join(config.llvm_lib_dir, 'ocaml') +@@ -318,7 +338,7 @@ def have_cxx_shared_library(): + + try: + readobj_cmd = subprocess.Popen( +- [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE) ++ [readobj_exe, '--needed-libs', readobj_exe], stdout=subprocess.PIPE, env=config.environment) + except OSError: + print('could not exec llvm-readobj') + return False diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch new file mode 100644 index 0000000000..1354ad2673 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/llvm/polly-lit-cfg-add-libs-to-dylib-path.patch @@ -0,0 +1,24 @@ +diff --git a/tools/polly/test/lit.cfg b/tools/polly/test/lit.cfg +index 41e3a589c61e..09f3b17498b0 100644 +--- a/tools/polly/test/lit.cfg ++++ b/tools/polly/test/lit.cfg +@@ -36,9 +36,17 @@ base_paths = [config.llvm_tools_dir, config.environment['PATH']] + path = os.path.pathsep.join(base_paths + config.extra_paths) + config.environment['PATH'] = path + ++# (Copied from polly/test/Unit/lit.cfg) ++if platform.system() == 'Darwin': ++ shlibpath_var = 'DYLD_LIBRARY_PATH' ++elif platform.system() == 'Windows': ++ shlibpath_var = 'PATH' ++else: ++ shlibpath_var = 'LD_LIBRARY_PATH' ++ + path = os.path.pathsep.join((config.llvm_libs_dir, +- config.environment.get('LD_LIBRARY_PATH',''))) +-config.environment['LD_LIBRARY_PATH'] = path ++ config.environment.get(shlibpath_var,''))) ++config.environment[shlibpath_var] = path + + llvm_config.use_default_substitutions() + diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/openmp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/openmp/default.nix new file mode 100644 index 0000000000..8047cb1122 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/openmp/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, llvm_meta +, monorepoSrc +, runCommand +, cmake +, ninja +, llvm +, targetLlvm +, lit +, clang-unwrapped +, perl +, pkg-config +, xcbuild +, version +}: + +stdenv.mkDerivation rec { + pname = "openmp"; + inherit version; + + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/${pname} "$out" + ''; + + sourceRoot = "${src.name}/${pname}"; + + patches = [ + ./fix-find-tool.patch + ./gnu-install-dirs.patch + ./run-lit-directly.patch + ]; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ninja perl pkg-config lit ]; + buildInputs = [ + (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) + ]; + + nativeCheckInputs = lib.optional stdenv.hostPlatform.isDarwin xcbuild.xcrun; + + # Unsup:Pass:XFail:Fail + # 26:267:16:8 + doCheck = false; + checkTarget = "check-openmp"; + + preCheck = '' + patchShebangs ../tools/archer/tests/deflake.bash + ''; + + cmakeFlags = [ + "-DCLANG_TOOL=${clang-unwrapped}/bin/clang" + "-DOPT_TOOL=${llvm}/bin/opt" + "-DLINK_TOOL=${llvm}/bin/llvm-link" + ]; + + meta = llvm_meta // { + homepage = "https://openmp.llvm.org/"; + description = "Support for the OpenMP language"; + longDescription = '' + The OpenMP subproject of LLVM contains the components required to build an + executable OpenMP program that are outside the compiler itself. + Contains the code for the runtime library against which code compiled by + "clang -fopenmp" must be linked before it can run and the library that + supports offload to target devices. + ''; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/openmp/fix-find-tool.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/openmp/fix-find-tool.patch new file mode 100644 index 0000000000..103b054ed1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/openmp/fix-find-tool.patch @@ -0,0 +1,18 @@ +diff --git a/libomptarget/DeviceRTL/CMakeLists.txt b/libomptarget/DeviceRTL/CMakeLists.txt +index ce66214822a2..6ab7b33c95da 100644 +--- a/libomptarget/DeviceRTL/CMakeLists.txt ++++ b/libomptarget/DeviceRTL/CMakeLists.txt +@@ -27,10 +27,10 @@ endif() + if (LLVM_DIR) + # Builds that use pre-installed LLVM have LLVM_DIR set. + # A standalone or LLVM_ENABLE_RUNTIMES=openmp build takes this route +- find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ find_program(CLANG_TOOL clang PATHS ${LLVM_TOOLS_BINARY_DIR}) + find_program(LINK_TOOL llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} +- NO_DEFAULT_PATH) +- find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH) ++ ) ++ find_program(OPT_TOOL opt PATHS ${LLVM_TOOLS_BINARY_DIR}) + if ((NOT CLANG_TOOL) OR (NOT LINK_TOOL) OR (NOT OPT_TOOL)) + libomptarget_say("Not building DeviceRTL. Missing clang: ${CLANG_TOOL}, llvm-link: ${LINK_TOOL} or opt: ${OPT_TOOL}") + return() diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/openmp/gnu-install-dirs.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/openmp/gnu-install-dirs.patch new file mode 100644 index 0000000000..77a9320883 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/openmp/gnu-install-dirs.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b6ddbe90516d..311ab1d50e7f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -29,7 +29,7 @@ if (OPENMP_STANDALONE_BUILD) + set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING + "Suffix of lib installation directory, e.g. 64 => lib64") + # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR. +- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") + + # Group test settings. + set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING +@@ -40,7 +40,7 @@ if (OPENMP_STANDALONE_BUILD) + else() + set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) + # If building in tree, we honor the same install suffix LLVM uses. +- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}") ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") + + if (NOT MSVC) + set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/15/openmp/run-lit-directly.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/openmp/run-lit-directly.patch new file mode 100644 index 0000000000..1e952fdc36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/15/openmp/run-lit-directly.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/OpenMPTesting.cmake b/cmake/OpenMPTesting.cmake +--- a/cmake/OpenMPTesting.cmake ++++ b/cmake/OpenMPTesting.cmake +@@ -185,7 +185,7 @@ function(add_openmp_testsuite target comment) + if (${OPENMP_STANDALONE_BUILD}) + set(LIT_ARGS ${OPENMP_LIT_ARGS} ${ARG_ARGS}) + add_custom_target(${target} +- COMMAND ${PYTHON_EXECUTABLE} ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} ++ COMMAND ${OPENMP_LLVM_LIT_EXECUTABLE} ${LIT_ARGS} ${ARG_UNPARSED_ARGUMENTS} + COMMENT ${comment} + DEPENDS ${ARG_DEPENDS} + USES_TERMINAL diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix index 5e08f8545d..3cfc89dac7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix @@ -19,7 +19,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -86,7 +86,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libcxx/default.nix index a5a86fcab4..073787e92d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libcxx/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt +}: + +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; stdenv.mkDerivation { pname = "libcxx"; @@ -33,13 +38,13 @@ stdenv.mkDerivation { ++ lib.optional stdenv.hostPlatform.isMusl python3 ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" + ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib"; preInstall = lib.optionalString (stdenv.isDarwin) '' for file in lib/*.dylib; do @@ -50,13 +55,14 @@ stdenv.mkDerivation { abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${libcxxabi}/lib/$abiName $file + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file done done ''; passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libcxxabi/default.nix index 97077ac771..cc2ac1beaf 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/libcxxabi/default.nix @@ -52,6 +52,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix index a82880f7fe..a0c4ba7271 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix @@ -19,7 +19,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -87,7 +87,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libcxx/default.nix index a6e723753e..0fc31d43cf 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libcxx/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt +}: + +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; stdenv.mkDerivation { pname = "libcxx"; @@ -39,13 +44,13 @@ stdenv.mkDerivation { ++ lib.optional stdenv.hostPlatform.isMusl python3 ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1"; + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" + ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib"; preInstall = lib.optionalString (stdenv.isDarwin) '' for file in lib/*.dylib; do @@ -56,13 +61,14 @@ stdenv.mkDerivation { abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${libcxxabi}/lib/$abiName $file + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file done done ''; passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libcxxabi/default.nix index aea126b31d..0821dbdae0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/libcxxabi/default.nix @@ -52,6 +52,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/bintools/default.nix index a9d4f5fffc..1eb7215c00 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/bintools/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix index f33efb4390..7ddd14b60d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix @@ -31,7 +31,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -117,7 +117,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -154,7 +154,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -164,7 +164,7 @@ let echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) '' + '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' echo "-lunwind" >> $out/nix-support/cc-ldflags '' + lib.optionalString stdenv.targetPlatform.isWasm '' echo "-fno-exceptions" >> $out/nix-support/cc-cflags diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libcxx/default.nix index 145f0df883..3834e17fb8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libcxx/default.nix @@ -1,7 +1,11 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic }: +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation { pname = "libcxx"; inherit version; @@ -42,13 +46,13 @@ stdenv.mkDerivation { ++ lib.optional stdenv.hostPlatform.isMusl python3 ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ lib.optional stdenv.hostPlatform.isMusl "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF" ; @@ -61,13 +65,14 @@ stdenv.mkDerivation { abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${libcxxabi}/lib/$abiName $file + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file done done ''; passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libcxxabi/default.nix index d6f90634cd..c33c61361e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/libcxxabi/default.nix @@ -71,6 +71,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/bintools/default.nix index a9d4f5fffc..1eb7215c00 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/bintools/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix index 0d604189a1..29a2ee7ddc 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix @@ -31,7 +31,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -118,7 +118,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -155,7 +155,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -165,7 +165,7 @@ let echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) '' + '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' echo "-lunwind" >> $out/nix-support/cc-ldflags '' + lib.optionalString stdenv.targetPlatform.isWasm '' echo "-fno-exceptions" >> $out/nix-support/cc-cflags diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libcxx/default.nix index 4a078ac9cd..967d4b748d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libcxx/default.nix @@ -1,7 +1,11 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic }: +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation { pname = "libcxx"; inherit version; @@ -41,13 +45,13 @@ stdenv.mkDerivation { ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" @@ -64,13 +68,14 @@ stdenv.mkDerivation { abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${libcxxabi}/lib/$abiName $file + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file done done ''; passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi/default.nix index ab2d46f40a..ebf8a5c702 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi/default.nix @@ -67,6 +67,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/bintools/default.nix index a9d4f5fffc..1eb7215c00 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/bintools/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix index 95e05c969c..e2191a81e7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix @@ -31,7 +31,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -118,7 +118,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -155,7 +155,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -165,7 +165,7 @@ let echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags '' + lib.optionalString (!stdenv.targetPlatform.isWasm) '' echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags - '' + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) '' + '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) '' echo "-lunwind" >> $out/nix-support/cc-ldflags '' + lib.optionalString stdenv.targetPlatform.isWasm '' echo "-fno-exceptions" >> $out/nix-support/cc-cflags diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libcxx/default.nix index 65441c359d..ec09998ed3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libcxx/default.nix @@ -1,7 +1,11 @@ -{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic }: +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation { pname = "libcxx"; inherit version; @@ -37,13 +41,13 @@ stdenv.mkDerivation { ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3 ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [ libcxxabi ]; + buildInputs = [ cxxabi ]; cmakeFlags = [ - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" + "-DLIBCXX_CXX_ABI=${cxxabi.pname}" ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optionals stdenv.hostPlatform.isWasm [ "-DLIBCXX_ENABLE_THREADS=OFF" @@ -60,13 +64,14 @@ stdenv.mkDerivation { abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${libcxxabi}/lib/$abiName $file + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file done done ''; passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libcxxabi/default.nix index cfd1c32abd..f19bfb157c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/libcxxabi/default.nix @@ -67,6 +67,10 @@ stdenv.mkDerivation { install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/bintools/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/bintools/default.nix index 6a12d776ac..303faf7bbb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/bintools/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/bintools/default.nix @@ -5,7 +5,12 @@ let if stdenv.hostPlatform != stdenv.targetPlatform then "${stdenv.targetPlatform.config}-" else ""; -in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' +in runCommand "llvm-binutils-${version}" { + preferLocalBuild = true; + passthru = { + isLLVM = true; + }; +} '' mkdir -p $out/bin for prog in ${lld}/bin/*; do ln -s $prog $out/bin/${prefix}$(basename $prog) diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix index c5567d2f2e..ffbce74a48 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix @@ -35,7 +35,7 @@ let llvm_meta = { license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ lovek323 raskin dtzWill primeos ]; + maintainers = lib.teams.llvm.members; platforms = lib.platforms.all; }; @@ -113,7 +113,7 @@ let cc = tools.clang-unwrapped; libcxx = targetLlvmLibraries.libcxx; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ]; extraBuildCommands = mkExtraBuildCommands cc; @@ -153,7 +153,7 @@ let libcxx = targetLlvmLibraries.libcxx; bintools = bintools'; extraPackages = [ - targetLlvmLibraries.libcxxabi + libcxx.cxxabi targetLlvmLibraries.compiler-rt ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [ targetLlvmLibraries.libunwind @@ -166,7 +166,7 @@ let ] ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind" ++ lib.optional - (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) + (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) "-lunwind" ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix index 95e3204103..a29edb0658 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, llvm_meta , monorepoSrc, runCommand , cmake, python3, fixDarwinDylibNames, version -, libcxxabi +, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi +, libcxxabi, libcxxrt , enableShared ? !stdenv.hostPlatform.isStatic # If headersOnly is true, the resulting package would only include the headers. @@ -16,6 +17,8 @@ let basename = "libcxx"; in +assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi"; + stdenv.mkDerivation rec { pname = basename + lib.optionalString headersOnly "-headers"; inherit version; @@ -59,12 +62,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = lib.optionals (!headersOnly) [ libcxxabi ]; + buildInputs = lib.optionals (!headersOnly) [ cxxabi ]; cmakeFlags = [ "-DLLVM_ENABLE_RUNTIMES=libcxx" - "-DLIBCXX_CXX_ABI=${lib.optionalString (!headersOnly) "system-"}libcxxabi" - ] ++ lib.optional (!headersOnly) "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${libcxxabi.dev}/include/c++/v1" + "-DLIBCXX_CXX_ABI=${lib.optionalString (!headersOnly) "system-"}${cxxabi.pname}" + ] ++ lib.optional (!headersOnly && cxxabi.pname == "libcxxabi") "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi.dev}/include/c++/v1" ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" ++ lib.optionals stdenv.hostPlatform.isWasm [ @@ -85,13 +88,14 @@ stdenv.mkDerivation rec { abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/') for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do - ${stdenv.cc.targetPrefix}install_name_tool -change $other ${libcxxabi}/lib/$abiName $file + ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file done done ''; passthru = { isLLVM = true; + inherit cxxabi; }; meta = llvm_meta // { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 804acd6c74..3d5f875637 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -95,6 +95,10 @@ stdenv.mkDerivation rec { install -m 644 ../../${pname}/include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include" ''; + passthru = { + libName = "c++abi"; + }; + meta = llvm_meta // { homepage = "https://libcxxabi.llvm.org/"; description = "Provides C++ standard library support"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix index 656c226574..b4e2757f20 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; patches = [ ./gnu-install-dirs.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix b/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix new file mode 100644 index 0000000000..0ad4fa0db8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/minimacy/default.nix @@ -0,0 +1,73 @@ +{ lib, stdenv, fetchFromGitHub, makeBinaryWrapper +, alsaLib, libX11, libXext, libGL, libGLU +}: + +stdenv.mkDerivation rec { + pname = "minimacy"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "ambermind"; + repo = pname; + rev = version; + sha256 = "i0Z1UKApX+elHmFgujwjiF7k6OmtFF37HJim464OMfU="; + }; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + buildInputs = [ libGL libGLU ] ++ lib.optionals stdenv.isLinux [ alsaLib libX11 libXext ]; + + enableParallelBuilding = true; + + NIX_CFLAGS_COMPILE = "-Wno-unused-result"; + + preBuild = '' + pushd ${if stdenv.isDarwin then "macos/cmdline" else "unix"} + ''; + + # TODO: build graphic version for darwin + buildFlags = (if stdenv.isDarwin then [ "nox" ] else [ "all" ]) ++ [ "CC=${stdenv.cc.targetPrefix}cc" ]; + + postBuild = '' + popd + ''; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + bin/${if stdenv.isDarwin then "minimacyMac" else "minimacy"} system/demo/demo.fun.mandelbrot.mcy + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/minimacy + cp -r {README.md,LICENSE,system,rom,topLevel.mcy} $out/lib/minimacy + install bin/minimacy* -Dt $out/bin + + runHook postInstall + ''; + + postFixup = '' + for prog in $out/bin/minimacy*; + do wrapProgram $prog \ + --set MINIMACY $out/lib/minimacy + done + ''; + + meta = { + description = "An open-source minimalist computing technology"; + longDescription = '' + Minimacy is an open-source minimalist computation system based on the principle "Less is more". + It is designed and programmed by Sylvain Huet. + ''; + maintainers = with lib.maintainers; [ jboy ]; + homepage = "https://minimacy.net"; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix index 074ec0a474..bdd8022e69 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -262,7 +262,7 @@ in { runHook postBuild ''; - wrapperArgs = [ + wrapperArgs = lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${ placeholder "out" }/bin" diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/configure-3.08.0 b/third_party/nixpkgs/pkgs/development/compilers/ocaml/configure-3.08.0 deleted file mode 100755 index 9c87058551..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/configure-3.08.0 +++ /dev/null @@ -1,1482 +0,0 @@ -#! /bin/sh - -######################################################################### -# # -# Objective Caml # -# # -# Xavier Leroy, projet Cristal, INRIA Rocquencourt # -# # -# Copyright 1999 Institut National de Recherche en Informatique et # -# en Automatique. All rights reserved. This file is distributed # -# under the terms of the GNU Library General Public License, with # -# the special exception on linking described in file LICENSE. # -# # -######################################################################### - -# $Id: configure,v 1.215.2.3 2004/07/09 15:08:51 doligez Exp $ - -configure_options="$*" -prefix=/usr/local -bindir='' -libdir='' -mandir='' -manext=1 -host_type=unknown -ccoption='' -cclibs='' -curseslibs='' -mathlib='-lm' -dllib='' -x11_include_dir='' -x11_lib_dir='' -tk_wanted=yes -pthread_wanted=yes -tk_defs='' -tk_libs='' -tk_x11=yes -dl_defs='' -verbose=no -withcurses=yes -withsharedlibs=yes -binutils_dir='' -gcc_warnings="-Wall" - -# Try to turn internationalization off, can cause config.guess to malfunction! -unset LANG -unset LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME - -# Turn off some macOS debugging stuff, same reason -unset RC_TRACE_ARCHIVES RC_TRACE_DYLIBS RC_TRACE_PREBINDING_DISABLED - -# Parse command-line arguments - -while : ; do - case "$1" in - "") break;; - -prefix|--prefix) - prefix=$2; shift;; - -bindir|--bindir) - bindir=$2; shift;; - -libdir|--libdir) - libdir=$2; shift;; - -mandir|--mandir) - case "$2" in - */man[1-9ln]) - mandir=`echo $2 | sed -e 's|^\(.*\)/man.$|\1|'` - manext=`echo $2 | sed -e 's/^.*\(.\)$/\1/'`;; - *) - mandir=$2 - manext=1;; - esac - shift;; - -host*|--host*) - host_type=$2; shift;; - -cc*) - ccoption="$2"; shift;; - -lib*) - cclibs="$2 $cclibs"; shift;; - -no-curses) - withcurses=no;; - -no-shared-libs) - withsharedlibs=no;; - -x11include*|--x11include*) - x11_include_dir=$2; shift;; - -x11lib*|--x11lib*) - x11_lib_dir=$2; shift;; - -with-pthread*|--with-pthread*) - ;; # Ignored for backward compatibility - -no-pthread*|--no-pthread*) - pthread_wanted=no;; - -no-tk|--no-tk) - tk_wanted=no;; - -tkdefs*|--tkdefs*) - tk_defs=$2; shift;; - -tklibs*|--tklibs*) - tk_libs=$2; shift;; - -tk-no-x11|--tk-no-x11) - tk_x11=no;; - -dldefs*|--dldefs*) - dl_defs="$2"; shift;; - -dllibs*|--dllibs*) - dllib="$2"; shift;; - -binutils*|--binutils*) - binutils_dir=$2; shift;; - -verbose|--verbose) - verbose=yes;; - *) echo "Unknown option \"$1\"." 1>&2; exit 2;; - esac - shift -done - -# Sanity checks - -case "$prefix" in - /*) ;; - *) echo "The -prefix directory must be absolute." 1>&2; exit 2;; -esac -case "$bindir" in - /*) ;; - "") ;; - *) echo "The -bindir directory must be absolute." 1>&2; exit 2;; -esac -case "$libdir" in - /*) ;; - "") ;; - *) echo "The -libdir directory must be absolute." 1>&2; exit 2;; -esac -case "$mandir" in - /*) ;; - "") ;; - *) echo "The -mandir directory must be absolute." 1>&2; exit 2;; -esac - -# Generate the files - -cd config/auto-aux -rm -f s.h m.h Makefile -touch s.h m.h Makefile - -# Write options to Makefile - -echo "# generated by ./configure $configure_options" >> Makefile - -# Where to install - -echo "PREFIX=$prefix" >> Makefile -case "$bindir" in - "") echo 'BINDIR=$(PREFIX)/bin' >> Makefile - bindir="$prefix/bin";; - *) echo "BINDIR=$bindir" >> Makefile;; -esac -case "$libdir" in - "") echo 'LIBDIR=$(PREFIX)/lib/ocaml' >> Makefile - libdir="$prefix/lib/ocaml";; - *) echo "LIBDIR=$libdir" >> Makefile;; -esac -echo 'STUBLIBDIR=$(LIBDIR)/stublibs' >> Makefile -case "$mandir" in - "") echo 'MANDIR=$(PREFIX)/man' >> Makefile - mandir="$prefix/man";; - *) echo "MANDIR=$mandir" >> Makefile;; -esac -echo "MANEXT=$manext" >> Makefile - -# Determine the system type - -if test "$host_type" = "unknown"; then - if host_type=`../gnu/config.guess`; then :; else - echo "Cannot guess host type" - echo "You must specify one with the -host option" - exit 2 - fi -fi -if host=`../gnu/config.sub $host_type`; then :; else - echo "Please specify the correct host type with the -host option" - exit 2 -fi -echo "Configuring for a $host ..." - -# Do we have gcc? - -if test -z "$ccoption"; then - if sh ./searchpath gcc; then - echo "gcc found" - cc=gcc - else - cc=cc - fi -else - cc="$ccoption" -fi - -# Check for buggy versions of GCC - -buggycc="no" - -case "$host,$cc" in - i[3456]86-*-*,gcc*) - case `$cc --version` in - 2.7.2.1) cat <<'EOF' - -WARNING: you are using gcc version 2.7.2.1 on an Intel x86 processor. -This version of gcc is known to generate incorrect code for the -Objective Caml runtime system on some Intel x86 machines. (The symptom -is a crash of boot/ocamlc when compiling stdlib/pervasives.mli.) -In particular, the version of gcc 2.7.2.1 that comes with -Linux RedHat 4.x / Intel is affected by this problem. -Other Linux distributions might also be affected. -If you are using one of these configurations, you are strongly advised -to use another version of gcc, such as 2.95, which are -known to work well with Objective Caml. - -Press to proceed or to stop. -EOF - read reply;; - 2.96*) cat <<'EOF' - -WARNING: you are using gcc version 2.96 on an Intel x86 processor. -Certain patched versions of gcc 2.96 are known to generate incorrect -code for the Objective Caml runtime system. (The symptom is a segmentation -violation on boot/ocamlc.) Those incorrectly patched versions can be found -in RedHat 7.2 and Mandrake 8.0 and 8.1; other Linux distributions -might also be affected. (See bug #57760 on bugzilla.redhat.com) - -Auto-configuration will now select gcc compiler flags that work around -the problem. Still, if you observe segmentation faults while running -ocamlc or ocamlopt, you are advised to try another version of gcc, -such as 2.95.3 or 3.2. - -EOF - buggycc="gcc.2.96";; - - esac;; -esac - -# Configure the bytecode compiler - -bytecc="$cc" -bytecccompopts="" -bytecclinkopts="" -ostype="Unix" -exe="" - -case "$bytecc,$host" in - cc,*-*-nextstep*) - # GNU C extensions disabled, but __GNUC__ still defined! - bytecccompopts="-fno-defer-pop $gcc_warnings -U__GNUC__ -posix" - bytecclinkopts="-posix";; - *,*-*-rhapsody*) - # Almost the same as NeXTStep - bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC" - mathlib="";; - *,*-*-darwin*) - # Almost the same as rhapsody - bytecccompopts="-fno-defer-pop -no-cpp-precomp $gcc_warnings" - mathlib="";; - *,*-*-beos*) - bytecccompopts="-fno-defer-pop $gcc_warnings" - # No -lm library - mathlib="";; - gcc,alpha*-*-osf*) - bytecccompopts="-fno-defer-pop $gcc_warnings" - if cc="$bytecc" sh ./hasgot -mieee; then - bytecccompopts="-mieee $bytecccompopts"; - fi - # Put code and static data in lower 4GB - bytecclinkopts="-Wl,-T,12000000 -Wl,-D,14000000" - # Tell gcc that we can use 32-bit code addresses for threaded code - echo "#define ARCH_CODE32" >> m.h;; - cc,alpha*-*-osf*) - bytecccompopts="-std1 -ieee";; - gcc,alpha*-*-linux*) - if cc="$bytecc" sh ./hasgot -mieee; then - bytecccompopts="-mieee $bytecccompopts"; - fi;; - cc,mips-*-irix6*) - # Add -n32 flag to ensure compatibility with native-code compiler - bytecccompopts="-n32" - # Turn off warning "unused library" - bytecclinkopts="-n32 -Wl,-woff,84";; - cc*,mips-*-irix6*) - # (For those who want to force "cc -64") - # Turn off warning "unused library" - bytecclinkopts="-Wl,-woff,84";; - *,alpha*-*-unicos*) - # For the Cray T3E - bytecccompopts="-DUMK";; - gcc*,powerpc-*-aix4.3*) - # Avoid name-space pollution by requiring Unix98-conformant includes - bytecccompopts="-fno-defer-pop $gcc_warnings -D_XOPEN_SOURCE=500";; - *,powerpc-*-aix4.3*) - bytecccompopts="-D_XOPEN_SOURCE=500";; - gcc*,*-*-cygwin*) - bytecccompopts="-fno-defer-pop $gcc_warnings -U_WIN32" - exe=".exe" - ostype="Cygwin";; - gcc*,x86_64-*-linux*) - bytecccompopts="-fno-defer-pop $gcc_warnings" - # Tell gcc that we can use 32-bit code addresses for threaded code - echo "#define ARCH_CODE32" >> m.h;; - gcc*) - bytecccompopts="-fno-defer-pop $gcc_warnings";; -esac - -# Configure compiler to use in further tests - -cc="$bytecc -O $bytecclinkopts" -export cc cclibs verbose - -# Check C compiler - -sh ./runtest ansi.c -case $? in - 0) echo "The C compiler is ANSI-compliant.";; - 1) echo "The C compiler $cc is not ANSI-compliant." - echo "You need an ANSI C compiler to build Objective Caml." - exit 2;; - *) echo "Unable to compile the test program." - echo "Make sure the C compiler $cc is properly installed." - exit 2;; -esac - -# Check the sizes of data types - -echo "Checking the sizes of integers and pointers..." -set `sh ./runtest sizes.c` -case "$2,$3" in - 4,4) echo "OK, this is a regular 32 bit architecture." - echo "#undef ARCH_SIXTYFOUR" >> m.h;; - 8,8) echo "Wow! A 64 bit architecture!" - echo "#define ARCH_SIXTYFOUR" >> m.h;; - *,8) echo "Wow! A 64 bit architecture!" - echo "Unfortunately, Objective Caml cannot work in the case" - echo "sizeof(long) != sizeof(long *)." - echo "Objective Caml won't run on this architecture." - exit 2;; - *,*) echo "This architecture seems to be neither 32 bits nor 64 bits." - echo "Objective Caml won't run on this architecture." - exit 2;; - *) echo "Unable to compile the test program." - echo "Make sure the C compiler $cc is properly installed." - exit 2;; -esac -if test $1 != 4 && test $2 != 4 && test $4 != 4; then - echo "Sorry, we can't find a 32-bit integer type" - echo "(sizeof(short) = $4, sizeof(int) = $1, sizeof(long) = $2)" - echo "Objective Caml won't run on this architecture." - exit 2 -fi - -echo "#define SIZEOF_INT $1" >> m.h -echo "#define SIZEOF_LONG $2" >> m.h -echo "#define SIZEOF_SHORT $4" >> m.h - -if test $2 = 8; then - echo "#define ARCH_INT64_TYPE long" >> m.h - echo "#define ARCH_UINT64_TYPE unsigned long" >> m.h - echo '#define ARCH_INT64_PRINTF_FORMAT "l"' >> m.h - int64_native=true -else - sh ./runtest longlong.c - case $? in - 0) echo "64-bit \"long long\" integer type found (printf with \"%ll\")." - echo "#define ARCH_INT64_TYPE long long" >> m.h - echo "#define ARCH_UINT64_TYPE unsigned long long" >> m.h - echo '#define ARCH_INT64_PRINTF_FORMAT "ll"' >> m.h - int64_native=true;; - 1) echo "64-bit \"long long\" integer type found (printf with \"%q\")." - echo "#define ARCH_INT64_TYPE long long" >> m.h - echo "#define ARCH_UINT64_TYPE unsigned long long" >> m.h - echo '#define ARCH_INT64_PRINTF_FORMAT "q"' >> m.h - int64_native=true;; - 2) echo "64-bit \"long long\" integer type found (but no printf)." - echo "#define ARCH_INT64_TYPE long long" >> m.h - echo "#define ARCH_UINT64_TYPE unsigned long long" >> m.h - echo '#undef ARCH_INT64_PRINTF_FORMAT' >> m.h - int64_native=true;; - *) echo "No suitable 64-bit integer type found, will use software emulation." - echo "#undef ARCH_INT64_TYPE" >> m.h - echo "#undef ARCH_UINT64_TYPE" >> m.h - echo '#undef ARCH_INT64_PRINTF_FORMAT' >> m.h - int64_native=false;; - esac -fi - -# Determine endianness - -sh ./runtest endian.c -case $? in - 0) echo "This is a big-endian architecture." - echo "#define ARCH_BIG_ENDIAN" >> m.h;; - 1) echo "This is a little-endian architecture." - echo "#undef ARCH_BIG_ENDIAN" >> m.h;; - 2) echo "This architecture seems to be neither big endian nor little endian." - echo "Objective Caml won't run on this architecture." - exit 2;; - *) echo "Something went wrong during endianness determination." - echo "You'll have to figure out endianness yourself" - echo "(option ARCH_BIG_ENDIAN in m.h).";; -esac - -# Determine alignment constraints - -case "$host" in - sparc-*-*|hppa*-*-*) - # On Sparc V9 with certain versions of gcc, determination of double - # alignment is not reliable (PR#1521), hence force it. - # Same goes for hppa. - # But there's a knack (PR#2572): - # if we're in 64-bit mode (sizeof(long) == 8), - # we must not doubleword-align floats... - if test $2 = 8; then - echo "Doubles can be word-aligned." - echo "#undef ARCH_ALIGN_DOUBLE" >> m.h - else - echo "Doubles must be doubleword-aligned." - echo "#define ARCH_ALIGN_DOUBLE" >> m.h - fi;; - *) - sh ./runtest dblalign.c - case $? in - 0) echo "Doubles can be word-aligned." - echo "#undef ARCH_ALIGN_DOUBLE" >> m.h;; - 1) echo "Doubles must be doubleword-aligned." - echo "#define ARCH_ALIGN_DOUBLE" >> m.h;; - *) echo "Something went wrong during alignment determination for doubles." - echo "I'm going to assume this architecture has alignment constraints over doubles." - echo "That's a safe bet: Objective Caml will work even if" - echo "this architecture has actually no alignment constraints." - echo "#define ARCH_ALIGN_DOUBLE" >> m.h;; - esac;; -esac - -if $int64_native; then - case "$host" in - hppa*-*-*) - if test $2 = 8; then - echo "64-bit integers can be word-aligned." - echo "#undef ARCH_ALIGN_INT64" >> m.h - else - echo "64-bit integers must be doubleword-aligned." - echo "#define ARCH_ALIGN_INT64" >> m.h - fi;; - *) - sh ./runtest int64align.c - case $? in - 0) echo "64-bit integers can be word-aligned." - echo "#undef ARCH_ALIGN_INT64" >> m.h;; - 1) echo "64-bit integers must be doubleword-aligned." - echo "#define ARCH_ALIGN_INT64" >> m.h;; - *) echo "Something went wrong during alignment determination for 64-bit integers." - echo "I'm going to assume this architecture has alignment constraints." - echo "That's a safe bet: Objective Caml will work even if" - echo "this architecture has actually no alignment constraints." - echo "#define ARCH_ALIGN_INT64" >> m.h;; - esac - esac -else - echo "#undef ARCH_ALIGN_INT64" >> m.h -fi - -# Check semantics of division and modulus - -sh ./runtest divmod.c -case $? in - 0) echo "Native division and modulus have round-towards-zero semantics, will use them." - echo "#undef NONSTANDARD_DIV_MOD" >> m.h;; - 1) echo "Native division and modulus do not have round-towards-zero semantics, will use software emulation." - echo "#define NONSTANDARD_DIV_MOD" >> m.h;; - *) echo "Something went wrong while checking native division and modulus, please report it." - echo "#define NONSTANDARD_DIV_MOD" >> m.h;; -esac - -# Shared library support - -shared_libraries_supported=false -dl_needs_underscore=false -sharedcccompopts='' -mksharedlib='' -byteccrpath='' -mksharedlibrpath='' - -if test $withsharedlibs = "yes"; then - case "$host" in - *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*) - sharedcccompopts="-fPIC" - mksharedlib="$bytecc -shared -o" - bytecclinkopts="$bytecclinkopts -Wl,-E" - byteccrpath="-Wl,-rpath," - mksharedlibrpath="-Wl,-rpath," - shared_libraries_supported=true;; - alpha*-*-osf*) - case "$bytecc" in - gcc*) - sharedcccompopts="-fPIC" - mksharedlib="$bytecc -shared -o" - byteccrpath="-Wl,-rpath," - mksharedlibrpath="-Wl,-rpath," - shared_libraries_supported=true;; - cc*) - sharedcccompopts="" - mksharedlib="ld -shared -expect_unresolved '*' -o" - byteccrpath="-Wl,-rpath," - mksharedlibrpath="-rpath " - shared_libraries_supported=true;; - esac;; - *-*-solaris2*) - case "$bytecc" in - gcc*) - sharedcccompopts="-fPIC" - if sh ./solaris-ld; then - mksharedlib="$bytecc -shared -o" - byteccrpath="-R" - mksharedlibrpath="-R" - else - mksharedlib="$bytecc -shared -o" - bytecclinkopts="$bytecclinkopts -Wl,-E" - byteccrpath="-Wl,-rpath," - mksharedlibrpath="-Wl,-rpath," - fi - shared_libraries_supported=true;; - *) - sharedcccompopts="-KPIC" - byteccrpath="-R" - mksharedlibrpath="-R" - mksharedlib="/usr/ccs/bin/ld -G -o" - shared_libraries_supported=true;; - esac;; - mips*-*-irix[56]*) - case "$bytecc" in - cc*) sharedcccompopts="";; - gcc*) sharedcccompopts="-fPIC";; - esac - mksharedlib="ld -shared -rdata_shared -o" - byteccrpath="-Wl,-rpath," - mksharedlibrpath="-rpath " - shared_libraries_supported=true;; - powerpc-apple-darwin*) - mksharedlib="cc -bundle -flat_namespace -undefined suppress -o" - bytecccompopts="$dl_defs $bytecccompopts" - #sharedcccompopts="-fnocommon" - dl_needs_underscore=true - shared_libraries_supported=true;; - esac -fi - -# Further machine-specific hacks - -case "$host" in - ia64-*-linux*|alpha*-*-linux*|x86_64-*-linux*) - echo "Will use mmap() instead of malloc() for allocation of major heap chunks." - echo "#define USE_MMAP_INSTEAD_OF_MALLOC" >> s.h;; -esac - -# Configure the native-code compiler - -arch=none -model=default -system=unknown - -case "$host" in - alpha*-*-osf*) arch=alpha; system=digital;; - alpha*-*-linux*) arch=alpha; system=linux;; - alpha*-*-freebsd*) arch=alpha; system=freebsd;; - alpha*-*-netbsd*) arch=alpha; system=netbsd;; - alpha*-*-openbsd*) arch=alpha; system=openbsd;; - sparc*-*-sunos4.*) arch=sparc; system=sunos;; - sparc*-*-solaris2.*) arch=sparc; system=solaris;; - sparc*-*-*bsd*) arch=sparc; system=bsd;; - sparc*-*-linux*) arch=sparc; system=linux;; - i[3456]86-*-linux*) arch=i386; system=linux_`sh ./runtest elf.c`;; - i[3456]86-*-*bsd*) arch=i386; system=bsd_`sh ./runtest elf.c`;; - i[3456]86-*-nextstep*) arch=i386; system=nextstep;; - i[3456]86-*-solaris*) arch=i386; system=solaris;; - i[3456]86-*-beos*) arch=i386; system=beos;; - i[3456]86-*-cygwin*) arch=i386; system=cygwin;; - mips-*-irix6*) arch=mips; system=irix;; - hppa1.1-*-hpux*) arch=hppa; system=hpux;; - hppa2.0*-*-hpux*) arch=hppa; system=hpux;; - hppa*-*-linux*) arch=hppa; system=linux;; - powerpc-*-linux*) arch=power; model=ppc; system=elf;; - powerpc-*-netbsd*) arch=power; model=ppc; system=bsd;; - powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;; - powerpc-*-darwin*) arch=power; model=ppc; system=rhapsody;; - arm*-*-linux*) arch=arm; system=linux;; - ia64-*-linux*) arch=ia64; system=linux;; - ia64-*-freebsd*) arch=ia64; system=freebsd;; - x86_64-*-linux*) arch=amd64; system=linux;; - x86_64-*-freebsd*) arch=amd64; system=freebsd;; - x86_64-*-openbsd*) arch=amd64; system=openbsd;; -esac - -if test -z "$ccoption"; then - case "$arch,$system,$cc" in - alpha,digital,gcc*) nativecc=cc;; - mips,*,gcc*) nativecc=cc;; - *) nativecc="$bytecc";; - esac -else - nativecc="$ccoption" -fi - -nativecccompopts='' -nativecclinkopts='' -nativeccrpath="$byteccrpath" - -case "$arch,$nativecc,$system,$host_type" in - alpha,cc*,digital,*) nativecccompopts=-std1;; - mips,cc*,irix,*) nativecccompopts=-n32 - nativecclinkopts="-n32 -Wl,-woff,84";; - *,*,nextstep,*) nativecccompopts="$gcc_warnings -U__GNUC__ -posix" - nativecclinkopts="-posix";; - *,*,rhapsody,*darwin[1-5].*) - nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";; - *,*,rhapsody,*) - nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs";; - *,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";; - *,gcc*,*,*) nativecccompopts="$gcc_warnings";; -esac - -asflags='' -aspp='$(AS)' -asppflags='' -asppprofflags='-DPROFILING' - -case "$arch,$model,$system" in - alpha,*,digital) asflags='-O2'; asppflags='-O2 -DSYS_$(SYSTEM)'; - asppprofflags='-pg -DPROFILING';; - alpha,*,linux) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - alpha,*,freebsd) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - alpha,*,netbsd) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - alpha,*,openbsd) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - mips,*,irix) asflags='-n32 -O2'; asppflags="$asflags";; - sparc,*,bsd) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - sparc,*,linux) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - sparc,*,*) case "$cc" in - gcc*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - *) asppflags='-P -DSYS_$(SYSTEM)';; - esac;; - i386,*,solaris) aspp='/usr/ccs/bin/as'; asppflags='-P -DSYS_$(SYSTEM)';; - i386,*,*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - hppa,*,*) aspp="$cc"; asppflags='-traditional -c -DSYS_$(SYSTEM)';; - power,*,elf) aspp='gcc'; asppflags='-c';; - power,*,bsd) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - power,*,rhapsody) ;; - arm,*,linux) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; - ia64,*,*) asflags=-xexplicit - aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM) -Wa,-xexplicit';; - amd64,*,*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';; -esac - -cc_profile='-pg' -case "$arch,$model,$system" in - alpha,*,digital) profiling='prof';; - i386,*,linux_elf) profiling='prof';; - i386,*,bsd_elf) profiling='prof';; - sparc,*,solaris) - profiling='prof' - case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; - amd64,*,linux) profiling='prof';; - *) profiling='noprof';; -esac - -# Where are GNU binutils? - -binutils_objcopy='' -binutils_nm='' - -if test "$arch" != "none"; then - binutils_path="${binutils_dir}:${PATH}:/usr/libexec/binutils" - old_IFS="$IFS" - IFS=':' - for d in ${binutils_path}; do - if test -z "$d"; then continue; fi - if test -f "$d/objcopy" && test -f "$d/nm"; then - echo "objcopy and nm found in $d" - if test `$d/objcopy --help | grep -s -c 'redefine-sym'` -eq 0; then - echo "$d/objcopy does not support option --redefine-sym, discarded" - continue; - fi - if test `$d/nm --version | grep -s -c 'GNU nm'` -eq 0; then - echo "$d/nm is not from GNU binutils, discarded" - continue; - fi - binutils_objcopy="$d/objcopy" - binutils_nm="$d/nm" - break - fi - done - IFS="$old_IFS" -fi - -# Where is ranlib? - -if sh ./searchpath ranlib; then - echo "ranlib found" - echo "RANLIB=ranlib" >> Makefile - echo "RANLIBCMD=ranlib" >> Makefile -else - echo "ranlib not used" - echo "RANLIB=ar rs" >> Makefile - echo "RANLIBCMD=" >> Makefile -fi - -# Do #! scripts work? - -if (SHELL=/bin/sh; export SHELL; (./sharpbang || ./sharpbang2) >/dev/null); then - echo "#! appears to work in shell scripts" - case "$host" in - *-*-sunos*|*-*-unicos*) - echo "We won't use it, though, because under SunOS and Unicos it breaks" - echo "on pathnames longer than 30 characters" - echo "SHARPBANGSCRIPTS=false" >> Makefile;; - *-*-cygwin*) - echo "We won't use it, though, because of conflicts with .exe extension" - echo "under Cygwin" - echo "SHARPBANGSCRIPTS=false" >> Makefile;; - *) - echo "SHARPBANGSCRIPTS=true" >> Makefile;; - esac -else - echo "No support for #! in shell scripts" - echo "SHARPBANGSCRIPTS=false" >> Makefile -fi - -# Write the OS type (Unix or Cygwin) - -echo "#define OCAML_OS_TYPE \"$ostype\"" >> s.h -echo "#define OCAML_STDLIB_DIR \"$libdir\"" >> s.h - -# Use 64-bit file offset if possible - -bytecccompopts="$bytecccompopts -D_FILE_OFFSET_BITS=64" -nativecccompopts="$nativecccompopts -D_FILE_OFFSET_BITS=64" - -# Check the semantics of signal handlers - -if sh ./hasgot sigaction sigprocmask; then - echo "POSIX signal handling found." - echo "#define POSIX_SIGNALS" >> s.h -else - if sh ./runtest signals.c; then - echo "Signals have the BSD semantics." - echo "#define BSD_SIGNALS" >> s.h - else - echo "Signals have the System V semantics." - fi - if sh ./hasgot sigsetmask; then - echo "sigsetmask() found" - echo "#define HAS_SIGSETMASK" >> s.h - fi -fi - -# For the sys module - -if sh ./hasgot times; then - echo "times() found." - echo "#define HAS_TIMES" >> s.h -fi - -# For the terminfo module - -if test "$withcurses" = "yes"; then - for libs in "" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do - if sh ./hasgot $libs tgetent tgetstr tgetnum tputs; then - echo "termcap functions found (with libraries '$libs')" - echo "#define HAS_TERMCAP" >> s.h - curseslibs="${libs}" - break - fi - done -fi - -# Configuration for the libraries - -otherlibraries="unix str num dynlink bigarray" - -# For the Unix library - -has_sockets=no -if sh ./hasgot socket socketpair bind listen accept connect; then - echo "You have BSD sockets." - echo "#define HAS_SOCKETS" >> s.h - has_sockets=yes -elif sh ./hasgot -lnsl -lsocket socket socketpair bind listen accept connect; then - echo "You have BSD sockets (with libraries '-lnsl -lsocket')" - cclibs="$cclibs -lnsl -lsocket" - echo "#define HAS_SOCKETS" >> s.h - has_sockets=yes -fi - -if sh ./hasgot -i sys/socket.h -t socklen_t; then - echo "socklen_t is defined in " - echo "#define HAS_SOCKLEN_T" >> s.h -fi - -if sh ./hasgot inet_aton; then - echo "inet_aton() found." - echo "#define HAS_INET_ATON" >> s.h -fi - -if sh ./hasgot -i sys/types.h -i sys/socket.h -i netinet/in.h \ - -t 'struct sockaddr_in6' \ -&& sh ./hasgot getaddrinfo getnameinfo inet_pton inet_ntop; then - echo "IPv6 is supported." - echo "#define HAS_IPV6" >> s.h -fi - -if sh ./hasgot -i unistd.h; then - echo "unistd.h found." - echo "#define HAS_UNISTD" >> s.h -fi - -if sh ./hasgot -i sys/types.h -t off_t; then - echo "off_t is defined in " - echo "#define HAS_OFF_T" >> s.h -fi - -if sh ./hasgot -i sys/types.h -i dirent.h; then - echo "dirent.h found." - echo "#define HAS_DIRENT" >> s.h -fi - -if sh ./hasgot rewinddir; then - echo "rewinddir() found." - echo "#define HAS_REWINDDIR" >> s.h -fi - -if sh ./hasgot lockf; then - echo "lockf() found." - echo "#define HAS_LOCKF" >> s.h -fi - -if sh ./hasgot mkfifo; then - echo "mkfifo() found." - echo "#define HAS_MKFIFO" >> s.h -fi - -if sh ./hasgot getcwd; then - echo "getcwd() found." - echo "#define HAS_GETCWD" >> s.h -fi - -if sh ./hasgot getwd; then - echo "getwd() found." - echo "#define HAS_GETWD" >> s.h -fi - -if sh ./hasgot getpriority setpriority; then - echo "getpriority() found." - echo "#define HAS_GETPRIORITY" >> s.h -fi - -if sh ./hasgot -i sys/types.h -i utime.h && sh ./hasgot utime; then - echo "utime() found." - echo "#define HAS_UTIME" >> s.h -fi - -if sh ./hasgot utimes; then - echo "utimes() found." - echo "#define HAS_UTIMES" >> s.h -fi - -if sh ./hasgot dup2; then - echo "dup2() found." - echo "#define HAS_DUP2" >> s.h -fi - -if sh ./hasgot fchmod fchown; then - echo "fchmod() found." - echo "#define HAS_FCHMOD" >> s.h -fi - -if sh ./hasgot truncate ftruncate; then - echo "truncate() found." - echo "#define HAS_TRUNCATE" >> s.h -fi - -select_include='' -if sh ./hasgot -i sys/types.h -i sys/select.h; then - echo "sys/select.h found." - echo "#define HAS_SYS_SELECT_H" >> s.h - select_include='-i sys/select.h' -fi - -has_select=no -if sh ./hasgot select && \ - sh ./hasgot -i sys/types.h $select_include -t fd_set ; then - echo "select() found." - echo "#define HAS_SELECT" >> s.h - has_select=yes -fi - -if sh ./hasgot symlink readlink lstat; then - echo "symlink() found." - echo "#define HAS_SYMLINK" >> s.h -fi - -has_wait=no -if sh ./hasgot waitpid; then - echo "waitpid() found." - echo "#define HAS_WAITPID" >> s.h - has_wait=yes -fi - -if sh ./hasgot wait4; then - echo "wait4() found." - echo "#define HAS_WAIT4" >> s.h - has_wait=yes -fi - -if sh ./hasgot -i limits.h && sh ./runtest getgroups.c; then - echo "getgroups() found." - echo "#define HAS_GETGROUPS" >> s.h -fi - -if sh ./hasgot -i termios.h && - sh ./hasgot tcgetattr tcsetattr tcsendbreak tcflush tcflow; then - echo "POSIX termios found." - echo "#define HAS_TERMIOS" >> s.h -fi - -# Async I/O under OSF1 3.x are so buggy that the test program hangs... -testasyncio=true -if test -f /usr/bin/uname; then - case "`/usr/bin/uname -s -r`" in - "OSF1 V3."*) testasyncio=false;; - esac -fi -if $testasyncio && sh ./runtest async_io.c; then - echo "Asynchronous I/O are supported." - echo "#define HAS_ASYNC_IO" >> s.h -fi - -has_setitimer=no -if sh ./hasgot setitimer; then - echo "setitimer() found." - echo "#define HAS_SETITIMER" >> s.h - has_setitimer="yes" -fi - -if sh ./hasgot gethostname; then - echo "gethostname() found." - echo "#define HAS_GETHOSTNAME" >> s.h -fi - -if sh ./hasgot -i sys/utsname.h && sh ./hasgot uname; then - echo "uname() found." - echo "#define HAS_UNAME" >> s.h -fi - -has_gettimeofday=no -if sh ./hasgot gettimeofday; then - echo "gettimeofday() found." - echo "#define HAS_GETTIMEOFDAY" >> s.h - has_gettimeofday="yes" -fi - -if sh ./hasgot mktime; then - echo "mktime() found." - echo "#define HAS_MKTIME" >> s.h -fi - -case "$host" in - *-*-cygwin*) ;; # setsid emulation under Cygwin breaks the debugger - *) if sh ./hasgot setsid; then - echo "setsid() found." - echo "#define HAS_SETSID" >> s.h - fi;; -esac - -if sh ./hasgot putenv; then - echo "putenv() found." - echo "#define HAS_PUTENV" >> s.h -fi - -if sh ./hasgot -i locale.h && sh ./hasgot setlocale; then - echo "setlocale() and found." - echo "#define HAS_LOCALE" >> s.h -fi - -if sh ./hasgot -i mach-o/dyld.h && sh ./hasgot NSLinkModule; then - echo "NSLinkModule() found. Using darwin dynamic loading." - echo "#define HAS_NSLINKMODULE" >> s.h -elif sh ./hasgot $dllib dlopen; then - echo "dlopen() found." -elif sh ./hasgot $dllib -ldl dlopen; then - echo "dlopen() found in -ldl." - dllib="$dllib -ldl" -else - shared_libraries_supported=no -fi - -if $shared_libraries_supported; then - echo "Dynamic loading of shared libraries is supported." - echo "#define SUPPORT_DYNAMIC_LINKING" >> s.h - if $dl_needs_underscore; then - echo '#define DL_NEEDS_UNDERSCORE' >>s.h - fi -fi - -if sh ./hasgot -i sys/types.h -i sys/mman.h && sh ./hasgot mmap munmap; then - echo "mmap() found." - echo "#define HAS_MMAP" >> s.h -fi - -nargs=none -for i in 5 6; do - if sh ./trycompile -DNUM_ARGS=${i} gethostbyname.c; then nargs=$i; break; fi -done -if test $nargs != "none"; then - echo "gethostbyname_r() found (with ${nargs} arguments)." - echo "#define HAS_GETHOSTBYNAME_R $nargs" >> s.h -fi - -nargs=none -for i in 7 8; do - if sh ./trycompile -DNUM_ARGS=${i} gethostbyaddr.c; then nargs=$i; break; fi -done -if test $nargs != "none"; then - echo "gethostbyaddr_r() found (with ${nargs} arguments)." - echo "#define HAS_GETHOSTBYADDR_R $nargs" >> s.h -fi - -# Determine if the debugger is supported - -if test "$has_sockets" = "yes"; then - echo "Replay debugger supported." - debugger="ocamldebugger" -else - echo "No replay debugger (missing system calls)" - debugger="" -fi - - -# Determine if system stack overflows can be detected - -case "$arch,$system" in - i386,linux_elf) - echo "System stack overflow can be detected." - echo "#define HAS_STACK_OVERFLOW_DETECTION" >> s.h;; - *) - echo "Cannot detect system stack overflow.";; -esac - -# Determine the target architecture for the "num" library - -case "$host" in - alpha*-*-*) bng_arch=alpha; bng_asm_level=1;; - i[3456]86-*-*) bng_arch=ia32 - if sh ./trycompile ia32sse2.c - then bng_asm_level=2 - else bng_asm_level=1 - fi;; - mips-*-*) bng_arch=mips; bng_asm_level=1;; - powerpc-*-*) bng_arch=ppc; bng_asm_level=1;; - sparc*-*-*) bng_arch=sparc; bng_asm_level=1;; - x86_64-*-*) bng_arch=amd64; bng_asm_level=1;; - *) bng_arch=generic; bng_asm_level=0;; -esac - -echo "BNG_ARCH=$bng_arch" >> Makefile -echo "BNG_ASM_LEVEL=$bng_asm_level" >> Makefile - -# Determine if the POSIX threads library is supported - -if test "$pthread_wanted" = "yes"; then - case "$host" in - *-*-solaris*) pthread_link="-lpthread -lposix4";; - *-*-freebsd*) pthread_link="-pthread";; - *-*-openbsd*) pthread_link="-pthread";; - *) pthread_link="-lpthread";; - esac - if ./hasgot -i pthread.h $pthread_link pthread_self; then - echo "POSIX threads library supported." - otherlibraries="$otherlibraries systhreads" - bytecccompopts="$bytecccompopts -D_REENTRANT" - nativecccompopts="$nativecccompopts -D_REENTRANT" - case "$host" in - *-*-freebsd*) - bytecccompopts="$bytecccompopts -D_THREAD_SAFE" - nativecccompopts="$nativecccompopts -D_THREAD_SAFE";; - *-*-openbsd*) - bytecccompopts="$bytecccompopts -pthread" - asppflags="$asppflags -pthread" - nativecccompopts="$nativecccompopts -pthread";; - esac - echo "Options for linking with POSIX threads: $pthread_link" - echo "PTHREAD_LINK=$pthread_link" >> Makefile - if sh ./hasgot $pthread_link sigwait; then - echo "sigwait() found" - echo "#define HAS_SIGWAIT" >> s.h - fi - else - echo "POSIX threads not found." - pthread_link="" - fi -fi - -# Determine if the bytecode thread library is supported - -if test "$has_select" = "yes" \ -&& test "$has_setitimer" = "yes" \ -&& test "$has_gettimeofday" = "yes" \ -&& test "$has_wait" = "yes"; then - echo "Bytecode threads library supported." - otherlibraries="$otherlibraries threads" -else - echo "Bytecode threads library not supported (missing system calls)" -fi - -# Determine the location of X include files and libraries - -x11_include="not found" -x11_link="not found" - -for dir in \ - $x11_include_dir \ - ; \ -do - if test -f $dir/X11/X.h; then - x11_include=$dir - break - fi -done - -if test "$x11_include" = "not found"; then - x11_try_lib_dir='' -else - x11_try_lib_dir=`echo $x11_include | sed -e 's|include|lib|'` -fi - -for dir in \ - $x11_lib_dir \ - $x11_try_lib_dir \ - ; \ -do - if test -f $dir/libX11.a || \ - test -f $dir/libX11.so || \ - test -f $dir/libX11.dll.a || \ - test -f $dir/libX11.sa; then - if test $dir = /usr/lib; then - x11_link="-lX11" - else - x11_link="-L$dir -lX11" - x11_libs="-L$dir" - fi - break - fi -done - - -if test "$x11_include" = "not found" || test "$x11_link" = "not found" -then - echo "X11 not found, the \"graph\" library will not be supported." - x11_include="" -else - echo "Location of X11 include files: $x11_include/X11" - echo "Options for linking with X11: $x11_link" - otherlibraries="$otherlibraries graph" - if test "$x11_include" = "/usr/include"; then - x11_include="" - else - x11_include="-I$x11_include" - fi - echo "X11_INCLUDES=$x11_include" >> Makefile - echo "X11_LINK=$x11_link" >> Makefile -fi - -# See if we can compile the dbm library - -dbm_include="not found" -dbm_link="not found" -use_gdbm_ndbm=no - -for dir in ; do - if test -f $dir/ndbm.h; then - dbm_include=$dir - if sh ./hasgot dbm_open; then - dbm_link="" - elif sh ./hasgot -lndbm dbm_open; then - dbm_link="-lndbm" - elif sh ./hasgot -ldb1 dbm_open; then - dbm_link="-ldb1" - elif sh ./hasgot -lgdbm dbm_open; then - dbm_link="-lgdbm" - elif sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then - dbm_link="-lgdbm_compat -lgdbm" - fi - break - fi - if test -f $dir/gdbm-ndbm.h; then - dbm_include=$dir - use_gdbm_ndbm=yes - if sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then - dbm_link="-lgdbm_compat -lgdbm" - fi - break - fi -done -if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then - echo "NDBM not found, the \"dbm\" library will not be supported." -else - echo "NDBM found (in $dbm_include)" - if test "$dbm_include" = "/usr/include"; then - dbm_include="" - else - dbm_include="-I$dbm_include" - fi - echo "DBM_INCLUDES=$dbm_include" >> Makefile - echo "DBM_LINK=$dbm_link" >> Makefile - if test "$use_gdbm_ndbm" = "yes"; then - echo "#define DBM_USES_GDBM_NDBM" >> s.h - fi - otherlibraries="$otherlibraries dbm" -fi - -# Look for tcl/tk - -echo "Configuring LablTk..." - -if test $tk_wanted = no; then - has_tk=false -elif test $tk_x11 = no; then - has_tk=true -elif test "$x11_include" = "not found" || test "$x11_link" = "not found"; then - echo "X11 not found." - has_tk=false -else - tk_x11_include="$x11_include" - tk_x11_libs="$x11_libs -lX11" - has_tk=true -fi - -if test $has_tk = true; then - tcl_version='' - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - if test -z "$tcl_version" && test -z "$tk_defs"; then - tk_defs=-I/usr/local/include - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -z "$tcl_version"; then - tk_defs="-I/usr/local/include/tcl8.2 -I/usr/local/include/tk8.2" - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -z "$tcl_version"; then - tk_defs="-I/usr/local/include/tcl8.3 -I/usr/local/include/tk8.3" - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -z "$tcl_version"; then - tk_defs="-I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4" - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -z "$tcl_version"; then - tk_defs="-I/usr/include/tcl8.2 -I/usr/include/tk8.2" - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -z "$tcl_version"; then - tk_defs="-I/usr/include/tcl8.3 -I/usr/include/tk8.3" - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -z "$tcl_version"; then - tk_defs="-I/usr/include/tcl8.4 -I/usr/include/tk8.4" - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -z "$tcl_version"; then - tk_defs="-I/sw/include" - tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c` - fi - if test -n "$tcl_version"; then - echo "tcl.h version $tcl_version found with \"$tk_defs\"." - case $tcl_version in - 7.5) tclmaj=7 tclmin=5 tkmaj=4 tkmin=1 ;; - 7.6) tclmaj=7 tclmin=6 tkmaj=4 tkmin=2 ;; - 8.0) tclmaj=8 tclmin=0 tkmaj=8 tkmin=0 ;; - 8.1) tclmaj=8 tclmin=1 tkmaj=8 tkmin=1 ;; - 8.2) tclmaj=8 tclmin=2 tkmaj=8 tkmin=2 ;; - 8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;; - 8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;; - *) echo "This version is not known."; has_tk=false ;; - esac - else - echo "tcl.h not found." - has_tk=false - fi -fi - -if test $has_tk = true; then - if sh ./hasgot $tk_x11_include $tk_defs -i tk.h; then - echo "tk.h found." - else - echo "tk.h not found." - has_tk=false - fi -fi - -tkauxlibs="$mathlib $dllib" -tcllib='' -tklib='' -if test $has_tk = true; then - if sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tcl_DoOneEvent - then tk_libs="$tk_libs $dllib" - elif sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent - then - tk_libs="$tk_libs -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib" - elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent - then - tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib" - elif test -z "$tk_libs" && tk_libs=-L/usr/local/lib && \ - sh ./hasgot $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs Tcl_DoOneEvent - then - tk_libs="$tk_libs -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib" - elif sh ./hasgot $tk_libs -ltcl$tclmaj$tclmin $tkauxlibs Tcl_DoOneEvent - then - tk_libs="$tk_libs -ltk$tkmaj$tkmin -ltcl$tclmaj$tclmin $dllib" -# elif sh ./hasgot $tk_libs -ltcl $tkauxlibs Tcl_DoOneEvent; then -# tk_libs="$tk_libs -ltk -ltcl" - elif sh ./hasgot -L/sw/lib $tk_libs -ltcl$tclmaj.$tclmin $tkauxlibs \ - Tcl_DoOneEvent - then tk_libs="-L/sw/lib -ltk$tkmaj.$tkmin -ltcl$tclmaj.$tclmin $dllib" - else - echo "Tcl library not found." - has_tk=false - fi -fi -if test $has_tk = true; then - if sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then - echo "Tcl/Tk libraries found." - elif sh ./hasgot -L/sw/lib $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then - tk_libs="-L/sw/lib $tk_libs" - echo "Tcl/Tk libraries found." - else - echo "Tcl library found." - echo "Tk library not found." - has_tk=false - fi -fi - -if test $has_tk = true; then - if test $tk_x11 = yes; then - echo "TK_DEFS=$tk_defs "'$(X11_INCLUDES)' >> Makefile - echo "TK_LINK=$tk_libs "'$(X11_LINK)' >> Makefile - else - echo "TK_DEFS=$tk_defs" >> Makefile - echo "TK_LINK=$tk_libs" >> Makefile - fi - otherlibraries="$otherlibraries labltk" -else - echo "Configuration failed, LablTk will not be built." -fi - -# Camlp4 - -( -cd ../../camlp4/config -EXE=$exe ./configure_batch -bindir "$bindir" -libdir "$libdir" -mandir "$mandir" -ocaml-top ../.. > /dev/null -) - -# Final twiddling of compiler options to work around known bugs - -nativeccprofopts="$nativecccompopts" -case "$buggycc" in - gcc.2.96) - bytecccompopts="$bytecccompopts -fomit-frame-pointer" - nativecccompopts="$nativecccompopts -fomit-frame-pointer";; -esac - -# Finish generated files - -cclibs="$cclibs $mathlib" - -echo "BYTECC=$bytecc" >> Makefile -echo "BYTECCCOMPOPTS=$bytecccompopts" >> Makefile -echo "BYTECCLINKOPTS=$bytecclinkopts" >> Makefile -echo "BYTECCLIBS=$cclibs $dllib $curseslibs $pthread_link" >> Makefile -echo "BYTECCRPATH=$byteccrpath" >> Makefile -echo "EXE=$exe" >> Makefile -echo "SUPPORTS_SHARED_LIBRARIES=$shared_libraries_supported" >> Makefile -echo "SHAREDCCCOMPOPTS=$sharedcccompopts" >> Makefile -echo "MKSHAREDLIB=$mksharedlib" >> Makefile -echo "MKSHAREDLIBRPATH=$mksharedlibrpath" >> Makefile -echo "ARCH=$arch" >> Makefile -echo "MODEL=$model" >> Makefile -echo "SYSTEM=$system" >> Makefile -echo "NATIVECC=$nativecc" >> Makefile -echo "NATIVECCCOMPOPTS=$nativecccompopts" >> Makefile -echo "NATIVECCPROFOPTS=$nativeccprofopts" >> Makefile -echo "NATIVECCLINKOPTS=$nativecclinkopts" >> Makefile -echo "NATIVECCRPATH=$nativeccrpath" >> Makefile -echo "NATIVECCLIBS=$cclibs $dllib" >> Makefile -echo "ASFLAGS=$asflags" >> Makefile -echo "ASPP=$aspp" >> Makefile -echo "ASPPFLAGS=$asppflags" >> Makefile -echo "ASPPPROFFLAGS=$asppprofflags" >> Makefile -echo "PROFILING=$profiling" >> Makefile -echo "BINUTILS_OBJCOPY=$binutils_objcopy" >> Makefile -echo "BINUTILS_NM=$binutils_nm" >> Makefile -echo "DYNLINKOPTS=$dllib" >> Makefile -echo "OTHERLIBRARIES=$otherlibraries" >> Makefile -echo "DEBUGGER=$debugger" >> Makefile -echo "CC_PROFILE=$cc_profile" >> Makefile - -rm -f tst hasgot.c -rm -f ../m.h ../s.h ../Makefile -mv m.h s.h Makefile .. - -# Print a summary - -echo -echo "** Configuration summary **" -echo -echo "Directories where Objective Caml will be installed:" -echo " binaries.................. $bindir" -echo " standard library.......... $libdir" -echo " manual pages.............. $mandir (with extension .$manext)" - -echo "Configuration for the bytecode compiler:" -echo " C compiler used........... $bytecc" -echo " options for compiling..... $bytecccompopts" -echo " options for linking....... $bytecclinkopts $cclibs $dllib $curseslibs $pthread_link" -if $shared_libraries_supported; then -echo " shared libraries are supported" -echo " options for compiling..... $sharedcccompopts $bytecccompopts" -echo " command for building...... $mksharedlib lib.so $mksharedlibrpath/a/path objs" -else -echo " shared libraries not supported" -fi - -echo "Configuration for the native-code compiler:" -if test "$arch" = "none"; then - echo " (not supported on this platform)" -else - if test "$model" = "default"; then - echo " hardware architecture..... $arch" - else - echo " hardware architecture..... $arch ($model)" - fi - if test "$system" = "unknown"; then : ; else - echo " OS variant................ $system" - fi - echo " C compiler used........... $nativecc" - echo " options for compiling..... $nativecccompopts" - echo " options for linking....... $nativecclinkopts $cclibs" - echo " assembler ................ \$(AS) $asflags" - echo " preprocessed assembler ... $aspp $asppflags" - if test "$profiling" = "prof"; then - echo " profiling with gprof ..... supported" - else - echo " profiling with gprof ..... not supported" - fi - if test -n "$binutils_objcopy" && test -n "$binutils_nm"; then - echo " ocamlopt -pack ........... supported" - else - echo " ocamlopt -pack ........... not supported (no binutils)" - fi -fi - -if test "$debugger" = "ocamldebugger"; then - echo "Source-level replay debugger: supported" -else - echo "Source-level replay debugger: not supported" -fi - -echo "Additional libraries supported:" -echo " $otherlibraries" - -echo "Configuration for the \"num\" library:" -echo " target architecture ...... $bng_arch (asm level $bng_asm_level)" - -if test "$x11_include" != "not found" && test "$x11_lib" != "not found"; then -echo "Configuration for the \"graph\" library:" -echo " options for compiling .... $x11_include" -echo " options for linking ...... $x11_link" -fi - -if test $has_tk = true; then -echo "Configuration for the \"labltk\" library:" -echo " use tcl/tk version ....... $tcl_version" -echo " options for compiling .... $tk_defs" -echo " options for linking ...... $tk_libs" -else -echo "The \"labltk\" library: not found" -fi diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix index ea89458c07..1fa52721dd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ocaml/generic.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation (args // { preConfigure = optionalString (lib.versionOlder version "4.04") '' CAT=$(type -tp cat) sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - '' + optionalString (stdenv.isDarwin && lib.versionOlder version "4.13") '' + '' + optionalString (stdenv.isDarwin) '' # Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176 # This is required for aarch64-darwin, everything else works as is. AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c" diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch b/third_party/nixpkgs/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch deleted file mode 100644 index dc2bcb8697..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/gnused-on-osx-fix.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Nuar ocaml-3.11.1/ocamldoc/remove_DEBUG ocaml-3.11.1-nixpkgs/ocamldoc/remove_DEBUG ---- ocaml-3.11.1/ocamldoc/remove_DEBUG 2004-04-15 18:18:52.000000000 +0200 -+++ ocaml-3.11.1-nixpkgs/ocamldoc/remove_DEBUG 2011-01-01 17:37:07.000000000 +0100 -@@ -18,4 +18,4 @@ - # respecting the cpp # line annotation conventions - - echo "# 1 \"$1\"" --LC_ALL=C sed -e '/DEBUG/s/.*//' "$1" -+grep -v 'DEBUG' "$1" diff --git a/third_party/nixpkgs/pkgs/development/compilers/ocaml/mips64.patch b/third_party/nixpkgs/pkgs/development/compilers/ocaml/mips64.patch deleted file mode 100644 index cdef9cafb9..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/ocaml/mips64.patch +++ /dev/null @@ -1,240 +0,0 @@ -http://caml.inria.fr/mantis/view.php?id=4849 - -diff -bur ocaml-3.11.1/asmcomp/mips/arch.ml my_ocaml/asmcomp/mips/arch.ml ---- asmcomp/mips/arch.ml 2002-11-29 16:03:36.000000000 +0100 -+++ asmcomp/mips/arch.ml 2009-08-09 23:18:31.000000000 +0200 -@@ -35,7 +35,7 @@ - - let big_endian = - match Config.system with -- "ultrix" -> false -+ "ultrix" | "gnu" -> false - | "irix" -> true - | _ -> fatal_error "Arch_mips.big_endian" - -diff -bur ocaml-3.11.1/asmcomp/mips/emit.mlp my_ocaml/asmcomp/mips/emit.mlp ---- asmcomp/mips/emit.mlp 2004-01-05 21:25:56.000000000 +0100 -+++ asmcomp/mips/emit.mlp 2009-08-23 12:11:58.000000000 +0200 -@@ -58,7 +58,7 @@ - !stack_offset + - 4 * num_stack_slots.(0) + 8 * num_stack_slots.(1) + - (if !contains_calls then if !uses_gp then 8 else 4 else 0) in -- Misc.align size 16 -+ Misc.align size 16 (* n32 require quadword alignment *) - - let slot_offset loc cl = - match loc with -@@ -252,7 +252,7 @@ - | Lop(Icall_ind) -> - ` move $25, {emit_reg i.arg.(0)}\n`; - liveregs i live_25; -- ` jal {emit_reg i.arg.(0)}\n`; -+ ` jal $25\n`; (* {emit_reg i.arg.(0)}\n; Equivalent but avoids "Warning: MIPS PIC call to register other than $25" on GNU as *) - `{record_frame i.live}\n` - | Lop(Icall_imm s) -> - liveregs i 0; -@@ -269,7 +269,7 @@ - liveregs i 0; - ` move $25, {emit_reg i.arg.(0)}\n`; - liveregs i live_25; -- ` j {emit_reg i.arg.(0)}\n` -+ ` j $25\n` - | Lop(Itailcall_imm s) -> - if s = !function_name then begin - ` b {emit_label !tailrec_entry_point}\n` -@@ -277,11 +277,11 @@ - let n = frame_size() in - if !contains_calls then - ` lw $31, {emit_int(n - 4)}($sp)\n`; -+ ` la $25, {emit_symbol s}\n`; (* Rxd: put before gp restore *) - if !uses_gp then - ` lw $gp, {emit_int(n - 8)}($sp)\n`; - if n > 0 then - ` addu $sp, $sp, {emit_int n}\n`; -- ` la $25, {emit_symbol s}\n`; - liveregs i live_25; - ` j $25\n` - end -@@ -305,8 +305,13 @@ - begin match chunk with - Double_u -> - (* Destination is not 8-aligned, hence cannot use l.d *) -+ if big_endian then begin - ` ldl $24, {emit_addressing addr i.arg 0}\n`; -- ` ldr $24, {emit_addressing (offset_addressing addr 7) i.arg 0}\n`; -+ ` ldr $24, {emit_addressing (offset_addressing addr 7) i.arg 0}\n` -+ end else begin -+ ` ldl $24, {emit_addressing (offset_addressing addr 7) i.arg 0}\n`; -+ ` ldr $24, {emit_addressing addr i.arg 0}\n` -+ end; - ` dmtc1 $24, {emit_reg dest}\n` - | Single -> - ` l.s {emit_reg dest}, {emit_addressing addr i.arg 0}\n`; -@@ -328,8 +333,13 @@ - Double_u -> - (* Destination is not 8-aligned, hence cannot use l.d *) - ` dmfc1 $24, {emit_reg src}\n`; -+ if big_endian then begin - ` sdl $24, {emit_addressing addr i.arg 1}\n`; - ` sdr $24, {emit_addressing (offset_addressing addr 7) i.arg 1}\n` -+ end else begin -+ ` sdl $24, {emit_addressing (offset_addressing addr 7) i.arg 1}\n`; -+ ` sdr $24, {emit_addressing addr i.arg 1}\n` -+ end - | Single -> - ` cvt.s.d $f31, {emit_reg src}\n`; - ` s.s $f31, {emit_addressing addr i.arg 1}\n` -@@ -552,6 +562,7 @@ - (* There are really two groups of registers: - $sp and $30 always point to stack locations - $2 - $21 never point to stack locations. *) -+ if Config.system = "irix" then begin - ` .noalias $2,$sp; .noalias $2,$30; .noalias $3,$sp; .noalias $3,$30\n`; - ` .noalias $4,$sp; .noalias $4,$30; .noalias $5,$sp; .noalias $5,$30\n`; - ` .noalias $6,$sp; .noalias $6,$30; .noalias $7,$sp; .noalias $7,$30\n`; -@@ -561,7 +572,8 @@ - ` .noalias $14,$sp; .noalias $14,$30; .noalias $15,$sp; .noalias $15,$30\n`; - ` .noalias $16,$sp; .noalias $16,$30; .noalias $17,$sp; .noalias $17,$30\n`; - ` .noalias $18,$sp; .noalias $18,$30; .noalias $19,$sp; .noalias $19,$30\n`; -- ` .noalias $20,$sp; .noalias $20,$30; .noalias $21,$sp; .noalias $21,$30\n\n`; -+ ` .noalias $20,$sp; .noalias $20,$30; .noalias $21,$sp; .noalias $21,$30\n\n` -+ end; - let lbl_begin = Compilenv.make_symbol (Some "data_begin") in - ` .data\n`; - ` .globl {emit_symbol lbl_begin}\n`; -diff -bur ocaml-3.11.1/asmrun/mips.s my_ocaml/asmrun/mips.s ---- asmrun/mips.s 2004-07-13 14:18:53.000000000 +0200 -+++ asmrun/mips.s 2009-08-20 09:34:36.000000000 +0200 -@@ -187,7 +187,7 @@ - sw $30, caml_exception_pointer - /* Call C function */ - move $25, $24 -- jal $24 -+ jal $25 /* Rxd: $24 replaced by $25 to avoid this "Warning: MIPS PIC call to register other than $25" ? */ - /* Reload return address, alloc ptr, alloc limit */ - lw $31, 0($16) /* caml_last_return_address */ - lw $22, 0($17) /* caml_young_ptr */ -@@ -254,7 +254,7 @@ - sw $0, caml_last_return_address - /* Call the Caml code */ - move $25, $24 -- jal $24 -+ jal $25 /* Rxd: 24 replaced by 25 */ - $104: - /* Pop the trap frame, restoring caml_exception_pointer */ - lw $24, 0($sp) -@@ -384,3 +384,8 @@ - .word $104 /* return address into callback */ - .half -1 /* negative frame size => use callback link */ - .half 0 /* no roots here */ -+ -+#if defined(SYS_linux) -+ /* Mark stack as non-executable, PR#4564 */ -+ .section .note.GNU-stack,"",%progbits -+#endif -diff -bur ocaml-3.11.1/configure my_ocaml/configure ---- configure 2009-05-20 17:33:09.000000000 +0200 -+++ configure 2009-08-23 10:55:44.000000000 +0200 -@@ -40,7 +40,7 @@ - verbose=no - withcurses=yes - withsharedlibs=yes --gcc_warnings="-Wall" -+gcc_warnings="-W -Wall" - partialld="ld -r" - - # Try to turn internationalization off, can cause config.guess to malfunction! -@@ -292,6 +292,9 @@ - # (For those who want to force "cc -64") - # Turn off warning "unused library" - bytecclinkopts="-Wl,-woff,84";; -+ gcc*,mips64el-*) -+ bytecccompopts="" -+ bytecclinkopts="-fno-defer-pop $gcc_warnings -Wl,-O1 -Wl,--as-needed";; - *,alpha*-*-unicos*) - # For the Cray T3E - bytecccompopts="-DUMK";; -@@ -468,6 +471,8 @@ - echo "64-bit integers must be doubleword-aligned." - echo "#define ARCH_ALIGN_INT64" >> m.h - fi;; -+ mips64el-*) -+ echo "#define ARCH_ALIGN_INT64" >> m.h;; - *) - sh ./runtest int64align.c - case $? in -@@ -636,6 +641,7 @@ - fi;; - i[3456]86-*-gnu*) arch=i386; system=gnu;; - mips-*-irix6*) arch=mips; system=irix;; -+ mips*-gnu*) arch=mips; system=gnu;; - hppa1.1-*-hpux*) arch=hppa; system=hpux;; - hppa2.0*-*-hpux*) arch=hppa; system=hpux;; - hppa*-*-linux*) arch=hppa; system=linux;; -@@ -672,7 +678,7 @@ - if test -z "$ccoption"; then - case "$arch,$system,$cc" in - alpha,digital,gcc*) nativecc=cc;; -- mips,*,gcc*) nativecc=cc;; -+ mips,irix,gcc*) nativecc=cc;; - *) nativecc="$bytecc";; - esac - else -@@ -687,6 +693,9 @@ - alpha,cc*,digital,*) nativecccompopts=-std1;; - mips,cc*,irix,*) nativecccompopts=-n32 - nativecclinkopts="-n32 -Wl,-woff,84";; -+ mips,gcc*,gnu,mips64el-*) -+ nativecccompopts="$gcc_warnings -fPIC" -+ nativecclinkopts="--as-needed";; - *,*,nextstep,*) nativecccompopts="$gcc_warnings -U__GNUC__ -posix" - nativecclinkopts="-posix";; - *,*,rhapsody,*darwin[1-5].*) -@@ -725,6 +734,8 @@ - aspp='gcc -c -Wa,-xexplicit';; - mips,*,irix) as='as -n32 -O2 -nocpp -g0' - aspp='as -n32 -O2';; -+ mips,*,gnu) as='as -KPIC' -+ aspp='gcc -c -fPIC';; # got bus error without fPIC ? - power,*,elf) as='as -u -m ppc' - aspp='gcc -c';; - power,*,bsd) as='as' -@@ -756,6 +767,7 @@ - case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; - amd64,*,linux) profiling='prof';; - amd64,*,gnu) profiling='prof';; -+ mips,*,gnu) profiling='prof';; - *) profiling='noprof';; - esac - -diff -bur ocaml-3.11.1/asmcomp/mips/proc.ml my_ocaml/asmcomp/mips/proc.ml ---- asmcomp/mips/proc.ml 2007-10-30 13:37:16.000000000 +0100 -+++ asmcomp/mips/proc.ml 2010-03-18 08:08:06.000000000 +0100 -@@ -114,7 +114,7 @@ - incr int - end else begin - loc.(i) <- stack_slot (make_stack !ofs) ty; -- ofs := !ofs + size_int -+ ofs := !ofs + 8 - end - | Float -> - if !float <= last_float then begin -@@ -143,7 +143,7 @@ - or float regs $f12...$f19. Each argument "consumes" both one slot - in the int register file and one slot in the float register file. - Extra arguments are passed on stack, in a 64-bits slot, right-justified -- (i.e. at +4 from natural address). *) -+ (i.e. at +4 from natural address for big endians). *) - - let loc_external_arguments arg = - let loc = Array.create (Array.length arg) Reg.dummy in -@@ -158,7 +158,7 @@ - end else begin - begin match arg.(i).typ with - Float -> loc.(i) <- stack_slot (Outgoing !ofs) Float -- | ty -> loc.(i) <- stack_slot (Outgoing (!ofs + 4)) ty -+ | ty -> loc.(i) <- stack_slot (Outgoing (!ofs + (if big_endian then 4 else 0))) ty - end; - ofs := !ofs + 8 - end - diff --git a/third_party/nixpkgs/pkgs/development/compilers/opa/default.nix b/third_party/nixpkgs/pkgs/development/compilers/opa/default.nix index e4cd191683..2843625dae 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/opa/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/opa/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "http://opalang.org/"; license = lib.licenses.gpl3; maintainers = [ ]; - platforms = with lib.platforms; unix; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix b/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix index 9d8a2367b9..a61a66ada9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/open-watcom/v2.nix @@ -13,19 +13,19 @@ stdenv.mkDerivation rec { pname = "${passthru.prettyName}-unwrapped"; # nixpkgs-update: no auto update - version = "unstable-2022-10-03"; + version = "unstable-2023-01-30"; src = fetchFromGitHub { owner = "open-watcom"; repo = "open-watcom-v2"; - rev = "61538429a501a09f369366d832799f2e3b196a02"; - sha256 = "sha256-YvqRw0klSqOxIuO5QFKjcUp6aRWlO2j3L+T1ekx8SfA="; + rev = "996740acdbb173499ec1bf2ba6c8942f2a374220"; + sha256 = "sha256-9m+0e2v1Hk8jYZHqJwb1mN02WgGDArsWbF7Ut3Z5OIg="; }; postPatch = '' patchShebangs *.sh - for dateSource in cmnvars.sh bld/wipfc/configure; do + for dateSource in bld/wipfc/configure; do substituteInPlace $dateSource \ --replace '`date ' '`date -ud "@$SOURCE_DATE_EPOCH" ' done @@ -35,14 +35,17 @@ stdenv.mkDerivation rec { --replace '__TIME__' "\"$(date -ud "@$SOURCE_DATE_EPOCH" +'%T')\"" substituteInPlace build/makeinit \ - --replace '%__CYEAR__' '%OWCYEAR' + --replace '$+$(%__CYEAR__)$-' "$(date -ud "@$SOURCE_DATE_EPOCH" +'%Y')" '' + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' substituteInPlace build/mif/local.mif \ --replace '-static' "" ''; - nativeBuildInputs = [ dosbox ] - ++ lib.optional withDocs ghostscript; + nativeBuildInputs = [ + dosbox + ] ++ lib.optionals withDocs [ + ghostscript + ]; configurePhase = '' runHook preConfigure @@ -120,7 +123,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://open-watcom.github.io"; license = licenses.watcom; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "x86_64-windows" "i686-windows" ]; + platforms = with platforms; windows ++ unix; + badPlatforms = platforms.riscv ++ [ "powerpc64-linux" "powerpc64le-linux" "mips64el-linux" ]; maintainers = with maintainers; [ OPNA2608 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/open-watcom/wrapper.nix b/third_party/nixpkgs/pkgs/development/compilers/open-watcom/wrapper.nix index 0677d32e6e..95752b2c2f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/open-watcom/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/open-watcom/wrapper.nix @@ -13,16 +13,29 @@ let wrapper = {}: let + archToBindir = with stdenv.hostPlatform; if isx86 then + "bin" + else if isAarch then + "arm" + # we don't support running on AXP + # don't know what MIPS, PPC bindirs are called + else throw "Don't know where ${system} binaries are located!"; + binDirs = with stdenv.hostPlatform; if isWindows then [ - (lib.optionalString is64bit "binnt64") - "binnt" - (lib.optionalString is32bit "binw") - ] else if (isDarwin && is64bit) then [ - "bino64" + (lib.optionalString is64bit "${archToBindir}nt64") + "${archToBindir}nt" + (lib.optionalString is32bit "${archToBindir}w") + ] else if (isDarwin) then [ + (lib.optionalString is64bit "${archToBindir}o64") + # modern Darwin cannot execute 32-bit code anymore + (lib.optionalString is32bit "${archToBindir}o") ] else [ - (lib.optionalString is64bit "binl64") - "binl" + (lib.optionalString is64bit "${archToBindir}l64") + "${archToBindir}l" ]; + # TODO + # This works good enough as-is, but should really only be targetPlatform-specific + # but we don't support targeting DOS, OS/2, 16-bit Windows etc Nixpkgs-wide so this needs extra logic includeDirs = with stdenv.hostPlatform; [ "h" ] @@ -71,9 +84,9 @@ let } EOF cat test.c - # Darwin target not supported, only host wcl386 -fe=test_c test.c - ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "./test_c"} + # Only test execution if hostPlatform is targetable + ${lib.optionalString (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch) "./test_c"} cat <test.cpp #include @@ -91,9 +104,9 @@ let } EOF cat test.cpp - # Darwin target not supported, only host wcl386 -fe=test_cpp test.cpp - ${lib.optionalString (!stdenv.hostPlatform.isDarwin) "./test_cpp"} + # Only test execution if hostPlatform is targetable + ${lib.optionalString (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isAarch) "./test_cpp"} touch $out ''; cross = runCommand "${name}-test-cross" { nativeBuildInputs = [ wrapped file ]; } '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix b/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix index 00f37157b5..798cdb790b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "p4c"; - version = "1.2.3.2"; + version = "1.2.3.5"; src = fetchFromGitHub { owner = "p4lang"; repo = "p4c"; rev = "v${version}"; - sha256 = "sha256-EeTYH7CsmPPBL05zJ+g4aM677n0NqDD+H40lBuKpY6M="; + sha256 = "sha256-5wDwHj+1X6HhhiLfEbOzijpZH6GwpTPEKgNh3iIGTWY="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/paco/default.nix b/third_party/nixpkgs/pkgs/development/compilers/paco/default.nix index 69e7b26287..d8014dd8e5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/paco/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/paco/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "paco"; version = "1.0"; @@ -8,11 +8,22 @@ buildGoPackage rec { owner = "pacolang"; repo = "paco"; rev = "v${version}"; - sha256 = "03x75h40dhjswbf2g1408krj9b1w05y9pjzygzhklldc75r3n9dh"; + hash = "sha256-sCU7cjmsUTrhf/7Lm3wBPKwk80SAhCfc4lrCBggspw8="; }; - goPackagePath = "github.com/pacolang/paco"; - goDeps = ./deps.nix; + vendorHash = "sha256-J0TKp1df5IWq3Irlzf1lvhWlXnP//MsVqs9M8TtEraw="; + + patches = [ + # Set correct package path in go.mod + (fetchpatch { + url = "https://github.com/pacolang/paco/pull/1/commits/886f0407e94418d34c7e062c6857834aea3c99ac.patch"; + hash = "sha256-HRNJSyWz1OY+kCV+eaRJbaDXkH4n1NaMpFxCuEhocK4="; + }) + ]; + + subPackages = [ "." ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A simple compiled programming language"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/paco/deps.nix b/third_party/nixpkgs/pkgs/development/compilers/paco/deps.nix deleted file mode 100644 index a3ec48b7f1..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/paco/deps.nix +++ /dev/null @@ -1,93 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.0"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/gookit/color"; - fetch = { - type = "git"; - url = "https://github.com/gookit/color"; - rev = "v1.1.7"; - sha256 = "02gq82i9srr8bv5yhgkmn5j1r3pn8wspiisvhpbyhykm1fn736mz"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/niemeyer/pretty"; - fetch = { - type = "git"; - url = "https://github.com/niemeyer/pretty"; - rev = "a10e7caefd8e"; - sha256 = "1jmazh4xzaa3v6g46hz60q2z7nmqs9l9cxdzmmscn3kbcs2znq4v"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "8fa46927fb4f"; - sha256 = "0fx03x0nx9mjwnqphnx852q9p76qg7cazrachvgr1bj357lplrcw"; - }; - } - { - goPackagePath = "gopkg.in/pipe.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/pipe.v2"; - rev = "3c2ca4d52544"; - sha256 = "090wrj4n6a6pzdlakcxy9qnkngc8hp6m49ipbnlszs0hyj2hnngv"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix index 955635d3f8..b58f24c151 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "rgbds"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "gbdev"; repo = "rgbds"; rev = "v${version}"; - sha256 = "sha256-2nyjI6z6W959/Yc8EwdQVmGnG0PKwsndPLmeDlNpj18="; + sha256 = "sha256-3mx4yymrOQnP5aJCzPWl5G96WBxt1ixU6tdzhhOsF04="; }; nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ libpng ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix index 3afa59739a..b50097d5e6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/cargo-auditable-cargo-wrapper.nix @@ -1,12 +1,9 @@ -{ lib, writeShellApplication, cargo, cargo-auditable }: +{ lib, writeShellScriptBin, cargo, cargo-auditable }: -(writeShellApplication { - name = "cargo"; - runtimeInputs = [ cargo cargo-auditable ]; - text = '' - CARGO_AUDITABLE_IGNORE_UNSUPPORTED=1 cargo auditable "$@" - ''; -}) // { +(writeShellScriptBin "cargo" '' + export PATH="${lib.makeBinPath [ cargo cargo-auditable ]}:$PATH" + CARGO_AUDITABLE_IGNORE_UNSUPPORTED=1 exec cargo auditable "$@" +'') // { meta = cargo-auditable.meta // { mainProgram = "cargo"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix index 9b10767e5b..d04eebe7ea 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/cargo.nix @@ -76,7 +76,7 @@ rustPlatform.buildRustPackage { meta = with lib; { homepage = "https://crates.io"; description = "Downloads your Rust project's dependencies and builds your project"; - maintainers = with maintainers; [ retrry ]; + maintainers = with maintainers; [ retrry ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 64254d5025..426f137788 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -211,7 +211,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; - maintainers = with maintainers; [ cstrahan globin havvy ]; + maintainers = with maintainers; [ cstrahan globin havvy ] ++ teams.rust.members; license = [ licenses.mit licenses.asl20 ]; platforms = platforms.linux ++ platforms.darwin; }; 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 601f05a51b..7bb69bde67 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix @@ -1,8 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils, writeScript , common-updater-scripts, git, gnused, nix, nixfmt, majorVersion }: -with lib; - let repo = "git@github.com:scala/scala.git"; @@ -102,7 +100,7 @@ stdenv.mkDerivation rec { ''; }; - meta = { + meta = with lib; { description = "A general purpose programming language"; longDescription = '' Scala is a general purpose programming language designed to express diff --git a/third_party/nixpkgs/pkgs/development/compilers/sdcc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/sdcc/default.nix index 8f6bc5e6da..584c0e7a66 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sdcc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sdcc/default.nix @@ -1,11 +1,9 @@ { lib, stdenv, fetchurl, autoconf, bison, boost, flex, texinfo, zlib, gputils ? null , excludePorts ? [] }: -with lib; - let # choices: mcs51 z80 z180 r2k r3ka gbz80 tlcs90 ds390 ds400 pic14 pic16 hc08 s08 stm8 - excludedPorts = excludePorts ++ (optionals (gputils == null) [ "pic14" "pic16" ]); + excludedPorts = excludePorts ++ (lib.optionals (gputils == null) [ "pic14" "pic16" ]); in stdenv.mkDerivation rec { @@ -29,7 +27,7 @@ stdenv.mkDerivation rec { fi ''; - meta = { + meta = with lib; { description = "Small Device C Compiler"; longDescription = '' SDCC is a retargettable, optimizing ANSI - C compiler suite that targets @@ -39,7 +37,7 @@ stdenv.mkDerivation rec { Rabbit 3000A). Work is in progress on supporting the Microchip PIC16 and PIC18 targets. It can be retargeted for other microprocessors. ''; - homepage = "http://sdcc.sourceforge.net/"; + homepage = "https://sdcc.sourceforge.net/"; license = with licenses; if (gputils == null) then gpl2Plus else unfreeRedistributable; maintainers = with maintainers; [ bjornfor yorickvp ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix index d00a354be1..55bf5237e6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix @@ -84,7 +84,7 @@ let buildInputs = [ boost ] ++ lib.optionals z3Support [ z3 ] ++ lib.optionals cvc4Support [ cvc4 cln gmp ]; - checkInputs = [ ncurses python3 ]; + nativeCheckInputs = [ ncurses python3 ]; # tests take 60+ minutes to complete, only run as part of passthru tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix b/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix index 052df63aec..19fa928a4d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { buildInputs = [ spirv-headers ] ++ lib.optionals (!isROCm) [ llvm ]; - checkInputs = [ lit ]; + nativeCheckInputs = [ lit ]; cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=ON" diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/default.nix new file mode 100644 index 0000000000..5f37c3ec84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/default.nix @@ -0,0 +1,691 @@ +{ lib +, stdenv +, callPackage +, cmake +, coreutils +, gnugrep +, perl +, ninja +, pkg-config +, clang +, bintools +, python3 +, git +, fetchpatch +, makeWrapper +, gnumake +, file +, runCommand +, writeShellScriptBin +# For lldb +, libedit +, ncurses +, swig +, libxml2 +# Linux-specific +, glibc +, libuuid +# Darwin-specific +, substituteAll +, fixDarwinDylibNames +, runCommandLocal +, xcbuild +, cctools # libtool +, sigtool +, DarwinTools +, CoreServices +, Foundation +, Combine +, MacOSX-SDK +, CLTools_Executables +}: + +let + + inherit (stdenv) hostPlatform targetPlatform; + + sources = callPackage ../sources.nix { }; + + # Tools invoked by swift at run-time. + runtimeDeps = lib.optionals stdenv.isDarwin [ + # libtool is used for static linking. This is part of cctools, but adding + # that as a build input puts an unwrapped linker in PATH, and breaks + # builds. This small derivation exposes just libtool. + # NOTE: The same applies to swift-driver, but that is currently always + # invoked via the old `swift` / `swiftc`. May change in the future. + (runCommandLocal "libtool" { } '' + mkdir -p $out/bin + ln -s ${cctools}/bin/libtool $out/bin/libtool + '') + ]; + + # There are apparently multiple naming conventions on Darwin. Swift uses the + # xcrun naming convention. See `configure_sdk_darwin` calls in CMake files. + swiftOs = if targetPlatform.isDarwin + then { + "macos" = "macosx"; + "ios" = "iphoneos"; + #iphonesimulator + #appletvos + #appletvsimulator + #watchos + #watchsimulator + }.${targetPlatform.darwinPlatform} + or (throw "Cannot build Swift for target Darwin platform '${targetPlatform.darwinPlatform}'") + else targetPlatform.parsed.kernel.name; + + # Apple Silicon uses a different CPU name in the target triple. + swiftArch = if stdenv.isDarwin && stdenv.isAarch64 then "arm64" + else targetPlatform.parsed.cpu.name; + + # On Darwin, a `.swiftmodule` is a subdirectory in `lib/swift/`, + # containing binaries for supported archs. On other platforms, binaries are + # installed to `lib/swift//`. Note that our setup-hook also adds + # `lib/swift` for convenience. + swiftLibSubdir = "lib/swift/${swiftOs}"; + swiftModuleSubdir = if hostPlatform.isDarwin + then "lib/swift/${swiftOs}" + else "lib/swift/${swiftOs}/${swiftArch}"; + + # And then there's also a separate subtree for statically linked modules. + toStaticSubdir = lib.replaceStrings [ "/swift/" ] [ "/swift_static/" ]; + swiftStaticLibSubdir = toStaticSubdir swiftLibSubdir; + swiftStaticModuleSubdir = toStaticSubdir swiftModuleSubdir; + + # This matches _SWIFT_DEFAULT_COMPONENTS, with specific components disabled. + swiftInstallComponents = [ + "autolink-driver" + "compiler" + # "clang-builtin-headers" + "stdlib" + "sdk-overlay" + "parser-lib" + "static-mirror-lib" + "editor-integration" + # "tools" + # "testsuite-tools" + "toolchain-tools" + "toolchain-dev-tools" + "license" + (if stdenv.isDarwin then "sourcekit-xpc-service" else "sourcekit-inproc") + "swift-remote-mirror" + "swift-remote-mirror-headers" + ]; + + # Build a tool used during the build to create a custom clang wrapper, with + # which we wrap the clang produced by the swift build. + # + # This is used in a `POST_BUILD` for the CMake target, so we rename the + # actual clang to clang-unwrapped, then put the wrapper in place. + # + # We replace the `exec ...` command with `exec -a "$0"` in order to + # preserve $0 for clang. This is because, unlike Nix, we don't have + # separate wrappers for clang/clang++, and clang uses $0 to detect C++. + # + # Similarly, the C++ detection in the wrapper itself also won't work for us, + # so we base it on $0 as well. + makeClangWrapper = writeShellScriptBin "nix-swift-make-clang-wrapper" '' + set -euo pipefail + + targetFile="$1" + unwrappedClang="$targetFile-unwrapped" + + mv "$targetFile" "$unwrappedClang" + sed < '${clang}/bin/clang' > "$targetFile" \ + -e 's|^\s*exec|exec -a "$0"|g' \ + -e 's|^\[\[ "${clang.cc}/bin/clang" = \*++ ]]|[[ "$0" = *++ ]]|' \ + -e "s|${clang.cc}/bin/clang|$unwrappedClang|g" + chmod a+x "$targetFile" + ''; + + # Create a tool used during the build to create a custom swift wrapper for + # each of the swift executables produced by the build. + # + # The build produces several `swift-frontend` executables during + # bootstrapping. Each of these has numerous aliases via symlinks, and the + # executable uses $0 to detect what tool is called. + wrapperParams = { + inherit bintools; + default_cc_wrapper = clang; # Instead of `@out@` in the original. + coreutils_bin = lib.getBin coreutils; + gnugrep_bin = gnugrep; + suffixSalt = lib.replaceStrings ["-" "."] ["_" "_"] targetPlatform.config; + use_response_file_by_default = 1; + swiftDriver = ""; + # NOTE: @prog@ needs to be filled elsewhere. + }; + swiftWrapper = runCommand "swift-wrapper.sh" wrapperParams '' + substituteAll '${../wrapper/wrapper.sh}' "$out" + ''; + makeSwiftcWrapper = writeShellScriptBin "nix-swift-make-swift-wrapper" '' + set -euo pipefail + + targetFile="$1" + unwrappedSwift="$targetFile-unwrapped" + + mv "$targetFile" "$unwrappedSwift" + sed < '${swiftWrapper}' > "$targetFile" \ + -e "s|@prog@|'$unwrappedSwift'|g" \ + -e 's|exec "$prog"|exec -a "$0" "$prog"|g' + chmod a+x "$targetFile" + ''; + + # On Darwin, we need to use BOOTSTRAPPING-WITH-HOSTLIBS because of ABI + # stability, and have to provide the definitions for the system stdlib. + appleSwiftCore = stdenv.mkDerivation { + name = "apple-swift-core"; + dontUnpack = true; + + installPhase = '' + mkdir -p $out/lib/swift + cp -r \ + "${MacOSX-SDK}/usr/lib/swift/Swift.swiftmodule" \ + "${MacOSX-SDK}/usr/lib/swift/libswiftCore.tbd" \ + $out/lib/swift/ + ''; + }; + +in stdenv.mkDerivation { + pname = "swift"; + inherit (sources) version; + + outputs = [ "out" "lib" "dev" "doc" "man" ]; + + nativeBuildInputs = [ + cmake + git + ninja + perl # pod2man + pkg-config + python3 + makeWrapper + makeClangWrapper + makeSwiftcWrapper + ] + ++ lib.optionals stdenv.isDarwin [ + xcbuild + sigtool # codesign + DarwinTools # sw_vers + fixDarwinDylibNames + ]; + + buildInputs = [ + # For lldb + python3 + swig + libxml2 + ] + ++ lib.optionals stdenv.isLinux [ + libuuid + ] + ++ lib.optionals stdenv.isDarwin [ + CoreServices + Foundation + Combine + ]; + + # This is a partial reimplementation of our setup hook. Because we reuse + # the Swift wrapper for the Swift build itself, we need to do some of the + # same preparation. + postHook = '' + for pkg in "''${pkgsHostTarget[@]}" '${clang.libc}'; do + for subdir in ${swiftModuleSubdir} ${swiftStaticModuleSubdir} lib/swift; do + if [[ -d "$pkg/$subdir" ]]; then + export NIX_SWIFTFLAGS_COMPILE+=" -I $pkg/$subdir" + fi + done + for subdir in ${swiftLibSubdir} ${swiftStaticLibSubdir} lib/swift; do + if [[ -d "$pkg/$subdir" ]]; then + export NIX_LDFLAGS+=" -L $pkg/$subdir" + fi + done + done + ''; + + # We invoke cmakeConfigurePhase multiple times, but only need this once. + dontFixCmake = true; + # We setup custom build directories. + dontUseCmakeBuildDir = true; + + unpackPhase = let + copySource = repo: "cp -r ${sources.${repo}} ${repo}"; + in '' + mkdir src + cd src + + ${copySource "swift-cmark"} + ${copySource "llvm-project"} + ${copySource "swift"} + ${copySource "swift-experimental-string-processing"} + ${lib.optionalString + (!stdenv.isDarwin) + (copySource "swift-corelibs-libdispatch")} + + chmod -R u+w . + ''; + + patchPhase = '' + # Just patch all the things for now, we can focus this later. + # TODO: eliminate use of env. + find -type f -print0 | xargs -0 sed -i \ + ${lib.optionalString stdenv.isDarwin + "-e 's|/usr/libexec/PlistBuddy|${xcbuild}/bin/PlistBuddy|g'"} \ + -e 's|/usr/bin/env|${coreutils}/bin/env|g' \ + -e 's|/usr/bin/make|${gnumake}/bin/make|g' \ + -e 's|/bin/mkdir|${coreutils}/bin/mkdir|g' \ + -e 's|/bin/cp|${coreutils}/bin/cp|g' \ + -e 's|/usr/bin/file|${file}/bin/file|g' + + patch -p1 -d swift -i ${./patches/swift-wrap.patch} + patch -p1 -d swift -i ${./patches/swift-nix-resource-root.patch} + patch -p1 -d swift -i ${./patches/swift-linux-fix-linking.patch} + patch -p1 -d swift -i ${substituteAll { + src = ./patches/swift-darwin-plistbuddy-workaround.patch; + inherit swiftArch; + }} + patch -p1 -d swift -i ${substituteAll { + src = ./patches/swift-prevent-sdk-dirs-warning.patch; + inherit (builtins) storeDir; + }} + substituteInPlace swift/cmake/modules/SwiftConfigureSDK.cmake \ + --replace '/usr/include' "${stdenv.cc.libc_dev}/include" + + # This patch needs to know the lib output location, so must be substituted + # in the same derivation as the compiler. + storeDir="${builtins.storeDir}" \ + substituteAll ${./patches/swift-separate-lib.patch} $TMPDIR/swift-separate-lib.patch + patch -p1 -d swift -i $TMPDIR/swift-separate-lib.patch + + patch -p1 -d llvm-project/llvm -i ${./patches/llvm-module-cache.patch} + + patch -p1 -d llvm-project/clang -i ${./patches/clang-toolchain-dir.patch} + patch -p1 -d llvm-project/clang -i ${./patches/clang-wrap.patch} + patch -p1 -d llvm-project/clang -i ${../../llvm/14/clang/purity.patch} + patch -p2 -d llvm-project/clang -i ${fetchpatch { + name = "clang-cmake-fix-interpreter.patch"; + url = "https://github.com/llvm/llvm-project/commit/b5eaf500f2441eff2277ea2973878fb1f171fd0a.patch"; + sha256 = "1rma1al0rbm3s3ql6bnvbcighp74lri1lcrwbyacgdqp80fgw1b6"; + }} + + ${lib.optionalString stdenv.isLinux '' + 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";' + + # 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 + ''} + + # Remove tests for cross compilation, which we don't currently support. + rm swift/test/Interop/Cxx/class/constructors-copy-irgen.swift + rm swift/test/Interop/Cxx/class/constructors-irgen.swift + + # TODO: consider fixing and re-adding. This test fails due to a non-standard "install_prefix". + rm swift/validation-test/Python/build_swift.swift + + # We cannot handle the SDK location being in "Weird Location" due to Nix isolation. + rm swift/test/DebugInfo/compiler-flags.swift + + # TODO: Fix issue with ld.gold invoked from script finding crtbeginS.o and crtendS.o. + rm swift/test/IRGen/ELF-remove-autolink-section.swift + + # The following two tests fail because we use don't use the bundled libicu: + # [SOURCE_DIR/utils/build-script] ERROR: can't find source directory for libicu (tried /build/src/icu) + rm swift/validation-test/BuildSystem/default_build_still_performs_epilogue_opts_after_split.test + rm swift/validation-test/BuildSystem/test_early_swift_driver_and_infer.swift + + # TODO: This test fails for some unknown reason + rm swift/test/Serialization/restrict-swiftmodule-to-revision.swift + + # This test was flaky in ofborg, see #186476 + rm swift/test/AutoDiff/compiler_crashers_fixed/sr14290-missing-debug-scopes-in-pullback-trampoline.swift + + patchShebangs . + + ${lib.optionalString (!stdenv.isDarwin) '' + # NOTE: This interferes with ABI stability on Darwin, which uses the system + # libraries in the hardcoded path /usr/lib/swift. + fixCmakeFiles . + ''} + ''; + + configurePhase = '' + export SWIFT_SOURCE_ROOT="$PWD" + mkdir -p ../build + cd ../build + export SWIFT_BUILD_ROOT="$PWD" + + # Most builds set a target, but LLDB doesn't. Harmless on non-Darwin. + export MACOSX_DEPLOYMENT_TARGET=10.15 + ''; + + # These steps are derived from doing a normal build with. + # + # ./swift/utils/build-toolchain test --dry-run + # + # But dealing with the custom Python build system is far more trouble than + # simply invoking CMake directly. Few variables it passes to CMake are + # actually required or non-default. + # + # Using CMake directly also allows us to split up the already large build, + # and package Swift components separately. + # + # Besides `--dry-run`, another good way to compare build changes between + # Swift releases is to diff the scripts: + # + # git diff swift-5.6.3-RELEASE..swift-5.7-RELEASE -- utils/build* + # + buildPhase = '' + # Helper to build a subdirectory. + # + # Always reset cmakeFlags before calling this. The cmakeConfigurePhase + # amends flags and would otherwise keep expanding it. + function buildProject() { + mkdir -p $SWIFT_BUILD_ROOT/$1 + cd $SWIFT_BUILD_ROOT/$1 + + cmakeDir=$SWIFT_SOURCE_ROOT/''${2-$1} + cmakeConfigurePhase + + ninjaBuildPhase + } + + cmakeFlags="-GNinja" + buildProject swift-cmark + + # Some notes: + # - The Swift build just needs Clang. + # - We can further reduce targets to just our targetPlatform. + cmakeFlags=" + -GNinja + -DLLVM_ENABLE_PROJECTS=clang + -DLLVM_TARGETS_TO_BUILD=${{ + "x86_64" = "X86"; + "aarch64" = "AArch64"; + }.${targetPlatform.parsed.cpu.name}} + " + buildProject llvm llvm-project/llvm + + '' + lib.optionalString stdenv.isDarwin '' + # Add appleSwiftCore to the search paths. We can't simply add it to + # buildInputs, because it is potentially an older stdlib than the one we're + # building. We have to remove it again after the main Swift build, or later + # build steps may fail. (Specific case: Concurrency backdeploy uses the + # Sendable protocol, which appears to not be present in the macOS 11 SDK.) + OLD_NIX_SWIFTFLAGS_COMPILE="$NIX_SWIFTFLAGS_COMPILE" + OLD_NIX_LDFLAGS="$NIX_LDFLAGS" + export NIX_SWIFTFLAGS_COMPILE+=" -I ${appleSwiftCore}/lib/swift" + export NIX_LDFLAGS+=" -L ${appleSwiftCore}/lib/swift" + '' + '' + + # Some notes: + # - BOOTSTRAPPING_MODE defaults to OFF in CMake, but is enabled in standard + # builds, so we enable it as well. On Darwin, we have to use the system + # Swift libs because of ABI-stability, but this may be trouble if the + # builder is an older macOS. + # - Experimental features are OFF by default in CMake, but are enabled in + # official builds, so we do the same. (Concurrency is also required in + # the stdlib. StringProcessing is often implicitely imported, causing + # lots of warnings if missing.) + # - SWIFT_STDLIB_ENABLE_OBJC_INTEROP is set explicitely because its check + # is buggy. (Uses SWIFT_HOST_VARIANT_SDK before initialized.) + # Fixed in: https://github.com/apple/swift/commit/84083afef1de5931904d5c815d53856cdb3fb232 + cmakeFlags=" + -GNinja + -DBOOTSTRAPPING_MODE=BOOTSTRAPPING${lib.optionalString stdenv.isDarwin "-WITH-HOSTLIBS"} + -DSWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=ON + -DSWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY=ON + -DSWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED=ON + -DSWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=ON + -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm + -DClang_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/clang + -DSWIFT_PATH_TO_CMARK_SOURCE=$SWIFT_SOURCE_ROOT/swift-cmark + -DSWIFT_PATH_TO_CMARK_BUILD=$SWIFT_BUILD_ROOT/swift-cmark + -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE=$SWIFT_SOURCE_ROOT/swift-corelibs-libdispatch + -DEXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing + -DSWIFT_INSTALL_COMPONENTS=${lib.concatStringsSep ";" swiftInstallComponents} + -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.isDarwin then "ON" else "OFF"} + " + buildProject swift + + '' + lib.optionalString stdenv.isDarwin '' + # Restore search paths to remove appleSwiftCore. + export NIX_SWIFTFLAGS_COMPILE="$OLD_NIX_SWIFTFLAGS_COMPILE" + export NIX_LDFLAGS="$OLD_NIX_LDFLAGS" + '' + '' + + # These are based on flags in `utils/build-script-impl`. + # + # LLDB_USE_SYSTEM_DEBUGSERVER=ON disables the debugserver build on Darwin, + # which requires a special signature. + # + # CMAKE_BUILD_WITH_INSTALL_NAME_DIR ensures we don't use rpath on Darwin. + # + # NOTE: On Darwin, we only want ncurses in the linker search path, because + # headers are part of libsystem. Adding its headers to the search path + # causes strange mixing and errors. Note that libedit propagates ncurses, + # so we add both manually here, instead of relying on setup hooks. + # TODO: Find a better way to prevent this conflict. + cmakeFlags=" + -GNinja + -DLLDB_SWIFTC=$SWIFT_BUILD_ROOT/swift/bin/swiftc + -DLLDB_SWIFT_LIBS=$SWIFT_BUILD_ROOT/swift/lib/swift + -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm + -DClang_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/clang + -DSwift_DIR=$SWIFT_BUILD_ROOT/swift/lib/cmake/swift + -DLLDB_ENABLE_CURSES=ON + -DLLDB_ENABLE_LIBEDIT=ON + -DLLDB_ENABLE_PYTHON=ON + -DLLDB_ENABLE_LZMA=OFF + -DLLDB_ENABLE_LUA=OFF + -DLLDB_INCLUDE_TESTS=OFF + -DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON + ${lib.optionalString stdenv.isDarwin '' + -DLLDB_USE_SYSTEM_DEBUGSERVER=ON + ''} + -DLibEdit_INCLUDE_DIRS=${libedit.dev}/include + -DLibEdit_LIBRARIES=${libedit}/lib/libedit${stdenv.hostPlatform.extensions.sharedLibrary} + -DCURSES_INCLUDE_DIRS=${if stdenv.isDarwin then "/var/empty" else ncurses.dev}/include + -DCURSES_LIBRARIES=${ncurses}/lib/libncurses${stdenv.hostPlatform.extensions.sharedLibrary} + -DPANEL_LIBRARIES=${ncurses}/lib/libpanel${stdenv.hostPlatform.extensions.sharedLibrary} + "; + buildProject lldb llvm-project/lldb + + ${lib.optionalString stdenv.isDarwin '' + # Need to do a standalone build of concurrency for Darwin back deployment. + # Based on: utils/swift_build_support/swift_build_support/products/backdeployconcurrency.py + cmakeFlags=" + -GNinja + -DCMAKE_Swift_COMPILER=$SWIFT_BUILD_ROOT/swift/bin/swiftc + + -DTOOLCHAIN_DIR=/var/empty + -DSWIFT_NATIVE_LLVM_TOOLS_PATH=${stdenv.cc}/bin + -DSWIFT_NATIVE_CLANG_TOOLS_PATH=${stdenv.cc}/bin + -DSWIFT_NATIVE_SWIFT_TOOLS_PATH=$SWIFT_BUILD_ROOT/swift/bin + + -DCMAKE_CROSSCOMPILING=ON + + -DBUILD_SWIFT_CONCURRENCY_BACK_DEPLOYMENT_LIBRARIES=ON + -DSWIFT_INCLUDE_TOOLS=OFF + -DSWIFT_BUILD_STDLIB_EXTRA_TOOLCHAIN_CONTENT=OFF + -DSWIFT_BUILD_TEST_SUPPORT_MODULES=OFF + -DSWIFT_BUILD_STDLIB=OFF + -DSWIFT_BUILD_DYNAMIC_STDLIB=OFF + -DSWIFT_BUILD_STATIC_STDLIB=OFF + -DSWIFT_BUILD_REMOTE_MIRROR=OFF + -DSWIFT_BUILD_SDK_OVERLAY=OFF + -DSWIFT_BUILD_DYNAMIC_SDK_OVERLAY=OFF + -DSWIFT_BUILD_STATIC_SDK_OVERLAY=OFF + -DSWIFT_INCLUDE_TESTS=OFF + -DSWIFT_BUILD_PERF_TESTSUITE=OFF + + -DSWIFT_HOST_VARIANT_ARCH=${swiftArch} + -DBUILD_STANDALONE=ON + + -DSWIFT_INSTALL_COMPONENTS=back-deployment + + -DSWIFT_SDKS=${{ + "macos" = "OSX"; + "ios" = "IOS"; + #IOS_SIMULATOR + #TVOS + #TVOS_SIMULATOR + #WATCHOS + #WATCHOS_SIMULATOR + }.${targetPlatform.darwinPlatform}} + + -DLLVM_DIR=$SWIFT_BUILD_ROOT/llvm/lib/cmake/llvm + + -DSWIFT_DEST_ROOT=$out + -DSWIFT_HOST_VARIANT_SDK=OSX + + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_OSX=10.15 + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_IOS=13.0 + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_MACCATALYST=13.0 + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS=13.0 + -DSWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS=6.0 + " + + # This depends on the special Clang build specific to the Swift branch. + # We also need to call a specific Ninja target. + export CC=$SWIFT_BUILD_ROOT/llvm/bin/clang + export CXX=$SWIFT_BUILD_ROOT/llvm/bin/clang++ + ninjaFlags="back-deployment" + + buildProject swift-concurrency-backdeploy swift + + export CC=$NIX_CC/bin/clang + export CXX=$NIX_CC/bin/clang++ + unset ninjaFlags + ''} + ''; + + # TODO: ~50 failing tests on x86_64-linux. Other platforms not checked. + doCheck = false; + nativeCheckInputs = [ file ]; + # TODO: consider using stress-tester and integration-test. + checkPhase = '' + cd $SWIFT_BUILD_ROOT/swift + checkTarget=check-swift-all + ninjaCheckPhase + unset checkTarget + ''; + + installPhase = '' + # Undo the clang and swift wrapping we did for the build. + # (This happened via patches to cmake files.) + cd $SWIFT_BUILD_ROOT + mv llvm/bin/clang-14{-unwrapped,} + mv swift/bin/swift-frontend{-unwrapped,} + + mkdir $out $lib + + # Install clang binaries only. We hide these with the wrapper, so they are + # for private use by Swift only. + cd $SWIFT_BUILD_ROOT/llvm + installTargets=install-clang + ninjaInstallPhase + unset installTargets + + # LLDB is also a private install. + cd $SWIFT_BUILD_ROOT/lldb + ninjaInstallPhase + + cd $SWIFT_BUILD_ROOT/swift + ninjaInstallPhase + + ${lib.optionalString stdenv.isDarwin '' + cd $SWIFT_BUILD_ROOT/swift-concurrency-backdeploy + installTargets=install-back-deployment + ninjaInstallPhase + unset installTargets + ''} + + # Separate $lib output here, because specific logic follows. + # Only move the dynamic run-time parts, to keep $lib small. Every Swift + # build will depend on it. + moveToOutput "lib/swift" "$lib" + moveToOutput "lib/libswiftDemangle.*" "$lib" + + # This link is here because various tools (swiftpm) check for stdlib + # relative to the swift compiler. It's fine if this is for build-time + # stuff, but we should patch all cases were it would end up in an output. + ln -s $lib/lib/swift $out/lib/swift + + # Swift has a separate resource root from Clang, but locates the Clang + # resource root via subdir or symlink. Provide a default here, but we also + # patch Swift to prefer NIX_CC if set. + ln -s ${clang}/resource-root $lib/lib/swift/clang + + ${lib.optionalString stdenv.isDarwin '' + # Install required library for ObjC interop. + # TODO: Is there no source code for this available? + cp -r ${CLTools_Executables}/usr/lib/arc $out/lib/arc + ''} + ''; + + preFixup = lib.optionalString stdenv.isLinux '' + # This is cheesy, but helps the patchelf hook remove /build from RPATH. + cd $SWIFT_BUILD_ROOT/.. + mv build buildx + ''; + + postFixup = lib.optionalString stdenv.isDarwin '' + # These libraries need to use the system install name. The official SDK + # does the same (as opposed to using rpath). Presumably, they are part of + # the stable ABI. Not using the system libraries at run-time is known to + # cause ObjC class conflicts and segfaults. + declare -A systemLibs=( + [libswiftCore.dylib]=1 + [libswiftDarwin.dylib]=1 + [libswiftSwiftOnoneSupport.dylib]=1 + [libswift_Concurrency.dylib]=1 + ) + + for systemLib in "''${!systemLibs[@]}"; do + install_name_tool -id /usr/lib/swift/$systemLib $lib/${swiftLibSubdir}/$systemLib + done + + for file in $out/bin/swift-frontend $lib/${swiftLibSubdir}/*.dylib; do + changeArgs="" + for dylib in $(otool -L $file | awk '{ print $1 }'); do + if [[ ''${systemLibs["$(basename $dylib)"]} ]]; then + changeArgs+=" -change $dylib /usr/lib/swift/$(basename $dylib)" + elif [[ "$dylib" = */bootstrapping1/* ]]; then + changeArgs+=" -change $dylib $lib/lib/swift/$(basename $dylib)" + fi + done + if [[ -n "$changeArgs" ]]; then + install_name_tool $changeArgs $file + fi + done + + wrapProgram $out/bin/swift-frontend \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} + ''; + + passthru = { + inherit + swiftOs swiftArch + swiftModuleSubdir swiftLibSubdir + swiftStaticModuleSubdir swiftStaticLibSubdir; + + # Internal attr for the wrapper. + _wrapperParams = wrapperParams; + }; + + meta = { + description = "The Swift Programming Language"; + homepage = "https://github.com/apple/swift"; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + license = lib.licenses.asl20; + platforms = with lib.platforms; linux ++ darwin; + # Swift doesn't support 32-bit Linux, unknown on other platforms. + badPlatforms = lib.platforms.i686; + timeout = 86400; # 24 hours. + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0005-clang-toolchain-dir.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/clang-toolchain-dir.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/swift/patches/0005-clang-toolchain-dir.patch rename to third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/clang-toolchain-dir.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/clang-wrap.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/clang-wrap.patch new file mode 100644 index 0000000000..9c6cafed36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/clang-wrap.patch @@ -0,0 +1,18 @@ +Wrap the clang produced during the build + +--- a/tools/driver/CMakeLists.txt ++++ b/tools/driver/CMakeLists.txt +@@ -59,6 +59,13 @@ endif() + + add_dependencies(clang clang-resource-headers) + ++# Nix: wrap the clang build. ++add_custom_command( ++ TARGET clang POST_BUILD ++ COMMAND nix-swift-make-clang-wrapper $ ++ VERBATIM ++) ++ + if(NOT CLANG_LINKS_TO_CREATE) + set(CLANG_LINKS_TO_CREATE clang++ clang-cl clang-cpp) + endif() diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/llvm-module-cache.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/llvm-module-cache.patch new file mode 100644 index 0000000000..9a22d0482e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/llvm-module-cache.patch @@ -0,0 +1,30 @@ +The compiler fails if LLVM modules are enabled and it cannot write its module +cache. This patch detects and rejects the fake, non-existant $HOME used in Nix +builds. + +We could simply return false in `cache_directory`, but that completely disables +module caching, and may unnecessarily slow down builds. Instead, let it use +'/tmp/.cache'. + +--- a/lib/Support/Unix/Path.inc ++++ b/lib/Support/Unix/Path.inc +@@ -1380,6 +1380,9 @@ bool user_config_directory(SmallVectorImpl &result) { + if (!home_directory(result)) { + return false; + } ++ if (std::equal(result.begin(), result.end(), "/homeless-shelter")) { ++ return false; ++ } + append(result, ".config"); + return true; + } +@@ -1401,6 +1404,9 @@ bool cache_directory(SmallVectorImpl &result) { + if (!home_directory(result)) { + return false; + } ++ if (std::equal(result.begin(), result.end(), "/homeless-shelter")) { ++ system_temp_directory(true/*ErasedOnReboot*/, result); ++ } + append(result, ".cache"); + return true; + } diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-darwin-plistbuddy-workaround.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-darwin-plistbuddy-workaround.patch new file mode 100644 index 0000000000..a3cf4f6067 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-darwin-plistbuddy-workaround.patch @@ -0,0 +1,17 @@ +CMake tries to read a list field from SDKSettings.plist, but the output of +facebook/xcbuild PlistBuddy is incompatible with Apple's. + +Simply set the supported architectures to the one target architecture we're +building for. + +--- a/cmake/modules/SwiftConfigureSDK.cmake ++++ b/cmake/modules/SwiftConfigureSDK.cmake +@@ -189,7 +189,7 @@ macro(configure_sdk_darwin + endif() + + # Remove any architectures not supported by the SDK. +- remove_sdk_unsupported_archs(${name} ${xcrun_name} ${SWIFT_SDK_${prefix}_PATH} SWIFT_SDK_${prefix}_ARCHITECTURES) ++ set(SWIFT_SDK_${prefix}_ARCHITECTURES "@swiftArch@") + + list_intersect( + "${SWIFT_DARWIN_MODULE_ARCHS}" # lhs diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-linking.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-linking.patch new file mode 100644 index 0000000000..e09d5162a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-linking.patch @@ -0,0 +1,21 @@ +--- a/lib/Driver/ToolChains.cpp ++++ b/lib/Driver/ToolChains.cpp +@@ -1475,7 +1475,17 @@ const char *ToolChain::getClangLinkerDriver( + + // If there is a linker driver in the toolchain folder, use that instead. + if (auto tool = llvm::sys::findProgramByName(LinkerDriver, {toolchainPath})) +- LinkerDriver = Args.MakeArgString(tool.get()); ++ return Args.MakeArgString(tool.get()); ++ } ++ ++ // For Nix, prefer linking using the wrapped system clang, instead of using ++ // the unwrapped clang packaged with swift. The latter is unable to link, but ++ // we still want to use it for other purposes (clang importer). ++ if (auto nixCC = llvm::sys::Process::GetEnv("NIX_CC")) { ++ llvm::SmallString<128> binDir(nixCC.getValue()); ++ llvm::sys::path::append(binDir, "bin"); ++ if (auto tool = llvm::sys::findProgramByName(LinkerDriver, {binDir.str()})) ++ return Args.MakeArgString(tool.get()); + } + + return LinkerDriver; diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch new file mode 100644 index 0000000000..a68326c580 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch @@ -0,0 +1,67 @@ +Swift normally looks for the Clang resource dir in a subdir/symlink of its own +resource dir. We provide a symlink to the Swift build-time Clang as a default +there, but we also here patch two checks to try locate it via NIX_CC. + +The first (ClangImporter.cpp) happens when Swift code imports C modules. The +second (ToolChains.cpp) happens when Swift is used to link the final product. + +--- a/lib/ClangImporter/ClangImporter.cpp ++++ b/lib/ClangImporter/ClangImporter.cpp +@@ -68,6 +68,7 @@ + #include "llvm/Support/FileSystem.h" + #include "llvm/Support/Memory.h" + #include "llvm/Support/Path.h" ++#include "llvm/Support/Process.h" + #include "llvm/Support/YAMLParser.h" + #include "llvm/Support/YAMLTraits.h" + #include +@@ -809,6 +810,17 @@ importer::addCommonInvocationArguments( + + const std::string &overrideResourceDir = importerOpts.OverrideResourceDir; + if (overrideResourceDir.empty()) { ++ // Prefer the Clang resource directory from NIX_CC, to allow swapping in a ++ // different stdenv. ++ // TODO: Figure out how to provide a user override for this. Probably a ++ // niche use case, though, and for now a user can unset NIX_CC to work ++ // around it if necessary. ++ if (auto nixCC = llvm::sys::Process::GetEnv("NIX_CC")) { ++ llvm::SmallString<128> resourceDir(nixCC.getValue()); ++ llvm::sys::path::append(resourceDir, "resource-root"); ++ invocationArgStrs.push_back("-resource-dir"); ++ invocationArgStrs.push_back(std::string(resourceDir.str())); ++ } else { + llvm::SmallString<128> resourceDir(searchPathOpts.RuntimeResourcePath); + + // Adjust the path to refer to our copy of the Clang resource directory +@@ -824,6 +836,7 @@ importer::addCommonInvocationArguments( + // Set the Clang resource directory to the path we computed. + invocationArgStrs.push_back("-resource-dir"); + invocationArgStrs.push_back(std::string(resourceDir.str())); ++ } // nixCC + } else { + invocationArgStrs.push_back("-resource-dir"); + invocationArgStrs.push_back(overrideResourceDir); +--- a/lib/Driver/ToolChains.cpp ++++ b/lib/Driver/ToolChains.cpp +@@ -1372,10 +1372,20 @@ void ToolChain::getClangLibraryPath(const ArgList &Args, + SmallString<128> &LibPath) const { + const llvm::Triple &T = getTriple(); + ++ // Nix: We provide a `clang` symlink in the default Swift resource root, but ++ // prefer detecting the Clang resource root via NIX_CC, to allow swapping in ++ // a different stdenv. However, always honor a user-provided `-resource-dir`. ++ auto nixCC = llvm::sys::Process::GetEnv("NIX_CC"); ++ if (nixCC && !Args.hasArgNoClaim(options::OPT_resource_dir)) { ++ LibPath.assign(nixCC.getValue()); ++ llvm::sys::path::append(LibPath, "resource-root"); ++ } else { + getResourceDirPath(LibPath, Args, /*Shared=*/true); + // Remove platform name. + llvm::sys::path::remove_filename(LibPath); +- llvm::sys::path::append(LibPath, "clang", "lib", ++ llvm::sys::path::append(LibPath, "clang"); ++ } // nixCC ++ llvm::sys::path::append(LibPath, "lib", + T.isOSDarwin() ? "darwin" + : getPlatformNameForTriple(T)); + } diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-prevent-sdk-dirs-warning.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-prevent-sdk-dirs-warning.patch new file mode 100644 index 0000000000..987b99d745 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-prevent-sdk-dirs-warning.patch @@ -0,0 +1,39 @@ +Prevents a user-visible warning on every compilation: + + ld: warning: directory not found for option '-L.../MacOSX11.0.sdk/usr/lib/swift' + +--- a/lib/Driver/ToolChains.cpp ++++ b/lib/Driver/ToolChains.cpp +@@ -1455,9 +1455,11 @@ void ToolChain::getRuntimeLibraryPaths(SmallVectorImpl &runtimeLibP + runtimeLibPaths.push_back(std::string(scratchPath.str())); + } + ++ if (!SDKPath.startswith("@storeDir@")) { + scratchPath = SDKPath; + llvm::sys::path::append(scratchPath, "usr", "lib", "swift"); + runtimeLibPaths.push_back(std::string(scratchPath.str())); ++ } + } + } + +--- a/lib/Frontend/CompilerInvocation.cpp ++++ b/lib/Frontend/CompilerInvocation.cpp +@@ -185,7 +185,9 @@ static void updateRuntimeLibraryPaths(SearchPathOptions &SearchPathOpts, + RuntimeLibraryImportPaths.push_back(std::string(LibPath.str())); + } + +- LibPath = SearchPathOpts.getSDKPath(); ++ auto SDKPath = SearchPathOpts.getSDKPath(); ++ if (!SDKPath.startswith("@storeDir@")) { ++ LibPath = SDKPath; + llvm::sys::path::append(LibPath, "usr", "lib", "swift"); + if (!Triple.isOSDarwin()) { + // Use the non-architecture suffixed form with directory-layout +@@ -200,6 +202,7 @@ static void updateRuntimeLibraryPaths(SearchPathOptions &SearchPathOpts, + llvm::sys::path::append(LibPath, swift::getMajorArchitectureName(Triple)); + } + RuntimeLibraryImportPaths.push_back(std::string(LibPath.str())); ++ } + } + SearchPathOpts.setRuntimeLibraryImportPaths(RuntimeLibraryImportPaths); + } diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-separate-lib.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-separate-lib.patch new file mode 100644 index 0000000000..20d81a6e82 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-separate-lib.patch @@ -0,0 +1,26 @@ +Patch paths to use the separate 'lib' output. One of the things this patch +fixes is the output of `swift -frontend -print-target-info`, which swiftpm uses +to set rpath on Linux. + +The check if the executable path starts with 'out' is necessary for +bootstrapping, or the compiler will fail when run from the build directory. + +--- a/lib/Frontend/CompilerInvocation.cpp ++++ b/lib/Frontend/CompilerInvocation.cpp +@@ -49,11 +49,16 @@ swift::CompilerInvocation::CompilerInvocation() { + void CompilerInvocation::computeRuntimeResourcePathFromExecutablePath( + StringRef mainExecutablePath, bool shared, + llvm::SmallVectorImpl &runtimeResourcePath) { ++ if (mainExecutablePath.startswith("@storeDir@")) { ++ auto libPath = StringRef("@lib@"); ++ runtimeResourcePath.append(libPath.begin(), libPath.end()); ++ } else { + runtimeResourcePath.append(mainExecutablePath.begin(), + mainExecutablePath.end()); + + llvm::sys::path::remove_filename(runtimeResourcePath); // Remove /swift + llvm::sys::path::remove_filename(runtimeResourcePath); // Remove /bin ++ } + appendSwiftLibDir(runtimeResourcePath, shared); + } + diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-wrap.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-wrap.patch new file mode 100644 index 0000000000..e4697f631e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/compiler/patches/swift-wrap.patch @@ -0,0 +1,46 @@ +Wrap the swift compiler produced during the build + +--- a/tools/driver/CMakeLists.txt ++++ b/tools/driver/CMakeLists.txt +@@ -16,6 +16,13 @@ if(${LIBSWIFT_BUILD_MODE} MATCHES "BOOTSTRAPPING.*") + swiftDriverTool + libswiftStub) + ++ # Nix: wrap the swift build. ++ add_custom_command( ++ TARGET swift-frontend-bootstrapping0 POST_BUILD ++ COMMAND nix-swift-make-swift-wrapper $ ++ VERBATIM ++ ) ++ + swift_create_post_build_symlink(swift-frontend-bootstrapping0 + SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}" + DESTINATION "swiftc${CMAKE_EXECUTABLE_SUFFIX}" +@@ -34,6 +41,13 @@ if(${LIBSWIFT_BUILD_MODE} MATCHES "BOOTSTRAPPING.*") + swiftDriverTool + libswift-bootstrapping1) + ++ # Nix: wrap the swift build. ++ add_custom_command( ++ TARGET swift-frontend-bootstrapping1 POST_BUILD ++ COMMAND nix-swift-make-swift-wrapper $ ++ VERBATIM ++ ) ++ + swift_create_post_build_symlink(swift-frontend-bootstrapping1 + SOURCE "swift-frontend${CMAKE_EXECUTABLE_SUFFIX}" + DESTINATION "swiftc${CMAKE_EXECUTABLE_SUFFIX}" +@@ -50,6 +64,13 @@ target_link_libraries(swift-frontend + swiftDriverTool + libswift) + ++# Nix: wrap the swift build. ++add_custom_command( ++ TARGET swift-frontend POST_BUILD ++ COMMAND nix-swift-make-swift-wrapper $ ++ VERBATIM ++) ++ + # Create a `swift-driver` executable adjacent to the `swift-frontend` executable + # to ensure that `swiftc` forwards to the standalone driver when invoked. + swift_create_early_driver_copies(swift-frontend) diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix index 0ea6e7b075..e8eb4d738c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix @@ -1,475 +1,101 @@ -{ lib, stdenv -, cmake -, coreutils -, glibc -, gccForLibs -, which -, perl -, libedit -, ninja -, pkg-config -, sqlite -, libxml2 -, clang_13 -, python3 -, ncurses -, libuuid -, libxcrypt -, icu -, libgcc -, libblocksruntime -, curl -, rsync -, git -, libgit2 -, fetchFromGitHub -, makeWrapper -, gnumake -, file +{ lib +, pkgs +, newScope +, darwin +, llvmPackages_latest +, overrideCC }: let - # The Swift toolchain script builds projects with separate repos. By convention, some of them share - # the same version with the main Swift compiler project per release. We fetch these with - # `fetchSwiftRelease`. The rest have their own versions locked to each Swift release, as defined in the - # Swift compiler repo: - # utils/update_checkout/update_checkout-config.json. - # - # ... among projects listed in that file, we provide our own: - # - CMake - # - ninja - # - icu - # - # ... we'd like to include the following in the future: - # - stress-tester - # - integration-tests + self = rec { + + callPackage = newScope self; + + # Current versions of Swift on Darwin require macOS SDK 10.15 at least. + # Re-export this so we can rely on the minimum Swift SDK elsewhere. + apple_sdk = pkgs.darwin.apple_sdk_11_0; + + # Our current Clang on Darwin is v11, but we need at least v12. The + # following applies the newer Clang with the same libc overrides as + # `apple_sdk.stdenv`. + # + # If 'latest' becomes an issue, recommend replacing it with v14, which is + # currently closest to the official Swift builds. + clang = if pkgs.stdenv.isDarwin + then + llvmPackages_latest.clang.override rec { + libc = apple_sdk.Libsystem; + bintools = pkgs.bintools.override { inherit libc; }; + } + else + llvmPackages_latest.clang; + + # Overrides that create a useful environment for swift packages, allowing + # packaging with `swiftPackages.callPackage`. These are similar to + # `apple_sdk_11_0.callPackage`, with our clang on top. + inherit (clang) bintools; + stdenv = overrideCC pkgs.stdenv clang; + darwin = pkgs.darwin.overrideScope (_: prev: { + inherit apple_sdk; + inherit (apple_sdk) Libsystem LibsystemCross libcharset libunwind objc4 configd IOKit Security; + CF = apple_sdk.CoreFoundation; + }); + xcodebuild = pkgs.xcbuild.override { + inherit (apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; + inherit stdenv; + sdkVer = "10.15"; + }; + xcbuild = xcodebuild; + + swift-unwrapped = callPackage ./compiler { + inherit (darwin) DarwinTools cctools sigtool; + inherit (apple_sdk) MacOSX-SDK CLTools_Executables; + inherit (apple_sdk.frameworks) CoreServices Foundation Combine; + }; + + swiftNoSwiftDriver = callPackage ./wrapper { + swift = swift-unwrapped; + useSwiftDriver = false; + }; + + Dispatch = if stdenv.isDarwin + then null # part of libsystem + else callPackage ./libdispatch { swift = swiftNoSwiftDriver; }; + + Foundation = if stdenv.isDarwin + then apple_sdk.frameworks.Foundation + else callPackage ./foundation { swift = swiftNoSwiftDriver; }; + + # TODO: Apple distributes a binary XCTest with Xcode, but it is not part of + # CLTools (or SUS), so would have to figure out how to fetch it. The binary + # version has several extra features, like a test runner and ObjC support. + XCTest = callPackage ./xctest { + inherit (darwin) DarwinTools; + swift = swiftNoSwiftDriver; + }; + + swiftpm = callPackage ./swiftpm { + inherit (darwin) DarwinTools cctools; + inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; + swift = swiftNoSwiftDriver; + }; + + swift-driver = callPackage ./swift-driver { + swift = swiftNoSwiftDriver; + }; + + swift = callPackage ./wrapper { + swift = swift-unwrapped; + }; + + sourcekit-lsp = callPackage ./sourcekit-lsp { + inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; + }; + + swift-docc = callPackage ./swift-docc { + inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication; + }; - versions = { - swift = "5.6.2"; - yams = "4.0.2"; - argumentParser = "1.0.3"; - format = "release/5.6"; - crypto = "1.1.5"; - nio = "2.31.2"; - nio-ssl = "2.15.0"; }; - fetchAppleRepo = { repo, rev, sha256 }: - fetchFromGitHub { - owner = "apple"; - inherit repo rev sha256; - name = "${repo}-${rev}-src"; - }; - - fetchSwiftRelease = { repo, sha256, fetchSubmodules ? false }: - fetchFromGitHub { - owner = "apple"; - inherit repo sha256 fetchSubmodules; - rev = "swift-${versions.swift}-RELEASE"; - name = "${repo}-${versions.swift}-src"; - }; - - sources = { - # Projects that share `versions.swift` for each release. - - swift = fetchSwiftRelease { - repo = "swift"; - sha256 = "sha256-wiRXAXWEksJuy+YQQ+B7tzr2iLkSVkgV6o+wIz7yKJA="; - }; - cmark = fetchSwiftRelease { - repo = "swift-cmark"; - sha256 = "sha256-f0BoTs4HYdx/aJ9HIGCWMalhl8PvClWD6R4QK3qSgAw="; - }; - llbuild = fetchSwiftRelease { - repo = "swift-llbuild"; - sha256 = "sha256-SQ6V0zVshIYMjayx+ZpYuLijgQ89tqRnPlXBPf2FYqM="; - }; - driver = fetchSwiftRelease { - repo = "swift-driver"; - sha256 = "sha256-D5/C4Rbv5KIsKpy6YbuMxGIGaQkn80PD4Cp0l6bPKzY="; - }; - toolsSupportCore = fetchSwiftRelease { - repo = "swift-tools-support-core"; - sha256 = "sha256-FbtQCq1sSlzrskCrgzD4iYuo5eGaXrAUUxoNX/BiOfg="; - }; - swiftpm = fetchSwiftRelease { - repo = "swift-package-manager"; - sha256 = "sha256-esO4Swz3UYngbVgxoV+fkhSC0AU3IaxVjWkgK/s3x68="; - }; - syntax = fetchSwiftRelease { - repo = "swift-syntax"; - sha256 = "sha256-C9FPCtq49BvKXtTWWeReYWNrU70pHzT2DhAv3NiTbPU="; - }; - corelibsXctest = fetchSwiftRelease { - repo = "swift-corelibs-xctest"; - sha256 = "sha256-0hizfnKJaUUA+jXuXzXWk72FmlSyc+UGEf7BTLdJrx4="; - }; - corelibsFoundation = fetchSwiftRelease { - repo = "swift-corelibs-foundation"; - sha256 = "sha256-8sCL8Ia6yb6bRsJZ52gUJH0jN3lwClM573G8jgUdEhw="; - }; - corelibsLibdispatch = fetchSwiftRelease { - repo = "swift-corelibs-libdispatch"; - sha256 = "sha256-1tIskUMnfblnvZaFDQPUMBfWTmBYG98s7rEww7PwZO8="; - fetchSubmodules = true; - }; - indexstoreDb = fetchSwiftRelease { - repo = "indexstore-db"; - sha256 = "sha256-/PO4eMiASZN3pjFjBQ1r8vYwGRn6xm3SWaB2HDZlkPs="; - }; - sourcekitLsp = fetchSwiftRelease { - repo = "sourcekit-lsp"; - sha256 = "sha256-ttgUC4ZHD3P/xLHllEbACtHVrJ6HXqeVWccXcoPMkts="; - }; - llvmProject = fetchSwiftRelease { - repo = "llvm-project"; - sha256 = "sha256-YVs3lKV2RlaovpYkdGO+vzypolrmXmbKBBP4+osNMYw="; - }; - docc = fetchSwiftRelease { - repo = "swift-docc"; - sha256 = "sha256-rWiaNamZoHTO1bKpubxuT7m1IBOl7amT5M71mNauilY="; - }; - docc-render-artifact = fetchSwiftRelease { - repo = "swift-docc-render-artifact"; - sha256 = "sha256-AX+rtDLhq8drk7N6/hoH3fQioudmmTCnEhR45bME8uU="; - }; - docc-symbolkit = fetchSwiftRelease { - repo = "swift-docc-symbolkit"; - sha256 = "sha256-Xy1TQ5ucDW+MnkeOvVznsATBmwcQ3p1x+ofQ22ofk+o="; - }; - lmdb = fetchSwiftRelease { - repo = "swift-lmdb"; - sha256 = "sha256-i2GkWRWq1W5j8rF4PiHwWgT4Dur5FCY2o44HvUU3vtQ="; - }; - markdown = fetchSwiftRelease { - repo = "swift-markdown"; - sha256 = "sha256-XtFSBiNHhmULjS4OqSpMgUetLu3peRg7l6HpjwVsTj8="; - }; - - cmark-gfm = fetchAppleRepo { - repo = "swift-cmark"; - rev = "swift-${versions.swift}-RELEASE-gfm"; - sha256 = "sha256-g28iKmMR2W0r1urf8Fk1HBxAp5OlonNYSVN3Ril66tQ="; - }; - - # Projects that have their own versions during each release - - argumentParser = fetchAppleRepo { - repo = "swift-argument-parser"; - rev = "${versions.argumentParser}"; - sha256 = "sha256-vNqkuAwSZNCWvwe6E5BqbXQdIbmIia0dENmmSQ9P8Mo="; - }; - format = fetchAppleRepo { - repo = "swift-format"; - rev = "${versions.format}"; - sha256 = "sha256-1f5sIrv9IbPB7Vnahq1VwH8gT41dcjWldRwvVEaMdto="; - }; - crypto = fetchAppleRepo { - repo = "swift-crypto"; - rev = "${versions.crypto}"; - sha256 = "sha256-jwxXQuOF+CnpLMwTZ2z52Fgx2b97yWzXiPTx0Ye8KCQ="; - }; - nio = fetchAppleRepo { - repo = "swift-nio"; - rev = versions.nio; - sha256 = "sha256-FscOA/S7on31QCR/MZFjg4ZB3FGJ+rdptZ6MRZJXexE="; - }; - nio-ssl = fetchAppleRepo { - repo = "swift-nio-ssl"; - rev = versions.nio-ssl; - sha256 = "sha256-5QGkmkCOXhG3uOdf0bd3Fo1MFekB8/WcveBXGhtVZKo="; - }; - yams = fetchFromGitHub { - owner = "jpsim"; - repo = "Yams"; - rev = versions.yams; - sha256 = "sha256-cTkCAwxxLc35laOon1ZXXV8eAxX02oDolJyPauhZado="; - name = "Yams-${versions.yams}-src"; - }; - }; - - devInputs = [ - curl - glibc - icu - libblocksruntime - libedit - libgcc - libuuid - libxcrypt - libxml2 - ncurses - sqlite - ]; - - 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" - "-DGCC_INSTALL_PREFIX=${gccForLibs}" - ]; - -in -stdenv.mkDerivation { - pname = "swift"; - version = versions.swift; - - nativeBuildInputs = [ - cmake - git - makeWrapper - ninja - perl - pkg-config - python - rsync - which - ]; - buildInputs = devInputs ++ [ - clang_13 - ]; - - # TODO: Revisit what needs to be propagated and how. - propagatedBuildInputs = [ - libgcc - libgit2 - python - ]; - propagatedUserEnvPkgs = [ git pkg-config ]; - - hardeningDisable = [ "format" ]; # for LLDB - - unpackPhase = '' - mkdir src - cd src - export SWIFT_SOURCE_ROOT=$PWD - - 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 - cp -r ${sources.corelibsXctest} swift-corelibs-xctest - cp -r ${sources.corelibsFoundation} swift-corelibs-foundation - cp -r ${sources.corelibsLibdispatch} swift-corelibs-libdispatch - 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.crypto} swift-crypto - cp -r ${sources.llvmProject} llvm-project - cp -r ${sources.cmark-gfm} swift-cmark-gfm - cp -r ${sources.docc} swift-docc - cp -r ${sources.docc-render-artifact} swift-docc-render-artifact - cp -r ${sources.docc-symbolkit} swift-docc-symbolkit - cp -r ${sources.lmdb} swift-lmdb - cp -r ${sources.markdown} swift-markdown - cp -r ${sources.nio} swift-nio - cp -r ${sources.nio-ssl} swift-nio-ssl - - chmod -R u+w . - ''; - - patchPhase = '' - # Just patch all the things for now, we can focus this later. - patchShebangs $SWIFT_SOURCE_ROOT - - # 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' \ - -e 's|/bin/mkdir|${coreutils}/bin/mkdir|g' \ - -e 's|/bin/cp|${coreutils}/bin/cp|g' \ - -e 's|/usr/bin/file|${file}/bin/file|g' - - # 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} - patch -p1 -d swift -i ${./patches/0007-build-presets-linux-os-stdlib.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/' \ - -e 's/^validation-test$/# \0/' \ - -e 's/^long-test$/# \0/' \ - -e 's/^stress-test$/# \0/' \ - -e 's/^test-optimized$/# \0/' \ - -e 's/^swift-install-components=autolink.*$/\0;editor-integration/' - - # 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";' - - # Substitute ncurses for curses in llbuild. - sed -i 's/curses/ncurses/' llbuild/*/*/CMakeLists.txt - 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 - - # Support library build script patches. - PREFIX=''${out/#\/} - 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" - - # Can be removed in later swift-docc versions, see - # https://github.com/apple/swift-docc/commit/bff70b847008f91ac729cfd299a85481eef3f581 - substituteInPlace swift-docc/build-script-helper.py \ - --replace \ - "subprocess.check_output(cmd, env=env).strip(), 'docc')" \ - "subprocess.check_output(cmd, env=env).strip().decode(), 'docc')" - - # Can be removed in later Swift versions, see - # https://github.com/apple/swift/pull/58755 - substituteInPlace swift/utils/process-stats-dir.py \ - --replace \ - "type=argparse.FileType('wb', 0)," \ - "type=argparse.FileType('w', 0)," - - # Apply Python 3 fix, see - # https://github.com/apple/swift/commit/ec6bc595092974628b27b114a472e84162261bbd - substituteInPlace swift/utils/swift_build_support/swift_build_support/productpipeline_list_builder.py \ - --replace \ - "filter(lambda x: x is not None, pipeline)" \ - "[p for p in pipeline if p is not None]" - ''; - - configurePhase = '' - cd .. - - mkdir build install - export SWIFT_BUILD_ROOT=$PWD/build - export SWIFT_INSTALL_DIR=$PWD/install - - export INSTALLABLE_PACKAGE=$PWD/swift.tar.gz - export NIX_ENFORCE_PURITY= - - cd $SWIFT_BUILD_ROOT - ''; - - buildPhase = '' - # Explicitly include C++ headers to prevent errors where stdlib.h is not found from cstdlib. - export NIX_CFLAGS_COMPILE="$(< ${clang_13}/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_13}/bin/clang" - - $SWIFT_SOURCE_ROOT/swift/utils/build-script \ - --preset=buildbot_linux \ - installable_package=$INSTALLABLE_PACKAGE \ - install_prefix=$out \ - install_destdir=$SWIFT_INSTALL_DIR \ - extra_cmake_options="${lib.concatStringsSep "," cmakeFlags}" - ''; - - doCheck = true; - - checkInputs = [ file ]; - - checkPhase = '' - # 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 - - # 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 - - # 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 - - # The following two tests fail because we use don't use the bundled libicu: - # [SOURCE_DIR/utils/build-script] ERROR: can't find source directory for libicu (tried /build/src/icu) - rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/default_build_still_performs_epilogue_opts_after_split.test - rm $SWIFT_SOURCE_ROOT/swift/validation-test/BuildSystem/test_early_swift_driver_and_infer.swift - - # TODO: This test fails for some unknown reason - rm $SWIFT_SOURCE_ROOT/swift/test/Serialization/restrict-swiftmodule-to-revision.swift - - # This test was flaky in ofborg, see #186476 - rm $SWIFT_SOURCE_ROOT/swift/test/AutoDiff/compiler_crashers_fixed/sr14290-missing-debug-scopes-in-pullback-trampoline.swift - - # TODO: consider using stress-tester and integration-test. - - # Match the wrapped version of Swift to be installed. - export LIBRARY_PATH=${lib.makeLibraryPath [icu libgcc libuuid]}:$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 - ''; - - installPhase = '' - mkdir -p $out - - # 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. - 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 : ${lib.makeLibraryPath [icu libgcc libuuid]} \ - --suffix PATH : ${lib.makeBinPath [ stdenv.cc.bintools ]} - - 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 : ${lib.makeLibraryPath [icu libgcc libuuid]} \ - --suffix PATH : ${lib.makeBinPath [ stdenv.cc.bintools ]} - ''; - - # Hack to avoid build and install directories in RPATHs. - preFixup = "rm -rf $SWIFT_BUILD_ROOT $SWIFT_INSTALL_DIR"; - - meta = with lib; { - description = "The Swift Programming Language"; - homepage = "https://github.com/apple/swift"; - maintainers = with maintainers; [ dtzWill trepetti dduan trundle ]; - license = licenses.asl20; - # Swift doesn't support 32-bit Linux, unknown on other platforms. - platforms = platforms.linux; - badPlatforms = platforms.i686; - timeout = 86400; # 24 hours. - }; -} +in self diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/foundation/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/foundation/default.nix new file mode 100644 index 0000000000..efb35bd74c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/foundation/default.nix @@ -0,0 +1,61 @@ +# TODO: We already package the CoreFoundation component of Foundation in: +# pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +# This is separate because the CF build is completely different and part of +# stdenv. Merging the two was kept outside of the scope of Swift work. + +{ lib +, stdenv +, callPackage +, cmake +, ninja +, swift +, Dispatch +, icu +, libxml2 +, curl +}: + +let + sources = callPackage ../sources.nix { }; +in stdenv.mkDerivation { + pname = "swift-corelibs-foundation"; + + inherit (sources) version; + src = sources.swift-corelibs-foundation; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ cmake ninja swift ]; + buildInputs = [ icu libxml2 curl ]; + propagatedBuildInputs = [ Dispatch ]; + + preConfigure = '' + # Fails to build with -D_FORTIFY_SOURCE. + NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/} + ''; + + postInstall = '' + # Split up the output. + mkdir $dev + mv $out/lib/swift/${swift.swiftOs} $out/swiftlibs + mv $out/lib/swift $dev/include + mkdir $out/lib/swift + mv $out/swiftlibs $out/lib/swift/${swift.swiftOs} + + # Provide a CMake module. This is primarily used to glue together parts of + # the Swift toolchain. Modifying the CMake config to do this for us is + # otherwise more trouble. + mkdir -p $dev/lib/cmake/Foundation + export dylibExt="${stdenv.hostPlatform.extensions.sharedLibrary}" + export swiftOs="${swift.swiftOs}" + substituteAll ${./glue.cmake} $dev/lib/cmake/Foundation/FoundationConfig.cmake + ''; + + meta = { + description = "Core utilities, internationalization, and OS independence for Swift"; + homepage = "https://github.com/apple/swift-corelibs-foundation"; + platforms = lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/foundation/glue.cmake b/third_party/nixpkgs/pkgs/development/compilers/swift/foundation/glue.cmake new file mode 100644 index 0000000000..a34984d19f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/foundation/glue.cmake @@ -0,0 +1,8 @@ +add_library(Foundation SHARED IMPORTED) +set_property(TARGET Foundation PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libFoundation@dylibExt@") + +add_library(FoundationNetworking SHARED IMPORTED) +set_property(TARGET FoundationNetworking PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libFoundationNetworking@dylibExt@") + +add_library(FoundationXML SHARED IMPORTED) +set_property(TARGET FoundationXML PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libFoundationXML@dylibExt@") diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/libdispatch/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/libdispatch/default.nix new file mode 100644 index 0000000000..4a0616ded5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/libdispatch/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, callPackage +, cmake +, ninja +, useSwift ? true, swift +}: + +let + sources = callPackage ../sources.nix { }; +in stdenv.mkDerivation { + pname = "swift-corelibs-libdispatch"; + + inherit (sources) version; + src = sources.swift-corelibs-libdispatch; + + outputs = [ "out" "dev" "man" ]; + + nativeBuildInputs = [ cmake ] + ++ lib.optionals useSwift [ ninja swift ]; + + patches = [ ./disable-swift-overlay.patch ]; + + cmakeFlags = lib.optional useSwift "-DENABLE_SWIFT=ON"; + + postInstall = '' + # Provide a CMake module. This is primarily used to glue together parts of + # the Swift toolchain. Modifying the CMake config to do this for us is + # otherwise more trouble. + mkdir -p $dev/lib/cmake/dispatch + export dylibExt="${stdenv.hostPlatform.extensions.sharedLibrary}" + substituteAll ${./glue.cmake} $dev/lib/cmake/dispatch/dispatchConfig.cmake + ''; + + meta = { + description = "Grand Central Dispatch"; + homepage = "https://github.com/apple/swift-corelibs-libdispatch"; + platforms = lib.platforms.linux; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ cmm dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/libdispatch/disable-swift-overlay.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/libdispatch/disable-swift-overlay.patch new file mode 100644 index 0000000000..0ea1869d55 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/libdispatch/disable-swift-overlay.patch @@ -0,0 +1,35 @@ +Enabling Swift support is normally intended for building an overlay for a +Swift SDK, which changes the installation layout. Prevent this. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -287,7 +287,7 @@ configure_file("${PROJECT_SOURCE_DIR}/cmake/config.h.in" + add_compile_definitions($<$,$>:HAVE_CONFIG_H>) + + +-if(ENABLE_SWIFT) ++if(0) + set(INSTALL_TARGET_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$>:_static>/$" CACHE PATH "Path where the libraries will be installed") + set(INSTALL_DISPATCH_HEADERS_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$>:_static>/dispatch" CACHE PATH "Path where the headers will be installed for libdispatch") + set(INSTALL_BLOCK_HEADERS_DIR "${CMAKE_INSTALL_LIBDIR}/swift$<$>:_static>/Block" CACHE PATH "Path where the headers will be installed for the blocks runtime") +--- a/man/CMakeLists.txt ++++ b/man/CMakeLists.txt +@@ -1,6 +1,6 @@ + + # TODO(compnerd) add symlinks +-if(NOT ENABLE_SWIFT) ++if(1) + install(FILES + dispatch.3 + dispatch_after.3 +--- a/src/swift/CMakeLists.txt ++++ b/src/swift/CMakeLists.txt +@@ -47,7 +47,7 @@ get_swift_host_arch(swift_arch) + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftmodule + ${CMAKE_CURRENT_BINARY_DIR}/swift/Dispatch.swiftdoc +- DESTINATION ${INSTALL_TARGET_DIR}/${swift_arch}) ++ DESTINATION ${INSTALL_TARGET_DIR}/swift) + set_property(GLOBAL APPEND PROPERTY DISPATCH_EXPORTS swiftDispatch) + install(TARGETS swiftDispatch + EXPORT dispatchExports diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/libdispatch/glue.cmake b/third_party/nixpkgs/pkgs/development/compilers/swift/libdispatch/glue.cmake new file mode 100644 index 0000000000..dd696dc610 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/libdispatch/glue.cmake @@ -0,0 +1,5 @@ +add_library(dispatch SHARED IMPORTED) +set_property(TARGET dispatch PROPERTY IMPORTED_LOCATION "@out@/lib/libdispatch@dylibExt@") + +add_library(swiftDispatch SHARED IMPORTED) +set_property(TARGET swiftDispatch PROPERTY IMPORTED_LOCATION "@out@/lib/libswiftDispatch@dylibExt@") 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 deleted file mode 100644 index 6c42921cd2..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0001-build-presets-linux-don-t-require-using-Ninja.patch +++ /dev/null @@ -1,13 +0,0 @@ -Don't build Ninja, we use our own. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -779,7 +779,7 @@ swiftpm - - dash-dash - --build-ninja -+# build-ninja - install-llvm - install-swift - install-lldb 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 deleted file mode 100644 index 0b4c2cc55c..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0002-build-presets-linux-allow-custom-install-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Use custom install prefix. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -788,7 +788,7 @@ - install-swiftpm - install-xctest - install-libicu --install-prefix=/usr -+install-prefix=%(install_prefix)s - install-libcxx - install-sourcekit-lsp - build-swift-static-stdlib 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 deleted file mode 100644 index eb522ac96f..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0003-build-presets-linux-don-t-build-extra-libs.patch +++ /dev/null @@ -1,23 +0,0 @@ -Disable targets, where we use Nix packages. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -818,8 +818,6 @@ - swiftpm - swift-driver - xctest --libicu --libcxx - swiftdocc - - # build-ninja -@@ -830,9 +828,7 @@ - install-swiftpm - install-swift-driver - install-xctest --install-libicu - install-prefix=%(install_prefix)s --install-libcxx - install-sourcekit-lsp - install-swiftdocc - build-swift-static-stdlib 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 deleted file mode 100644 index 3cacdfc0c5..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0004-build-presets-linux-plumb-extra-cmake-options.patch +++ /dev/null @@ -1,13 +0,0 @@ -Plumb extra-cmake-options. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -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] - mixin-preset=mixin_linux_installation - build-subdir=buildbot_linux 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 deleted file mode 100644 index 928c1db6de..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0006-clang-purity.patch +++ /dev/null @@ -1,16 +0,0 @@ -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/0007-build-presets-linux-os-stdlib.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0007-build-presets-linux-os-stdlib.patch deleted file mode 100644 index 46da016355..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/swift/patches/0007-build-presets-linux-os-stdlib.patch +++ /dev/null @@ -1,13 +0,0 @@ -Use os-stdlib in tests. - ---- a/utils/build-presets.ini -+++ b/utils/build-presets.ini -@@ -872,7 +872,7 @@ - indexstore-db - sourcekit-lsp - swiftdocc --lit-args=-v --time-tests -+lit-args=-v --time-tests --param use_os_stdlib - - # rdar://problem/31454823 - lldb-test-swift-only diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/default.nix new file mode 100644 index 0000000000..deb82de20a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, callPackage +, swift +, swiftpm +, swiftpm2nix +, Foundation +, XCTest +, sqlite +, ncurses +, CryptoKit +, LocalAuthentication +}: +let + sources = callPackage ../sources.nix { }; + generated = swiftpm2nix.helpers ./generated; + + # On Darwin, we only want ncurses in the linker search path, because headers + # are part of libsystem. Adding its headers to the search path causes strange + # mixing and errors. + # TODO: Find a better way to prevent this conflict. + ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; +in +stdenv.mkDerivation { + pname = "sourcekit-lsp"; + + inherit (sources) version; + src = sources.sourcekit-lsp; + + nativeBuildInputs = [ swift swiftpm ]; + buildInputs = [ + Foundation + XCTest + sqlite + ncursesInput + ] + ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; + + configurePhase = generated.configure + '' + swiftpmMakeMutable indexstore-db + patch -p1 -d .build/checkouts/indexstore-db -i ${./patches/indexstore-db-macos-target.patch} + + # This toggles a section specific to Xcode XCTest, which doesn't work on + # Darwin, where we also use swift-corelibs-xctest. + substituteInPlace Sources/LSPTestSupport/PerfTestCase.swift \ + --replace '#if os(macOS)' '#if false' + + # Required to link with swift-corelibs-xctest on Darwin. + export SWIFTTSC_MACOS_DEPLOYMENT_TARGET=10.12 + ''; + + # TODO: BuildServerBuildSystemTests fails + #doCheck = true; + + installPhase = '' + binPath="$(swiftpmBinPath)" + mkdir -p $out/bin + cp $binPath/sourcekit-lsp $out/bin/ + ''; + + # Canary to verify output of our Swift toolchain does not depend on the Swift + # compiler itself. (Only its 'lib' output.) + disallowedRequisites = [ swift.swift ]; + + meta = { + description = "Language Server Protocol implementation for Swift and C-based languages"; + homepage = "https://github.com/apple/sourcekit-lsp"; + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix new file mode 100644 index 0000000000..fbc898142f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix @@ -0,0 +1,16 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "indexstore-db" = "05d7l3fgcvbw8plaky3pgjm03x20a63z9r14njxg5qm2zcp5m6jx"; + "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw"; + "swift-collections" = "1k6sjx5rqmp3gklny77b480hyzy6gkhpi23r0s8ljfbrcwawgnan"; + "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313"; + "swift-driver" = "1lcb5wqragc74nd0fjnk47lyph9hs0i9cps1mplvp2i91yzjqk05"; + "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h"; + "swift-package-manager" = "0a3vahdkj35n0dkinwcgybgfb9dnq2lq1nknn874r38xbj3mhlff"; + "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7"; + "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz"; + "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json b/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json new file mode 100644 index 0000000000..af73c75539 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json @@ -0,0 +1,178 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "indexstore-db", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/indexstore-db.git", + "name": "IndexStoreDB" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "9305648b0a8700434fa2e55eeacf7c7f4402a0d5" + }, + "name": "sourceControlCheckout" + }, + "subpath": "indexstore-db" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser.git", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "e394bf350e38cb100b6bc4172834770ede1b7232", + "version": "1.0.3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-collections", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-collections.git", + "name": "swift-collections" + }, + "state": { + "checkoutState": { + "revision": "937e904258d22af6e447a0b72c0bc67583ef64a2", + "version": "1.0.4" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-collections" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-crypto", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-crypto.git", + "name": "swift-crypto" + }, + "state": { + "checkoutState": { + "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5", + "version": "1.1.7" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-crypto" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-driver", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-driver.git", + "name": "swift-driver" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "82b274af66cfbb8f3131677676517b34d01e30fd" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-driver" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-llbuild", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-llbuild.git", + "name": "llbuild" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-llbuild" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-package-manager", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-package-manager.git", + "name": "SwiftPM" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "c6e40adbfc78acc60ca464ae482b56442f9f34f4" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-package-manager" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-system", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-system.git", + "name": "swift-system" + }, + "state": { + "checkoutState": { + "revision": "836bc4557b74fe6d2660218d56e3ce96aff76574", + "version": "1.1.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-system" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-tools-support-core", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-tools-support-core.git", + "name": "swift-tools-support-core" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-tools-support-core" + }, + { + "basedOn": null, + "packageRef": { + "identity": "yams", + "kind": "remoteSourceControl", + "location": "https://github.com/jpsim/Yams.git", + "name": "Yams" + }, + "state": { + "checkoutState": { + "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", + "version": "4.0.6" + }, + "name": "sourceControlCheckout" + }, + "subpath": "Yams" + } + ] + }, + "version": 5 +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/patches/indexstore-db-macos-target.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/patches/indexstore-db-macos-target.patch new file mode 100644 index 0000000000..53e790874d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/sourcekit-lsp/patches/indexstore-db-macos-target.patch @@ -0,0 +1,12 @@ +Raise the deployment target of IndexStoreDB so it can link against our XCTest. + +--- a/Package.swift ++++ b/Package.swift +@@ -4,6 +4,7 @@ import PackageDescription + + let package = Package( + name: "IndexStoreDB", ++ platforms: [.macOS("10.12")], + products: [ + .library( + name: "IndexStoreDB", diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/sources.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/sources.nix new file mode 100644 index 0000000000..c3b2fb60a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/sources.nix @@ -0,0 +1,33 @@ +{ lib, fetchFromGitHub }: + +let + + # These packages are all part of the Swift toolchain, and have a single + # upstream version that should match. We also list the hashes here so a basic + # version upgrade touches only this file. + version = "5.7.3"; + hashes = { + llvm-project = "sha256-IDtLPe0sXamnmovbFVKvmDMnci4u/A0urAPjWTYwJCo="; + sourcekit-lsp = "sha256-BT6+VCBSupKOg2mXo6HlkvNRc8pVZU772Mj3LKFamsU="; + swift = "sha256-essP2eIp1sLuROqk0OKGBPfJnvnyAW0moMk0cX1IVQQ="; + swift-cmark = "sha256-f0BoTs4HYdx/aJ9HIGCWMalhl8PvClWD6R4QK3qSgAw="; + swift-corelibs-foundation = "sha256-g78zKSq/b/pVFAD2k2SoMpzJQIpkxMvZOaSz5JPaQmA="; + swift-corelibs-libdispatch = "sha256-1qbXiC1k9+T+L6liqXKg6EZXqem6KEEx8OctuL4Kb2o="; + swift-corelibs-xctest = "sha256-qLUO9/3tkJWorDMEHgHd8VC3ovLLq/UWXJWMtb6CMN0="; + swift-docc = "sha256-WlXJMAnrlVPCM+iCIhG0Gyho76BsC2yVBEpX3m/WiIQ="; + swift-docc-render-artifact = "sha256-ttdurN/K7OX+I4577jG3YGeRs+GLUTc7BiiEZGmFD+s="; + swift-driver = "sha256-BUwsvw8pirvprUFfliLQMMHr6SHTSgeaJYc9lTEvi9E="; + swift-experimental-string-processing = "sha256-W0cQBkdR3A0hrV75Wwm0YULUDVg1bjT0O5w5VGBYDJs="; + swift-package-manager = "sha256-zlFYh1wdjUwOsnbagKnAtqXl3vKPcRtnA7YMORtUeyg="; + }; + + # Create fetch derivations. + sources = lib.mapAttrs (repo: hash: fetchFromGitHub { + owner = "apple"; + inherit repo; + rev = "swift-${version}-RELEASE"; + name = "${repo}-${version}-src"; + hash = hashes.${repo}; + }) hashes; + +in sources // { inherit version; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swift-docc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-docc/default.nix new file mode 100644 index 0000000000..f85512f840 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-docc/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, callPackage +, swift +, swiftpm +, swiftpm2nix +, Foundation +, XCTest +, CryptoKit +, LocalAuthentication +}: +let + sources = callPackage ../sources.nix { }; + generated = swiftpm2nix.helpers ./generated; +in +stdenv.mkDerivation { + pname = "swift-docc"; + + inherit (sources) version; + src = sources.swift-docc; + # TODO: We could build this from `apple/swift-docc-render` source, but that + # repository is not tagged. + renderArtifact = sources.swift-docc-render-artifact; + + nativeBuildInputs = [ swift swiftpm ]; + buildInputs = [ Foundation XCTest ] + ++ lib.optionals stdenv.isDarwin [ CryptoKit LocalAuthentication ]; + + configurePhase = generated.configure; + + # TODO: Tests depend on indexstore-db being provided by an existing Swift + # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc. + #doCheck = true; + + installPhase = '' + binPath="$(swiftpmBinPath)" + mkdir -p $out/bin $out/share/docc + cp $binPath/docc $out/bin/ + ln -s $renderArtifact/dist $out/share/docc/render + ''; + + # Canary to verify output of our Swift toolchain does not depend on the Swift + # compiler itself. (Only its 'lib' output.) + disallowedRequisites = [ swift.swift ]; + + meta = { + description = "Documentation compiler for Swift"; + homepage = "https://github.com/apple/swift-docc"; + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swift-docc/generated/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-docc/generated/default.nix new file mode 100644 index 0000000000..bcd873a44f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-docc/generated/default.nix @@ -0,0 +1,15 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "swift-argument-parser" = "070gip241dgn3d0nxgwxva4vp6kbnf11g01q5yaq6kmflcmz58f2"; + "swift-cmark" = "0xfchdgls3070z16in8ks69y8fpiajmyk7lmp5h7ym7164isa6bb"; + "swift-crypto" = "0h054rq14jyg94aiymmp37vqz60a13dlczp5g09pln724j4ypv92"; + "swift-docc-plugin" = "11d6nhi139yzk1lxxrixsbgyj1bnvmh40wj30y725q83nqq49ljh"; + "swift-docc-symbolkit" = "14hb2wc09hisf2r2yny17z28z0m58cf4lnqaczad2x2hk4s1iayi"; + "swift-lmdb" = "1m5y6x2vs1wflcv2c57rx87gh12sy0hkwy5iy9inxmda2mcs8qcb"; + "swift-markdown" = "09270bfrwlp904cma29hsbhr1p25v8kwgvhcfi7lg2av7aaknd97"; + "swift-nio" = "04bvay94b34ynmlvgyl9a7f431l3cf8k2zr483spv8mvyh1hxiqn"; + "swift-nio-ssl" = "1ak4aldilmz0pnfgbwq1x4alr38nfyvx2pz7p2vi2plf82da80g5"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json new file mode 100644 index 0000000000..ced9a6df95 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json @@ -0,0 +1,161 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "d2930e8fcf9c33162b9fcc1d522bc975e2d4179b", + "version": "1.0.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-cmark", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-cmark.git", + "name": "cmark-gfm" + }, + "state": { + "checkoutState": { + "branch": "release/5.7-gfm", + "revision": "792c1c3326327515ce9bf64c44196b7f4daab9a6" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-cmark" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-crypto", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-crypto.git", + "name": "swift-crypto" + }, + "state": { + "checkoutState": { + "revision": "9680b7251cd2be22caaed8f1468bd9e8915a62fb", + "version": "1.1.2" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-crypto" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-docc-plugin", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-docc-plugin", + "name": "SwiftDocCPlugin" + }, + "state": { + "checkoutState": { + "revision": "3303b164430d9a7055ba484c8ead67a52f7b74f6", + "version": "1.0.0" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-docc-plugin" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-docc-symbolkit", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-docc-symbolkit", + "name": "SymbolKit" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "8682202025906dce29a8b04f9263f40ba87b89d8" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-docc-symbolkit" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-lmdb", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-lmdb.git", + "name": "CLMDB" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "6ea45a7ebf6d8f72bd299dfcc3299e284bbb92ee" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-lmdb" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-markdown", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-markdown.git", + "name": "swift-markdown" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "d6cd065a7e4b6c3fad615dcd39890e095a2f63a2" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-markdown" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-nio", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-nio.git", + "name": "swift-nio" + }, + "state": { + "checkoutState": { + "revision": "1d425b0851ffa2695d488cce1d68df2539f42500", + "version": "2.31.2" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-nio" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-nio-ssl", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-nio-ssl.git", + "name": "swift-nio-ssl" + }, + "state": { + "checkoutState": { + "revision": "2e74773972bd6254c41ceeda827f229bccbf1c0f", + "version": "2.15.0" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-nio-ssl" + } + ] + }, + "version": 5 +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/default.nix new file mode 100644 index 0000000000..60fe2aeb9c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenv +, callPackage +, fetchpatch +, swift +, swiftpm +, swiftpm2nix +, Foundation +, XCTest +, sqlite +, ncurses +, substituteAll +}: +let + sources = callPackage ../sources.nix { }; + generated = swiftpm2nix.helpers ./generated; + + # On Darwin, we only want ncurses in the linker search path, because headers + # are part of libsystem. Adding its headers to the search path causes strange + # mixing and errors. + # TODO: Find a better way to prevent this conflict. + ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; +in +stdenv.mkDerivation { + pname = "swift-driver"; + + inherit (sources) version; + src = sources.swift-driver; + + nativeBuildInputs = [ swift swiftpm ]; + buildInputs = [ + Foundation + XCTest + sqlite + ncursesInput + ]; + + patches = [ + ./patches/nix-resource-root.patch + ./patches/disable-catalyst.patch + ./patches/linux-fix-linking.patch + # TODO: Replace with branch patch once merged: + # https://github.com/apple/swift-driver/pull/1197 + (fetchpatch { + url = "https://github.com/apple/swift-driver/commit/d3ef9cdf4871a58eddec7ff0e28fe611130da3f9.patch"; + hash = "sha256-eVBaKN6uzj48ZnHtwGV0k5ChKjak1tDCyE+wTdyGq2c="; + }) + # Prevent a warning about SDK directories we don't have. + (substituteAll { + src = ./patches/prevent-sdk-dirs-warnings.patch; + inherit (builtins) storeDir; + }) + ]; + + configurePhase = generated.configure; + + # TODO: Tests depend on indexstore-db being provided by an existing Swift + # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc. + #doCheck = true; + + # TODO: Darwin-specific installation includes more, but not sure why. + installPhase = '' + binPath="$(swiftpmBinPath)" + mkdir -p $out/bin + for executable in swift-driver swift-help swift-build-sdk-interfaces; do + cp $binPath/$executable $out/bin/ + done + ''; + + meta = { + description = "Swift compiler driver"; + homepage = "https://github.com/apple/swift-driver"; + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/generated/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/generated/default.nix new file mode 100644 index 0000000000..760e8156c4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/generated/default.nix @@ -0,0 +1,11 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "swift-argument-parser" = "11did5snqj8chcbdbiyx84mpif940ls2pr1iikwivvfp63i248hm"; + "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h"; + "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7"; + "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz"; + "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json new file mode 100644 index 0000000000..f9e893abb7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json @@ -0,0 +1,93 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser.git", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "e1465042f195f374b94f915ba8ca49de24300a0d", + "version": "1.0.2" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-llbuild", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-llbuild.git", + "name": "llbuild" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-llbuild" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-system", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-system.git", + "name": "swift-system" + }, + "state": { + "checkoutState": { + "revision": "836bc4557b74fe6d2660218d56e3ce96aff76574", + "version": "1.1.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-system" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-tools-support-core", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-tools-support-core.git", + "name": "swift-tools-support-core" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-tools-support-core" + }, + { + "basedOn": null, + "packageRef": { + "identity": "yams", + "kind": "remoteSourceControl", + "location": "https://github.com/jpsim/Yams.git", + "name": "Yams" + }, + "state": { + "checkoutState": { + "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", + "version": "4.0.6" + }, + "name": "sourceControlCheckout" + }, + "subpath": "Yams" + } + ] + }, + "version": 5 +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/patches/disable-catalyst.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/patches/disable-catalyst.patch new file mode 100644 index 0000000000..b9eb23f210 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/patches/disable-catalyst.patch @@ -0,0 +1,17 @@ +Tries to parse SDKSettings.plist looking for a Catalyst version map, but we +don't currently support this. + +--- a/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift ++++ b/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift +@@ -297,11 +297,7 @@ public final class DarwinToolchain: Toolchain { + debugDescription: "Malformed version string") + } + self.version = version +- if self.canonicalName.hasPrefix("macosx") { +- self.versionMap = try keyedContainer.decode(VersionMap.self, forKey: .versionMap) +- } else { + self.versionMap = VersionMap() +- } + } + + diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch new file mode 100644 index 0000000000..c0cfe2b7d2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch @@ -0,0 +1,40 @@ +--- a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift ++++ b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift +@@ -9,6 +9,7 @@ + // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors + // + //===----------------------------------------------------------------------===// ++import Foundation + import TSCBasic + import SwiftOptions + +@@ -116,7 +117,20 @@ extension GenericUnixToolchain { + // just using `clang` and avoid a dependency on the C++ runtime. + let clangTool: Tool = + parsedOptions.hasArgument(.enableExperimentalCxxInterop) ? .clangxx : .clang +- var clangPath = try getToolPath(clangTool) ++ ++ // For Nix, prefer linking using the wrapped system clang, instead of using ++ // the unwrapped clang packaged with swift. The latter is unable to link, but ++ // we still want to use it for other purposes (clang importer). ++ var clangPath: AbsolutePath ++ let env = ProcessInfo.processInfo.environment ++ if let nixCC = env["NIX_CC"], ++ let binPath = try? AbsolutePath(validating: "\(nixCC)/bin"), ++ let tool = lookupExecutablePath(filename: parsedOptions.hasArgument(.enableExperimentalCxxInterop) ++ ? "clang++" : "clang", ++ searchPaths: [binPath]) { ++ clangPath = tool ++ } else { ++ clangPath = try getToolPath(clangTool) + if let toolsDirPath = parsedOptions.getLastArgument(.toolsDirectory) { + // FIXME: What if this isn't an absolute path? + let toolsDir = try AbsolutePath(validating: toolsDirPath.asSingle) +@@ -132,6 +146,7 @@ extension GenericUnixToolchain { + commandLine.appendFlag("-B") + commandLine.appendPath(toolsDir) + } ++ } // nixCC + + // Executables on Linux get -pie + if targetTriple.os == .linux && linkerOutputType == .executable { diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch new file mode 100644 index 0000000000..6c3ae87d68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch @@ -0,0 +1,28 @@ +Swift normally looks for the Clang resource dir in a subdir/symlink of its own +resource dir. We provide a symlink to the Swift build-time Clang as a default +there, but we also here patch a check to try locate it via NIX_CC. + +--- a/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift ++++ b/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift +@@ -9,6 +9,7 @@ + // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors + // + //===----------------------------------------------------------------------===// ++import Foundation + import TSCBasic + import SwiftOptions + +@@ -24,6 +25,13 @@ extension Toolchain { + for targetInfo: FrontendTargetInfo, + parsedOptions: inout ParsedOptions + ) throws -> VirtualPath { ++ let env = ProcessInfo.processInfo.environment ++ if let nixCC = env["NIX_CC"] { ++ return try VirtualPath(path: nixCC) ++ .appending(components: "resource-root", "lib", ++ targetInfo.target.triple.platformName(conflatingDarwin: true)!) ++ } ++ + return VirtualPath.lookup(targetInfo.runtimeResourcePath.path) + .appending(components: "clang", "lib", + targetInfo.target.triple.platformName(conflatingDarwin: true)!) diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/patches/prevent-sdk-dirs-warnings.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/patches/prevent-sdk-dirs-warnings.patch new file mode 100644 index 0000000000..6080865ebe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swift-driver/patches/prevent-sdk-dirs-warnings.patch @@ -0,0 +1,16 @@ +Prevents a user-visible warning on every compilation: + + ld: warning: directory not found for option '-L.../MacOSX11.0.sdk/usr/lib/swift' + +--- a/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift ++++ b/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift +@@ -50,7 +50,9 @@ extension Toolchain { + result.append(sdkPath.appending(components: "System", "iOSSupport", "usr", "lib", "swift")) + } + ++ if sdkPath.absolutePath?.pathString.starts(with: "@storeDir@") == false { + result.append(sdkPath.appending(components: "usr", "lib", "swift")) ++ } + } + + return result diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/cmake-glue.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/cmake-glue.nix new file mode 100644 index 0000000000..f297eafd38 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/cmake-glue.nix @@ -0,0 +1,90 @@ +# SwiftPM dependencies are normally not installed using CMake, and only provide +# CMake modules to link them together in a build tree. We have separate +# derivations, so need a real install step. Here we provide our own minimal +# CMake modules to install along with the build products. +{ lib, stdenv, swift }: +let + + inherit (stdenv.hostPlatform) extensions; + + # This file exports shell snippets for use in postInstall. + mkInstallScript = module: template: '' + mkdir -p $out/lib/cmake/${module} + ( + export staticLibExt="${extensions.staticLibrary}" + export sharedLibExt="${extensions.sharedLibrary}" + export swiftOs="${swift.swiftOs}" + substituteAll \ + ${builtins.toFile "${module}Config.cmake" template} \ + $out/lib/cmake/${module}/${module}Config.cmake + ) + ''; + +in lib.mapAttrs mkInstallScript { + SwiftSystem = '' + add_library(SwiftSystem::SystemPackage STATIC IMPORTED) + set_property(TARGET SwiftSystem::SystemPackage PROPERTY IMPORTED_LOCATION "@out@/lib/swift_static/@swiftOs@/libSystemPackage@staticLibExt@") + ''; + + SwiftCollections = '' + add_library(SwiftCollections::Collections STATIC IMPORTED) + set_property(TARGET SwiftCollections::Collections PROPERTY IMPORTED_LOCATION "@out@/lib/swift_static/@swiftOs@/libCollections@staticLibExt@") + + add_library(SwiftCollections::DequeModule STATIC IMPORTED) + set_property(TARGET SwiftCollections::DequeModule PROPERTY IMPORTED_LOCATION "@out@/lib/swift_static/@swiftOs@/libDequeModule@staticLibExt@") + + add_library(SwiftCollections::OrderedCollections STATIC IMPORTED) + set_property(TARGET SwiftCollections::OrderedCollections PROPERTY IMPORTED_LOCATION "@out@/lib/swift_static/@swiftOs@/libOrderedCollections@staticLibExt@") + ''; + + TSC = '' + add_library(TSCLibc SHARED IMPORTED) + set_property(TARGET TSCLibc PROPERTY IMPORTED_LOCATION "@out@/lib/libTSCLibc@sharedLibExt@") + + add_library(TSCBasic SHARED IMPORTED) + set_property(TARGET TSCBasic PROPERTY IMPORTED_LOCATION "@out@/lib/libTSCBasic@sharedLibExt@") + + add_library(TSCUtility SHARED IMPORTED) + set_property(TARGET TSCUtility PROPERTY IMPORTED_LOCATION "@out@/lib/libTSCUtility@sharedLibExt@") + ''; + + ArgumentParser = '' + add_library(ArgumentParser SHARED IMPORTED) + set_property(TARGET ArgumentParser PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libArgumentParser@sharedLibExt@") + + add_library(ArgumentParserToolInfo SHARED IMPORTED) + set_property(TARGET ArgumentParserToolInfo PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libArgumentParserToolInfo@sharedLibExt@") + ''; + + Yams = '' + add_library(CYaml SHARED IMPORTED) + set_property(TARGET CYaml PROPERTY IMPORTED_LOCATION "@out@/lib/libCYaml@sharedLibExt@") + + add_library(Yams SHARED IMPORTED) + set_property(TARGET Yams PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libYams@sharedLibExt@") + ''; + + LLBuild = '' + add_library(libllbuild SHARED IMPORTED) + set_property(TARGET libllbuild PROPERTY IMPORTED_LOCATION "@out@/lib/libllbuild@sharedLibExt@") + + add_library(llbuildSwift SHARED IMPORTED) + set_property(TARGET llbuildSwift PROPERTY IMPORTED_LOCATION "@out@/lib/swift/pm/llbuild/libllbuildSwift@sharedLibExt@") + ''; + + SwiftDriver = '' + add_library(SwiftDriver SHARED IMPORTED) + set_property(TARGET SwiftDriver PROPERTY IMPORTED_LOCATION "@out@/lib/libSwiftDriver@sharedLibExt@") + + add_library(SwiftDriverExecution SHARED IMPORTED) + set_property(TARGET SwiftDriverExecution PROPERTY IMPORTED_LOCATION "@out@/lib/libSwiftDriverExecution@sharedLibExt@") + + add_library(SwiftOptions SHARED IMPORTED) + set_property(TARGET SwiftOptions PROPERTY IMPORTED_LOCATION "@out@/lib/libSwiftOptions@sharedLibExt@") + ''; + + SwiftCrypto = '' + add_library(Crypto SHARED IMPORTED) + set_property(TARGET Crypto PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libCrypto@sharedLibExt@") + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/default.nix new file mode 100644 index 0000000000..3025672563 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/default.nix @@ -0,0 +1,419 @@ +{ lib +, stdenv +, callPackage +, cmake +, ninja +, git +, swift +, swiftpm2nix +, Foundation +, XCTest +, sqlite +, ncurses +, substituteAll +, runCommandLocal +, makeWrapper +, DarwinTools # sw_vers +, cctools # vtool +, xcbuild +, CryptoKit +, LocalAuthentication +}: + +let + + inherit (swift) swiftOs swiftModuleSubdir swiftStaticModuleSubdir; + sharedLibraryExt = stdenv.hostPlatform.extensions.sharedLibrary; + + sources = callPackage ../sources.nix { }; + generated = swiftpm2nix.helpers ./generated; + cmakeGlue = callPackage ./cmake-glue.nix { }; + + # Common attributes for the bootstrap swiftpm and the final swiftpm. + commonAttrs = { + inherit (sources) version; + src = sources.swift-package-manager; + nativeBuildInputs = [ makeWrapper ]; + # Required at run-time for the host platform to build package manifests. + propagatedBuildInputs = [ Foundation ]; + patches = [ + ./patches/cmake-disable-rpath.patch + ./patches/disable-index-store.patch + ./patches/disable-sandbox.patch + ./patches/fix-clang-cxx.patch + (substituteAll { + src = ./patches/disable-xctest.patch; + inherit (builtins) storeDir; + }) + (substituteAll { + src = ./patches/fix-stdlib-path.patch; + inherit (builtins) storeDir; + swiftLib = swift.swift.lib; + }) + ]; + postPatch = '' + # The location of xcrun is hardcoded. We need PATH lookup instead. + find Sources -name '*.swift' | xargs sed -i -e 's|/usr/bin/xcrun|xcrun|g' + + # Patch the location where swiftpm looks for its API modules. + substituteInPlace Sources/PackageModel/UserToolchain.swift \ + --replace \ + 'librariesPath = applicationPath.parentDirectory' \ + "librariesPath = AbsolutePath(\"$out\")" + ''; + }; + + # Tools invoked by swiftpm at run-time. + runtimeDeps = [ git ] + ++ lib.optionals stdenv.isDarwin [ + xcbuild.xcrun + # vtool is used to determine a minimum deployment target. This is part of + # cctools, but adding that as a build input puts an unwrapped linker in + # PATH, and breaks builds. This small derivation exposes just vtool. + (runCommandLocal "vtool" { } '' + mkdir -p $out/bin + ln -s ${cctools}/bin/vtool $out/bin/vtool + '') + ]; + + # Common attributes for the bootstrap derivations. + mkBootstrapDerivation = attrs: stdenv.mkDerivation (attrs // { + nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) + ++ [ cmake ninja swift ] + ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; + + buildInputs = (attrs.buildInputs or [ ]) + ++ [ Foundation ]; + + postPatch = (attrs.postPatch or "") + + lib.optionalString stdenv.isDarwin '' + # On Darwin only, Swift uses arm64 as cpu arch. + if [ -e cmake/modules/SwiftSupport.cmake ]; then + substituteInPlace cmake/modules/SwiftSupport.cmake \ + --replace '"aarch64" PARENT_SCOPE' '"arm64" PARENT_SCOPE' + fi + ''; + + preConfigure = (attrs.preConfigure or "") + + '' + # Builds often don't set a target, and our default minimum macOS deployment + # target on x86_64-darwin is too low. Harmless on non-Darwin. + export MACOSX_DEPLOYMENT_TARGET=10.15.4 + ''; + + postInstall = (attrs.postInstall or "") + + lib.optionalString stdenv.isDarwin '' + # The install name of libraries is incorrectly set to lib/ (via our + # CMake setup hook) instead of lib/swift/. This'd be easily fixed by + # fixDarwinDylibNames, but some builds create libraries that reference + # eachother, and we also have to fix those references. + dylibs="$(find $out/lib/swift* -name '*.dylib')" + changes="" + for dylib in $dylibs; do + changes+=" -change $(otool -D $dylib | tail -n 1) $dylib" + done + for dylib in $dylibs; do + install_name_tool -id $dylib $changes $dylib + done + ''; + + cmakeFlags = (attrs.cmakeFlags or [ ]) + ++ [ + # Some builds link to libraries within the same build. Make sure these + # create references to $out. None of our builds run their own products, + # so we don't have to account for that scenario. + "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" + ]; + }); + + # On Darwin, we only want ncurses in the linker search path, because headers + # are part of libsystem. Adding its headers to the search path causes strange + # mixing and errors. + # TODO: Find a better way to prevent this conflict. + ncursesInput = if stdenv.isDarwin then ncurses.out else ncurses; + + # Derivations for bootstrapping dependencies using CMake. + # This is based on the `swiftpm/Utilities/bootstrap` script. + # + # Some of the installation steps here are a bit hacky, because it seems like + # these packages were not really meant to be installed using CMake. The + # regular swiftpm bootstrap simply refers to the source and build + # directories. The advantage of separate builds is that we can more easily + # link libs together using existing Nixpkgs infra. + # + # In the end, we don't expose these derivations, and they only exist during + # the bootstrap phase. The final swiftpm derivation does not depend on them. + + swift-system = mkBootstrapDerivation { + name = "swift-system"; + src = generated.sources.swift-system; + + postInstall = cmakeGlue.SwiftSystem + + lib.optionalString (!stdenv.isDarwin) '' + # The cmake rules apparently only use the Darwin install convention. + # Fix up the installation so the module can be found on non-Darwin. + mkdir -p $out/${swiftStaticModuleSubdir} + mv $out/lib/swift_static/${swiftOs}/*.swiftmodule $out/${swiftStaticModuleSubdir}/ + ''; + }; + + swift-collections = mkBootstrapDerivation { + name = "swift-collections"; + src = generated.sources.swift-collections; + + postPatch = '' + # Only builds static libs on Linux, but this installation difference is a + # hassle. Because this installation is temporary for the bootstrap, may + # as well build static libs everywhere. + sed -i -e '/BUILD_SHARED_LIBS/d' CMakeLists.txt + ''; + + postInstall = cmakeGlue.SwiftCollections + + lib.optionalString (!stdenv.isDarwin) '' + # The cmake rules apparently only use the Darwin install convention. + # Fix up the installation so the module can be found on non-Darwin. + mkdir -p $out/${swiftStaticModuleSubdir} + mv $out/lib/swift_static/${swiftOs}/*.swiftmodule $out/${swiftStaticModuleSubdir}/ + ''; + }; + + swift-tools-support-core = mkBootstrapDerivation { + name = "swift-tools-support-core"; + src = generated.sources.swift-tools-support-core; + + buildInputs = [ + swift-system + sqlite + ]; + + postInstall = cmakeGlue.TSC + '' + # Swift modules are not installed. + mkdir -p $out/${swiftModuleSubdir} + cp swift/*.swift{module,doc} $out/${swiftModuleSubdir}/ + + # Static libs are not installed. + cp lib/*.a $out/lib/ + + # Headers are not installed. + mkdir -p $out/include + cp -r ../Sources/TSCclibc/include $out/include/TSC + ''; + }; + + swift-argument-parser = mkBootstrapDerivation { + name = "swift-argument-parser"; + src = generated.sources.swift-argument-parser; + + buildInputs = [ ncursesInput sqlite ]; + + cmakeFlags = [ + "-DBUILD_TESTING=NO" + "-DBUILD_EXAMPLES=NO" + ]; + + postInstall = cmakeGlue.ArgumentParser + + lib.optionalString stdenv.isLinux '' + # Fix rpath so ArgumentParserToolInfo can be found. + patchelf --add-rpath "$out/lib/swift/${swiftOs}" \ + $out/lib/swift/${swiftOs}/libArgumentParser.so + ''; + }; + + Yams = mkBootstrapDerivation { + name = "Yams"; + src = generated.sources.Yams; + + # Conflicts with BUILD file on case-insensitive filesystems. + cmakeBuildDir = "_build"; + + postInstall = cmakeGlue.Yams; + }; + + llbuild = mkBootstrapDerivation { + name = "llbuild"; + src = generated.sources.swift-llbuild; + + nativeBuildInputs = lib.optional stdenv.isDarwin xcbuild; + buildInputs = [ ncursesInput sqlite ]; + + patches = [ + ./patches/llbuild-cmake-disable-rpath.patch + ]; + + postPatch = '' + # Substitute ncurses for curses. + find . -name CMakeLists.txt | xargs sed -i -e 's/curses/ncurses/' + + # Use absolute install names instead of rpath. + substituteInPlace \ + products/libllbuild/CMakeLists.txt \ + products/llbuildSwift/CMakeLists.txt \ + --replace '@rpath' "$out/lib" + + # This subdirectory is enabled for Darwin only, but requires ObjC XCTest + # (and only Swift XCTest is open source). + substituteInPlace perftests/CMakeLists.txt \ + --replace 'add_subdirectory(Xcode/' '#add_subdirectory(Xcode/' + ''; + + cmakeFlags = [ + "-DLLBUILD_SUPPORT_BINDINGS=Swift" + ]; + + postInstall = cmakeGlue.LLBuild + '' + # Install module map. + cp ../products/libllbuild/include/module.modulemap $out/include + + # Swift modules are not installed. + mkdir -p $out/${swiftModuleSubdir} + cp products/llbuildSwift/*.swift{module,doc} $out/${swiftModuleSubdir}/ + ''; + }; + + swift-driver = mkBootstrapDerivation { + name = "swift-driver"; + src = generated.sources.swift-driver; + + buildInputs = [ + Yams + llbuild + swift-system + swift-argument-parser + swift-tools-support-core + ]; + + postInstall = cmakeGlue.SwiftDriver + '' + # Swift modules are not installed. + mkdir -p $out/${swiftModuleSubdir} + cp swift/*.swift{module,doc} $out/${swiftModuleSubdir}/ + ''; + }; + + swift-crypto = mkBootstrapDerivation { + name = "swift-crypto"; + src = generated.sources.swift-crypto; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace /usr/bin/ar $NIX_CC/bin/ar + ''; + + postInstall = cmakeGlue.SwiftCrypto + '' + # Static libs are not installed. + cp lib/*.a $out/lib/ + + # Headers are not installed. + cp -r ../Sources/CCryptoBoringSSL/include $out/include + ''; + }; + + # Build a bootrapping swiftpm using CMake. + swiftpm-bootstrap = mkBootstrapDerivation (commonAttrs // { + pname = "swiftpm-bootstrap"; + + buildInputs = [ + llbuild + swift-argument-parser + swift-collections + swift-crypto + swift-driver + swift-system + swift-tools-support-core + ]; + + cmakeFlags = [ + "-DUSE_CMAKE_INSTALL=ON" + ]; + + postInstall = '' + for program in $out/bin/swift-*; do + wrapProgram $program --prefix PATH : ${lib.makeBinPath runtimeDeps} + done + ''; + }); + +# Build the final swiftpm with the bootstrapping swiftpm. +in stdenv.mkDerivation (commonAttrs // { + pname = "swiftpm"; + + nativeBuildInputs = commonAttrs.nativeBuildInputs ++ [ + swift + swiftpm-bootstrap + ]; + buildInputs = [ + ncursesInput + sqlite + XCTest + ] + ++ lib.optionals stdenv.isDarwin [ + CryptoKit + LocalAuthentication + ]; + + configurePhase = generated.configure + '' + # Functionality provided by Xcode XCTest, but not available in + # swift-corelibs-xctest. + swiftpmMakeMutable swift-tools-support-core + substituteInPlace .build/checkouts/swift-tools-support-core/Sources/TSCTestSupport/XCTestCasePerf.swift \ + --replace 'canImport(Darwin)' 'false' + + # Prevent a warning about SDK directories we don't have. + swiftpmMakeMutable swift-driver + patch -p1 -d .build/checkouts/swift-driver -i ${substituteAll { + src = ../swift-driver/patches/prevent-sdk-dirs-warnings.patch; + inherit (builtins) storeDir; + }} + ''; + + buildPhase = '' + # Required to link with swift-corelibs-xctest on Darwin. + export SWIFTTSC_MACOS_DEPLOYMENT_TARGET=10.12 + + TERM=dumb swift-build -c release + ''; + + # TODO: Tests depend on indexstore-db being provided by an existing Swift + # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc. + #doCheck = true; + #checkPhase = '' + # TERM=dumb swift-test -c release + #''; + + # The following is dervied from Utilities/bootstrap, see install_swiftpm. + installPhase = '' + binPath="$(swift-build --show-bin-path -c release)" + + mkdir -p $out/bin $out/lib/swift + + cp $binPath/swift-package $out/bin/ + wrapProgram $out/bin/swift-package \ + --prefix PATH : ${lib.makeBinPath runtimeDeps} + for tool in swift-build swift-test swift-run swift-package-collection; do + ln -s $out/bin/swift-package $out/bin/$tool + done + + installSwiftpmModule() { + mkdir -p $out/lib/swift/pm/$2 + cp $binPath/lib$1${sharedLibraryExt} $out/lib/swift/pm/$2/ + + if [[ -f $binPath/$1.swiftinterface ]]; then + cp $binPath/$1.swiftinterface $out/lib/swift/pm/$2/ + else + cp -r $binPath/$1.swiftmodule $out/lib/swift/pm/$2/ + fi + cp $binPath/$1.swiftdoc $out/lib/swift/pm/$2/ + } + installSwiftpmModule PackageDescription ManifestAPI + installSwiftpmModule PackagePlugin PluginAPI + ''; + + setupHook = ./setup-hook.sh; + + meta = { + description = "The Package Manager for the Swift Programming Language"; + homepage = "https://github.com/apple/swift-package-manager"; + platforms = with lib.platforms; linux ++ darwin; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/generated/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/generated/default.nix new file mode 100644 index 0000000000..45d09093c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/generated/default.nix @@ -0,0 +1,14 @@ +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = { + "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw"; + "swift-collections" = "1k6sjx5rqmp3gklny77b480hyzy6gkhpi23r0s8ljfbrcwawgnan"; + "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313"; + "swift-driver" = "1lcb5wqragc74nd0fjnk47lyph9hs0i9cps1mplvp2i91yzjqk05"; + "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h"; + "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7"; + "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz"; + "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json new file mode 100644 index 0000000000..48a6350ece --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json @@ -0,0 +1,144 @@ +{ + "object": { + "artifacts": [], + "dependencies": [ + { + "basedOn": null, + "packageRef": { + "identity": "swift-argument-parser", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-argument-parser.git", + "name": "swift-argument-parser" + }, + "state": { + "checkoutState": { + "revision": "e394bf350e38cb100b6bc4172834770ede1b7232", + "version": "1.0.3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-argument-parser" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-collections", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-collections.git", + "name": "swift-collections" + }, + "state": { + "checkoutState": { + "revision": "937e904258d22af6e447a0b72c0bc67583ef64a2", + "version": "1.0.4" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-collections" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-crypto", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-crypto.git", + "name": "swift-crypto" + }, + "state": { + "checkoutState": { + "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5", + "version": "1.1.7" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-crypto" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-driver", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-driver.git", + "name": "swift-driver" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "82b274af66cfbb8f3131677676517b34d01e30fd" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-driver" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-llbuild", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-llbuild.git", + "name": "llbuild" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-llbuild" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-system", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-system.git", + "name": "swift-system" + }, + "state": { + "checkoutState": { + "revision": "836bc4557b74fe6d2660218d56e3ce96aff76574", + "version": "1.1.1" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-system" + }, + { + "basedOn": null, + "packageRef": { + "identity": "swift-tools-support-core", + "kind": "remoteSourceControl", + "location": "https://github.com/apple/swift-tools-support-core.git", + "name": "swift-tools-support-core" + }, + "state": { + "checkoutState": { + "branch": "release/5.7", + "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3" + }, + "name": "sourceControlCheckout" + }, + "subpath": "swift-tools-support-core" + }, + { + "basedOn": null, + "packageRef": { + "identity": "yams", + "kind": "remoteSourceControl", + "location": "https://github.com/jpsim/Yams.git", + "name": "Yams" + }, + "state": { + "checkoutState": { + "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa", + "version": "4.0.6" + }, + "name": "sourceControlCheckout" + }, + "subpath": "Yams" + } + ] + }, + "version": 5 +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/cmake-disable-rpath.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/cmake-disable-rpath.patch new file mode 100644 index 0000000000..9aeba452f9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/cmake-disable-rpath.patch @@ -0,0 +1,36 @@ +Disable rpath for the bootstrap build with CMake. + +--- a/Sources/PackageDescription/CMakeLists.txt ++++ b/Sources/PackageDescription/CMakeLists.txt +@@ -31,14 +31,11 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin) + set(SWIFT_INTERFACE_PATH ${CMAKE_BINARY_DIR}/pm/ManifestAPI/PackageDescription.swiftinterface) + target_compile_options(PackageDescription PUBLIC + $<$:-emit-module-interface-path$${SWIFT_INTERFACE_PATH}>) +- target_link_options(PackageDescription PRIVATE +- "SHELL:-Xlinker -install_name -Xlinker @rpath/libPackageDescription.dylib") + endif() + + set_target_properties(PackageDescription PROPERTIES + Swift_MODULE_NAME PackageDescription + Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI +- INSTALL_NAME_DIR \\@rpath + OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI + OUTPUT_NAME PackageDescription + ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/ManifestAPI +--- a/Sources/PackagePlugin/CMakeLists.txt ++++ b/Sources/PackagePlugin/CMakeLists.txt +@@ -29,14 +29,11 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL Darwin) + set(SWIFT_INTERFACE_PATH ${CMAKE_BINARY_DIR}/pm/PluginAPI/PackagePlugin.swiftinterface) + target_compile_options(PackagePlugin PUBLIC + $<$:-emit-module-interface-path$${SWIFT_INTERFACE_PATH}>) +- target_link_options(PackagePlugin PRIVATE +- "SHELL:-Xlinker -install_name -Xlinker @rpath/libPackagePlugin.dylib") + endif() + + set_target_properties(PackagePlugin PROPERTIES + Swift_MODULE_NAME PackagePlugin + Swift_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI +- INSTALL_NAME_DIR \\@rpath + OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI + OUTPUT_NAME PackagePlugin + ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pm/PluginAPI diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/disable-index-store.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/disable-index-store.patch new file mode 100644 index 0000000000..bef8d43a0d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/disable-index-store.patch @@ -0,0 +1,23 @@ +The `-index-store-path` option is an Apple extension not available in our +Clang. Make it opt-in by default. + +(It is assumed the `target.type == test` check is for Xcode support, because +there is no evidence of it in swift-corelibs-xctest.) + +--- a/Sources/Build/BuildPlan.swift ++++ b/Sources/Build/BuildPlan.swift +@@ -103,14 +103,7 @@ extension BuildParameters { + case .off: + addIndexStoreArguments = false + case .auto: +- if configuration == .debug { +- addIndexStoreArguments = true +- } else if target.type == .test { +- // Test discovery requires an index store for the test target to discover the tests +- addIndexStoreArguments = true +- } else { + addIndexStoreArguments = false +- } + } + + if addIndexStoreArguments { diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch new file mode 100644 index 0000000000..406e1d68d0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch @@ -0,0 +1,21 @@ +Nix may already sandbox the build, in which case sandbox_apply will fail. + +--- a/Sources/Basics/Sandbox.swift ++++ b/Sources/Basics/Sandbox.swift +@@ -30,12 +30,14 @@ public enum Sandbox { + readOnlyDirectories: [AbsolutePath] = [] + ) -> [String] { + #if os(macOS) ++ let env = ProcessInfo.processInfo.environment ++ if env["NIX_BUILD_TOP"] == nil || env["IN_NIX_SHELL"] != nil { + let profile = macOSSandboxProfile(strictness: strictness, writableDirectories: writableDirectories, readOnlyDirectories: readOnlyDirectories) + return ["/usr/bin/sandbox-exec", "-p", profile] + command +- #else ++ } ++ #endif + // rdar://40235432, rdar://75636874 tracks implementing sandboxes for other platforms. + return command +- #endif + } + + /// Basic strictness level of a sandbox applied to a command line. diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch new file mode 100644 index 0000000000..e24d154d29 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch @@ -0,0 +1,48 @@ +XCTest is not fully open-source, only the Swift library parts. We don't have a +command-line runner available, so disable support. + +--- a/Sources/Commands/TestingSupport.swift ++++ b/Sources/Commands/TestingSupport.swift +@@ -60,7 +60,7 @@ enum TestingSupport { + /// - Returns: Array of TestSuite + static func getTestSuites(fromTestAt path: AbsolutePath, swiftTool: SwiftTool, swiftOptions: SwiftToolOptions) throws -> [TestSuite] { + // Run the correct tool. +- #if os(macOS) ++ #if false + let data: String = try withTemporaryFile { tempFile in + let args = [try TestingSupport.xctestHelperPath(swiftTool: swiftTool).pathString, path.pathString, tempFile.path.pathString] + var env = try TestingSupport.constructTestEnvironment(toolchain: try swiftTool.getToolchain(), options: swiftOptions, buildParameters: swiftTool.buildParametersForTest()) +--- a/Sources/swiftpm-xctest-helper/main.swift ++++ b/Sources/swiftpm-xctest-helper/main.swift +@@ -9,8 +9,11 @@ + */ + + #if os(macOS) +-import XCTest + import func Darwin.C.exit ++print("Not supported in Nix.") ++exit(1) ++#if false ++import XCTest + + /// A helper tool to get list of tests from a XCTest Bundle on macOS. + /// +@@ -132,6 +135,7 @@ do { + exit(1) + } + ++#endif // nix + #else + + #if os(Windows) +--- a/Sources/PackageModel/Destination.swift ++++ b/Sources/PackageModel/Destination.swift +@@ -174,7 +174,7 @@ public struct Destination: Encodable, Equatable { + arguments: ["/usr/bin/xcrun", "--sdk", "macosx", "--show-sdk-platform-path"], + environment: environment).spm_chomp() + +- if let platformPath = platformPath, !platformPath.isEmpty { ++ if let platformPath = platformPath, !platformPath.isEmpty && !platformPath.starts(with: "@storeDir@") { + // For XCTest framework. + let fwk = AbsolutePath(platformPath).appending( + components: "Developer", "Library", "Frameworks") diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch new file mode 100644 index 0000000000..60c4e33eb1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch @@ -0,0 +1,121 @@ +Swiftpm may invoke clang, not clang++, to compile C++. Our cc-wrapper also +doesn't pick up the arguments that enable C++ compilation in this case. Patch +swiftpm to properly invoke clang++. + +--- a/Sources/Build/LLBuildManifestBuilder.swift ++++ b/Sources/Build/LLBuildManifestBuilder.swift +@@ -782,7 +782,7 @@ extension LLBuildManifestBuilder { + + args += ["-c", path.source.pathString, "-o", path.object.pathString] + +- let clangCompiler = try buildParameters.toolchain.getClangCompiler().pathString ++ let clangCompiler = try buildParameters.toolchain.getClangCompiler(isCXX: isCXX).pathString + args.insert(clangCompiler, at: 0) + + let objectFileNode: Node = .file(path.object) +--- a/Sources/PackageModel/Destination.swift ++++ b/Sources/PackageModel/Destination.swift +@@ -153,7 +153,7 @@ public struct Destination: Encodable, Equatable { + + var extraCPPFlags: [String] = [] + #if os(macOS) +- extraCPPFlags += ["-lc++"] ++ extraCPPFlags += ["-lc++", "-lc++abi"] + #elseif os(Windows) + extraCPPFlags += [] + #else +--- a/Sources/PackageModel/Toolchain.swift ++++ b/Sources/PackageModel/Toolchain.swift +@@ -20,7 +20,7 @@ public protocol Toolchain { + var macosSwiftStdlib: AbsolutePath { get } + + /// Path of the `clang` compiler. +- func getClangCompiler() throws -> AbsolutePath ++ func getClangCompiler(isCXX: Bool) throws -> AbsolutePath + + // FIXME: This is a temporary API until index store is widely available in + // the OSS clang compiler. This API should not used for any other purpose. +--- a/Sources/PackageModel/UserToolchain.swift ++++ b/Sources/PackageModel/UserToolchain.swift +@@ -57,7 +57,7 @@ public final class UserToolchain: Toolchain { + /// Only use search paths, do not fall back to `xcrun`. + let useXcrun: Bool + +- private var _clangCompiler: AbsolutePath? ++ private var _clangCompiler: [Bool: AbsolutePath] = [:] + + private let environment: EnvironmentVariables + +@@ -150,29 +150,31 @@ public final class UserToolchain: Toolchain { + } + + /// Returns the path to clang compiler tool. +- public func getClangCompiler() throws -> AbsolutePath { ++ public func getClangCompiler(isCXX: Bool) throws -> AbsolutePath { + // Check if we already computed. +- if let clang = self._clangCompiler { ++ if let clang = self._clangCompiler[isCXX] { + return clang + } + + // Check in the environment variable first. +- if let toolPath = UserToolchain.lookup(variable: "CC", searchPaths: self.envSearchPaths, environment: environment) { +- self._clangCompiler = toolPath ++ let envVar = isCXX ? "CXX" : "CC"; ++ if let toolPath = UserToolchain.lookup(variable: envVar, searchPaths: self.envSearchPaths, environment: environment) { ++ self._clangCompiler[isCXX] = toolPath + return toolPath + } + + // Then, check the toolchain. ++ let tool = isCXX ? "clang++" : "clang"; + do { +- if let toolPath = try? UserToolchain.getTool("clang", binDir: self.destination.binDir) { +- self._clangCompiler = toolPath ++ if let toolPath = try? UserToolchain.getTool(tool, binDir: self.destination.binDir) { ++ self._clangCompiler[isCXX] = toolPath + return toolPath + } + } + + // Otherwise, lookup it up on the system. +- let toolPath = try UserToolchain.findTool("clang", envSearchPaths: self.envSearchPaths, useXcrun: useXcrun) +- self._clangCompiler = toolPath ++ let toolPath = try UserToolchain.findTool(tool, envSearchPaths: self.envSearchPaths, useXcrun: useXcrun) ++ self._clangCompiler[isCXX] = toolPath + return toolPath + } + +--- a/Sources/SPMBuildCore/BuildParameters.swift ++++ b/Sources/SPMBuildCore/BuildParameters.swift +@@ -342,7 +342,7 @@ private struct _Toolchain: Encodable { + public func encode(to encoder: Encoder) throws { + var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(toolchain.swiftCompilerPath, forKey: .swiftCompiler) +- try container.encode(toolchain.getClangCompiler(), forKey: .clangCompiler) ++ try container.encode(toolchain.getClangCompiler(isCXX: false), forKey: .clangCompiler) + + try container.encode(toolchain.extraCCFlags, forKey: .extraCCFlags) + try container.encode(toolchain.extraCPPFlags, forKey: .extraCPPFlags) +--- a/Sources/XCBuildSupport/XcodeBuildSystem.swift ++++ b/Sources/XCBuildSupport/XcodeBuildSystem.swift +@@ -172,7 +172,7 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem { + // Generate a table of any overriding build settings. + var settings: [String: String] = [:] + // An error with determining the override should not be fatal here. +- settings["CC"] = try? buildParameters.toolchain.getClangCompiler().pathString ++ settings["CC"] = try? buildParameters.toolchain.getClangCompiler(isCXX: false).pathString + // Always specify the path of the effective Swift compiler, which was determined in the same way as for the native build system. + settings["SWIFT_EXEC"] = buildParameters.toolchain.swiftCompilerPath.pathString + settings["LIBRARY_SEARCH_PATHS"] = "$(inherited) \(buildParameters.toolchain.toolchainLibDir.pathString)" +--- a/Tests/BuildTests/MockBuildTestHelper.swift ++++ b/Tests/BuildTests/MockBuildTestHelper.swift +@@ -15,7 +15,7 @@ struct MockToolchain: PackageModel.Toolchain { + #else + let extraCPPFlags: [String] = ["-lstdc++"] + #endif +- func getClangCompiler() throws -> AbsolutePath { ++ func getClangCompiler(isCXX: Bool) throws -> AbsolutePath { + return AbsolutePath("/fake/path/to/clang") + } + diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch new file mode 100644 index 0000000000..327ccf37e4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch @@ -0,0 +1,23 @@ +Swiftpm looks for the Swift stdlib relative to the swift compiler, but that's a +wrapper in our case. It wants to add the stdlib to the rpath, which is +necessary for back-deployment of some features. + +--- a/Sources/PackageModel/Toolchain.swift ++++ b/Sources/PackageModel/Toolchain.swift +@@ -43,10 +43,16 @@ extension Toolchain { + } + + public var macosSwiftStdlib: AbsolutePath { ++ if swiftCompilerPath.pathString.starts(with: "@storeDir@") { ++ return AbsolutePath("@swiftLib@/lib/swift/macosx") ++ } + return AbsolutePath("../../lib/swift/macosx", relativeTo: resolveSymlinks(swiftCompilerPath)) + } + + public var toolchainLibDir: AbsolutePath { ++ if swiftCompilerPath.pathString.starts(with: "@storeDir@") { ++ return AbsolutePath("@swiftLib@/lib") ++ } + // FIXME: Not sure if it's better to base this off of Swift compiler or our own binary. + return AbsolutePath("../../lib", relativeTo: resolveSymlinks(swiftCompilerPath)) + } diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/llbuild-cmake-disable-rpath.patch b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/llbuild-cmake-disable-rpath.patch new file mode 100644 index 0000000000..785e82cc34 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/patches/llbuild-cmake-disable-rpath.patch @@ -0,0 +1,14 @@ +Specifying `-platform_version` targeting macos before 10.15 causes cctools ld +to link with `@rpath`. This may have something to do with Swift ABI stability. + +--- a/products/llbuildSwift/CMakeLists.txt ++++ b/products/llbuildSwift/CMakeLists.txt +@@ -22,7 +17,7 @@ endif() + + # TODO(compnerd) move both of these outside of the CMake into the invocation + if(CMAKE_SYSTEM_NAME STREQUAL Darwin) +- add_compile_options(-target ${CMAKE_OSX_ARCHITECTURES}-apple-macosx10.10) ++ add_compile_options(-target ${CMAKE_OSX_ARCHITECTURES}-apple-macosx10.15) + if(NOT CMAKE_OSX_SYSROOT STREQUAL "") + add_compile_options(-sdk ${CMAKE_OSX_SYSROOT}) + endif() diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/setup-hook.sh new file mode 100644 index 0000000000..160fbb1ccc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/swiftpm/setup-hook.sh @@ -0,0 +1,60 @@ +# Build using 'swift-build'. +swiftpmBuildPhase() { + runHook preBuild + + local buildCores=1 + if [ "${enableParallelBuilding-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi + + local flagsArray=( + -j $buildCores + -c "${swiftpmBuildConfig-release}" + $swiftpmFlags "${swiftpmFlagsArray[@]}" + ) + + echoCmd 'build flags' "${flagsArray[@]}" + TERM=dumb swift-build "${flagsArray[@]}" + + runHook postBuild +} + +if [ -z "${dontUseSwiftpmBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=swiftpmBuildPhase +fi + +# Check using 'swift-test'. +swiftpmCheckPhase() { + runHook preCheck + + local buildCores=1 + if [ "${enableParallelBuilding-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi + + local flagsArray=( + -j $buildCores + -c "${swiftpmBuildConfig-release}" + $swiftpmFlags "${swiftpmFlagsArray[@]}" + ) + + echoCmd 'check flags' "${flagsArray[@]}" + TERM=dumb swift-test "${flagsArray[@]}" + + runHook postCheck +} + +if [ -z "${dontUseSwiftpmCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=swiftpmCheckPhase +fi + +# Helper used to find the binary output path. +# Useful for performing the installPhase of swiftpm packages. +swiftpmBinPath() { + local flagsArray=( + -c "${swiftpmBuildConfig-release}" + $swiftpmFlags "${swiftpmFlagsArray[@]}" + ) + + swift-build --show-bin-path "${flagsArray[@]}" +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/wrapper/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/wrapper/default.nix new file mode 100644 index 0000000000..a7d16cc247 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/wrapper/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, swift +, useSwiftDriver ? true, swift-driver +}: + +stdenv.mkDerivation (swift._wrapperParams // { + pname = "swift-wrapper"; + inherit (swift) version meta; + + outputs = [ "out" "man" ]; + + # Wrapper and setup hook variables. + inherit swift; + inherit (swift) + swiftOs swiftArch + swiftModuleSubdir swiftLibSubdir + swiftStaticModuleSubdir swiftStaticLibSubdir; + swiftDriver = if useSwiftDriver + then "${swift-driver}/bin/swift-driver" else ""; + + passAsFile = [ "buildCommand" ]; + buildCommand = '' + mkdir -p $out/bin $out/nix-support + + # Symlink all Swift binaries first. + # NOTE: This specifically omits clang binaries. We want to hide these for + # private use by Swift only. + ln -s -t $out/bin/ $swift/bin/swift* + + # Replace specific binaries with wrappers. + for executable in swift swiftc swift-frontend; do + export prog=$swift/bin/$executable + rm $out/bin/$executable + substituteAll '${./wrapper.sh}' $out/bin/$executable + chmod a+x $out/bin/$executable + done + + ${lib.optionalString useSwiftDriver '' + # Symlink swift-driver executables. + ln -s -t $out/bin/ ${swift-driver}/bin/* + ''} + + ln -s ${swift.man} $man + + # This link is here because various tools (swiftpm) check for stdlib + # relative to the swift compiler. It's fine if this is for build-time + # stuff, but we should patch all cases were it would end up in an output. + ln -s ${swift.lib}/lib $out/lib + + substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook + ''; + + passthru = { + inherit swift; + inherit (swift) swiftOs swiftArch swiftModuleSubdir swiftLibSubdir; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/wrapper/setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/swift/wrapper/setup-hook.sh new file mode 100644 index 0000000000..398f19977f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/wrapper/setup-hook.sh @@ -0,0 +1,28 @@ +# Add import paths for build inputs. +swiftWrapper_addImports () { + # Include subdirectories following both the Swift platform convention, and + # a simple `lib/swift` for Nix convenience. + for subdir in @swiftModuleSubdir@ @swiftStaticModuleSubdir@ lib/swift; do + if [[ -d "$1/$subdir" ]]; then + export NIX_SWIFTFLAGS_COMPILE+=" -I $1/$subdir" + fi + done + for subdir in @swiftLibSubdir@ @swiftStaticLibSubdir@ lib/swift; do + if [[ -d "$1/$subdir" ]]; then + export NIX_LDFLAGS+=" -L $1/$subdir" + fi + done +} + +addEnvHooks "$targetOffset" swiftWrapper_addImports + +# Use a postHook here because we rely on NIX_CC, which is set by the cc-wrapper +# setup hook, so delay until we're sure it was run. +swiftWrapper_postHook () { + # On Darwin, libc also contains Swift modules. + if [[ -e "$NIX_CC/nix-support/orig-libc" ]]; then + swiftWrapper_addImports "$(<$NIX_CC/nix-support/orig-libc)" + fi +} + +postHooks+=(swiftWrapper_postHook) diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/wrapper/wrapper.sh b/third_party/nixpkgs/pkgs/development/compilers/swift/wrapper/wrapper.sh new file mode 100644 index 0000000000..0c56e63b6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/wrapper/wrapper.sh @@ -0,0 +1,291 @@ +#! @shell@ +# NOTE: This wrapper is derived from cc-wrapper.sh, and is hopefully somewhat +# diffable with the original, so changes can be merged if necessary. +set -eu -o pipefail +o posix +shopt -s nullglob + +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + +cc_wrapper="${NIX_CC:-@default_cc_wrapper@}" + +source $cc_wrapper/nix-support/utils.bash + +expandResponseParams "$@" + +# Check if we should wrap this Swift invocation at all, and how. Specifically, +# there are some internal tools we don't wrap, plus swift-frontend doesn't link +# and doesn't understand linker flags. This follows logic in +# `lib/DriverTool/driver.cpp`. +prog=@prog@ +progName="$(basename "$prog")" +firstArg="${params[0]:-}" +isFrontend=0 +isRepl=0 + +# These checks follow `shouldRunAsSubcommand`. +if [[ "$progName" == swift ]]; then + case "$firstArg" in + "" | -* | *.* | */* | repl) + ;; + *) + exec "swift-$firstArg" "${params[@]:1}" + ;; + esac +fi + +# These checks follow the first part of `run_driver`. +# +# NOTE: The original function short-circuits, but we can't here, because both +# paths must be wrapped. So we use an 'isFrontend' flag instead. +case "$firstArg" in + -frontend) + isFrontend=1 + # Ensure this stays the first argument. + params=( "${params[@]:1}" ) + extraBefore+=( "-frontend" ) + ;; + -modulewrap) + # Don't wrap this integrated tool. + exec "$prog" "${params[@]}" + ;; + repl) + isRepl=1 + params=( "${params[@]:1}" ) + ;; + --driver-mode=*) + ;; + *) + if [[ "$progName" == swift-frontend ]]; then + isFrontend=1 + fi + ;; +esac + +# For many tasks, Swift reinvokes swift-driver, the new driver implementation +# written in Swift. It needs some help finding the executable, though, and +# reimplementing the logic here is little effort. These checks follow +# `shouldDisallowNewDriver`. +if [[ + $isFrontend = 0 && + -n "@swiftDriver@" && + -z "${SWIFT_USE_OLD_DRIVER:-}" && + ( "$progName" == "swift" || "$progName" == "swiftc" ) +]]; then + prog=@swiftDriver@ + # Driver mode must be the very first argument. + extraBefore+=( "--driver-mode=$progName" ) + if [[ $isRepl = 1 ]]; then + extraBefore+=( "-repl" ) + fi + + # Ensure swift-driver invokes the unwrapped frontend (instead of finding + # the wrapped one via PATH), because we don't have to wrap a second time. + export SWIFT_DRIVER_SWIFT_FRONTEND_EXEC="@swift@/bin/swift-frontend" + + # Ensure swift-driver can find the LLDB with Swift support for the REPL. + export SWIFT_DRIVER_LLDB_EXEC="@swift@/bin/lldb" +fi + +path_backup="$PATH" + +# That @-vars are substituted separately from bash evaluation makes +# shellcheck think this, and others like it, are useless conditionals. +# shellcheck disable=SC2157 +if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then + PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" +fi + +# Parse command line options and set several variables. +# For instance, figure out if linker flags should be passed. +# GCC prints annoying warnings when they are not needed. +isCxx=0 +dontLink=$isFrontend + +for p in "${params[@]}"; do + case "$p" in + -enable-cxx-interop) + isCxx=1 ;; + esac +done + +# NOTE: We don't modify these for Swift, but sourced scripts may use them. +cxxInclude=1 +cxxLibrary=1 +cInclude=1 + +linkType=$(checkLinkType "${params[@]}") + +# Optionally filter out paths not refering to the store. +if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then + kept=() + nParams=${#params[@]} + declare -i n=0 + while (( "$n" < "$nParams" )); do + p=${params[n]} + p2=${params[n+1]:-} # handle `p` being last one + n+=1 + + skipNext=false + path="" + case "$p" in + -[IL]/*) path=${p:2} ;; + -[IL]) path=$p2 skipNext=true ;; + esac + + if [[ -n $path ]] && badPath "$path"; then + skip "$path" + $skipNext && n+=1 + continue + fi + + kept+=("$p") + done + # Old bash empty array hack + params=(${kept+"${kept[@]}"}) +fi + +# Flirting with a layer violation here. +if [ -z "${NIX_BINTOOLS_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then + source @bintools@/nix-support/add-flags.sh +fi + +# Put this one second so libc ldflags take priority. +if [ -z "${NIX_CC_WRAPPER_FLAGS_SET_@suffixSalt@:-}" ]; then + source $cc_wrapper/nix-support/add-flags.sh +fi + +if [[ "$isCxx" = 1 ]]; then + if [[ "$cxxInclude" = 1 ]]; then + NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@" + fi + if [[ "$cxxLibrary" = 1 ]]; then + NIX_CFLAGS_LINK_@suffixSalt@+=" $NIX_CXXSTDLIB_LINK_@suffixSalt@" + fi +fi + +source $cc_wrapper/nix-support/add-hardening.sh + +# Add the flags for the C compiler proper. +addCFlagsToList() { + declare -n list="$1" + shift + + for ((i = 1; i <= $#; i++)); do + local val="${!i}" + case "$val" in + # Pass through using -Xcc, but also convert to Swift -I. + # These have slightly different meaning for Clang, but Swift + # doesn't have exact equivalents. + -isystem | -idirafter) + i=$((i + 1)) + list+=("-Xcc" "$val" "-Xcc" "${!i}" "-I" "${!i}") + ;; + # Simple rename. + -iframework) + i=$((i + 1)) + list+=("-Fsystem" "${!i}") + ;; + # Pass through verbatim. + -I | -Fsystem) + i=$((i + 1)) + list+=("${val}" "${!i}") + ;; + -I* | -L* | -F*) + list+=("${val}") + ;; + # Pass through using -Xcc. + *) + list+=("-Xcc" "$val") + ;; + esac + done +} +for i in ${NIX_SWIFTFLAGS_COMPILE:-}; do + extraAfter+=("$i") +done +for i in ${NIX_SWIFTFLAGS_COMPILE_BEFORE:-}; do + extraBefore+=("$i") +done +addCFlagsToList extraAfter $NIX_CFLAGS_COMPILE_@suffixSalt@ +addCFlagsToList extraBefore ${hardeningCFlags[@]+"${hardeningCFlags[@]}"} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@ + +if [ "$dontLink" != 1 ]; then + + # Add the flags that should only be passed to the compiler when + # linking. + addCFlagsToList extraAfter $(filterRpathFlags "$linkType" $NIX_CFLAGS_LINK_@suffixSalt@) + + # Add the flags that should be passed to the linker (and prevent + # `ld-wrapper' from adding NIX_LDFLAGS_@suffixSalt@ again). + for i in $(filterRpathFlags "$linkType" $NIX_LDFLAGS_BEFORE_@suffixSalt@); do + extraBefore+=("-Xlinker" "$i") + done + if [[ "$linkType" == dynamic && -n "$NIX_DYNAMIC_LINKER_@suffixSalt@" ]]; then + extraBefore+=("-Xlinker" "-dynamic-linker=$NIX_DYNAMIC_LINKER_@suffixSalt@") + fi + for i in $(filterRpathFlags "$linkType" $NIX_LDFLAGS_@suffixSalt@); do + if [ "${i:0:3}" = -L/ ]; then + extraAfter+=("$i") + else + extraAfter+=("-Xlinker" "$i") + fi + done + export NIX_LINK_TYPE_@suffixSalt@=$linkType +fi + +# TODO: If we ever need to expand functionality of this hook, it may no longer +# be compatible with Swift. Right now, it is only used on Darwin to force +# -target, which also happens to work with Swift. +if [[ -e $cc_wrapper/nix-support/add-local-cc-cflags-before.sh ]]; then + source $cc_wrapper/nix-support/add-local-cc-cflags-before.sh +fi + +# May need to transform the triple injected by the above. +for ((i = 1; i < ${#extraBefore[@]}; i++)); do + if [[ "${extraBefore[i]}" = -target ]]; then + i=$((i + 1)) + # On Darwin only, need to change 'aarch64' to 'arm64'. + extraBefore[i]="${extraBefore[i]/aarch64-apple-/arm64-apple-}" + # On Darwin, Swift requires the triple to be annotated with a version. + # TODO: Assumes macOS. + extraBefore[i]="${extraBefore[i]/-apple-darwin/-apple-macosx${MACOSX_DEPLOYMENT_TARGET:-11.0}}" + break + fi +done + +# As a very special hack, if the arguments are just `-v', then don't +# add anything. This is to prevent `gcc -v' (which normally prints +# out the version number and returns exit code 0) from printing out +# `No input files specified' and returning exit code 1. +if [ "$*" = -v ]; then + extraAfter=() + extraBefore=() +fi + +# Optionally print debug info. +if (( "${NIX_DEBUG:-0}" >= 1 )); then + # Old bash workaround, see ld-wrapper for explanation. + echo "extra flags before to $prog:" >&2 + printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 + echo "original flags to $prog:" >&2 + printf " %q\n" ${params+"${params[@]}"} >&2 + echo "extra flags after to $prog:" >&2 + printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 +fi + +PATH="$path_backup" +# Old bash workaround, see above. + +if (( "${NIX_CC_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then + exec "$prog" @<(printf "%q\n" \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"}) +else + exec "$prog" \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} +fi diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/xctest/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/xctest/default.nix new file mode 100644 index 0000000000..c8003d8486 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/swift/xctest/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, callPackage +, cmake +, ninja +, swift +, Foundation +, DarwinTools +}: + +let + sources = callPackage ../sources.nix { }; +in stdenv.mkDerivation { + pname = "swift-corelibs-xctest"; + + inherit (sources) version; + src = sources.swift-corelibs-xctest; + + outputs = [ "out" ]; + + nativeBuildInputs = [ cmake ninja swift ] + ++ lib.optional stdenv.isDarwin DarwinTools; # sw_vers + buildInputs = [ Foundation ]; + + postPatch = lib.optionalString stdenv.isDarwin '' + # On Darwin only, Swift uses arm64 as cpu arch. + substituteInPlace cmake/modules/SwiftSupport.cmake \ + --replace '"aarch64" PARENT_SCOPE' '"arm64" PARENT_SCOPE' + ''; + + preConfigure = '' + # On aarch64-darwin, our minimum target is 11.0, but we can target lower, + # and some dependants require a lower target. Harmless on non-Darwin. + export MACOSX_DEPLOYMENT_TARGET=10.12 + ''; + + cmakeFlags = lib.optional stdenv.isDarwin "-DUSE_FOUNDATION_FRAMEWORK=ON"; + + postInstall = lib.optionalString stdenv.isDarwin '' + # Darwin normally uses the Xcode version of XCTest. Installing + # swift-corelibs-xctest is probably not officially supported, but we have + # no alternative. Fix up the installation here. + mv $out/lib/swift/darwin/${swift.swiftArch}/* $out/lib/swift/darwin + rmdir $out/lib/swift/darwin/${swift.swiftArch} + mv $out/lib/swift/darwin $out/lib/swift/${swift.swiftOs} + ''; + + meta = { + description = "Framework for writing unit tests in Swift"; + homepage = "https://github.com/apple/swift-corelibs-xctest"; + platforms = lib.platforms.all; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix index 2f6eb98be2..0d2541a5a1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/tinygo/default.nix @@ -52,7 +52,7 @@ buildGoModule rec { ./0003-Use-out-path-as-build-id-on-darwin.patch ]; - checkInputs = [ avrgcc binaryen ]; + nativeCheckInputs = [ avrgcc binaryen ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ llvm clang.cc ] ++ lib.optionals stdenv.isDarwin [ zlib ncurses libffi libxml2 xar ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/tvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/tvm/default.nix index 05d2f8696d..e2245f800a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/tvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/tvm/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "tvm"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "apache"; repo = "incubator-tvm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-lzLrd4vNK1c7BwWS0H5x1uDdZ3moUl+zWHb8G6gs8hw="; + sha256 = "sha256-v3F+qncs3PFkRllrdWvrle/ofg9thX4BJlvILQz9B6A="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/x11basic/default.nix b/third_party/nixpkgs/pkgs/development/compilers/x11basic/default.nix index 030c30b96a..3ce548c9b4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/x11basic/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/x11basic/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://x11-basic.sourceforge.net/"; + homepage = "https://x11-basic.sourceforge.net/"; description = "A Basic interpreter and compiler with graphics capabilities"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/xa/xa.nix b/third_party/nixpkgs/pkgs/development/compilers/xa/xa.nix index 0fb9d7d058..db719c8fd2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/xa/xa.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/xa/xa.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-qUd68VC2yKkc09QeHPjJ31UtODMmSVV2gwJxykRnvYY="; }; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix index 122de5ac10..e1c035745f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/default.nix @@ -127,7 +127,7 @@ in stdenv.mkDerivation rec { checkTarget = "test"; doCheck = true; - checkInputs = [ verilog ]; + nativeCheckInputs = [ verilog ]; # Internally, yosys knows to use the specified hardcoded ABCEXTERNAL binary. # But other tools (like mcy or symbiyosys) can't know how yosys was built, so diff --git a/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix index 31e429284c..8990067358 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/yosys/plugins/symbiflow.nix @@ -54,7 +54,7 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec { # xdc has an incorrect path to a test which has yet to be patched doCheck = plugin != "xdc"; - checkInputs = [ static_gtest ]; + nativeCheckInputs = [ static_gtest ]; # ql-qlf tries to fetch a yosys script from github # Run the script in preBuild instead. diff --git a/third_party/nixpkgs/pkgs/development/compilers/zig/0.10.nix b/third_party/nixpkgs/pkgs/development/compilers/zig/0.10.nix new file mode 100644 index 0000000000..89f23b9ca2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/zig/0.10.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, coreutils +, llvmPackages +, libxml2 +, zlib +}: + +stdenv.mkDerivation rec { + pname = "zig"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "ziglang"; + repo = pname; + rev = version; + hash = "sha256-69QIkkKzApOGfrBdgtmxFMDytRkSh+0YiaJQPbXsBeo="; + }; + + nativeBuildInputs = [ + cmake + llvmPackages.llvm.dev + ]; + + buildInputs = [ + coreutils + libxml2 + zlib + ] ++ (with llvmPackages; [ + libclang + lld + llvm + ]); + + preBuild = '' + export HOME=$TMPDIR; + ''; + + postPatch = '' + # Zig's build looks at /usr/bin/env to find dynamic linking info. This + # doesn't work in Nix' sandbox. Use env from our coreutils instead. + substituteInPlace lib/std/zig/system/NativeTargetInfo.zig --replace "/usr/bin/env" "${coreutils}/bin/env" + ''; + + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + + doCheck = true; + installCheckPhase = '' + $out/bin/zig test --cache-dir "$TMPDIR" -I $src/test $src/test/behavior.zig + ''; + + meta = with lib; { + homepage = "https://ziglang.org/"; + description = + "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; + license = licenses.mit; + maintainers = with maintainers; [ aiotter andrewrk AndersonTorres ]; + platforms = platforms.unix; + # Build fails on Darwin on both AArch64 and x86_64: + # https://github.com/NixOS/nixpkgs/pull/210324#issuecomment-1381313616 + # https://github.com/NixOS/nixpkgs/pull/210324#issuecomment-1381236045 + broken = stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/zig/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zig/0.9.1.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/zig/default.nix rename to third_party/nixpkgs/pkgs/development/compilers/zig/0.9.1.nix diff --git a/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix b/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix index e23dbdbd6c..9780dac344 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zulu/8.nix @@ -21,11 +21,11 @@ }: let - version = "8.48.0.53"; - openjdk = "8.0.265"; + version = "8.68.0.19"; + openjdk = "8.0.362"; - sha256_linux = "ed32513524b32a83b3b388831c69d1884df5675bd5069c6d1485fd1a060be209"; - sha256_darwin = "36f189bfbd0255195848835819377474ba9c1c868e3c204633c451c96e21f30a"; + sha256_linux = "sha256-jNty0iJoXG+sp7v2fGCrwZWCSZfQ4tkYe8ERixQMKL0="; + sha256_darwin = "sha256-3/P3puM6a7tCHP5eZM6IzbdPrqnhY1dTa7QWss9M08M="; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; diff --git a/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix index 03dff2348a..b4338738f8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix @@ -22,12 +22,12 @@ }: let - version = "11.52.13"; - openjdk = "11.0.13"; + version = "11.62.17"; + openjdk = "11.0.18"; - sha256_x64_linux = "77a126669b26b3a89e0117b0f28cddfcd24fcd7699b2c1d35f921487148b9a9f"; - sha256_x64_darwin = "a96f9f859350f977319ebb5c2a999c182ab6b99b24c60e19d97c54367868a63e"; - sha256_aarch64_darwin = "dmzfergSUVz39T30PT/6ZtT8JNqv5lzdX7zUsXsFGJg="; + sha256_x64_linux = "sha256-b65oEbDzrrsUw+WaX94USBz/QS74yiMiGZPxqzMmmqs="; + sha256_x64_darwin = "sha256-nRRWTWiog8bRblmmPIPE5YibA34St3ZrJpZN91qEDUg="; + sha256_aarch64_darwin = "sha256-TBTrBxOfGo6MV+Md49P3sDfqVG1e+NraqfVbw9WTppk="; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isAarch64 && stdenv.isDarwin then sha256_aarch64_darwin else if stdenv.isDarwin then sha256_x64_darwin else sha256_x64_linux; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix index 7ded64ec57..5a7ec31f50 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/Cheerios/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, StructTact, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "cheerios"; owner = "uwplse"; inherit version; - defaultVersion = if versions.range "8.6" "8.16" coq.version then "20200201" else null; + defaultVersion = if lib.versions.range "8.6" "8.16" coq.version then "20200201" else null; release."20200201".rev = "9c7f66e57b91f706d70afa8ed99d64ed98ab367d"; release."20200201".sha256 = "1h55s6lk47bk0lv5ralh81z55h799jbl9mhizmqwqzy57y8wqgs1"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix index 9dabae0bdb..a926f6d809 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/CoLoR/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, bignums, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "color"; owner = "fblanqui"; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ {case = range "8.12" "8.16"; out = "1.8.2"; } {case = range "8.10" "8.11"; out = "1.7.0"; } {case = range "8.8" "8.9"; out = "1.6.0"; } @@ -26,6 +26,6 @@ with lib; mkCoqDerivation { meta = { homepage = "https://github.com/fblanqui/color"; description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant."; - maintainers = with maintainers; [ jpas jwiegley ]; + maintainers = with lib.maintainers; [ jpas jwiegley ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix index ad371f1b6a..a0761dfb51 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/HoTT/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, autoconf, automake, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "HoTT"; repo = "Coq-HoTT"; owner = "HoTT"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = coq.coq-version; } ] null; releaseRev = v: "V${v}"; @@ -18,8 +18,8 @@ with lib; mkCoqDerivation { ''; meta = { - homepage = "http://homotopytypetheory.org/"; + homepage = "https://homotopytypetheory.org/"; description = "Homotopy type theory"; - maintainers = with maintainers; [ siddharthist ]; + maintainers = with lib.maintainers; [ siddharthist ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix index 23922dcce4..e0a9e1f6bf 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/ITree/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null , paco, coq-ext-lib }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "InteractionTrees"; owner = "DeepSpec"; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.10" "8.16"; out = "4.0.0"; } ] null; release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm"; @@ -12,6 +12,6 @@ with lib; mkCoqDerivation rec { propagatedBuildInputs = [ coq-ext-lib paco ]; meta = { description = "A Library for Representing Recursive and Impure Programs in Coq"; - maintainers = with maintainers; [ larsr ]; + maintainers = with lib.maintainers; [ larsr ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/LibHyps/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/LibHyps/default.nix index 1a9eb9cec0..b0997e857b 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/LibHyps/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/LibHyps/default.nix @@ -1,11 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "LibHyps"; owner = "Matafou"; inherit version; - defaultVersion = if (versions.range "8.11" "8.16") coq.version then "2.0.4.1" else null; + defaultVersion = if (lib.versions.range "8.11" "8.16") coq.version then "2.0.4.1" else null; release = { "2.0.4.1".sha256 = "09p89701zhrfdmqlpxw3mziw8yylj1w1skb4b0xpbdwd1vsn4k3h"; }; @@ -16,6 +15,6 @@ mkCoqDerivation { meta = { description = "Hypotheses manipulation library"; - license = licenses.mit; + license = lib.licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix index 3fb8a42cfb..778ab14265 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/StructTact/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "StructTact"; owner = "uwplse"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.6" "8.16"; out = "20210328"; } { case = range "8.5" "8.13"; out = "20181102"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix index 8a4243a870..72d88dec6f 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/VST/default.nix @@ -1,7 +1,5 @@ { lib, mkCoqDerivation, coq, compcert, ITree, version ? null }: -with lib; - # A few modules that are not built and installed by default # but that may be useful to some users. # They depend on ITree. @@ -11,7 +9,7 @@ let extra_floyd_files = [ "powerlater.v" ] # floyd/printf.v is broken in VST 2.9 - ++ optional (!versions.isGe "8.13" coq.coq-version) "printf.v" + ++ lib.optional (!lib.versions.isGe "8.13" coq.coq-version) "printf.v" ++ [ "quickprogram.v" ]; @@ -24,7 +22,7 @@ mkCoqDerivation { owner = "PrincetonUniversity"; repo = "VST"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.15" "8.16"; out = "2.11.1"; } { case = range "8.14" "8.16"; out = "2.10"; } { case = range "8.13" "8.15"; out = "2.9"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix index 08322fb7fc..62eb9c389a 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/Velisarios/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "Velisarios"; owner = "vrahli"; inherit version; - defaultVersion = if versions.range "8.6" "8.8" coq.coq-version then "20180221" else null; + defaultVersion = if lib.versions.range "8.6" "8.8" coq.coq-version then "20180221" else null; release."20180221".rev = "e1eee1f10d5d46331a560bd8565ac101229d0d6b"; release."20180221".sha256 = "0l9885nxy0n955fj1gnijlxl55lyxiv9yjfmz8hmfrn9hl8vv1m2"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix index 80b964b390..6dec34a095 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/Verdi/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, Cheerios, InfSeqExt, ssreflect, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "verdi"; owner = "uwplse"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.7" "8.16"; out = "20211026"; } { case = range "8.7" "8.14"; out = "20210524"; } { case = range "8.7" "8.13"; out = "20200131"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix index 90ddf3e524..180b7b88fc 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/aac-tactics/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "aac-tactics"; @@ -21,7 +20,7 @@ mkCoqDerivation { release."8.5.0".sha256 = "sha256-7yNxJn6CH5xS5w/zsXfcZYORa6e5/qS9v8PUq2o02h4="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.16"; out = "8.16.0"; } { case = "8.15"; out = "8.15.1"; } { case = "8.14"; out = "8.14.1"; } @@ -37,7 +36,7 @@ mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "Coq plugin providing tactics for rewriting universally quantified equations"; longDescription = '' This Coq plugin provides tactics for rewriting universally quantified diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix index 63ba0e8050..f40bdbf189 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/addition-chains/default.nix @@ -1,6 +1,5 @@ { lib, mkCoqDerivation, coq, mathcomp-ssreflect, mathcomp-algebra, mathcomp-fingroup, paramcoq , version ? null }: -with lib; mkCoqDerivation { pname = "addition-chains"; @@ -12,7 +11,7 @@ mkCoqDerivation { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "0.6"; } { case = range "8.11" "8.12"; out = "0.4"; } ] null; @@ -21,7 +20,7 @@ mkCoqDerivation { useDune = true; - meta = { + meta = with lib; { description = "Exponentiation algorithms following addition chains"; longDescription = '' Addition chains are algorithms for computations of the p-th diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix index 5a7331c222..72768777c1 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/autosubst/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, mathcomp-ssreflect, version ? null }: -with lib; mkCoqDerivation { pname = "autosubst"; @@ -8,13 +7,13 @@ mkCoqDerivation { release."1.7".sha256 = "sha256-qoyteQ5W2Noxf12uACOVeHhPLvgmTzrvEo6Ts+FKTGI="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "1.7"; } ] null; propagatedBuildInputs = [ mathcomp-ssreflect ]; - meta = { + meta = with lib; { homepage = "https://www.ps.uni-saarland.de/autosubst/"; description = "Automation for de Bruijn syntax and substitution in Coq"; maintainers = with maintainers; [ siraben jwiegley ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix index f2e64ab2f6..c62e20a5a2 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/bignums/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "bignums"; owner = "coq"; displayVersion = { bignums = ""; }; inherit version; - defaultVersion = if versions.isGe "8.6" coq.coq-version + defaultVersion = if lib.versions.isGe "8.6" coq.coq-version then "${coq.coq-version}.0" else null; release."8.17.0".sha256 = "sha256-MXYjqN86+3O4hT2ql62U83T5H03E/8ysH8erpvC/oyw="; @@ -25,5 +25,5 @@ with lib; mkCoqDerivation { mlPlugin = true; - meta = { license = licenses.lgpl2; }; + meta = { license = lib.licenses.lgpl2; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/category-theory/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/category-theory/default.nix index 97feac90c3..ed214533b0 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/category-theory/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/category-theory/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, ssreflect, equations, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "category-theory"; owner = "jwiegley"; @@ -16,7 +16,7 @@ with lib; mkCoqDerivation { release."20180709".sha256 = "0f2nr8dgn1ab7hr7jrdmr1zla9g9h8216q4yf4wnff9qkln8sbbs"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "1.0.0"; } { case = range "8.10" "8.15"; out = "20211213"; } { case = range "8.8" "8.9"; out = "20190414"; } @@ -28,6 +28,6 @@ with lib; mkCoqDerivation { meta = { description = "A formalization of category theory in Coq for personal study and practical work"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/ceres/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/ceres/default.nix index 375eb6c75b..75d57936ff 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/ceres/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/ceres/default.nix @@ -1,6 +1,5 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "ceres"; @@ -8,10 +7,10 @@ mkCoqDerivation { owner = "Lysxia"; inherit version; - defaultVersion = if versions.range "8.8" "8.16" coq.version then "0.4.0" else null; + defaultVersion = if lib.versions.range "8.8" "8.16" coq.version then "0.4.0" else null; release."0.4.0".sha256 = "sha256:0zwp3pn6fdj0qdig734zdczrls886al06mxqhhabms0jvvqijmbi"; - meta = { + meta = with lib; { description = "Library for serialization to S-expressions"; license = licenses.mit; maintainers = with maintainers; [ Zimmi48 ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix index fb6527989d..fb33f92bcc 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/compcert/default.nix @@ -5,8 +5,6 @@ , version ? null }: -with lib; - let compcert = mkCoqDerivation rec { pname = "compcert"; @@ -15,7 +13,7 @@ let compcert = mkCoqDerivation rec { inherit version; releaseRev = v: "v${v}"; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.14" "8.16"; out = "3.11"; } { case = isEq "8.13" ; out = "3.10"; } { case = isEq "8.12" ; out = "3.9"; } @@ -84,7 +82,7 @@ let compcert = mkCoqDerivation rec { }; in compcert.overrideAttrs (o: { - patches = with versions; switch [ coq.version o.version ] [ + patches = with lib.versions; lib.switch [ coq.version o.version ] [ { cases = [ (range "8.12.2" "8.13.2") "3.8" ]; out = [ # Support for Coq 8.12.2 diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/contribs/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/contribs/default.nix index cb6dedca35..2d10f683cc 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/contribs/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/contribs/default.nix @@ -1,16 +1,16 @@ { lib, mkCoqDerivation, coq, callPackage }: -with lib; let mkContrib = pname: coqs: param: + let mkContrib = pname: coqs: param: let contribVersion = {version ? null}: mkCoqDerivation ({ inherit pname version; owner = "coq-contribs"; mlPlugin = true; - } // optionalAttrs (builtins.elem coq.coq-version coqs) ({ + } // lib.optionalAttrs (builtins.elem coq.coq-version coqs) ({ defaultVersion = param.version; release = { "${param.version}" = { inherit (param) rev sha256; }; }; } // (removeAttrs param [ "version" "rev" "sha256" ])) ); in - makeOverridable contribVersion {} ; in + lib.makeOverridable contribVersion {} ; in { aac-tactics = mkContrib "aac-tactics" [ "8.7" "8.8" ] { "8.7" = { diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix index a2ef7e09a7..16a26d9fa3 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-bits/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coq-bits"; repo = "bits"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "1.1.0"; } { case = range "8.7" "8.15"; out = "1.0.0"; } ] null; @@ -14,7 +14,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ mathcomp-algebra ]; - meta = { + meta = with lib; { description = "A formalization of bitset operations in Coq"; license = licenses.asl20; maintainers = with maintainers; [ ptival ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix index b6f124b3f0..d555e55389 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "coq-ext-lib"; owner = "coq-ext-lib"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "0.11.7"; } { case = range "8.8" "8.16"; out = "0.11.6"; } { case = range "8.8" "8.14"; out = "0.11.4"; } @@ -30,6 +30,6 @@ with lib; mkCoqDerivation rec { meta = { description = "A collection of theories and plugins that may be useful in other Coq developments"; - maintainers = with maintainers; [ jwiegley ptival ]; + maintainers = with lib.maintainers; [ jwiegley ptival ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix index 7caf754ae5..028b4c5025 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-haskell/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, ssreflect, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coq-haskell"; owner = "jwiegley"; inherit version; - defaultVersion = if versions.range "8.5" "8.8" coq.coq-version then "20171215" else null; + defaultVersion = if lib.versions.range "8.5" "8.8" coq.coq-version then "20171215" else null; release."20171215".rev = "e2cf8b270c2efa3b56fab1ef6acc376c2c3de968"; release."20171215".sha256 = "09dq1vvshhlhgjccrhqgbhnq2hrys15xryfszqq11rzpgvl2zgdv"; @@ -16,6 +16,6 @@ with lib; mkCoqDerivation { meta = { description = "A library for formalizing Haskell types and functions in Coq"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix index 77c42fb48d..a0b27dda84 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coq-record-update/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { + mkCoqDerivation rec { pname = "coq-record-update"; owner = "tchajed"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "0.3.1"; } ] null; release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk="; @@ -13,6 +13,6 @@ with lib; mkCoqDerivation rec { buildFlags = [ "NO_TEST=1" ]; meta = { description = "Library to create Coq record update functions"; - maintainers = with maintainers; [ ineol ]; + maintainers = with lib.maintainers; [ ineol ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix index d3a8e366a0..1ccbf9e82a 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqeal/default.nix @@ -2,14 +2,12 @@ mathcomp-real-closed, lib, version ? null }: -with lib; - (mkCoqDerivation { pname = "CoqEAL"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.13.0") ]; out = "1.1.1"; } { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.1.0"; } { cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; } @@ -28,9 +26,9 @@ with lib; meta = { description = "CoqEAL - The Coq Effective Algebra Library"; - license = licenses.mit; + license = lib.licenses.mit; }; }).overrideAttrs (o: { propagatedBuildInputs = o.propagatedBuildInputs - ++ optional (versions.isGe "1.1" o.version || o.version == "dev") mathcomp-real-closed; + ++ lib.optional (lib.versions.isGe "1.1" o.version || o.version == "dev") mathcomp-real-closed; }) diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix index 853e77990b..e5e23247f1 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqhammer/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { inherit version; pname = "coqhammer"; owner = "lukaszcz"; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.15"; out = "1.3.2-coq8.15"; } { case = "8.14"; out = "1.3.2-coq8.14"; } { case = "8.13"; out = "1.3.2-coq8.13"; } @@ -57,7 +57,7 @@ with lib; mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { homepage = "http://cl-informatik.uibk.ac.at/cek/coqhammer/"; description = "Automation for Dependent Type Theory"; license = licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqide/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqide/default.nix index 4e1f9e5f66..a11bfb2c0d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqide/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqide/default.nix @@ -8,14 +8,14 @@ , coq , version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "coqide"; inherit version; inherit (coq) src; release."${coq.version}" = {}; - defaultVersion = if versions.isGe "8.14" coq.version then coq.version else null; + defaultVersion = if lib.versions.isGe "8.14" coq.version then coq.version else null; preConfigure = '' patchShebangs dev/tools/ diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix index ac05af5872..cfba685e35 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqprime/default.nix @@ -1,11 +1,11 @@ { which, lib, mkCoqDerivation, coq, bignums, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coqprime"; owner = "thery"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.12" "8.16"; out = "8.15"; } { case = range "8.10" "8.11"; out = "8.10"; } { case = range "8.8" "8.9"; out = "8.8"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coqtail-math/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coqtail-math/default.nix index a4f7ca405f..b43cadb918 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coqtail-math/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coqtail-math/default.nix @@ -1,12 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; - mkCoqDerivation { pname = "coqtail-math"; owner = "coq-community"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.15"; out = "8.14"; } { case = range "8.11" "8.13"; out = "20201124"; } ] null; @@ -15,7 +13,7 @@ mkCoqDerivation { release."20201124".rev = "5c22c3d7dcd8cf4c47cf84a281780f5915488e9e"; release."20201124".sha256 = "sha256-wd+Lh7dpAD4zfpyKuztDmSFEZo5ZiFrR8ti2jUCVvoQ="; mlPlugin = true; - meta = { + meta = with lib; { license = licenses.lgpl3Only; maintainers = [ maintainers.siraben ]; }; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix index 09327f2ff7..b6e2df653b 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,12 +1,12 @@ { lib, mkCoqDerivation, autoconf, coq, ssreflect, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "coquelicot"; owner = "coquelicot"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.8" "8.16"; out = "3.2.0"; } { case = range "8.8" "8.13"; out = "3.1.0"; } { case = range "8.5" "8.9"; out = "3.0.2"; } @@ -20,7 +20,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ ssreflect ]; useMelquiondRemake.logpath = "Coquelicot"; - meta = { + meta = with lib; { homepage = "http://coquelicot.saclay.inria.fr/"; description = "A Coq library for Reals"; license = licenses.lgpl3; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix index d019d4b4e5..84bca53931 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/corn/default.nix @@ -1,9 +1,9 @@ { lib, mkCoqDerivation, coq, bignums, math-classes, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "corn"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.6"; out = "8.8.1"; } { case = (range "8.11" "8.16"); out = "8.16.0"; } { case = (range "8.7" "8.15"); out = "8.13.0"; } @@ -21,7 +21,7 @@ with lib; mkCoqDerivation rec { propagatedBuildInputs = [ bignums math-classes ]; - meta = { + meta = with lib; { homepage = "http://c-corn.github.io/"; license = licenses.gpl2; description = "A Coq library for constructive analysis"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/deriving/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/deriving/default.nix index f08e86ccc4..06e80f118b 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/deriving/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/deriving/default.nix @@ -1,14 +1,13 @@ { lib, mkCoqDerivation, coq, version ? null , ssreflect }: -with lib; mkCoqDerivation { pname = "deriving"; owner = "arthuraa"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "0.1.0"; } ] null; @@ -20,7 +19,7 @@ mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "Generic instances of MathComp classes"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix index e247294655..da26b0774d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,14 +1,13 @@ { lib, mkCoqDerivation, autoreconfHook, coq, version ? null }: -with lib; -let hasWarning = versionAtLeast coq.ocamlPackages.ocaml.version "4.08"; in +let hasWarning = lib.versionAtLeast coq.ocamlPackages.ocaml.version "4.08"; in mkCoqDerivation { pname = "dpdgraph"; owner = "Karmaki"; repo = "coq-dpdgraph"; inherit version; - defaultVersion = switch coq.coq-version [ + defaultVersion = lib.switch coq.coq-version [ { case = "8.16"; out = "1.0+8.16"; } { case = "8.15"; out = "1.0+8.15"; } { case = "8.14"; out = "1.0+8.14"; } @@ -47,11 +46,11 @@ mkCoqDerivation { # dpd_compute.ml uses deprecated Pervasives.compare # Versions prior to 0.6.5 do not have the WARN_ERR build flag - preConfigure = optionalString hasWarning '' + preConfigure = lib.optionalString hasWarning '' substituteInPlace Makefile.in --replace "-warn-error +a " "" ''; - buildFlags = optional hasWarning "WARN_ERR="; + buildFlags = lib.optional hasWarning "WARN_ERR="; preInstall = '' mkdir -p $out/bin @@ -59,7 +58,7 @@ mkCoqDerivation { extraInstallFlags = [ "BINDIR=$(out)/bin" ]; - meta = { + meta = with lib; { description = "Build dependency graphs between Coq objects"; license = licenses.lgpl21; maintainers = with maintainers; [ vbgl ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix index ffe72ad330..b574f4c9fb 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/equations/default.nix @@ -1,11 +1,12 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; (mkCoqDerivation { +(mkCoqDerivation { pname = "equations"; owner = "mattam82"; repo = "Coq-Equations"; inherit version; - defaultVersion = switch coq.coq-version [ + defaultVersion = lib.switch coq.coq-version [ + { case = "8.17"; out = "1.3+8.17"; } { case = "8.16"; out = "1.3+8.16"; } { case = "8.15"; out = "1.3+8.15"; } { case = "8.14"; out = "1.3+8.14"; } @@ -54,14 +55,16 @@ with lib; (mkCoqDerivation { release."1.3+8.15".sha256 = "1vfcfpsp9zyj0sw0cwibk76nj6n0r6gwh8m1aa3lbvc0b1kbm32k"; release."1.3+8.16".rev = "v1.3-8.16"; release."1.3+8.16".sha256 = "sha256-zyMGeRObtSGWh7n3WCqesBZL5EgLvKwmnTy09rYpxyE="; + release."1.3+8.17".rev = "v1.3-8.17"; + release."1.3+8.17".sha256 = "sha256-yNotSIxFkhTg3reZIchGQ7cV9WmTJ7p7hPfKGBiByDw="; mlPlugin = true; - meta = { + meta = with lib; { homepage = "https://mattam82.github.io/Coq-Equations/"; description = "A plugin for Coq to add dependent pattern-matching"; maintainers = with maintainers; [ jwiegley ]; }; }).overrideAttrs (o: { - preBuild = "coq_makefile -f _CoqProject -o Makefile${optionalString (versionAtLeast o.version "1.2.1" || o.version == "dev") ".coq"}"; + preBuild = "coq_makefile -f _CoqProject -o Makefile${lib.optionalString (lib.versionAtLeast o.version "1.2.1" || o.version == "dev") ".coq"}"; }) diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix index 2a038ff0c1..b6345d7b0a 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/extructures/default.nix @@ -2,14 +2,13 @@ , ssreflect , deriving }: -with lib; (mkCoqDerivation { pname = "extructures"; owner = "arthuraa"; inherit version; - defaultVersion = with versions; switch [coq.coq-version ssreflect.version] [ + defaultVersion = with lib.versions; lib.switch [coq.coq-version ssreflect.version] [ { cases = [(range "8.11" "8.16") (isGe "1.12.0") ]; out = "0.3.1"; } { cases = [(range "8.11" "8.14") (isLe "1.12.0") ]; out = "0.3.0"; } { cases = [(range "8.10" "8.12") (isLe "1.12.0") ]; out = "0.2.2"; } @@ -23,7 +22,7 @@ with lib; propagatedBuildInputs = [ ssreflect ]; - meta = { + meta = with lib; { description = "Finite data structures with extensional reasoning"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; @@ -31,5 +30,5 @@ with lib; }).overrideAttrs (o: { propagatedBuildInputs = o.propagatedBuildInputs - ++ optional (versionAtLeast o.version "0.3.0") deriving; + ++ lib.optional (lib.versionAtLeast o.version "0.3.0") deriving; }) diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/fiat/HEAD.nix b/third_party/nixpkgs/pkgs/development/coq-modules/fiat/HEAD.nix index d94dc03b63..0a6375907e 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/fiat/HEAD.nix @@ -1,6 +1,6 @@ {lib, mkCoqDerivation, coq, python27, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "fiat"; owner = "mit-plv"; repo = "fiat"; @@ -29,6 +29,6 @@ with lib; mkCoqDerivation rec { meta = { homepage = "http://plv.csail.mit.edu/fiat/"; description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/flocq/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/flocq/default.nix index ed973996fe..cf39c8211b 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/flocq/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/flocq/default.nix @@ -1,12 +1,12 @@ { lib, bash, autoconf, automake, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "flocq"; owner = "flocq"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "4.1.0"; } { case = range "8.7" "8.15"; out = "3.4.3"; } { case = range "8.5" "8.8"; out = "2.6.1"; } @@ -22,7 +22,7 @@ with lib; mkCoqDerivation { mlPlugin = true; useMelquiondRemake.logpath = "Flocq"; - meta = { + meta = with lib; { description = "A floating-point formalization for the Coq system"; license = licenses.lgpl3; maintainers = with maintainers; [ jwiegley ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix index 3615f5513a..6548da52b9 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/fourcolor/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, mathcomp, version ? null }: -with lib; mkCoqDerivation { pname = "fourcolor"; @@ -12,15 +11,15 @@ mkCoqDerivation { release."1.2.5".sha256 = "sha256-3qOPNCRjGK2UdHGMSqElpIXhAPVCklpeQgZwf9AFals="; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.11") (isGe "1.12") ]; out = "1.2.5"; } { cases = [ (isGe "8.11") (range "1.11" "1.14") ]; out = "1.2.4"; } - { cases = [ (isLe "8.13") (pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } + { cases = [ (isLe "8.13") (lib.pred.inter (isGe "1.11.0") (isLt "1.13")) ]; out = "1.2.3"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; - meta = { + meta = with lib; { description = "Formal proof of the Four Color Theorem "; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/gaia-hydras/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/gaia-hydras/default.nix index 5377600cab..4f9e7a12e0 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/gaia-hydras/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/gaia-hydras/default.nix @@ -1,7 +1,7 @@ { lib, mkCoqDerivation, coq, hydra-battles, gaia, mathcomp-zify, mathcomp, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "gaia-hydras"; repo = "hydra-battles"; @@ -10,7 +10,7 @@ with lib; mkCoqDerivation rec { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch [coq.coq-version mathcomp.version] [ + defaultVersion = with lib.versions; lib.switch [coq.coq-version mathcomp.version] [ { cases = [ (range "8.14" "8.16") (isGe "1.12.0") ]; out = "0.6"; } { cases = [ (range "8.13" "8.14") (isGe "1.12.0") ]; out = "0.5"; } ] null; @@ -23,7 +23,7 @@ with lib; mkCoqDerivation rec { useDune = true; - meta = { + meta = with lib; { description = "Comparison between ordinals in Gaia and Hydra battles"; longDescription = '' The Gaia and Hydra battles projects develop different notions of ordinals. diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix index d4fa4a1da3..a2994dcc9b 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix @@ -1,6 +1,6 @@ { lib, mkCoqDerivation, coq, mathcomp, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "gaia"; release."1.11".sha256 = "sha256:0gwb0blf37sv9gb0qpn34dab71zdcx7jsnqm3j9p58qw65cgsqn5"; @@ -11,7 +11,7 @@ with lib; mkCoqDerivation { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.15"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } ] null; @@ -19,7 +19,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ mathcomp.ssreflect mathcomp.algebra mathcomp.fingroup ]; - meta = { + meta = with lib; { description = "Implementation of books from Bourbaki's Elements of Mathematics in Coq"; maintainers = with maintainers; [ Zimmi48 ]; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix index 52e69e90d1..5a4b4b2a4d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/gappalib/default.nix @@ -1,12 +1,12 @@ { which, lib, mkCoqDerivation, autoconf, coq, flocq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "gappalib"; repo = "coq"; owner = "gappa"; domain = "gitlab.inria.fr"; inherit version; - defaultVersion = if versions.range "8.8" "8.16" coq.coq-version then "1.5.2" else null; + defaultVersion = if lib.versions.range "8.8" "8.16" coq.coq-version then "1.5.2" else null; release."1.5.2".sha256 = "sha256-A021Bhqz5r2CZBayfjIiWrCIfUlejcQAfbTmOaf6QTM="; release."1.5.1".sha256 = "1806bq1z6q5rq2ma7d5kfbqfyfr755hjg0dq7b2llry8fx9cxjsg"; release."1.5.0".sha256 = "1i1c0gakffxqqqqw064cbvc243yl325hxd50jmczr6mk18igk41n"; @@ -19,7 +19,7 @@ with lib; mkCoqDerivation { propagatedBuildInputs = [ flocq ]; useMelquiondRemake.logpath = "Gappa"; - meta = { + meta = with lib; { description = "Coq support library for Gappa"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix index 19efb786ad..1b16f8c394 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/goedel/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, hydra-battles, pocklington, version ? null }: -with lib; mkCoqDerivation { pname = "goedel"; @@ -11,13 +10,13 @@ mkCoqDerivation { release."8.13.0".sha256 = "0sqqkmj6wsk4xmhrnqkhcsbsrqjzn2gnk67nqzgrmjpw5danz8y5"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "8.13.0"; } ] null; propagatedBuildInputs = [ hydra-battles pocklington ]; - meta = { + meta = with lib; { description = "The Gödel-Rosser 1st incompleteness theorem in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix index c2fca0a16a..cbd919c7aa 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/graph-theory/default.nix @@ -1,8 +1,6 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap, mathcomp-fingroup , hierarchy-builder, version ? null }: -with lib; - mkCoqDerivation { pname = "graph-theory"; @@ -11,13 +9,13 @@ mkCoqDerivation { releaseRev = v: "v${v}"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "0.9"; } ] null; propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ]; - meta = { + meta = with lib; { description = "Library of formalized graph theory results in Coq"; longDescription = '' A library of formalized graph theory results, including various diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/heq/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/heq/default.nix index c3a815eb5c..fc96b2abf9 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/heq/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/heq/default.nix @@ -5,13 +5,13 @@ let fetcher = {rev, repo, owner, sha256, domain, ...}: url = "https://${domain}/${owner}/${repo}/download/${repo}-${rev}.zip"; inherit sha256; }; in -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "heq"; repo = "Heq"; owner = "gil.hur"; domain = "sf.snu.ac.kr"; inherit version fetcher; - defaultVersion = if versions.isLt "8.8" coq.coq-version then "0.92" else null; + defaultVersion = if lib.versions.isLt "8.8" coq.coq-version then "0.92" else null; release."0.92".sha256 = "0cf8y6728n81wwlbpq3vi7l2dbzi7759klypld4gpsjjp1y1fj74"; mlPlugin = true; @@ -22,6 +22,6 @@ with lib; mkCoqDerivation { meta = { homepage = "https://ropas.snu.ac.kr/~gil.hur/Heq/"; description = "Heq : a Coq library for Heterogeneous Equality"; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with lib.maintainers; [ jwiegley ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix index 4f319587de..9bcc07387b 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, coq-elpi, version ? null }: -with lib; let hb = mkCoqDerivation { +let hb = mkCoqDerivation { pname = "hierarchy-builder"; owner = "math-comp"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.15" "8.16"; out = "1.4.0"; } { case = range "8.13" "8.14"; out = "1.2.0"; } { case = range "8.12" "8.13"; out = "1.1.0"; } @@ -25,16 +25,16 @@ with lib; let hb = mkCoqDerivation { extraInstallFlags = [ "VFILES=structures.v" ]; - meta = { + meta = with lib; { description = "High level commands to declare a hierarchy based on packed classes"; maintainers = with maintainers; [ cohencyril siraben ]; license = licenses.mit; }; }; in hb.overrideAttrs (o: - optionalAttrs (versions.isGe "1.2.0" o.version || o.version == "dev") + lib.optionalAttrs (lib.versions.isGe "1.2.0" o.version || o.version == "dev") { buildPhase = "make build"; } // - optionalAttrs (versions.isGe "1.1.0" o.version || o.version == "dev") + lib.optionalAttrs (lib.versions.isGe "1.1.0" o.version || o.version == "dev") { installFlags = [ "DESTDIR=$(out)" ] ++ o.installFlags; } ) diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix index 2729f7c213..06798c5fcc 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/hydra-battles/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, equations, LibHyps, version ? null }: -with lib; (mkCoqDerivation { pname = "hydra-battles"; @@ -11,14 +10,14 @@ with lib; releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "0.6"; } { case = range "8.11" "8.12"; out = "0.4"; } ] null; useDune = true; - meta = { + meta = with lib; { description = "Exploration of some properties of Kirby and Paris' hydra battles, with the help of Coq"; longDescription = '' An exploration of some properties of Kirby and Paris' hydra @@ -33,5 +32,5 @@ with lib; }; }).overrideAttrs(o: let inherit (o) version; in { - propagatedBuildInputs = [ equations ] ++ optional (versions.isGe "0.6" version || version == "dev") LibHyps; + propagatedBuildInputs = [ equations ] ++ lib.optional (lib.versions.isGe "0.6" version || version == "dev") LibHyps; }) diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix index a2a59e1ab2..f72dd69f36 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/iris/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, stdpp, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "iris"; domain = "gitlab.mpi-sws.org"; owner = "iris"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "4.0.0"; } { case = range "8.12" "8.14"; out = "3.5.0"; } { case = range "8.11" "8.13"; out = "3.4.0"; } @@ -26,7 +26,7 @@ with lib; mkCoqDerivation rec { fi ''; - meta = { + meta = with lib; { description = "The Coq development of the Iris Project"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/itauto/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/itauto/default.nix index 1ffa37ec6c..e2dfe98cf9 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/itauto/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/itauto/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { pname = "itauto"; @@ -11,7 +10,7 @@ mkCoqDerivation rec { release."8.14.0".sha256 = "sha256:1k6pqhv4dwpkwg81f2rlfg40wh070ks1gy9r0ravm2zhsbxqcfc9"; release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "8.16.0"; } { case = isEq "8.15"; out = "8.15.0"; } { case = isEq "8.14"; out = "8.14.0"; } @@ -22,7 +21,7 @@ mkCoqDerivation rec { nativeBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); enableParallelBuilding = false; - meta = { + meta = with lib; { description = "A reflexive SAT solver parameterised by a leaf tactic and Nelson-Oppen support"; maintainers = with maintainers; [ siraben ]; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/ltac2/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/ltac2/default.nix index c938a7ad02..da28184296 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/ltac2/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/ltac2/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, which, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "ltac2"; owner = "coq"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = "8.10"; out = "0.3"; } { case = "8.9"; out = "0.2"; } { case = "8.8"; out = "0.1"; } @@ -19,7 +19,7 @@ with lib; mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "A robust and expressive tactic language for Coq"; maintainers = [ maintainers.vbgl ]; license = licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix index da708f87e4..d40dacd393 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/math-classes/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, bignums, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "math-classes"; inherit version; - defaultVersion = if versions.range "8.6" "8.16" coq.coq-version then "8.15.0" else null; + defaultVersion = if lib.versions.range "8.6" "8.16" coq.coq-version then "8.15.0" else null; release."8.12.0".sha256 = "14nd6a08zncrl5yg2gzk0xf4iinwq4hxnsgm4fyv07ydbkxfb425"; release."8.13.0".sha256 = "1ln7ziivfbxzbdvlhbvyg3v30jgblncmwcsam6gg3d1zz6r7cbby"; release."8.15.0".sha256 = "10w1hm537k6jx8a8vghq1yx12rsa0sjk2ipv3scgir71ln30hllw"; @@ -14,6 +14,6 @@ with lib; mkCoqDerivation { meta = { homepage = "https://math-classes.github.io"; description = "A library of abstract interfaces for mathematical structures in Coq."; - maintainers = with maintainers; [ siddharthist jwiegley ]; + maintainers = with lib.maintainers; [ siddharthist jwiegley ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-abel/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-abel/default.nix index 43228252b5..bae9266d4d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-abel/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-abel/default.nix @@ -7,7 +7,7 @@ mkCoqDerivation { owner = "math-comp"; inherit version; - defaultVersion = with lib; with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib; with versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.10" "8.16") (range "1.12.0" "1.15.0") ]; out = "1.2.1"; } { cases = [ (range "8.10" "8.15") (range "1.12.0" "1.14.0") ]; out = "1.2.0"; } { cases = [ (range "8.10" "8.14") (range "1.11.0" "1.12.0") ]; out = "1.1.2"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix index f4ae2afd38..af37096a4f 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-algebra-tactics/default.nix @@ -1,14 +1,14 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, coq-elpi, mathcomp-zify, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "algebra-tactics"; owner = "math-comp"; inherit version; - defaultVersion = with versions; - switch [ coq.coq-version mathcomp-algebra.version ] [ + defaultVersion = with lib.versions; + lib.switch [ coq.coq-version mathcomp-algebra.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.0.0"; } ] null; @@ -18,6 +18,6 @@ with lib; mkCoqDerivation { meta = { description = "Ring and field tactics for Mathematical Components"; - maintainers = with maintainers; [ cohencyril ]; + maintainers = with lib.maintainers; [ cohencyril ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix index a42b551d18..3e67675b5e 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -21,7 +21,7 @@ let release."0.3.1".sha256 = "1iad288yvrjv8ahl9v18vfblgqb1l5z6ax644w49w9hwxs93f2k8"; release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966"; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.14") (isGe "1.13.0") ]; out = "0.5.3"; } { cases = [ (isGe "8.14") (range "1.13" "1.15") ]; out = "0.5.2"; } { cases = [ (isGe "8.13") (range "1.13" "1.14") ]; out = "0.5.1"; } @@ -40,7 +40,7 @@ let classical-deps = [ mathcomp.algebra mathcomp-finmap hierarchy-builder ]; analysis-deps = [ mathcomp.field mathcomp-bigenough ]; intra-deps = if package == "single" then [] - else map mathcomp_ (head (splitList (pred.equal package) packages)); + else map mathcomp_ (head (splitList (lib.pred.equal package) packages)); pkgpath = if package == "single" then "." else if package == "analysis" then "theories" else "${package}"; pname = if package == "single" then "mathcomp-analysis-single" diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix index 7804a61c93..a4e4a1ecbb 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-bigenough/default.nix @@ -1,6 +1,6 @@ { coq, mkCoqDerivation, mathcomp, lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "bigenough"; @@ -11,7 +11,7 @@ with lib; mkCoqDerivation { "1.0.1".sha256 = "sha256:02f4dv4rz72liciwxb2k7acwx6lgqz4381mqyq5854p3nbyn06aw"; }; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.10" "8.16"; out = "1.0.1"; } { case = range "8.5" "8.14"; out = "1.0.0"; } ] null; @@ -20,6 +20,6 @@ with lib; mkCoqDerivation { meta = { description = "A small library to do epsilon - N reasonning"; - license = licenses.cecill-b; + license = lib.licenses.cecill-b; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 8c29208c3f..551d33c9fa 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -1,12 +1,12 @@ { coq, mkCoqDerivation, mathcomp, lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "finmap"; owner = "math-comp"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.5.2"; } { cases = [ (isGe "8.10") (isGe "1.11") ]; out = "1.5.1"; } { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } @@ -33,6 +33,6 @@ with lib; mkCoqDerivation { meta = { description = "A finset and finmap library"; - license = licenses.cecill-b; + license = lib.licenses.cecill-b; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix index aef912c615..b114a3f290 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-real-closed/default.nix @@ -1,7 +1,7 @@ { coq, mkCoqDerivation, mathcomp, mathcomp-bigenough, lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "real-closed"; @@ -17,7 +17,7 @@ with lib; mkCoqDerivation { "1.0.1".sha256 = "0j81gkjbza5vg89v4n9z598mfdbql416963rj4b8fzm7dp2r4rxg"; }; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.13") (isGe "1.12.0") ]; out = "1.1.3"; } { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.1.2"; } { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.1.1"; } @@ -37,6 +37,6 @@ with lib; mkCoqDerivation { meta = { description = "Mathematical Components Library on real closed fields"; - license = licenses.cecill-c; + license = lib.licenses.cecill-c; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 706ee06869..19ecfcc384 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -1,14 +1,15 @@ { coq, mkCoqDerivation, mathcomp-ssreflect, mathcomp-fingroup, lib, version ? null }@args: -with lib; mkCoqDerivation { + +mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "tarjan"; owner = "math-comp"; inherit version; - defaultVersion = with versions; - switch [ coq.version mathcomp-ssreflect.version ] [{ + defaultVersion = with lib.versions; + lib.switch [ coq.version mathcomp-ssreflect.version ] [{ cases = [ (range "8.10" "8.16") (isGe "1.12.0") ]; out = "1.0.0"; }] null; release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1"; @@ -17,6 +18,6 @@ with lib; mkCoqDerivation { meta = { description = "Proofs of Tarjan and Kosaraju connected components algorithms"; - license = licenses.cecill-b; + license = lib.licenses.cecill-b; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix index 5f34434b50..090cc4567c 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-word/default.nix @@ -1,6 +1,5 @@ { coq, mkCoqDerivation, mathcomp, lib, version ? null }: -with lib; mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "word"; @@ -15,13 +14,13 @@ mkCoqDerivation { release."1.0".sha256 = "sha256:0703m97rnivcbc7vvbd9rl2dxs6l8n52cbykynw61c6w9rhxspcg"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.12" "8.16") (isGe "1.12") ]; out = "2.0"; } ] null; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; - meta = { + meta = with lib; { description = "Yet Another Coq Library on Machine Words"; maintainers = [ maintainers.vbgl ]; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix index 1ac1d92873..86dd239ebf 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-zify/default.nix @@ -1,14 +1,14 @@ { lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-ssreflect, mathcomp-fingroup, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { namePrefix = [ "coq" "mathcomp" ]; pname = "zify"; repo = "mczify"; owner = "math-comp"; inherit version; - defaultVersion = with versions; - switch [ coq.coq-version mathcomp-algebra.version ] [ + defaultVersion = with lib.versions; + lib.switch [ coq.coq-version mathcomp-algebra.version ] [ { cases = [ (range "8.13" "8.16") (isGe "1.12") ]; out = "1.1.0+1.12+8.13"; } ] null; @@ -19,6 +19,6 @@ with lib; mkCoqDerivation rec { meta = { description = "Micromega tactics for Mathematical Components"; - maintainers = with maintainers; [ cohencyril ]; + maintainers = with lib.maintainers; [ cohencyril ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix index 7be30844eb..031536b7a6 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp/default.nix @@ -18,7 +18,7 @@ let repo = "math-comp"; owner = "math-comp"; withDoc = single && (args.withDoc or false); - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "1.15.0"; } { case = range "8.11" "8.15"; out = "1.14.0"; } { case = range "8.11" "8.15"; out = "1.13.0"; } @@ -50,7 +50,7 @@ let mathcomp_ = package: let mathcomp-deps = if package == "single" then [] - else map mathcomp_ (head (splitList (pred.equal package) packages)); + else map mathcomp_ (head (splitList (lib.pred.equal package) packages)); pkgpath = if package == "single" then "mathcomp" else "mathcomp/${package}"; pname = if package == "single" then "mathcomp" else "mathcomp-${package}"; pkgallMake = '' diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/metacoq/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/metacoq/default.nix index ab036add60..9a22d82dd4 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/metacoq/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/metacoq/default.nix @@ -5,7 +5,7 @@ with builtins // lib; let repo = "metacoq"; owner = "MetaCoq"; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with versions; lib.switch coq.coq-version [ { case = "8.11"; out = "1.0-beta2-8.11"; } { case = "8.12"; out = "1.0-beta2-8.12"; } # Do not provide 8.13 because it does not compile with equations 1.3 provided by default (only 1.2.3) @@ -34,7 +34,7 @@ let metacoq_ = package: let metacoq-deps = if package == "single" then [] - else map metacoq_ (head (splitList (pred.equal package) packages)); + else map metacoq_ (head (splitList (lib.pred.equal package) packages)); pkgpath = if package == "single" then "./" else "./${package}"; pname = if package == "all" then "metacoq" else "metacoq-${package}"; pkgallMake = '' diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix index 6072f9995c..82d2a16f77 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/metalib/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "metalib"; owner = "plclub"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.14" "8.16"; out = "8.15"; } { case = range "8.10" "8.13"; out = "8.10"; } ] null; @@ -14,7 +14,7 @@ with lib; mkCoqDerivation { sourceRoot = "source/Metalib"; - meta = { + meta = with lib; { license = licenses.mit; maintainers = [ maintainers.jwiegley ]; }; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix index 57f4a381b2..19c6015ce9 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix @@ -1,6 +1,6 @@ { coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, lib, version ? null, useDune ? false }@args: -with lib; mkCoqDerivation { + mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "multinomials"; @@ -8,7 +8,7 @@ with lib; mkCoqDerivation { owner = "math-comp"; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ { cases = [ (isGe "8.10") (isGe "1.12.0") ]; out = "1.5.5"; } { cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; } { cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; } @@ -31,7 +31,7 @@ with lib; mkCoqDerivation { "1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; }; - useDuneifVersion = v: versions.isGe "1.5.3" v || v == "dev"; + useDuneifVersion = v: lib.versions.isGe "1.5.3" v || v == "dev"; preConfigure = '' patchShebangs configure || true @@ -42,7 +42,7 @@ with lib; mkCoqDerivation { meta = { description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; - license = licenses.cecill-c; + license = lib.licenses.cecill-c; }; } -// optionalAttrs (args?useDune) { inherit useDune; } +// lib.optionalAttrs (args?useDune) { inherit useDune; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix index 066976e8b4..b6770aa633 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/odd-order/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, mathcomp, version ? null }: -with lib; mkCoqDerivation { pname = "odd-order"; @@ -11,7 +10,7 @@ mkCoqDerivation { releaseRev = v: "mathcomp-odd-order.${v}"; inherit version; - defaultVersion = with versions; switch mathcomp.character.version [ + defaultVersion = with lib.versions; lib.switch mathcomp.character.version [ { case = (range "1.13.0" "1.15.0"); out = "1.14.0"; } { case = (range "1.12.0" "1.14.0"); out = "1.13.0"; } { case = (range "1.10.0" "1.12.0"); out = "1.12.0"; } @@ -27,7 +26,7 @@ mkCoqDerivation { mathcomp.all ]; - meta = { + meta = with lib; { description = "Formal proof of the Odd Order Theorem"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix index 82b6079bb2..e9163c1613 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/paco/default.nix @@ -1,10 +1,10 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "paco"; owner = "snu-sf"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.12" "8.16"; out = "4.1.2"; } { case = range "8.9" "8.13"; out = "4.1.1"; } { case = range "8.6" "8.13"; out = "4.0.2"; } @@ -25,8 +25,8 @@ with lib; mkCoqDerivation { ''; meta = { - homepage = "http://plv.mpi-sws.org/paco/"; + homepage = "https://plv.mpi-sws.org/paco/"; description = "A Coq library implementing parameterized coinduction"; - maintainers = with maintainers; [ jwiegley ptival ]; + maintainers = with lib.maintainers; [ jwiegley ptival ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix index e03f44320c..e6ef7b83c6 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/paramcoq/default.nix @@ -1,13 +1,14 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "paramcoq"; inherit version; - defaultVersion = with versions; switch coq.version [ - { case = range "8.10" "8.16"; out = "1.1.3+coq${coq.coq-version}"; } + defaultVersion = with lib.versions; lib.switch coq.version [ + { case = range "8.10" "8.17"; out = "1.1.3+coq${coq.coq-version}"; } { case = range "8.7" "8.13"; out = "1.1.2+coq${coq.coq-version}"; } ] null; displayVersion = { paramcoq = "..."; }; + release."1.1.3+coq8.17".sha256 = "sha256-m8QGGuwj1lHzDprf4LHgAuzwfoblxtDIHunHBdpmiuM="; release."1.1.3+coq8.16".sha256 = "sha256-K7/8hXH6DwiW7Gw41sgQF8UDAO3c32xBGWQQapzG8Mo="; release."1.1.3+coq8.15".sha256 = "0sl7ihznwz05d2x2v78w1zd4q55c1sgy06vxasbcls4v2pkw53hl"; release."1.1.3+coq8.14".sha256 = "00zqq9dc2p5v0ib1jgizl25xkwxrs9mrlylvy0zvb96dpridjc71"; @@ -24,7 +25,7 @@ with lib; mkCoqDerivation { release."1.1.2+coq8.7".sha256 = "09n0ky7ldb24by7yf5j3hv410h85x50ksilf7qacl7xglj4gy5hj"; releaseRev = v: "v${v}"; mlPlugin = true; - meta = { + meta = with lib; { description = "Coq plugin for parametricity"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix index f764267d77..8a30fbeb96 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/parsec/default.nix @@ -1,6 +1,5 @@ { lib, mkCoqDerivation, coq, ceres, coq-ext-lib, version ? null }: -with lib; mkCoqDerivation { pname = "parsec"; @@ -11,14 +10,14 @@ mkCoqDerivation { releaseRev = (v: "v${v}"); inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = range "8.12" "8.16"; out = "0.1.1"; } { case = range "8.12" "8.13"; out = "0.1.0"; } ] null; release."0.1.1".sha256 = "sha256:1c0l18s68pzd4c8i3jimh2yz0pqm4g38pca4bm7fr18r8xmqf189"; release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr"; - meta = { + meta = with lib; { description = "Library for serialization to S-expressions"; license = licenses.bsd3; maintainers = with maintainers; [ Zimmi48 ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/pocklington/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/pocklington/default.nix index 111bffeca2..a9e0d43a5a 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/pocklington/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/pocklington/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "pocklington"; @@ -9,11 +8,11 @@ mkCoqDerivation { release."8.12.0".sha256 = "sha256-0xBrw9+4g14niYdNqp0nx00fPJoSSnaDSDEaIVpPfjs="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isGe "8.7"; out = "8.12.0"; } ] null; - meta = { + meta = with lib; { description = "Pocklington's criterion for primality in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix index 2d83cbfd88..44e938e16d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/reglang/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, ssreflect, version ? null }: -with lib; mkCoqDerivation { pname = "reglang"; @@ -9,14 +8,14 @@ mkCoqDerivation { release."1.1.2".sha256 = "sha256-SEnMilLNxh6a3oiDNGLaBr8quQ/nO2T9Fwdf/1il2Yk="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "1.1.2"; } ] null; propagatedBuildInputs = [ ssreflect ]; - meta = { + meta = with lib; { description = "Regular Language Representations in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix index d2124d56f3..c8fb6982b8 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/relation-algebra/default.nix @@ -1,12 +1,11 @@ { lib, mkCoqDerivation, coq, aac-tactics, mathcomp, version ? null }: -with lib; mkCoqDerivation { pname = "relation-algebra"; owner = "damien-pous"; releaseRev = v: - if versions.isGe "1.7.6" v + if lib.versions.isGe "1.7.6" v then "v.${v}" else "v${v}"; @@ -20,7 +19,7 @@ mkCoqDerivation { release."1.7.1".sha256 = "sha256-WWVMcR6z8rT4wzZPb8SlaVWGe7NC8gScPqawd7bltQA="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "1.7.8"; } { case = isEq "8.15"; out = "1.7.7"; } { case = isEq "8.14"; out = "1.7.6"; } @@ -35,7 +34,7 @@ mkCoqDerivation { propagatedBuildInputs = [ aac-tactics mathcomp.ssreflect ]; - meta = { + meta = with lib; { description = "Relation algebra library for Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/semantics/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/semantics/default.nix index ecbef5b92f..468be219d0 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/semantics/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/semantics/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { pname = "semantics"; @@ -15,7 +14,7 @@ mkCoqDerivation rec { release."8.6.0".sha256 = "sha256-GltkGQ3tJqUPAbdDkqqvKLLhMOap50XvGaCkjshiNdY="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "8.14.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } @@ -34,7 +33,7 @@ mkCoqDerivation rec { done ''; - meta = { + meta = with lib; { description = "A survey of programming language semantics styles in Coq"; longDescription = '' A survey of semantics styles in Coq, from natural semantics through diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix index e3ec9bfdc3..27641f4f5a 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/serapi/default.nix @@ -17,7 +17,7 @@ in inherit version release; defaultVersion = with versions; - switch coq.version [ + lib.switch coq.version [ { case = isEq "8.16"; out = "8.16.0+0.16.0"; } { case = isEq "8.15"; out = "8.15.0+0.15.0"; } { case = isEq "8.14"; out = "8.14.0+0.14.0"; } diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix index f9fe909d8c..509ce57c5c 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/default.nix @@ -1,11 +1,11 @@ { lib, callPackage, mkCoqDerivation, coq, coq-ext-lib, version ? null }: -with lib; mkCoqDerivation { +mkCoqDerivation { pname = "simple-io"; owner = "Lysxia"; repo = "coq-simple-io"; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.11" "8.16"; out = "1.7.0"; } { case = range "8.7" "8.13"; out = "1.3.0"; } ] null; @@ -21,7 +21,7 @@ with lib; mkCoqDerivation { passthru.tests.HelloWorld = callPackage ./test.nix {}; - meta = { + meta = with lib; { description = "Purely functional IO for Coq"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/test.nix b/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/test.nix index 39db69d21a..255b25efde 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/test.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/simple-io/test.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { pname = "coq-simple-io-test"; inherit (simple-io) src version; - checkInputs = [ coq simple-io ]; + nativeCheckInputs = [ coq simple-io ]; dontConfigure = true; dontBuild = true; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/smpl/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/smpl/default.nix index f03065cf04..2ba755dd42 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/smpl/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/smpl/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { pname = "smpl"; @@ -13,7 +12,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = isEq "8.15"; out = "8.15"; } { case = isEq "8.14"; out = "8.14"; } { case = "8.13.2"; out = "8.13"; } @@ -23,7 +22,7 @@ mkCoqDerivation { mlPlugin = true; - meta = { + meta = with lib; { description = "A Coq plugin providing an extensible tactic similar to first"; maintainers = with maintainers; [ siraben ]; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/default.nix index 89a6abd2b1..49c4348b9a 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, gcc10StdenvCompat, pkgs, mkCoqDerivation, coq, trakt, veriT, zchaff, fetchurl, version ? null }: -with lib; let # version of veriT that works with SMTCoq @@ -23,7 +22,7 @@ mkCoqDerivation { release."2021-09-17".sha256 = "sha256-bF7ES+tXraaAJwVEwAMx3CUESpNlAUerQjr4d2eaGJQ="; inherit version; - defaultVersion = with versions; switch coq.version [ + defaultVersion = with lib.versions; lib.switch coq.version [ { case = isEq "8.13"; out = "2021-09-17"; } ] null; @@ -34,7 +33,7 @@ mkCoqDerivation { # This is meant to ease future troubleshooting of cvc4 build failures passthru = { inherit cvc4; }; - meta = { + meta = with lib; { description = "Communication between Coq and SAT/SMT solvers "; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix index 19b72c4e94..d20b637321 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/stdpp/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation rec { +mkCoqDerivation rec { pname = "stdpp"; inherit version; domain = "gitlab.mpi-sws.org"; owner = "iris"; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "1.8.0"; } { case = range "8.12" "8.14"; out = "1.6.0"; } { case = range "8.11" "8.13"; out = "1.5.0"; } @@ -24,7 +24,7 @@ with lib; mkCoqDerivation rec { fi ''; - meta = { + meta = with lib; { description = "An extended “Standard Library” for Coq"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/tlc/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/tlc/default.nix index 79d3ce2d7a..8ded1abeb1 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/tlc/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/tlc/default.nix @@ -1,11 +1,11 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; (mkCoqDerivation { +(mkCoqDerivation { pname = "tlc"; owner = "charguer"; inherit version; displayVersion = { tlc = false; }; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.13" "8.16"; out = "20211215"; } { case = range "8.12" "8.13"; out = "20210316"; } { case = range "8.10" "8.12"; out = "20200328"; } @@ -16,14 +16,14 @@ with lib; (mkCoqDerivation { release."20200328".sha256 = "16vzild9gni8zhgb3qhmka47f8zagdh03k6nssif7drpim8233lx"; release."20181116".sha256 = "032lrbkxqm9d3fhf6nv1kq2z0mqd3czv3ijlbsjwnfh12xck4vpl"; - meta = { + meta = with lib; { homepage = "http://www.chargueraud.org/softs/tlc/"; description = "A non-constructive library for Coq"; license = licenses.free; maintainers = [ maintainers.vbgl ]; }; }).overrideAttrs (x: - if versionAtLeast x.version "20210316" + if lib.versionAtLeast x.version "20210316" then {} else { installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/topology/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/topology/default.nix index 71849c50ae..de73fbadbf 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/topology/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/topology/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, mathcomp, zorns-lemma, version ? null }: -with lib; mkCoqDerivation rec { pname = "topology"; @@ -15,7 +14,7 @@ mkCoqDerivation rec { release."8.6.0".sha256 = "sha256-eu/dBEFo3y6vnXlJljUD4hds6+qgAPQVvsuspyGHcj8="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } @@ -25,9 +24,9 @@ mkCoqDerivation rec { propagatedBuildInputs = [ zorns-lemma ]; - useDuneifVersion = versions.isGe "9.0"; + useDuneifVersion = lib.versions.isGe "9.0"; - meta = { + meta = with lib; { description = "General topology in Coq"; longDescription = '' This library develops some of the basic concepts and results of diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/trakt/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/trakt/default.nix index f10e69cc4e..8bc7581489 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/trakt/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/trakt/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, coq-elpi, version ? null }: -with lib; mkCoqDerivation { pname = "trakt"; @@ -9,13 +8,13 @@ mkCoqDerivation { release."1.0".sha256 = "sha256-Qhw5fWFYxUFO2kIWWz/og+4fuy9aYG27szfNk3IglhY="; inherit version; - defaultVersion = with versions; switch [ coq.version ] [ + defaultVersion = with lib.versions; lib.switch [ coq.version ] [ { cases = [ (range "8.13" "8.16") ]; out = "1.0"; } ] null; propagatedBuildInputs = [ coq-elpi ]; - meta = { + meta = with lib; { description = "A generic goal preprocessing tool for proof automation tactics in Coq"; maintainers = with maintainers; [ siraben ]; license = licenses.cecill-b; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix index dedb58b593..19696bd81d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix @@ -1,5 +1,4 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; (mkCoqDerivation { pname = "zorns-lemma"; @@ -16,7 +15,7 @@ with lib; release."8.5.0".sha256 = "sha256-mH/v02ObMjbVPYx2H+Jhz+Xp0XRKN67iMAdA1VNFzso="; inherit version; - defaultVersion = with versions; switch coq.coq-version [ + defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = range "8.10" "8.16"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } @@ -25,9 +24,9 @@ with lib; { case = "8.5"; out = "8.5.0"; } ] null; - useDuneifVersion = versions.isGe "9.0"; + useDuneifVersion = lib.versions.isGe "9.0"; - meta = { + meta = with lib; { description = "Development of basic set theory"; longDescription = '' This Coq library develops some basic set theory. The main @@ -37,4 +36,4 @@ with lib; maintainers = with maintainers; [ siraben ]; license = licenses.lgpl21Plus; }; -}).overrideAttrs({version, ...}: if versions.isGe "9.0" version then { repo = "topology"; } else {}) +}).overrideAttrs({version, ...}: if lib.versions.isGe "9.0" version then { repo = "topology"; } else {}) diff --git a/third_party/nixpkgs/pkgs/development/embedded/fpga/apio/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/apio/default.nix index 3b5ad60123..b201ca169d 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/fpga/apio/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/fpga/apio/default.nix @@ -60,7 +60,7 @@ buildPythonApplication rec { tinyprog # needed for upload to TinyFPGA ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/embedded/platformio/chrootenv.nix b/third_party/nixpkgs/pkgs/development/embedded/platformio/chrootenv.nix index 75f9adf0d3..40aa423374 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/platformio/chrootenv.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/platformio/chrootenv.nix @@ -38,7 +38,7 @@ buildFHSUserEnv { mkdir -p $out/lib/udev/rules.d ln -s $out/bin/platformio $out/bin/pio - ln -s ${src}/scripts/99-platformio-udev.rules $out/lib/udev/rules.d/99-platformio-udev.rules + ln -s ${src}/platformio/assets/system/99-platformio-udev.rules $out/lib/udev/rules.d/99-platformio-udev.rules ''; runScript = "platformio"; diff --git a/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix b/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix index a9b6e156b8..61a09e0473 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix @@ -22,7 +22,7 @@ with python3.pkgs; buildPythonApplication rec { substituteInPlace setup.py \ --replace 'uvicorn==%s" % ("0.16.0" if PY36 else "0.19.*")' 'uvicorn>=0.16"' \ - --replace 'starlette==%s" % ("0.19.1" if PY36 else "0.21.*")' 'starlette>=0.19.1,<=0.21"' \ + --replace 'starlette==%s" % ("0.19.1" if PY36 else "0.21.*")' 'starlette>=0.19.1"' \ --replace 'tabulate==%s" % ("0.8.10" if PY36 else "0.9.*")' 'tabulate>=0.8.10,<=0.9"' \ --replace 'wsproto==' 'wsproto>=' ''; @@ -54,7 +54,7 @@ with python3.pkgs; buildPythonApplication rec { export PATH=$PATH:$out/bin ''; - checkInputs = [ + nativeCheckInputs = [ jsondiff pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/embedded/platformio/default.nix b/third_party/nixpkgs/pkgs/development/embedded/platformio/default.nix index 241914fa3e..6fd8592a12 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/platformio/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/platformio/default.nix @@ -3,14 +3,14 @@ let callPackage = newScope self; - version = "6.1.5"; + version = "6.1.6"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "sha256-7Wx3O2zL5Dlbk7rooiHutpN63kAjhuYijgsZru+oaOI="; + sha256 = "sha256-BEeMfdmAWqFbQUu8YKKrookQVgmhfZBqXnzeb2gfhms="; }; self = { diff --git a/third_party/nixpkgs/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch b/third_party/nixpkgs/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch index 1f809822cb..6db8585a55 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch +++ b/third_party/nixpkgs/pkgs/development/embedded/platformio/use-local-spdx-license-list.patch @@ -6,13 +6,13 @@ index 1e5f935a..26d1ac6a 100644 @staticmethod @memoized(expire="1h") def load_spdx_licenses(): -- version = "3.18" +- version = "3.19" - spdx_data_url = ( - "https://raw.githubusercontent.com/spdx/license-list-data/" - "v%s/json/licenses.json" % version - ) - return json.loads(fetch_remote_content(spdx_data_url)) -+ # version = "3.18" ++ # version = "3.19" + # spdx_data_url = ( + # "https://raw.githubusercontent.com/spdx/license-list-data/" + # "v%s/json/licenses.json" % version diff --git a/third_party/nixpkgs/pkgs/development/embedded/svdtools/default.nix b/third_party/nixpkgs/pkgs/development/embedded/svdtools/default.nix index e902d837c9..0da71d1de1 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/svdtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.2.7"; + version = "0.2.8"; src = fetchCrate { inherit version pname; - sha256 = "sha256-pRY9lL04BcZDYeFcdArIp2PcWiCZBurCYpYtYhPqFsg="; + sha256 = "sha256-x0C+1Ld4RImmS6x9l9jQaZ/sEd3iLFmmwOWNfA+xYsk="; }; - cargoSha256 = "sha256-9XymDE9ON11VfZObrMiARmpJay2g2mKEf0l2eojbjL8="; + cargoSha256 = "sha256-U1YiQdfk/SgRicAND0X8KdHKgX7wHnYspWNF270WDrE="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/third_party/nixpkgs/pkgs/development/embedded/xc3sprog/default.nix b/third_party/nixpkgs/pkgs/development/embedded/xc3sprog/default.nix index ead48a0047..393a11f8a4 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/xc3sprog/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/xc3sprog/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; - homepage = "http://xc3sprog.sourceforge.net/"; + homepage = "https://xc3sprog.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix index 1ea76cb237..2bee41af04 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-cairo/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = false; # Cannot find unit-test module from guile-lib - checkInputs = [ guile-lib ]; + nativeCheckInputs = [ guile-lib ]; meta = with lib; { homepage = "https://www.nongnu.org/guile-cairo/"; diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix index dee81f2bae..81febc3171 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-json/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "guile-json"; - version = "4.7.2"; + version = "4.7.3"; src = fetchurl { url = "mirror://savannah/guile-json/${pname}-${version}.tar.gz"; - sha256 = "sha256-lCq37FtAhWeZwMqfuBkhrxf8Q2CuvvHMjLH2rZIg1Rk="; + sha256 = "sha256-OLoEjtKdEvBbMsWy+3pReVxEi0HkA6Kxty/wA1gX84g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix index c4ec4904f9..0ae8424b59 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "guile-sdl2"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "https://files.dthompson.us/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-h0osCURnYTUQFrKw0i7Jd+QCI8piR1NUE2lbxPv87aQ="; + hash = "sha256-V/XrpFrqOxS5mAphtIt2e3ewflK+HdLFEqOmix98p+w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/guile-modules/guile-ssh/default.nix b/third_party/nixpkgs/pkgs/development/guile-modules/guile-ssh/default.nix index 1fb97c7a2a..be082c373a 100644 --- a/third_party/nixpkgs/pkgs/development/guile-modules/guile-ssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/guile-modules/guile-ssh/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "guile-ssh"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "artyom-poptsov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3h4U/h6cVgHTJOyliw1gTYtgzQcatRLX6NrP87JXRc0="; + sha256 = "sha256-BDnLm5Q+69v8JbrfAn0+XMuWzRvCeUB/prfrKnvw5eY="; }; configureFlags = [ "--with-guilesitedir=\${out}/share/guile/site" ]; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index ec9b70f4a0..548110cafc 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -200,9 +200,10 @@ self: super: { # base bound digit = doJailbreak super.digit; - # matterhorn-50200.17.0 won't work with brick >= 0.71 + # matterhorn-50200.17.0 won't work with brick >= 0.71, brick-skylighting >= 1.0 matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: { brick = self.brick_0_70_1; + brick-skylighting = self.brick-skylighting_0_3; })); # 2020-06-05: HACK: does not pass own build suite - `dontCheck` @@ -2328,4 +2329,8 @@ self: super: { # posix-api has had broken tests since 2020 (until at least 2023-01-11) # raehik has a fix pending: https://github.com/andrewthad/posix-api/pull/14 posix-api = dontCheck super.posix-api; + + # bytestring <0.11.0, optparse-applicative <0.13.0 + # https://github.com/kseo/sfnt2woff/issues/1 + sfnt2woff = doJailbreak super.sfnt2woff; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix index 11a6bc1fdf..2c40ee7711 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix @@ -308,6 +308,9 @@ self: super: ({ libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; }) (disableCabalFlag "fixity-th" super.fourmolu); + # https://github.com/NixOS/nixpkgs/issues/149692 + Agda = removeConfigureFlag "-foptimise-heavily" super.Agda; + } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin # tests appear to be failing to link or something: diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index c77a86913f..54994347dd 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -90,10 +90,6 @@ self: super: { # https://github.com/sjakobi/bsb-http-chunked/issues/38 bsb-http-chunked = dontCheck super.bsb-http-chunked; - # need bytestring >= 0.11 which is only bundled with GHC >= 9.2 - regex-rure = doDistribute (markUnbroken super.regex-rure); - jacinda = doDistribute super.jacinda; - # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46 hiedb = dontCheck super.hiedb; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index b654793353..6278c72813 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -104,6 +104,7 @@ in { resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; rope-utf16-splay = doDistribute self.rope-utf16-splay_0_4_0_0; + shake-cabal = doDistribute self.shake-cabal_0_2_2_3; base-orphans = dontCheck super.base-orphans; @@ -201,4 +202,8 @@ in { fourmolu = overrideCabal (drv: { libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ]; }) (disableCabalFlag "fixity-th" super.fourmolu_0_10_1_0); + + # The Haskell library has additional dependencies when compiled with ghc-9.4.x. + X11-xft = addExtraLibraries [pkgs.xorg.libXau pkgs.xorg.libXdmcp pkgs.expat] super.X11-xft; + } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix similarity index 91% rename from third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix rename to third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index a2546c3dc5..b96526640b 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -53,9 +53,7 @@ self: super: { time = null; transformers = null; unix = null; - # GHC only bundles the xhtml library if haddock is enabled, check if this is - # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 - xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1; + xhtml = null; # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 22ce6fd8f9..e1ee3b669e 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -224,6 +224,7 @@ broken-packages: - ascii-string - ascii-vector-avc - asif + - asn1-ber-syntax - asn1-codec - asn1-data - AspectAG @@ -400,7 +401,6 @@ broken-packages: - bindings-wlc - bind-marshal - binembed - - binrep - binsm - bio - BiobaseNewick @@ -472,7 +472,6 @@ broken-packages: - brick-dropdownmenu - brick-filetree - bricks-internal - - brick-skylighting - brillig - brittany - broadcast-chan-tests @@ -512,6 +511,7 @@ broken-packages: - byline - by-other-names - bytearray-parsing + - bytepatch - bytestring-aeson-orphans - bytestring-arbitrary - bytestring-class @@ -1486,6 +1486,7 @@ broken-packages: - fenfire - fernet - FerryCore + - festival - Feval - fez-conf - ffeed @@ -3386,6 +3387,7 @@ broken-packages: - monad-control-aligned - monadcryptorandom - monad-fork + - monadic-bang - monadiccp - monadic-recursion-schemes - monad-introspect @@ -4721,7 +4723,6 @@ broken-packages: - SFML - sfml-audio - sfmt - - sfnt2woff - SG - sgd - SGplus @@ -5824,7 +5825,6 @@ broken-packages: - X11-rm - X11-xdamage - X11-xfixes - - xcffib - xchat-plugin - xcp - x-dsp diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 52ba243cb0..d61ab5200c 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -76,8 +76,6 @@ default-package-overrides: - http-client-restricted < 0.0.5 # Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage - hasql-dynamic-statements < 0.3.1.2 - # Its dependency brick >= 1.0 is not yet in stackage - - brick-skylighting < 1.0 - rope-utf16-splay < 0.4.0.0 # hnix < 0.17 (unreleased) needs hnix-store-* 0.5.* - hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17 @@ -86,6 +84,8 @@ default-package-overrides: - reflex < 0.9.0.0 # reqired by haskell-language-server 1.9.0.0 - implicit-hie < 0.1.3 + # latest version requires Cabal >= 3.8 + - shake-cabal < 0.2.2.3 extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. @@ -101,6 +101,7 @@ extra-packages: - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 - bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9 - brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0 + - brick-skylighting < 1.0 # 2022-08-13: needed by matterhorn-50200.17.0 to match brick - brick == 1.3 # 2022-11-03: needed by swarm 0.2.0.0 - brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8 - cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3 @@ -310,6 +311,7 @@ package-maintainers: - pandoc - paths - postgresql-simple + - purebred-email - reflex-dom - releaser - replace-megaparsec @@ -357,6 +359,10 @@ package-maintainers: - persistent-sqlite - persistent-template - shakespeare + raehik: + - strongweak + - binrep + - bytepatch roberth: - arion-compose - cabal-pkg-config-version-hook diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 99e542eed0..dff7577fed 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 20.5 +# Stackage LTS 20.6 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -87,15 +87,15 @@ default-package-overrides: - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 - ascii ==1.2.4.0 - - ascii-case ==1.0.1.1 - - ascii-char ==1.0.0.16 + - ascii-case ==1.0.1.2 + - ascii-char ==1.0.0.17 - asciidiagram ==1.3.3.3 - - ascii-group ==1.0.0.14 - - ascii-numbers ==1.1.0.0 - - ascii-predicates ==1.0.1.0 + - ascii-group ==1.0.0.15 + - ascii-numbers ==1.1.0.2 + - ascii-predicates ==1.0.1.2 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.13 - - ascii-th ==1.0.0.11 + - ascii-superset ==1.0.1.15 + - ascii-th ==1.0.0.14 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - asn1-types ==0.3.4 @@ -126,11 +126,11 @@ default-package-overrides: - autodocodec ==0.2.0.1 - autodocodec-openapi3 ==0.2.1.1 - autodocodec-schema ==0.1.0.2 - - autodocodec-yaml ==0.2.0.2 + - autodocodec-yaml ==0.2.0.3 - autoexporter ==2.0.0.2 - auto-update ==0.1.6 - avro ==0.6.1.2 - - aws-cloudfront-signed-cookies ==0.2.0.11 + - aws-cloudfront-signed-cookies ==0.2.0.12 - aws-xray-client ==0.1.0.2 - aws-xray-client-persistent ==0.1.0.5 - aws-xray-client-wai ==0.1.0.2 @@ -379,7 +379,7 @@ default-package-overrides: - colour ==2.3.6 - columnar ==1.0.0.0 - combinatorial ==0.1.0.1 - - comfort-array ==0.5.1.1 + - comfort-array ==0.5.2 - comfort-array-shape ==0.0 - comfort-fftw ==0.0 - comfort-graph ==0.0.3.2 @@ -445,7 +445,7 @@ default-package-overrides: - control-monad-free ==0.6.2 - control-monad-omega ==0.3.2 - convertible ==1.1.1.1 - - cookie ==0.4.5 + - cookie ==0.4.6 - copr-api ==0.1.0 - core-data ==0.3.8.0 - core-program ==0.6.1.1 @@ -505,7 +505,7 @@ default-package-overrides: - cursor-gen ==0.4.0.0 - cyclotomic ==1.1.1 - czipwith ==1.0.1.4 - - d10 ==1.0.1.0 + - d10 ==1.0.1.2 - data-accessor ==0.2.3 - data-accessor-mtl ==0.2.0.4 - data-accessor-transformers ==0.2.1.7 @@ -638,6 +638,7 @@ default-package-overrides: - domain-optics ==0.1.0.3 - do-notation ==0.1.0.2 - dot ==0.3 + - dotenv ==0.10.0.0 - dotgen ==0.4.3 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.4.2 @@ -1023,7 +1024,7 @@ default-package-overrides: - harp ==0.4.3.5 - HasBigDecimal ==0.2.0.0 - hasbolt ==0.1.6.2 - - hashable ==1.4.1.0 + - hashable ==1.4.2.0 - hashids ==1.0.2.7 - hashmap ==1.3.3 - hashtables ==1.3.1 @@ -1032,7 +1033,7 @@ default-package-overrides: - haskell-gi-base ==0.26.3 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1.1 - - HaskellNet ==0.6.0.1 + - HaskellNet ==0.6.0.2 - HaskellNet-SSL ==0.3.4.4 - haskell-src ==1.0.4 - haskell-src-exts ==1.23.1 @@ -1056,7 +1057,7 @@ default-package-overrides: - hasql-transaction ==1.0.1.2 - has-transformers ==0.1.0.4 - hasty-hamiltonian ==1.3.4 - - HaTeX ==3.22.3.1 + - HaTeX ==3.22.3.2 - HaXml ==1.25.12 - haxr ==3000.11.4.1 - HCodecs ==0.5.2 @@ -1083,7 +1084,7 @@ default-package-overrides: - hexml ==0.3.4 - hexml-lens ==0.2.2 - hexpat ==0.20.13 - - hex-text ==0.1.0.7 + - hex-text ==0.1.0.8 - hformat ==0.3.3.1 - hfsevents ==0.1.6 - hgeometry ==0.14 @@ -1163,7 +1164,7 @@ default-package-overrides: - hslua-module-doclayout ==1.0.4 - hslua-module-path ==1.0.3 - hslua-module-system ==1.0.2 - - hslua-module-text ==1.0.2 + - hslua-module-text ==1.0.3.1 - hslua-module-version ==1.0.3 - hslua-objectorientation ==2.2.1 - hslua-packaging ==2.2.1 @@ -1530,7 +1531,7 @@ default-package-overrides: - markdown-unlit ==0.5.1 - markov-chain ==0.0.3.4 - markov-chain-usage-model ==0.0.0 - - mason ==0.2.5 + - mason ==0.2.6 - massiv ==1.0.3.0 - massiv-io ==1.0.0.1 - massiv-persist ==1.0.0.3 @@ -1555,7 +1556,7 @@ default-package-overrides: - mega-sdist ==0.4.2.1 - membership ==0.0.1 - memcache ==0.3.0.1 - - memfd ==1.0.1.0 + - memfd ==1.0.1.1 - memory ==0.17.0 - MemoTrie ==0.6.10 - mergeful ==0.3.0.0 @@ -1705,7 +1706,7 @@ default-package-overrides: - netlib-carray ==0.1 - netlib-comfort-array ==0.0.0.2 - netlib-ffi ==0.1.1 - - net-mqtt ==0.8.2.4 + - net-mqtt ==0.8.2.5 - net-mqtt-lens ==0.1.1.0 - netpbm ==1.0.4 - netrc ==0.2.0.0 @@ -1930,7 +1931,7 @@ default-package-overrides: - pointedlist ==0.6.1 - pointless-fun ==1.1.0.8 - poll ==0.0.0.2 - - poly ==0.5.0.0 + - poly ==0.5.1.0 - poly-arity ==0.1.0 - polynomials-bernstein ==1.1.2 - polyparse ==1.13 @@ -1952,7 +1953,7 @@ default-package-overrides: - possibly ==1.0.0.0 - postgres-options ==0.2.0.0 - postgresql-binary ==0.13.1 - - postgresql-libpq ==0.9.4.3 + - postgresql-libpq ==0.9.5.0 - postgresql-libpq-notify ==0.2.0.0 - postgresql-migration ==0.2.1.6 - postgresql-query ==3.10.0 @@ -2200,8 +2201,8 @@ default-package-overrides: - safe-money ==0.9.1 - SafeSemaphore ==0.10.1 - salve ==2.0.0.1 - - sample-frame ==0.0.3 - - sample-frame-np ==0.0.4.1 + - sample-frame ==0.0.4 + - sample-frame-np ==0.0.5 - sampling ==0.3.5 - sandi ==0.5 - sandwich ==0.1.2.0 @@ -2483,7 +2484,7 @@ default-package-overrides: - SVGFonts ==1.8.0.1 - svg-tree ==0.6.2.4 - swagger2 ==2.8.6 - - swish ==0.10.2.0 + - swish ==0.10.3.0 - syb ==0.7.2.2 - syb-with-class ==0.6.1.14 - sydtest ==0.13.0.0 @@ -2507,7 +2508,7 @@ default-package-overrides: - symbol ==0.2.4 - symengine ==0.1.2.0 - symmetry-operations-symbols ==0.0.2.1 - - synthesizer-core ==0.8.2.1 + - synthesizer-core ==0.8.3 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - systemd ==2.3.0 @@ -2602,7 +2603,7 @@ default-package-overrides: - text-rope ==0.2 - text-short ==0.1.5 - text-show ==3.10 - - text-show-instances ==3.9.3 + - text-show-instances ==3.9.4 - text-zipper ==0.12 - tfp ==1.0.2 - tf-random ==0.5 @@ -2739,7 +2740,7 @@ default-package-overrides: - unconstrained ==0.1.0.2 - unexceptionalio ==0.5.1 - unexceptionalio-trans ==0.5.1 - - unfork ==1.0.0.0 + - unfork ==1.0.0.1 - unicode ==0.0.1.1 - unicode-collation ==0.1.3.3 - unicode-data ==0.3.1 @@ -2900,7 +2901,7 @@ default-package-overrides: - Win32 ==2.12.0.1 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==1.1.5.0 + - witch ==1.1.6.0 with-compiler: ghc-9.2.5 - withdependencies ==0.3.0 - witherable ==0.4.2 diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 70a3c7525d..136fe881b2 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -874,7 +874,6 @@ dont-distribute-packages: - bv-sized - bv-sized-lens - bytable - - bytepatch - bytestring-builder-varword - bytestring-read - ca @@ -1029,7 +1028,6 @@ dont-distribute-packages: - comark - comfort-array - comfort-array-shape - - comfort-array_0_5_2 - comfort-fftw - comfort-glpk - commsec @@ -2731,7 +2729,6 @@ dont-distribute-packages: - mathblog - mathlink - matsuri - - matterhorn - maxent - maxent-learner-hw-gui - maxsharing @@ -3820,7 +3817,6 @@ dont-distribute-packages: - synthesizer - synthesizer-alsa - synthesizer-core - - synthesizer-core_0_8_3 - synthesizer-dimensional - synthesizer-filter - synthesizer-llvm diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix index 8b3020f886..eae0337eff 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -16,7 +16,9 @@ let # Add all dependencies in buildInputs including propagated ones to # STACK_IN_NIX_EXTRA_ARGS. - stackHook = makeSetupHook {} ./stack-hook.sh; + stackHook = makeSetupHook { + name = "stack-hook"; + } ./stack-hook.sh; in stdenv.mkDerivation (args // { diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 175ffe274d..3fb5c3e88a 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -9999,26 +9999,6 @@ self: { }) {}; "HaTeX" = callPackage - ({ mkDerivation, base, bibtex, bytestring, containers, hashable - , matrix, parsec, prettyprinter, QuickCheck, tasty - , tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "HaTeX"; - version = "3.22.3.1"; - sha256 = "0vgyixd8j3nzpy8s04cy3q7gj2gfblba2z0ppr58rdm8qgj16j5c"; - libraryHaskellDepends = [ - base bibtex bytestring containers hashable matrix parsec - prettyprinter QuickCheck text transformers - ]; - testHaskellDepends = [ - base parsec QuickCheck tasty tasty-quickcheck text - ]; - description = "The Haskell LaTeX library"; - license = lib.licenses.bsd3; - }) {}; - - "HaTeX_3_22_3_2" = callPackage ({ mkDerivation, base, bibtex, bytestring, containers, hashable , matrix, parsec, prettyprinter, QuickCheck, tasty , tasty-quickcheck, text, transformers @@ -10036,7 +10016,6 @@ self: { ]; description = "The Haskell LaTeX library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "HaTeX-meta" = callPackage @@ -10486,24 +10465,6 @@ self: { }) {}; "HaskellNet" = callPackage - ({ mkDerivation, array, base, base64, bytestring, cryptohash-md5 - , mime-mail, mtl, network, network-bsd, old-time, pretty, text - }: - mkDerivation { - pname = "HaskellNet"; - version = "0.6.0.1"; - sha256 = "08rwi28q46md2d25l1h6s6hdqf8c2c47is5w5vyydbqx6pmfdc73"; - revision = "1"; - editedCabalFile = "0c5ixp7nl0h9nixr3g079wvjvs7j6hra2va5hnj93bsjbcm350k3"; - libraryHaskellDepends = [ - array base base64 bytestring cryptohash-md5 mime-mail mtl network - network-bsd old-time pretty text - ]; - description = "Client support for POP3, SMTP, and IMAP"; - license = lib.licenses.bsd3; - }) {}; - - "HaskellNet_0_6_0_2" = callPackage ({ mkDerivation, array, base, base64, bytestring, cryptohash-md5 , mime-mail, mtl, network, network-bsd, old-time, pretty, text }: @@ -10517,7 +10478,6 @@ self: { ]; description = "Client support for POP3, SMTP, and IMAP"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "HaskellNet-SSL" = callPackage @@ -14276,8 +14236,8 @@ self: { pname = "MonadRandom"; version = "0.5.3"; sha256 = "17qaw1gg42p9v6f87dj5vih7l88lddbyd8880ananj8avanls617"; - revision = "2"; - editedCabalFile = "1diy29if7w1c9ckc465mrrb52fm0zmd8zzym1h5ryh5a58qafwhr"; + revision = "3"; + editedCabalFile = "0317qhagxgn41ql1w7isnw4jqddnw394wglqahm3c569pbr3lmdv"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -14293,8 +14253,8 @@ self: { pname = "MonadRandom"; version = "0.6"; sha256 = "0i6h9s2iqj71q06i9al3s2akmdjjx16h015qb81nhgjwi4q8cf69"; - revision = "1"; - editedCabalFile = "1swvjlsazh6wj1k8yj7ijarmw1sfmk9fv53h1hbfqcxva4gbhnkp"; + revision = "2"; + editedCabalFile = "0pkfprfr4386s2a67dk0kazn2x3m2nfr3w5r32y75rb2aa25dbmy"; libraryHaskellDepends = [ base mtl primitive random transformers transformers-compat ]; @@ -34234,8 +34194,8 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.7.4"; - sha256 = "1yin826p57pmabv763l9igz6lk6c43f0y6cg2f5lqi6q1662x03w"; + version = "1.7.5"; + sha256 = "1rmxahc4fp62c00k9j4p3952wl2cqny9adlhd7l1h4z3wml7mwsv"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary @@ -35190,18 +35150,6 @@ self: { }) {}; "ascii-case" = callPackage - ({ mkDerivation, ascii-char, base, hashable, hspec }: - mkDerivation { - pname = "ascii-case"; - version = "1.0.1.1"; - sha256 = "1vsqjxh8mhzd960p30lbzakfa3acfqpk646a61jhn0j3yv7lq7p3"; - libraryHaskellDepends = [ ascii-char base hashable ]; - testHaskellDepends = [ ascii-char base hspec ]; - description = "ASCII letter case"; - license = lib.licenses.asl20; - }) {}; - - "ascii-case_1_0_1_2" = callPackage ({ mkDerivation, ascii-char, base, hashable, hspec }: mkDerivation { pname = "ascii-case"; @@ -35211,7 +35159,6 @@ self: { testHaskellDepends = [ ascii-char base hspec ]; description = "ASCII letter case"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-caseless" = callPackage @@ -35232,8 +35179,8 @@ self: { ({ mkDerivation, base, hashable, hspec }: mkDerivation { pname = "ascii-char"; - version = "1.0.0.16"; - sha256 = "06iig5p15ip0wpg330dq8kclq7g7j2xkrkk0dbl3z509d44mg049"; + version = "1.0.0.17"; + sha256 = "1562gkfvrcjygs9qpyswsk25d4m2pxblmmbb0hw8jsaml2jwsyss"; libraryHaskellDepends = [ base hashable ]; testHaskellDepends = [ base hspec ]; description = "A Char type representing an ASCII character"; @@ -35283,20 +35230,6 @@ self: { }) {}; "ascii-group" = callPackage - ({ mkDerivation, ascii-char, base, hashable, hedgehog }: - mkDerivation { - pname = "ascii-group"; - version = "1.0.0.14"; - sha256 = "0rk3lvs4b6d4cfzb5zc87f42wdmziprpfd4fww5r68ry3ccyn1ps"; - revision = "1"; - editedCabalFile = "0iwf48cq67qzgw4ih6532yxl03bpnzrhz68y0yfk87r1y3hsdxfx"; - libraryHaskellDepends = [ ascii-char base hashable ]; - testHaskellDepends = [ ascii-char base hedgehog ]; - description = "ASCII character groups"; - license = lib.licenses.asl20; - }) {}; - - "ascii-group_1_0_0_15" = callPackage ({ mkDerivation, ascii-char, base, hashable, hedgehog }: mkDerivation { pname = "ascii-group"; @@ -35306,7 +35239,6 @@ self: { testHaskellDepends = [ ascii-char base hedgehog ]; description = "ASCII character groups"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-holidays" = callPackage @@ -35326,27 +35258,6 @@ self: { }) {}; "ascii-numbers" = callPackage - ({ mkDerivation, ascii-case, ascii-char, ascii-superset, base - , bytestring, hashable, hedgehog, invert, text - }: - mkDerivation { - pname = "ascii-numbers"; - version = "1.1.0.0"; - sha256 = "041qyhgksqchj3x09fbirxba7s31aicaqnk8185g2l70zgxjz6iv"; - revision = "2"; - editedCabalFile = "0nw6iy42ql53gl4i74ilmdar5r4l2wbn5ihv1yqbqm7rm9bqda8p"; - libraryHaskellDepends = [ - ascii-case ascii-char ascii-superset base bytestring hashable text - ]; - testHaskellDepends = [ - ascii-case ascii-char ascii-superset base bytestring hashable - hedgehog invert text - ]; - description = "ASCII representations of numbers"; - license = lib.licenses.asl20; - }) {}; - - "ascii-numbers_1_1_0_2" = callPackage ({ mkDerivation, ascii-case, ascii-char, ascii-superset, base , bytestring, hashable, hedgehog, invert, text }: @@ -35365,24 +35276,9 @@ self: { ]; description = "ASCII representations of numbers"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-predicates" = callPackage - ({ mkDerivation, ascii-char, base, hedgehog }: - mkDerivation { - pname = "ascii-predicates"; - version = "1.0.1.0"; - sha256 = "1zqlly878qlrkjw2m4mgs4cgw6xspn0alx6xnvnrp1r2b412ykyn"; - revision = "2"; - editedCabalFile = "15jb8yq55dwwbbq0k0vzcznsk4xvxylm61i2jspyhjhgzq9w34ik"; - libraryHaskellDepends = [ ascii-char base ]; - testHaskellDepends = [ ascii-char base hedgehog ]; - description = "Various categorizations of ASCII characters"; - license = lib.licenses.asl20; - }) {}; - - "ascii-predicates_1_0_1_2" = callPackage ({ mkDerivation, ascii-char, base, hedgehog }: mkDerivation { pname = "ascii-predicates"; @@ -35392,7 +35288,6 @@ self: { testHaskellDepends = [ ascii-char base hedgehog ]; description = "Various categorizations of ASCII characters"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-progress" = callPackage @@ -35445,10 +35340,8 @@ self: { }: mkDerivation { pname = "ascii-superset"; - version = "1.0.1.13"; - sha256 = "0pf1awrx0bfpgyc96r1ycybgpy801iqxr8qf3vp9pvbnfava1v8s"; - revision = "2"; - editedCabalFile = "1551j1x284zdv9w233ma5r15bwmwizh5zi2ifcsp86d09c38505n"; + version = "1.0.1.15"; + sha256 = "0jq2kfc6mmpavljrv89xqwn0iskf3z9l3m3hjcm3bw03wlyv6clp"; libraryHaskellDepends = [ ascii-char base bytestring hashable text ]; @@ -35495,19 +35388,19 @@ self: { "ascii-th" = callPackage ({ mkDerivation, ascii-char, ascii-superset, base, bytestring - , hedgehog, template-haskell, text + , hspec, template-haskell, text }: mkDerivation { pname = "ascii-th"; - version = "1.0.0.11"; - sha256 = "14a50pxmri17nch7bcmrdflrqq5qq2z5012aiqh260iq4qsw74xq"; - revision = "1"; - editedCabalFile = "037i6n02c9xsxj5zz1nxihwgzhksbzjzd0s2a2m8ndsq3a5hgc61"; + version = "1.0.0.14"; + sha256 = "0wm0n7wr7bypdqs1cpgkcbmcwgz84lm7la2xkqflwc2kn0wr839h"; + revision = "2"; + editedCabalFile = "0a74410lmbd11j6bfh5x1rk3gyp7sybl7lqfxkkz5qws413ijli6"; libraryHaskellDepends = [ ascii-char ascii-superset base template-haskell ]; testHaskellDepends = [ - ascii-char ascii-superset base bytestring hedgehog text + ascii-char ascii-superset base bytestring hspec text ]; description = "Template Haskell support for ASCII"; license = lib.licenses.asl20; @@ -35706,6 +35599,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "asn1-ber-syntax" = callPackage + ({ mkDerivation, array-chunks, base, base16, bytebuild, byteslice + , bytesmith, bytestring, contiguous, filepath, natural-arithmetic + , pretty-simple, primitive, QuickCheck, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text-short, vector + }: + mkDerivation { + pname = "asn1-ber-syntax"; + version = "0.1.0.0"; + sha256 = "0rdn482cdbx149m1048lk894yhdh12ac8iw0d9wmx245627j4cvd"; + libraryHaskellDepends = [ + array-chunks base bytebuild byteslice bytesmith bytestring + contiguous natural-arithmetic primitive text-short vector + ]; + testHaskellDepends = [ + base base16 byteslice bytestring filepath pretty-simple primitive + QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck + text-short + ]; + description = "ASN.1 BER Encode and Decode"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "asn1-codec" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , containers, contravariant, cryptonite, directory, hashable, HUnit @@ -37350,6 +37268,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "attoparsec-run" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, text }: + mkDerivation { + pname = "attoparsec-run"; + version = "0.0.1.0"; + sha256 = "0sdia624pxc0xj7lvai0hw41zjnkfz2da3vpc9mlhldiwzdwa815"; + libraryHaskellDepends = [ attoparsec base bytestring text ]; + description = "Conveniently run Attoparsec parsers"; + license = lib.licenses.asl20; + }) {}; + "attoparsec-text" = callPackage ({ mkDerivation, array, attoparsec, base, containers, text }: mkDerivation { @@ -37748,6 +37677,18 @@ self: { broken = true; }) {}; + "auto-lift-classes" = callPackage + ({ mkDerivation, base, reflection }: + mkDerivation { + pname = "auto-lift-classes"; + version = "1"; + sha256 = "02809ihgynxc20riycghgiw016xpgqh7234bs8m1ilvr7hnnwpr1"; + libraryHaskellDepends = [ base reflection ]; + testHaskellDepends = [ base ]; + description = "Deriving (Show|Read)(1|2)"; + license = lib.licenses.bsd3; + }) {}; + "auto-update" = callPackage ({ mkDerivation, base, exceptions, hspec, HUnit, retry }: mkDerivation { @@ -37866,24 +37807,6 @@ self: { }) {}; "autodocodec-yaml" = callPackage - ({ mkDerivation, autodocodec, autodocodec-schema, base, bytestring - , containers, path, path-io, safe-coloured-text, scientific, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "autodocodec-yaml"; - version = "0.2.0.2"; - sha256 = "164nrmpxrwyr49f0gczi2sixzrs3sv2pn8j293s9avw684aq2prx"; - libraryHaskellDepends = [ - autodocodec autodocodec-schema base bytestring containers path - path-io safe-coloured-text scientific text unordered-containers - vector yaml - ]; - description = "Autodocodec interpreters for yaml"; - license = lib.licenses.mit; - }) {}; - - "autodocodec-yaml_0_2_0_3" = callPackage ({ mkDerivation, autodocodec, autodocodec-schema, base, bytestring , containers, path, path-io, safe-coloured-text, scientific, text , unordered-containers, vector, yaml @@ -37899,7 +37822,6 @@ self: { ]; description = "Autodocodec interpreters for yaml"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "autoexporter" = callPackage @@ -38531,32 +38453,6 @@ self: { }) {}; "aws-cloudfront-signed-cookies" = callPackage - ({ mkDerivation, aeson, aeson-pretty, asn1-encoding, asn1-types - , base, base64-bytestring, bytestring, cookie, cryptonite, hedgehog - , lens, lens-aeson, neat-interpolation, optparse-applicative, pem - , text, time, vector - }: - mkDerivation { - pname = "aws-cloudfront-signed-cookies"; - version = "0.2.0.11"; - sha256 = "018a3q443h19pbcc178ns7zdmsdd3pz8ww3yfixrhr4jfghws3r9"; - revision = "4"; - editedCabalFile = "1rkwa74h6kwpypr7z0fjv8l83n06b27zan1fxgpzsdrhq6d700vj"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty asn1-encoding asn1-types base base64-bytestring - bytestring cookie cryptonite lens lens-aeson optparse-applicative - pem text time vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hedgehog neat-interpolation ]; - description = "Generate signed cookies for AWS CloudFront"; - license = lib.licenses.mit; - mainProgram = "aws-cloudfront-signed-cookies"; - }) {}; - - "aws-cloudfront-signed-cookies_0_2_0_12" = callPackage ({ mkDerivation, aeson, aeson-pretty, asn1-encoding, asn1-types , base, base64-bytestring, bytestring, cookie, cryptonite, hedgehog , lens, lens-aeson, neat-interpolation, optparse-applicative, pem @@ -38577,7 +38473,6 @@ self: { testHaskellDepends = [ base hedgehog neat-interpolation ]; description = "Generate signed cookies for AWS CloudFront"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "aws-cloudfront-signed-cookies"; }) {}; @@ -43243,6 +43138,25 @@ self: { license = lib.licenses.mit; }) {}; + "binary-parser_0_5_7_3" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, mtl, QuickCheck + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + , transformers + }: + mkDerivation { + pname = "binary-parser"; + version = "0.5.7.3"; + sha256 = "1l739h7aixw6dlwbblk7g2cablyn6265715mwywwjq7wb73va1vd"; + libraryHaskellDepends = [ base bytestring mtl text transformers ]; + testHaskellDepends = [ + base base-prelude bytestring mtl QuickCheck quickcheck-instances + tasty tasty-hunit tasty-quickcheck text transformers + ]; + description = "An efficient but limited parser API specialised to bytestrings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "binary-parsers" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-lexing, case-insensitive, criterion, deepseq @@ -44440,6 +44354,8 @@ self: { pname = "binrep"; version = "0.3.1"; sha256 = "01adzragxiick3l2q4cm0x1xd2pmrxw9xl8m39ysk9l8d15b0n4n"; + revision = "1"; + editedCabalFile = "17l5x2vpdwdp6x14n1wayh6751cpsxsywj205n94khnm1cgcfp1a"; libraryHaskellDepends = [ aeson base bytestring either flatparse mason megaparsec refined strongweak text text-icu vector vector-sized @@ -44452,8 +44368,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Encode precise binary representations directly in types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = [ lib.maintainers.raehik ]; }) {}; "bins" = callPackage @@ -46669,20 +46584,19 @@ self: { "blockfrost-api" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default - , data-default-class, deriving-aeson, hspec, lens, QuickCheck - , quickcheck-instances, raw-strings-qq, safe-money, servant - , servant-docs, servant-multipart-api, tasty, tasty-discover - , tasty-hspec, tasty-hunit, template-haskell, text, time, vector + , data-default-class, deriving-aeson, hspec, lens, raw-strings-qq + , safe-money, servant, servant-docs, servant-multipart-api, tasty + , tasty-discover, tasty-hspec, tasty-hunit, template-haskell, text + , time, vector }: mkDerivation { pname = "blockfrost-api"; - version = "0.7.1.0"; - sha256 = "0dy2xspnmy9487zgjaws250kp5qnip3ir8qwnn57ah92h3z1w0mj"; + version = "0.8.0.0"; + sha256 = "030q47qxk8hzrff1dz0m7409kg3a7fg978c0776dw1l0bljk0v0a"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deriving-aeson - lens QuickCheck quickcheck-instances safe-money servant - servant-docs servant-multipart-api template-haskell text time - vector + lens safe-money servant servant-docs servant-multipart-api + template-haskell text time vector ]; testHaskellDepends = [ aeson base bytestring containers data-default hspec raw-strings-qq @@ -46697,12 +46611,12 @@ self: { ({ mkDerivation, base, blockfrost-api, blockfrost-client-core , bytestring, data-default, directory, filepath, hspec, mtl , servant, servant-client, servant-client-core, tasty - , tasty-discover, tasty-hspec, tasty-hunit, tasty-quickcheck, text + , tasty-discover, tasty-hspec, tasty-hunit, text }: mkDerivation { pname = "blockfrost-client"; - version = "0.7.1.0"; - sha256 = "1cr3zb69hradfc02di523vhykp0y8v8mpyzc37xw8i3phrgasw57"; + version = "0.7.1.1"; + sha256 = "1k795lar667y5ai484cmrv5cvzdcca165cgvai9234b721by80jx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46710,9 +46624,7 @@ self: { directory filepath mtl servant servant-client servant-client-core text ]; - testHaskellDepends = [ - base hspec tasty tasty-hspec tasty-hunit tasty-quickcheck - ]; + testHaskellDepends = [ base hspec tasty tasty-hspec tasty-hunit ]; testToolDepends = [ tasty-discover ]; description = "blockfrost.io basic client"; license = lib.licenses.asl20; @@ -48781,7 +48693,7 @@ self: { mainProgram = "mywork-example"; }) {}; - "brick-skylighting" = callPackage + "brick-skylighting_0_3" = callPackage ({ mkDerivation, base, brick, containers, skylighting-core, text , vty }: @@ -48797,10 +48709,9 @@ self: { description = "Show syntax-highlighted text in your Brick UI"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; - "brick-skylighting_1_0" = callPackage + "brick-skylighting" = callPackage ({ mkDerivation, base, brick, containers, skylighting-core, text , vty }: @@ -48815,8 +48726,6 @@ self: { ]; description = "Show syntax-highlighted text in your Brick UI"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "bricks" = callPackage @@ -50726,6 +50635,8 @@ self: { license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; mainProgram = "bytepatch"; + maintainers = [ lib.maintainers.raehik ]; + broken = true; }) {}; "bytes" = callPackage @@ -51809,6 +51720,18 @@ self: { license = lib.licenses.agpl3Only; }) {}; + "cabal-appimage_0_4_0_0" = callPackage + ({ mkDerivation, base, Cabal, filepath }: + mkDerivation { + pname = "cabal-appimage"; + version = "0.4.0.0"; + sha256 = "1ws5alrffpzr6yikwsq6yvazdqbclbsa509rc4csc7dmka8xc4dp"; + libraryHaskellDepends = [ base Cabal filepath ]; + description = "Cabal support for creating AppImage applications"; + license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "cabal-audit" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, HTTP , optparse-applicative @@ -55729,9 +55652,7 @@ self: { testHaskellDepends = [ base bytestring primitive text ]; description = "Portable CRC-32C"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {primitive-slice = null;}; + }) {}; "caster" = callPackage ({ mkDerivation, base, bytestring, directory, fast-builder, mtl @@ -61860,8 +61781,8 @@ self: { }: mkDerivation { pname = "co-log-json"; - version = "0.0.1.0"; - sha256 = "1ap62gq3s08fif96jwssp7aj6kldsiwf2qx0f5yffl3zna4h6j2p"; + version = "0.1.0.0"; + sha256 = "0212dcaw4anjn569a8gpv30k09b9lk99r70bbsh7kb8hb268rk83"; libraryHaskellDepends = [ aeson base bytestring co-log-core containers string-conv text ]; @@ -63376,30 +63297,6 @@ self: { }) {}; "comfort-array" = callPackage - ({ mkDerivation, base, ChasingBottoms, containers, deepseq - , doctest-exitcode-stdio, doctest-lib, guarded-allocation - , non-empty, prelude-compat, primitive, QuickCheck, semigroups - , storable-record, storablevector, tagged, transformers, utility-ht - }: - mkDerivation { - pname = "comfort-array"; - version = "0.5.1.1"; - sha256 = "07rajrpp495g17naywybkrydd67ixiav5g8rayavwabvyrybnmgy"; - libraryHaskellDepends = [ - base containers deepseq guarded-allocation non-empty prelude-compat - primitive QuickCheck semigroups storable-record storablevector - tagged transformers utility-ht - ]; - testHaskellDepends = [ - base ChasingBottoms containers doctest-exitcode-stdio doctest-lib - QuickCheck tagged - ]; - description = "Arrays where the index type is a function of the shape type"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - - "comfort-array_0_5_2" = callPackage ({ mkDerivation, base, ChasingBottoms, containers, deepseq , doctest-exitcode-stdio, doctest-lib, guarded-allocation , non-empty, prelude-compat, primitive, QuickCheck, semigroups @@ -65541,6 +65438,8 @@ self: { pname = "concurrent-output"; version = "1.10.16"; sha256 = "0l4k0bkq5bddqraf14g3ngyzwff17f3ngg4axlilcl3zf3c4bamh"; + revision = "1"; + editedCabalFile = "0ak0nnfznsvq3vs8czsnlrw586hw4hj3299y75p7rhqi5jyvi932"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions process stm terminal-size text transformers unix @@ -65549,6 +65448,23 @@ self: { license = lib.licenses.bsd2; }) {}; + "concurrent-output_1_10_17" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix + }: + mkDerivation { + pname = "concurrent-output"; + version = "1.10.17"; + sha256 = "12dmpjdiv3y1jnljvsbx258plzjvsjnizn25csmy7w4scfbrjl0b"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix + ]; + description = "Ungarble output from several threads or commands"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "concurrent-resource-map" = callPackage ({ mkDerivation, base, containers, random, stm }: mkDerivation { @@ -68609,26 +68525,6 @@ self: { }) {}; "cookie" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, deepseq - , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text - , time - }: - mkDerivation { - pname = "cookie"; - version = "0.4.5"; - sha256 = "10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh"; - libraryHaskellDepends = [ - base bytestring data-default-class deepseq text time - ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck - text time - ]; - description = "HTTP cookie parsing and rendering"; - license = lib.licenses.mit; - }) {}; - - "cookie_0_4_6" = callPackage ({ mkDerivation, base, bytestring, data-default-class, deepseq , HUnit, QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text , time @@ -68646,7 +68542,6 @@ self: { ]; description = "HTTP cookie parsing and rendering"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "cookies" = callPackage @@ -73116,6 +73011,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "custom-interpolation" = callPackage + ({ mkDerivation, base, data-default-class, haskell-src-meta, mtl + , parsec, template-haskell + }: + mkDerivation { + pname = "custom-interpolation"; + version = "0.1.0.1"; + sha256 = "158ljlw17486n46p5vhbmsn8y1c4zs7i7piwhd6mjigzhv5hr4vd"; + libraryHaskellDepends = [ + base data-default-class haskell-src-meta mtl parsec + template-haskell + ]; + testHaskellDepends = [ base template-haskell ]; + description = "Customizable string interpolation quasiquoters"; + license = lib.licenses.bsd3; + }) {}; + "custom-prelude" = callPackage ({ mkDerivation, base, basic-prelude, monad-loops }: mkDerivation { @@ -73337,21 +73249,6 @@ self: { }) {}; "d10" = callPackage - ({ mkDerivation, base, hashable, hedgehog, template-haskell }: - mkDerivation { - pname = "d10"; - version = "1.0.1.0"; - sha256 = "0494hnk99nski7xsas06kbskvi4m9k7h5hizn1w8034xc34n0ppg"; - libraryHaskellDepends = [ - base hashable hedgehog template-haskell - ]; - testHaskellDepends = [ base hashable hedgehog template-haskell ]; - doHaddock = false; - description = "Digits 0-9"; - license = lib.licenses.mit; - }) {}; - - "d10_1_0_1_2" = callPackage ({ mkDerivation, base, hashable, hedgehog, template-haskell }: mkDerivation { pname = "d10"; @@ -73364,7 +73261,6 @@ self: { doHaddock = false; description = "Digits 0-9"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "d3d11binding" = callPackage @@ -74949,6 +74845,8 @@ self: { pname = "data-functor-logistic"; version = "0.0"; sha256 = "0k2r4jpm7sa3hgd6i08sg9xbgjzkgzx44z5ai5zpw32b7pqr9xqm"; + revision = "1"; + editedCabalFile = "135950pg0gxqhzmvzq9lmvvy5qnsd3q8963fslasgj01bixb3k0f"; libraryHaskellDepends = [ base distributive ]; description = "Updatable analogue of Distributive functors"; license = lib.licenses.bsd3; @@ -78256,8 +78154,8 @@ self: { }: mkDerivation { pname = "dep-t"; - version = "0.6.5.0"; - sha256 = "19jhxcmh6qf3nhixjjp7sqcpn4jpl6cdnaccvfn8375h83v1dbp9"; + version = "0.6.6.0"; + sha256 = "1r3pd00jlbqc8z61a1s5iwzp9y1lbqvs55sc9f495fg8m35zxcqz"; libraryHaskellDepends = [ base mtl transformers unliftio-core ]; testHaskellDepends = [ aeson barbies base bytestring containers doctest mtl rank2classes @@ -78956,16 +78854,17 @@ self: { }) {}; "deriving-trans" = callPackage - ({ mkDerivation, base, monad-control, monad-control-identity, mtl - , transformers, transformers-base + ({ mkDerivation, base, exceptions, monad-control + , monad-control-identity, mtl, transformers, transformers-base + , unliftio-core }: mkDerivation { pname = "deriving-trans"; - version = "0.5.0.1"; - sha256 = "1d9mrld6c6hcjzw2rhss83zhlsjy9fddfhg55fdrwsajr87zsppl"; + version = "0.5.1.0"; + sha256 = "1k6j66v2wcqhcbf7rrj4qsm7fdf68g0i6yslcjdrricdh8b7r9w2"; libraryHaskellDepends = [ - base monad-control monad-control-identity mtl transformers - transformers-base + base exceptions monad-control monad-control-identity mtl + transformers transformers-base unliftio-core ]; description = "Derive instances for monad transformer stacks"; license = lib.licenses.bsd3; @@ -80640,8 +80539,8 @@ self: { }: mkDerivation { pname = "diagrams-input"; - version = "0.1"; - sha256 = "1ap1qark5f746fgvnzr0fam9csxqqbpvlsyr7smxgwxzhqhsjdjy"; + version = "0.1.1"; + sha256 = "0wad5xdvw33dp5fzqq9h52px3m81nsic35k9wd27ss23bfzgbb6b"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder blaze-markup bytestring colour conduit conduit-extra containers css-text @@ -81407,6 +81306,8 @@ self: { pname = "digest"; version = "0.0.1.4"; sha256 = "05pc5l4bwddszc6vy1hazwi1dnrxg323521gdkis9cvh7zs2a4gr"; + revision = "1"; + editedCabalFile = "1x9wr09q0rx0v4lc1f3a3mq2md412bq6zhhyvs5njffb7bi8mpdi"; libraryHaskellDepends = [ base bytestring ]; libraryPkgconfigDepends = [ zlib ]; description = "Various hashes for bytestrings; CRC32 and Adler32 for now"; @@ -88581,6 +88482,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful_2_2_2_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , effectful-core, exceptions, lifted-base, primitive, process, stm + , tasty, tasty-bench, tasty-hunit, text, time, unix, unliftio + }: + mkDerivation { + pname = "effectful"; + version = "2.2.2.0"; + sha256 = "1j6p28d5701v0a5fhgra1mhnzsqbxj44mpnixrh8jy34rcbq02bi"; + libraryHaskellDepends = [ + async base bytestring directory effectful-core process stm time + unliftio + ]; + testHaskellDepends = [ + base containers effectful-core exceptions lifted-base primitive + tasty tasty-hunit unliftio + ]; + benchmarkHaskellDepends = [ + async base tasty-bench text unix unliftio + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-core" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control , primitive, transformers-base, unliftio-core @@ -88598,6 +88524,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "effectful-core_2_2_2_1" = callPackage + ({ mkDerivation, base, containers, exceptions, monad-control + , primitive, transformers-base, unliftio-core + }: + mkDerivation { + pname = "effectful-core"; + version = "2.2.2.1"; + sha256 = "1k3l79rh7whfm7yrdxmxyjggmwm912g8r6brwxjkla5d4phg4azp"; + libraryHaskellDepends = [ + base containers exceptions monad-control primitive + transformers-base unliftio-core + ]; + description = "An easy to use, performant extensible effects library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "effectful-plugin" = callPackage ({ mkDerivation, base, containers, effectful-core, ghc , ghc-tcplugins-extra @@ -98018,6 +97961,27 @@ self: { broken = true; }) {}; + "festival" = callPackage + ({ mkDerivation, alsa-lib, base, bytestring, c2hs, estbase, estools + , eststring, Festival, gomp, ncurses + }: + mkDerivation { + pname = "festival"; + version = "0.1.0.0"; + sha256 = "0w48b4dh41qjcgh0hdb7jd12gpl16zq3gbv907dcmlqmrskd712w"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ + alsa-lib estbase estools eststring Festival gomp ncurses + ]; + libraryToolDepends = [ c2hs ]; + description = "C bindings plus conveniences for the festival tts system"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {Festival = null; inherit (pkgs) alsa-lib; estbase = null; + estools = null; eststring = null; inherit (pkgs) gomp; + inherit (pkgs) ncurses;}; + "festung" = callPackage ({ mkDerivation, aeson, argparser, async, base, base64-bytestring , bytestring, case-insensitive, containers, directory, either @@ -101505,6 +101469,8 @@ self: { pname = "foldl"; version = "1.4.13"; sha256 = "14vlhgf40qmwkznwza37z4www3q1v5acsx4nw5vmg25wdnc8ibfw"; + revision = "1"; + editedCabalFile = "0wkjdxjyjyq9kv9hwa5k8k8fp6i0b77xf9b2prrzyq0cwlps016i"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable primitive profunctors random semigroupoids text transformers @@ -101521,8 +101487,8 @@ self: { ({ mkDerivation, base, foldl, hedgehog, safe-exceptions }: mkDerivation { pname = "foldl-exceptions"; - version = "1.0.0.1"; - sha256 = "05b7d7y7lg8b2d4kyzwnad4vkr6qyx1gpjw4wd20kk5smql4bxsq"; + version = "1.0.0.2"; + sha256 = "1303ybbfh60hqbwvydfvc4byva2agjm20vq4cfs4lkassrb36lrp"; libraryHaskellDepends = [ base foldl safe-exceptions ]; testHaskellDepends = [ base foldl hedgehog safe-exceptions ]; description = "Exception handling with FoldM"; @@ -107155,8 +107121,8 @@ self: { }: mkDerivation { pname = "general-allocate"; - version = "0.2.0.0"; - sha256 = "1i388gvnk4brc49pp44xaayddcpg78ii1yv0n4r09nl4iicggsyc"; + version = "0.2.0.1"; + sha256 = "0n6szggdafnn8s3s4n737q8s8d1jfnz9cb4v25rsz508q56mghzl"; libraryHaskellDepends = [ base containers mtl primitive resourcet safe-exceptions transformers @@ -120555,8 +120521,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "2.0.1.0"; - sha256 = "0p9sv21dj7sa9w5abz78q5mq72908iih8x61w19xf5z9rz5n5war"; + version = "2.0.2.0"; + sha256 = "1hlqy041d7qxvvhbv7lki852m9bvviml5b48vs0x299i4z9mhprx"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector @@ -127402,26 +127368,6 @@ self: { }) {}; "hashable" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, ghc-bignum - , ghc-prim, HUnit, QuickCheck, random, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, unix - }: - mkDerivation { - pname = "hashable"; - version = "1.4.1.0"; - sha256 = "11sycr73821amdz8g0k8c97igi4z7f9xdvgaxlkxhsp6h310bcz1"; - libraryHaskellDepends = [ - base bytestring containers deepseq ghc-bignum ghc-prim text - ]; - testHaskellDepends = [ - base bytestring ghc-prim HUnit QuickCheck random test-framework - test-framework-hunit test-framework-quickcheck2 text unix - ]; - description = "A class for types that can be converted to a hash value"; - license = lib.licenses.bsd3; - }) {}; - - "hashable_1_4_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-array-byte , deepseq, filepath, ghc-bignum, ghc-prim, HUnit, QuickCheck , random, test-framework, test-framework-hunit @@ -127441,7 +127387,6 @@ self: { ]; description = "A class for types that can be converted to a hash value"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hashable-accelerate" = callPackage @@ -132297,8 +132242,8 @@ self: { }: mkDerivation { pname = "hasql-interpolate"; - version = "0.1.0.3"; - sha256 = "1532bs4d04fh0mhdn2dwgyl94x9pgbnh4xmq403pmx3785m60rva"; + version = "0.1.0.4"; + sha256 = "1b3q21m25wxjxrprfr24b2ay94yjjaqs0p2x6s1d9cqagmznh9v0"; libraryHaskellDepends = [ aeson array base bytestring containers haskell-src-meta hasql megaparsec mtl scientific template-haskell text time transformers @@ -135105,8 +135050,8 @@ self: { }: mkDerivation { pname = "hedgehog-extras"; - version = "0.3.0.2"; - sha256 = "1bf6fyvp2vzvm7z9ny1pcnaqqxqh9j42x6jyd2r8mv3dxdfdjkhr"; + version = "0.3.0.3"; + sha256 = "1jrzijk8b4hnglsghja1aad482sc7zq0g9g0zyjxgwr4pjj7sc6f"; libraryHaskellDepends = [ aeson aeson-pretty async base bytestring deepseq directory exceptions filepath hedgehog hw-aeson mmorph mtl network process @@ -135235,10 +135180,8 @@ self: { ({ mkDerivation, base, hedgehog, optics-core }: mkDerivation { pname = "hedgehog-optics"; - version = "1.0.0.1"; - sha256 = "0ybpq4c74w8y3wnfmy7macana4zlr4w1m2s0kk88yq67cvzfgb5w"; - revision = "2"; - editedCabalFile = "1w7drklx7z8qkkf9d9pysic5iqa3ija57yqx6pq8qkhzlal09kbx"; + version = "1.0.0.2"; + sha256 = "0i39s3ajrfdf87qy8i2k5v4dh42snc3jw4ar49c9hc76gzhxw2qj"; libraryHaskellDepends = [ base hedgehog optics-core ]; description = "Hedgehog properties for optics laws"; license = lib.licenses.mit; @@ -136916,18 +136859,6 @@ self: { }) {}; "hex-text" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, text }: - mkDerivation { - pname = "hex-text"; - version = "0.1.0.7"; - sha256 = "1xyyr6570dbp6mgarz8v56s9kg4pfzk1dc10nw0gg51j6xl1c2zn"; - libraryHaskellDepends = [ base base16-bytestring bytestring text ]; - testHaskellDepends = [ base base16-bytestring bytestring text ]; - description = "ByteString-Text hexidecimal conversions"; - license = lib.licenses.mit; - }) {}; - - "hex-text_0_1_0_8" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, hspec, text }: mkDerivation { @@ -136940,7 +136871,6 @@ self: { ]; description = "ByteString-Text hexidecimal conversions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hexchat" = callPackage @@ -139932,6 +139862,31 @@ self: { mainProgram = "hjsmin"; }) {}; + "hjsmin_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, directory, extra, filepath + , language-javascript, optparse-applicative, process, text, unix + }: + mkDerivation { + pname = "hjsmin"; + version = "0.2.1"; + sha256 = "146d4b9k11msqf1q12rzh5bfdrqddkcgsf42w6wpkzfdlhskid2d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring language-javascript text + ]; + executableHaskellDepends = [ + base bytestring language-javascript optparse-applicative text + ]; + testHaskellDepends = [ + base directory extra filepath process unix + ]; + description = "Haskell implementation of a javascript minifier"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "hjsmin"; + }) {}; + "hjson" = callPackage ({ mkDerivation, base, containers, parsec }: mkDerivation { @@ -141891,6 +141846,8 @@ self: { pname = "hmatrix"; version = "0.20.2"; sha256 = "05462prqkbqpxfbzsgsp8waf0sirg2qz6lzsk7r1ll752n7gqkbg"; + revision = "1"; + editedCabalFile = "154n2hddfk90rqd9fwwhfjnq6ab701nglsrdjss71brza93wjy8d"; configureFlags = [ "-fdisable-default-paths" "-fopenblas" ]; libraryHaskellDepends = [ array base binary bytestring deepseq primitive random semigroups @@ -149420,24 +149377,6 @@ self: { }) {}; "hslua-module-text" = callPackage - ({ mkDerivation, base, hslua-core, hslua-marshalling - , hslua-packaging, tasty, tasty-hunit, tasty-lua, text - }: - mkDerivation { - pname = "hslua-module-text"; - version = "1.0.2"; - sha256 = "0xq5ndgjhs37d73s8lvm0pndwjpj2pqb67pr0ckjap8yzhjna7fq"; - libraryHaskellDepends = [ - base hslua-core hslua-marshalling hslua-packaging text - ]; - testHaskellDepends = [ - base hslua-core hslua-packaging tasty tasty-hunit tasty-lua text - ]; - description = "Lua module for text"; - license = lib.licenses.mit; - }) {}; - - "hslua-module-text_1_0_3_1" = callPackage ({ mkDerivation, base, hslua-core, hslua-marshalling , hslua-packaging, tasty, tasty-hunit, tasty-lua, text }: @@ -149453,7 +149392,6 @@ self: { ]; description = "Lua module for text"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hslua-module-version" = callPackage @@ -162361,6 +162299,31 @@ self: { license = lib.licenses.asl20; }) {}; + "invert_1_0_0_3" = callPackage + ({ mkDerivation, base, containers, criterion, generic-deriving + , hashable, unordered-containers, vector + }: + mkDerivation { + pname = "invert"; + version = "1.0.0.3"; + sha256 = "08bkn9pv02bklmrn5cf17qkw949ryvs51dc8pzxkixgbjk9fpny4"; + libraryHaskellDepends = [ + base containers generic-deriving hashable unordered-containers + vector + ]; + testHaskellDepends = [ + base containers generic-deriving hashable unordered-containers + vector + ]; + benchmarkHaskellDepends = [ + base containers criterion generic-deriving hashable + unordered-containers vector + ]; + description = "Automatically generate a function’s inverse"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "invertible" = callPackage ({ mkDerivation, base, haskell-src-meta, invariant, lens , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell @@ -165473,6 +165436,23 @@ self: { mainProgram = "jira-wiki-markup"; }) {}; + "jira-wiki-markup_1_5_0" = callPackage + ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: + mkDerivation { + pname = "jira-wiki-markup"; + version = "1.5.0"; + sha256 = "1ajzsn4129xjcf9kzzs2hwc2w1nv6a5y7kn7nx4im19gs6hjwzs4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base mtl parsec text ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base parsec tasty tasty-hunit text ]; + description = "Handle Jira wiki markup"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + mainProgram = "jira-wiki-markup"; + }) {}; + "jl" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , conduit, conduit-extra, containers, exceptions, mtl @@ -167384,8 +167364,8 @@ self: { ({ mkDerivation, aeson, base, bytestring, conduit, hspec, jsonl }: mkDerivation { pname = "jsonl-conduit"; - version = "0.1.1"; - sha256 = "0678hasvy8f3dvrqsg5m21yd6wdxpj1dffg9asi2b0byr4rxdaax"; + version = "0.1.2"; + sha256 = "03ab1ysyqg0vnlx1pxw5gj1d2gq16zsz9pdrscdjp9491fiwxg2b"; libraryHaskellDepends = [ aeson base bytestring conduit jsonl ]; testHaskellDepends = [ aeson base bytestring conduit hspec ]; description = "Conduit interface to JSONL-encoded data"; @@ -171194,10 +171174,8 @@ self: { }: mkDerivation { pname = "kvitable"; - version = "1.0.1.0"; - sha256 = "0j0sl1bdx174w79xz80j89r3nmllics1h72mslsivnqv04l519l9"; - revision = "1"; - editedCabalFile = "0f801w2jgadc53nxxkgzdmfy90im0vvqh5i36r68cfx0ycywkcgn"; + version = "1.0.2.0"; + sha256 = "0d01sn1wj1d8cndahrvplg8qhkfyhjy5yw22c2h04jjy6n89vwwq"; libraryHaskellDepends = [ base containers lucid microlens prettyprinter text ]; @@ -172614,6 +172592,26 @@ self: { maintainers = [ lib.maintainers.expipiplus1 ]; }) {}; + "language-c_0_9_2" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers, deepseq + , directory, filepath, happy, mtl, pretty, process + }: + mkDerivation { + pname = "language-c"; + version = "0.9.2"; + sha256 = "1cvcxwnbg71xijadr4aqzwxaw29fxj5z2gpnz3lp5pqnv8phscdj"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath mtl + pretty process + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ base directory filepath process ]; + description = "Analysis and generation of C code"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.expipiplus1 ]; + }) {}; + "language-c-comments" = callPackage ({ mkDerivation, alex, array, base, language-c }: mkDerivation { @@ -174397,8 +174395,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "3.0.3"; - sha256 = "0j5j4x94r7ha7amv0cggs7n7n9vyx1ga5kwdr8mcddc7karz18cg"; + version = "3.0.4"; + sha256 = "0ah3sxghmbv3gzzqs9xak5xi5fpzkvhgf0v637sq2w1k06776k56"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash exceptions extra generic-lens hashtables hedis @@ -174642,10 +174640,8 @@ self: { }: mkDerivation { pname = "lazy-async"; - version = "1.0.0.1"; - sha256 = "1nw24hfpw0wd099lxjsi1iqssbb7yw6isilkv4a68agv2q1ranvk"; - revision = "1"; - editedCabalFile = "1rp4ym19rz1z60awfdxyl80abmpmyjhw6s0rb40j1cmrahpvf6hz"; + version = "1.0.0.2"; + sha256 = "0727384j636pbnfmw2v98j6yn9qw0inv5zrsvmyf1p6znk718jf8"; libraryHaskellDepends = [ base exceptions lifted-async monad-control rank2classes stm transformers transformers-base @@ -175043,8 +175039,8 @@ self: { ({ mkDerivation, aeson, base, text }: mkDerivation { pname = "ldtk-types"; - version = "0.1.0.0"; - sha256 = "0gf99imncx6b50jjv6nn6zf37xxq8kimhp14lxymbi86k6xl204z"; + version = "0.2.0.0"; + sha256 = "0dyjzcrd5p3hg54j0qnszxdpfb7wn6gykaq8nc6il284nf9rqbai"; libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base text ]; description = "Datatypes and Aeson instances for parsing LDtk"; @@ -179870,6 +179866,24 @@ self: { license = lib.licenses.mit; }) {}; + "list-t_1_0_5_6" = callPackage + ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph + , monad-control, mtl, mtl-prelude, transformers, transformers-base + }: + mkDerivation { + pname = "list-t"; + version = "1.0.5.6"; + sha256 = "1ilbc3kjvqanwn4zysy9sdp45cizdqkfyibiymzb1ibg2s56a4sg"; + libraryHaskellDepends = [ + base foldl logict mmorph monad-control mtl transformers + transformers-base + ]; + testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; + description = "ListT done right"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "list-t-attoparsec" = callPackage ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t , list-t-text, text, transformers @@ -181127,14 +181141,30 @@ self: { license = lib.licenses.asl20; }) {}; + "loc_0_1_4_1" = callPackage + ({ mkDerivation, base, containers, hedgehog, hspec, hspec-hedgehog + }: + mkDerivation { + pname = "loc"; + version = "0.1.4.1"; + sha256 = "12bsbjl0808dfcshz38iih3cl3768zix23adznnq821ffxsxfiiw"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers hedgehog hspec hspec-hedgehog + ]; + description = "Line and column positions and ranges in text files"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "loc-test" = callPackage ({ mkDerivation, base, containers, hedgehog, loc }: mkDerivation { pname = "loc-test"; - version = "0.1.3.12"; - sha256 = "0xzlv3mgp90l054gsfg8v5li2f5igb1z84r9vz6sdzmsdv6nyzbg"; + version = "0.1.3.13"; + sha256 = "114qi58ppyc5zwyx21d977dh7zhkaxrr0dv7qf1bk98ql5grqcjl"; libraryHaskellDepends = [ base containers hedgehog loc ]; - description = "Test-related utilities related to the /loc/ package"; + description = "Hedgehog generators for loc"; license = lib.licenses.asl20; }) {}; @@ -181908,6 +181938,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "logical-constraints" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "logical-constraints"; + version = "0.1.2.0"; + sha256 = "1sj47ampdyh117wl2czbkqks6vbii2n24p374r49zqnpcw9y4862"; + libraryHaskellDepends = [ base ]; + description = "Simple logical constraints 'syntax-sugar' writing library"; + license = lib.licenses.mit; + }) {}; + "logicst" = callPackage ({ mkDerivation, base, logict, transformers }: mkDerivation { @@ -186333,20 +186374,6 @@ self: { }) {}; "mason" = callPackage - ({ mkDerivation, array, base, bytestring, ghc-prim, network, text - }: - mkDerivation { - pname = "mason"; - version = "0.2.5"; - sha256 = "0ch8qajaj83pifxy24z4srb3j51z5zn94lrx0ziqcfrpshck569j"; - libraryHaskellDepends = [ - array base bytestring ghc-prim network text - ]; - description = "Fast and extensible bytestring builder"; - license = lib.licenses.bsd3; - }) {}; - - "mason_0_2_6" = callPackage ({ mkDerivation, array, base, bytestring, ghc-prim, network, text }: mkDerivation { @@ -186358,7 +186385,6 @@ self: { ]; description = "Fast and extensible bytestring builder"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "massiv" = callPackage @@ -187158,7 +187184,6 @@ self: { ]; description = "Terminal client for the Mattermost chat system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "matterhorn"; maintainers = [ lib.maintainers.kiwi ]; }) {}; @@ -188502,17 +188527,6 @@ self: { }) {}; "memfd" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "memfd"; - version = "1.0.1.0"; - sha256 = "154861xg18h02s26gf3fk8zqhr2d8x21p0s4ar56rfrbi7b2nqrk"; - libraryHaskellDepends = [ base transformers ]; - description = "Open temporary anonymous Linux file handles"; - license = lib.licenses.asl20; - }) {}; - - "memfd_1_0_1_1" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "memfd"; @@ -188521,7 +188535,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Open temporary anonymous Linux file handles"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "meminfo" = callPackage @@ -189958,6 +189971,8 @@ self: { pname = "microstache"; version = "1.0.2.2"; sha256 = "1b1nvlb9jragibbbf7bg3k61g0kqhnalpsi91spy2dx18ppxp8gh"; + revision = "1"; + editedCabalFile = "0j9nvvyfk4grxhfg7c0nv6fp635kxnrg95zqmi2dgcw0fkw0apgr"; libraryHaskellDepends = [ aeson base containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -189970,6 +189985,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "microstache_1_0_2_3" = callPackage + ({ mkDerivation, aeson, base, base-orphans, bytestring, containers + , deepseq, directory, filepath, parsec, tasty, tasty-hunit, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "microstache"; + version = "1.0.2.3"; + sha256 = "16nj6ss8nmxd0z8lc2a9zpawgvi4kbd5wyjy17xknq43awbi6ynz"; + libraryHaskellDepends = [ + aeson base containers deepseq directory filepath parsec text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base base-orphans bytestring containers parsec tasty + tasty-hunit text + ]; + description = "Mustache templates for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "microtimer" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -194009,6 +194046,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "monadic-bang" = callPackage + ({ mkDerivation, base, containers, exceptions, fused-effects, ghc + , ghc-boot, ghc-paths, transformers + }: + mkDerivation { + pname = "monadic-bang"; + version = "0.1.0.0"; + sha256 = "0wflx8vlwa5rxa94g40rsn8bwncnwvkbf5iagbhf74mjjdnrc17c"; + libraryHaskellDepends = [ + base containers fused-effects ghc transformers + ]; + testHaskellDepends = [ + base exceptions ghc ghc-boot ghc-paths transformers + ]; + description = "GHC plugin to desugar ! into do-notation"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "monadic-recursion-schemes" = callPackage ({ mkDerivation, base, comonad, containers, free, mtl , recursion-schemes, transformers @@ -200960,39 +201017,6 @@ self: { }) {ghc-binary = null;}; "net-mqtt" = callPackage - ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary - , bytestring, checkers, conduit, conduit-extra, connection - , containers, deepseq, HUnit, network-conduit-tls, network-uri - , optparse-applicative, QuickCheck, stm, tasty, tasty-hunit - , tasty-quickcheck, text, websockets - }: - mkDerivation { - pname = "net-mqtt"; - version = "0.8.2.4"; - sha256 = "03w0086kn9zgsry8gm1ij7n5m3fqq7xfas4ma1fviqsx7w8wdc3r"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async attoparsec attoparsec-binary base binary bytestring conduit - conduit-extra connection containers deepseq network-conduit-tls - network-uri QuickCheck stm text websockets - ]; - executableHaskellDepends = [ - async attoparsec attoparsec-binary base binary bytestring conduit - conduit-extra connection containers deepseq network-conduit-tls - network-uri optparse-applicative QuickCheck stm text websockets - ]; - testHaskellDepends = [ - async attoparsec attoparsec-binary base binary bytestring checkers - conduit conduit-extra connection containers deepseq HUnit - network-conduit-tls network-uri QuickCheck stm tasty tasty-hunit - tasty-quickcheck text websockets - ]; - description = "An MQTT Protocol Implementation"; - license = lib.licenses.bsd3; - }) {}; - - "net-mqtt_0_8_2_5" = callPackage ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary , bytestring, checkers, conduit, conduit-extra, connection , containers, deepseq, HUnit, network-conduit-tls, network-uri @@ -201023,7 +201047,6 @@ self: { ]; description = "An MQTT Protocol Implementation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "net-mqtt-lens" = callPackage @@ -208108,8 +208131,8 @@ self: { ({ mkDerivation, aeson, base, text }: mkDerivation { pname = "one-line-aeson-text"; - version = "0.1.0.4"; - sha256 = "0hhdnpc4fs6xz709vlww990i5f98p73n8niq09y6hv1vzgsh5gr1"; + version = "0.1.0.5"; + sha256 = "10ngmv4xbz5w4fpgprrii6n74syia824sysja7ajyv27v6zfbihf"; libraryHaskellDepends = [ aeson base text ]; testHaskellDepends = [ aeson base text ]; description = "Pretty-printing short Aeson values as text"; @@ -208285,8 +208308,8 @@ self: { }: mkDerivation { pname = "oops"; - version = "0.1.2.0"; - sha256 = "025vgnlnilja8sn66w34iy7vc83cpidg3vcvjl1vf1inmncsydrh"; + version = "0.1.5.0"; + sha256 = "0yb10jv01mx2czz8sb9qxr0b34wfhvvrai52c26s6q4gwybi77jb"; libraryHaskellDepends = [ base mtl QuickCheck transformers ]; testHaskellDepends = [ base base-compat doctest doctest-discover Glob hedgehog @@ -210324,6 +210347,28 @@ self: { maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; + "optparse-generic_1_4_9" = callPackage + ({ mkDerivation, base, bytestring, Only, optparse-applicative + , system-filepath, text, time, transformers, transformers-compat + , void + }: + mkDerivation { + pname = "optparse-generic"; + version = "1.4.9"; + sha256 = "1kxrhh4h2jd2i9fi1lr3sx6wij71n1y50crl0r0j6b3c8hj3c05j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Only optparse-applicative system-filepath text time + transformers transformers-compat void + ]; + executableHaskellDepends = [ base ]; + description = "Auto-generate a command-line parser for your datatype"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.Gabriel439 ]; + }) {}; + "optparse-helper" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -214219,12 +214264,12 @@ self: { mainProgram = "parseargs-example"; }) {}; - "parsec_3_1_15_1" = callPackage + "parsec_3_1_16_1" = callPackage ({ mkDerivation, base, bytestring, mtl, tasty, tasty-hunit, text }: mkDerivation { pname = "parsec"; - version = "3.1.15.1"; - sha256 = "1pcqgxzhzlyaxrkgdixsl0jh7jfcg66kwqqf6va0am8q64ar1r5b"; + version = "3.1.16.1"; + sha256 = "0ihjbmsn9hrryjid0ydh6vryzq2mnzavhdb7hxc8d9kfszjn46d4"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ base mtl tasty tasty-hunit ]; description = "Monadic parser combinators"; @@ -214884,12 +214929,25 @@ self: { license = lib.licenses.asl20; }) {}; + "partial-semigroup_0_6_0_1" = callPackage + ({ mkDerivation, base, hedgehog }: + mkDerivation { + pname = "partial-semigroup"; + version = "0.6.0.1"; + sha256 = "1zzpv5b860k22wng7qa0pcj129vgzm2vxda5x1f26f9vc0bm8q18"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hedgehog ]; + description = "A partial binary associative operator"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "partial-semigroup-hedgehog" = callPackage ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.6.0.13"; - sha256 = "117k12wgaypj7lkj9lqi7xhli9f33hsd455p87g9xxcwx32m0r53"; + version = "0.6.0.14"; + sha256 = "1f5c2z8ivmdbdy5s2f4q3pbrb4k53503zwsdc8c5drm34wrvim3b"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; description = "Property testing for partial semigroups using Hedgehog"; license = lib.licenses.asl20; @@ -215507,6 +215565,20 @@ self: { license = lib.licenses.asl20; }) {}; + "path-text-utf8_0_0_1_11" = callPackage + ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: + mkDerivation { + pname = "path-text-utf8"; + version = "0.0.1.11"; + sha256 = "1dxqbcwsr3ayijssm7wr6z96p3vrwrfqhr15zhg7m3i2ad44wz8c"; + libraryHaskellDepends = [ + base bytestring path safe-exceptions text + ]; + description = "Read and write UTF-8 text files"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "path-tree" = callPackage ({ mkDerivation, base, containers, relude }: mkDerivation { @@ -223255,30 +223327,6 @@ self: { }) {}; "poly" = callPackage - ({ mkDerivation, base, deepseq, doctest, finite-typelits, gauge - , mod, primitive, QuickCheck, quickcheck-classes, semirings, tasty - , tasty-quickcheck, vector, vector-algorithms, vector-sized - }: - mkDerivation { - pname = "poly"; - version = "0.5.0.0"; - sha256 = "1h7nbyiwnbxyj2jss04raws7zapfq7mvzj7fmi8rqyr0aw91k4zl"; - libraryHaskellDepends = [ - base deepseq finite-typelits primitive semirings vector - vector-algorithms vector-sized - ]; - testHaskellDepends = [ - base doctest finite-typelits mod QuickCheck quickcheck-classes - semirings tasty tasty-quickcheck vector vector-sized - ]; - benchmarkHaskellDepends = [ - base deepseq gauge mod semirings vector - ]; - description = "Polynomials"; - license = lib.licenses.bsd3; - }) {}; - - "poly_0_5_1_0" = callPackage ({ mkDerivation, base, deepseq, finite-typelits, mod, primitive , QuickCheck, quickcheck-classes, quickcheck-classes-base , semirings, tasty, tasty-bench, tasty-quickcheck, vector @@ -223302,7 +223350,6 @@ self: { ]; description = "Polynomials"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "poly-arity" = callPackage @@ -225577,22 +225624,6 @@ self: { }) {}; "postgresql-libpq" = callPackage - ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }: - mkDerivation { - pname = "postgresql-libpq"; - version = "0.9.4.3"; - sha256 = "1gfnhc5pibn7zmifdf2g0c112xrpzsk756ln2kjzqljkspf4dqp3"; - revision = "3"; - editedCabalFile = "02cj493a2qxl5hddiq0579079s398hdqqy164pig6d61nl7q66cs"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring unix ]; - librarySystemDepends = [ postgresql ]; - testHaskellDepends = [ base bytestring ]; - description = "low-level binding to libpq"; - license = lib.licenses.bsd3; - }) {inherit (pkgs) postgresql;}; - - "postgresql-libpq_0_9_5_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }: mkDerivation { pname = "postgresql-libpq"; @@ -225604,7 +225635,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "low-level binding to libpq"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) postgresql;}; "postgresql-libpq-notify" = callPackage @@ -227712,8 +227742,8 @@ self: { ({ mkDerivation, base, bytestring, filepath, text }: mkDerivation { pname = "pretty-html"; - version = "0.1.0.0"; - sha256 = "099gj9h1smgjnp8xyrp5c0hj99f35lf7jc6rgmbnh8s7ra3a1gz5"; + version = "0.1.0.1"; + sha256 = "14f2jydcjxnm9whxi2irvsx769xc4041dpvn3r7iahcn5gqf3krr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base text ]; testHaskellDepends = [ base bytestring filepath text ]; @@ -228521,6 +228551,17 @@ self: { broken = true; }) {}; + "primitive-slice" = callPackage + ({ mkDerivation, base, primitive, primitive-unlifted }: + mkDerivation { + pname = "primitive-slice"; + version = "0.1.0.0"; + sha256 = "07bwpvqvv42x9dz4wb1k6nia9pj0d406k0apgkxyxhvd6wwk0hxz"; + libraryHaskellDepends = [ base primitive primitive-unlifted ]; + description = "Slices of primitive arrays"; + license = lib.licenses.bsd3; + }) {}; + "primitive-sort" = callPackage ({ mkDerivation, base, containers, contiguous, doctest, gauge , ghc-prim, HUnit, primitive, QuickCheck, random, smallcheck, tasty @@ -228581,26 +228622,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "primitive-unlifted_1_0_0_0" = callPackage - ({ mkDerivation, array, base, bytestring, primitive, QuickCheck - , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short - }: - mkDerivation { - pname = "primitive-unlifted"; - version = "1.0.0.0"; - sha256 = "07b53730nxzqyhac71xxijg598304ppb7wa8lfhw1glicj9h0wad"; - libraryHaskellDepends = [ - array base bytestring primitive text-short - ]; - testHaskellDepends = [ - base primitive QuickCheck quickcheck-classes-base stm tasty - tasty-quickcheck - ]; - description = "Primitive GHC types with unlifted types inside"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "primula-board" = callPackage ({ mkDerivation, base, ConfigFile, containers, directory, happstack , happstack-helpers, happstack-server, happstack-state, hsp @@ -230446,8 +230467,8 @@ self: { }: mkDerivation { pname = "proteaaudio"; - version = "0.9.2"; - sha256 = "0wrahbiq7pa7bg0x7z9ynmy9ap30rj0lldgc2m7b49zhj43kax83"; + version = "0.9.3"; + sha256 = "12572f2pwn3akzwqi83p734jabrfinr7bb89yhinl8pari7lya7k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -230465,8 +230486,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, SDL2 }: mkDerivation { pname = "proteaaudio-sdl"; - version = "0.9.2"; - sha256 = "0qn6rnv4wc0g8s2mnsx71281nmgi29gnnnbskzy1kbzrwxlshrcc"; + version = "0.9.3"; + sha256 = "117fn2a5821ifl4yv94bwiylbnbhriqgjdl9c4685z98m0n9ryap"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -232048,6 +232069,7 @@ self: { ]; description = "types and parser for email messages (including MIME)"; license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "purenix" = callPackage @@ -243522,8 +243544,8 @@ self: { }: mkDerivation { pname = "rest-rewrite"; - version = "0.4.0"; - sha256 = "0vvb4jk0s699h4dcdls1yxzyaja1gwpqdchfy5wbg0fybfw94pr5"; + version = "0.4.1"; + sha256 = "0h9s6s9wv8fgs6xi2fqdycybjl8si0w50mlk1zc62dmjdzwxy8dx"; libraryHaskellDepends = [ base containers hashable monad-loops mtl parsec process QuickCheck text time unordered-containers @@ -248737,19 +248759,6 @@ self: { }) {}; "sample-frame" = callPackage - ({ mkDerivation, base, QuickCheck, storable-record }: - mkDerivation { - pname = "sample-frame"; - version = "0.0.3"; - sha256 = "0ivj0bcnqqc805np62bdpvh8v4ykmw86ph5rp7k54bbv9wd31bsv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base QuickCheck storable-record ]; - description = "Handling of samples in an (audio) signal"; - license = lib.licenses.bsd3; - }) {}; - - "sample-frame_0_0_4" = callPackage ({ mkDerivation, base, QuickCheck, storable-record }: mkDerivation { pname = "sample-frame"; @@ -248760,21 +248769,9 @@ self: { libraryHaskellDepends = [ base QuickCheck storable-record ]; description = "Handling of samples in an (audio) signal"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sample-frame-np" = callPackage - ({ mkDerivation, base, numeric-prelude, sample-frame }: - mkDerivation { - pname = "sample-frame-np"; - version = "0.0.4.1"; - sha256 = "091nz5w5511xl8hp2q8dfvs4jz15nkhz22rr97zga0vmn0hpdnxi"; - libraryHaskellDepends = [ base numeric-prelude sample-frame ]; - description = "Orphan instances for types from sample-frame and numericprelude"; - license = lib.licenses.bsd3; - }) {}; - - "sample-frame-np_0_0_5" = callPackage ({ mkDerivation, base, numeric-prelude, sample-frame }: mkDerivation { pname = "sample-frame-np"; @@ -248783,7 +248780,6 @@ self: { libraryHaskellDepends = [ base numeric-prelude sample-frame ]; description = "Orphan instances for types from sample-frame and numericprelude"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sampling" = callPackage @@ -249560,6 +249556,37 @@ self: { broken = true; }) {inherit (pkgs) z3;}; + "sbv_9_1" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , deepseq, directory, filepath, hlint, libBF, mtl, pretty, process + , QuickCheck, random, syb, tasty, tasty-bench, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, text, time + , transformers, uniplate, z3 + }: + mkDerivation { + pname = "sbv"; + version = "9.1"; + sha256 = "0wkpx73blwg629l4y9vjjlhbk4qa1zzddc4z8qvida62qwcdxw6w"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers deepseq directory filepath libBF mtl + pretty process QuickCheck random syb template-haskell text time + transformers uniplate + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hlint mtl process + QuickCheck random tasty tasty-golden tasty-hunit tasty-quickcheck + ]; + testSystemDepends = [ z3 ]; + benchmarkHaskellDepends = [ + base deepseq filepath process random tasty tasty-bench time + ]; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {inherit (pkgs) z3;}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -252815,6 +252842,8 @@ self: { pname = "sensei"; version = "0.6.2"; sha256 = "168znkrlciywsqpgbssnz2n2w1w6240j1cxk83bpzlflg7q934ps"; + revision = "1"; + editedCabalFile = "0i4k8zdyvv3ypwqg2x5s4p0dgszpgb6g8wc0s9zi05fyzhizpi4s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -257311,9 +257340,7 @@ self: { testHaskellDepends = [ base ]; description = "A command line tool to convert TrueType/OpenType fonts to WOFF format"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "sfnt2woff"; - broken = true; }) {inherit (pkgs) zlib;}; "sgd" = callPackage @@ -257673,6 +257700,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "shake-cabal_0_2_2_3" = callPackage + ({ mkDerivation, base, binary, Cabal, composition-prelude, deepseq + , directory, filepath, hashable, shake + }: + mkDerivation { + pname = "shake-cabal"; + version = "0.2.2.3"; + sha256 = "0gl0yiimbwcrhbh24bgm6dm3nqz4ldzgm73k1fg9sms4r2pr15hy"; + libraryHaskellDepends = [ + base binary Cabal composition-prelude deepseq directory filepath + hashable shake + ]; + description = "Shake library for use with cabal"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "shake-cabal-build" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, process }: mkDerivation { @@ -261815,8 +261859,8 @@ self: { }: mkDerivation { pname = "sketch-frp-copilot"; - version = "1.0.5"; - sha256 = "0vz7p5vsjkvck3znn9ywbyi1vw0cmfb5n48m2sbcm4ky7j5x7yps"; + version = "1.0.6"; + sha256 = "1hxz51vx1a1p0v8sajv2ch6y261lm4s9z5fvp5w86qygsd1zy2px"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language mtl optparse-applicative @@ -269684,24 +269728,25 @@ self: { ({ mkDerivation, aeson, aeson-casing, aeson-pretty, amazonka , amazonka-cloudformation, amazonka-core, amazonka-ec2 , amazonka-lambda, amazonka-sts, base, Blammo, bytestring, cfn-flip - , conduit, containers, errors, exceptions, extra, filepath, Glob - , hspec, lens, lens-aeson, monad-logger, mtl, optparse-applicative - , QuickCheck, resourcet, rio, text, time, unliftio, unliftio-core - , unordered-containers, uuid, yaml + , conduit, containers, envparse, errors, exceptions, extra + , filepath, Glob, hspec, lens, lens-aeson, monad-logger, mtl + , optparse-applicative, QuickCheck, resourcet, rio, semigroups + , text, time, unliftio, unliftio-core, unordered-containers, uuid + , yaml }: mkDerivation { pname = "stackctl"; - version = "1.1.3.1"; - sha256 = "0mzn546zjgqjiky4mv19ap1qa6xxdf280qkmq041d9sj5s4xp2vh"; + version = "1.3.0.0"; + sha256 = "1a97xkbvcvr7r85b4xrzdijap3zw02j0rqxix3ld9ns907mkdq2n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing aeson-pretty amazonka amazonka-cloudformation amazonka-core amazonka-ec2 amazonka-lambda amazonka-sts base Blammo - bytestring cfn-flip conduit containers errors exceptions extra - filepath Glob lens lens-aeson monad-logger mtl optparse-applicative - resourcet rio text time unliftio unliftio-core unordered-containers - uuid yaml + bytestring cfn-flip conduit containers envparse errors exceptions + extra filepath Glob lens lens-aeson monad-logger mtl + optparse-applicative resourcet rio semigroups text time unliftio + unliftio-core unordered-containers uuid yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -273176,6 +273221,8 @@ self: { pname = "string-conversions"; version = "0.4.0.1"; sha256 = "150rdank90h7v08x0wq4dffjbxv2daf5v9sqfs5mab76kinwxg26"; + revision = "1"; + editedCabalFile = "1g3wxx579mhs2icxngi78pvjfybbk606a6vgns88pg6ws5hrvx4s"; libraryHaskellDepends = [ base bytestring text utf8-string ]; testHaskellDepends = [ base bytestring deepseq hspec QuickCheck quickcheck-instances text @@ -273876,6 +273923,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Convert between strong and weak representations of types"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.raehik ]; }) {}; "strptime" = callPackage @@ -274269,6 +274317,40 @@ self: { mainProgram = "stylish-haskell"; }) {}; + "stylish-haskell_0_14_4_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, file-embed, filepath, ghc-lib-parser + , ghc-lib-parser-ex, HsYAML, HsYAML-aeson, HUnit, mtl + , optparse-applicative, random, regex-tdfa, strict, syb + , test-framework, test-framework-hunit, text + }: + mkDerivation { + pname = "stylish-haskell"; + version = "0.14.4.0"; + sha256 = "0y0vfz5vkvw0wzcsw2ym3nix0v3pwjw2vas0qv3lrhdvn3ba9gb7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath ghc-lib-parser ghc-lib-parser-ex HsYAML HsYAML-aeson mtl + regex-tdfa syb text + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath ghc-lib-parser ghc-lib-parser-ex HsYAML HsYAML-aeson mtl + optparse-applicative regex-tdfa strict syb text + ]; + testHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath ghc-lib-parser ghc-lib-parser-ex HsYAML HsYAML-aeson HUnit + mtl random regex-tdfa syb test-framework test-framework-hunit text + ]; + description = "Haskell code prettifier"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "stylish-haskell"; + }) {}; + "stylist" = callPackage ({ mkDerivation, async, base, css-syntax, hashable, hspec , network-uri, QuickCheck, regex-tdfa, scientific, stylist-traits @@ -275292,21 +275374,21 @@ self: { ({ mkDerivation, base, supply-chain-core }: mkDerivation { pname = "supply-chain"; - version = "0.0.0.0"; - sha256 = "12rdx593ivps3khxpvq0r1kc99jhzvc0qfkdxa7jdy0qn22fi3dx"; + version = "0.0.0.1"; + sha256 = "0g7hfbzqwrl30bkrk1pxiriyg2xdzv5ia77mba58sv7g0bacjz2a"; libraryHaskellDepends = [ base supply-chain-core ]; description = "Composable request-response pipelines"; license = lib.licenses.asl20; }) {}; "supply-chain-core" = callPackage - ({ mkDerivation, base, tasty, tasty-hedgehog, tasty-hunit }: + ({ mkDerivation, base, hspec }: mkDerivation { pname = "supply-chain-core"; - version = "0.0.0.0"; - sha256 = "17ih0pvfk0xzr30q9094gf8ry8pvnannr92hvk86z7j514nv6q9h"; + version = "0.0.0.1"; + sha256 = "18x9g2qacvyar4ckv4giaxxdkwn8prrl2xyzgd7p6h8pzb5xbjzz"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base tasty tasty-hedgehog tasty-hunit ]; + testHaskellDepends = [ base hspec ]; description = "Composable request-response pipelines"; license = lib.licenses.asl20; }) {}; @@ -275972,32 +276054,6 @@ self: { }) {}; "swish" = callPackage - ({ mkDerivation, base, containers, directory, filepath, hashable - , HUnit, intern, mtl, network-uri, polyparse, semigroups - , test-framework, test-framework-hunit, text, time - }: - mkDerivation { - pname = "swish"; - version = "0.10.2.0"; - sha256 = "162sq6k9ylzlnqj4l9plykvhhrkc7sc08bza6az5cadfvnqlham8"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers directory filepath hashable intern mtl network-uri - polyparse text time - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers hashable HUnit network-uri semigroups - test-framework test-framework-hunit text time - ]; - description = "A semantic web toolkit"; - license = lib.licenses.lgpl21Only; - mainProgram = "Swish"; - }) {}; - - "swish_0_10_3_0" = callPackage ({ mkDerivation, base, containers, directory, filepath, hashable , HUnit, intern, mtl, network-uri, polyparse, semigroups , test-framework, test-framework-hunit, text, time @@ -276020,7 +276076,6 @@ self: { ]; description = "A semantic web toolkit"; license = lib.licenses.lgpl21Plus; - hydraPlatforms = lib.platforms.none; mainProgram = "Swish"; }) {}; @@ -277530,41 +277585,6 @@ self: { }) {}; "synthesizer-core" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, event-list, explicit-exception, filepath - , non-empty, non-negative, numeric-prelude, numeric-quest, old-time - , process, QuickCheck, random, sample-frame-np, semigroups, sox - , storable-record, storable-tuple, storablevector, timeit - , transformers, utility-ht - }: - mkDerivation { - pname = "synthesizer-core"; - version = "0.8.2.1"; - sha256 = "1sdvqabxlgiqqb3kppxwyvmkmvcqrmrzicbmcmy6mr5c4npjxffj"; - revision = "1"; - editedCabalFile = "1c3l83qrdn3nxpp0gsr06iz9praw37c2j9zjj15pxd8in73mb74a"; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq event-list - explicit-exception filepath non-empty non-negative numeric-prelude - numeric-quest process QuickCheck random sample-frame-np semigroups - sox storable-record storable-tuple storablevector transformers - utility-ht - ]; - testHaskellDepends = [ - base containers event-list non-empty non-negative numeric-prelude - QuickCheck random storable-tuple storablevector transformers - utility-ht - ]; - benchmarkHaskellDepends = [ - array base binary bytestring directory numeric-prelude old-time - storable-tuple storablevector timeit utility-ht - ]; - description = "Audio signal processing coded in Haskell: Low level part"; - license = "GPL"; - hydraPlatforms = lib.platforms.none; - }) {}; - - "synthesizer-core_0_8_3" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, event-list, explicit-exception, filepath , non-empty, non-negative, numeric-prelude, numeric-quest, old-time @@ -280057,8 +280077,8 @@ self: { pname = "tasty-hspec"; version = "1.2.0.1"; sha256 = "0ibl2xi6mmqad2mriz67nb7pjwwvjik385amp24j9kc7a7zkx091"; - revision = "1"; - editedCabalFile = "0a6r4gzxzp6n90z0nif7ha7p7am57hs48i54i2y4z9kgjv6lnvll"; + revision = "2"; + editedCabalFile = "0qyp20khzr6ingdjmmwlhlklc26257wds56cn2pwss3yf1j5blv1"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -280067,6 +280087,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "tasty-hspec_1_2_0_3" = callPackage + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-hspec"; + version = "1.2.0.3"; + sha256 = "150dvscaa0sv5pjsd74mmnp9f0jmz09qs24swz73wwjzrzmnypcx"; + libraryHaskellDepends = [ + base hspec hspec-core QuickCheck tasty tasty-quickcheck + tasty-smallcheck + ]; + description = "Hspec support for the Tasty test framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-html" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, filepath , generic-deriving, mtl, semigroups, stm, tagged, tasty, text @@ -280474,8 +280511,8 @@ self: { }: mkDerivation { pname = "tasty-sugar"; - version = "2.0.0.1"; - sha256 = "0rgq5k9vv72c5826acpfscjfszvyi5bms5wjbw7bs0izimqw7b1j"; + version = "2.0.1.0"; + sha256 = "1mngpdfafdxsnczi9hzvg4awg1y845srrk3f19lmnig6f70kg23h"; libraryHaskellDepends = [ base containers directory filemanip filepath kvitable logict microlens mtl optparse-applicative parallel prettyprinter tasty @@ -284137,39 +284174,6 @@ self: { }) {}; "text-show-instances" = callPackage - ({ mkDerivation, aeson, base, base-compat, bifunctors, binary - , containers, directory, generic-deriving, ghc-boot-th, ghc-prim - , haskeline, hpc, hspec, hspec-discover, old-locale, old-time - , pretty, QuickCheck, quickcheck-instances, random, scientific - , semigroups, tagged, template-haskell, terminfo, text, text-short - , text-show, th-orphans, time, transformers, transformers-compat - , unix, unordered-containers, uuid-types, vector, xhtml - }: - mkDerivation { - pname = "text-show-instances"; - version = "3.9.3"; - sha256 = "153hfl8k0489ll71apq48s59ngv8ag1vyhhs6pp3fgxmdwwg2xpl"; - libraryHaskellDepends = [ - aeson base base-compat bifunctors binary containers directory - ghc-boot-th haskeline hpc old-locale old-time pretty random - scientific semigroups tagged template-haskell terminfo text - text-short text-show time transformers unix unordered-containers - uuid-types vector xhtml - ]; - testHaskellDepends = [ - aeson base base-compat bifunctors binary containers directory - generic-deriving ghc-boot-th ghc-prim haskeline hpc hspec - old-locale old-time pretty QuickCheck quickcheck-instances random - scientific tagged template-haskell terminfo text-short text-show - th-orphans time transformers transformers-compat unix - unordered-containers uuid-types vector xhtml - ]; - testToolDepends = [ hspec-discover ]; - description = "Additional instances for text-show"; - license = lib.licenses.bsd3; - }) {}; - - "text-show-instances_3_9_4" = callPackage ({ mkDerivation, aeson, base, base-compat, bifunctors, binary , containers, directory, generic-deriving, ghc-boot-th, ghc-prim , haskeline, hpc, hspec, hspec-discover, old-locale, old-time @@ -284200,7 +284204,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Additional instances for text-show"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-stream-decode" = callPackage @@ -290004,12 +290007,12 @@ self: { mainProgram = "Benchmark"; }) {}; - "transformers_0_6_0_5" = callPackage + "transformers_0_6_0_6" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "transformers"; - version = "0.6.0.5"; - sha256 = "09s4svr1z1y93qwzq22py0s2s35b6lyszyfippiimccqrbk1jlsm"; + version = "0.6.0.6"; + sha256 = "1savf7rjhji0lcx7fv0gz7ci6dn1sycdgh5flqr63y31spbj4q3w"; libraryHaskellDepends = [ base ]; description = "Concrete functor and monad transformers"; license = lib.licenses.bsd3; @@ -295715,19 +295718,6 @@ self: { }) {}; "unfork" = callPackage - ({ mkDerivation, async, base, safe-exceptions, stm }: - mkDerivation { - pname = "unfork"; - version = "1.0.0.0"; - sha256 = "0k770q549f1rcdhx21nb6n1van00za2wv50angdw5gkxihzczcjq"; - revision = "1"; - editedCabalFile = "1vwlyyrczrkma8ggzn29b6vwfbq51h3m1si1jfh6v5c99vajr33y"; - libraryHaskellDepends = [ async base safe-exceptions stm ]; - description = "Make any action thread safe"; - license = lib.licenses.asl20; - }) {}; - - "unfork_1_0_0_1" = callPackage ({ mkDerivation, async, base, safe-exceptions, stm }: mkDerivation { pname = "unfork"; @@ -295736,7 +295726,6 @@ self: { libraryHaskellDepends = [ async base safe-exceptions stm ]; description = "Make any action thread safe"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "unfree" = callPackage @@ -308072,25 +308061,6 @@ self: { }) {}; "witch" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, tagged - , template-haskell, text, time, transformers - }: - mkDerivation { - pname = "witch"; - version = "1.1.5.0"; - sha256 = "1lg3kdy18d1cabb39hrj7k9s4ryc1bfrx6ln5k3j640ankdv1asj"; - libraryHaskellDepends = [ - base bytestring containers tagged template-haskell text time - ]; - testHaskellDepends = [ - base bytestring containers HUnit tagged text time transformers - ]; - description = "Convert values from one type into another"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.maralorn ]; - }) {}; - - "witch_1_1_6_0" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, tagged , template-haskell, text, time, transformers }: @@ -308106,7 +308076,6 @@ self: { ]; description = "Convert values from one type into another"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.maralorn ]; }) {}; @@ -310354,8 +310323,8 @@ self: { }: mkDerivation { pname = "xcffib"; - version = "1.1.2"; - sha256 = "068g730p0rbsf1l7k9jgc9d7ng0zx3552wqk357wl3q56jac0chs"; + version = "1.2.0"; + sha256 = "0xsjr73ayld2ra40715hk319cc353vpiv2xpv58cvwfdh76n5nsy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -310372,9 +310341,7 @@ self: { ]; description = "A cffi-based python binding for X"; license = "unknown"; - hydraPlatforms = lib.platforms.none; mainProgram = "xcffibgen"; - broken = true; }) {}; "xchat-plugin" = callPackage @@ -317645,8 +317612,8 @@ self: { }: mkDerivation { pname = "zephyr-copilot"; - version = "1.0.5"; - sha256 = "1fc58cq0dgzqfy84z8mbana8lisnc2df7k7jhramafpl7qgkp9q4"; + version = "1.0.6"; + sha256 = "0lakan23rddv8rlrd5h7jzc3g59h22hpdbjgabn4v76aaxpk3rga"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative sketch-frp-copilot temporary diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix index c478c87554..77ccd301b4 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -4,6 +4,8 @@ # platform that has NCG support , useLLVM ? false , withHoogle ? false +# Whether to install `doc` outputs for GHC and all included libraries. +, installDocumentation ? true , hoogleWithPackages , postBuild ? "" , ghcLibdir ? null # only used by ghcjs, when resolving plugins @@ -54,7 +56,11 @@ let else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}"; docDir = "$out/share/doc/ghc/html"; packageCfgDir = "${libDir}/package.conf.d"; - paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages); + paths = lib.concatLists ( + builtins.map + (pkg: [ pkg ] ++ lib.optionals installDocumentation [ (lib.getOutput "doc" pkg) ]) + (lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages)) + ); hasLibraries = lib.any (x: x.isHaskellLibrary) paths; # CLang is needed on Darwin for -fllvm to work: # https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm @@ -71,7 +77,9 @@ symlinkJoin { # if such a feature is needed, the real compiler name should be saved # as a dedicated drv attribute, like `compiler-name` name = ghc.name + "-with-packages"; - paths = paths ++ [ghc]; + paths = paths + ++ [ ghc ] + ++ lib.optionals installDocumentation [ (lib.getOutput "doc" ghc) ]; nativeBuildInputs = [ makeWrapper ]; postBuild = '' # wrap compiler executables with correct env variables @@ -161,8 +169,8 @@ symlinkJoin { ''} $out/bin/${ghcCommand}-pkg check '' + postBuild; + preferLocalBuild = true; passthru = { - preferLocalBuild = true; inherit (ghc) version meta; # Inform users about backwards incompatibilities with <= 21.05 diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix index 2b4dcddff0..00aada3965 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/bats/default.nix @@ -160,7 +160,7 @@ resholve.mkDerivation rec { passthru.tests.upstream = bats.unresholved.overrideAttrs (old: { name = "${bats.name}-tests"; dontInstall = true; # just need the build directory - installCheckInputs = [ + nativeInstallCheckInputs = [ ncurses parallel # skips some tests if it can't detect flock # skips some tests if it can't detect diff --git a/third_party/nixpkgs/pkgs/development/interpreters/boron/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/boron/default.nix index 249a39c58f..e40ca2b5b4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/boron/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/boron/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://urlan.sourceforge.net/boron/"; + homepage = "https://urlan.sourceforge.net/boron/"; description = "Scripting language and C library useful for building DSLs"; license = licenses.lgpl3Plus; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/default.nix index 5dffd7f184..bd07f3ca7e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { outputs = [ "out" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals enableLibcbqn [ "lib" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index 0934e73a19..d50ed8ff05 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "1.0.169"; + version = "1.1.172"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-R4oGMN/2oVPKe0JBXXQ1mzw0F66Wn+WiP0kVs53zdoI="; + sha256 = "sha256-mdcG4zKC9zX0J2S2lWCvFdFFr5sOxfOe9/iPzvEyImM="; }; executable = "bb"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix index 2f1a548c88..58df443f96 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R24.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "24.3.4.7"; - sha256 = "sha256-cOtoSlK3S2irPX8vQ81rPXBH3aWriyoUmidUyaFs11E="; + version = "24.3.4.8"; + sha256 = "sha256-NwnGqFEhVi96fEPLKoAqJgvWNZEsRGtE/3HP0eRthuA="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R25.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R25.nix index d6dc77c3da..b2ad0846cd 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R25.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.2.1"; - sha256 = "xJ3fadveOFZ0TeHhjl3VnAtWyFTOVUIoFubXofvrsT0="; + version = "25.2.2"; + sha256 = "HfEh2IhifFe/gQ4sK99uBnmUGvNCeJ2mlTQf7IzenEs="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix index bdfca31d7f..59e2286f84 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/generic-builder.nix @@ -21,7 +21,7 @@ , parallelBuild ? false , systemd , wxSupport ? true -, systemdSupport ? stdenv.isLinux # systemd support in epmd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd # systemd support in epmd # updateScript deps , writeScript , common-updater-scripts diff --git a/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix b/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix index afad1c7a29..de0b8479f1 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix @@ -25,11 +25,11 @@ let in builder rec { pname = "guile"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-2qcGClbygE6bdMjX5/6L7tErQ6qyeJo4WFGD/MF7ihM="; + sha256 = "sha256-GiYlrHKyNm6VeS8/51j9Lfd1tARKkKSpeHMm5mwNdQ0="; }; outputs = [ "out" "dev" "info" ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/hashlink/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/hashlink/default.nix index e24742ac13..dc5f153c5e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/hashlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/hashlink/default.nix @@ -17,17 +17,15 @@ stdenv.mkDerivation rec { pname = "hashlink"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "HaxeFoundation"; repo = "hashlink"; rev = version; - sha256 = "AiUGhTxz4Pkrks4oE+SAuAQPMuC5T2B6jo3Jd3sNrkQ="; + sha256 = "lpHW0JWxbLtOBns3By56ZBn47CZsDzwOFBuW9MlERrE="; }; - patches = [ ./hashlink.patch ]; - makeFlags = [ "PREFIX=$(out)" ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/hashlink/hashlink.patch b/third_party/nixpkgs/pkgs/development/interpreters/hashlink/hashlink.patch deleted file mode 100644 index 20d4eedd5a..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/hashlink/hashlink.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -107,6 +107,7 @@ LIBFLAGS += -L/opt/libjpeg-turbo/lib64 - endif - - LIBOPENAL = -lopenal -+LIBOPENGL = -lGL - RELEASE_NAME = linux - - endif ---- a/libs/sdl/gl.c -+++ b/libs/sdl/gl.c -@@ -7,7 +7,7 @@ - # include - # define HL_GLES - #elif defined(HL_MAC) --# include -+# include - # include - # define glBindImageTexture(...) hl_error("Not supported on OSX") - # define glDispatchCompute(...) hl_error("Not supported on OSX") ---- a/libs/sdl/sdl.c -+++ b/libs/sdl/sdl.c -@@ -7,7 +7,7 @@ - # include - # include - #elif defined(HL_MAC) --# include -+# include - #else - # include - #endif diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ivy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ivy/default.nix index 81ddfbf238..434b495277 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ivy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ivy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-pb/dJfEXz13myT6XadCg0kKd+n9bcHNBc84ES+hDw2Y="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix index 158d99e3b2..60202544ad 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/jimtcl/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; # test posix-1.6 needs the "hostname" command - checkInputs = [ inetutils ]; + nativeCheckInputs = [ inetutils ]; postInstall = '' ln -sr $out/lib/libjim.so.${version} $out/lib/libjim.so diff --git a/third_party/nixpkgs/pkgs/development/interpreters/kerf/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/kerf/default.nix index 96db9bbaeb..d904a1ede3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/kerf/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/kerf/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { CoreGraphics CoreVideo ]); - checkInputs = [ expect ]; + nativeCheckInputs = [ expect ]; doCheck = true; makeFlags = [ "kerf" "kerf_test" ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lolcode/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lolcode/default.nix index 23a77596e1..ccb0e062a5 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lolcode/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lolcode/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, doxygen, cmake, readline }: -with lib; stdenv.mkDerivation rec { pname = "lolcode"; @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { # Maybe it clashes with lci scientific logic software package... postInstall = "mv $out/bin/lci $out/bin/lolcode-lci"; - meta = { + meta = with lib; { homepage = "http://lolcode.org"; description = "An esoteric programming language"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix index a15a12dd28..c86e71ad36 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-lua-package.nix @@ -20,8 +20,8 @@ , buildInputs ? [] # Dependencies needed for running the checkPhase. -# These are added to buildInputs when doCheck = true. -, checkInputs ? [] +# These are added to nativeBuildInputs when doCheck = true. +, nativeCheckInputs ? [] # propagate build dependencies so in case we have A -> B -> C, # C can import package A propagated by B @@ -114,7 +114,7 @@ let nativeBuildInputs = [ wrapLua luarocks - ] ++ lib.optionals doCheck ([ luarocksCheckHook ] ++ self.checkInputs); + ] ++ lib.optionals doCheck ([ luarocksCheckHook ] ++ self.nativeCheckInputs); buildInputs = buildInputs ++ (map (d: d.dep) externalDeps'); diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrap-lua.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrap-lua.nix index 049afcd611..c9ef151bea 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrap-lua.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/wrap-lua.nix @@ -7,10 +7,10 @@ # defined in trivial-builders.nix # imported as wrapLua in lua-packages.nix and passed to build-lua-derivation to be used as buildInput makeSetupHook { + name = "wrap-lua-hook"; deps = makeWrapper; substitutions.executable = lua.interpreter; substitutions.lua = lua; substitutions.LuaPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; substitutions.LuaCPathSearchPaths = lib.escapeShellArgs lua.LuaPathSearchPaths; } ./wrap.sh - diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix index 411220870e..8596e379e7 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luajit/default.nix @@ -52,6 +52,15 @@ let ++ optional enableVMAssertions "-DLUAJIT_USE_ASSERT" ++ optional deterministicStringIds "-DLUAJIT_SECURITY_STRID=0" ; + + # LuaJIT requires build for 32bit architectures to be build on x86 not x86_64 + # TODO support also other build architectures. The ideal way would be to use + # stdenv_32bit but that doesn't work due to host platform mismatch: + # https://github.com/NixOS/nixpkgs/issues/212494 + buildStdenv = if buildPackages.stdenv.isx86_64 && stdenv.is32bit + then buildPackages.pkgsi686Linux.buildPackages.stdenv + else buildPackages.stdenv; + in stdenv.mkDerivation rec { pname = "luajit"; @@ -88,8 +97,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "DEFAULT_CC=cc" "CROSS=${stdenv.cc.targetPrefix}" - # TODO: when pointer size differs, we would need e.g. -m32 - "HOST_CC=${buildPackages.stdenv.cc}/bin/cc" + "HOST_CC=${buildStdenv.cc}/bin/cc" ] ++ lib.optional enableJITDebugModule "INSTALL_LJLIBD=$(INSTALL_LMOD)"; enableParallelBuilding = true; NIX_CFLAGS_COMPILE = XCFLAGS; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix index baed9801eb..0f88c73311 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/luau/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.558"; + version = "0.560"; src = fetchFromGitHub { owner = "Roblox"; repo = "luau"; rev = version; - hash = "sha256-103TLfVmXBN3Vd31nbBu7RlxrG4DX6xn/vpveIdnm5E="; + hash = "sha256-tGZ9gy/RqkVP/pXyMd2XgdVc2oekZfpsdDgAB3+rv9s="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/metamath/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/metamath/default.nix index 9c6c64f739..e83a724d25 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/metamath/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/metamath/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ASCII databases (set.mm and others) are also included in this derivation. ''; homepage = "http://us.metamath.org"; - downloadPage = "http://us.metamath.org/#downloads"; + downloadPage = "https://us.metamath.org/#downloads"; license = licenses.gpl2Plus; maintainers = [ maintainers.taneb ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix index 6c0eb22225..8030980b77 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/nelua/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation { pname = "nelua"; - version = "unstable-2022-11-20"; + version = "unstable-2023-01-21"; src = fetchFromGitHub { owner = "edubart"; repo = "nelua-lang"; - rev = "63909dc834708a5bd7c21d65a6633880f40295db"; - hash = "sha256-GeknXYsdRUzihzF3qHcCgbcB3w8geiWe5O1Az+4UqMs="; + rev = "d10cc61bc54050b07874a8597f8df20534885105"; + hash = "sha256-HyNYqhPCQVBJqEcAUUXfvycXE8tWIMIUJJMTIV48ne8="; }; makeFlags = [ "PREFIX=$(out)" ]; - checkInputs = [ luaPackages.luacheck ]; + nativeCheckInputs = [ luaPackages.luacheck ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/nextflow/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/nextflow/default.nix index 7f96a29039..1d3d1070fc 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/nextflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/nextflow/default.nix @@ -2,25 +2,35 @@ , stdenv , fetchurl , makeWrapper -, jre +, openjdk17 , wget , which , gnused , gawk , coreutils +, buildFHSUserEnv }: +let + nextflow = stdenv.mkDerivation rec { pname = "nextflow"; - version = "22.04.5"; + version = "22.10.6"; src = fetchurl { url = "https://github.com/nextflow-io/nextflow/releases/download/v${version}/nextflow-${version}-all"; - sha256 = "sha256-Lpxb0lGR/oiPzj6j+lySZwiRgkRgPgyjK7FX0BSejm4="; + hash = "sha256-zeYsKxWRnzr0W6CD+yjoAXwCN/AbN5P4HhH1oftnrjY="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre wget which gnused gawk coreutils ]; + nativeBuildInputs = [ + makeWrapper + openjdk17 + wget + which + gnused + gawk + coreutils + ]; dontUnpack = true; @@ -34,7 +44,9 @@ stdenv.mkDerivation rec { ''; postFixup = '' - wrapProgram $out/bin/nextflow --prefix PATH : ${lib.makeBinPath buildInputs} + wrapProgram $out/bin/nextflow \ + --prefix PATH : ${lib.makeBinPath nativeBuildInputs} \ + --set JAVA_HOME ${openjdk17.home} ''; meta = with lib; { @@ -53,4 +65,13 @@ stdenv.mkDerivation rec { mainProgram = "nextflow"; platforms = platforms.unix; }; -} +}; +in +if stdenv.isLinux then + buildFHSUserEnv + { + name = "nextflow"; + targetPkgs = pkgs: [ nextflow ]; + runScript = "nextflow"; + } +else nextflow diff --git a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix index ce7947a842..e8db13a647 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -12,8 +12,6 @@ assert (enableCrypt -> (libxcrypt != null)); # cgit) that are needed here should be included directly in Nixpkgs as # files. -with lib; - let libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; @@ -33,7 +31,7 @@ let strictDeps = true; # TODO: Add a "dev" output containing the header files. outputs = [ "out" "man" "devdoc" ] ++ - optional crossCompiling "mini"; + lib.optional crossCompiling "mini"; setOutputFlags = false; # On FreeBSD, if Perl is built with threads support, having @@ -57,9 +55,9 @@ let # Enable TLS/SSL verification in HTTP::Tiny by default ./http-tiny-verify-ssl-by-default.patch ] - ++ optional stdenv.isSunOS ./ld-shared.patch - ++ optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] - ++ optional crossCompiling ./MakeMaker-cross.patch; + ++ lib.optional stdenv.isSunOS ./ld-shared.patch + ++ lib.optionals stdenv.isDarwin [ ./cpp-precomp.patch ./sw_vers.patch ] + ++ lib.optional crossCompiling ./MakeMaker-cross.patch; # This is not done for native builds because pwd may need to come from # bootstrap tools when building bootstrap perl. @@ -93,18 +91,18 @@ let "-Dlocincpth=${libcInc}/include" "-Dloclibpth=${libcLib}/lib" ] - ++ optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ] - ++ optional stdenv.isSunOS "-Dcc=gcc" - ++ optional enableThreading "-Dusethreads" - ++ optional (!enableCrypt) "-A clear:d_crypt_r" - ++ optional stdenv.hostPlatform.isStatic "--all-static" - ++ optionals (!crossCompiling) [ + ++ lib.optionals ((builtins.match ''5\.[0-9]*[13579]\..+'' version) != null) [ "-Dusedevel" "-Uversiononly" ] + ++ lib.optional stdenv.isSunOS "-Dcc=gcc" + ++ lib.optional enableThreading "-Dusethreads" + ++ lib.optional (!enableCrypt) "-A clear:d_crypt_r" + ++ lib.optional stdenv.hostPlatform.isStatic "--all-static" + ++ lib.optionals (!crossCompiling) [ "-Dprefix=${placeholder "out"}" "-Dman1dir=${placeholder "out"}/share/man/man1" "-Dman3dir=${placeholder "out"}/share/man/man3" ]; - configureScript = optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; + configureScript = lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; dontAddStaticConfigureFlags = true; @@ -138,9 +136,9 @@ let OLD_ZLIB = False GZIP_OS_CODE = AUTO_DETECT EOF - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" - '' + optionalString (!enableThreading) '' + '' + lib.optionalString (!enableThreading) '' # We need to do this because the bootstrap doesn't have a static libpthread sed -i 's,\(libswanted.*\)pthread,\1,g' Configure ''; @@ -183,7 +181,7 @@ let }" /no-such-path \ --replace "${stdenv.cc}" /no-such-path \ --replace "$man" /no-such-path - '' + optionalString crossCompiling + '' + lib.optionalString crossCompiling '' mkdir -p $mini/lib/perl5/cross_perl/${version} for dir in cnf/{stub,cpan}; do @@ -207,7 +205,7 @@ let "$mini/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch" ''; # */ - meta = { + meta = with lib; { homepage = "https://www.perl.org/"; description = "The standard implementation of the Perl 5 programmming language"; license = licenses.artistic1; @@ -215,7 +213,7 @@ let platforms = platforms.all; priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; - } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { + } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { crossVersion = "c876045741f5159318085d2737b0090f35a842ca"; # June 5, 2022 perl-cross-src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix index 5a363822bc..b8ceac621a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix @@ -52,7 +52,7 @@ let , cgotoSupport ? false , embedSupport ? false , ipv6Support ? true - , systemdSupport ? stdenv.isLinux + , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , valgrindSupport ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind , ztsSupport ? apxs2Support }@args: diff --git a/third_party/nixpkgs/pkgs/development/interpreters/picolisp/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/picolisp/default.nix index 8e3e868fad..b85f99a7b5 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/picolisp/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/picolisp/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl, jdk, w3m, openssl, makeWrapper }: -with lib; stdenv.mkDerivation rec { pname = "picoLisp"; @@ -9,11 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0l51x98bn1hh6kv40sdgp0x09pzg5i8yxbcjvm9n5bxsd6bbk5w2"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [openssl] ++ optional stdenv.is64bit jdk; + buildInputs = [openssl] ++ lib.optional stdenv.is64bit jdk; patchPhase = '' sed -i "s/which java/command -v java/g" mkAsm - ${optionalString stdenv.isAarch32 '' + ${lib.optionalString stdenv.isAarch32 '' sed -i s/-m32//g Makefile cat >>Makefile < (!enableOptimizations)) assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode)) "Deterministic builds are not achieved when (default unoptimized) bytecode is created."; -with lib; - let buildPackages = pkgsBuildHost; inherit (passthru) pythonForBuild; @@ -133,9 +131,9 @@ let # * https://github.com/python/cpython/commit/e6b247c8e524 ../3.7/no-win64-workaround.patch - ] ++ optionals (x11Support && stdenv.isDarwin) [ + ] ++ lib.optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since # ldconfig doesn't work on NixOS), and don't use @@ -147,7 +145,7 @@ let # Fix ctypes.util.find_library with gcc10. ./find_library-gcc10.patch - ] ++ optionals stdenv.hostPlatform.isCygwin [ + ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ ./2.5.2-ctypes-util-find_library.patch ./2.5.2-tkinter-x11.patch ./2.6.2-ssl-threads.patch @@ -158,7 +156,7 @@ let ./2.7.3-dylib.patch ./2.7.3-getpath-exe-extension.patch ./2.7.3-no-libm.patch - ] ++ optionals hasDistutilsCxxPatch [ + ] ++ lib.optionals hasDistutilsCxxPatch [ # Patch from http://bugs.python.org/issue1222585 adapted to work with # `patch -p1' and with a last hunk removed @@ -166,7 +164,7 @@ let # only works for GCC and Apple Clang. This makes distutils to call C++ # compiler when needed. ./python-2.7-distutils-C++.patch - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ./cross-compile.patch ]; @@ -175,31 +173,31 @@ let for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done - '' + optionalString (stdenv ? cc && stdenv.cc.libc != null) '' + '' + lib.optionalString (stdenv ? cc && stdenv.cc.libc != null) '' for i in Lib/plat-*/regen; do substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/ done - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' substituteInPlace Lib/multiprocessing/__init__.py \ --replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")' ''; - configureFlags = optionals enableOptimizations [ + configureFlags = lib.optionals enableOptimizations [ "--enable-optimizations" - ] ++ optionals (!static) [ + ] ++ lib.optionals (!static) [ "--enable-shared" ] ++ [ "--with-threads" "--with-system-ffi" "--with-system-expat" "--enable-unicode=ucs${toString ucsEncoding}" - ] ++ optionals stdenv.hostPlatform.isCygwin [ + ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ "ac_cv_func_bind_textdomain_codeset=yes" - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "--disable-toolbox-glue" - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "PYTHON_FOR_BUILD=${getBin buildPackages.python}/bin/python" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "PYTHON_FOR_BUILD=${lib.getBin buildPackages.python}/bin/python" "ac_cv_buggy_getaddrinfo=no" # Assume little-endian IEEE 754 floating point when cross compiling "ac_cv_little_endian_double=yes" @@ -223,23 +221,23 @@ let ] # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. - ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no" - ++ optional static "LDFLAGS=-static"; + ++ lib.optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no" + ++ lib.optional static "LDFLAGS=-static"; strictDeps = true; buildInputs = - optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ + lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl zlib libffi expat db gdbm ncurses sqlite readline ] - ++ optionals x11Support [ tcl tk libX11 ] - ++ optional (stdenv.isDarwin && configd != null) configd; + ++ lib.optionals x11Support [ tcl tk libX11 ] + ++ lib.optional (stdenv.isDarwin && configd != null) configd; nativeBuildInputs = [ autoreconfHook ] - ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc buildPackages.python ]; mkPaths = paths: { - C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; - LIBRARY_PATH = makeLibraryPath paths; + C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" paths; + LIBRARY_PATH = lib.makeLibraryPath paths; }; # Python 2.7 needs this @@ -258,13 +256,13 @@ in with passthru; stdenv.mkDerivation ({ LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; - NIX_CFLAGS_COMPILE = optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2" - + optionalString stdenv.hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000"; + NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2" + + lib.optionalString stdenv.hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000"; DETERMINISTIC_BUILD = 1; setupHook = python-setup-hook sitePackages; - postPatch = optionalString (x11Support && (tix != null)) '' + postPatch = lib.optionalString (x11Support && (tix != null)) '' substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; @@ -291,18 +289,18 @@ in with passthru; stdenv.mkDerivation ({ # Determinism: Windows installers were not deterministic. # We're also not interested in building Windows installers. find "$out" -name 'wininst*.exe' | xargs -r rm -f - '' + optionalString stripBytecode '' + '' + lib.optionalString stripBytecode '' # Determinism: deterministic bytecode # First we delete all old bytecode. find $out -name "*.pyc" -delete - '' + optionalString rebuildBytecode '' + '' + lib.optionalString rebuildBytecode '' # We build 3 levels of optimized bytecode. Note the default level, without optimizations, # is not reproducible yet. https://bugs.python.org/issue29708 # Not creating bytecode will result in a large performance loss however, so we do build it. find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | ${pythonForBuildInterpreter} -O -m compileall -q -f -x "lib2to3" -i - find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - - '' + optionalString stdenv.hostPlatform.isCygwin '' + '' + lib.optionalString stdenv.hostPlatform.isCygwin '' cp libpython2.7.dll.a $out/lib ''; @@ -311,14 +309,14 @@ in with passthru; stdenv.mkDerivation ({ postFixup = '' # Include a sitecustomize.py file. Note it causes an error when it's in postInstall with 2.7. cp ${../../sitecustomize.py} $out/${sitePackages}/sitecustomize.py - '' + optionalString strip2to3 '' + '' + lib.optionalString strip2to3 '' rm -R $out/bin/2to3 $out/lib/python*/lib2to3 - '' + optionalString stripConfig '' + '' + lib.optionalString stripConfig '' rm -R $out/bin/python*-config $out/lib/python*/config* - '' + optionalString stripIdlelib '' + '' + lib.optionalString stripIdlelib '' # Strip IDLE rm -R $out/bin/idle* $out/lib/python*/idlelib - '' + optionalString stripTests '' + '' + lib.optionalString stripTests '' # Strip tests rm -R $out/lib/python*/test $out/lib/python*/**/test{,s} ''; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix deleted file mode 100644 index 2e399aa52f..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "python37-docs-html"; - version = "3.7.2"; - - src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-html.tar.bz2"; - sha256 = "19wbrawpdam09fmyipfy92sxwn1rl93v8jkfqsfx028qhvzf0422"; - }; - installPhase = '' - mkdir -p $out/share/doc/python37 - cp -R ./ $out/share/doc/python37/html - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix deleted file mode 100644 index 9879a26be5..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "python37-docs-pdf-a4"; - version = "3.7.2"; - - src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-a4.tar.bz2"; - sha256 = "0vdx762m30hjaabn6w88awcj2qpbz0b6z59zn9wmamd35k59lfba"; - }; - installPhase = '' - mkdir -p $out/share/doc/python37 - cp -R ./ $out/share/doc/python37/pdf-a4 - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix deleted file mode 100644 index 7c58c45776..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "python37-docs-pdf-letter"; - version = "3.7.2"; - - src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-pdf-letter.tar.bz2"; - sha256 = "17g57vlyvqx0k916q84q2pcx7y8myw0fda9fvg9kh0ph930c837x"; - }; - installPhase = '' - mkdir -p $out/share/doc/python37 - cp -R ./ $out/share/doc/python37/pdf-letter - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix deleted file mode 100644 index 641e4913f6..0000000000 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - pname = "python37-docs-text"; - version = "3.7.2"; - - src = fetchurl { - url = "http://docs.python.org/ftp/python/doc/${version}/python-${version}-docs-text.tar.bz2"; - sha256 = "0h50rlr8jclwfxa106b42q2vn2ynp219c4zsy5qz65n5m3b7y1g2"; - }; - installPhase = '' - mkdir -p $out/share/doc/python37 - cp -R ./ $out/share/doc/python37/text - ''; - meta = { - maintainers = [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index faab3eb785..bb709694dc 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -36,8 +36,12 @@ stdenv ]; providesSetupHook = lib.attrByPath [ "provides" "setupHook"] false; - valid = value: !((lib.isDerivation value) && !((pythonPackages.hasPythonModule value) || (providesSetupHook value))) || (lib.elem value exceptions); - func = name: value: if (valid value) then value else throw "${name} should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python packages set."; + valid = value: pythonPackages.hasPythonModule value || providesSetupHook value || lib.elem value exceptions; + func = name: value: + if lib.isDerivation value then + lib.extendDerivation (valid value || throw "${name} should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python packages set.") {} value + else + value; in lib.mapAttrs func items; in ensurePythonModules (callPackage # Function that when called diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix index bdb4969bf1..b1f35cc2fb 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -39,6 +39,7 @@ # Dependencies needed for running the checkPhase. # These are added to buildInputs when doCheck = true. , checkInputs ? [] +, nativeCheckInputs ? [] # propagate build dependencies so in case we have A -> B -> C, # C can import package A propagated by B @@ -100,12 +101,6 @@ , ... } @ attrs: - -# Keep extra attributes from `attrs`, e.g., `patchPhase', etc. -if disabled -then throw "${name} not supported for interpreter ${python.executable}" -else - let inherit (python) stdenv; @@ -113,8 +108,9 @@ let name_ = name; + # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ - "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" + "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" "disabledTestPaths" "outputs" ]) // { @@ -169,13 +165,14 @@ let # Python packages don't have a checkPhase, only an installCheckPhase doCheck = false; doInstallCheck = attrs.doCheck or true; - installCheckInputs = [ + nativeInstallCheckInputs = [ ] ++ lib.optionals (format == "setuptools") [ # Longer-term we should get rid of this and require # users of this function to set the `installCheckPhase` or # pass in a hook that sets it. setuptoolsCheckHook - ] ++ checkInputs; + ] ++ nativeCheckInputs; + installCheckInputs = checkInputs; postFixup = lib.optionalString (!dontWrapPythonPrograms) '' wrapPythonPrograms @@ -202,4 +199,7 @@ let passthru.updateScript = let filename = builtins.head (lib.splitString ":" self.meta.position); in attrs.passthru.updateScript or [ update-python-libraries filename ]; -in lib.extendDerivation true passthru self +in lib.extendDerivation + (disabled -> throw "${name} not supported for interpreter ${python.executable}") + passthru + self diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix index 92b0a456b0..d5b02223fd 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/python-packages-base.nix @@ -41,8 +41,6 @@ let # See build-setupcfg/default.nix for documentation. buildSetupcfg = import ../../../build-support/build-setupcfg self; - fetchPypi = callPackage ./fetchpypi.nix { }; - # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; @@ -89,7 +87,7 @@ in { inherit lib pkgs stdenv; inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; inherit buildPythonPackage buildPythonApplication; - inherit fetchPypi; + inherit (pkgs) fetchPypi; inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; inherit toPythonModule toPythonApplication; inherit buildSetupcfg; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix index 645b1de2d7..a7c6c8d842 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/rustpython/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; meta = with lib; { description = "Python 3 interpreter in written Rust"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/wrap-python.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/wrap-python.nix index 29fc6cf820..83da013bfd 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/wrap-python.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/wrap-python.nix @@ -3,9 +3,8 @@ , makePythonHook , makeWrapper }: -with lib; - makePythonHook { + name = "wrap-python-hook"; deps = makeWrapper; substitutions.sitePackages = python.sitePackages; substitutions.executable = python.interpreter; @@ -19,7 +18,7 @@ makePythonHook { mkStringSkipper = labelNum: quote: let label = "q${toString labelNum}"; - isSingle = elem quote [ "\"" "'\"'\"'" ]; + isSingle = lib.elem quote [ "\"" "'\"'\"'" ]; endQuote = if isSingle then "[^\\\\]${quote}" else quote; in '' /^[a-z]?${quote}/ { @@ -45,8 +44,8 @@ makePythonHook { :r /\\$|,$/{N;br} /__future__|^ |^ *(#.*)?$/{n;br} - ${concatImapStrings mkStringSkipper quoteVariants} - /^[^# ]/i ${replaceStrings ["\n"] [";"] preamble} + ${lib.concatImapStrings mkStringSkipper quoteVariants} + /^[^# ]/i ${lib.replaceStrings ["\n"] [";"] preamble} } ''; } ./wrap.sh diff --git a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix index 3af1b408b3..cfdeac264c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.14.2"; + version = "0.14.6"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-+U9K6PRcWbs5JzlJudcpCCk3zHkqE8L1Sq/wkf68jyY="; + sha256 = "sha256-3FRzqHbzNhmYg3wRvajMzTWB7lOlgrxwQvvnB3fggGM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/ruby-version.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/ruby-version.nix index b1cbbfc216..23f7f46a47 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/ruby-version.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/ruby-version.nix @@ -1,6 +1,6 @@ # Contains the ruby version heuristics { lib }: -with lib; + let # The returned set should be immutable rubyVersion = major: minor: tiny: tail: @@ -10,15 +10,15 @@ let # Contains the patch number "223" if tail is "p223" or null patchLevel = let - p = removePrefix "p" tail; + p = lib.removePrefix "p" tail; isPosInt = num: - 0 == stringLength - (replaceStrings + 0 == lib.stringLength + (lib.replaceStrings ["0" "1" "2" "3" "4" "5" "6" "7" "8" "9"] ["" "" "" "" "" "" "" "" "" "" ] num); in - if hasPrefix "p" tail && isPosInt p then p + if lib.hasPrefix "p" tail && isPosInt p then p else null; # Shortcuts @@ -28,11 +28,11 @@ let # Ruby separates lib and gem folders by ABI version which isn't very # consistent. libDir = - if versionAtLeast majMinTiny "2.1.0" then + if lib.versionAtLeast majMinTiny "2.1.0" then "${majMin}.0" - else if versionAtLeast majMinTiny "2.0.0" then + else if lib.versionAtLeast majMinTiny "2.0.0" then "2.0.0" - else if versionAtLeast majMinTiny "1.9.1" then + else if lib.versionAtLeast majMinTiny "1.9.1" then "1.9.1" else throw "version ${majMinTiny} is not supported"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/self/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/self/default.nix index 58cac6bbe9..0da843d3f1 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/self/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/self/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine"; homepage = "https://selflanguage.org/"; license = licenses.bsd3; - maintainers = [ maintainers.doublec ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix index a669508268..32a0ae2e74 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix @@ -149,6 +149,7 @@ stdenv.mkDerivation (finalAttrs: rec { # while we have a double-float toolchain NIX_CFLAGS_COMPILE = lib.optionalString (with stdenv.hostPlatform; isRiscV && is64bit && lib.versionOlder version "91") "-mabi=lp64d"; + # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = if (with stdenv; isAarch64 && isLinux) then [ "-lgcc" ] else null; postPatch = lib.optionalString (lib.versionOlder version "102") '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix b/third_party/nixpkgs/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix index 0e44eb3585..57d60f0f2a 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix @@ -10,6 +10,7 @@ , nativeBuildInputs ? [] , propagatedBuildInputs ? [] , checkInputs ? [] +, nativeCheckInputs ? [] # true if we should skip the configuration phase altogether , dontConfigure ? false @@ -27,7 +28,7 @@ let inherit (tcl) stdenv; - inherit (lib) getBin optionalAttrs optionals; + inherit (lib) getBin optionalAttrs; defaultTclPkgConfigureFlags = [ "--with-tcl=${tcl}/lib" @@ -36,7 +37,7 @@ let ]; self = (stdenv.mkDerivation ((builtins.removeAttrs attrs [ - "addTclConfigureFlags" "checkPhase" "checkInputs" "doCheck" + "addTclConfigureFlags" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" ]) // { buildInputs = buildInputs ++ [ tcl.tclPackageHook ]; @@ -47,8 +48,9 @@ let # Run tests after install, at which point we've done all TCLLIBPATH setup doCheck = false; - doInstallCheck = attrs.doCheck or ((attrs ? doInstallCheck) && attrs.doInstallCheck); - installCheckInputs = checkInputs ++ (optionals (attrs ? installCheckInputs) attrs.installCheckInputs); + doInstallCheck = attrs.doCheck or (attrs.doInstallCheck or false); + installCheckInputs = checkInputs ++ (attrs.installCheckInputs or []); + nativeInstallCheckInputs = nativeCheckInputs ++ (attrs.nativeInstallCheckInputs or []); # Add typical values expected by TEA for configureFlags configureFlags = diff --git a/third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix index 000b0534a1..1b298af4ac 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix @@ -72,8 +72,8 @@ stdenv.mkDerivation rec { TinyScheme is a lightweight Scheme interpreter that implements as large a subset of R5RS as was possible without getting very large and complicated. ''; - homepage = "http://tinyscheme.sourceforge.net/"; - changelog = "http://tinyscheme.sourceforge.net/CHANGES"; + homepage = "https://tinyscheme.sourceforge.net/"; + changelog = "https://tinyscheme.sourceforge.net/CHANGES"; license = licenses.bsdOriginal; mainProgram = pname; maintainers = [ maintainers.ebzzry ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix index b6bb4c1663..5666b078b4 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-t/ObsvUSNGFvHkVH2nl8vLFI+5GUQx6niCgeH4ykk/0="; + rev = "refs/tags/v${version}"; + hash = "sha256-797I3FBBfnAgNfOdMajm3WNkMo3MUXb1347LBggXrLk="; }; - cargoSha256 = "sha256-75/0D0lrV50wH51Ll7M1Lvqj2kRSaJXiQWElxCaF9mE="; + cargoHash = "sha256-zUTwhfRLKUixgj3JXiz2QOuwbFhfget+GcFSRL1QJ3w="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix index 5ae05510f6..f0d71673c2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zuo"; - version = "unstable-2022-11-15"; + version = "unstable-2023-01-02"; src = fetchFromGitHub { owner = "racket"; repo = "zuo"; - rev = "7492a8aa3721bfad7d158497313b913537a8b12d"; - hash = "sha256-9tMYaKjBTGm9NjcytpUS9mgBlE9L1U2VECsqfU706u4="; + rev = "464aae9ae90dcb43ab003b922e4ae4d08611c55b"; + hash = "sha256-O8p3dEXqAP2UNPNBla9AtkndxgL8UoVp/QygXOmcgWg="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/java-modules/maven-minimal.nix b/third_party/nixpkgs/pkgs/development/java-modules/maven-minimal.nix index d966a75bb9..01774cc262 100644 --- a/third_party/nixpkgs/pkgs/development/java-modules/maven-minimal.nix +++ b/third_party/nixpkgs/pkgs/development/java-modules/maven-minimal.nix @@ -1,6 +1,5 @@ { lib, pkgs }: -with lib; with pkgs.javaPackages; let @@ -10,7 +9,7 @@ let poms = import ./poms.nix { inherit fetchMaven; }; in { # Maven needs all of these to function - mavenMinimal = flatten + mavenMinimal = lib.flatten collections.mavenLibs_2_0_6 ++ collections.mavenLibs_2_0_9 ++ collections.mavenLibs_2_2_1 diff --git a/third_party/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix index 4c67c927e5..6c1eeff941 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/AntTweakBar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { (compatibility and core profiles), DirectX 9, DirectX 10 or DirectX 11 to interactively tweak parameters on-screen ''; - homepage = "http://anttweakbar.sourceforge.net/"; + homepage = "https://anttweakbar.sourceforge.net/"; license = lib.licenses.zlib; maintainers = [ lib.maintainers.razvan ]; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/CGAL/4.nix b/third_party/nixpkgs/pkgs/development/libraries/CGAL/4.nix index 9c0305ec07..d30492c890 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/CGAL/4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/CGAL/4.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; patches = [ + ./cgal_path.patch # Pull upstream fix for c++17 (gcc-12): # https://github.com/CGAL/cgal/pull/6109 diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL/default.nix index 3a2a048a86..5299135e9f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL/default.nix @@ -11,17 +11,15 @@ # NOTE: When editing this expression see if the same change applies to # SDL2 expression too -with lib; - let extraPropagatedBuildInputs = [ ] - ++ optionals x11Support [ libXext libICE libXrandr ] - ++ optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ] - ++ optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ] - ++ optional alsaSupport alsa-lib - ++ optional pulseaudioSupport libpulseaudio - ++ optional stdenv.isDarwin Cocoa; - rpath = makeLibraryPath extraPropagatedBuildInputs; + ++ lib.optionals x11Support [ libXext libICE libXrandr ] + ++ lib.optionals (openglSupport && stdenv.isLinux) [ libGL libGLU ] + ++ lib.optionals (openglSupport && stdenv.isDarwin) [ OpenGL GLUT ] + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional stdenv.isDarwin Cocoa; + rpath = lib.makeLibraryPath extraPropagatedBuildInputs; in stdenv.mkDerivation rec { @@ -40,13 +38,13 @@ stdenv.mkDerivation rec { outputBin = "dev"; # sdl-config nativeBuildInputs = [ pkg-config ] - ++ optional stdenv.isLinux libcap; + ++ lib.optional stdenv.isLinux libcap; propagatedBuildInputs = [ libiconv ] ++ extraPropagatedBuildInputs; buildInputs = [ ] - ++ optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile - ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; + ++ lib.optional (!stdenv.hostPlatform.isMinGW && alsaSupport) audiofile + ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ]; configureFlags = [ "--disable-oss" @@ -58,9 +56,9 @@ stdenv.mkDerivation rec { # SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) # # Please try revert the change that introduced this comment when updating SDL. - ] ++ optional stdenv.isDarwin "--disable-x11-shared" - ++ optional (!x11Support) "--without-x" - ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"; + ] ++ lib.optional stdenv.isDarwin "--disable-x11-shared" + ++ lib.optional (!x11Support) "--without-x" + ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib"; patches = [ ./find-headers.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix index a38761ed7c..f601e10166 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -55,8 +55,6 @@ # NOTE: When editing this expression see if the same change applies to # SDL expression too -with lib; - stdenv.mkDerivation rec { pname = "SDL2"; version = "2.24.2"; @@ -88,40 +86,40 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkg-config ] ++ optionals waylandSupport [ wayland wayland-scanner ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals waylandSupport [ wayland wayland-scanner ]; propagatedBuildInputs = dlopenPropagatedBuildInputs; dlopenPropagatedBuildInputs = [ ] # Propagated for #include in SDL_opengles.h. - ++ optional openglSupport libGL + ++ lib.optional openglSupport libGL # Propagated for #include and in SDL_syswm.h. - ++ optionals x11Support [ libX11 xorgproto ]; + ++ lib.optionals x11Support [ libX11 xorgproto ]; - dlopenBuildInputs = optionals alsaSupport [ alsa-lib audiofile ] - ++ optional dbusSupport dbus - ++ optional libdecorSupport libdecor - ++ optional pipewireSupport pipewire - ++ optional pulseaudioSupport libpulseaudio - ++ optional udevSupport udev - ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] - ++ optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] - ++ optionals drmSupport [ libdrm mesa ]; + dlopenBuildInputs = lib.optionals alsaSupport [ alsa-lib audiofile ] + ++ lib.optional dbusSupport dbus + ++ lib.optional libdecorSupport libdecor + ++ lib.optional pipewireSupport pipewire + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional udevSupport udev + ++ lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] + ++ lib.optionals x11Support [ libICE libXi libXScrnSaver libXcursor libXinerama libXext libXrandr libXxf86vm ] + ++ lib.optionals drmSupport [ libdrm mesa ]; buildInputs = [ libiconv ] ++ dlopenBuildInputs - ++ optional ibusSupport ibus - ++ optional fcitxSupport fcitx - ++ optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; + ++ lib.optional ibusSupport ibus + ++ lib.optional fcitxSupport fcitx + ++ lib.optionals stdenv.isDarwin [ AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL ]; enableParallelBuilding = true; configureFlags = [ "--disable-oss" - ] ++ optional (!x11Support) "--without-x" - ++ optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" - ++ optional stdenv.targetPlatform.isWindows "--disable-video-opengles" - ++ optional stdenv.isDarwin "--disable-sdltest"; + ] ++ lib.optional (!x11Support) "--without-x" + ++ lib.optional alsaSupport "--with-alsa-prefix=${alsa-lib.out}/lib" + ++ lib.optional stdenv.targetPlatform.isWindows "--disable-video-opengles" + ++ lib.optional stdenv.isDarwin "--disable-sdltest"; # We remove libtool .la files when static libs are requested, # because they make the builds of downstream libs like `SDL_tff` @@ -156,9 +154,9 @@ stdenv.mkDerivation rec { # list the symbols used in this way. postFixup = let - rpath = makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs); + rpath = lib.makeLibraryPath (dlopenPropagatedBuildInputs ++ dlopenBuildInputs); in - optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") '' + lib.optionalString (stdenv.hostPlatform.extensions.sharedLibrary == ".so") '' for lib in $out/lib/*.so* ; do if ! [[ -L "$lib" ]]; then patchelf --set-rpath "$(patchelf --print-rpath $lib):${rpath}" "$lib" diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix index 7c90092fe8..e24af838c6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL_Pango/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Connects the Pango rendering engine to SDL"; license = licenses.lgpl21Plus; platforms = platforms.all; - homepage = "http://sdlpango.sourceforge.net/"; + homepage = "https://sdlpango.sourceforge.net/"; maintainers = with maintainers; [ puckipedia ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL_compat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL_compat/default.nix index d0cb80fb6b..ff5d2649aa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL_compat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL_compat/default.nix @@ -6,6 +6,7 @@ , SDL2 , libiconv , Cocoa +, autoSignDarwinBinariesHook , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , openglSupport ? libGLSupported , libGL @@ -27,7 +28,8 @@ stdenv.mkDerivation rec { hash = "sha256-8b9rFI4iRpBJqeJ2KRJ9vRyv9gYwa9jRWCuXRfA3x50="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config ] + ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]; propagatedBuildInputs = [ SDL2 ] ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Cocoa ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix index e6318b8485..99f86dd258 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL_stretch/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Stretch Functions For SDL"; - homepage = "http://sdl-stretch.sourceforge.net/"; + homepage = "https://sdl-stretch.sourceforge.net/"; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix index 612aa472b0..2e617ef9e0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ace"; - version = "7.0.8"; + version = "7.0.11"; src = fetchurl { url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "sha256-bZQKtNIdTzCbwE3T/fF7e/1CETG4S42Hq8S9RDxCZdw="; + sha256 = "sha256-r+LRiu/u1qMcbrjkSr8ErnemX6zvhgvc5cLWu8AQhww="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aften/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aften/default.nix index 11ed0f1b28..97b2230f03 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aften/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aften/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An audio encoder which generates compressed audio streams based on ATSC A/52 specification"; - homepage = "http://aften.sourceforge.net/"; + homepage = "https://aften.sourceforge.net/"; license = licenses.lgpl21Only; platforms = platforms.unix; maintainers = with maintainers; [ emilytrau ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix index 667d334c90..c7bc4894e1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "sha256-QnqUD8KmMDmEZ1REoKN70SwVICOdyGPZsB/lU9nojj4="; + sha256 = "sha256-8dQhOQN0t2Y2kC2wOpQUqbu6Woy4DUmiLqXjf1D+mxE="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index 0895698378..4fd87c69d7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2022.Q3.5"; + version = "2022.Q4.4"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "YY9/njuzGONqAtbM54OGGvC1V73JyL+IHkLSZs4JSYs="; + sha256 = "sha256-MKU7bfjrvH4M2kON2tr5463nYjN1xoGAknsC9YmklEc="; }; buildInputs = [ @@ -68,6 +68,7 @@ in stdenv.mkDerivation rec { xorg.libX11 xorg.libxcb xorg.libxshmfence + zlib ]; cmakeDir = "../drivers/xgl"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aml/default.nix index 392dae609c..1a6900d298 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aml/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aml"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WhhjK9uzKyvnzpGtAWXXo0upfZTPINHVk0qmzNXwobE="; + sha256 = "sha256-BX+MRqvnwwLPhz22m0gfJ2EkW31KQEi/YTgOCMcQk2Q="; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/apr-util/default.nix b/third_party/nixpkgs/pkgs/development/libraries/apr-util/default.nix index 909965bb06..594ecfbdb3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/apr-util/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/apr-util/default.nix @@ -10,8 +10,6 @@ assert sslSupport -> openssl != null; assert bdbSupport -> db != null; assert ldapSupport -> openldap != null; -with lib; - stdenv.mkDerivation rec { pname = "apr-util"; version = "1.6.1"; @@ -22,21 +20,21 @@ stdenv.mkDerivation rec { }; patches = [ ./fix-libxcrypt-build.patch ] - ++ optional stdenv.isFreeBSD ./include-static-dependencies.patch; + ++ lib.optional stdenv.isFreeBSD ./include-static-dependencies.patch; NIX_CFLAGS_LINK = [ "-lcrypt" ]; outputs = [ "out" "dev" ]; outputBin = "dev"; - nativeBuildInputs = [ makeWrapper ] ++ optional stdenv.isFreeBSD autoreconfHook; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isFreeBSD autoreconfHook; configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ] - ++ optional (!stdenv.isCygwin) "--with-crypto" - ++ optional sslSupport "--with-openssl=${openssl.dev}" - ++ optional bdbSupport "--with-berkeley-db=${db.dev}" - ++ optional ldapSupport "--with-ldap=ldap" - ++ optionals stdenv.isCygwin + ++ lib.optional (!stdenv.isCygwin) "--with-crypto" + ++ lib.optional sslSupport "--with-openssl=${openssl.dev}" + ++ lib.optional bdbSupport "--with-berkeley-db=${db.dev}" + ++ lib.optional ldapSupport "--with-ldap=ldap" + ++ lib.optionals stdenv.isCygwin [ "--without-pgsql" "--without-sqlite2" "--without-sqlite3" "--without-freetds" "--without-berkeley-db" "--without-crypto" ] ; @@ -53,10 +51,10 @@ stdenv.mkDerivation rec { ''; propagatedBuildInputs = [ apr expat libiconv libxcrypt ] - ++ optional sslSupport openssl - ++ optional bdbSupport db - ++ optional ldapSupport openldap - ++ optional stdenv.isFreeBSD cyrus_sasl; + ++ lib.optional sslSupport openssl + ++ lib.optional bdbSupport db + ++ lib.optional ldapSupport openldap + ++ lib.optional stdenv.isFreeBSD cyrus_sasl; postInstall = '' for f in $out/lib/*.la $out/lib/apr-util-1/*.la $dev/bin/apu-1-config; do diff --git a/third_party/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix index 1a09ed84a1..f4fc2101e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/argp-standalone/default.nix @@ -1,62 +1,25 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, meson, ninja }: -let - patch-argp-fmtstream = fetchpatch { - name = "patch-argp-fmtstream.h"; - url = "https://raw.githubusercontent.com/Homebrew/formula-patches/b5f0ad3/argp-standalone/patch-argp-fmtstream.h"; - sha256 = "5656273f622fdb7ca7cf1f98c0c9529bed461d23718bc2a6a85986e4f8ed1cb8"; - }; - - patch-throw-in-funcdef = fetchpatch { - name = "argp-standalone-1.3-throw-in-funcdef.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/argp-standalone/files/argp-standalone-1.3-throw-in-funcdef.patch?id=409d0e2a9c9c899fb1fb04cc808fe0aff3f745ca"; - sha256 = "0b2b4l1jkvmnffl22jcn4ydzxy2i7fnmmnfim12f0yg5pb8fs43c"; - }; - - patch-shared = fetchpatch { - name = "argp-standalone-1.3-shared.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-libs/argp-standalone/files/argp-standalone-1.3-shared.patch?id=409d0e2a9c9c899fb1fb04cc808fe0aff3f745ca"; - sha256 = "1xx2zdc187a1m2x6c1qs62vcrycbycw7n0q3ks2zkxpaqzx2dgkw"; - }; -in stdenv.mkDerivation rec { pname = "argp-standalone"; - version = "1.3"; + version = "1.5.0"; - src = fetchurl { - url = "https://www.lysator.liu.se/~nisse/misc/argp-standalone-${version}.tar.gz"; - sha256 = "dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be"; + src = fetchFromGitHub { + owner = "argp-standalone"; + repo = "argp-standalone"; + rev = version; + sha256 = "jWnoWVnUVDQlsC9ru7oB9PdtZuyCCNqGnMqF/f2m0ZY="; }; - patches = - lib.optionals stdenv.hostPlatform.isDarwin [ patch-argp-fmtstream ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ patch-throw-in-funcdef patch-shared ]; - - patchFlags = lib.optional stdenv.hostPlatform.isDarwin "-p0"; - - # For currently unknown reason, `-fPIC` has to be passed explicitly, otherwise - # downstream software like `elfutils` will get `recompile errors like: - # libargp.a(argp-help.o): relocation R_X86_64_PC32 against symbol `program_invocation_short_name' can not be used when making a shared object; recompile with -fPIC - # It seems that nixpkgs's on-by-default `-fPIC` is not in effect here. - preConfigure = lib.optionalString stdenv.hostPlatform.isLinux "export CFLAGS='-fgnu89-inline -fPIC'"; - - postInstall = '' - mkdir -p $out/lib $out/include - cp libargp.a $out/lib - cp argp.h $out/include - ''; + nativeBuildInputs = [ meson ninja ]; doCheck = true; - makeFlags = [ "AR:=$(AR)" ]; - - enableParallelBuilding = true; - meta = with lib; { - homepage = "https://www.lysator.liu.se/~nisse/misc/"; - description = "Standalone version of arguments parsing functions from GLIBC"; - platforms = with platforms; darwin ++ linux; + homepage = "https://github.com/argp-standalone/argp-standalone"; + description = "Standalone version of arguments parsing functions from Glibc"; + platforms = platforms.unix; maintainers = with maintainers; [ amar1729 ]; - license = licenses.gpl2; + license = licenses.lgpl21Plus; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index f5e88b1203..5c60723309 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -65,6 +65,17 @@ let hash = "sha256-cO5t/mgsbBhbSefx8EMGTyxmgTjhZ8mFujkFQ3p/JS0="; }; + aws-sdk-cpp-arrow = aws-sdk-cpp.override { + apis = [ + "cognito-identity" + "config" + "identity-management" + "s3" + "sts" + "transfer" + ]; + }; + in stdenv.mkDerivation rec { pname = "arrow-cpp"; @@ -144,7 +155,7 @@ stdenv.mkDerivation rec { grpc openssl protobuf - ] ++ lib.optionals enableS3 [ aws-sdk-cpp openssl ] + ] ++ lib.optionals enableS3 [ aws-sdk-cpp-arrow openssl ] ++ lib.optionals enableGcs [ crc32c curl @@ -205,7 +216,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF" - ++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp}/include/aws/core/Aws.h" + ++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp-arrow}/include/aws/core/Aws.h" ++ lib.optionals enableGcs [ "-DCMAKE_CXX_STANDARD=${grpc.cxxStandard}" ]; doInstallCheck = true; @@ -230,7 +241,7 @@ stdenv.mkDerivation rec { in lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}"; __darwinAllowLocalNetworking = true; - installCheckInputs = [ perl which sqlite ] ++ lib.optional enableS3 minio; + nativeInstallCheckInputs = [ perl which sqlite ] ++ lib.optional enableS3 minio; installCheckPhase = let excludedTests = lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/asio/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/asio/generic.nix index 8bcc12ae2b..cb9f1eb302 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/asio/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/asio/generic.nix @@ -2,8 +2,6 @@ , version, sha256, ... }: -with lib; - stdenv.mkDerivation { pname = "asio"; inherit version; @@ -17,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ openssl ]; - meta = { + meta = with lib; { homepage = "http://asio.sourceforge.net/"; description = "Cross-platform C++ library for network and low-level I/O programming"; license = licenses.boost; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix b/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix index 74caec57c2..ea8a2133c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aspell/dictionaries.nix @@ -1,7 +1,5 @@ {lib, stdenv, fetchurl, aspell, which, writeScript}: -with lib; - /* HOWTO: * Add some of these to your profile or systemPackages. @@ -105,7 +103,7 @@ let homepage = "http://ftp.gnu.org/gnu/aspell/dict/0index.html"; } // (args.meta or {}); - } // lib.optionalAttrs (stdenv.isDarwin && elem language [ "is" "nb" ]) { + } // lib.optionalAttrs (stdenv.isDarwin && lib.elem language [ "is" "nb" ]) { # tar: Cannot open: Illegal byte sequence unpackPhase = '' runHook preUnpack @@ -115,7 +113,7 @@ let runHook postUnpack ''; - postPatch = getAttr language { + postPatch = lib.getAttr language { is = '' cp icelandic.alias íslenska.alias sed -i 's/ .slenska\.alias/ íslenska.alias/g' Makefile.pre @@ -137,7 +135,7 @@ let preBuild = '' # Aspell can't handle multiple data-dirs # Copy everything we might possibly need - ${concatMapStringsSep "\n" (p: '' + ${lib.concatMapStringsSep "\n" (p: '' cp -a ${p}/lib/aspell/* . '') ([ aspell ] ++ langInputs)} export ASPELL_CONF="data-dir $(pwd)" diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix index 720823852b..fa390eaaa5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = "http://bs2b.sourceforge.net/"; + homepage = "https://bs2b.sourceforge.net/"; description = "Bauer stereophonic-to-binaural DSP library"; license = lib.licenses.mit; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libkeyfinder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/libkeyfinder/default.nix index 0a48dc4790..0742297cb6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/libkeyfinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/libkeyfinder/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftw ]; - checkInputs = [ catch2 ]; + nativeCheckInputs = [ catch2 ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix index a4916eecfe..f52800e2e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -12,7 +12,9 @@ libunwindSupport ? true, libunwind, pulseaudioSupport ? true, - libpulseaudio + libpulseaudio, + soxSupport ? true, + sox }: stdenv.mkDerivation rec { @@ -35,17 +37,17 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libuv - libunwind - openfec - libpulseaudio speexdsp - ]; + ] ++ lib.optional openfecSupport openfec + ++ lib.optional libunwindSupport libunwind + ++ lib.optional pulseaudioSupport libpulseaudio + ++ lib.optional soxSupport sox; sconsFlags = [ "--build=${stdenv.buildPlatform.config}" "--host=${stdenv.hostPlatform.config}" - "--prefix=${placeholder "out"}" - "--disable-sox" ] ++ + "--prefix=${placeholder "out"}" ] ++ + lib.optional (!soxSupport) "--disable-sox" ++ lib.optional (!libunwindSupport) "--disable-libunwind" ++ lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++ (if (!openfecSupport) diff --git a/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix index d57b6a75cb..2d2fd4f577 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/avahi/default.nix @@ -6,6 +6,7 @@ , libdaemon , dbus , perlPackages +, libpcap , expat , gettext , glib @@ -63,7 +64,9 @@ stdenv.mkDerivation rec { ] ++ (with perlPackages; [ perl XMLParser - ]) ++ lib.optionals gtk3Support [ + ]) ++ lib.optionals stdenv.isFreeBSD [ + libpcap + ] ++ lib.optionals gtk3Support [ gtk3 ] ++ lib.optionals qt5Support [ qt5 @@ -86,7 +89,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--runstatedir=/run" "--sysconfdir=/etc" - "--with-distro=none" + "--with-distro=${with stdenv.hostPlatform; if isBSD then parsed.kernel.name else "none"}" # A systemd unit is provided by the avahi-daemon NixOS module "--with-systemdsystemunitdir=no" ] ++ lib.optionals withLibdnssdCompat [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/bash/bash-preexec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bash/bash-preexec/default.nix index fcdf561904..166b73b1da 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bash/bash-preexec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bash/bash-preexec/default.nix @@ -12,7 +12,7 @@ in stdenvNoCC.mkDerivation { sha256 = "sha256-+FU5n7EkY78X5nUiW3WN9+6Bf6oiPjsG2MSRCleooFs="; }; - checkInputs = [ bats ]; + nativeCheckInputs = [ bats ]; dontConfigure = true; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix index bf46dcd8de..f8a17f3bb1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bashup-events/generic.nix @@ -49,7 +49,7 @@ resholve.mkDerivation rec { ''; inherit doCheck; - checkInputs = [ bash ]; + nativeCheckInputs = [ bash ]; checkPhase = '' runHook preCheck @@ -68,7 +68,7 @@ resholve.mkDerivation rec { }; inherit doInstallCheck; - installCheckInputs = [ bash ]; + nativeInstallCheckInputs = [ bash ]; installCheckPhase = '' runHook preInstallCheck ${installCheck "${bash}/bin/bash"} diff --git a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index 2bc457cac1..97072fc4ad 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "5.1.17"; + version = "5.2.16"; nativeBuildInputs = [ cmake @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-p1rpFFMCYG/c35lqQT673j/Uicxe+PLhaktQfM6uF8Y="; + hash = "sha256-M2apFibqSKp8ojXl82W+vQb7CUxdbWsmw8PLL/ByYuM="; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix index 0f251f73e8..eb0ea3c94b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/belcard/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "belcard"; - version = "5.1.12"; + version = "5.2.12"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-ZxO0Y4R04T+3K+08fEJ9krWfYSodQLrjBZYbGrKOrXI="; + sha256 = "sha256-Q5FJ1Nh61woyXN7BVTZGNGXOVhcZXakLWcxaavPpgeY="; }; buildInputs = [ bctoolbox belr ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix index 187264caed..152572c6b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/belle-sip/default.nix @@ -11,15 +11,15 @@ stdenv.mkDerivation rec { pname = "belle-sip"; - version = "linphone-4.4.1"; + version = "5.2.16"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; owner = "public"; group = "BC"; repo = pname; - rev = "44d5977570280763ee1fecdb920736715bad58a3"; - sha256 = "sha256-w++v3YlDZfpCHAbUQA/RftjRNGkz9J/zYoxZqRgtvnA="; + rev = version; + sha256 = "sha256-LMbQz22ENTT27jr9tGakzNjidC5nfCuLDMZ6sFwtRKI="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bobcat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bobcat/default.nix index f1e537943f..47fc87af14 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bobcat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bobcat/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { ''; # have to link to static gcc lib on aarch64-linux explicitly + # https://github.com/NixOS/nixpkgs/issues/201254 NIX_LDFLAGS = lib.optionalString (with stdenv.targetPlatform; isAarch64 && isLinux) "-lgcc"; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix index feb41bf629..4c6ba70045 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix @@ -34,20 +34,19 @@ assert enableNumpy -> enablePython; # Boost <1.69 can't be built on linux with clang >8, because pth was removed assert with lib; (stdenv.isLinux && toolset == "clang" && versionAtLeast stdenv.cc.version "8.0.0") -> versionAtLeast version "1.69"; -with lib; let - variant = concatStringsSep "," - (optional enableRelease "release" ++ - optional enableDebug "debug"); + variant = lib.concatStringsSep "," + (lib.optional enableRelease "release" ++ + lib.optional enableDebug "debug"); - threading = concatStringsSep "," - (optional enableSingleThreaded "single" ++ - optional enableMultiThreaded "multi"); + threading = lib.concatStringsSep "," + (lib.optional enableSingleThreaded "single" ++ + lib.optional enableMultiThreaded "multi"); - link = concatStringsSep "," - (optional enableShared "shared" ++ - optional enableStatic "static"); + link = lib.concatStringsSep "," + (lib.optional enableShared "shared" ++ + lib.optional enableStatic "static"); runtime-link = if enableShared then "shared" else "static"; @@ -61,16 +60,16 @@ let # [0]: https://github.com/boostorg/build/commit/0ef40cb86728f1cd804830fef89a6d39153ff632 # [1]: https://github.com/boostorg/build/commit/316e26ca718afc65d6170029284521392524e4f8 jobs = - if versionOlder version "1.58" then + if lib.versionOlder version "1.58" then "$(($NIX_BUILD_CORES<=64 ? $NIX_BUILD_CORES : 64))" - else if versionOlder version "1.65" then + else if lib.versionOlder version "1.65" then "$(($NIX_BUILD_CORES<=256 ? $NIX_BUILD_CORES : 256))" else "$NIX_BUILD_CORES"; needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || (stdenv.isDarwin && enableShared); - b2Args = concatStringsSep " " ([ + b2Args = lib.concatStringsSep " " ([ "--includedir=$dev/include" "--libdir=$out/lib" "-j${jobs}" @@ -82,12 +81,12 @@ let "-sEXPAT_LIBPATH=${expat.out}/lib" # TODO: make this unconditional - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform || + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform || # required on mips; see 61d9f201baeef4c4bb91ad8a8f5f89b747e0dfe4 - (stdenv.hostPlatform.isMips && versionAtLeast version "1.79")) [ + (stdenv.hostPlatform.isMips && lib.versionAtLeast version "1.79")) [ "address-model=${toString stdenv.hostPlatform.parsed.cpu.bits}" "architecture=${if stdenv.hostPlatform.isMips64 - then if versionOlder version "1.78" then "mips1" else "mips" + then if lib.versionOlder version "1.78" then "mips1" else "mips" else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x" else toString stdenv.hostPlatform.parsed.cpu.family}" "binary-format=${toString stdenv.hostPlatform.parsed.kernel.execFormat.name}" @@ -100,13 +99,13 @@ let else if stdenv.hostPlatform.isMips32 then "o32" else if stdenv.hostPlatform.isMips64n64 then "n64" else "sysv"}" - ] ++ optional (link != "static") "runtime-link=${runtime-link}" - ++ optional (variant == "release") "debug-symbols=off" - ++ optional (toolset != null) "toolset=${toolset}" - ++ optional (!enablePython) "--without-python" - ++ optional needUserConfig "--user-config=user-config.jam" - ++ optional (stdenv.buildPlatform.isDarwin && stdenv.hostPlatform.isLinux) "pch=off" - ++ optionals (stdenv.hostPlatform.libc == "msvcrt") [ + ] ++ lib.optional (link != "static") "runtime-link=${runtime-link}" + ++ lib.optional (variant == "release") "debug-symbols=off" + ++ lib.optional (toolset != null) "toolset=${toolset}" + ++ lib.optional (!enablePython) "--without-python" + ++ lib.optional needUserConfig "--user-config=user-config.jam" + ++ lib.optional (stdenv.buildPlatform.isDarwin && stdenv.hostPlatform.isLinux) "pch=off" + ++ lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ "threadapi=win32" ] ++ extraB2Args ); @@ -121,38 +120,38 @@ stdenv.mkDerivation { patchFlags = []; patches = patches - ++ optional stdenv.isDarwin ./darwin-no-system-python.patch + ++ lib.optional stdenv.isDarwin ./darwin-no-system-python.patch # Fix boost-context segmentation faults on ppc64 due to ABI violation - ++ optional (versionAtLeast version "1.61" && - versionOlder version "1.71") (fetchpatch { + ++ lib.optional (lib.versionAtLeast version "1.61" && + lib.versionOlder version "1.71") (fetchpatch { url = "https://github.com/boostorg/context/commit/2354eca9b776a6739112833f64754108cc0d1dc5.patch"; sha256 = "067m4bjpmcanqvg28djax9a10avmdwhlpfx6gn73kbqqq70dnz29"; stripLen = 1; extraPrefix = "libs/context/"; }) # Fix compiler warning with GCC >= 8; TODO: patch may apply to older versions - ++ optional (versionAtLeast version "1.65" && versionOlder version "1.67") + ++ lib.optional (lib.versionAtLeast version "1.65" && lib.versionOlder version "1.67") (fetchpatch { url = "https://github.com/boostorg/mpl/commit/f48fd09d021db9a28bd7b8452c175897e1af4485.patch"; sha256 = "15d2a636hhsb1xdyp44x25dyqfcaws997vnp9kl1mhzvxjzz7hb0"; stripLen = 1; }) - ++ optional (versionAtLeast version "1.65" && versionOlder version "1.70") (fetchpatch { + ++ lib.optional (lib.versionAtLeast version "1.65" && lib.versionOlder version "1.70") (fetchpatch { # support for Mips64n64 appeared in boost-context 1.70; this patch won't apply to pre-1.65 cleanly url = "https://github.com/boostorg/context/commit/e3f744a1862164062d579d1972272d67bdaa9c39.patch"; sha256 = "sha256-qjQy1b4jDsIRrI+UYtcguhvChrMbGWO0UlEzEJHYzRI="; stripLen = 1; extraPrefix = "libs/context/"; }) - ++ optional (versionAtLeast version "1.70" && versionOlder version "1.73") ./cmake-paths.patch - ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch - ++ optional (version == "1.77.0") (fetchpatch { + ++ lib.optional (lib.versionAtLeast version "1.70" && lib.versionOlder version "1.73") ./cmake-paths.patch + ++ lib.optional (lib.versionAtLeast version "1.73") ./cmake-paths-173.patch + ++ lib.optional (version == "1.77.0") (fetchpatch { url = "https://github.com/boostorg/math/commit/7d482f6ebc356e6ec455ccb5f51a23971bf6ce5b.patch"; relative = "include"; sha256 = "sha256-KlmIbixcds6GyKYt1fx5BxDIrU7msrgDdYo9Va/KJR4="; }); - meta = { + meta = with lib; { homepage = "http://boost.org/"; description = "Collection of C++ libraries"; license = licenses.boost; @@ -175,7 +174,7 @@ stdenv.mkDerivation { inherit boostBuildPatches; }; - preConfigure = optionalString useMpi '' + preConfigure = lib.optionalString useMpi '' cat << EOF >> user-config.jam using mpi : ${mpi}/bin/mpiCC ; EOF @@ -183,7 +182,7 @@ stdenv.mkDerivation { # On darwin we need to add the `$out/lib` to the libraries' rpath explicitly, # otherwise the dynamic linker is unable to resolve the reference to @rpath # when the boost libraries want to load each other at runtime. - + optionalString (stdenv.isDarwin && enableShared) '' + + lib.optionalString (stdenv.isDarwin && enableShared) '' cat << EOF >> user-config.jam using clang-darwin : : ${stdenv.cc.targetPrefix}c++ : "-rpath $out/lib/" @@ -196,7 +195,7 @@ stdenv.mkDerivation { # uniform way for clang and gcc (which works thanks to our cc-wrapper). # We pass toolset later which will make b2 invoke everything in the right # way -- the other toolset in user-config.jam will be ignored. - + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' cat << EOF >> user-config.jam using gcc : cross : ${stdenv.cc.targetPrefix}c++ : $AR @@ -210,7 +209,7 @@ stdenv.mkDerivation { EOF '' # b2 needs to be explicitly told how to find Python when cross-compiling - + optionalString enablePython '' + + lib.optionalString enablePython '' cat << EOF >> user-config.jam using python : : ${python.interpreter} : ${python}/include/python${python.pythonVersion} @@ -225,11 +224,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; nativeBuildInputs = [ which boost-build ] - ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ expat zlib bzip2 libiconv ] - ++ optional enableIcu icu - ++ optionals enablePython [ libxcrypt python ] - ++ optional enableNumpy python.pkgs.numpy; + ++ lib.optional enableIcu icu + ++ lib.optionals enablePython [ libxcrypt python ] + ++ lib.optional enableNumpy python.pkgs.numpy; configureScript = "./bootstrap.sh"; configurePlatforms = []; @@ -239,7 +238,7 @@ stdenv.mkDerivation { "--includedir=$(dev)/include" "--libdir=$(out)/lib" "--with-bjam=b2" # prevent bootstrapping b2 in configurePhase - ] ++ optional (toolset != null) "--with-toolset=${toolset}" + ] ++ lib.optional (toolset != null) "--with-toolset=${toolset}" ++ [ (if enableIcu then "--with-icu=${icu.dev}" else "--without-icu") ]; buildPhase = '' @@ -265,7 +264,7 @@ stdenv.mkDerivation { # Make boost header paths relative so that they are not runtime dependencies cd "$dev" && find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ -exec sed '1s/^\xef\xbb\xbf//;1i#line 1 "{}"' -i '{}' \; - '' + optionalString (stdenv.hostPlatform.libc == "msvcrt") '' + '' + lib.optionalString (stdenv.hostPlatform.libc == "msvcrt") '' $RANLIB "$out/lib/"*.a ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix index efcb64a7fd..61c2a27f3d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boringssl/default.nix @@ -20,7 +20,7 @@ buildGoModule { nativeBuildInputs = [ cmake ninja perl ]; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; # hack to get both go and cmake configure phase # (if we use postConfigure then cmake will loop runHook postConfigure) diff --git a/third_party/nixpkgs/pkgs/development/libraries/boxfort/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boxfort/default.nix index 57504dfd3a..855f86a3c3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boxfort/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boxfort/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchShebangs ci/isdir.py ''; - checkInputs = with python3Packages; [ cram ]; + nativeCheckInputs = with python3Packages; [ cram ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix index 3a6ef0e356..4bccc0c5cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bzrtp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "bzrtp"; - version = "5.1.12"; + version = "5.2.16"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-GsHVuNXzLkbKUaHtnyXAr7bR9Emc55zcmKt3RGjCMtA="; + hash = "sha256-nrnGmJxAeobejS6zdn5Z/kOFOxyepZcxW/G4nXAt2DY="; }; buildInputs = [ bctoolbox sqlite ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix b/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix index 431b30f7cf..853b1d7d59 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - hash = "sha256-e5S3K0kYCB6nVZDi/DVKzMvrVk6IgXC2g7217sr8xUo="; + hash = "sha256-f/tM8b2JGZw2OzhlhMvjzLjgvgj5qncEepYsEwSxeAI="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix index f5c000f227..a5119f4a7f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix @@ -18,23 +18,15 @@ assert runTests -> gflags != null; stdenv.mkDerivation rec { pname = "ceres-solver"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz"; - sha256 = "00vng9vnmdb1qga01m0why90m0041w7bn6kxa2h4m26aflfqla8h"; + sha256 = "sha256-99dO7N4K7XW/xR7EjJHQH+Fqa/FrzhmHpwcyhnAeL8Y="; }; outputs = [ "out" "dev" ]; - patches = [ - # Enable GNUInstallDirs, see: https://github.com/ceres-solver/ceres-solver/pull/706 - (fetchpatch { - url = "https://github.com/ceres-solver/ceres-solver/commit/4998c549396d36a491f1c0638fe57824a40bcb0d.patch"; - sha256 = "sha256-mF6Zh2fDVzg2kD4nI2dd9rp4NpvPErmwfdYo5JaBmCA="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = lib.optional runTests gflags; propagatedBuildInputs = [ eigen glog ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix index 5929c9dcbd..d21c0243bf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.8.5"; + version = "0.8.8"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-PJHDZXc0DD/d+K/4uouv5F8gAf1sE5e3jLkGILPMpnI="; + sha256 = "sha256-BzZb8NDgf1NnkZaaxs+0YlVuYod/uiWJxA3geaYN7e0="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cjose/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cjose/default.nix index 972b3dee44..1158fa01cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cjose/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cjose/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ jansson openssl ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; configureFlags = [ "--with-jansson=${jansson}" diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix index 3459f2a849..b88766952e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark-gfm"; - version = "0.29.0.gfm.6"; + version = "0.29.0.gfm.9"; src = fetchFromGitHub { owner = "github"; repo = "cmark-gfm"; rev = version; - sha256 = "sha256-ekHY5EGSrJrQwlXNjKpyj7k0Bzq1dYPacRsfNZ8K+lk="; + sha256 = "sha256-goQtLaiLCyEqVItPfH3e/pFroQWZuVT5oxLs1/GwdoU="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix index f2945116e7..830791f6fb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cmark"; - version = "0.30.2"; + version = "0.30.3"; src = fetchFromGitHub { - owner = "jgm"; + owner = "commonmark"; repo = pname; rev = version; - sha256 = "sha256-IkNybUe/XYwAvPowym3aqfVyvNdw2t/brRjhOrjVRpA="; + sha256 = "sha256-/7TzaZYP8lndkfRPgCpBbazUBytVLXxqWHYktIsGox0="; }; nativeBuildInputs = [ cmake ]; @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CommonMark parsing and rendering library and program in C"; - homepage = "https://github.com/jgm/cmark"; + homepage = "https://github.com/commonmark/cmark"; + changelog = "https://github.com/commonmark/cmark/raw/${version}/changelog.txt"; maintainers = [ maintainers.michelk ]; - platforms = platforms.unix; + platforms = platforms.all; license = licenses.bsd2; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/composable_kernel/default.nix b/third_party/nixpkgs/pkgs/development/libraries/composable_kernel/default.nix index 9ced4e0a44..8b0ac95581 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/composable_kernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/composable_kernel/default.nix @@ -28,8 +28,7 @@ let "example" ]; - # There is now a release, but it's cpu-only it seems to be for a very specific purpose - # Thus, we're sticking with the develop branch for now... + # ROCm 5.6 should release composable_kernel as stable with a tag in the future src = fetchFromGitHub { owner = "ROCmSoftwarePlatform"; repo = "composable_kernel"; @@ -53,6 +52,7 @@ let "-DCMAKE_CXX_COMPILER=hipcc" ] ++ lib.optionals (gpuTargets != [ ]) [ "-DGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" + "-DAMDGPU_TARGETS=${lib.concatStringsSep ";" gpuTargets}" ] ++ lib.optionals buildTests [ "-DGOOGLETEST_DIR=${gtest.src}" # Custom linker names ]; @@ -82,7 +82,6 @@ let license = with licenses; [ mit ]; maintainers = teams.rocm.members; platforms = platforms.linux; - broken = buildExamples; # bin/example_grouped_gemm_xdl_bfp16] Error 139 }; }); @@ -93,6 +92,7 @@ in stdenv.mkDerivation { inherit (ck) pname version outputs src passthru meta; dontUnpack = true; + dontPatch = true; dontConfigure = true; dontBuild = true; @@ -109,4 +109,10 @@ in stdenv.mkDerivation { '' + '' runHook postInstall ''; + + # Fix paths + preFixup = '' + substituteInPlace $out/lib/cmake/composable_kernel/*.cmake \ + --replace "${ck}" "$out" + ''; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/coost/default.nix b/third_party/nixpkgs/pkgs/development/libraries/coost/default.nix new file mode 100644 index 0000000000..5d692edd43 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/coost/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, gitUpdater +, withCurl ? true, withOpenSSL ? true }: + +stdenv.mkDerivation rec { + pname = "coost"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "idealvin"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-qpJh1yl0lYYszNHGo5Jkbzal2hnVzg7UUxiyg/Grva8="; + }; + + postPatch = '' + substituteInPlace cmake/coost.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ \ + ''; + + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional withCurl curl ++ lib.optional withOpenSSL openssl; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] + ++ lib.optional withCurl "-DWITH_LIBCURL=ON" + ++ lib.optional withOpenSSL "-DWITH_OPENSSL=ON"; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "A tiny boost library in C++11"; + homepage = "https://github.com/idealvin/coost"; + license = licenses.mit; + maintainers = with maintainers; [ candyc1oud ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index 385cfb81a5..9cea13e659 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - checkInputs = [ cppunit ]; + nativeCheckInputs = [ cppunit ]; # Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files preCheck = '' checkFlagsArray+=( diff --git a/third_party/nixpkgs/pkgs/development/libraries/criterion/default.nix b/third_party/nixpkgs/pkgs/development/libraries/criterion/default.nix index eb2a1d6c6e..9b3304f601 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/criterion/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/criterion/default.nix @@ -27,10 +27,9 @@ stdenv.mkDerivation rec { libffi ]; - checkInputs = with python3Packages; [ cram ]; + nativeCheckInputs = with python3Packages; [ cram ]; doCheck = true; - checkTarget = "test"; postPatch = '' patchShebangs ci/isdir.py src/protocol/gen-pb.py diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ctre/default.nix index b91c00930a..2b3631a565 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ctre/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ctre/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ctre"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "hanickadot"; repo = "compile-time-regular-expressions"; rev = "v${version}"; - hash = "sha256-KqYBSY45x8FDQ0YgjrKoZdOiuhf33gv5w160/dSsSsg="; + hash = "sha256-pO6PW4oZsCA2xaMCsaJz2Bu203zyMUkbjO3OOBEbSiw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cutee/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cutee/default.nix index 748d495063..07e2b7cbce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cutee/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cutee/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ Unit Testing Easy Environment"; - homepage = "http://www.codesink.org/cutee_unit_testing.html"; + homepage = "https://www.codesink.org/cutee_unit_testing.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cxxtest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cxxtest/default.nix index 3b8d470d17..273bfef319 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cxxtest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cxxtest/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { sourceRoot = "source/python"; - checkInputs = [ python3Packages.ply ]; + nativeCheckInputs = [ python3Packages.ply ]; preCheck = '' cd ../ diff --git a/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix index db23009b8f..883b30c6a5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix @@ -2,7 +2,6 @@ , pam, libxcrypt, fixDarwinDylibNames, autoreconfHook, enableLdap ? false , buildPackages, pruneLibtoolFiles, nixosTests }: -with lib; stdenv.mkDerivation rec { pname = "cyrus-sasl"; version = "2.1.28"; @@ -50,7 +49,7 @@ stdenv.mkDerivation rec { inherit (nixosTests) parsedmarc postfix; }; - meta = { + meta = with lib; { homepage = "https://www.cyrusimap.org/sasl"; description = "Library for adding authentication support to connection-based protocols"; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix index 795c2c51dd..20856f2ad9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dbus/default.nix @@ -3,7 +3,7 @@ , fetchurl , pkg-config , expat -, enableSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal , systemdMinimal , audit , libapparmor diff --git a/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix index a587901169..e4333f4c28 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dconf/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "-Dgtk_doc=${lib.boolToString (!isCross)}" # gtk-doc does do some gobject introspection, which doesn't yet cross-compile. ] ++ lib.optional isCross "-Dvapi=false"; - checkInputs = [ + nativeCheckInputs = [ dbus # for dbus-daemon ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/directx-headers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/directx-headers/default.nix new file mode 100644 index 0000000000..3ac15bb85e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/directx-headers/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, meson, ninja }: +stdenv.mkDerivation rec { + pname = "directx-headers"; + version = "1.608.2"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "DirectX-Headers"; + rev = "v${version}"; + hash = "sha256-F0riTDJpydqe4yhE9GKSSvnRI0Sl3oY2sOP+H/vDHG0="; + }; + + nativeBuildInputs = [ meson ninja ]; + + # tests require WSL2 + mesonFlags = [ "-Dbuild-test=false" ]; + + meta = with lib; { + description = "Official D3D12 headers from Microsoft"; + homepage = "https://github.com/microsoft/DirectX-Headers"; + license = licenses.mit; + maintainers = with maintainers; [ k900 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/discord-gamesdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/discord-gamesdk/default.nix new file mode 100644 index 0000000000..513eebe712 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/discord-gamesdk/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchzip +, autoPatchelfHook +}: + +stdenv.mkDerivation rec { + pname = "discord-gamesdk"; + version = "3.2.1"; + + src = fetchzip { + url = "https://dl-game-sdk.discordapp.net/${version}/discord_game_sdk.zip"; + sha256 = "sha256-83DgL9y3lHLLJ8vgL3EOVk2Tjcue64N+iuDj/UpSdLc="; + stripRoot = false; + }; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + installPhase = + let + processor = stdenv.hostPlatform.uname.processor; + sharedLibrary = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + runHook preInstall + + install -Dm555 lib/${processor}/discord_game_sdk${sharedLibrary} $out/lib/discord_game_sdk${sharedLibrary} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://discord.com/developers/docs/game-sdk/sdk-starter-guide"; + description = "Library to allow other programs to interact with the Discord desktop application"; + license = licenses.unfree; + maintainers = with maintainers; [ tomodachi94 ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "x86_64-windows" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix index 07d753dd83..cb7b7466d0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv -, raft-canonical, sqlite }: +, raft-canonical, sqlite, lxd }: stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.9.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "canonical"; repo = pname; - rev = "v${version}"; - sha256 = "0zalsvr0vy7632nhm96a29lrfy18iqsmbxpyz2lvq80mrjlbrzsn"; + rev = "refs/tags/v${version}"; + hash = "sha256-x76f9Sw3BMgWSY7DLIqDjbggp/qVu8mJBtf4znTz9hA="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; + passthru.tests = { + inherit lxd; + }; + meta = with lib; { description = '' Expose a SQLite database over the network and replicate it across a @@ -33,7 +37,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://dqlite.io/"; license = licenses.asl20; - maintainers = with maintainers; [ joko ]; + maintainers = with maintainers; [ joko adamcstephens ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix index 3df87efba1..0eca838dfc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/drogon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib +{ stdenv, fetchFromGitHub, cmake, jsoncpp, libossp_uuid, zlib, lib, fetchpatch # optional but of negligible size , openssl, brotli, c-ares # optional databases @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "drogon"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${version}"; - sha256 = "sha256-IpECYpPuheoLelEdgV+J26b+95fMfRmeQ44q6JvqRtw="; + sha256 = "sha256-I3f/8TMGm1G4CFMJJLyiVYso9yTHjeLefS5eaGySvC4="; fetchSubmodules = true; }; @@ -43,6 +43,12 @@ stdenv.mkDerivation rec { # this part of the test would normally fail because it attempts to configure a CMake project that uses find_package on itself # this patch makes drogon and trantor visible to the test ./fix_find_package.patch + + # see https://github.com/drogonframework/drogon/issues/1491 + (fetchpatch { + url = "https://github.com/drogonframework/drogon/commit/7d87d7e0b264ce53aa5ee006fb022d3516c9d666.patch"; + sha256 = "sha256-C4zH9oNMfhkaeVNvZuBuzu1v2vNgg/t+YPitbrmHg+Y="; + }) ]; # modifying PATH here makes drogon_ctl visible to the test diff --git a/third_party/nixpkgs/pkgs/development/libraries/dyncall/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dyncall/default.nix index 3197e3abed..75841b5d0d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/dyncall/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/dyncall/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "dyncall"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "https://www.dyncall.org/r${version}/dyncall-${version}.tar.gz"; - # https://www.dyncall.org/r1.3/SHA256 - sha256 = "sha256-q/Ys/DHr1/IWWNqhNwp3gcxRQxYrwIaDhKwH3vnj05A="; + # https://www.dyncall.org/r1.4/SHA256 + sha256 = "sha256-FEN9u+87bckkg/ZQfq+CWrl5ZKie7K6Ms0emvsnDKq4="; }; # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :) diff --git a/third_party/nixpkgs/pkgs/development/libraries/elfio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/elfio/default.nix index 5bf4f3a333..13bdbe735d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/elfio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/elfio/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - checkInputs = [ boost ]; + nativeCheckInputs = [ boost ]; cmakeFlags = [ "-DELFIO_BUILD_TESTS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix index fb8db3a218..e4509d058d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/embree/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "embree"; - version = "3.13.4"; + version = "3.13.5"; src = fetchFromGitHub { owner = "embree"; repo = "embree"; rev = "v${version}"; - sha256 = "sha256-WmblxU1kHiC8+hYAfUDcbJ1/e80f1LcKX8qCwgaBwGc="; + sha256 = "sha256-tfM4SGOFVBG0pQK9B/iN2xDaW3yjefnTtsoUad75m80="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index eaa80586f4..e3975dd0c3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nuspell ]; - checkInputs = [ + nativeCheckInputs = [ unittest-cpp ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix index 8d45a7186e..c0119cbfac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmake ]; - checkInputs = [ + nativeCheckInputs = [ gbenchmark gtest ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/exempi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/exempi/default.nix index 3586a67490..d17ca4ea75 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/exempi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/exempi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, expat, zlib, boost, libiconv, darwin }: +{ lib, stdenv, fetchurl, expat, zlib, boost, libiconv, darwin }: stdenv.mkDerivation rec { pname = "exempi"; @@ -21,9 +21,11 @@ stdenv.mkDerivation rec { doCheck = stdenv.isLinux && stdenv.is64bit; dontDisableStatic = doCheck; + enableParallelBuilding = true; + meta = with lib; { description = "An implementation of XMP (Adobe's Extensible Metadata Platform)"; - homepage = "https://libopenraw.freedesktop.org/wiki/Exempi/"; + homepage = "https://libopenraw.freedesktop.org/exempi/"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix index 1e671c7b2e..436d3cdf3a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.27.5"; + version = "0.27.6"; outputs = [ "out" "lib" "dev" "doc" "man" "static" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - sha256 = "sha256-5kdzw/YzpYldfHjUSPOzu3gW2TPgxt8Oxs0LZDFphgA="; + sha256 = "sha256-Ddy605EQhsATzmdhN3Zq+2ksYMrHEfucA+IqezYmjo4="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { zlib ]; - checkInputs = [ + nativeCheckInputs = [ libxml2.bin python3 which @@ -62,9 +62,6 @@ stdenv.mkDerivation rec { doCheck = true; - # Test setup found by inspecting ${src}/.travis/run.sh; problems without cmake. - checkTarget = "tests"; - preCheck = '' patchShebangs ../test/ mkdir ../test/tmp diff --git a/third_party/nixpkgs/pkgs/development/libraries/exprtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/exprtk/default.nix new file mode 100644 index 0000000000..3e109956c6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/exprtk/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "exprtk"; + version = "unstable-2021-12-31"; + + src = fetchFromGitHub { + owner = "ArashPartow"; + repo = "exprtk"; + rev = "806c519c91fd08ba4fa19380dbf3f6e42de9e2d1"; + hash = "sha256-5/k+y3gNJeggfwXmtAVqmaiV+BXX+WKtWwZWcQSrQDM="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm644 exprtk.hpp "$out/include/exprtk.hpp" + runHook postInstall + ''; + + meta = with lib; { + description = "The C++ Mathematical Expression Toolkit Library"; + homepage = "https://www.partow.net/programming/exprtk/index.html"; + license = licenses.mit; + maintainers = with maintainers; [ anselmschueler ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/faac/default.nix b/third_party/nixpkgs/pkgs/development/libraries/faac/default.nix index dbc56572d5..42f1f8db59 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/faac/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/faac/default.nix @@ -5,7 +5,6 @@ assert mp4v2Support -> (mp4v2 != null); -with lib; stdenv.mkDerivation rec { pname = "faac"; version = "1.30"; @@ -16,19 +15,19 @@ stdenv.mkDerivation rec { }; configureFlags = [ ] - ++ optional mp4v2Support "--with-external-mp4v2" - ++ optional drmSupport "--enable-drm"; + ++ lib.optional mp4v2Support "--with-external-mp4v2" + ++ lib.optional drmSupport "--enable-drm"; hardeningDisable = [ "format" ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ ] - ++ optional mp4v2Support mp4v2; + ++ lib.optional mp4v2Support mp4v2; enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Open source MPEG-4 and MPEG-2 AAC encoder"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ codyopel ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/faad2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/faad2/default.nix index e62a90fcd2..f72e6f4f95 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/faad2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/faad2/default.nix @@ -11,7 +11,6 @@ , vlc }: -with lib; stdenv.mkDerivation rec { pname = "faad2"; version = "2.10.1"; @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { }; configureFlags = [] - ++ optional drmSupport "--with-drm"; + ++ lib.optional drmSupport "--with-drm"; nativeBuildInputs = [ autoreconfHook ]; @@ -34,7 +33,7 @@ stdenv.mkDerivation rec { ocaml-faad = ocamlPackages.faad; }; - meta = { + meta = with lib; { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; homepage = "https://sourceforge.net/projects/faac/"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix index bd179c6ee7..b658cece4d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "22.08"; + version = "23.01"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-ZGyLP7dsVDKPCGA/6MNSEifd1rOcYqLdcEXYIQxrgtE="; + sha256 = "sha256-/XfwQUkhn82vAKa7ZyiPbD4c7XJhCIncxvWkj/m2P0M="; }; nativeBuildInputs = [cmake]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix index 453bac74b2..7b988a9ad8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fcft/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype fontconfig pixman tllist ] ++ lib.optionals (withShapingTypes != []) [ harfbuzz ] ++ lib.optionals (builtins.elem "run" withShapingTypes) [ utf8proc ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; mesonBuildType = "release"; mesonFlags = builtins.map (t: diff --git a/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix index 4645e16845..7dadbcb395 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Eztc2jUyKRVUiZkYEh+IFHkDuPIy+Gx3ZW/MsuOVaMc="; }; - checkInputs = [ + nativeCheckInputs = [ gmpxx ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config - ] ++ lib.optionals doCheck checkInputs; + ] ++ lib.optionals doCheck nativeCheckInputs; buildInputs = [ givaro blas lapack ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix index 4f3d685c1f..c5edb59262 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fftw/default.nix @@ -14,9 +14,7 @@ , withDoc ? stdenv.cc.isGNU }: -with lib; - -assert elem precision [ "single" "double" "long-double" "quad-precision" ]; +assert lib.elem precision [ "single" "double" "long-double" "quad-precision" ]; stdenv.mkDerivation rec { pname = "fftw-${precision}"; @@ -31,36 +29,36 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "dev" "man" ] - ++ optional withDoc "info"; # it's dev-doc only + ++ lib.optional withDoc "info"; # it's dev-doc only outputBin = "dev"; # fftw-wisdom nativeBuildInputs = [ gfortran ]; - buildInputs = optionals stdenv.cc.isClang [ + buildInputs = lib.optionals stdenv.cc.isClang [ # TODO: This may mismatch the LLVM version sin the stdenv, see #79818. llvmPackages.openmp - ] ++ optional enableMpi mpi; + ] ++ lib.optional enableMpi mpi; configureFlags = [ "--enable-shared" "--enable-threads" ] - ++ optional (precision != "double") "--enable-${precision}" + ++ lib.optional (precision != "double") "--enable-${precision}" # all x86_64 have sse2 # however, not all float sizes fit - ++ optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2" - ++ optional enableAvx "--enable-avx" - ++ optional enableAvx2 "--enable-avx2" - ++ optional enableAvx512 "--enable-avx512" - ++ optional enableFma "--enable-fma" + ++ lib.optional (stdenv.isx86_64 && (precision == "single" || precision == "double") ) "--enable-sse2" + ++ lib.optional enableAvx "--enable-avx" + ++ lib.optional enableAvx2 "--enable-avx2" + ++ lib.optional enableAvx512 "--enable-avx512" + ++ lib.optional enableFma "--enable-fma" ++ [ "--enable-openmp" ] - ++ optional enableMpi "--enable-mpi" + ++ lib.optional enableMpi "--enable-mpi" # doc generation causes Fortran wrapper generation which hard-codes gcc - ++ optional (!withDoc) "--disable-doc"; + ++ lib.optional (!withDoc) "--disable-doc"; enableParallelBuilding = true; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; meta = with lib; { description = "Fastest Fourier Transform in the West library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix index 60ad286831..14e6abd900 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flatpak/default.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: { ostree ]; - checkInputs = [ + nativeCheckInputs = [ valgrind ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix index 76107e1e07..5f810ecbe5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -42,11 +42,6 @@ let }; in { - fmt_7 = generic { - version = "7.1.3"; - sha256 = "08hyv73qp2ndbs0isk8pspsphdzz5qh8czl3wgyxy3mmif9xdg29"; - }; - fmt_8 = generic { version = "8.1.1"; sha256 = "sha256-leb2800CwdZMJRWF5b1Y9ocK0jXpOX/nwo95icDf308="; diff --git a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix index a03df4e5e2..57e90cd87f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folks/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { sqlite ]; - checkInputs = [ + nativeCheckInputs = [ dbus (python3.withPackages (pp: with pp; [ python-dbusmock diff --git a/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix index 00b8dac910..776023f35f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { intended to be a full replacement for GLUT, and has only a few differences. ''; - homepage = "http://freeglut.sourceforge.net/"; + homepage = "https://freeglut.sourceforge.net/"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fribidi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fribidi/default.nix index 3dae39b3c3..25600c9f6e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fribidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fribidi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; doCheck = true; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; meta = with lib; { homepage = "https://github.com/fribidi/fribidi"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix index c91e8517b0..2dfa02e710 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fstrcmp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { comparisons of strings and byte arrays, including multi-byte character strings. ''; - homepage = "http://fstrcmp.sourceforge.net/"; + homepage = "https://fstrcmp.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/fstrcmp/"; license = licenses.gpl3; maintainers = [ maintainers.sephalon ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix b/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix index 7f757fd481..4000129f55 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pythonPackages.pytest ]; - checkInputs = lib.optionals enablePython [ pythonPackages.scipy pythonPackages.pytest-cov ]; + nativeCheckInputs = lib.optionals enablePython [ pythonPackages.scipy pythonPackages.pytest-cov ]; preConfigure = '' mkdir -p build/external/src diff --git a/third_party/nixpkgs/pkgs/development/libraries/gcr/4.nix b/third_party/nixpkgs/pkgs/development/libraries/gcr/4.nix index a7f5b66a60..28ca262ead 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gcr/4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gcr/4.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { p11-kit ]; - checkInputs = [ + nativeCheckInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix index 1241ae2a63..7c20e2f5c6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gcr/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { p11-kit ]; - checkInputs = [ + nativeCheckInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix index 4d342f61ec..fdd5fc951e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { "-DGEOTIFF_INCLUDE_DIR=${lib.getDev libgeotiff}/include" "-DGEOTIFF_LIBRARY_RELEASE=${lib.getLib libgeotiff}/lib/libgeotiff${stdenv.hostPlatform.extensions.sharedLibrary}" "-DMYSQL_INCLUDE_DIR=${lib.getDev libmysqlclient}/include/mysql" - "-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/mysql/libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DMYSQL_LIBRARY=${lib.getLib libmysqlclient}/lib/${lib.optionalString (libmysqlclient.pname != "mysql") "mysql/"}libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary}" ] ++ lib.optionals (!stdenv.isDarwin) [ "-DCMAKE_SKIP_BUILD_RPATH=ON" # without, libgdal.so can't find libmariadb.so ] ++ lib.optionals stdenv.isDarwin [ @@ -163,7 +163,7 @@ stdenv.mkDerivation rec { export HOME=$(mktemp -d) export PYTHONPATH="$out/${python3.sitePackages}:$PYTHONPATH" ''; - installCheckInputs = with python3.pkgs; [ + nativeInstallCheckInputs = with python3.pkgs; [ pytestCheckHook pytest-env lxml diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix index b6aaa341da..d21fd25019 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , enableVTK ? true -, vtk +, vtk_8 , ApplicationServices , Cocoa , enablePython ? false @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "gdcm"; - version = "3.0.20"; + version = "3.0.21"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; rev = "v${version}"; - sha256 = "sha256-MaQk2VlaZxZPNzVF9pUnEzMaXyN0tq2P3kodnGpl6PA="; + sha256 = "sha256-BmUJCqCGt+BvVpLG4bzCH4lsqmhWHU0gbOIU2CCIMGU="; }; cmakeFlags = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = lib.optionals enableVTK [ - vtk + vtk_8 ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Cocoa @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly. GDCM includes a file format definition and a network communications protocol, both of which should be extended to provide a full set of tools for a researcher or small medical imaging vendor to interface with an existing medical database. ''; - homepage = "http://gdcm.sourceforge.net/"; + homepage = "https://gdcm.sourceforge.net/"; license = with licenses; [ bsd3 asl20 ]; maintainers = with maintainers; [ tfmoraes ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix index 87d3285e64..5e44d2221f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -62,8 +62,6 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ]; - buildInputs = [ gobject-introspection ]; - propagatedBuildInputs = [ glib libtiff diff --git a/third_party/nixpkgs/pkgs/development/libraries/geis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geis/default.nix index e8476b0fef..43b61e78fb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geis/default.nix @@ -15,7 +15,6 @@ , xorgserver }: -with lib; stdenv.mkDerivation rec { pname = "geis"; @@ -48,7 +47,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--set PYTHONPATH "$program_PYTHONPATH") ''; - meta = { + meta = with lib; { description = "A library for input gesture recognition"; homepage = "https://launchpad.net/geis"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix index 16000833d4..a11b5674b5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.5.5"; + version = "2.6.2"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K2A61OflKdVVzdV8qH5x/ggZKa4i8yvs5bdPoOwmm7A="; + sha256 = "sha256-lpP/pmM06zIw+9EZe+zywExLOcrN3K7IMK32XSrCmYs="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/getdata/default.nix b/third_party/nixpkgs/pkgs/development/libraries/getdata/default.nix index 5978c3dc31..8617d7ddd2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/getdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/getdata/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.all; maintainers = [ maintainers.vbgl ]; - homepage = "http://getdata.sourceforge.net/"; + homepage = "https://getdata.sourceforge.net/"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix index 795aeb8844..5202dc0eda 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix @@ -8,7 +8,13 @@ stdenv.mkDerivation rec { sha256 = "1gbrg03z1b6rlrvjyc6d41bc8j1bsr7rm8206gb1apscyii5bnii"; }; - patches = lib.optional stdenv.hostPlatform.isDarwin + patches = [ + (fetchpatch { + name = "CVE-2022-28506.patch"; + url = "https://src.fedoraproject.org/rpms/giflib/raw/2e9917bf13df114354163f0c0211eccc00943596/f/CVE-2022-28506.patch"; + sha256 = "sha256-TBemEXkuox8FdS9RvjnWcTWPaHRo4crcwSR9czrUwBY="; + }) + ] ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { # https://sourceforge.net/p/giflib/bugs/133/ name = "darwin-soname.patch"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix index 8b15bbf608..a6824f121d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gjs/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { spidermonkey_102 ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run ] ++ testDeps; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix b/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix index c0c4d6fe0c..8fa77013e1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glew/1.10.nix @@ -2,8 +2,6 @@ , AGL, OpenGL }: -with lib; - stdenv.mkDerivation rec { pname = "glew"; version = "1.10.0"; @@ -20,7 +18,7 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux - ${optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + ${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' sed -i -e 's/\(INSTALL.*\)-s/\1/' Makefile ''} ''; @@ -45,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An OpenGL extension loading library for C(++)"; - homepage = "http://glew.sourceforge.net/"; + homepage = "https://glew.sourceforge.net/"; license = licenses.free; # different files under different licenses #["BSD" "GLX" "SGI-B" "GPL2"] platforms = platforms.mesaPlatforms; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glew/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glew/default.nix index 94a2d2c967..1e30eb744b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glew/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glew/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An OpenGL extension loading library for C/C++"; - homepage = "http://glew.sourceforge.net/"; + homepage = "https://glew.sourceforge.net/"; license = with licenses; [ /* modified bsd */ free mit gpl2Only ]; # For full details, see https://github.com/nigels-com/glew#copyright-and-licensing platforms = with platforms; if enableEGL then diff --git a/third_party/nixpkgs/pkgs/development/libraries/glfw/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/glfw/2.x.nix index 75a7c97db2..545e7a418a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glfw/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glfw/2.x.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; - homepage = "http://glfw.sourceforge.net/"; + homepage = "https://glfw.sourceforge.net/"; license = licenses.zlib; maintainers = [ lib.maintainers.marcweber ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix index 7cecc8e545..ac7977d0f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -188,6 +188,9 @@ stdenv.mkDerivation (finalAttrs: { "-Ddevbindir=${placeholder "dev"}/bin" ] ++ lib.optionals (!stdenv.isDarwin) [ "-Dman=true" # broken on Darwin + ] ++ lib.optionals stdenv.isFreeBSD [ + "-Db_lundef=false" + "-Dxattr=false" ]; NIX_CFLAGS_COMPILE = toString [ @@ -253,7 +256,7 @@ stdenv.mkDerivation (finalAttrs: { done ''; - checkInputs = [ tzdata desktop-file-utils shared-mime-info ]; + nativeCheckInputs = [ tzdata desktop-file-utils shared-mime-info ]; preCheck = lib.optionalString finalAttrs.doCheck or config.doCheckByDefault or false '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/glib-${finalAttrs.version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" @@ -300,7 +303,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C library of programming buildings blocks"; - homepage = "https://www.gtk.org/"; + homepage = "https://wiki.gnome.org/Projects/GLib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]); platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/default.nix index 2d7e6614ce..9193404d01 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/default.nix @@ -76,11 +76,19 @@ in # - clang-wrapper in cross-compilation # Last attempt: https://github.com/NixOS/nixpkgs/pull/36948 preInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then + if [ -f ${lib.getLib stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then mkdir -p $out/lib - cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 + cp ${lib.getLib stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 # the .so It used to be a symlink, but now it is a script - cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so + cp -a ${lib.getLib stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so + # wipe out reference to previous libc it was built against + chmod +w $out/lib/libgcc_s.so.1 + # rely on default RUNPATHs of the binary and other libraries + # Do no force-pull wrong glibc. + patchelf --remove-rpath $out/lib/libgcc_s.so.1 + # 'patchelf' does not remove the string itself. Wipe out + # string reference to avoid possible link to bootstrapTools + ${buildPackages.nukeReferences}/bin/nuke-refs $out/lib/libgcc_s.so.1 fi ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix index 4e8503b484..a64bb0967a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; # There are some non-thread safe tests that can fail enableParallelChecking = false; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; GTEST_FILTER = let diff --git a/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix index f50704bcb6..8fc57d865f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix @@ -4,7 +4,6 @@ , idnSupport ? true, libidn }: -with lib; stdenv.mkDerivation rec{ pname = "gloox"; @@ -16,11 +15,11 @@ stdenv.mkDerivation rec{ }; buildInputs = [ ] - ++ optional zlibSupport zlib - ++ optional sslSupport openssl - ++ optional idnSupport libidn; + ++ lib.optional zlibSupport zlib + ++ lib.optional sslSupport openssl + ++ lib.optional idnSupport libidn; - meta = { + meta = with lib; { description = "A portable high-level Jabber/XMPP library for C++"; homepage = "http://camaya.net/gloox"; license = licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gmime/2.nix b/third_party/nixpkgs/pkgs/development/libraries/gmime/2.nix index f5575bd20c..2a953fa702 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gmime/2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gmime/2.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { --replace /bin/mkdir mkdir ''; - checkInputs = [ gnupg ]; + nativeCheckInputs = [ gnupg ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix b/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix index 4ec99d2e18..6816c10816 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { --replace /bin/rm rm ''; - checkInputs = [ gnupg ]; + nativeCheckInputs = [ gnupg ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix index 6b58b171f7..fd58e6b77a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "43"; + version = "43.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-PW4VMxdIYVdZaqOAL4dnZBTFcHOPRQqUoEH+iDVCCmk="; + sha256 = "sha256-Mq+NvD2afVg1aafw1/GPlYGNXbnuj5LZEjpkexXqyMc="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix index ec109cbee8..4ab8cbbf96 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: { (python3.withPackages pythonModules) ]; - checkInputs = lib.optionals stdenv.isDarwin [ + nativeCheckInputs = lib.optionals stdenv.isDarwin [ cctools # for otool ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix index 9e2585d7ee..1bd0d69ea6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.53"; + version = "0.10.54"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "J/1YeW+qHNTMASDDTqhTFaCJHscfVbxnk8FOzxaKP1c="; + sha256 = "WDXNnVPmT3UmLAOZZu/fTYj0Vvyx8IeM5NEIgqUK1aA="; }; nativeBuildInputs = [ pkg-config intltool ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix index be6da72645..1e5271d477 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { # enable these dependencies when doInstallCheck is false because we're # unconditionally building tests and benchmarks # - # when doInstallCheck is true, these deps are added to installCheckInputs + # when doInstallCheck is true, these deps are added to nativeInstallCheckInputs gbenchmark gtest ]; @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - installCheckInputs = lib.optionals doInstallCheck [ + nativeInstallCheckInputs = lib.optionals doInstallCheck [ gbenchmark gtest ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix index c4f7770ae8..002d07cc33 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/gperftools/gperftools"; description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; - platforms = with platforms; linux ++ darwin; + platforms = platforms.all; license = licenses.bsd3; maintainers = with maintainers; [ vcunat ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix index 8470c62a89..050adad77c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { qtbase ]; - checkInputs = [ + nativeCheckInputs = [ which ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix index 3d4af9db19..65498357b5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -19,7 +19,7 @@ lib.fix (self: stdenv.mkDerivation rec { }; doCheck = true; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; # these tests cover use as a build-time-linked library checkPhase = '' make test diff --git a/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix b/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix index 3e13e8b749..1ad814e2b9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/graphene/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { glib ]; - checkInputs = [ + nativeCheckInputs = [ mutest ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix index ecf2d0e5ba..ff2217b6e3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gsm/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "1.0.20"; src = fetchurl { - url = "http://www.quut.com/gsm/${pname}-${version}.tar.gz"; + url = "https://www.quut.com/gsm/${pname}-${version}.tar.gz"; sha256 = "sha256-YxXDhRi4HomcP8LtRjzGI68pxcIxpIwTeyQwIjSukL8="; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lossy speech compression codec"; - homepage = "http://www.quut.com/gsm/"; + homepage = "https://www.quut.com/gsm/"; license = licenses.bsd2; maintainers = with maintainers; [ codyopel raskin ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix index ba7950d725..92a126bd7e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -9,11 +9,12 @@ , wayland , gtk3 , gobject-introspection +, vala }: stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.7.0"; + version = "0.8.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # for demo @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "sha256-0S1WBpxXpWoMOecJQS6FKEXRZdw4E5hrjURPyhkxiMc="; + sha256 = "sha256-Z7jPYLKgkwMNXu80aaZ2vNj57LbN+X2XqlTTq6l0wTE="; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + vala ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix index 3568bbfed4..23680c9b67 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix @@ -7,8 +7,6 @@ , fetchpatch, buildPackages }: -with lib; - let gtkCleanImmodulesCache = substituteAll { @@ -44,7 +42,7 @@ stdenv.mkDerivation rec { patches = [ ./patches/2.0-immodules.cache.patch ./patches/gtk2-theme-paths.patch - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ (fetchpatch { url = "https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776"; sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r"; @@ -54,13 +52,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with xorg; [ glib cairo pango gdk-pixbuf atk ] - ++ optionals (stdenv.isLinux || stdenv.isDarwin) [ + ++ lib.optionals (stdenv.isLinux || stdenv.isDarwin) [ libXrandr libXrender libXcomposite libXi libXcursor ] - ++ optionals stdenv.isDarwin [ libXdamage ] - ++ optional xineramaSupport libXinerama - ++ optionals cupsSupport [ cups ] - ++ optionals stdenv.isDarwin [ AppKit Cocoa ]; + ++ lib.optionals stdenv.isDarwin [ libXdamage ] + ++ lib.optional xineramaSupport libXinerama + ++ lib.optionals cupsSupport [ cups ] + ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa ]; preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then '' MACOSX_DEPLOYMENT_TARGET=10.16 @@ -69,7 +67,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gdktarget=${gdktarget}" "--with-xinput=yes" - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "--disable-glibtest" "--disable-introspection" "--disable-visibility" @@ -94,7 +92,7 @@ stdenv.mkDerivation rec { inherit gdktarget; }; - meta = { + meta = with lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 112158a472..1533f59b4a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -2,7 +2,6 @@ , stdenv , substituteAll , fetchurl -, fetchpatch2 , pkg-config , gettext , docbook-xsl-nons @@ -61,7 +60,7 @@ in stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.35"; + version = "3.24.36"; outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -73,22 +72,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-7BD+bXEu8LPGO1+TJjnJ0a6Z/OlPUA9vBpZWKf72C9E="; + sha256 = "sha256-J6bvFXdDNQyAf/6lm6odcCJtvt6CpelT/9WOpgWf5pE="; }; patches = [ ./patches/3.0-immodules.cache.patch ./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch - - # Add accidentally non-dist’d build file. - # https://gitlab.gnome.org/GNOME/gtk/-/commit/b2ad8d2abafbd94c7e58e5e1b98c92e6b6fa6d9a - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/66a199806ceb3daa5e2c7d3a5b45a86007cec46a.patch"; - includes = [ - "gdk/wayland/cursor/meson.build" - ]; - sha256 = "cOOcSB3yphff2+7l7YpFbGSswWjV8lJ2tk+Vjgl1ras="; - }) ] ++ lib.optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it @@ -121,7 +110,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection libxkbcommon (libepoxy.override { inherit x11Support; }) isocodes diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkextra/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkextra/default.nix index 4c2f739cd9..ed860b7dde 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkextra/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkextra/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 glib cairo atk pango libtiff libpng libjpeg ]; meta = with lib; { - homepage = "http://gtkextra.sourceforge.net/"; + homepage = "https://gtkextra.sourceforge.net/"; description = "GtkExtra is a useful set of widgets for creating GUI's for GTK+."; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix index b12ff45a3a..ffb2e123c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkmm/4.x.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { pangomm_2_48 ]; - checkInputs = lib.optionals (!stdenv.isDarwin)[ + nativeCheckInputs = lib.optionals (!stdenv.isDarwin)[ xvfb-run ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix index c7c04f5e81..447e7d061f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/3.x.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool perl gobject-introspection vala ]; - checkInputs = [ xvfb-run dbus ]; + nativeCheckInputs = [ xvfb-run dbus ]; buildInputs = [ atk cairo glib pango libxml2 gettext ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix index ccf1cb2d4f..95e6e8d2e1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/4.x.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { shared-mime-info ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run dbus ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix index 083c987853..849c3caf26 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtksourceview/5.x.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "5.6.1"; + version = "5.6.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ZZ2cydA0oRTwfn4TTugNd97ASXyxUWrlNpEZwvy52hY="; + sha256 = "HxRsFW8TWmBJnZeeNXfJm24VoRFEV2er5iGbs0xUXHc="; }; patches = [ @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { shared-mime-info ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run dbus ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkspell/3.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkspell/3.nix index d3a1a17885..3c7a6a3b3b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkspell/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkspell/3.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://gtkspell.sourceforge.net/"; + homepage = "https://gtkspell.sourceforge.net/"; description = "Word-processor-style highlighting GtkTextView widget"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix index 31380b5ab7..641ebbf9f0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtkspellmm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ binding for the gtkspell library"; - homepage = "http://gtkspell.sourceforge.net/"; + homepage = "https://gtkspell.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gts/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gts/default.nix index 815dfb634c..5aa8aca6ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gts/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gts/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://gts.sourceforge.net/"; + homepage = "https://gts.sourceforge.net/"; license = lib.licenses.lgpl2Plus; description = "GNU Triangulated Surface Library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix index af24e46efe..4d6546f0e5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gusb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, substituteAll, meson, ninja, pkg-config, gettext, gobject-introspection , gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_44, python3 -, glib, systemd, libusb1, vala, hwdata +, glib, libusb1, vala, hwdata }: let @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_44 gobject-introspection vala ]; - buildInputs = [ systemd glib ]; + buildInputs = [ glib ]; propagatedBuildInputs = [ libusb1 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hamlib/4.nix b/third_party/nixpkgs/pkgs/development/libraries/hamlib/4.nix index 474db9891a..b199bb2739 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hamlib/4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hamlib/4.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "hamlib"; - version = "4.4"; + version = "4.5.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-i/AQewcfUvCFh/OOLe6KeEjeE0NDWzJvj2bZXh+KJIc="; + sha256 = "sha256-Wg+eky/+LTlx4HtUSqYr7D5JTnP/HOPKM/oNiOGZsGE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index 9da8e8837b..782823cd67 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 ]; - buildInputs = [ glib freetype gobject-introspection ] + buildInputs = [ glib freetype ] ++ lib.optionals withCoreText [ ApplicationServices CoreText ]; propagatedBuildInputs = lib.optional withGraphite2 graphite2 diff --git a/third_party/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix index 41d24b81bf..41e86b275f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/htmlcxx/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://htmlcxx.sourceforge.net/"; + homepage = "https://htmlcxx.sourceforge.net/"; description = "A simple non-validating css1 and html parser for C++"; license = licenses.lgpl2; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix b/third_party/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix index d67fe23010..01987ab718 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hunspell/wrapper.nix @@ -1,10 +1,9 @@ { stdenv, lib, hunspell, makeWrapper, dicts ? [] }: -with lib; let - searchPath = makeSearchPath "share/hunspell" dicts; + searchPath = lib.makeSearchPath "share/hunspell" dicts; in stdenv.mkDerivation { - name = (appendToName "with-dicts" hunspell).name; + name = (lib.appendToName "with-dicts" hunspell).name; nativeBuildInputs = [ makeWrapper ]; buildCommand = '' makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${lib.escapeShellArg searchPath} diff --git a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix index 9aea9e5453..3ebba3c50d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation rec { pname = "igraph"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - hash = "sha256-+U8bo68Q6XX3p2sZiIChjidcRwA10gv9eWccRt4MoYM="; + hash = "sha256-LsTOxUktGZcp46Ec9QH3+9C+VADMYTZZCjKF1gp36xk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix index 0a57b3c26f..4234e56edd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/incrtcl/default.nix @@ -30,7 +30,7 @@ tcl.mkTclDerivation rec { outputs = [ "out" "dev" "man" ]; meta = with lib; { - homepage = "http://incrtcl.sourceforge.net/"; + homepage = "https://incrtcl.sourceforge.net/"; description = "Object Oriented Enhancements for Tcl/Tk"; license = licenses.tcltk; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix b/third_party/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix index f75ade98c6..9fe3575b7b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/indicator-application/gtk2.nix @@ -3,8 +3,6 @@ , glib, dbus-glib, json-glib , gtk2, libindicator-gtk2, libdbusmenu-gtk2, libappindicator-gtk2 }: -with lib; - stdenv.mkDerivation rec { pname = "indicator-application-gtk2"; version = "12.10.0.1"; @@ -45,7 +43,7 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; - meta = { + meta = with lib; { description = "Indicator to take menus from applications and place them in the panel (GTK 2 library for Xfce/LXDE)"; homepage = "https://launchpad.net/indicators-gtk2"; license = licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index 665fdb3f93..5e6f628aa6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,20 +3,20 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "22.5.4"; + version = "22.6.5"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-f9b0+BWUlekMM0huPdJ5Ms4tYr/ipgfLiQ310FQKAXA="; + sha256 = "sha256-W+lDqGZAenhRZ7tf4qfDNik/3rFNDM0DGSK/CdNRb8g="; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libdrm libva libpciaccess libX11 libXau libXdmcp libpthreadstubs ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; cmakeFlags = [ "-DBUILD_SAMPLES=OFF" diff --git a/third_party/nixpkgs/pkgs/development/libraries/itk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/itk/generic.nix index 0408aed50a..78f4d56bfa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/itk/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/itk/generic.nix @@ -54,6 +54,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake xz makeWrapper ]; buildInputs = [ libX11 libuuid vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9 + # (specifically libGL and libX11 on Linux), + # it's now seemingly necessary for packages that configure ITK to + # also include configuration deps of VTK, even if VTK is not required or available. + # These deps were propagated from VTK 9 in https://github.com/NixOS/nixpkgs/pull/206935, + # so we simply propagate them again from ITK. + # This admittedly is a hack and seems like an issue with VTK 9's CMake configuration. + propagatedBuildInputs = vtk.propagatedBuildInputs; postInstall = '' wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkg-config}/bin" diff --git a/third_party/nixpkgs/pkgs/development/libraries/itktcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/itktcl/default.nix index 66039c61b4..b6a4788075 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/itktcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/itktcl/default.nix @@ -29,7 +29,7 @@ tcl.mkTclDerivation rec { outputs = [ "out" "dev" "man" ]; meta = with lib; { - homepage = "http://incrtcl.sourceforge.net/"; + homepage = "https://incrtcl.sourceforge.net/"; description = "Mega-widget toolkit for incr Tk"; license = licenses.tcltk; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jarowinkler-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jarowinkler-cpp/default.nix index 0cbfdcea64..fb19f99842 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jarowinkler-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jarowinkler-cpp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "-DJARO_WINKLER_BUILD_TESTING=ON" ]; - checkInputs = [ + nativeCheckInputs = [ catch2_3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/daemon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/commons/daemon/default.nix index e41c475c82..dbecabec2d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/commons/daemon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/commons/daemon/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.3.3"; pname = "commons-daemon"; src = fetchurl { url = "mirror://apache/commons/daemon/binaries/commons-daemon-${version}-bin.tar.gz"; - sha256 = "sha256-EaQ4wy32GX1MGByCqo811WblqZgsNSw3psr94lrxEqw="; + sha256 = "sha256-FVWmj20LiigRvfK82363Wy8/ie9+wlIlRx49AwQnhOA="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/saxon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/saxon/default.nix index 484f9017ae..4ff3e69c34 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/saxon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/saxon/default.nix @@ -28,7 +28,7 @@ let meta = with lib; { inherit description license; - homepage = "http://saxon.sourceforge.net/"; + homepage = "https://saxon.sourceforge.net/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ rvl ]; platforms = platforms.all; @@ -44,7 +44,7 @@ in { sha256 = "0l5y3y2z4wqgh80f26dwwxwncs8v3nkz3nidv14z024lmk730vs3"; }; description = "XSLT 1.0 processor"; - # http://saxon.sourceforge.net/saxon6.5.3/conditions.html + # https://saxon.sourceforge.net/saxon6.5.3/conditions.html license = lib.licenses.mpl10; java = jre8; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix index 6513a76160..a00399497e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index c461e168b2..537ab60fda 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -9,13 +9,13 @@ nv-codec-headers = nv-codec-headers-11; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.1.2-6"; + version = "5.1.2-7"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-YPw29cnScchL4Y2CEatUjzqUW/U9kOdi29Dr577Qy5A="; + sha256 = "sha256-OWSixz1QjWthykO55wMAlywe2ihFLugzLH1qg4Qbe3I="; }; buildInputs = old.buildInputs ++ [ chromaprint ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix index 9885384e00..efac369085 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix @@ -49,8 +49,6 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ]; - buildInputs = [ gobject-introspection ]; - propagatedBuildInputs = [ glib ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/judy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/judy/default.nix index da8e89f935..618aee4984 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/judy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/judy/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = { - homepage = "http://judy.sourceforge.net/"; + homepage = "https://judy.sourceforge.net/"; license = lib.licenses.lgpl21Plus; description = "State-of-the-art C library that implements a sparse dynamic array"; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix b/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix index 792d4b102f..e4a61a3c07 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/heimdal.nix @@ -4,7 +4,6 @@ , CoreFoundation, Security, SystemConfiguration }: -with lib; stdenv.mkDerivation rec { pname = "heimdal"; version = "7.8.0"; @@ -22,9 +21,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config python3 perl bison flex texinfo ] ++ (with perlPackages; [ JSON ]); - buildInputs = optionals (stdenv.isLinux) [ libcap_ng ] + buildInputs = lib.optionals (stdenv.isLinux) [ libcap_ng ] ++ [ db sqlite openssl libedit openldap pam] - ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ]; + ++ lib.optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ]; ## ugly, X should be made an option configureFlags = [ @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { "--with-berkeley-db" "--with-berkeley-db-include=${db.dev}/include" "--with-openldap=${openldap.dev}" - ] ++ optionals (stdenv.isLinux) [ + ] ++ lib.optionals (stdenv.isLinux) [ "--with-capng" ]; @@ -91,7 +90,7 @@ stdenv.mkDerivation rec { # hx_locl.h:67:25: fatal error: pkcs10_asn1.h: No such file or directory #enableParallelBuilding = true; - meta = { + meta = with lib; { description = "An implementation of Kerberos 5 (and some more stuff)"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kissfft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kissfft/default.nix index abc96a40a9..503cad45fd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kissfft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kissfft/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ py (if datatype == "float" then fftwFloat else fftw) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kompute/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kompute/default.nix index 0b79bd7e56..ced30a87db 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kompute/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kompute/default.nix @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { url = "https://github.com/KomputeProject/kompute/commit/9a791b161dd58ca927fe090f65fa2b0e5e85e7ca.diff"; sha256 = "OtFTN8sgPlyiMmVzUnqzCkVMKj6DWxbCXtYwkRdEprY="; }) + (fetchpatch { + name = "enum-class-fix-for-fmt-8-x.patch"; + url = "https://github.com/KomputeProject/kompute/commit/f731f2e55c7aaaa804111106c3e469f9a642d4eb.patch"; + sha256 = "sha256-scTCYqkgKQnH27xzuY4FVbiwRuwBvChmLPPU7ZUrrL0="; + }) ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix index fb9c5c57ec..7fb8520348 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kronosnet/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "kronosnet"; - version = "1.23"; + version = "1.25"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-+uQXV5tOLsBPFzfFHqwV1Oz4+KwZMkdjO8zfIljV+ro="; + sha256 = "sha256-NEmkgKTm+R4lzqjbQTyQ6TDpjoTQtMKiTpzn25HUfYk="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lame/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lame/default.nix index 674defc42e..506be91932 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lame/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lame/default.nix @@ -11,7 +11,6 @@ , debugSupport ? false # Debugging (disables optimizations) }: -with lib; stdenv.mkDerivation rec { pname = "lame"; version = "3.100"; @@ -25,24 +24,24 @@ stdenv.mkDerivation rec { outputMan = "out"; nativeBuildInputs = [ ] - ++ optional nasmSupport nasm; + ++ lib.optional nasmSupport nasm; buildInputs = [ ] #++ optional efenceSupport libefence #++ optional mp3xSupport gtk1 - ++ optional sndfileFileIOSupport libsndfile; + ++ lib.optional sndfileFileIOSupport libsndfile; configureFlags = [ - (enableFeature nasmSupport "nasm") - (enableFeature cpmlSupport "cpml") + (lib.enableFeature nasmSupport "nasm") + (lib.enableFeature cpmlSupport "cpml") #(enableFeature efenceSupport "efence") (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame") - (enableFeature analyzerHooksSupport "analyzer-hooks") - (enableFeature decoderSupport "decoder") - (enableFeature frontendSupport "frontend") - (enableFeature frontendSupport "dynamic-frontends") + (lib.enableFeature analyzerHooksSupport "analyzer-hooks") + (lib.enableFeature decoderSupport "decoder") + (lib.enableFeature frontendSupport "frontend") + (lib.enableFeature frontendSupport "dynamic-frontends") #(enableFeature mp3xSupport "mp3x") - (enableFeature mp3rtpSupport "mp3rtp") + (lib.enableFeature mp3rtpSupport "mp3rtp") (if debugSupport then "--enable-debug=alot" else "") ]; @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { sed -i '/lame_init_old/d' include/libmp3lame.sym ''; - meta = { + meta = with lib; { description = "A high quality MPEG Audio Layer III (MP3) encoder"; homepage = "http://lame.sourceforge.net"; license = licenses.lgpl2; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ldns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ldns/default.nix index ba0c5e606f..1e696b1175 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ldns/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ldns/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "ac_cv_func_realloc_0_nonnull=yes" ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; doCheck = false; # fails. missing some files postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix b/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix index fe5c23b361..4b84584d53 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.8"; + version = "1.12.9"; src = fetchFromGitHub { - sha256 = "sha256-5xcwktlwgP9Ltild4BliaGJBqlheDLSTKQLZjzK+nGk="; + sha256 = "sha256-TuiOAinJsQWJVJiaS8kWk4Pl+hn521f4ooJ2p+eR6mk="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/leptonica/default.nix b/third_party/nixpkgs/pkgs/development/libraries/leptonica/default.nix index 27d2d5e30d..448a22f549 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/leptonica/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/leptonica/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ giflib libjpeg libpng libtiff libwebp openjpeg zlib ]; enableParallelBuilding = true; - checkInputs = [ which gnuplot ]; + nativeCheckInputs = [ which gnuplot ]; # Fails on pngio_reg for unknown reason doCheck = false; # !stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix index 85a803c010..89684080f9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.8.12"; + version = "1.9.4"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "v${version}"; - sha256 = "sha256-87fnucPg8JygYo3QSuA6ll0acbHQvmWzNLEp4dqkAH8="; + sha256 = "sha256-4AQnMMKo4BvajfhhKmhTZA0snKPnO4WjOuZAeiWU5PY="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix index 6e5f6944f4..2b99c7bdaf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { double-conversion ]; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lib3ds/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lib3ds/default.nix index 78ee4172b5..791d2ab523 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lib3ds/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lib3ds/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; - homepage = "http://lib3ds.sourceforge.net/"; + homepage = "https://lib3ds.sourceforge.net/"; license = "LGPL"; platforms = lib.platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libHX/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libHX/default.nix index 8b9190fc82..e7172b493c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libHX/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libHX/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://libhx.sourceforge.net/"; + homepage = "https://libhx.sourceforge.net/"; longDescription = '' libHX is a C library (with some C++ bindings available) that provides data structures and functions commonly needed, such as maps, deques, linked lists, string formatting diff --git a/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix index 844a30cc89..46929cee9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { libxml2 ]; - checkInputs = [ + nativeCheckInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix index 1c62169058..7b08005133 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { gtk4 ]; - checkInputs = [ + nativeCheckInputs = [ gnome.adwaita-icon-theme ] ++ lib.optionals (!stdenv.isDarwin) [ xvfb-run diff --git a/third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix index c055a6bce1..c9d396bf2e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.18"; + version = "4.3.19"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-cjxzBw2tjZROx5xzdhzZjGNJQe3tC9fHOhF/+uSM+CY="; + sha256 = "sha256-YyWpXh/8gNYTiGAJWr8lRPhstBD0eEVRBg8IlYk8o3w="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix index 381689f9cb..c8f050c300 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , acl , attr , autoreconfHook @@ -29,7 +30,7 @@ let autoreconfHook = buildPackages.autoreconfHook269; in assert xarSupport -> libxml2 != null; -stdenv.mkDerivation (finalAttrs: { +(stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; version = "3.6.2"; @@ -118,4 +119,16 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { inherit cmake nix samba; }; -}) +})).overrideAttrs(previousAttrs: + assert previousAttrs.version == "3.6.2"; + lib.optionalAttrs stdenv.hostPlatform.isStatic { + patches = [ + # fixes static linking; upstream in releases after 3.6.2 + # https://github.com/libarchive/libarchive/pull/1825 merged upstream + (fetchpatch { + name = "001-only-add-iconv-to-pc-file-if-needed.patch"; + url = "https://github.com/libarchive/libarchive/commit/1f35c466aaa9444335a1b854b0b7223b0d2346c2.patch"; + hash = "sha256-lb+zwWSH6/MLUIROvu9I/hUjSbb2jOWO755WC/r+lbY="; + }) + ]; + }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libargon2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libargon2/default.nix index 19ca4fab40..4eb28fb02f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libargon2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libargon2/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { license = with licenses; [ asl20 cc0 ]; maintainers = with maintainers; [ taeer olynch ]; mainProgram = "argon2"; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix index 419cbfdb9f..79572e4300 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "args"; - version = "6.4.4"; + version = "6.4.6"; src = fetchFromGitHub { owner = "Taywee"; repo = pname; rev = version; - sha256 = "sha256-niuBM8tPCedFNCrkgvLE7PZu411sKgcvovr++6dIaus="; + sha256 = "sha256-2gH3h3QAl0+XVULt/fR2UUGKNIxTUmnRRdxPOFdpVy4="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix index 118238f5f5..7ed461516c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix @@ -8,7 +8,6 @@ assert fontconfigSupport -> fontconfig != null; -with lib; stdenv.mkDerivation rec { pname = "libass"; version = "0.16.0"; @@ -19,18 +18,18 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (enableFeature fontconfigSupport "fontconfig") - (enableFeature rasterizerSupport "rasterizer") - (enableFeature largeTilesSupport "large-tiles") + (lib.enableFeature fontconfigSupport "fontconfig") + (lib.enableFeature rasterizerSupport "rasterizer") + (lib.enableFeature largeTilesSupport "large-tiles") ]; nativeBuildInputs = [ pkg-config yasm ]; buildInputs = [ freetype fribidi harfbuzz ] - ++ optional fontconfigSupport fontconfig - ++ optional stdenv.isDarwin libiconv; + ++ lib.optional fontconfigSupport fontconfig + ++ lib.optional stdenv.isDarwin libiconv; - meta = { + meta = with lib; { description = "Portable ASS/SSA subtitle renderer"; homepage = "https://github.com/libass/libass"; license = licenses.isc; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libayatana-indicator/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libayatana-indicator/default.nix index f58b0b273f..39a6305c6d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libayatana-indicator/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libayatana-indicator/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libayatana-indicator"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "libayatana-indicator"; rev = version; - sha256 = "sha256-Bi+whbODdJMSQ6iiIrHAwht1Efi83icerT7ubQvE5n0="; + sha256 = "sha256-tOZcrcuZowqDg/LRYTY6PCxKnpEd67k4xAHrIKupunI="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix index 9473c4823f..7abbd944ed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix @@ -1,22 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, cmake, cmocka }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, cmocka -stdenv.mkDerivation rec { +# for passthru.tests +, libfido2 +, mysql80 +, openssh +, systemd +}: + +stdenv.mkDerivation (finalAttrs: { pname = "libcbor"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "PJK"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Wp/48yQA17mf/dTgeMcMDvPpKOPkfLhQkCnzgGLpLtk="; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-YJSIZ7o191/0QJf1fH6LUYykS2pvP17knSeRO2WcDeM="; }; nativeBuildInputs = [ cmake ]; - checkInputs = [ cmocka ]; - doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DBUILD_SHARED_LIBS=on" + ] ++ lib.optional finalAttrs.doCheck "-DWITH_TESTS=ON"; - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_SHARED_LIBS=on" ]; + # 2 tests are not 32-bit clean: overflow size_t: + # https://github.com/PJK/libcbor/issues/263 + doCheck = + !stdenv.hostPlatform.is32bit + && (!stdenv.hostPlatform.isStatic) + && stdenv.hostPlatform == stdenv.buildPlatform; + nativeCheckInputs = [ cmocka ]; + + passthru.tests = { + inherit libfido2 mysql80; + openssh = (openssh.override { withFIDO = true; }); + systemd = (systemd.override { + withFido2 = true; + withCryptsetup = true; + }); + }; meta = with lib; { description = "CBOR protocol implementation for C and others"; @@ -24,4 +52,4 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcddb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcddb/default.nix index 79c11d75db..11a0c259df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcddb/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C library to access data on a CDDB server (freedb.org)"; - homepage = "http://libcddb.sourceforge.net/"; + homepage = "https://libcddb.sourceforge.net/"; license = licenses.lgpl2Plus; mainProgram = "cddb_query"; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcdio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcdio/default.nix index 324f0669af..aacb7555a4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcdio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcdio/default.nix @@ -31,8 +31,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config help2man ]; - buildInputs = [ libcddb ncurses ] - ++ lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; + buildInputs = [ libcddb libiconv ncurses ] + ++ lib.optionals stdenv.isDarwin [ Carbon IOKit ]; + + enableParallelBuilding = true; doCheck = !stdenv.isDarwin; @@ -46,6 +48,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/libcdio/"; license = licenses.gpl2Plus; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libchewing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libchewing/default.nix index c6b7841ca4..7cfa864fc0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libchewing/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libchewing/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Intelligent Chinese phonetic input method"; - homepage = "http://chewing.im/"; + homepage = "https://chewing.im/"; license = licenses.lgpl21Only; maintainers = [ maintainers.ericsagnes ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix index 177189f765..09f9d8b420 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcint/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { strictDeps = true; doCheck = true; - checkInputs = [ python3.pkgs.numpy ]; + nativeCheckInputs = [ python3.pkgs.numpy ]; meta = with lib; { description = "General GTO integrals for quantum chemistry"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix index 14a20a9579..647079ae2f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libclc/default.nix @@ -7,13 +7,13 @@ in stdenv.mkDerivation rec { pname = "libclc"; - version = "14.0.6"; + version = "15.0.7"; src = fetchFromGitHub { owner = "llvm"; repo = "llvm-project"; rev = "llvmorg-${version}"; - sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; + sha256 = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s="; }; sourceRoot = "source/libclc"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix index 919ddcd3f0..41c5565482 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcollectdclient/default.nix @@ -1,5 +1,4 @@ { lib, collectd }: -with lib; collectd.overrideAttrs (oldAttrs: { pname = "libcollectdclient"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcue/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcue/default.nix index 227dfd77f4..0b03ec6ee0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcue/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcue/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { a file pointer. For handling of the parsed data a convenient API is available. ''; - homepage = "https://sourceforge.net/projects/libcue/"; - license = licenses.gpl2; + homepage = "https://github.com/lipnitsk/libcue"; + license = licenses.gpl2Only; maintainers = with maintainers; [ astsmtl ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix new file mode 100644 index 0000000000..e981945ccb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libcxxrt/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, cmake, unstableGitUpdater }: + +stdenv.mkDerivation { + pname = "libcxxrt"; + version = "unstable-2022-08-08"; + + src = fetchFromGitHub { + owner = "libcxxrt"; + repo = "libcxxrt"; + rev = "a0f7f5c139a7daf71de0de201b6c405d852b1dc1"; + sha256 = "6ErOhlD6pOudbTkFTlI2hjBuYT3QuzEiL33/mLnw1aI="; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + mkdir -p $out/include $out/lib + cp ../src/cxxabi.h $out/include + cp lib/libcxxrt${stdenv.hostPlatform.extensions.library} $out/lib + ''; + + passthru = { + libName = "cxxrt"; + updateScript = unstableGitUpdater { }; + }; + + meta = with lib; { + homepage = "https://github.com/libcxxrt/libcxxrt"; + description = "Implementation of the Code Sourcery C++ ABI"; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.all; + license = licenses.bsd2; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix index 321c50b61c..461a3c0b7b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://libdbi-drivers.sourceforge.net/"; + homepage = "https://libdbi-drivers.sourceforge.net/"; description = "Database drivers for libdbi"; platforms = platforms.all; license = licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdbi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdbi/default.nix index ffbc3f6710..f0cb74cb86 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdbi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdbi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://libdbi.sourceforge.net/"; + homepage = "https://libdbi.sourceforge.net/"; description = "DB independent interface to DB"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix index d054e223cf..18b8d6ba5d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libde265/default.nix @@ -6,7 +6,6 @@ # for passthru.tests , imagemagick -, imagemagick6 , libheif , imlib2Full , gst_all_1 @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru.tests = { - inherit imagemagick imagemagick6 libheif imlib2Full; + inherit imagemagick libheif imlib2Full; inherit (gst_all_1) gst-plugins-bad; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix index b533488e94..7d8b1c9569 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.106.0"; + version = "1.107.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - hash = "sha256-S53ghVFb1qDI7MVNbc2ZlHqDN4VRBFQJCJg2J+w0erc="; + hash = "sha256-fjiS7GZy1BLgmxu4LFOWgucORcVx+9KleQcga+hRkSY="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-k4j814Ao7FAyd0w1nH2fuX1cJKjBkhPw0CVZqNU7Hqs="; + hash = "sha256-7XhSI/C0GEmsaL0UupvufB1bfPGbzSQJH720Y4/Do3o="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { libiconv ]; - checkInputs = with rustPlatform; [ + nativeCheckInputs = with rustPlatform; [ cargoCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index 21da1a917b..c160e7602c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,12 +2,12 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.11"; + version = "3.14.12"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - hash = "sha256-5QYKHwRB5nck5yqukX/UA+M3jFlBvkQ/ekB7JFIY5tI="; + hash = "sha256-82AH18KcrkD7mHDy+2c9v7E3Kj7Cb7jCoLfmo09D8PU="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library for creating DigiDoc signature files"; - homepage = "http://www.id.ee/"; + homepage = "https://www.id.ee/"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdiscid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdiscid/default.nix index 3021aced93..7a073b143b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdiscid/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdiscid/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "http://musicbrainz.org/doc/libdiscid"; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix index c9759d7624..e469283ae7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdmapsharing/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { libsoup ]; - checkInputs = [ + nativeCheckInputs = [ libgee check gtk3 @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { "--enable-gtk-doc" ]; - # Cannot disable tests here or `check` from checkInputs would not be included. + # Cannot disable tests here or `check` from nativeCheckInputs would not be included. # Cannot disable building the tests or docs will not build: # https://gitlab.gnome.org/GNOME/libdmapsharing/-/issues/49 doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix deleted file mode 100644 index d4a8b8f6f2..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libelf-freebsd/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, fetchsvn, stdenv, gnum4, tet }: - -stdenv.mkDerivation (rec { - version = "3258"; - pname = "libelf-freebsd"; - - src = fetchsvn { - url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk"; - rev = (lib.strings.toInt version); - name = "elftoolchain-${version}"; - sha256 = "1rcmddjanlsik0b055x8k914r9rxs8yjsvslia2nh1bhzf1lxmqz"; - }; - - buildInputs = [ gnum4 tet ]; - - buildPhase = '' - PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:$PATH # use BSD install(1) instead of coreutils and make(1) instead of GNU Make - cp -vr ${tet} test/tet/tet3.8 - chmod -R a+w test/tet/tet3.8 - make libelf - ''; - - installPhase = '' - cp -vr libelf $out - cp -vr common/. $out/ - ''; - - meta = { - description = "Essential compilation tools and libraries for building and analyzing ELF based program images"; - - homepage = "https://sourceforge.net/p/elftoolchain/wiki/Home/"; - - license = lib.licenses.bsd2; - - platforms = lib.platforms.freebsd; - maintainers = [ ]; - }; -}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libelf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libelf/default.nix index 07873f4197..4002146d4d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libelf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libelf/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchurl, autoreconfHook, gettext, netbsd +, fetchurl, autoreconfHook, gettext, freebsd, netbsd }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -42,11 +42,14 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = - if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] else [ gettext ] + (if stdenv.hostPlatform.isFreeBSD then [ freebsd.gencat ] + else if stdenv.hostPlatform.isNetBSD then [ netbsd.gencat ] + else [ gettext ]) # Need to regenerate configure script with newer version in order to pass - # "mr_cv_target_elf=yes", but `autoreconfHook` brings in `makeWrapper` - # which doesn't work with the bootstrapTools bash, so can only do this - # for cross builds when `stdenv.shell` is a newer bash. + # "mr_cv_target_elf=yes" and determine integer sizes correctly when + # cross-compiling, but `autoreconfHook` brings in `makeWrapper` which + # doesn't work with the bootstrapTools bash, so can only do this for + # cross builds when `stdenv.shell` is a newer bash. ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) autoreconfHook; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix index 7ac48a705a..ac501c660b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfaketime/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=cast-function-type -Wno-error=format-truncation"; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; meta = with lib; { description = "Report faked system time to programs without having to change the system-wide time"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libffcall/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libffcall/default.nix index 3f2398e19d..07de21a412 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libffcall/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libffcall/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libffcall"; - version = "2.2"; + version = "2.4"; src = fetchurl { url = "mirror://gnu/libffcall/libffcall-${version}.tar.gz"; - sha256 = "sha256-6/o3+XtslPrCTs8xk/n8gpUXz4Gu6awtGRr5k9c8t0c="; + sha256 = "sha256-jvaZIdvcBrxbuQUTYiY3p7g6cfMfW6N3vp2P2PV5EsI="; }; enableParallelBuilding = false; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libffi/3.3.nix b/third_party/nixpkgs/pkgs/development/libraries/libffi/3.3.nix index 2481069bc0..b6837c6523 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libffi/3.3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libffi/3.3.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { inherit doCheck; - checkInputs = [ dejagnu ]; + nativeCheckInputs = [ dejagnu ]; meta = with lib; { description = "A foreign function call interface library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix index 474d0e953e..2031f175ea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libffi/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { inherit doCheck; - checkInputs = [ dejagnu ]; + nativeCheckInputs = [ dejagnu ]; passthru = { updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix index 1def54a3ae..457a4bc466 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "-Dudev_hwdb_dir=${placeholder "out"}/lib/udev/hwdb.d" ]; - installCheckInputs = [ + nativeInstallCheckInputs = [ (python3.withPackages (p: with p; [ pygobject3 ])) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix index 164c9f9e27..69166ab33f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.26"; + version = "1.1.32"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-bXptf1ALanzDyhajQtKMs/0M9TWlrjhWQdC1NZiUgd8="; + sha256 = "sha256-/sOshlPcqKEdH5muusXg6Q9QfSgRYyCJMmtRM5mT/kQ="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgda/6.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libgda/6.x.nix index c02c6116e6..1f551ec9b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgda/6.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgda/6.x.nix @@ -50,6 +50,12 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/57f618a3b2a3758ee3dcbf9bbdc566122dd8566d.patch"; sha256 = "pyfymUd61m1kHaGyMbUQMma+szB8mlqGWwcFBBQawf8="; }) + + (fetchpatch { + name = "CVE-2021-39359.patch"; + url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/bebdffb4de586fb43fd07ac549121f4b22f6812d.patch"; + sha256 = "sha256-UjHP1nhb5n6TOdaMdQeE2s828T4wv/0ycG3FAk+I1QA="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix index e29482a34d..1ef0a397c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgda/default.nix @@ -37,6 +37,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/libgda/-/commit/9859479884fad5f39e6c37e8995e57c28b11b1b9.diff"; sha256 = "158sncc5bg9lkri1wb0i1ri1nhx4c34rzi47gbfkwphlp7qd4qqv"; }) + (fetchpatch { + name = "CVE-2021-39359.patch"; + url = "https://src.fedoraproject.org/rpms/libgda5/raw/72bb769f12e861e27e883dac5fab34f1ba4bd97e/f/bebdffb4de586fb43fd07ac549121f4b22f6812d.patch"; + sha256 = "sha256-hIKuY5NEqOzntdlLb541bA4xZU5ypTRmV1u765K6KbM="; + }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix index 35b3fef308..e6808b47ab 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.5.0"; + version = "1.5.1"; # also check the following packages for updates: python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "sha256-lXFQo+tt56BFoPgdkTfz6WdIngeotTm+8cAGcBP6XqY="; + sha256 = "sha256-KzBMwpqn6wUFhgB3KDclBS0BvZSVcasM5AG/y+L91xM="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgringotts/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgringotts/default.nix index 16595a12eb..faa478b568 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgringotts/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgringotts/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A small library to encapsulate data in an encrypted structure"; - homepage = "http://libgringotts.sourceforge.net/"; + homepage = "https://libgringotts.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix index b567a99d45..172e3a2a2c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { zlib ]; - checkInputs = [ + nativeCheckInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix index 5aa3f8520e..18f2a563a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ gnome-desktop gtk3 libxml2 ]; - checkInputs = [ dbus xvfb-run hicolor-icon-theme ]; + nativeCheckInputs = [ dbus xvfb-run hicolor-icon-theme ]; mesonFlags = [ "-Dgtk_doc=true" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix index de3bdad3e8..0af6a910a5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { glade ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run at-spi2-atk at-spi2-core diff --git a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix index 760fc88e98..230cd3fc91 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; - installCheckInputs = [ + nativeInstallCheckInputs = [ # running libical-glib tests (python3.pythonForBuild.withPackages (pkgs: with pkgs; [ pygobject3 diff --git a/third_party/nixpkgs/pkgs/development/libraries/libid3tag/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libid3tag/default.nix index 57786cad76..c8c9d8bf51 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libid3tag/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libid3tag/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ID3 tag manipulation library"; - homepage = "http://mad.sourceforge.net/"; + homepage = "https://mad.sourceforge.net/"; license = licenses.gpl2; maintainers = [ ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libidn2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libidn2/default.nix index 724778999f..9d7babd01d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libidn2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libidn2/default.nix @@ -5,8 +5,6 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -with lib; - stdenv.mkDerivation rec { pname = "libidn2"; version = "2.3.2"; @@ -20,14 +18,14 @@ stdenv.mkDerivation rec { # Beware: non-bootstrap libidn2 is overridden by ./hack.nix outputs = [ "bin" "dev" "out" "info" "devdoc" ]; - patches = optional stdenv.isDarwin ./fix-error-darwin.patch; + patches = lib.optional stdenv.isDarwin ./fix-error-darwin.patch; enableParallelBuilding = true; # The above patch causes the documentation to be regenerated, so the # documentation tools are required. - nativeBuildInputs = optionals stdenv.isDarwin [ help2man texinfo ]; - buildInputs = [ libunistring ] ++ optional stdenv.isDarwin libiconv; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ help2man texinfo ]; + buildInputs = [ libunistring ] ++ lib.optional stdenv.isDarwin libiconv; depsBuildBuild = [ buildPackages.stdenv.cc ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libindicator/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libindicator/default.nix index 991b1733c9..99b6542fa3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libindicator/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libindicator/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib, file -, pkg-config +, pkg-config, glib , gtkVersion ? "3", gtk2, gtk3 }: stdenv.mkDerivation rec { @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f"; }; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + + nativeBuildInputs = [ pkg-config glib ]; buildInputs = [ (if gtkVersion == "2" then gtk2 else gtk3) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinklevel/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libinklevel/default.nix index f9c711df70..0179009be3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libinklevel/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libinklevel/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { project is to create a vendor independent API for retrieving the ink level of a printer connected to a Linux or FreeBSD box. ''; - homepage = "http://libinklevel.sourceforge.net/"; + homepage = "https://libinklevel.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.freebsd; maintainers = with maintainers; [ samb96 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix index 5d5e90770f..83034b8dd6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { udev ]; - checkInputs = [ + nativeCheckInputs = [ check valgrind ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinsane/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libinsane/default.nix index 51ce6808f5..cafa99ed77 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libinsane/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libinsane/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ sane-backends glib ]; - checkInputs = [ cunit valgrind ]; + nativeCheckInputs = [ cunit valgrind ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libipfix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libipfix/default.nix index 8b0c35e0d1..ce99321028 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libipfix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libipfix/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-fcommon"; meta = with lib; { - homepage = "http://libipfix.sourceforge.net/"; + homepage = "https://libipfix.sourceforge.net/"; description = "The libipfix C-library implements the IPFIX protocol defined by the IP Flow Information Export working group of the IETF"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libivykis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libivykis/default.nix index 9a1c728bd5..c5e0c55854 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libivykis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libivykis/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ file protobufc ]; meta = with lib; { - homepage = "http://libivykis.sourceforge.net/"; + homepage = "https://libivykis.sourceforge.net/"; description = '' A thin wrapper over various OS'es implementation of I/O readiness notification facilities diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix index 1c03973fff..700223cd1a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix @@ -34,6 +34,15 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # present in master + (fetchpatch { + name = "fix-test-failure-on-ia64-ppc64-riscv64"; + url = "https://github.com/libjxl/libjxl/commit/bb8eac5d6acec223e44cf8cc72ae02f0816de311.patch"; + hash = "sha256-DuUCStWEquhWo7bOss0RgZ7ouYE4FpWrIMFywYR424s="; + }) + ]; + nativeBuildInputs = [ cmake gtest diff --git a/third_party/nixpkgs/pkgs/development/libraries/libkrun/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libkrun/default.nix index 2f1b66116c..c931489057 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libkrun/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libkrun/default.nix @@ -15,21 +15,21 @@ stdenv.mkDerivation rec { pname = "libkrun"; - version = "1.4.8"; + version = "1.5.0"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-3oNsY91hgor1nZV10mcEZyEdhmHlozF8xXaCR4dvLYg="; + hash = "sha256-3WYxGpZ3uRbnh/VEDVSNOxp25SE7GQgC5t3ROuKNRE0="; } else fetchurl { url = "https://github.com/containers/libkrun/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-eKjBUianpW4T8OeVwRSEyZFfDE10d3qogkPA4FUJ7rc="; + hash = "sha256-T1nYzrzxEJaVBnI00CQPKoT2OYJxdW7y6WNkabNsQYI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-9v8UaBBpQDPZwHVurFJ1FaFMe6wywH3upKDjGcPYnuQ="; + hash = "sha256-Clb6PNwLuzx42Qr1tgpjG1WHq9NcDr2bbfnyp4UVVLU="; }; nativeBuildInputs = with rustPlatform; [ @@ -61,5 +61,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/libkrun"; license = licenses.asl20; maintainers = with maintainers; [ nickcao ]; + platforms = libkrunfw.meta.platforms; + sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix index f602299e23..1309077640 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libkrunfw/default.nix @@ -13,21 +13,21 @@ assert sevVariant -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "libkrunfw"; - version = "3.8.1"; + version = "3.9.0"; src = if stdenv.isLinux then fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - hash = "sha256-6jFIfTPjI6Eq0SFdQVxqqoBDW00AsDz/xHN+n6DezME="; + hash = "sha256-hpVE7g6V3nquZ3R5fQCcfRWuFDHJ3rgisezwdsDMaGg="; } else fetchurl { url = "https://github.com/containers/libkrunfw/releases/download/v${version}/v${version}-with_macos_prebuilts.tar.gz"; - hash = "sha256-i7btjGBgb93tHshIS02Rp492iB4aG0N4UuRwv6Pkukg="; + hash = "sha256-moZ2LYLhZDb8Y8jgWbdgK6SbJ8lY8f356d5vKHc/54Q="; }; kernelSrc = fetchurl { - url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.6.tar.xz"; - hash = "sha256-hksFry2Gm6c9YanFlZ5FMaFBqyvXshdINnH2Jfl0f6o="; + url = "https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.6.tar.xz"; + hash = "sha256-Pk2OVh2lcDogWujXsr7WxcZPxCme68v9IEgeY7V9XuM="; }; preBuild = '' @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl2Only lgpl21Only ]; maintainers = with maintainers; [ nickcao ]; platforms = [ "x86_64-linux" "aarch64-darwin" ]; + sourceProvenance = with sourceTypes; lib.optionals stdenv.isDarwin [ binaryNativeCode ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix index 10c2bfb272..fe3ddba36b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix @@ -15,11 +15,12 @@ , lib , stdenv , xercesc +, zxing-cpp }: stdenv.mkDerivation rec { pname = "liblinphone"; - version = "5.1.22"; + version = "5.2.17"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -27,10 +28,14 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-hTyp/fUA1+7J1MtqX33kH8Vn1XNjx51Wy5REvrpdJTY="; + hash = "sha256-zxp+jcClfKm+VsylRtydF2rlDCkO+sa9vw8GpwAfKHM="; }; - patches = [ ./use-normal-jsoncpp.patch ]; + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace "jsoncpp_object" "jsoncpp" \ + --replace "jsoncpp_static" "jsoncpp" + ''; cmakeFlags = [ "-DENABLE_STATIC=NO" # Do not build static libraries @@ -52,6 +57,7 @@ stdenv.mkDerivation rec { (python3.withPackages (ps: [ ps.pystache ps.six ])) sqlite xercesc + zxing-cpp ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch deleted file mode 100644 index 4685b327ec..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/use-normal-jsoncpp.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ea6901c9ed0f804bd2d6d09e514610518c2f4f09 Mon Sep 17 00:00:00 2001 -From: Lorenz Brun -Date: Fri, 18 Mar 2022 17:36:22 +0100 -Subject: [PATCH] Use normal jsoncpp - ---- - src/CMakeLists.txt | 6 +++--- - tester/CMakeLists.txt | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5cd87fe9a..822b2151e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI) - if (XCODE) - list(APPEND LINK_LIBS jsoncpp_static) - else() -- list(APPEND LINK_LIBS jsoncpp_object) -+ list(APPEND LINK_LIBS jsoncpp) - endif() - endif() - -@@ -592,7 +592,7 @@ if(ENABLE_STATIC) - if (XCODE) - target_link_libraries(linphone PRIVATE jsoncpp_static) - else() -- target_link_libraries(linphone PRIVATE jsoncpp_object) -+ target_link_libraries(linphone PRIVATE jsoncpp) - endif() - endif() - -@@ -646,7 +646,7 @@ if(ENABLE_SHARED) - if (XCODE) - target_link_libraries(linphone PRIVATE jsoncpp_static) - else() -- target_link_libraries(linphone PRIVATE jsoncpp_object) -+ target_link_libraries(linphone PRIVATE jsoncpp) - endif() - endif() - -diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt -index b97042678..b4c5a5794 100644 ---- a/tester/CMakeLists.txt -+++ b/tester/CMakeLists.txt -@@ -34,7 +34,7 @@ if (ENABLE_FLEXIAPI) - if (XCODE) - list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_static) - else() -- list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp_object) -+ list(APPEND OTHER_LIBS_FOR_TESTER jsoncpp) - endif() - endif() - --- -2.25.1 - diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix index 953a6d03e5..cdd6a7b2ec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, darwin, disablePosixThreads ? false }: -with lib; - stdenv.mkDerivation rec { pname = "libmcrypt"; version = "2.5.8"; @@ -11,15 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"; }; - buildInputs = optional stdenv.isDarwin darwin.cctools; + buildInputs = lib.optional stdenv.isDarwin darwin.cctools; - configureFlags = optionals disablePosixThreads + configureFlags = lib.optionals disablePosixThreads [ "--disable-posix-threads" ]; meta = { description = "Replacement for the old crypt() package and crypt(1) command, with extensions"; homepage = "http://mcrypt.sourceforge.net"; license = "GPL"; - platforms = platforms.all; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodplug/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmodplug/default.nix index 3f4f89c0a2..c4fa6fcd7c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmodplug/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmodplug/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MOD playing library"; - homepage = "http://modplug-xmms.sourceforge.net/"; + homepage = "https://modplug-xmms.sourceforge.net/"; license = licenses.publicDomain; platforms = platforms.unix; maintainers = with maintainers; [ raskin ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix index 8421a25030..481f12e175 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libmpc"; - version = "1.2.1"; # to avoid clash with the MPD client + version = "1.3.1"; # to avoid clash with the MPD client src = fetchurl { url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; - sha256 = "0n846hqfqvmsmim7qdlms0qr86f1hck19p12nq3g3z2x74n3sl0p"; + sha256 = "sha256-q2QkkvXPiCt0qgy3MM1BCoHtzb7IlRg86TDnBsHHWbg="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnats-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnats-c/default.nix index 86e8932c04..f2bc161998 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnats-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnats-c/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; rev = "v${version}"; - sha256 = "sha256-mdOvJkCdJ2QEsVUdxVCpIDLn4+6JM6OeJfasJxqqID8="; + sha256 = "sha256-L/RS/M0TQJEMXRvdwo03st1VAlIlJ/fCmTvx+0+gCGE="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnatspec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnatspec/default.nix index 304fb49f02..360aba08e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnatspec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnatspec/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libiconv ]; meta = with lib; { - homepage = "http://natspec.sourceforge.net/"; + homepage = "https://natspec.sourceforge.net/"; description = "A library intended to smooth national specificities in using of programs"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix index 48edfbfce2..7a9e0580e3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnixxml/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { glib nix ]; - checkInputs = [ + nativeCheckInputs = [ nix ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix index dd14504bf8..b7dddd1667 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libofx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libofx"; - version = "0.10.7"; + version = "0.10.9"; src = fetchFromGitHub { owner = "LibOFX"; repo = pname; rev = version; - sha256 = "sha256-zbSVmduEH7iO/8N6hEpQQMUYDVG6CaNycGOl5bd6fsw="; + sha256 = "sha256-KOQrEAt1jHrOpPQ7QbGUADe0i7sQXNH2fblPRzT0EIg="; }; preConfigure = "./autogen.sh"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Opensource implementation of the Open Financial eXchange specification"; - homepage = "http://libofx.sourceforge.net/"; + homepage = "https://libofx.sourceforge.net/"; license = "LGPL"; platforms = lib.platforms.unix; maintainers = [ ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix index e49473b79e..67d9ec29b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { doCheck = false; # fails - # Fix for #40213, probably permanent, because upstream doesn't seem to be - # developed anymore. Alternatively, gcc7Stdenv could be used. - NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds -Wno-error=stringop-overflow=8"; + NIX_CFLAGS_COMPILE = + if stdenv.cc.isGNU then "-Wno-error=array-bounds -Wno-error=stringop-overflow=8" + else "-Wno-error=absolute-value -Wno-error=enum-conversion -Wno-error=logical-not-parentheses -Wno-error=non-literal-null-conversion"; meta = with lib; { - homepage = "https://sourceforge.net/projects/omxil/"; + homepage = "https://omxil.sourceforge.net/"; description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/liboqs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liboqs/default.nix new file mode 100644 index 0000000000..908554a679 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/liboqs/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, openssl +, enableStatic ? stdenv.hostPlatform.isStatic +}: + +stdenv.mkDerivation rec { + pname = "liboqs"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "open-quantum-safe"; + repo = pname; + rev = version; + sha256 = "sha256-cwrTHj/WFDZ9Ez2FhjpRhEx9aC5xBnh7HR/9T+zUpZc="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ openssl ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if enableStatic then "OFF" else "ON"}" + "-DOQS_DIST_BUILD=ON" + "-DOQS_BUILD_ONLY_LIB=ON" + ]; + + dontFixCmake = true; # fix CMake file will give an error + + meta = with lib; { + description = "C library for prototyping and experimenting with quantum-resistant cryptography"; + homepage = "https://openquantumsafe.org"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ candyc1oud ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix index 0325893362..801b748695 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libxml2 libxslt ]; - checkInputs = [ + nativeCheckInputs = [ check curl perl diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix index 01cdc96e39..d86755837b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libosmium/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "sha256-IPdaBT6hRNHo8kuOsiKdyiQkRxA/l+44U3qGGG89BTo="; + sha256 = "sha256-R7kOhQFfGYuHNkIZV4BTE+WKjHnCJwKeIWjCJNrvyTQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosmscout/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libosmscout/default.nix index 76a1ba534b..8452ccffe3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libosmscout/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libosmscout/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { meta = with lib; { description = "Simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data"; - homepage = "http://libosmscout.sourceforge.net/"; + homepage = "https://libosmscout.sourceforge.net/"; license = licenses.lgpl3Plus; maintainers = [ maintainers.Thra11 ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpar2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpar2/default.nix index 0130af6645..772f3ff719 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpar2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpar2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; meta = { - homepage = "http://parchive.sourceforge.net/"; + homepage = "https://parchive.sourceforge.net/"; license = lib.licenses.gpl2Plus; description = "A library for using Parchives (parity archive volume sets)"; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix index f3d3587c14..312e1dbf87 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpcap/default.nix @@ -1,6 +1,14 @@ -{ lib, stdenv, fetchurl, flex, bison, bluez, pkg-config, withBluez ? false }: - -with lib; +{ lib +, stdenv +, fetchurl +, flex +, bison +, bluez +, libxcrypt +, pkg-config +, withBluez ? false +, withRemote ? false +}: stdenv.mkDerivation rec { pname = "libpcap"; @@ -11,16 +19,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-7ShfSsyvBTRPkJdXV7Pb/ncrpB0cQBwmSLf6RbcRvdQ="; }; + buildInputs = lib.optionals withRemote [ libxcrypt ]; + nativeBuildInputs = [ flex bison ] - ++ optionals withBluez [ bluez.dev pkg-config ]; + ++ lib.optionals withBluez [ bluez.dev pkg-config ]; # We need to force the autodetection because detection doesn't # work in pure build environments. configureFlags = [ "--with-pcap=${if stdenv.isLinux then "linux" else "bpf"}" - ] ++ optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin [ "--disable-universal" - ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) + ] ++ lib.optionals withRemote [ + "--enable-remote" + ] ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ "ac_cv_linux_vers=2" ]; postInstall = '' @@ -29,7 +41,7 @@ stdenv.mkDerivation rec { fi ''; - meta = { + meta = with lib; { homepage = "https://www.tcpdump.org"; description = "Packet Capture Library"; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpqxx/6.nix b/third_party/nixpkgs/pkgs/development/libraries/libpqxx/6.nix index c9e55fd9c0..1c2a98fcb3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpqxx/6.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpqxx/6.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++ library to access PostgreSQL databases"; - homepage = "http://pqxx.org/development/libpqxx/"; + homepage = "https://pqxx.org/development/libpqxx/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eelco ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix index d0116a742d..2350217693 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++ library to access PostgreSQL databases"; - homepage = "http://pqxx.org/development/libpqxx/"; + homepage = "https://pqxx.org/development/libpqxx/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eelco ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix index c2d91b1d5b..10f4b43f98 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix @@ -17,8 +17,6 @@ , libva }: -with lib; - mkDerivation rec { pname = "libqtav"; version = "unstable-2020-09-10"; @@ -64,7 +62,7 @@ mkDerivation rec { stripDebugList = [ "lib" "libexec" "bin" "qml" ]; - meta = { + meta = with lib; { description = "A multimedia playback framework based on Qt + FFmpeg"; #license = licenses.lgpl21; # For the libraries / headers only. license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used. diff --git a/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix index c112f0a334..4d029ec803 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -1,20 +1,24 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, qtmultimedia, qtkeychain }: +{ mkDerivation, lib, fetchFromGitHub, cmake, olm, openssl, qtmultimedia, qtkeychain }: mkDerivation rec { pname = "libquotient"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "sha256-9NAWphpAI7/qWDMjsx26s+hOaQh0hbzjePfESC7PtXc="; + hash = "sha256-3xnv1dcyeX3Kl5EH2Tlf6nXobLG1zXsFmYstnvmSAXA="; }; - buildInputs = [ qtmultimedia qtkeychain ]; + buildInputs = [ olm openssl qtmultimedia qtkeychain ]; nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DQuotient_ENABLE_E2EE=ON" + ]; + # https://github.com/quotient-im/libQuotient/issues/551 postPatch = '' substituteInPlace Quotient.pc.in \ @@ -23,7 +27,7 @@ mkDerivation rec { ''; meta = with lib; { - description = "A Qt5 library to write cross-platform clients for Matrix"; + description = "A Qt5/Qt6 library to write cross-platform clients for Matrix"; homepage = "https://matrix.org/docs/projects/sdk/quotient"; license = licenses.lgpl21; maintainers = with maintainers; [ colemickens ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librdf/rasqal.nix b/third_party/nixpkgs/pkgs/development/libraries/librdf/rasqal.nix index fd0f6d2ce6..8d935bb085 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librdf/rasqal.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librdf/rasqal.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rvf $out/share/gtk-doc"; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; doCheck = false; # fails with "No testsuite plan file sparql-query-plan.ttl could be created in build/..." doInstallCheck = false; # fails with "rasqal-config does not support (--help|--version)" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix index 155af3f74f..8a01ace464 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libredwg/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { doCheck = true; # the "xmlsuite" test requires the libxml2 c library as well as the python module - checkInputs = lib.optionals enablePython [ libxml2 libxml2.dev ]; + nativeCheckInputs = lib.optionals enablePython [ libxml2 libxml2.dev ]; meta = with lib; { description = "Free implementation of the DWG file format"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix index 6877f9ab7b..7daa4ad19e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librime/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, boost, glog, leveldb, marisa, opencc, - libyamlcpp, gtest, capnproto, pkg-config, plugins ? [ ] }: + yaml-cpp, gtest, capnproto, pkg-config, plugins ? [ ] }: let copySinglePlugin = plug: "cp -r ${plug} plugins/${plug.name}"; @@ -10,18 +10,18 @@ let in stdenv.mkDerivation rec { pname = "librime"; - version = "1.7.3"; + version = "1.8.3"; src = fetchFromGitHub { owner = "rime"; repo = pname; rev = version; - sha256 = "sha256-GzNMwyJR9PgJN0eGYbnBW6LS3vo4SUVLdyNG9kcEE18="; + sha256 = "sha256-tPuDDVV4ZeBva/oHcw0rNjkzYmCtT2vLCdwCukBM28w="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost glog leveldb marisa opencc libyamlcpp gtest capnproto ] + buildInputs = [ boost glog leveldb marisa opencc yaml-cpp gtest capnproto ] ++ plugins; # for propagated build inputs preConfigure = copyPlugins; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix index 691975b1af..cc80655c1f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { make cleanall ''; - checkInputs = [ + nativeCheckInputs = [ octave ]; checkTarget = "tests"; meta = with lib; { - homepage = "http://librsb.sourceforge.net/"; + homepage = "https://librsb.sourceforge.net/"; description = "Shared memory parallel sparse matrix and sparse BLAS library"; longDescription = '' Library for sparse matrix computations featuring the Recursive Sparse diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsync/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsync/default.nix index 0594e9e6e2..cc9778a3ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librsync/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librsync/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implementation of the rsync remote-delta algorithm"; - homepage = "http://librsync.sourceforge.net/"; + homepage = "https://librsync.sourceforge.net/"; license = licenses.lgpl2Plus; mainProgram = "rdiff"; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libseccomp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libseccomp/default.nix index c861673305..e68603c490 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libseccomp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libseccomp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - checkInputs = [ util-linuxMinimal which ]; + nativeCheckInputs = [ util-linuxMinimal which ]; doCheck = true; # Hack to ensure that patchelf --shrink-rpath get rids of a $TMPDIR reference. diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix index 7de9fecd7d..fd2cadf160 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { glib ]; - checkInputs = [ + nativeCheckInputs = [ python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 diff --git a/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix index 4164ef4a46..810047394e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libshumate/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { gtk4 ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix index 7ff3974fdb..84d0f01c15 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsidplayfp/default.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation rec { pname = "libsidplayfp"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-stfpyJC1AVmDh1Nk5c5Lv0j6ic2AU6mwY02L/IDr8tE="; + sha256 = "sha256-e+blEdO2KA/noW9pq56qZ0/vvtqQwiDbBJoQR0cQeds="; }; postPatch = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ unittest-cpp ]; + nativeCheckInputs = [ unittest-cpp ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix index 6ae972b51d..99e1a35a80 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.22"; + version = "0.7.23"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-rqWQJz3gZuhcNblyFWiYCC17miNY8F5xguAJwDk3xFE="; + sha256 = "sha256-i1g4arr8rII9SzdyITD6xS9CAVN6zP73gFwnZdkc5os="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix index df753b55b0..91b4a42d54 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection sqlite libpsl glib.out diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspectrum/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspectrum/default.nix index c373f7c24f..3dda20ab61 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspectrum/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspectrum/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "http://fuse-emulator.sourceforge.net/libspectrum.php"; + homepage = "https://fuse-emulator.sourceforge.net/libspectrum.php"; description = "ZX Spectrum input and output support library"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspf2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspf2/default.nix index 203f2768e3..b7bef29735 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspf2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspf2/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: -with lib; - stdenv.mkDerivation rec { pname = "libspf2"; version = "2.2.12"; @@ -35,7 +33,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with lib; { description = "Implementation of the Sender Policy Framework for SMTP " + "authorization (Helsinki Systems fork)"; homepage = "https://github.com/helsinki-systems/libspf2"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix index f6908aa331..d67b12a726 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspnav/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://spacenav.sourceforge.net/"; + homepage = "https://spacenav.sourceforge.net/"; description = "Device driver and SDK for 3Dconnexion 3D input devices"; longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspng/default.nix index f74a1777a7..3925c8fb53 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspng/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - checkInputs = [ + nativeCheckInputs = [ cmake libpng ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsv/default.nix new file mode 100644 index 0000000000..fb319bf30f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libsv/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libsv"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "uael"; + repo = "sv"; + rev = "v${version}"; + sha256 = "sha256-icvGQi6FNSZXNGs2oLiUKu6rrVsWcXh1r91kycGjnwY="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Public domain cross-platform semantic versioning in C99"; + homepage = "https://github.com/uael/sv"; + license = licenses.unlicense; + maintainers = with maintainers; [ candyc1oud ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtap/default.nix index ce7cb6bfd1..47ca65e849 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtap/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, cmake, perl }: -with lib; stdenv.mkDerivation rec { pname = "libtap"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtar/default.nix index 3e5b4cd23e..c6c89ecb4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtar/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtar/default.nix @@ -18,10 +18,24 @@ stdenv.mkDerivation rec { inherit sha256; }; in [ - (fp "no_static_buffers" "0yv90bhvqjj0v650gzn8fbzhdhzx5z0r1lh5h9nv39wnww435bd0") + (fetchpatch { + name = "no_static_buffers.patch"; + url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-no-static-buffer.patch"; + sha256 = "sha256-QcWOgdkNlALb+YDVneT1zCNAMf4d8IUm2kUUUy2VvJs="; + }) (fp "no_maxpathlen" "11riv231wpbdb1cm4nbdwdsik97wny5sxcwdgknqbp61ibk572b7") (fp "CVE-2013-4420" "0d010190bqgr2ggy02qwxvjaymy9a22jmyfwdfh4086v876cbxpq") (fp "th_get_size-unsigned-int" "1ravbs5yrfac98mnkrzciw9hd2fxq4dc07xl3wx8y2pv1bzkwm41") + (fetchpatch { + name = "CVE-2021-33643_CVE-2021-33644.patch"; + url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-CVE-2021-33643-CVE-2021-33644.patch"; + sha256 = "sha256-HdjotTvKJNntkdcV+kR08Ht/MyNeB6qUT0qo67BBOVA="; + }) + (fetchpatch { + name = "CVE-2021-33645_CVE-2021-33646_CVE-2021-33640.patch"; + url = "https://src.fedoraproject.org/rpms/libtar/raw/e25b692fc7ceaa387dafb865b472510754f51bd2/f/libtar-1.2.20-CVE-2021-33645-CVE-2021-33646.patch"; + sha256 = "sha256-p9DEFAL5Y+Ldy5c9Wj9h/BSg4TDxIxCjCQJD+wGQ7oI="; + }) ]; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtheora/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtheora/default.nix index 1e88218aa0..0e0030558d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtheora/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtheora/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { }) ]; + configureFlags = [ "--disable-examples" ]; + outputs = [ "out" "dev" "devdoc" ]; outputDoc = "devdoc"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix index 8e94275bab..05aff27340 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libthreadar/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://libthreadar.sourceforge.net/"; + homepage = "https://libthreadar.sourceforge.net/"; description = "A C++ library that provides several classes to manipulate threads"; longDescription = '' Libthreadar is a C++ library providing a small set of C++ classes to manipulate diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix index 65a68ffc08..59bfabefce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtoxcore/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; doCheck = true; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; postInstall = '' substituteInPlace $out/lib/pkgconfig/toxcore.pc \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libucl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libucl/default.nix index e65d0d475f..9ba9664410 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libucl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libucl/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "libucl"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "vstakhov"; repo = pname; rev = version; - sha256 = "1h52ldxankyhbbm1qbqz1f2q0j03c1b4mig7343bs3mc6fpm18gf"; + sha256 = "sha256-rpTc0gq8HquDow4NEkRSjyESEMrv8dAhX98yKKu/Fsk="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunibreak/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunibreak/default.nix index 7dee1d6b1e..f740bd82bb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunibreak/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libunibreak/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libunibreak"; - version = "5.0"; + version = "5.1"; src = let rev_version = lib.replaceStrings ["."] ["_"] version; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "adah1972"; repo = pname; rev = "libunibreak_${rev_version}"; - sha256 = "sha256-ju+DNCzwD+y/ebLVBU96iNpE1Wt7/K0qLcZHzWGzrWQ="; + sha256 = "sha256-hjgT5DCQ6KFXKlxk9LLzxGHz6B71X/3Ot7ipK3KY85A="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunique/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libunique/3.x.nix index 72027b85ed..086ca28676 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libunique/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libunique/3.x.nix @@ -3,7 +3,6 @@ , gtk-doc, docbook_xml_dtd_45, docbook_xsl , libxslt, libxml2 }: -with lib; stdenv.mkDerivation rec { majorVer = "3.0"; @@ -23,8 +22,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://wiki.gnome.org/Attic/LibUnique"; description = "A library for writing single instance applications"; - license = licenses.lgpl21; - maintainers = [ maintainers.AndersonTorres ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.AndersonTorres ]; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix index 120b5d9c61..8eab8d6bee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liburcu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-EhP9nxsLdNp94rt0M1t2CY25c4/sXTzcB8DFJPNPwDI="; }; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; preCheck = "patchShebangs tests/unit"; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libutempter/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libutempter/default.nix index 3b63ef9386..717418e686 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libutempter/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libutempter/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, lib, glib }: -with lib; - stdenv.mkDerivation rec { pname = "libutempter"; version = "1.2.1"; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { "mandir=\${out}/share/man" ]; - meta = { + meta = with lib; { homepage = "https://github.com/altlinux/libutempter"; description = "Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix index bad8e14d59..9f958efe71 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "sha256-HTwJQpDND4PjiNpUjHtTgkQdkahm2BUe71UDRQpvo6M="; + sha256 = "sha256-Vw62xgWzaaWKQWIZDYpVpOgEUQGUNToImEAo6lwiFFU="; }; outputs = [ "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix index dff497fbdc..a46af497a5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.17.0"; + version = "2.17.1"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "sha256-zv62Jznifw3GG5n8CIE7rJu0POx0aT8btO9N6CoBfAE="; + sha256 = "sha256-xsKOoDVt6L3L+6uBrKo/pyeHvQ4GgH312WKesT8XVLs="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvgm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvgm/default.nix index a6d9a68abb..733a75e5fc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvgm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvgm/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "libvgm"; - version = "unstable-2022-11-25"; + version = "unstable-2023-01-18"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "fd7da37b96b5937a0bb5a41bacbae0a0ef59069f"; - sha256 = "1tjooO/f72lRdZDxXVSxBySWsUMNWuqI2yQOipa7zFY="; + rev = "c250212538dd48d3965826ad7fe669bb0f348cbd"; + sha256 = "5XHdPtadfsfzkeeOpa5NPrWarHBHeKvmr7p0m31URDc="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix index 8f84cd0eab..566a1c1b83 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix @@ -5,21 +5,23 @@ , meson , ninja , pkg-config -, gobject-introspection , gettext -, gtk-doc -, docbook-xsl-nons , vala , libcap_ng , libvirt , libxml2 +, withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform +, gobject-introspection +, withDocs ? stdenv.hostPlatform == stdenv.buildPlatform +, gtk-doc +, docbook-xsl-nons }: stdenv.mkDerivation rec { pname = "libvirt-glib"; version = "4.0.0"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] ++ lib.optional withDocs "devdoc"; src = fetchurl { url = "https://libvirt.org/sources/glib/${pname}-${version}.tar.xz"; @@ -39,22 +41,35 @@ stdenv.mkDerivation rec { ninja pkg-config gettext - gtk-doc - docbook-xsl-nons vala gobject-introspection + ] ++ lib.optionals withIntrospection [ + gobject-introspection + ] ++ lib.optionals withDocs [ + gtk-doc + docbook-xsl-nons ]; - buildInputs = (lib.optionals stdenv.isLinux [ - libcap_ng - ]) ++ [ + buildInputs = [ libvirt libxml2 + ] ++ lib.optionals stdenv.isLinux [ + libcap_ng + ] ++ lib.optionals withIntrospection [ gobject-introspection ]; strictDeps = true; + # The build system won't let us build with docs or introspection + # unless we're building natively, but will still do a mandatory + # check for the dependencies for those things unless we explicitly + # disable the options. + mesonFlags = [ + (lib.mesonEnable "docs" withDocs) + (lib.mesonEnable "introspection" withIntrospection) + ]; + # https://gitlab.com/libvirt/libvirt-glib/-/issues/4 NIX_CFLAGS_COMPILE = [ "-Wno-error=pointer-sign" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch b/third_party/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch index b8d8ddcb14..75d2ac1f08 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch @@ -305,7 +305,7 @@ diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 39f0f615cc..5f6f30f82b 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build -@@ -175,24 +175,24 @@ if conf.has('WITH_QEMU') +@@ -200,25 +200,25 @@ if conf.has('WITH_QEMU') endif virt_install_dirs += [ @@ -326,6 +326,7 @@ index 39f0f615cc..5f6f30f82b 100644 - localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', - runstatedir / 'libvirt' / 'qemu', - runstatedir / 'libvirt' / 'qemu' / 'dbus', +- runstatedir / 'libvirt' / 'qemu' / 'passt', - runstatedir / 'libvirt' / 'qemu' / 'slirp', - runstatedir / 'libvirt' / 'qemu' / 'swtpm', + install_prefix + confdir / 'qemu', @@ -345,6 +346,7 @@ index 39f0f615cc..5f6f30f82b 100644 + install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', + install_prefix + runstatedir / 'libvirt' / 'qemu', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'dbus', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'passt', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'slirp', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 8f4479a763..734f96850c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -42,7 +42,7 @@ , attr ? null , audit ? null , dmidecode ? null -, fuse ? null +, fuse3 ? null , kmod ? null , libapparmor ? null , libcap_ng ? null @@ -77,13 +77,11 @@ , zfs }: -with lib; - let inherit (stdenv) isDarwin isLinux isx86_64; - binPath = makeBinPath ([ + binPath = lib.makeBinPath ([ dnsmasq - ] ++ optionals isLinux [ + ] ++ lib.optionals isLinux [ bridge-utils dmidecode dnsmasq @@ -95,10 +93,10 @@ let numad pmutils systemd - ] ++ optionals enableIscsi [ + ] ++ lib.optionals enableIscsi [ libiscsi openiscsi - ] ++ optionals enableZfs [ + ] ++ lib.optionals enableZfs [ zfs ]); in @@ -114,13 +112,13 @@ stdenv.mkDerivation rec { # NOTE: You must also bump: # # SysVirt in - version = "8.10.0"; + version = "9.0.0"; src = fetchFromGitLab { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-MboJLQ0R3l9lUQDjNVACvmxISjypvfxxMHSKF0+k6WM="; + sha256 = "sha256-YnkgTl6C3QkvMBGm95JgWmWaP4mAECe9B0wwjOx94p8="; fetchSubmodules = true; }; @@ -148,17 +146,17 @@ stdenv.mkDerivation rec { substituteInPlace meson.build \ --replace "'dbus-daemon'," "'${lib.getBin dbus}/bin/dbus-daemon'," - '' + optionalString isLinux '' + '' + lib.optionalString isLinux '' sed -i 's,define PARTED "parted",define PARTED "${parted}/bin/parted",' \ src/storage/storage_backend_disk.c \ src/storage/storage_util.c - '' + optionalString isDarwin '' + '' + lib.optionalString isDarwin '' sed -i '/qemucapabilitiestest/d' tests/meson.build sed -i '/vircryptotest/d' tests/meson.build sed -i '/domaincapstest/d' tests/meson.build sed -i '/qemufirmwaretest/d' tests/meson.build sed -i '/qemuvhostusertest/d' tests/meson.build - '' + optionalString (isDarwin && isx86_64) '' + '' + lib.optionalString (isDarwin && isx86_64) '' sed -i '/qemucaps2xmltest/d' tests/meson.build sed -i '/qemuhotplugtest/d' tests/meson.build sed -i '/virnetdaemontest/d' tests/meson.build @@ -178,9 +176,9 @@ stdenv.mkDerivation rec { perl perlPackages.XMLXPath ] - ++ optional (!isDarwin) rpcsvc-proto + ++ lib.optional (!isDarwin) rpcsvc-proto # NOTE: needed for rpcgen - ++ optional isDarwin darwin.developer_cmds; + ++ lib.optional isDarwin darwin.developer_cmds; buildInputs = [ bash @@ -197,11 +195,11 @@ stdenv.mkDerivation rec { readline xhtml1 yajl - ] ++ optionals isLinux [ + ] ++ lib.optionals isLinux [ acl attr audit - fuse + fuse3 libapparmor libcap_ng libnl @@ -213,17 +211,17 @@ stdenv.mkDerivation rec { parted systemd util-linux - ] ++ optionals isDarwin [ + ] ++ lib.optionals isDarwin [ AppKit Carbon gmp libiconv ] - ++ optionals enableCeph [ ceph ] - ++ optionals enableGlusterfs [ glusterfs ] - ++ optionals enableIscsi [ libiscsi openiscsi ] - ++ optionals enableXen [ xen ] - ++ optionals enableZfs [ zfs ]; + ++ lib.optionals enableCeph [ ceph ] + ++ lib.optionals enableGlusterfs [ glusterfs ] + ++ lib.optionals enableIscsi [ libiscsi openiscsi ] + ++ lib.optionals enableXen [ xen ] + ++ lib.optionals enableZfs [ zfs ]; preConfigure = let @@ -348,7 +346,7 @@ stdenv.mkDerivation rec { # Added in nixpkgs: gettext() { "${gettext}/bin/gettext" "$@"; } ' - '' + optionalString isLinux '' + '' + lib.optionalString isLinux '' for f in $out/lib/systemd/system/*.service ; do substituteInPlace $f --replace /bin/kill ${coreutils}/bin/kill done @@ -372,7 +370,7 @@ stdenv.mkDerivation rec { passthru.tests.libvirtd = nixosTests.libvirtd; - meta = { + meta = with lib; { description = "A toolkit to interact with the virtualization capabilities of recent versions of Linux and other OSes"; homepage = "https://libvirt.org/"; changelog = "https://gitlab.com/libvirt/libvirt/-/raw/v${version}/NEWS.rst"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvmi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvmi/default.nix index 36fd026eee..cbcba106b8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvmi/default.nix @@ -10,8 +10,6 @@ libvirt, xenSupport ? true }: -with lib; - stdenv.mkDerivation rec { pname = "libvmi"; version = "0.12.0"; @@ -24,16 +22,16 @@ stdenv.mkDerivation rec { sha256 = "0wbi2nasb1gbci6cq23g6kq7i10rwi1y7r44rl03icr5prqjpdyv"; }; - buildInputs = [ glib libvirt json_c ] ++ (optional xenSupport xen); + buildInputs = [ glib libvirt json_c ] ++ (lib.optional xenSupport xen); nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; - configureFlags = optional (!xenSupport) "--disable-xen"; + configureFlags = lib.optional (!xenSupport) "--disable-xen"; # libvmi uses dlopen() for the xen libraries, however autoPatchelfHook doesn't work here - postFixup = optionalString xenSupport '' + postFixup = lib.optionalString xenSupport '' libvmi="$out/lib/libvmi.so.${libVersion}" oldrpath=$(patchelf --print-rpath "$libvmi") - patchelf --set-rpath "$oldrpath:${makeLibraryPath [ xen ]}" "$libvmi" + patchelf --set-rpath "$oldrpath:${lib.makeLibraryPath [ xen ]}" "$libvmi" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix index 13ad9eb29c..dff7abc7dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.2.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - hash = "sha256-XX6qOWlIl8TqOQMiGpmmDVKwQnM1taG6lrqq1ZFVk5s="; + hash = "sha256-nhXkq+qKpaa75YQB/W/cRozslTIFPdXeqj1y6emQeHk="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwmf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwmf/default.nix index e955fee572..e6d598b54b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwmf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwmf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "WMF library from wvWare"; - homepage = "http://wvware.sourceforge.net/libwmf.html"; + homepage = "https://wvware.sourceforge.net/libwmf.html"; downloadPage = "https://github.com/caolanm/libwmf/releases"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwpd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwpd/default.nix index 1f54c2c2fb..47755e18e2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwpd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwpd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A library for importing and exporting WordPerfect documents"; - homepage = "http://libwpd.sourceforge.net/"; + homepage = "https://libwpd.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwps/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwps/default.nix index 7dd7153bae..597370ad0e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwps/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwps/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; meta = with lib; { - homepage = "http://libwps.sourceforge.net/"; + homepage = "https://libwps.sourceforge.net/"; description = "Microsoft Works document format import filter library"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix index ca7feb996f..ed936a9d03 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "libxkbcommon"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "0fbb2dyjvf71p42y2jmwdcylsvj03w52f5rb23c2d00rwahhfg4l"; + sha256 = "sha256-Vg8RxLu8oQ9JXz7306aqTKYrT4+wtS59RZ0Yom5G4Bc="; }; outputs = [ "out" "dev" "doc" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ lib.optional withWaylandTools wayland-scanner; buildInputs = [ xkeyboard_config libxcb libxml2 ] ++ lib.optionals withWaylandTools [ wayland wayland-protocols ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; mesonFlags = [ "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix index 16c29647a7..717ef7c70b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://libxmlplusplus.sourceforge.net/"; + homepage = "https://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library"; license = licenses.lgpl2Plus; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix index b3ff59ad41..02c990ae35 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/v3.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://libxmlplusplus.sourceforge.net/"; + homepage = "https://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library, version 3"; license = licenses.lgpl2Plus; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmp/default.nix index 47dfcab5a4..7fc14677ed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxmp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Extended module player library"; - homepage = "http://xmp.sourceforge.net/"; + homepage = "https://xmp.sourceforge.net/"; longDescription = '' Libxmp is a library that renders module files to PCM data. It supports over 90 mainstream and obscure module formats including Protracker (MOD), diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/0.3.0.nix b/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/0.3.0.nix deleted file mode 100644 index e379c34726..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/0.3.0.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - pname = "libyaml-cpp"; - version = "0.3.0"; - - src = fetchFromGitHub { - owner = "jbeder"; - repo = "yaml-cpp"; - rev = "release-${version}"; - sha256 = "sha256-pmgcULTXhl83+Wc8ZsGebnJ1t0XybHhUEJxDnEZE5x8="; - }; - - # implement https://github.com/jbeder/yaml-cpp/commit/52a1378e48e15d42a0b755af7146394c6eff998c - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace 'option(YAML_BUILD_SHARED_LIBS "Build Shared Libraries" OFF)' \ - 'option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ''${BUILD_SHARED_LIBS})' - ''; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "A YAML parser and emitter for C++"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix deleted file mode 100644 index 9b30ce19b1..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libyaml-cpp/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: - -stdenv.mkDerivation rec { - pname = "libyaml-cpp"; - version = "0.7.0"; - - src = fetchFromGitHub { - owner = "jbeder"; - repo = "yaml-cpp"; - rev = "yaml-cpp-${version}"; - sha256 = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk="; - }; - - patches = [ - # https://github.com/jbeder/yaml-cpp/issues/774 - # https://github.com/jbeder/yaml-cpp/pull/1037 - (fetchpatch { - url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch"; - sha256 = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM="; - }) - # TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available - (fetchpatch { - name = "libyaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patchj"; - url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch"; - sha256 = "12g5h7lxzd5v16ykay03zww5g28j3k69k228yr3v8fnmyv2spkfl"; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DYAML_CPP_BUILD_TESTS=OFF" ]; - - meta = with lib; { - inherit (src.meta) homepage; - description = "A YAML parser and emitter for C++"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libyang/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libyang/default.nix index 2bf595aae1..fa7d125f91 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libyang/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libyang/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libyang"; - version = "2.1.4"; + version = "2.1.30"; src = fetchFromGitHub { owner = "CESNET"; repo = "libyang"; rev = "v${version}"; - sha256 = "sha256-qmJHCADFqxjnxdDYxGmgZId3pxxgB8kw2UGBwYGauOc="; + sha256 = "sha256-EtAm6VbxTDNOEna5zCnGW23CPWlAxe4LpWwXmLPvo/Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libytnef/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libytnef/default.nix index f34834ae31..a4f358fa54 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libytnef/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libytnef/default.nix @@ -1,7 +1,5 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook }: -with lib; - stdenv.mkDerivation rec { pname = "libytnef"; version = "2.0"; @@ -15,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - meta = { + meta = with lib; { inherit (src.meta) homepage; description = "Yeraze's TNEF Stream Reader - for winmail.dat files"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzdb/default.nix index 986f27e27c..cfd4d38ac5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libzdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libzdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { - version = "3.2.2"; + version = "3.2.3"; pname = "libzdb"; src = fetchurl { url = "https://www.tildeslash.com/libzdb/dist/libzdb-${version}.tar.gz"; - sha256 = "1blmy7228649iscwlldrc1ldf31nhps1ps9xfv44ms0yxqhlw7nm"; + sha256 = "sha256-oZV4Jvq3clSE/Ft0eApqfQ2Lf14uVNJuEGs5ngqGvrA="; }; buildInputs = [ sqlite ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzen/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzen/default.nix index 1c7aa8c54b..a0c99457d4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libzen/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libzen/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.39"; + version = "0.4.40"; pname = "libzen"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "1rwaxmid9iv65n0y6xlcyxxydsvihjni9ldxpg6pbqz43amp49xx"; + sha256 = "sha256-VUPixFIUudnwuk9D3uYdApbh/58UJ+1sh53dG2K59p4="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lightning/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lightning/default.nix index 44b58a9d81..8398c80d50 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lightning/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lightning/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-TjmE/xzPC6MKmFIR1A/FwGsl8BTr3z2A0P49DIDdfA4="; }; - checkInputs = [ libopcodes ]; + nativeCheckInputs = [ libopcodes ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix index 038d96cad7..dc679b4ba5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lime/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "End-to-end encryption library for instant messaging. Part of the Linphone project."; - homepage = "http://www.linphone.org/technical-corner/lime"; + homepage = "https://www.linphone.org/technical-corner/lime"; license = licenses.gpl3Only; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix b/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix index 7ceb70bb8b..1e6311692a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "live555"; - version = "2022.12.01"; + version = "2023.01.19"; src = fetchurl { urls = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "https://download.videolan.org/contrib/live555/live.${version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz" ]; - sha256 = "sha256-BXwdPcJMJrM+FMTcNZKIWt8iBAOh4SVeihAeIzxpwQg="; + sha256 = "sha256-p8ZJE/f3AHxf3CnqgR48p4HyYicbPkKv3UvBBB2G+pk="; }; nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; diff --git a/third_party/nixpkgs/pkgs/development/libraries/log4cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/log4cpp/default.nix index f7a10d9c31..18ef21f26a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/log4cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/log4cpp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = "http://log4cpp.sourceforge.net/"; + homepage = "https://log4cpp.sourceforge.net/"; description = "A logging framework for C++ patterned after Apache log4j"; license = licenses.lgpl21Plus; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lucene++/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lucene++/default.nix index 08a3485050..7755692d2c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lucene++/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lucene++/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/39cd44bd54e918d25ee464477992ad0dc234dcba.patch"; sha256 = "sha256-PP6ENNhPJMWrYDlTnr156XV8d5aX/VNX8v4vvi9ZiWo"; }) + (fetchpatch { + name = "fix-visibility-on-mac.patch"; + url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/bc436842227aea561b68c6ae89fbd1fdefcac7b3.patch"; + sha256 = "sha256-/S7tFZ4ht5p0cv036xF2NKZQwExbPaGINyWZiUg/lS4="; + }) ]; postPatch = '' @@ -47,6 +52,6 @@ stdenv.mkDerivation rec { description = "C++ port of the popular Java Lucene search engine"; homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; license = with lib.licenses; [ asl20 lgpl3Plus ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix index bc26615488..bb0c61ba12 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lyra"; - version = "1.6"; + version = "1.6.1"; src = fetchFromGitHub { owner = "bfgroup"; repo = "lyra"; rev = version; - sha256 = "sha256-5k4b1JVrGDmT65tSWo6AkqvNpN+6n8wZgqEuXLL7stI="; + sha256 = "sha256-tS2SPLiKaL8C35AmOXyJPstFUfynkE/A53rurqiySbI="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mac/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mac/default.nix index 7445d283c6..f2eb234232 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mac/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mac/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "APE codec and decompressor"; - homepage = "http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"; + homepage = "https://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/martyr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/martyr/default.nix index 609033e22e..3221f2950c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/martyr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/martyr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; - homepage = "http://martyr.sourceforge.net/"; + homepage = "https://martyr.sourceforge.net/"; license = lib.licenses.lgpl21; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/mdds/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mdds/default.nix index 3ba31f094f..23059b91e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mdds/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mdds/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; - checkInputs = [ boost ]; + nativeCheckInputs = [ boost ]; postInstall = '' mkdir -p $out/lib/ diff --git a/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix index bb5bc566bc..fade17507c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "5.1.20"; + version = "5.2.16"; dontWrapQtApps = true; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-u8YqF5BzyYIF9+XB90Eu6DlwXuu1FDOJUzxebj0errU="; + hash = "sha256-K4EBZC3zuLKF9Qw4i24f0hYKlOgRM7MR4Ck2ZoTYi6I="; }; patches = [ @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications. Part of the Linphone project"; - homepage = "http://www.linphone.org/technical-corner/mediastreamer2"; + homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix index c853c172d2..56fa74e5c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -6,11 +6,58 @@ , libelf, libvdpau , libglvnd, libunwind , vulkan-loader, glslang -, galliumDrivers ? ["auto"] -# upstream Mesa defaults to only enabling swrast (aka lavapipe) on aarch64 for some reason, so force building the others -, vulkanDrivers ? if (stdenv.isLinux && stdenv.isAarch64) then [ "swrast" "broadcom" "freedreno" "panfrost" ] else [ "auto" ] +, galliumDrivers ? + if stdenv.isLinux then + [ + "d3d12" # WSL emulated GPU (aka Dozen) + "kmsro" # helper driver for display-only devices + "nouveau" # Nvidia + "radeonsi" # new AMD (GCN+) + "r300" # very old AMD + "r600" # less old AMD + "swrast" # software renderer (aka LLVMPipe) + "svga" # VMWare virtualized GPU + "virgl" # QEMU virtualized GPU (aka VirGL) + "zink" # generic OpenGL over Vulkan, experimental + ] + ++ lib.optionals stdenv.isAarch64 [ + "etnaviv" # Vivante GPU designs (mostly NXP/Marvell SoCs) + "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) + "lima" # ARM Mali 4xx + "panfrost" # ARM Mali Midgard and up (T/G series) + "tegra" # Nvidia Tegra SoCs + "v3d" # Broadcom VC5 (Raspberry Pi 4) + "vc4" # Broadcom VC4 (Raspberry Pi 0-3) + ] ++ lib.optionals stdenv.isx86_64 [ + "iris" # new Intel, could work on non-x86_64 with PCIe cards, but doesn't build as of 22.3.4 + "crocus" # Intel legacy, x86_64 only + ] + else [ "auto" ] +, vulkanDrivers ? + if stdenv.isLinux then + [ + "amd" # AMD (aka RADV) + "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) + "swrast" # software renderer (aka Lavapipe) + ] + ++ lib.optionals (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") [ + # QEMU virtualized GPU (aka VirGL) + # Requires ATOMIC_INT_LOCK_FREE == 2. + "virtio-experimental" + ] + ++ lib.optionals stdenv.isAarch64 [ + "broadcom" # Broadcom VC5 (Raspberry Pi 4, aka V3D) + "freedreno" # Qualcomm Adreno (all Qualcomm SoCs) + "imagination-experimental" # PowerVR Rogue (currently N/A) + "panfrost" # ARM Mali Midgard and up (T/G series) + ] + ++ lib.optionals stdenv.isx86_64 [ + "intel" # Intel (aka ANV), could work on non-x86_64 with PCIe cards, but doesn't build as of 22.3.4 + "intel_hasvk" # Intel Haswell/Broadwell, experimental, x86_64 only + ] + else [ "auto" ] , eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] -, vulkanLayers ? lib.optionals (!stdenv.isDarwin) [ "device-select" "overlay" ] # No Vulkan support on Darwin +, vulkanLayers ? lib.optionals (!stdenv.isDarwin) [ "device-select" "overlay" "intel-nullhw" ] # No Vulkan support on Darwin , OpenGL, Xplugin , withValgrind ? lib.meta.availableOn stdenv.hostPlatform valgrind-light && !valgrind-light.meta.broken, valgrind-light , enableGalliumNine ? stdenv.isLinux @@ -19,10 +66,12 @@ , enablePatentEncumberedCodecs ? true , libclc , jdupes -, cmake , rustc , rust-bindgen -, spirv-llvm-translator_14 +, spirv-llvm-translator +, zstd +, directx-headers +, udev }: /** Packaging design: @@ -36,22 +85,29 @@ - libOSMesa is in $osmesa (~4 MB) */ -with lib; - let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "22.3.3"; - branch = versions.major version; + version = "22.3.4"; + branch = lib.versions.major version; withLibdrm = lib.meta.availableOn stdenv.hostPlatform libdrm; + # Align all the Mesa versions used. Required to prevent explosions when + # two different LLVMs are loaded in the same process. + # FIXME: these should really go into some sort of versioned LLVM package set rust-bindgen' = rust-bindgen.override { rust-bindgen-unwrapped = rust-bindgen.unwrapped.override { clang = llvmPackages.clang; }; }; + spirv-llvm-translator' = spirv-llvm-translator.override { + inherit (llvmPackages) llvm; + }; + haveWayland = lib.elem "wayland" eglPlatforms; + haveZink = lib.elem "zink" galliumDrivers; + haveDozen = (lib.elem "d3d12" galliumDrivers) || (lib.elem "microsoft-experimental" vulkanDrivers); self = stdenv.mkDerivation { pname = "mesa"; inherit version; @@ -64,7 +120,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "sha256-vteZeIvyvZ7wedl82OCTSL9TywhoGFeOQHc7KxeBKSI="; + sha256 = "37a1ddaf03f41919ee3c89c97cff41e87de96e00e9d3247959cc8279d8294593"; }; # TODO: @@ -93,7 +149,11 @@ self = stdenv.mkDerivation { outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa" ++ lib.optional stdenv.isLinux "driversdev" - ++ lib.optional enableOpenCL "opencl"; + ++ lib.optional enableOpenCL "opencl" + # the Dozen drivers depend on libspirv2dxil, but link it statically, and + # libspirv2dxil itself is pretty chonky, so relocate it to its own output + # in case anything wants to use it at some point + ++ lib.optional haveDozen "spirv2dxil"; # FIXME: this fixes rusticl/iris segfaulting on startup, _somehow_. # Needs more investigating. @@ -115,66 +175,73 @@ self = stdenv.mkDerivation { "-Ddisk-cache-key=${placeholder "drivers"}" "-Ddri-search-path=${libglvnd.driverLink}/lib/dri" - "-Dplatforms=${concatStringsSep "," eglPlatforms}" - "-Dgallium-drivers=${concatStringsSep "," galliumDrivers}" - "-Dvulkan-drivers=${concatStringsSep "," vulkanDrivers}" + "-Dplatforms=${lib.concatStringsSep "," eglPlatforms}" + "-Dgallium-drivers=${lib.concatStringsSep "," galliumDrivers}" + "-Dvulkan-drivers=${lib.concatStringsSep "," vulkanDrivers}" "-Ddri-drivers-path=${placeholder "drivers"}/lib/dri" "-Dvdpau-libs-path=${placeholder "drivers"}/lib/vdpau" "-Domx-libs-path=${placeholder "drivers"}/lib/bellagio" "-Dva-libs-path=${placeholder "drivers"}/lib/dri" "-Dd3d-drivers-path=${placeholder "drivers"}/lib/d3d" - "-Dgallium-nine=${boolToString enableGalliumNine}" # Direct3D in Wine - "-Dosmesa=${boolToString enableOSMesa}" # used by wine + + "-Dgallium-nine=${lib.boolToString enableGalliumNine}" # Direct3D in Wine + "-Dosmesa=${lib.boolToString enableOSMesa}" # used by wine "-Dmicrosoft-clc=disabled" # Only relevant on Windows (OpenCL 1.2 API on top of D3D12) # To enable non-mesa gbm backends to be found (e.g. Nvidia) "-Dgbm-backends-path=${libglvnd.driverLink}/lib/gbm:${placeholder "out"}/lib/gbm" - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ "-Dglvnd=true" - ] ++ optionals enableOpenCL [ - "-Dgallium-opencl=icd" # Enable the gallium OpenCL frontend + + # Enable RT for Intel hardware + "-Dintel-clc=enabled" + ] ++ lib.optionals enableOpenCL [ + # Clover, old OpenCL frontend + "-Dgallium-opencl=icd" + "-Dopencl-spirv=true" + + # Rusticl, new OpenCL frontend "-Dgallium-rusticl=true" "-Drust_std=2021" "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" - ] ++ optional enablePatentEncumberedCodecs + ] ++ lib.optional enablePatentEncumberedCodecs "-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec" - ++ optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; + ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; buildInputs = with xorg; [ expat llvmPackages.libllvm libglvnd xorgproto libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libffi libvdpau libelf libXvMC libpthreadstubs openssl /*or another sha1 provider*/ - ] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ] - ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal ] + zstd + ] ++ lib.optionals haveWayland [ wayland wayland-protocols ] + ++ lib.optionals stdenv.isLinux [ libomxil-bellagio libva-minimal udev ] ++ lib.optionals stdenv.isDarwin [ libunwind ] - ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator_14 ] + ++ lib.optionals enableOpenCL [ libclc llvmPackages.clang llvmPackages.clang-unwrapped rustc rust-bindgen' spirv-llvm-translator' ] ++ lib.optional withValgrind valgrind-light - # Mesa will not build zink when gallium-drivers=auto - ++ lib.optional (elem "zink" galliumDrivers) vulkan-loader; + ++ lib.optional haveZink vulkan-loader + ++ lib.optional haveDozen directx-headers; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson pkg-config ninja intltool bison flex file - python3Packages.python python3Packages.Mako + python3Packages.python python3Packages.Mako python3Packages.ply jdupes glslang - ] ++ lib.optionals (elem "wayland" eglPlatforms) [ - wayland-scanner - ]; + ] ++ lib.optional haveWayland wayland-scanner; propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm - ] ++ optional withLibdrm libdrm - ++ optionals stdenv.isDarwin [ OpenGL Xplugin ]; + ] ++ lib.optional withLibdrm libdrm + ++ lib.optionals stdenv.isDarwin [ OpenGL Xplugin ]; doCheck = false; postInstall = '' # Some installs don't have any drivers so this directory is never created. mkdir -p $drivers $osmesa - '' + optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' mkdir -p $drivers/lib if [ -n "$(shopt -s nullglob; echo "$out/lib/libxatracker"*)" -o -n "$(shopt -s nullglob; echo "$out/lib/libvulkan_"*)" ]; then @@ -199,7 +266,7 @@ self = stdenv.mkDerivation { for js in $drivers/share/vulkan/icd.d/*.json; do substituteInPlace "$js" --replace "$out" "$drivers" done - '' + optionalString enableOpenCL '' + '' + lib.optionalString enableOpenCL '' # Move OpenCL stuff mkdir -p $opencl/lib mv -t "$opencl/lib/" \ @@ -219,9 +286,13 @@ self = stdenv.mkDerivation { for js in $drivers/share/vulkan/{im,ex}plicit_layer.d/*.json; do substituteInPlace "$js" --replace '"libVkLayer_' '"'"$drivers/lib/libVkLayer_" done + '' + lib.optionalString haveDozen '' + mkdir -p $spirv2dxil/{bin,lib} + mv -t $spirv2dxil/lib $out/lib/libspirv_to_dxil* + mv -t $spirv2dxil/bin $out/bin/spirv2dxil ''; - postFixup = optionalString stdenv.isLinux '' + postFixup = lib.optionalString stdenv.isLinux '' # set the default search path for DRI drivers; used e.g. by X server substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace "$drivers" "${libglvnd.driverLink}" [ -f "$dev/lib/pkgconfig/d3d.pc" ] && substituteInPlace "$dev/lib/pkgconfig/d3d.pc" --replace "$drivers" "${libglvnd.driverLink}" @@ -252,9 +323,13 @@ self = stdenv.mkDerivation { done ''; - NIX_CFLAGS_COMPILE = optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ "-fno-common" ] ++ lib.optionals enableOpenCL [ "-UPIPE_SEARCH_DIR" "-DPIPE_SEARCH_DIR=\"${placeholder "opencl"}/lib/gallium-pipe\"" + + # Work around regression from https://github.com/NixOS/nixpkgs/pull/210004 + # TODO(trofi): remove + "--sysroot=/" ]; passthru = { @@ -274,7 +349,7 @@ self = stdenv.mkDerivation { }; }; - meta = { + meta = with lib; { description = "An open source 3D graphics library"; longDescription = '' The Mesa project began as an open-source implementation of the OpenGL diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/opencl.patch b/third_party/nixpkgs/pkgs/development/libraries/mesa/opencl.patch index 02558aaa82..fb4da5cf7a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/opencl.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/opencl.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index e32338b3f9a..fae804fd41e 100644 +index 172c64a7c70..05961e56926 100644 --- a/meson.build +++ b/meson.build -@@ -1894,7 +1894,7 @@ endif +@@ -1900,7 +1900,7 @@ endif dep_clang = null_dep if with_clc @@ -29,51 +29,20 @@ index 6f307018815..ab84eb1006c 100644 'platforms', type : 'array', diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build -index 7af210b5693..ff6ac8c61ca 100644 +index db3586bd7fb..4d914206d21 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build -@@ -30,6 +30,7 @@ if with_ld_version_script +@@ -39,7 +39,8 @@ if dep_llvm.version().version_compare('>=10.0.0') + polly_isl_dep = cpp.find_library('PollyISL', dirs : llvm_libdir, required : false) endif - llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir') +-dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) +clang_libdir = get_option('clang-libdir') - opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL' ++dep_clang = cpp.find_library('clang-cpp', dirs : clang_libdir, required : false) - polly_dep = null_dep -@@ -60,19 +61,19 @@ else - endif - if not _shared_llvm or not (dep_clang.found() and dep_clang_usable) - dep_clang = [ -- cpp.find_library('clangCodeGen', dirs : llvm_libdir), -- cpp.find_library('clangFrontendTool', dirs : llvm_libdir), -- cpp.find_library('clangFrontend', dirs : llvm_libdir), -- cpp.find_library('clangDriver', dirs : llvm_libdir), -- cpp.find_library('clangSerialization', dirs : llvm_libdir), -- cpp.find_library('clangParse', dirs : llvm_libdir), -- cpp.find_library('clangSema', dirs : llvm_libdir), -- cpp.find_library('clangAnalysis', dirs : llvm_libdir), -- cpp.find_library('clangAST', dirs : llvm_libdir), -- cpp.find_library('clangASTMatchers', dirs : llvm_libdir), -- cpp.find_library('clangEdit', dirs : llvm_libdir), -- cpp.find_library('clangLex', dirs : llvm_libdir), -- cpp.find_library('clangBasic', dirs : llvm_libdir), -+ cpp.find_library('clangCodeGen', dirs : clang_libdir), -+ cpp.find_library('clangFrontendTool', dirs : clang_libdir), -+ cpp.find_library('clangFrontend', dirs : clang_libdir), -+ cpp.find_library('clangDriver', dirs : clang_libdir), -+ cpp.find_library('clangSerialization', dirs : clang_libdir), -+ cpp.find_library('clangParse', dirs : clang_libdir), -+ cpp.find_library('clangSema', dirs : clang_libdir), -+ cpp.find_library('clangAnalysis', dirs : clang_libdir), -+ cpp.find_library('clangAST', dirs : clang_libdir), -+ cpp.find_library('clangASTMatchers', dirs : clang_libdir), -+ cpp.find_library('clangEdit', dirs : clang_libdir), -+ cpp.find_library('clangLex', dirs : clang_libdir), -+ cpp.find_library('clangBasic', dirs : clang_libdir), - polly_dep, polly_isl_dep, - ] - # check clang once more -@@ -119,7 +120,7 @@ if with_opencl_icd + # meson will return clang-cpp from system dirs if it's not found in llvm_libdir + linker_rpath_arg = '-Wl,--rpath=@0@'.format(llvm_libdir) +@@ -123,7 +124,7 @@ if with_opencl_icd configuration : _config, input : 'mesa.icd.in', output : 'mesa.icd', diff --git a/third_party/nixpkgs/pkgs/development/libraries/mimetic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mimetic/default.nix index 5a965c3d7d..668b2fdf10 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mimetic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mimetic/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MIME handling library"; - homepage = "http://www.codesink.org/mimetic_mime_library.html"; + homepage = "https://www.codesink.org/mimetic_mime_library.html"; license = licenses.mit; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix index 19cd07fc16..5f7dc56ed7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/minizip-ng/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { ''; doCheck = stdenv.buildPlatform == stdenv.hostPlatform; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; enableParallelChecking = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpfr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mpfr/default.nix index 7d9e94c6f9..e0a33e27c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mpfr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mpfr/default.nix @@ -11,7 +11,7 @@ # files. stdenv.mkDerivation rec { - version = "4.1.1"; + version = "4.2.0"; pname = "mpfr"; src = fetchurl { @@ -19,16 +19,9 @@ stdenv.mkDerivation rec { "https://www.mpfr.org/${pname}-${version}/${pname}-${version}.tar.xz" "mirror://gnu/mpfr/${pname}-${version}.tar.xz" ]; - hash = "sha256-/9GVvVZ9uv/DuYsj/QCq0FN2gMmJYXHkT+P/eeKKwz0="; + hash = "sha256-BqN43xNQEkjBsttaqXeiyBJq6Emp2be+JUb7Spwm2ZM="; }; - patches = [ - (fetchurl { # https://gitlab.inria.fr/mpfr/mpfr/-/issues/1 - url = "https://www.mpfr.org/mpfr-4.1.1/patch01"; - hash = "sha256-gKPCcJviGsqsEqnMmYiNY6APp3+3VXbyBf6LoZhP9Eo="; - }) - ]; - outputs = [ "out" "dev" "doc" "info" ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix index 14dddf1f29..c4d26e0092 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mpich/default.nix @@ -11,11 +11,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "4.0.3"; + version = "4.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - sha256 = "sha256-F0BuqQpu1OzVvjnJ3cv6yTQ+arT3esToxevko+O2xQE="; + sha256 = "sha256-ix7GO8RMfKoq+7RXvFs81KcNvka6unABI9Z8SNxatqA="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/mtdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mtdev/default.nix index 4a510762f7..9e6a45e297 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mtdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mtdev/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, evdev-proto }: stdenv.mkDerivation rec { pname = "mtdev"; @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1q700h9dqcm3zl6c3gj0qxxjcx6ibw2c51wjijydhwdcm26v5mqm"; }; + buildInputs = lib.optional stdenv.hostPlatform.isFreeBSD evdev-proto; + meta = with lib; { - homepage = "http://bitmath.org/code/mtdev/"; + homepage = "https://bitmath.org/code/mtdev/"; description = "Multitouch Protocol Translation Library"; longDescription = '' The mtdev is a stand-alone library which transforms all variants of @@ -20,6 +22,6 @@ stdenv.mkDerivation rec { See the kernel documentation for further details. ''; license = licenses.mit; - platforms = platforms.linux; + platforms = with platforms; freebsd ++ linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index 7513614a51..a3b829a754 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - hash = "sha256-39tdTY2emN3/FxZxwl6dcQn1bOgybws166wqFPJl68M="; + hash = "sha256-34iwYn9EOAl2c9UWERyzgwlZ+539jW9FygNYwgZ7ClU="; }; postPatch = '' @@ -53,6 +53,9 @@ stdenv.mkDerivation rec { spdlog ]; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + meta = with lib; { description = "Client API library for the Matrix protocol."; homepage = "https://github.com/Nheko-Reborn/mtxclient"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mythes/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mythes/default.nix index 2c4312d649..4683940b9c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mythes/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mythes/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ncurses pkg-config perl ]; meta = { - homepage = "http://hunspell.sourceforge.net/"; + homepage = "https://hunspell.sourceforge.net/"; description = "Thesaurus library from Hunspell project"; license = lib.licenses.bsd3; inherit (hunspell.meta) platforms; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix index ef396f2999..46861f216c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nco/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nco"; - version = "5.0.6"; + version = "5.1.4"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = version; - sha256 = "sha256-LmxHgSBBqXK5M4KOthd8R+H5EY3O5lueb2gnw5mK8Xw="; + sha256 = "sha256-M2GP92SIs4B92Re8McGKIIjQJ+qXAr/TwDtFKcH/zsk="; }; nativeBuildInputs = [ flex which antlr2 ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "NetCDF Operator toolkit"; longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5"; - homepage = "http://nco.sourceforge.net/"; + homepage = "https://nco.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ bzizou ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix index 2cfe41956a..4caf05ef3c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix @@ -11,16 +11,12 @@ }: stdenv.mkDerivation rec { - ver = "6.3"; - # We pick fresh intermediate release to get a fix for CVE-2022-29458 - # which was fixed in 20220416 patchset. - patchver = "20220507"; - version = "${ver}-p${patchver}"; + version = "6.4"; pname = "ncurses" + lib.optionalString (abiVersion == "5") "-abi5-compat"; src = fetchurl { - url = "https://invisible-island.net/archives/ncurses/current/ncurses-${ver}-${patchver}.tgz"; - sha256 = "02y4n4my5qqhw3fdhdjv1zc9xpyglzlzmzjwq2zcwbwv738255ja"; + url = "https://invisible-island.net/archives/ncurses/ncurses-${version}.tar.gz"; + hash = "sha256-aTEoPZrIfFBz8wtikMTHXyFjK7T8NgOsgQCBK+0kgVk="; }; outputs = [ "out" "dev" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix index aeade2f22c..0b4426f1a2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix @@ -1,20 +1,52 @@ -{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja -, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml, mesa, ffmpeg +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, aml +, ffmpeg +, gnutls +, libjpeg_turbo +, mesa +, pixman +, zlib }: stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IZUCNHhlDhq0KlUjkp3Yh5ysJsThlGw1FLHSaFe4Z0Q="; + sha256 = "sha256-3hNdgfAJGJkMXdB86+u3bKwrvXoMei1YCFXDG4ObkU4="; }; - nativeBuildInputs = [ meson pkg-config ninja ]; - buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml mesa ffmpeg ]; + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + aml + ffmpeg + gnutls + libjpeg_turbo + mesa + pixman + zlib + ]; + + mesonFlags = [ + (lib.mesonBool "tests" true) + ]; + + doCheck = true; meta = with lib; { description = "A VNC server library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/netcdf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/netcdf/default.nix index 76478bc80c..188dd58679 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/netcdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/netcdf/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { ''; doCheck = !(mpiSupport || (stdenv.isDarwin && stdenv.isAarch64)); - checkInputs = [ unzip ]; + nativeCheckInputs = [ unzip ]; preCheck = '' export HOME=$TEMP diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix index f118467b56..2fae813512 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix @@ -58,11 +58,14 @@ stdenv.mkDerivation rec { "--disable-examples" (lib.enableFeature enableApp "app") ] ++ lib.optionals (enableAsioLib) [ "--enable-asio-lib" "--with-boost-libdir=${boost}/lib" ] - ++ lib.optionals (enablePython) [ "--with-cython=${python3Packages.cython}/bin/cython" ]; + ++ lib.optionals (enablePython) [ + "--enable-python-bindings" + "--with-cython=${python3Packages.cython}/bin/cython" + ]; # Unit tests require CUnit and setting TZDIR environment variable doCheck = enableTests; - checkInputs = lib.optionals (enableTests) [ cunit tzdata ]; + nativeCheckInputs = lib.optionals (enableTests) [ cunit tzdata ]; preCheck = lib.optionalString (enableTests) '' export TZDIR=${tzdata}/share/zoneinfo ''; @@ -82,6 +85,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit curl libsoup; + python-nghttp2 = python3Packages.nghttp2; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix index f5c64a1d88..af83fb29c0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ autoreconfHook pkg-config file ]; - checkInputs = [ cunit ncurses ]; + nativeCheckInputs = [ cunit ncurses ]; preConfigure = '' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file diff --git a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix index 9ecbbaa913..d6cacc0aa7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix @@ -7,20 +7,20 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OnGzAUfIop/3/0qAAm5rgTlpCdZ/1fwWPJ/KLfGUy8U="; + sha256 = "sha256-nUUbGNxr2pGiEoYbArHppNE29rki9SM/3MZWMS9HmqY="; }; outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ]; buildInputs = [ libev nghttp3 quictls ] ++ lib.optional withJemalloc jemalloc; - checkInputs = [ cunit ncurses ]; + nativeCheckInputs = [ cunit ncurses ]; cmakeFlags = [ "-DENABLE_STATIC_LIB=OFF" diff --git a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix index 5479debb66..ac8dec4441 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - checkInputs = [ cunit ] + nativeCheckInputs = [ cunit ] ++ lib.optional stdenv.isDarwin ncurses; passthru.tests = knot-dns.passthru.tests; # the only consumer so far diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/esr.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/esr.nix index 2a3b25bc58..c3f04cf6b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/esr.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nss/esr.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.79.2"; - hash = "sha256-hwcHDI74CgYp2vhQyKspKQ6T/O55f6g/cZvb9z1np4E="; + version = "3.79.3"; + hash = "sha256-8fhrlMe832xWYTYVMnZE7MV20W8sMX+5hHDcAcWYSA4="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix index 89227b78f2..e1b6abc5b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix @@ -103,11 +103,14 @@ stdenv.mkDerivation rec { runHook postBuild ''; - NIX_CFLAGS_COMPILE = - "-Wno-error -DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\" " - + lib.optionalString stdenv.hostPlatform.is64bit "-DNSS_USE_64=1" - + lib.optionalString stdenv.hostPlatform.isILP32 " -DNS_PTR_LE_32=1" # See RNG_RandomUpdate() in drdbg.c - ; + NIX_CFLAGS_COMPILE = [ + "-Wno-error" + "-DNIX_NSS_LIBDIR=\"${placeholder "out"}/lib/\"" + ] ++ lib.optionals stdenv.hostPlatform.is64bit [ + "-DNSS_USE_64=1" + ] ++ lib.optionals stdenv.hostPlatform.isILP32 [ + "-DNS_PTR_LE_32=1" # See RNG_RandomUpdate() in drdbg.c + ]; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/development/libraries/ntbtls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ntbtls/default.nix index 391f96734d..9a6d9c7194 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ntbtls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ntbtls/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ntbtls"; - version = "0.2.0"; + version = "0.3.1"; src = fetchurl { url = "mirror://gnupg/ntbtls/ntbtls-${version}.tar.bz2"; - sha256 = "sha256-ZJ/nSjEdE+Q7FrJuuqkWZd22MpJbc5AlkurD7TBRnhc="; + sha256 = "sha256-iSIYH+9SO3e3FiXlYuTWlTInjqu9GLx0V52+FBNXKbo="; }; outputs = [ "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ntirpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ntirpc/default.nix index 66002df490..4526814c37 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ntirpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ntirpc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ntirpc"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "ntirpc"; rev = "v${version}"; - sha256 = "sha256-rVv5TLxirtmoRJl0+RupbkvzChuSMSGi3NTa0dchZSU="; + sha256 = "sha256-P9+t9dTiEKjloulypWPJ4sXWWemq9zPUH/Kctvq1SUQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/nuraft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nuraft/default.nix index 232fdfc512..d8a56a7a5b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nuraft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nuraft/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuraft"; - version = "1.3.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "eBay"; repo = "NuRaft"; rev = "v${version}"; - sha256 = "sha256-Fyy9B5CXyMcDSOdqaeJ4ejo1svM90ESXuNL0rzsTZpE="; + sha256 = "sha256-puO8E7tSLqB0oq/NlzEZqQgIZKm7ZUb4HhR0XuI9dco="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix b/third_party/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix index 64108c33b7..b3a929545f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nuspell/wrapper.nix @@ -1,10 +1,10 @@ { stdenv, lib, nuspell, makeWrapper, dicts ? [] }: -with lib; + let - searchPath = makeSearchPath "share/hunspell" dicts; + searchPath = lib.makeSearchPath "share/hunspell" dicts; in stdenv.mkDerivation { - name = (appendToName "with-dicts" nuspell).name; + name = (lib.appendToName "with-dicts" nuspell).name; nativeBuildInputs = [ makeWrapper ]; buildCommand = '' makeWrapper ${nuspell}/bin/nuspell $out/bin/nuspell --prefix DICPATH : ${lib.escapeShellArg searchPath} diff --git a/third_party/nixpkgs/pkgs/development/libraries/ode/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ode/default.nix index 211821e084..f82a67b76e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ode/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ode/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ode"; - version = "0.16.2"; + version = "0.16.3"; src = fetchurl { url = "https://bitbucket.org/odedevs/${pname}/downloads/${pname}-${version}.tar.gz"; - sha256 = "08hgh4gqdk77jcw8b7gq2mwsfg4a5v5y0j7g42bxiqhmn3ffnsmj"; + sha256 = "sha256-x0Hb9Jv8Rozilkgk5bw/kG6pVrGuNZTFDTUcOD8DxBM="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix index 34cb8d21f8..6317480782 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ogre/default.nix @@ -36,13 +36,13 @@ stdenv.mkDerivation rec { pname = "ogre"; - version = "13.5.3"; + version = "13.6.1"; src = fetchFromGitHub { owner = "OGRECave"; repo = "ogre"; rev = "v${version}"; - sha256 = "sha256-fjgMAuIA7rm3Gt2z//kPkc7LOcfddoFgY38B7bs6zZo="; + hash = "sha256-UG/vwLE80Ski9NwMj9E5+PoLU6rSCdJrSmQOmmFv66U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencascade/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencascade/default.nix index 5c262a3680..2934558b58 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencascade/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencascade/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, - pkg-config, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, + pkg-config, fontconfig, freetype, expat, freeimage, vtk_8, gl2ps, tbb, OpenCL, Cocoa }: -with lib; stdenv.mkDerivation rec { pname = "opencascade-oce"; version = "0.18.3"; @@ -17,10 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja pkg-config ]; buildInputs = [ - libGL libGLU libXmu freetype fontconfig expat freeimage vtk + libGL libGLU libXmu freetype fontconfig expat freeimage vtk_8 gl2ps tbb ] - ++ optionals stdenv.isDarwin [OpenCL Cocoa] + ++ lib.optionals stdenv.isDarwin [OpenCL Cocoa] ; cmakeFlags = [ @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { "-DOCE_WITH_GL2PS=ON" "-DOCE_MULTITHREAD_LIBRARY=TBB" ] - ++ optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"]; + ++ lib.optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"]; patches = [ # Use fontconfig instead of hardcoded directory list @@ -56,7 +55,7 @@ stdenv.mkDerivation rec { --replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES ''; - meta = { + meta = with lib; { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; homepage = "https://github.com/tpaviot/oce"; maintainers = [ maintainers.viric ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencolorio/1.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencolorio/1.x.nix index 2941a1a1e7..0355b99774 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencolorio/1.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencolorio/1.x.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_EXTERNAL_LCMS=ON" "-DUSE_EXTERNAL_TINYXML=ON" - # External libyamlcpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517 + # External yaml-cpp 0.6.* not compatible: https://github.com/imageworks/OpenColorIO/issues/517 "-DUSE_EXTERNAL_YAML=OFF" ] ++ lib.optional stdenv.isDarwin "-DOCIO_USE_BOOST_PTR=ON" ++ lib.optional (!stdenv.hostPlatform.isx86) "-DOCIO_USE_SSE=OFF" diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix index 4cf75039c4..3d8a558804 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix @@ -4,7 +4,7 @@ , fetchpatch , cmake , expat -, libyamlcpp +, yaml-cpp , ilmbase , pystring , imath @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ expat - libyamlcpp + yaml-cpp ilmbase pystring imath diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index 56b022d03b..59a74a6673 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/3.x.nix @@ -22,7 +22,7 @@ , enablePython ? false, pythonPackages ? null , enableGtk2 ? false, gtk2 , enableGtk3 ? false, gtk3 -, enableVtk ? false, vtk +, enableVtk ? false, vtk_8 , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableTesseract ? false, tesseract, leptonica @@ -188,7 +188,7 @@ stdenv.mkDerivation { ++ lib.optional enablePython pythonPackages.python ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 - ++ lib.optional enableVtk vtk + ++ lib.optional enableVtk vtk_8 ++ lib.optional enableJPEG libjpeg ++ lib.optional enablePNG libpng ++ lib.optional enableTIFF libtiff diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index 2c676e008f..5afc209922 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -48,7 +48,7 @@ , enableGtk3 ? false , gtk3 , enableVtk ? false -, vtk +, vtk_8 , enableFfmpeg ? true , ffmpeg , enableGStreamer ? true @@ -253,7 +253,7 @@ stdenv.mkDerivation { ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5 ++ lib.optional enableGtk2 gtk2 ++ lib.optional enableGtk3 gtk3 - ++ lib.optional enableVtk vtk + ++ lib.optional enableVtk vtk_8 ++ lib.optional enableJPEG libjpeg ++ lib.optional enablePNG libpng ++ lib.optional enableTIFF libtiff diff --git a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix index 51194a3679..1a9a5deb0d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gfortran, perl, libnl +{ lib, stdenv, fetchurl, fetchpatch, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin , libpsm2, libfabric, pmix, ucx @@ -32,6 +32,14 @@ in stdenv.mkDerivation rec { sha256 = "03ckngrff1cl0l81vfvrfhp99rbgk7s0633kr1l468yibwbjx4cj"; }; + patches = [ + (fetchpatch { + name = "RDMA-osc-perform-CAS-in-shared-memory-if-possible.patch"; + url = "https://github.com/open-mpi/ompi/pull/10513/commits/0512c135a77a0278e5288e0e119dce24c95ebed4.patch"; + sha256 = "sha256-K1Gc+hBUkTPY1WqLP6JWo623EUhkoL4ONrqPVDNfFuE="; + }) + ]; + postPatch = '' patchShebangs ./ diff --git a/third_party/nixpkgs/pkgs/development/libraries/openwsman/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openwsman/default.nix index 446952b300..4df98d28fd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openwsman/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openwsman/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "openwsman"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "Openwsman"; repo = "openwsman"; rev = "v${version}"; - sha256 = "sha256-/fSVzpGPObMkJIu7j6eR6A7Gtf2jttoPhcSayBvn3IU="; + sha256 = "sha256-CH2pqWs64Dznim3IljmsthKEQfACVlaAKQ/07MgryHo="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/optparse-bash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/optparse-bash/default.nix index 811458ed18..f14512c527 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/optparse-bash/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/optparse-bash/default.nix @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation { doCheck = true; - checkInputs = [ bash ]; + nativeCheckInputs = [ bash ]; # `#!/usr/bin/env` isn't okay for OfBorg # Need external bash to run diff --git a/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix b/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix index abe45b6337..4ea4692a14 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix @@ -1,18 +1,18 @@ { lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QAq/6MGVj+iBHLElHuqokF1v3LU1TZ9hVVJE1s3y6f0="; + sha256 = "sha256-xF6QIXfsI+6WqshcG74/J98MgjSkYjRkTW64zeH6DDY="; }; nativeBuildInputs = [ cmake ]; - checkInputs = [ check subunit ]; + nativeCheckInputs = [ check subunit ]; cmakeFlags = [ "-DBUILD_ORCANIA_TESTING=on" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix index e896717644..4a0edf08a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "5.1.55"; + version = "5.2.16"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-FsPbpKkC1qhsZ4QBRzyV64H+lo/802qlaggDGCgbPlw="; + hash = "sha256-zGguzrWXSjjrJdFnlAeC6U6w10BucXjeUg7/2D4OxM4="; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix index e6d9a6d7b8..6624376591 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { buildInputs = [ fribidi libthai - gobject-introspection ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcg-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcg-c/default.nix index 95acc77922..04aa6c7afb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcg-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcg-c/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchzip }: -with lib; - stdenv.mkDerivation rec { version = "0.94"; pname = "pcg-c"; @@ -31,8 +29,8 @@ stdenv.mkDerivation rec { algorithms for random number generation. Unlike many general-purpose RNGs, they are also hard to predict. ''; - platforms = platforms.unix; - maintainers = [ maintainers.linus ]; + platforms = lib.platforms.unix; + maintainers = [ lib.maintainers.linus ]; broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11 }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix index bbc2bd8cc6..385288ffdc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix @@ -6,7 +6,7 @@ , qhull , flann , boost -, vtk +, vtk_8 , eigen , pkg-config , qtbase @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libpng libtiff qhull - vtk + vtk_8 ]; cmakeFlags = lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix index c4bbcf2ddf..8bc1055279 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix @@ -3,9 +3,7 @@ , variant ? null }: -with lib; - -assert elem variant [ null "cpp" "pcre16" "pcre32" ]; +assert lib.elem variant [ null "cpp" "pcre16" "pcre32" ]; stdenv.mkDerivation rec { pname = "pcre" @@ -21,11 +19,11 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "doc" "man" ]; # Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51 - configureFlags = optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto" ++ [ + configureFlags = lib.optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto" ++ [ "--enable-unicode-properties" "--disable-cpp" ] - ++ optional (variant != null) "--enable-${variant}"; + ++ lib.optional (variant != null) "--enable-${variant}"; # https://bugs.exim.org/show_bug.cgi?id=2173 patches = [ ./stacksize-detection.patch ]; @@ -40,7 +38,7 @@ stdenv.mkDerivation rec { postFixup = '' moveToOutput bin/pcre-config "$dev" - '' + optionalString (variant != null) '' + '' + lib.optionalString (variant != null) '' ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.{so.*.*.*,*dylib,*a} ''; @@ -57,7 +55,7 @@ stdenv.mkDerivation rec { PCRE library is free, even for building proprietary software. ''; - platforms = platforms.all; - maintainers = with maintainers; [ ]; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix b/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix index 73c27e9d8c..3ef63aa2c3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -3,8 +3,6 @@ , debug ? false }: -with lib; - stdenv.mkDerivation rec { pname = "phonon-backend-gstreamer"; version = "4.10.0"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/phonon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/phonon/default.nix index 877bf97319..4966e379ae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/phonon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/phonon/default.nix @@ -12,8 +12,6 @@ , debug ? false }: -with lib; - let soname = "phonon4qt5"; buildsystemdir = "share/cmake/${soname}"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index d9e88c4293..049cfcb04d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ perl lhapdf.pdf_sets.CT10nlo ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/tests.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/tests.nix index 83afee6089..7d68780e2e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/tests.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/tests.nix @@ -8,7 +8,7 @@ nativeBuildInputs = [ cmake ]; buildInputs = [ geant4 ]; - checkInputs = with geant4.data; [ + nativeCheckInputs = with geant4.data; [ G4EMLOW G4ENSDFSTATE G4PARTICLEXS diff --git a/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix index 4cf69bb795..df42dea81a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pinocchio/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "pinocchio"; - version = "2.6.14"; + version = "2.6.15"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-3dPGeWnIVIErLnd+mxwudTj4qHyN2k7H94EsHYmKV1I="; + hash = "sha256-bnm5nbb0mKw76k2J2Qi04n7bmfzadtqV/AmnWSzbb+0="; }; # error: use of undeclared identifier '__sincos' diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index ad2bf00a6c..8da35364e2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -2,6 +2,7 @@ , lib , buildPackages , fetchFromGitLab +, fetchpatch , python3 , meson , ninja @@ -67,7 +68,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.64"; + version = "0.3.65"; outputs = [ "out" @@ -85,7 +86,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-wIvdciLBWIQjENEipzbVID0eliOcEwqS567pLxVVOsc="; + sha256 = "sha256-O5nu58QFlOPTaN4qNi50Wp9acxM6dWNy63BD+AnVl5w="; }; patches = [ @@ -101,6 +102,13 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch + + # backport a fix to actually install the new module + # FIXME: remove after 0.3.66 + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/fba7083f8ceb210c7c20aceafeb5c9a8767cf705.patch"; + hash = "sha256-aZQ4OzK0B5YPq+jQNygxPE0coG2qB0ukbYzyI8E24XM="; + }) ]; nativeBuildInputs = [ @@ -139,7 +147,7 @@ let ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ]; # Valgrind binary is required for running one optional test. - checkInputs = lib.optional withValgrind valgrind; + nativeCheckInputs = lib.optional withValgrind valgrind; mesonFlags = [ "-Ddocs=enabled" @@ -237,7 +245,7 @@ let homepage = "https://pipewire.org/"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ jtojnar kranzes ]; + maintainers = with maintainers; [ jtojnar kranzes k900 ]; }; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix index 74e4f6c510..d749744d51 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { pname = "plasma-wayland-protocols"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-pCdbmoVHFvpe2cK6LWl98rB0n8RaKK2WXmjQqjbF1Mg="; + sha256 = "sha256-MZSIZ8mgRhPm3g0jrfy8Ws7N3vCzn5hrNF7GwZcnNv4="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/plib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/plib/default.nix index 49c50ed7bd..b420c17c88 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/plib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/plib/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { # XXX: The author doesn't use the orthodox SF way to store tarballs. - url = "http://plib.sourceforge.net/dist/${pname}-${version}.tar.gz"; + url = "https://plib.sourceforge.net/dist/${pname}-${version}.tar.gz"; sha256 = "0cha71mflpa10vh2l7ipyqk67dq2y0k5xbafwdks03fwdyzj4ns8"; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; - homepage = "http://plib.sourceforge.net/"; + homepage = "https://plib.sourceforge.net/"; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix index 7791973bb1..1f16ba86b3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "pmix"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { repo = "openpmix"; owner = "openpmix"; rev = "v${version}"; - sha256 = "sha256-w3j4zgEAn6RxIHAvy0B3MPFTV46ocCvc0Z36tN1T+rc="; + sha256 = "sha256-79zTZm549VRsqeziCuBT6l4jTJ6D/gZaMAvgHZm7jn4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix index 6d2a56d03a..5c67eb1b65 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix @@ -21,7 +21,7 @@ , docbook_xml_dtd_412 , gtk-doc , coreutils -, useSystemd ? stdenv.isLinux +, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal , systemdMinimal , elogind # A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault). @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { glib # in .pc Requires ]; - checkInputs = [ + nativeCheckInputs = [ dbus ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/presage/default.nix b/third_party/nixpkgs/pkgs/development/libraries/presage/default.nix index 5f03a425dc..b3c3c21e30 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/presage/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/presage/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { tinyxml ]; - checkInputs = [ + nativeCheckInputs = [ cppunit ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/proj/7.nix b/third_party/nixpkgs/pkgs/development/libraries/proj/7.nix index 95c02febda..4e1ade0bd5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/proj/7.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/proj/7.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite libtiff curl ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; cmakeFlags = [ "-DUSE_EXTERNAL_GTEST=ON" diff --git a/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix b/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix index 26f9388664..1dc4a3a838 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: rec { buildInputs = [ sqlite libtiff curl nlohmann_json ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; cmakeFlags = [ "-DUSE_EXTERNAL_GTEST=ON" diff --git a/third_party/nixpkgs/pkgs/development/libraries/pslib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pslib/default.nix index b3439b7ee9..94dead43a4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pslib/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C-library for generating multi page PostScript documents"; - homepage = "http://pslib.sourceforge.net/"; + homepage = "https://pslib.sourceforge.net/"; changelog = "https://sourceforge.net/p/pslib/git/ci/master/tree/pslib/ChangeLog"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pstreams/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pstreams/default.nix index bb9b6bc9c8..2baa3b3550 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pstreams/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pstreams/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { POSIX.2 functions popen(3) and pclose(3), using C++ iostreams instead of C's stdio library. ''; - homepage = "http://pstreams.sourceforge.net/"; - downloadPage = "http://pstreams.sourceforge.net/download/"; + homepage = "https://pstreams.sourceforge.net/"; + downloadPage = "https://pstreams.sourceforge.net/download/"; maintainers = with maintainers; [ arthur ]; license = licenses.boost; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix index a09abc539c..403c903577 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; preConfigure = '' # Enable long long support (required for filezilla) diff --git a/third_party/nixpkgs/pkgs/development/libraries/pxlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pxlib/default.nix index 4b6b9ada7a..6b31ef3257 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pxlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pxlib/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to read and write Paradox files"; - homepage = "http://pxlib.sourceforge.net/"; + homepage = "https://pxlib.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.winpat ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/py3c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/py3c/default.nix index be8a0523d4..f4d2aa95a2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/py3c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/py3c/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix index f4574a1704..f0b7c8478e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/python-qt/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PythonQt is a dynamic Python binding for the Qt framework. It offers an easy way to embed the Python scripting language into your C++ Qt applications"; - homepage = "http://pythonqt.sourceforge.net/"; + homepage = "https://pythonqt.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.all; maintainers = with maintainers; [ hlolli ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix index d10ebbdd4b..67d916dd14 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qca-qt5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "qca-qt5"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "sha256-a2lYgafj/ZX3Oq7m6uq5b2rRflFenCs9SzJy14Yv9cQ="; + sha256 = "sha256-kffZFqs2kr9ZkfClU7+BUxYb/doUvQBdSAorTjhDYug="; }; buildInputs = [ openssl qtbase ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qjson/default.nix index 7ab0d8c1ae..4308b46c5c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qjson/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight data-interchange format"; - homepage = "http://qjson.sourceforge.net/"; + homepage = "https://qjson.sourceforge.net/"; license = licenses.lgpl21; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qrencode/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qrencode/default.nix index b8f01bcff5..14a9b9904d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qrencode/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qrencode/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libpng ] - ++ lib.optionals stdenv.isDarwin [ libiconv libobjc ]; + buildInputs = [ libiconv libpng ] + ++ lib.optionals stdenv.isDarwin [ libobjc ]; configureFlags = [ "--with-tests" ]; - checkInputs = [ SDL2 ]; + nativeCheckInputs = [ SDL2 ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index dd33d96142..2829bb0be0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -174,10 +174,11 @@ let cp -r ${srcs.catapult} src/3rdparty/chromium/third_party/catapult ''; inherit (darwin) cctools xnu; - inherit (darwin.apple_sdk_11_0) libunwind; + inherit (darwin.apple_sdk_11_0) libpm libunwind; inherit (darwin.apple_sdk_11_0.libs) sandbox; inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit - ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication; + ImageCaptureCore CoreBluetooth IOBluetooth CoreWLAN Quartz Cocoa LocalAuthentication + MediaPlayer MediaAccessibility SecurityInterface Vision CoreML; libobjc = darwin.apple_sdk_11_0.objc4; }; qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {}; @@ -203,6 +204,7 @@ let ++ lib.optional (stdenv.isDarwin) qtmacextras); qmake = makeSetupHook { + name = "qmake-hook"; deps = [ self.qtbase.dev ]; substitutions = { inherit debug; @@ -211,6 +213,7 @@ let } ../hooks/qmake-hook.sh; wrapQtAppsHook = makeSetupHook { + name = "wrap-qt5-apps-hook"; deps = [ self.qtbase.dev buildPackages.makeWrapper ] ++ lib.optional stdenv.isLinux self.qtwayland.dev; } ../hooks/wrap-qt-apps-hook.sh; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/fetch.sh b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/fetch.sh index dcada36490..7225b432c5 100755 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/fetch.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/fetch.sh @@ -10,7 +10,7 @@ srcs="${here}/srcs-generated.json" while read -r module; do if [[ -z "$module" ]]; then continue; fi url="https://invent.kde.org/qt/qt/${module}.git" - nix-prefetch-git --url $url --rev refs/heads/kde/5.15 \ + nix-prefetch-git --url $url --rev refs/heads/kde/5.15 --fetch-submodules \ | jq "{key: \"${module}\", value: {url,rev,sha256}}" done < "$modules" | jq -s 'from_entries' > "${srcs}.tmp" diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index 229bfabbec..3f6c616c39 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -2,7 +2,7 @@ "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", "rev": "c3c7e6ebc29cce466d954f72f340a257d76b5ec2", - "sha256": "0lh05j21acs8wz72g4cs092m1yglpbjkhh55ww1351fjrp5gbzrg" + "sha256": "13ixg0gx7sp90k0db2xn7r2rj1w3zw3vs84pav0v8fwfvph9ki98" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", @@ -16,8 +16,8 @@ }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "9cf586d629a04040c9414c4f9e17abbc65c644eb", - "sha256": "1jvm92m3jz34yvzyn4vnihga2phpgszb2wqk0y7pr0ww6vs9kaf6" + "rev": "fa8dee92201448cc4eaa92f222b93d0b044d8ea5", + "sha256": "16b0q0anlgmfzbdm0jyakb8cxikrr295pj7avzny26x9609lzqga" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", @@ -36,8 +36,8 @@ }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "8defe7bfcae2ac5cb6dc25bfe3678124b09cf6f9", - "sha256": "0xzdnrhqalsrc52a326c5baf3si815a4rb2p1a4djyf8anp9wcai" + "rev": "05c3f4921d81fb1b0eb497515c24ae56221d1e0a", + "sha256": "0101bbpnrj4rp51dcnn2gjcq7vw55g4c8y4lmg2nd5g69whmkl1c" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", @@ -62,7 +62,7 @@ "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", "rev": "f991e28cb0a670597f1955585c76ce8a26ce9e4b", - "sha256": "1vflnscqc0jidr68v5ikxr579rx7k5yhdik8dcmnfgvmz3fq4jlz" + "sha256": "0bvxjciisq2hixhbxxs68zdwfdyvljy8iq48rnwpynqsdrhh5rma" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", @@ -92,7 +92,7 @@ "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", "rev": "47defc8b33b7bdf1dbf289b65b301fba2def9b1c", - "sha256": "1w4f02kch7p2jhn6dlzks6jpfcsm9ik04jnnaw6qvpxpsxwvcaah" + "sha256": "0kfwkxln3yz0c5rd1kfjmw0y2drwm1gg2s7f52kajfvg4274ha9c" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", @@ -181,8 +181,8 @@ }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "63fb8da1ecf8e48262cd515690cf71a425f92bf5", - "sha256": "0kjw5dsgn67897laana4h06czr9g8555jiqf1k3pkzv4fxzcqypn" + "rev": "90f3590c3c49a0820462af9a778dd13d8df42244", + "sha256": "1dxc3imh8455vy3pggrzjflb2v5382q9ha2fwplybxawld9wdw45" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", @@ -202,6 +202,6 @@ "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", "rev": "3199d91de3f38e5ece3d36bcefe2c33b2c014f3f", - "sha256": "1hjw5ymbc1fl4r4lym7n7ilmb953izmvyp6z8g5l8l7cz9sjz4ka" + "sha256": "1l6babh2cjqwaqk12cqpkkl2qy909b1fd84p0ab19raw419ncawz" } } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix index 4bc04dbefd..19f36c337e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -14,7 +14,7 @@ let fetchgit { inherit (args) url rev sha256; fetchLFS = false; - fetchSubmodules = false; + fetchSubmodules = true; deepClone = false; leaveDotGit = false; }; @@ -22,19 +22,6 @@ let in lib.mapAttrs mk (lib.importJSON ./srcs-generated.json) // { - qt3d = { - inherit version; - src = fetchgit { - url = "https://invent.kde.org/qt/qt/qt3d.git"; - rev = "c3c7e6ebc29cce466d954f72f340a257d76b5ec2"; - sha256 = "sha256-KMWZ4N2OO7TBVpcgvQf/gweZRT62i9XABOnq0x94PY4="; - fetchLFS = false; - fetchSubmodules = true; - deepClone = false; - leaveDotGit = false; - }; - }; - # qtwebkit does not have an official release tarball on the qt mirror and is # mostly maintained by the community. qtwebkit = rec { 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 3cf2fedbad..6e4fb476d4 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 @@ -14,9 +14,10 @@ , systemd , enableProprietaryCodecs ? true , gn -, cctools, libobjc, libunwind, sandbox, xnu +, cctools, libobjc, libpm, libunwind, sandbox, xnu , ApplicationServices, AVFoundation, Foundation, ForceFeedback, GameController, AppKit , ImageCaptureCore, CoreBluetooth, IOBluetooth, CoreWLAN, Quartz, Cocoa, LocalAuthentication +, MediaPlayer, MediaAccessibility, SecurityInterface, Vision, CoreML , cups, openbsm, runCommand, xcbuild, writeScriptBin , ffmpeg_4 ? null , lib, stdenv, fetchpatch @@ -94,6 +95,11 @@ qtModule { --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]" + + # ld: warning: directory not found for option '-L/nix/store/...-xcodebuild-0.1.2-pre/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/usr/lib' + # ld: fatal warning(s) induced error (-fatal_warnings) + substituteInPlace src/3rdparty/chromium/build/config/compiler/BUILD.gn \ + --replace "-Wl,-fatal_warnings" "" '') + postPatch; NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ @@ -105,8 +111,6 @@ qtModule { "-march=westmere" ] ++ lib.optionals stdenv.cc.isClang [ "-Wno-elaborated-enum-base" - ] ++ lib.optionals stdenv.isDarwin [ - "-Wno-elaborated-enum-base" ]; preConfigure = '' @@ -177,6 +181,11 @@ qtModule { Quartz Cocoa LocalAuthentication + MediaPlayer + MediaAccessibility + SecurityInterface + Vision + CoreML openbsm libunwind @@ -184,6 +193,7 @@ qtModule { buildInputs = lib.optionals stdenv.isDarwin [ cups + libpm sandbox # `sw_vers` is used by `src/3rdparty/chromium/build/config/mac/sdk_info.py` @@ -235,6 +245,7 @@ qtModule { (isMips && isLittleEndian)))) (map (plat: plat.system)) ]; + broken = stdenv.isDarwin && stdenv.isx86_64; # This build takes a long time; particularly on slow architectures timeout = 24 * 3600; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix index 9664f005d7..b09521e34e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix @@ -140,10 +140,12 @@ let }; wrapQtAppsHook = makeSetupHook { + name = "wrap-qt6-apps-hook"; deps = [ buildPackages.makeWrapper ]; } ./hooks/wrap-qt-apps-hook.sh; qmake = makeSetupHook { + name = "qmake6-hook"; deps = [ self.qtbase.dev ]; substitutions = { inherit debug; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix index ae89c223d2..6da193bbd5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -222,8 +222,8 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" "-DQT_FEATURE_vulkan=ON" ] ++ lib.optionals stdenv.isDarwin [ - # error: 'path' is unavailable: introduced in macOS 10.15 - "-DQT_FEATURE_cxx17_filesystem=OFF" + # build as a set of dynamic libraries + "-DFEATURE_framework=OFF" ]; NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ @@ -253,6 +253,11 @@ stdenv.mkDerivation rec { "bin/qdbusxml2cpp" "bin/qlalr" "bin/qmake" + "bin/qmake6" + "bin/qt-cmake" + "bin/qt-cmake-private" + "bin/qt-cmake-private-install.cmake" + "bin/qt-cmake-standalone-test" "bin/rcc" "bin/syncqt.pl" "bin/uic" @@ -271,7 +276,8 @@ stdenv.mkDerivation rec { # fixup .pc file (where to find 'moc' etc.) if [ -f "$dev/lib/pkgconfig/Qt6Core.pc" ]; then sed -i "$dev/lib/pkgconfig/Qt6Core.pc" \ - -e "/^bindir=/ c bindir=$dev/bin" + -e "/^bindir=/ c bindir=$dev/bin" \ + -e "/^libexecdir=/ c libexecdir=$dev/libexec" fi patchShebangs $out $dev diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix index 09f0d05dd5..b52837aa17 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum-qt4"; - version = "1.0.4"; + version = "1.0.7"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - hash = "sha256-chdtcx73mfr/b1P3yVevx0m7HkMFzEYG7YLuhSyG7rk="; + hash = "sha256-Ys77z5BoeQEOYe1h5ITEuVtVn6Uug9zQjrCBxLQOrSs="; }; nativeBuildInputs = [ qmake4Hook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/quantlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quantlib/default.nix new file mode 100644 index 0000000000..d2cda30b5d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/quantlib/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +}: + +stdenv.mkDerivation rec { + pname = "quantlib"; + version = "1.29"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "lballabio"; + repo = "QuantLib"; + rev = "QuantLib-v${version}"; + sha256 = "sha256-TpVn3zPru/GtdNqDH45YdOkm7fkJzv/qay9SY3J6Jiw="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost ]; + + meta = with lib; { + description = "A free/open-source library for quantitative finance"; + homepage = "https://quantlib.org"; + platforms = platforms.unix; + license = licenses.bsd3; + maintainers = with maintainers; [ candyc1oud ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/quesoglc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quesoglc/default.nix index 1a4fcca9d9..440d52d08f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quesoglc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quesoglc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { provides Unicode support and is designed to be easily ported to any platform that supports both FreeType and the OpenGL API. ''; - homepage = "http://quesoglc.sourceforge.net/"; + homepage = "https://quesoglc.sourceforge.net/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix index 72da2a34e7..e2dd81b138 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file, libuv, lz4, lxd }: stdenv.mkDerivation rec { pname = "raft-canonical"; - version = "0.11.2"; + version = "0.17.1"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; - rev = "v${version}"; - sha256 = "050dwy34jh8dihfwfm0r1by2i3sy9crapipp9idw32idm79y4izb"; + rev = "refs/tags/v${version}"; + hash = "sha256-P6IYl6xcsqXw1ilt6HYw757FL2syy1XePBVGbPAlz6Q="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Ignore broken test, likely not causing huge breakage - # (https://github.com/canonical/raft/issues/292) - postPatch = '' - substituteInPlace test/integration/test_uv_tcp_connect.c --replace \ - "TEST(tcp_connect, closeDuringHandshake, setUp, tearDownDeps, 0, NULL)" \ - "TEST(tcp_connect, closeDuringHandshake, setUp, tearDownDeps, MUNIT_TEST_OPTION_TODO, NULL)" - ''; + patches = [ + # network tests either hang indefinitely, or fail outright + ./disable-net-tests.patch + + # missing dir check is flaky + ./disable-missing-dir-test.patch + ]; preConfigure = '' substituteInPlace configure --replace /usr/bin/ " " @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; + passthru.tests = { + inherit lxd; + }; + meta = with lib; { description = '' Fully asynchronous C implementation of the Raft consensus protocol @@ -46,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/canonical/raft"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ wucke13 ]; + maintainers = with maintainers; [ wucke13 adamcstephens ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch new file mode 100644 index 0000000000..ddfec9b22e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/disable-missing-dir-test.patch @@ -0,0 +1,23 @@ +diff --git a/test/unit/test_uv_fs.c b/test/unit/test_uv_fs.c +index 638c39c..c8758d2 100644 +--- a/test/unit/test_uv_fs.c ++++ b/test/unit/test_uv_fs.c +@@ -40,18 +40,6 @@ TEST(UvFsCheckDir, exists, DirSetUp, DirTearDown, 0, NULL) + return MUNIT_OK; + } + +-/* If the directory doesn't exist, it an error is returned. */ +-TEST(UvFsCheckDir, doesNotExist, DirSetUp, DirTearDown, 0, NULL) +-{ +- const char *parent = data; +- char errmsg[RAFT_ERRMSG_BUF_SIZE]; +- char dir[128]; +- sprintf(errmsg, "%s/sub", parent); +- sprintf(errmsg, "directory '%s' does not exist", dir); +- CHECK_DIR_ERROR(dir, RAFT_NOTFOUND, errmsg); +- return MUNIT_OK; +-} +- + /* If the process can't access the directory, an error is returned. */ + TEST(UvFsCheckDir, permissionDenied, NULL, NULL, 0, NULL) + { diff --git a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/disable-net-tests.patch b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/disable-net-tests.patch new file mode 100644 index 0000000000..7c8be29fea --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/disable-net-tests.patch @@ -0,0 +1,16 @@ +diff --git a/Makefile.am b/Makefile.am +index 2137932..93abdb6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -198,11 +198,7 @@ test_integration_uv_SOURCES = \ + test/integration/test_uv_bootstrap.c \ + test/integration/test_uv_load.c \ + test/integration/test_uv_recover.c \ +- test/integration/test_uv_recv.c \ +- test/integration/test_uv_send.c \ + test/integration/test_uv_set_term.c \ +- test/integration/test_uv_tcp_connect.c \ +- test/integration/test_uv_tcp_listen.c \ + test/integration/test_uv_snapshot_put.c \ + test/integration/test_uv_truncate.c \ + test/integration/test_uv_work.c diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 0b2c90f120..d1524024dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "-include algorithm" ]; - checkInputs = [ + nativeCheckInputs = [ catch2_3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix index ac2d7e0b5f..b67824b5cc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix @@ -5,6 +5,7 @@ , pkg-config , cmake , gtest +, valgrind }: stdenv.mkDerivation rec { @@ -36,25 +37,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ]; - cmakeFlags = [ - "-DGTEST_SOURCE_DIR=${gtest.dev}/include" - ] ++ lib.optionals (!doCheck) [ - "-DRAPIDJSON_BUILD_TESTS=OFF" - ]; + # for tests, adding gtest to checkInputs does not work + # https://github.com/NixOS/nixpkgs/pull/212200 + buildInputs = [ gtest ]; + cmakeFlags = [ "-DGTEST_SOURCE_DIR=${gtest.dev}/include" ]; - checkInputs = [ - gtest - ]; - - checkPhase = '' - runHook preCheck - - ctest -E '.*valgrind.*' - - runHook postCheck - ''; - - doCheck = !stdenv.hostPlatform.isStatic; + nativeCheckInputs = [ valgrind ]; + doCheck = !stdenv.hostPlatform.isStatic && !stdenv.isDarwin; meta = with lib; { description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidxml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidxml/default.nix index e5ae16087c..3a353b7a2b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rapidxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidxml/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast XML DOM-style parser in C++"; - homepage = "http://rapidxml.sourceforge.net/"; + homepage = "https://rapidxml.sourceforge.net/"; license = licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ cpages ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix index 61e593d28c..b064297afd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix @@ -8,13 +8,13 @@ assert enableShared || enableStatic; stdenv.mkDerivation rec { pname = "redis-plus-plus"; - version = "1.3.5"; + version = "1.3.7"; src = fetchFromGitHub { owner = "sewenew"; repo = "redis-plus-plus"; rev = version; - sha256 = "sha256-5tjadh3Ku7lrJn4tbi8TjTH6N0+QB2ER9xuO51cK/LU="; + sha256 = "sha256-QCNN85syxw2EGPdyTV3bL0txcHl7t2YhsKwK9lgnexY="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix index 375e6a7b43..39d714ce84 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocfft/default.nix @@ -135,6 +135,7 @@ in stdenv.mkDerivation { inherit (rocfft) pname version outputs src passthru meta; dontUnpack = true; + dontPatch = true; dontConfigure = true; dontBuild = true; @@ -155,4 +156,22 @@ in stdenv.mkDerivation { '' + '' runHook postInstall ''; + + # Fix paths + preFixup = '' + substituteInPlace $out/include/*.h $out/rocfft/include/*.h \ + --replace "${rocfft}" "$out" + + patchelf --set-rpath \ + $(patchelf --print-rpath $out/lib/librocfft.so | sed 's,${rocfft}/lib,'"$out/lib"',') \ + $out/lib/librocfft.so + '' + lib.optionalString buildTests '' + patchelf --set-rpath \ + $(patchelf --print-rpath $test/bin/rocfft-test | sed 's,${rocfft}/lib,'"$out/lib"',') \ + $test/bin/rocfft-test + '' + lib.optionalString buildBenchmarks '' + patchelf --set-rpath \ + $(patchelf --print-rpath $benchmark/bin/rocfft-rider | sed 's,${rocfft}/lib,'"$out/lib"',') \ + $benchmark/bin/rocfft-rider + ''; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 233a69e57b..057baafdc6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "7.8.3"; + version = "7.9.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HVLxLltOZ0e9BCekynjdc+f/fTS9vz15GZVKB77uDXo="; + sha256 = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rote/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rote/default.nix index e5fb046268..4655d54ab9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rote/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rote/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ncurses as well so that you may render the virtual screen to the real screen when you need to. ''; - homepage = "http://rote.sourceforge.net/"; + homepage = "https://rote.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index 2df87e5920..f9a12322c4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.3.32"; + version = "1.3.34"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LKJubTzV4B7aimKtnODUJJil3b55qKuDkCe7TLa8tjQ="; + sha256 = "sha256-CaVo2OxfB7ImMOgPuyvKQFbTeEm3PqD8CV96jUEZ8U0="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix index 32b3d5b562..bea05468ce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/wcslib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wcslib"; - version = "7.11"; + version = "7.12"; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Rr77/fUM1JU4lmdqfVcAlNx2YeKulnewkuf7E87j2l8="; + sha256 = "sha256-nPjeUOEJqX+gRRHUER6NFL0KRAdxMqz3PmzwAp/pa9Q="; }; nativeBuildInputs = [ flex ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/edlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/edlib/default.nix new file mode 100644 index 0000000000..b8ea4a5529 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/edlib/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "edlib"; + version = "unstable-2021-08-20"; + + src = fetchFromGitHub { + owner = "Martinsos"; + repo = pname; + rev = "f8afceb49ab0095c852e0b8b488ae2c88e566afd"; + hash = "sha256-P/tFbvPBtA0MYCNDabW+Ypo3ltwP4S+6lRDxwAZ1JFo="; + }; + + nativeBuildInputs = [ cmake ]; + + doCheck = true; + checkPhase = '' + runHook preCheck + bin/runTests + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://martinsos.github.io/edlib"; + description = "Lightweight, fast C/C++ library for sequence alignment using edit distance"; + maintainers = with maintainers; [ bcdarwin ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix index 4fd4c0c130..0344559f8a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,26 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, itk_5_2, python3, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }: stdenv.mkDerivation rec { pname = "elastix"; - version = "5.0.1"; + version = "5.1.0"; src = fetchFromGitHub { - owner = "SuperElastix"; - repo = pname; - rev = version; - sha256 = "1mx8kkak2d3ibfrxrh8jkmh2zkdlgl9h578wiw3617zcwaa97bxw"; + owner = "SuperElastix"; + repo = pname; + rev = version; + hash = "sha256-wFeLU8IwiF43a9TAvecQG+QMw88PQZdJ8sI1Zz3ZeXc="; }; - patches = [ - (fetchpatch { - name = "install-executables.patch"; # https://github.com/SuperElastix/elastix/issues/305 - url = "https://github.com/SuperElastix/elastix/commit/8e26cdc0d66f6030c7be085fdc424d84d4fc7546.patch"; - sha256 = "12y9wbpi9jlarnw6fk4iby97jxvx5g4daq9zqblbcmn51r134bj5"; - }) - ]; - - nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ itk_5_2 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; doCheck = !stdenv.isDarwin; # usual dynamic linker issues diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix index d2615b391f..de419dc3d5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/mirtk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk, zlib, tbb }: +{ lib, stdenv, gtest, fetchFromGitHub, cmake, boost, eigen, python3, vtk_8, zlib, tbb }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake gtest ]; - buildInputs = [ boost eigen python3 vtk zlib tbb ]; + buildInputs = [ boost eigen python3 vtk_8 zlib tbb ]; meta = with lib; { homepage = "https://github.com/BioMedIA/MIRTK"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix index a20f697338..0fcf4a6c04 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/electronics/qcsxcad/default.nix @@ -4,7 +4,7 @@ , cmake , csxcad , tinyxml -, vtkWithQt5 +, vtk_8_withQt5 , qtbase }: @@ -33,7 +33,7 @@ mkDerivation { buildInputs = [ csxcad tinyxml - vtkWithQt5 + vtk_8_withQt5 qtbase ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix index bdb386b9fe..a418df7050 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { eigen ] ++ lib.optional useMpi mpi; - checkInputs = lib.optional useMpi openssh; + nativeCheckInputs = lib.optional useMpi openssh; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix index 142641398f..6ec28ba1c2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.11"; + version = "1.2.12"; pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "sha256-GkaeBggOCiIWNBZoIaCvAcqGDRc/whTOqPZbGpAxWIk="; + sha256 = "sha256-y6nlqRBJRWohGDAKe/F37qBP1SgtFHR1HD+erFJReOM="; }; # FIXME package boost-test and enable checks diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix index fe9fc54090..c5efbb757d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/clmagma/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, gfortran, opencl-headers, clblas, ocl-icd, mkl, intel-ocl }: -with lib; - let incfile = builtins.toFile "make.inc.custom" '' CC = g++ diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/tests.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/tests.nix index fcf57a8bc9..fdc8d9259e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/tests.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/tests.nix @@ -21,7 +21,7 @@ buildPythonPackage { "test_contrib.py" ]; - checkInputs = [ + nativeCheckInputs = [ faiss pytestCheckHook scipy diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix index c3ff2aeebf..b5e2f4b80d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IT++ is a C++ library of mathematical, signal processing and communication classes and functions"; - homepage = "http://itpp.sourceforge.net/"; + homepage = "https://itpp.sourceforge.net/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ andrew-d ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix index 559d8094b2..9becf229c9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix @@ -21,46 +21,47 @@ let # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # https://github.com/matthewbauer/undmg/issues/4 - mklVersion = if stdenvNoCC.isDarwin then "2019.3" else "2021.1.1"; - rel = if stdenvNoCC.isDarwin then "199" else "52"; + mklVersion = if stdenvNoCC.isDarwin then "2019.3" else "2023.0.0"; + rel = if stdenvNoCC.isDarwin then "199" else "25398"; # Intel openmp uses its own versioning. - openmpVersion = if stdenvNoCC.isDarwin then "19.0.3" else "19.1.3"; - openmpRel = "189"; + openmpVersion = if stdenvNoCC.isDarwin then "19.0.3" else "2023.0.0"; + openmpRel = "25370"; # Thread Building Blocks release. - tbbRel = "119"; + tbbVersion = if stdenvNoCC.isDarwin then "2019.3" else "2021.8.0"; + tbbRel = "25334"; shlibExt = stdenvNoCC.hostPlatform.extensions.sharedLibrary; oneapi-mkl = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; - hash = "sha256-G2Y7iX3UN2YUJhxcMM2KmhONf0ls9owpGlOo8hHOfqA="; + hash = "sha256-fiL5TDmQHB+OQb1ERcoDQFpUutpsPe+AqIbMoa85nEk="; }; oneapi-mkl-common = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; - hash = "sha256-HrMt2OcPIRxM8EL8SPjYTyuHJnC7RhPFUrvLhRH+7vc="; + hash = "sha256-AFayUxybi48SgR2mX6mxkNECconIXm1/TWelvE4aqX0="; }; oneapi-mkl-common-devel = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-common-devel-${mklVersion}-${mklVersion}-${rel}.noarch.rpm"; - hash = "sha256-XDE2WFJzEcpujFmO2AvqQdipZMvKB6/G+ksBe2sE438="; + hash = "sha256-riyIO2xWuvTSzfXgB+K6NSKqWLRmxKSnGZaH5nYTYPk="; }; oneapi-mkl-devel = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-mkl-devel-${mklVersion}-${mklVersion}-${rel}.x86_64.rpm"; - hash = "sha256-GhUJZ0Vr/ZXp10maie29/5ryU7zzX3F++wRCuuFcE0s="; + hash = "sha256-2IK0t47FaPNp7Oq9LJ5ZdLmlFFjQluWrh+nhvi8MCd8="; }; oneapi-openmp = fetchurl { url = "https://yum.repos.intel.com/oneapi/intel-oneapi-openmp-${mklVersion}-${mklVersion}-${openmpRel}.x86_64.rpm"; - hash = "sha256-yP2c4aQAFNRffjLoIZgWXLcNXbiez8smsgu2wXitefU="; + hash = "sha256-grzVFWqt3Vpwb5K3Bur+sJz8pdKxZ4ISJXF5YAPrwmk="; }; oneapi-tbb = fetchurl { - url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${mklVersion}-${mklVersion}-${tbbRel}.x86_64.rpm"; - hash = "sha256-K1BvhGoGVU2Zwy5vg2ZvJWBrSdh5uQwo0znt5039X0A="; + url = "https://yum.repos.intel.com/oneapi/intel-oneapi-tbb-${tbbVersion}-${tbbVersion}-${tbbRel}.x86_64.rpm"; + hash = "sha256-8hIoRfV36XVElKCqP9UmCkjLCs3l0ZKCHxg+yxNIHc0="; }; in stdenvNoCC.mkDerivation ({ @@ -128,23 +129,23 @@ in stdenvNoCC.mkDerivation ({ done # License - install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/2021.1.1/licensing/en/license.txt + install -Dm0655 -t $out/share/doc/mkl opt/intel/oneapi/mkl/${mklVersion}/licensing/license.txt # Dynamic libraries mkdir -p $out/lib cp -a opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib - cp -a opt/intel/oneapi/compiler/2021.1.1/linux/compiler/lib/intel64_lin/*.so* $out/lib - cp -a opt/intel/oneapi/tbb/2021.1.1/lib/intel64/gcc4.8/*.so* $out/lib + cp -a opt/intel/oneapi/compiler/${mklVersion}/linux/compiler/lib/intel64_lin/*.so* $out/lib + cp -a opt/intel/oneapi/tbb/${tbbVersion}/lib/intel64/gcc4.8/*.so* $out/lib # Headers cp -r opt/intel/oneapi/mkl/${mklVersion}/include $out/ '' + (if enableStatic then '' install -Dm0644 -t $out/lib opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.a - install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*.pc + install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/tools/pkgconfig/*.pc '' else '' cp opt/intel/oneapi/mkl/${mklVersion}/lib/intel64/*.so* $out/lib - install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/2021.1.1/tools/pkgconfig/*dynamic*.pc + install -Dm0644 -t $out/lib/pkgconfig opt/intel/oneapi/mkl/${mklVersion}/lib/pkgconfig/*dynamic*.pc '') + '' # Setup symlinks for blas / lapack ln -s $out/lib/libmkl_rt${shlibExt} $out/lib/libblas${shlibExt} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index f3ec52f6a5..0477f859ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -32,8 +32,6 @@ , python3 }: -with lib; - let blas64_ = blas64; in let @@ -121,7 +119,7 @@ let blas64 = if blas64_ != null then blas64_ - else hasPrefix "x86_64" stdenv.hostPlatform.system; + else lib.hasPrefix "x86_64" stdenv.hostPlatform.system; # Convert flag values to format OpenBLAS's build expects. # `toString` is almost what we need other than bools, # which we need to map {true -> 1, false -> 0} @@ -129,7 +127,7 @@ let mkMakeFlagValue = val: if !builtins.isBool val then toString val else if val then "1" else "0"; - mkMakeFlagsFromConfig = mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}"); + mkMakeFlagsFromConfig = lib.mapAttrsToList (var: val: "${var}=${mkMakeFlagValue val}"); shlibExt = stdenv.hostPlatform.extensions.sharedLibrary; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix index 30feab0c9b..983c4e1296 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { python.pkgs.protobuf python.pkgs.numpy ]; - checkInputs = [ + nativeCheckInputs = [ python.pkgs.matplotlib python.pkgs.pandas python.pkgs.virtualenv diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix index c0abcf6da6..0d55337628 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - checkInputs = [ openssh ]; + nativeCheckInputs = [ openssh ]; buildInputs = [ blas lapack ]; propagatedBuildInputs = [ mpi ]; hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix index a2be472cc3..263060f767 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - hash = "sha256-zeJGgtqEITK1fQtqFXwh+kpaS9Ky+RSY/uxZ2as8YyM="; + hash = "sha256-qRtr+Og75eowKJjezRSGlRp9Ps2A75zY80IqZMRa4Sw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix index 571e4e717d..9f04cee386 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-e5u9+H4rILIDpnZxzVV9wbjhR9tRqnf11i2Kn39DTzo="; + sha256 = "sha256-gIRfmCCkDokUhBKsQnWx8jQtfoYBgY65IS+tdmgeaYE="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix index 649c1dbae2..5fe290f04f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.14"; + version = "2020.3.17"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-NbpHn1e9+TD+9/iSFBw16/CQMXYx3D/aSDhkSGdBT3Q="; + sha256 = "sha256-TF6c0Nz/G9MRwkYKpgEjC9gKvbrsdRtVnB1xR3SfN3w="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix index 2990bc25e9..a09ac168ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk_5_2 }: +{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk }: stdenv.mkDerivation rec { pname = "simpleitk"; - version = "2.1.1.2"; + version = "2.2.1"; outputs = [ "out" "dev" ]; @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { owner = "SimpleITK"; repo = "SimpleITK"; rev = "v${version}"; - sha256 = "sha256-sokJXOz6p+0eTeps5Tt24pjB3u+L1s6mDlaWN7K9m3g="; + hash = "sha256-0YxmixUTXpjegZQv7DDCNTWFTH8QEWqQQszee7aQ5EI="; }; nativeBuildInputs = [ cmake swig4 ]; - buildInputs = [ lua itk_5_2 ]; + buildInputs = [ lua itk ]; # 2.0.0: linker error building examples cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/snap7/default.nix b/third_party/nixpkgs/pkgs/development/libraries/snap7/default.nix index 3419c4c6c2..f83ee00d04 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/snap7/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/snap7/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://snap7.sourceforge.net/"; + homepage = "https://snap7.sourceforge.net/"; description = "Step7 Open Source Ethernet Communication Suite"; license = licenses.lgpl3; maintainers = with maintainers; [ freezeboy ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix b/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix index 142081da01..154924922a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/soci/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Database access library for C++"; - homepage = "http://soci.sourceforge.net/"; + homepage = "https://soci.sourceforge.net/"; license = licenses.boost; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix index b3e91bd3fd..bd4dc73c1e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sofia-sip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sofia-sip"; - version = "1.13.10"; + version = "1.13.12"; src = fetchFromGitHub { owner = "freeswitch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UVyjeIIS0WwnY3GoZLIYTgf7R+C8SCuykDozaxCpog0="; + sha256 = "sha256-2K5Lt2zk5MXKD9zIQ2pBt2IRx/H1Zg/S70dsrpI2mTM="; }; buildInputs = [ glib openssl ] ++ lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix index 83442035d7..1a6a977036 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix @@ -1,24 +1,23 @@ { gnustep, lib, fetchFromGitHub , libxml2, openssl , openldap, mariadb, libmysqlclient, postgresql }: -with lib; gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - sha256 = "sha256-mS685NOB6IN3a5tE3yr+VUq55Ouc5af9aJ2wTfGsAlo="; + hash = "sha256-sXIpKdJ5930+W+FsxQ8DZOq/49XWMM1zV8dIzbQdcbc="; }; hardeningDisable = [ "format" ]; nativeBuildInputs = [ gnustep.make ]; - buildInputs = flatten ([ gnustep.base libxml2 openssl ] - ++ optional (openldap != null) openldap - ++ optionals (mariadb != null) [ libmysqlclient mariadb ] - ++ optional (postgresql != null) postgresql); + buildInputs = lib.flatten ([ gnustep.base libxml2 openssl ] + ++ lib.optional (openldap != null) openldap + ++ lib.optionals (mariadb != null) [ libmysqlclient mariadb ] + ++ lib.optional (postgresql != null) postgresql); postPatch = '' # Exclude NIX_ variables @@ -30,9 +29,9 @@ gnustep.stdenv.mkDerivation rec { ''; configureFlags = [ "--prefix=" "--disable-debug" "--enable-xml" "--with-ssl=ssl" ] - ++ optional (openldap != null) "--enable-openldap" - ++ optional (mariadb != null) "--enable-mysql" - ++ optional (postgresql != null) "--enable-postgresql"; + ++ lib.optional (openldap != null) "--enable-openldap" + ++ lib.optional (mariadb != null) "--enable-mysql" + ++ lib.optional (postgresql != null) "--enable-postgresql"; # Yes, this is ugly. preFixup = '' @@ -40,7 +39,7 @@ gnustep.stdenv.mkDerivation rec { rm -rf $out/nix/store ''; - meta = { + meta = with lib; { description = "An extensive set of frameworks which form a complete Web application server environment"; license = licenses.publicDomain; homepage = "https://github.com/inverse-inc/sope"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/archive-version.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/archive-version.nix index 75d70680fb..601bb6a588 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/archive-version.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/archive-version.nix @@ -1,11 +1,9 @@ lib: version: -with lib; - let - fragments = splitVersion version; - major = head fragments; - minor = concatMapStrings (fixedWidthNumber 2) (tail fragments); + fragments = lib.splitVersion version; + major = lib.head fragments; + minor = lib.concatMapStrings (lib.fixedWidthNumber 2) (lib.tail fragments); in major + minor + "00" diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix index eb27c8c8b9..f4654a843f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -9,14 +9,12 @@ , enableDeserialize ? false }: -with lib; - let archiveVersion = import ./archive-version.nix lib; in stdenv.mkDerivation rec { - pname = "sqlite${optionalString interactive "-interactive"}"; + pname = "sqlite${lib.optionalString interactive "-interactive"}"; version = "3.40.1"; # nixpkgs-update: no auto update @@ -29,14 +27,14 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; separateDebugInfo = stdenv.isLinux; - buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ]; + buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ]; # required for aarch64 but applied for all arches for simplicity preConfigure = '' patchShebangs configure ''; - configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline"; + configureFlags = [ "--enable-threadsafe" ] ++ lib.optional interactive "--enable-readline"; NIX_CFLAGS_COMPILE = toString ([ "-DSQLITE_ENABLE_COLUMN_METADATA" @@ -94,7 +92,7 @@ stdenv.mkDerivation rec { inherit sqldiff sqlite-analyzer tracker; }; - meta = { + meta = with lib; { description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; downloadPage = "https://sqlite.org/download.html"; homepage = "https://www.sqlite.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix index a61ad7dc42..f4b2ee9e9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlitecpp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - checkInputs = [ cppcheck ]; + nativeCheckInputs = [ cppcheck ]; buildInputs = [ sqlite gtest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/srt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/srt/default.nix index 2e1a96eebb..97e55a0303 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/srt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/srt/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, openssl }: -with lib; stdenv.mkDerivation rec { pname = "srt"; version = "1.5.1"; @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { "-UCMAKE_INSTALL_LIBDIR" ]; - meta = { + meta = with lib; { description = "Secure, Reliable, Transport"; homepage = "https://github.com/Haivision/srt"; license = licenses.mpl20; diff --git a/third_party/nixpkgs/pkgs/development/libraries/swift-corelibs-libdispatch/default.nix b/third_party/nixpkgs/pkgs/development/libraries/swift-corelibs-libdispatch/default.nix deleted file mode 100644 index 76cc0d3e30..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/swift-corelibs-libdispatch/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, clangStdenv -, fetchFromGitHub -, cmake -, ninja -, libbsd -, libsystemtap -}: - -let - version = "5.5"; -in clangStdenv.mkDerivation { - pname = "swift-corelibs-libdispatch"; - inherit version; - - outputs = [ "out" "dev" "man" ]; - - src = fetchFromGitHub { - owner = "apple"; - repo = "swift-corelibs-libdispatch"; - rev = "swift-${version}-RELEASE"; - sha256 = "sha256-MbLgmS6qRSRT+2dGqbYTNb5MTM4Wz/grDXFk1kup+jk="; - }; - - nativeBuildInputs = [ - cmake - ninja - ]; - - buildInputs = [ - libbsd - libsystemtap - ]; - - meta = { - description = "Grand Central Dispatch"; - homepage = "https://github.com/apple/swift-corelibs-libdispatch"; - platforms = lib.platforms.linux; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.cmm ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/taskflow/default.nix b/third_party/nixpkgs/pkgs/development/libraries/taskflow/default.nix index dd2f8fb391..cde327c550 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/taskflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/taskflow/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "taskflow"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; rev = "v${version}"; - hash = "sha256-5bTTV/WAxslHQ+hvATtUUA1h3MuNzwVTlYMbD/sINRM="; + hash = "sha256-UUWJENGn60YQdUSQ55uL+/3xt/JUsVuKnqm/ef7wPVM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/tclap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tclap/default.nix index c24768bbbd..cdb2b51932 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tclap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tclap/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://tclap.sourceforge.net/"; + homepage = "https://tclap.sourceforge.net/"; description = "Templatized C++ Command Line Parser Library"; platforms = platforms.all; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tclx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tclx/default.nix index 3c814e1720..829015e8eb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tclx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tclx/default.nix @@ -17,7 +17,7 @@ tcl.mkTclDerivation rec { ''; meta = { - homepage = "http://tclx.sourceforge.net/"; + homepage = "https://tclx.sourceforge.net/"; description = "Tcl extensions"; license = lib.licenses.tcltk; maintainers = with lib.maintainers; [ kovirobi ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix index ca0f98acc2..575d8f4c4e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.8.8"; + version = "1.8.10"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "bbe37ee594d97f3c7820dd23ebcd9c9b8dac51a0"; - sha256 = "jLJglvq+7f+zCoanDRTFpUsH/M1Qf7PWJ1JjvmZsa24="; + rev = "93c42f6d7c1209937431469f80427d48907f1b8d"; + hash = "sha256-vdaVnC26txUBp8rlqx1CdLHlNlack3XXYdfFal1VLh4="; }; buildInputs = [ gperf openssl readline zlib ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix index 667d6dce74..605da19f77 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/telepathy/qt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config python ]; propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ]; buildInputs = [ dbus-glib ]; - checkInputs = [ dbus dbus-python ]; + nativeCheckInputs = [ dbus dbus-python ]; # No point in building tests if they are not run # On 0.9.7, they do not even build with QT4 diff --git a/third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix index 259d596465..3b228b6c62 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "tepl"; - version = "6.2.0"; + version = "6.4.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "jNaGXCw4GIdgyzjK4z3J4KiI+tGNCwTx1V5laqmJqEQ="; + sha256 = "XlayBmnQzwX6HWS1jIw0LFkVgSLcUYEA0JPVnfm4cyE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix index 19ebadd895..bb71b7ca90 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { doxygen ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tix/default.nix index b017b3eb66..80b93823df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tix/default.nix @@ -52,7 +52,7 @@ tcl.mkTclDerivation { meta = with lib; { description = "A widget library for Tcl/Tk"; - homepage = "http://tix.sourceforge.net/"; + homepage = "https://tix.sourceforge.net/"; platforms = platforms.all; license = with licenses; [ bsd2 # tix diff --git a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index 34a545d799..61cd2e0b48 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { cmocka ]; - checkInputs = [ + nativeCheckInputs = [ cmocka which openssl procps_pkg iproute2 ibm-sw-tpm2 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix index e5ea8b17f6..9027c14de9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gobject-introspection glib libxml2 sqlite diff --git a/third_party/nixpkgs/pkgs/development/libraries/tsocks/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tsocks/default.nix index d312944118..a489f679c6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tsocks/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tsocks/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Transparent SOCKS v4 proxying library"; - homepage = "http://tsocks.sourceforge.net/"; + homepage = "https://tsocks.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix index 1d34c21d38..6b7f58bcd6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.17.13"; + version = "0.17.16"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-bG6/bmIJtqSXRuDZGkSNAntUJxurgu1woTLs8pTKE88="; + sha256 = "sha256-T0BbjOkhn4EX2GBezYFbiUHNgp2uEbSiaxpJ/36jriY="; }; patches = [ @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libpcap ]; - checkInputs = [ + nativeCheckInputs = [ python3 which usbutils @@ -83,6 +83,8 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://github.com/martinpitt/umockdev"; + changelog = "https://github.com/martinpitt/umockdev/releases/tag/${version}"; description = "Mock hardware devices for creating unit tests"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ flokli ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/umockdev/hardcode-paths.patch b/third_party/nixpkgs/pkgs/development/libraries/umockdev/hardcode-paths.patch index 91f1e928ec..75a5c014a9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/umockdev/hardcode-paths.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/umockdev/hardcode-paths.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 2ed9027..1f6bbf2 100644 +index 15d9e5d..a1906dd 100644 --- a/meson.build +++ b/meson.build -@@ -38,6 +38,7 @@ g_ir_compiler = find_program('g-ir-compiler', required: false) +@@ -44,6 +44,7 @@ g_ir_compiler = find_program('g-ir-compiler', required: false) conf.set('PACKAGE_NAME', meson.project_name()) conf.set_quoted('VERSION', meson.project_version()) @@ -10,7 +10,7 @@ index 2ed9027..1f6bbf2 100644 # glibc versions somewhere between 2.28 and 2.34 if cc.has_function('__fxstatat', prefix: '#include ') -@@ -148,7 +149,7 @@ hacked_gir = custom_target('UMockdev-1.0 hacked gir', +@@ -156,7 +157,7 @@ hacked_gir = custom_target('UMockdev-1.0 hacked gir', if g_ir_compiler.found() umockdev_typelib = custom_target('UMockdev-1.0 typelib', @@ -31,28 +31,28 @@ index 5269dd0..a2ec46d 100644 } diff --git a/src/umockdev-record.vala b/src/umockdev-record.vala -index 8434d32..68c7f8e 100644 +index bf0e644..ff5ea59 100644 --- a/src/umockdev-record.vala +++ b/src/umockdev-record.vala -@@ -435,7 +435,7 @@ main (string[] args) +@@ -444,7 +444,7 @@ main (string[] args) preload = ""; else preload = preload + ":"; -- Environment.set_variable("LD_PRELOAD", preload + "libumockdev-preload.so.0", true); -+ Environment.set_variable("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0", true); +- checked_setenv("LD_PRELOAD", preload + "libumockdev-preload.so.0"); ++ checked_setenv("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0"); try { root_dir = DirUtils.make_tmp("umockdev.XXXXXX"); diff --git a/src/umockdev-run.vala b/src/umockdev-run.vala -index 9a1ba10..6df2522 100644 +index 7b0753e..66b778b 100644 --- a/src/umockdev-run.vala +++ b/src/umockdev-run.vala @@ -95,7 +95,7 @@ main (string[] args) preload = ""; else preload = preload + ":"; -- Environment.set_variable ("LD_PRELOAD", preload + "libumockdev-preload.so.0", true); -+ Environment.set_variable ("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0", true); +- checked_setenv ("LD_PRELOAD", preload + "libumockdev-preload.so.0"); ++ checked_setenv ("LD_PRELOAD", preload + Config.LIBDIR + "/libumockdev-preload.so.0"); var testbed = new UMockdev.Testbed (); diff --git a/third_party/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix index d185d32c81..6f27a71b3e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix @@ -1,7 +1,5 @@ {lib, stdenv, fetchFromGitHub, cmake}: -with lib; - stdenv.mkDerivation rec { pname = "unittest-cpp"; version = "2.0.0"; @@ -20,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/unittest-cpp/unittest-cpp"; description = "Lightweight unit testing framework for C++"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = []; platforms = lib.platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/unixODBC/default.nix b/third_party/nixpkgs/pkgs/development/libraries/unixODBC/default.nix index 2ab717782e..2c424157bb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/unixODBC/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/unixODBC/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "unixODBC"; - version = "2.3.9"; + version = "2.3.11"; src = fetchurl { urls = [ "ftp://ftp.unixodbc.org/pub/unixODBC/${pname}-${version}.tar.gz" "http://www.unixodbc.org/${pname}-${version}.tar.gz" ]; - sha256 = "sha256-UoM+rD1oHIsMmlpl8uvXRbOpZPII/HSPl35EAVoxsgc="; + sha256 = "sha256-2eVcjnEYNH48ZshzOIVtrRUWtJD7fHVsFWKiwmfHO1w="; }; configureFlags = [ "--disable-gui" "--sysconfdir=/etc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix index dc808c529a..01ab983e1d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/uriparser/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { "-DURIPARSER_BUILD_DOCS=OFF" ] ++ lib.optional (!doCheck) "-DURIPARSER_BUILD_TESTS=OFF"; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; doCheck = stdenv.buildPlatform == stdenv.hostPlatform; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/uthash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uthash/default.nix index f6c6e37842..f697e8c7a1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/uthash/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/uthash/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; doCheck = true; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; checkTarget = "all"; preCheck = "cd tests"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/uthenticode/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uthenticode/default.nix index 06579c2d47..c98d9f930d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/uthenticode/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/uthenticode/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ]; nativeBuildInputs = [ cmake ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; buildInputs = [ pe-parse openssl ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix b/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix index c3f04eae4d..7ca5080cb7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/v8/default.nix @@ -105,6 +105,10 @@ stdenv.mkDerivation rec { --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ 'false' ''} + ${lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + substituteInPlace build/config/compiler/BUILD.gn \ + --replace "-Wl,-fatal_warnings" "" + ''} touch build/config/gclient_args.gni ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vcg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vcg/default.nix index d8c83bf54a..8b86df2e1c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vcg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vcg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vcg"; - version = "1.0.1"; + version = "2022.02"; src = fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "vcglib"; - rev = "v${version}"; - sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f"; + rev = version; + sha256 = "sha256-XCjbVlgE0C9UagPj4fraA7BNsM6ONKo66aKQ87gQOfE="; }; propagatedBuildInputs = [ eigen ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix index 1cff63d178..81abbf8c40 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/virglrenderer/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "virglrenderer"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2"; - sha256 = "uKHxPhKAMwg3E1GeTJNryd8K/nYQnx8r1eB3uME6LUQ="; + sha256 = "sha256-qqvnko2sN4bdm9+F0PVjDW5FsiL5k3UAfjPSTqG+73c="; }; buildInputs = [ libGLU libepoxy libX11 libdrm mesa ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vk-bootstrap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vk-bootstrap/default.nix index 8b7ce6cd93..ef76d6db9d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vk-bootstrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vk-bootstrap/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "vk-bootstrap"; - version = "0.5"; + version = "0.6"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "charles-lunarg"; repo = "vk-bootstrap"; rev = "v${version}"; - sha256 = "sha256-rKyfUWfRYiVNzLWh6y44ASHW4j+yabY0kZTdZi8j2Dc="; + sha256 = "sha256-T24SCJSGta4yuK58NcQnMeiO3sg9P9/O3kaFJFO/eOE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix b/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix index cc0049ef75..2c27745217 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix @@ -16,9 +16,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "dev" "py" ]; - nativeBuildInputs = [ autoconf automake libtool pkg-config gettext swig autoreconfHook ]; + strictDeps = true; - buildInputs = [ glib cryptsetup nss util-linux gpgme ncurses ]; + nativeBuildInputs = [ autoreconfHook gettext gpgme pkg-config swig ]; + + buildInputs = [ glib cryptsetup nss util-linux ncurses ]; configureFlags = [ "--with-gpgme-prefix=${gpgme.dev}" diff --git a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix index f87557ac46..3a82bafa3e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -24,7 +24,7 @@ , zlib , icu , systemd -, systemdSupport ? stdenv.hostPlatform.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , nixosTests }: diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/9.x.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/9.x.nix index 3a5032efdc..7f7fc22f54 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vtk/9.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/9.x.nix @@ -1,5 +1,5 @@ import ./generic.nix { majorVersion = "9.2"; - minorVersion = "2"; - sourceSha256 = "sha256-HFsKK+cfrJb/SDGvaeNQ96DqMWiYH3kMAAcJ3PkSEHU="; + minorVersion = "5"; + sourceSha256 = "sha256-Eo1gG6qYDpjuA0IHl0sz+zjSyYq5z0pXVu/bCe1sCUk="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix index 235202284b..35f3a1725d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix @@ -4,7 +4,7 @@ , enableQt ? false, qtbase, qtx11extras, qttools, qtdeclarative, qtEnv , enablePython ? false, python ? throw "vtk: Python support requested, but no python interpreter was given." # Darwin support -, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL +, AGL, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL , ApplicationServices, CoreText, IOSurface, ImageIO, xpc, libobjc }: @@ -34,6 +34,7 @@ in stdenv.mkDerivation rec { libXt ] ++ optionals stdenv.isDarwin [ xpc + AGL Cocoa CoreServices DiskArbitration diff --git a/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix index 878271b431..098dc64cf1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: stdenv.mkDerivation rec { pname = "vxl"; - version = "3.3.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "vxl"; repo = "vxl"; rev = "v${version}"; - sha256 = "0qmqrijl14xlsbd77jk9ygg44h3lqzpswia6yif1iia6smqccjsr"; + sha256 = "sha256-4kMpIrywEZzt0JH95LHeDLrDneii0R/Uw9GsWkvED+E="; }; nativeBuildInputs = [ cmake unzip ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ Libraries for Computer Vision Research and Implementation"; - homepage = "http://vxl.sourceforge.net/"; + homepage = "https://vxl.sourceforge.net/"; license = "VXL License"; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix index e6d8a98b53..0fc513b68f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A cross-platform C library that allows one to defer selection of an OpenGL API and window system until runtime"; - homepage = "http://www.waffle-gl.org/"; + homepage = "https://www.waffle-gl.org/"; license = licenses.bsd2; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ Flakebi ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wavpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wavpack/default.nix index 67d8bccf51..2836faf6bc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wavpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wavpack/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = lib.optional stdenv.isDarwin libiconv; + buildInputs = [ libiconv ]; # autogen.sh:9 preAutoreconf = "cp ${gettext}/share/gettext/config.rpath ."; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix index bb764d6414..8d229678a3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix @@ -8,7 +8,7 @@ , wayland-scanner , expat , libxml2 -, withLibraries ? stdenv.isLinux +, withLibraries ? true , libffi , withDocumentation ? withLibraries && stdenv.hostPlatform == stdenv.buildPlatform , graphviz-nox diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix index bd94cc6b47..f9dc3c4e80 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja wayland-scanner ]; - checkInputs = [ python3 wayland ]; + nativeCheckInputs = [ python3 wayland ]; mesonFlags = [ "-Dtests=${lib.boolToString doCheck}" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index cfff2e7f85..4e22df60f5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -63,7 +63,7 @@ , addOpenGLRunpath , enableGeoLocation ? true , withLibsecret ? true -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation (finalAttrs: { diff --git a/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix index 88dd403a31..5e8adaf0c4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wildmidi/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { WildMIDI is a simple software midi player which has a core softsynth library that can be use with other applications. ''; - homepage = "http://wildmidi.sourceforge.net/"; + homepage = "https://wildmidi.sourceforge.net/"; # The library is LGPLv3, the wildmidi executable is GPLv3 license = licenses.lgpl3; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix index 761e977840..9d03d193d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix @@ -121,8 +121,8 @@ rec { }; wlroots_0_16 = generic { - version = "0.16.0"; - hash = "sha256-k7BFx1xvvsdCXNWX0XeZYwv8H/myk4p42i2Y6vjILqM="; + version = "0.16.1"; + hash = "sha256-UyPN7zmytre4emwx/ztZ4JefXHwixPV6UEEqnhSLbIY="; extraBuildInputs = [ vulkan-loader ]; extraNativeBuildInputs = [ glslang ]; extraPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index a8e2259a3b..b77ec4d3c4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ openssl ]; + nativeCheckInputs = [ openssl ]; postInstall = '' # fix recursive cycle: diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxSVG/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxSVG/default.nix index 52f6d679b9..7b018c89f5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxSVG/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxSVG/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.isDarwin Cocoa; meta = with lib; { - homepage = "http://wxsvg.sourceforge.net/"; + homepage = "https://wxsvg.sourceforge.net/"; description = "A SVG manipulation library built with wxWidgets"; longDescription = '' wxSVG is C++ library to create, manipulate and render Scalable Vector diff --git a/third_party/nixpkgs/pkgs/development/libraries/xavs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xavs/default.nix index 11d73a9dec..25dd7fdad7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xavs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xavs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "AVS encoder and decoder"; - homepage = "http://xavs.sourceforge.net/"; + homepage = "https://xavs.sourceforge.net/"; license = licenses.lgpl2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ codyopel ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix index b027c95a7e..cc7406b114 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-dbus-proxy/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { glib ]; - checkInputs = [ + nativeCheckInputs = [ dbus ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xine-lib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xine-lib/default.nix index aab4542ac3..263b6cd595 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xine-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xine-lib/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with lib; { - homepage = "http://xine.sourceforge.net/"; + homepage = "https://xine.sourceforge.net/"; description = "A high-performance, portable and reusable multimedia playback engine"; license = with licenses; [ gpl2Plus lgpl2Plus ]; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix index 2cb64fe6eb..6e002a2854 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xmlrpc-c/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A lightweight RPC library based on XML and HTTP"; - homepage = "http://xmlrpc-c.sourceforge.net/"; + homepage = "https://xmlrpc-c.sourceforge.net/"; # /doc/COPYING also lists "Expat license", # "ABYSS Web Server License" and "Python 1.5.2 License" license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix index 7f3dc9d609..92b662ac44 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - checkInputs = [ nss.tools ]; + nativeCheckInputs = [ nss.tools ]; preCheck = '' substituteInPlace tests/testrun.sh \ --replace 'timestamp=`date +%Y%m%d_%H%M%S`' 'timestamp=19700101_000000' \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/xsimd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xsimd/default.nix index 7d0af99645..db8cc787de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xsimd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xsimd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTS=ON" ]; doCheck = true; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; checkTarget = "xtest"; GTEST_FILTER = let diff --git a/third_party/nixpkgs/pkgs/development/libraries/xtensor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xtensor/default.nix index 3503c6894e..45c1ce936a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xtensor/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xtensor/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTS=ON" ]; doCheck = true; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; checkTarget = "xtest"; # https://github.com/xtensor-stack/xtensor/issues/2542 diff --git a/third_party/nixpkgs/pkgs/development/libraries/xtl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xtl/default.nix index fb50105cff..694f6511f0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xtl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xtl/default.nix @@ -2,17 +2,18 @@ , stdenv , fetchFromGitHub , cmake +, doctest , gtest }: stdenv.mkDerivation rec { pname = "xtl"; - version = "0.7.2"; + version = "0.7.5"; src = fetchFromGitHub { owner = "xtensor-stack"; repo = "xtl"; rev = version; - sha256 = "177ym67sz544wdylksfkkpi6bqn34kagycfnb3cv0nkmpipqj9lg"; + hash = "sha256-Vc1VKOWmG1sAw3UQpNJAhm9PvXSqJ0iO2qLjP6/xjtI="; }; nativeBuildInputs = [ cmake ]; @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_TESTS=ON" ]; doCheck = true; - checkInputs = [ gtest ]; + nativeCheckInputs = [ doctest ]; checkTarget = "xtest"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/xvidcore/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xvidcore/default.nix index 57f2403cfe..82520572c3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xvidcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xvidcore/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, yasm, autoconf, automake, libtool }: -with lib; stdenv.mkDerivation rec { pname = "xvidcore"; version = "1.3.7"; @@ -13,7 +12,7 @@ stdenv.mkDerivation rec { preConfigure = '' # Configure script is not in the root of the source directory cd build/generic - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # Undocumented darwin hack substituteInPlace configure --replace "-no-cpp-precomp" "" ''; @@ -21,22 +20,22 @@ stdenv.mkDerivation rec { configureFlags = [ ] # Undocumented darwin hack (assembly is probably disabled due to an # issue with nasm, however yasm is now used) - ++ optional stdenv.isDarwin "--enable-macosx_module --disable-assembly"; + ++ lib.optional stdenv.isDarwin "--enable-macosx_module --disable-assembly"; nativeBuildInputs = [ ] - ++ optional (!stdenv.isDarwin) yasm; + ++ lib.optional (!stdenv.isDarwin) yasm; buildInputs = [ ] # Undocumented darwin hack - ++ optionals stdenv.isDarwin [ autoconf automake libtool ]; + ++ lib.optionals stdenv.isDarwin [ autoconf automake libtool ]; # Don't remove static libraries (e.g. 'libs/*.a') on darwin. They're needed to # compile ffmpeg (and perhaps other things). - postInstall = optionalString (!stdenv.isDarwin) '' + postInstall = lib.optionalString (!stdenv.isDarwin) '' rm $out/lib/*.a ''; - meta = { + meta = with lib; { description = "MPEG-4 video codec for PC"; homepage = "https://www.xvid.com/"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xylib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xylib/default.nix index 1e3cf38bc7..ab2e3792ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xylib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xylib/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods"; license = licenses.lgpl21; - homepage = "http://xylib.sourceforge.net/"; + homepage = "https://xylib.sourceforge.net/"; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/yaml-cpp/0.3.0.nix b/third_party/nixpkgs/pkgs/development/libraries/yaml-cpp/0.3.0.nix new file mode 100644 index 0000000000..fad3397b74 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/yaml-cpp/0.3.0.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "yaml-cpp"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "jbeder"; + repo = "yaml-cpp"; + rev = "release-${version}"; + hash = "sha256-pmgcULTXhl83+Wc8ZsGebnJ1t0XybHhUEJxDnEZE5x8="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DYAML_CPP_BUILD_TOOLS=${lib.boolToString doCheck}" + "-DBUILD_SHARED_LIBS=${lib.boolToString (!stdenv.hostPlatform.isStatic)}" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + meta = with lib; { + description = "A YAML parser and emitter for C++"; + homepage = "https://github.com/jbeder/yaml-cpp"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/yaml-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/yaml-cpp/default.nix new file mode 100644 index 0000000000..c9468b10b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/yaml-cpp/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, gitUpdater +, cmake +, fetchpatch +}: + +stdenv.mkDerivation rec { + pname = "yaml-cpp"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "jbeder"; + repo = "yaml-cpp"; + rev = "yaml-cpp-${version}"; + hash = "sha256-2tFWccifn0c2lU/U1WNg2FHrBohjx8CXMllPJCevaNk="; + }; + + patches = [ + # https://github.com/jbeder/yaml-cpp/issues/774 + # https://github.com/jbeder/yaml-cpp/pull/1037 + (fetchpatch { + name = "yaml-cpp-Fix-generated-cmake-config.patch"; + url = "https://github.com/jbeder/yaml-cpp/commit/4f48727b365962e31451cd91027bd797bc7d2ee7.patch"; + hash = "sha256-jarZAh7NgwL3xXzxijDiAQmC/EC2WYfNMkYHEIQBPhM="; + }) + # TODO: Remove with the next release, when https://github.com/jbeder/yaml-cpp/pull/1058 is available + (fetchpatch { + name = "yaml-cpp-Fix-pc-paths-for-absolute-GNUInstallDirs.patch"; + url = "https://github.com/jbeder/yaml-cpp/commit/328d2d85e833be7cb5a0ab246cc3f5d7e16fc67a.patch"; + hash = "sha256-1M2rxfbVOrRH9kiImcwcEolXOP8DeDW9Cbu03+mB5Yk="; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DYAML_CPP_BUILD_TOOLS=false" + "-DYAML_BUILD_SHARED_LIBS=${lib.boolToString (!stdenv.hostPlatform.isStatic)}" + "-DINSTALL_GTEST=false" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + passthru.updateScript = gitUpdater { + rev-prefix = "yaml-cpp-"; + }; + + meta = with lib; { + description = "A YAML parser and emitter for C++"; + homepage = "https://github.com/jbeder/yaml-cpp"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix index 9ab0f5db74..43b181fc34 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix @@ -6,7 +6,7 @@ , systemd , check , subunit -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ orcania ] ++ lib.optional withSystemd systemd; - checkInputs = [ check subunit ]; + nativeCheckInputs = [ check subunit ]; cmakeFlags = [ "-DBUILD_YDER_TESTING=on" diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix index 3050525c2a..f62dec911d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" ]; doCheck = true; - checkInputs = with python3.pkgs; [ passlib ]; + nativeCheckInputs = with python3.pkgs; [ passlib ]; checkPhase = with lib; let # these tests require network access so we need to skip them. brokenTests = map escapeRegex [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/zimlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zimlib/default.nix index 56438f8e17..15161b17c2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zimlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zimlib/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dtest_data_dir=${testData}" ]; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zydis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zydis/default.nix index 901d32b395..e889d92273 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zydis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zydis/default.nix @@ -1,9 +1,16 @@ { lib , stdenv , fetchFromGitHub +, callPackage , cmake +, python3 }: +let + zycore = callPackage ./zycore.nix { + inherit stdenv fetchFromGitHub cmake; + }; +in stdenv.mkDerivation rec { pname = "zydis"; version = "4.0.0"; @@ -12,19 +19,34 @@ stdenv.mkDerivation rec { owner = "zyantific"; repo = "zydis"; rev = "v${version}"; - fetchSubmodules = true; - sha256 = "sha256-WSBi8HUVj/JR0/0pBoEaUKD0kOk41gSW5ZW74fn8b4k="; + hash = "sha256-/no/8FNa5LlwhZMSMao4/cwZk6GlamLjqr+isbh6tEI="; }; - nativeBuildInputs = [ - cmake + nativeBuildInputs = [ cmake ]; + buildInputs = [ zycore ]; + cmakeFlags = [ + "-DZYAN_SYSTEM_ZYCORE=ON" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" ]; + doCheck = true; + nativeCheckInputs = [ python3 ]; + checkPhase = '' + pushd ../tests + python3 ./regression.py test ../build/ZydisInfo + python3 ./regression_encoder.py \ + ../build/Zydis{Fuzz{ReEncoding,Encoder},TestEncoderAbsolute} + popd + ''; + + passthru = { inherit zycore; }; + meta = with lib; { homepage = "https://zydis.re/"; description = "Fast and lightweight x86/x86-64 disassembler library"; license = licenses.mit; - maintainers = with maintainers; [ jbcrail AndersonTorres ]; + maintainers = with maintainers; [ jbcrail AndersonTorres athre0z ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/zydis/zycore.nix b/third_party/nixpkgs/pkgs/development/libraries/zydis/zycore.nix new file mode 100644 index 0000000000..c0ad668d12 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/zydis/zycore.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "zycore"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "zyantific"; + repo = "zycore-c"; + rev = "v${version}"; + hash = "sha256-kplUgrYecymGxz92tEU6H+NNtcN/Ao/tmmqdVo2c7HA="; + }; + + nativeBuildInputs = [ cmake ]; + + # The absolute paths set by the Nix CMake build manager confuse + # Zycore's config generation (which appends them to the package path). + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix index 90758db16e..c4c20f207a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zziplib/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ lgpl2Plus mpl11 ]; maintainers = with maintainers; [ AndersonTorres ]; - platforms = python3.meta.platforms; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index 52fbeabf06..31891967df 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -424,7 +424,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/JorjBauer/lua-cyrussasl"; + homepage = "https://github.com/JorjBauer/lua-cyrussasl"; description = "Cyrus SASL library for Lua 5.1+"; license.fullName = "BSD"; }; @@ -593,7 +593,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/lewis6991/gitsigns.nvim"; + homepage = "https://github.com/lewis6991/gitsigns.nvim"; description = "Git signs written in pure lua"; license.fullName = "MIT/X11"; }; @@ -1038,7 +1038,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/rrthomas/lrexlib"; + homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (GNU flavour)."; license.fullName = "MIT/X11"; }; @@ -1071,7 +1071,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/rrthomas/lrexlib"; + homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (PCRE flavour)."; maintainers = with lib.maintainers; [ vyp ]; license.fullName = "MIT/X11"; @@ -1105,7 +1105,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/rrthomas/lrexlib"; + homepage = "https://github.com/rrthomas/lrexlib"; description = "Regular expression library binding (POSIX flavour)."; license.fullName = "MIT/X11"; }; @@ -1171,7 +1171,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/antirez/lua-cmsgpack"; + homepage = "https://github.com/antirez/lua-cmsgpack"; description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; license.fullName = "Two-clause BSD"; }; @@ -1569,7 +1569,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/brimworks/lua-yajl"; + homepage = "https://github.com/brimworks/lua-yajl"; description = "Integrate the yajl JSON library with Lua."; maintainers = with lib.maintainers; [ pstn ]; license.fullName = "MIT/X11"; @@ -2019,6 +2019,40 @@ buildLuarocksPackage { }; }) {}; +lualdap = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { + pname = "lualdap"; + version = "1.3.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lualdap-1.3.0-1.rockspec"; + sha256 = "0b51sm0fz4kiim20w538v31k9g20wq3msxdkh17drkr60ab25sc8"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/lualdap/lualdap", + "rev": "be380f5d98f779c813a4fb4ae1400262366fc8d4", + "date": "2021-06-05T15:49:42+02:00", + "path": "/nix/store/99sy73yz6sidqhkl0kwdsd7r853aw38n-lualdap", + "sha256": "133d8br5f24z03ni38m0czrqfz0mr0ksdrc1g73rawpmiqarpps8", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = with lua; (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://lualdap.github.io/lualdap/"; + description = "A Lua interface to the OpenLDAP library"; + maintainers = with lib.maintainers; [ aanderse ]; + license.fullName = "MIT"; + }; +}) {}; + lualogging = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, luasocket }: @@ -2086,7 +2120,7 @@ buildLuarocksPackage { sha256 = "0hx6my54axjcb3bklr991wji374qq6mwa3ily6dvb72vi2534nwz"; }).outPath; src = fetchzip { - url = "http://github.com/luaposix/luaposix/archive/v34.1.1.zip"; + url = "https://github.com/luaposix/luaposix/archive/v34.1.1.zip"; sha256 = "0863r8c69yx92lalj174qdhavqmcs2cdimjim6k55qj9yn78v9zl"; }; @@ -2094,7 +2128,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ bit32 lua ]; meta = { - homepage = "http://github.com/luaposix/luaposix/"; + homepage = "https://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; maintainers = with lib.maintainers; [ vyp lblasc ]; license.fullName = "MIT/X11"; @@ -2329,7 +2363,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/bluebird75/luaunit"; + homepage = "https://github.com/bluebird75/luaunit"; description = "A unit testing framework for Lua"; maintainers = with lib.maintainers; [ lockejan ]; license.fullName = "BSD"; @@ -2355,7 +2389,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/starwing/luautf8"; + homepage = "https://github.com/starwing/luautf8"; description = "A UTF-8 support module for Lua"; maintainers = with lib.maintainers; [ pstn ]; license.fullName = "MIT"; @@ -2417,7 +2451,7 @@ buildLuarocksPackage { disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; - checkInputs = [ moonscript ]; + nativeCheckInputs = [ moonscript ]; meta = { homepage = "https://github.com/rktjmp/lush.nvim"; @@ -2489,7 +2523,7 @@ buildLuarocksPackage { sha256 = "0d0h70kjl5fkq589y1sx8qy8as002dhcf88pf60pghvch002ryi1"; }).outPath; src = fetchzip { - url = "http://github.com/gvvaughan/lyaml/archive/v6.2.8.zip"; + url = "https://github.com/gvvaughan/lyaml/archive/v6.2.8.zip"; sha256 = "0r3jjsd8x2fs1aanki0s1mvpznl16f32c1qfgmicy0icgy5xfch0"; }; @@ -2497,7 +2531,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua ]; meta = { - homepage = "http://github.com/gvvaughan/lyaml"; + homepage = "https://github.com/gvvaughan/lyaml"; description = "libYAML binding for Lua"; maintainers = with lib.maintainers; [ lblasc ]; license.fullName = "MIT/X11"; @@ -2689,7 +2723,7 @@ buildLuarocksPackage { disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua luafilesystem ]; - checkInputs = [ busted ]; + nativeCheckInputs = [ busted ]; meta = { homepage = "https://lunarmodules.github.io/penlight"; @@ -2723,7 +2757,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua luassert ]; meta = { - homepage = "http://github.com/nvim-lua/plenary.nvim"; + homepage = "https://github.com/nvim-lua/plenary.nvim"; description = "lua functions you don't want to write "; license.fullName = "MIT/X11"; }; @@ -2779,7 +2813,7 @@ buildLuarocksPackage { propagatedBuildInputs = [ lua luaposix ]; meta = { - homepage = "http://pjb.com.au/comp/lua/readline.html"; + homepage = "https://pjb.com.au/comp/lua/readline.html"; description = "Interface to the readline library"; license.fullName = "MIT/X11"; }; @@ -2833,7 +2867,7 @@ buildLuarocksPackage { disabled = with lua; (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; - checkInputs = [ busted ]; + nativeCheckInputs = [ busted ]; meta = { homepage = "https://lunarmodules.github.io/say"; @@ -2900,7 +2934,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; propagatedBuildInputs = [ luv ]; - checkInputs = [ plenary-nvim ]; + nativeCheckInputs = [ plenary-nvim ]; meta = { homepage = "https://github.com/tami5/sqlite.lua"; @@ -3051,7 +3085,7 @@ buildLuarocksPackage { '') ["date" "path"]) ; propagatedBuildInputs = [ argparse compat53 luafilesystem ]; - checkInputs = [ dkjson ]; + nativeCheckInputs = [ dkjson ]; meta = { homepage = "https://github.com/teal-language/tl"; diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix index fbab2d259a..419842a096 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -27,6 +27,7 @@ , mariadb , mpfr , neovim-unwrapped +, openldap , openssl , pcre , pkg-config @@ -329,6 +330,12 @@ with prev; disabled = luaOlder "5.1" || luaAtLeast "5.4" || isLuaJIT; }); + lualdap = prev.luaLib.overrideLuarocks prev.lualdap (drv: { + externalDeps = [ + { name = "LDAP"; dep = openldap; } + ]; + }); + luaossl = prev.luaLib.overrideLuarocks prev.luaossl (drv: { externalDeps = [ { name = "CRYPTO"; dep = openssl; } @@ -491,7 +498,7 @@ with prev; sqlite = prev.luaLib.overrideLuarocks prev.sqlite (drv: { doCheck = true; - checkInputs = [ final.plenary-nvim neovim-unwrapped ]; + nativeCheckInputs = [ final.plenary-nvim neovim-unwrapped ]; # we override 'luarocks test' because otherwise neovim doesn't find/load the plenary plugin checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix b/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix index d25bb93d49..70270a58dd 100644 --- a/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/brev-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.197"; + version = "0.6.199"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+elot37F8VW7BP18zB8wHbxTHLgnTlXLUJlr82/Y05w="; + sha256 = "sha256-6sEgxUDKKAFWxWQqTb8hLt+vqlkD/9f5zdj9rh3sDLM="; }; - vendorSha256 = "sha256-uaLoh1VhJAT5liGqL77DLhAWviy5Ci8B16LuzCWuek8="; + vendorHash = "sha256-hpS8fyyWIw1vkWXyd1OxyorGT5j4bJ5Ey+Hh48QF0p0="; CGO_ENABLED = 0; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix index 48954114a4..c03b1fb881 100644 --- a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix @@ -17,7 +17,7 @@ mkDerivation { vector ]; testHaskellDepends = [ base hspec ]; - homepage = "http://github.com/bos/pool"; + homepage = "https://github.com/bos/pool"; description = "A high-performance striped resource pooling implementation"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lassulus ]; diff --git a/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/binary.nix b/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/binary.nix index 5b64ec328a..3558599c2d 100644 --- a/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/binary.nix +++ b/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/binary.nix @@ -1,9 +1,7 @@ { stdenv, lib, fetchurl, unzip, autoPatchelfHook }: -with lib; - let - archPostfix = optionalString (stdenv.is64bit && !stdenv.isDarwin) "_64"; + archPostfix = lib.optionalString (stdenv.is64bit && !stdenv.isDarwin) "_64"; in stdenv.mkDerivation rec { pname = "msp-debug-stack-bin"; version = "3.15.1.1"; @@ -26,7 +24,7 @@ in stdenv.mkDerivation rec { install -Dm0644 -t $out/include Inc/*.h ''; - meta = { + meta = with lib; { description = "Unfree binary release of the TI MSP430 FET debug driver"; homepage = "https://www.ti.com/tool/MSPDS"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/default.nix b/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/default.nix index 891e7d980b..ec0ac507a4 100644 --- a/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/msp430/mspds/default.nix @@ -6,11 +6,10 @@ , libusb1 ? null }: -with lib; assert stdenv.isLinux -> libusb1 != null; let - hidapiDriver = optionalString stdenv.isLinux "-libusb"; + hidapiDriver = lib.optionalString stdenv.isLinux "-libusb"; in stdenv.mkDerivation { pname = "msp-debug-stack"; @@ -33,7 +32,7 @@ in stdenv.mkDerivation { preBuild = '' rm ThirdParty/src/pugixml.cpp rm ThirdParty/include/pugi{config,xml}.hpp - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' makeFlagsArray+=(OUTNAME="-install_name ") ''; @@ -44,9 +43,9 @@ in stdenv.mkDerivation { nativeBuildInputs = [ unzip ]; buildInputs = [ boost hidapi pugixml ] - ++ optional stdenv.isLinux libusb1; + ++ lib.optional stdenv.isLinux libusb1; - meta = { + meta = with lib; { description = "TI MSP430 FET debug driver"; homepage = "https://www.ti.com/tool/MSPDS"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/README.md b/third_party/nixpkgs/pkgs/development/misc/resholve/README.md index b2480d4b09..18d98f364f 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/README.md +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/README.md @@ -252,8 +252,23 @@ with some rules (internal to resholve) for locating sub-executions in some of the more common commands. - "execer" lore identifies whether an executable can, cannot, - or might execute its arguments. Every "can" or "might" verdict requires - either built-in rules for finding the executable, or human triage. + or might execute its arguments. Every "can" or "might" verdict requires: + - an update to the matching rules in [binlore](https://github.com/abathur/binlore) + if there's absolutely no exec in the executable and binlore just lacks + rules for understanding this + - an override in [binlore](https://github.com/abathur/binlore) if there is + exec but it isn't actually under user control + - a parser in [resholve](https://github.com/abathur/resholve) capable of + isolating the exec'd words if the command does have exec under user + control + - overriding the execer lore for the executable if manual triage indicates + that all of the invocations in the current package don't include any + commands that the executable would exec + - if manual triage turns up any commands that would be exec'd, use some + non-resholve tool to patch/substitute/replace them before or after you + run resholve on them (if before, you may need to also add keep directives + for these absolute paths) + - "wrapper" lore maps shell exec wrappers to the programs they exec so that resholve can substitute an executable's verdict for its wrapper's. diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/oildev.nix b/third_party/nixpkgs/pkgs/development/misc/resholve/oildev.nix index d965951399..de3ac08ec9 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/oildev.nix +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/oildev.nix @@ -9,8 +9,7 @@ , # py-yajl deps git , # oil deps - readline -, cmark + cmark , file , glibcLocales , six @@ -36,12 +35,12 @@ rec { py-yajl = python27.pkgs.buildPythonPackage rec { pname = "oil-pyyajl-unstable"; - version = "2019-12-05"; + version = "2022-09-01"; src = fetchFromGitHub { owner = "oilshell"; repo = "py-yajl"; - rev = "eb561e9aea6e88095d66abcc3990f2ee1f5339df"; - sha256 = "17hcgb7r7cy8r1pwbdh8di0nvykdswlqj73c85k6z8m0filj3hbh"; + rev = "72686b0e2e9d13d3ce5fefe47ecd607c540c90a3"; + hash = "sha256-H3GKN0Pq1VFD5+SWxm8CXUVO7zAyj/ngKVmDaG/aRT4="; fetchSubmodules = true; }; # just for submodule IIRC @@ -60,9 +59,9 @@ rec { src = fetchFromGitHub { owner = "oilshell"; repo = "oil"; - # rev == present HEAD of release/0.8.12 - rev = "799c0703d1da86cb80d1f5b163edf9369ad77cf1"; - hash = "sha256-QNSISr719ycZ1Z0quxHWzCb3IvHGj9TpogaYz20hDM4="; + # rev == present HEAD of release/0.14.0 + rev = "3d0427e222f7e42ae7be90c706d7fde555efca2e"; + hash = "sha256-XMoNkBEEmD6AwNSu1uSh3OcWLfy4/ADtRckn/Pj2cP4="; /* It's not critical to drop most of these; the primary target is @@ -73,16 +72,16 @@ rec { hash on rev updates. Command will fail w/o and not print hash. */ postFetch = '' - rm -rf Python-2.7.13 benchmarks metrics py-yajl rfc gold web testdata services demo devtools cpp + rm -rf $out/{Python-2.7.13,metrics,py-yajl,rfc,gold,web,testdata,services,demo,devtools} ''; }; - # patch to support a python package, pass tests on macOS, etc. + # patch to support a python package, pass tests on macOS, drop deps, etc. patchSrc = fetchFromGitHub { owner = "abathur"; repo = "nix-py-dev-oil"; - rev = "v0.8.12.2"; - hash = "sha256-+dVxzPKMGNKFE+7Ggzx9iWjjvwW2Ow3UqmjjUud9Mqo="; + rev = "v0.14.0.0"; + hash = "sha256-U6uR8G6yB2xwuDE/fznco23mVFSVdCxPUNdCRYz4Mj8="; }; patches = [ "${patchSrc}/0001-add_setup_py.patch" @@ -91,13 +90,18 @@ rec { "${patchSrc}/0006-disable_failing_libc_tests.patch" "${patchSrc}/0007-namespace_via_init.patch" "${patchSrc}/0009-avoid_nix_arch64_darwin_toolchain_bug.patch" + "${patchSrc}/0010-disable-line-input.patch" + "${patchSrc}/0011-disable-fanos.patch" + "${patchSrc}/0012-disable-doc-cmark.patch" ]; - buildInputs = [ readline cmark py-yajl ]; + configureFlags = [ + "--without-readline" + ]; nativeBuildInputs = [ re2c file makeWrapper ]; - propagatedBuildInputs = [ six typing ]; + propagatedBuildInputs = [ six typing py-yajl ]; doCheck = true; @@ -106,7 +110,12 @@ rec { ''; postPatch = '' - patchShebangs asdl build core doctools frontend native oil_lang + patchShebangs asdl build core doctools frontend pyext oil_lang + substituteInPlace pyext/fastlex.c --replace '_gen/frontend' '../_gen/frontend' + substituteInPlace core/main_loop.py --replace 'import fanos' '# import fanos' + rm cpp/stdlib.h # keep modules from finding the wrong stdlib? + # work around hard parse failure documented in oilshell/oil#1468 + substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False' ''; /* @@ -120,8 +129,17 @@ rec { # See earlier note on glibcLocales TODO: verify needed? LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; - # not exhaustive; just a spot-check for now - pythonImportsCheck = [ "oil" "oil._devbuild" ]; + # not exhaustive; sample what resholve uses as a sanity check + pythonImportsCheck = [ + "oil" + "oil.asdl" + "oil.core" + "oil.frontend" + "oil._devbuild" + "oil._devbuild.gen.id_kind_asdl" + "oil._devbuild.gen.syntax_asdl" + "oil.tools.osh2oil" + ]; meta = { license = with lib.licenses; [ diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/source.nix b/third_party/nixpkgs/pkgs/development/misc/resholve/source.nix index d8f7578f68..70182722bd 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/source.nix +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/source.nix @@ -3,7 +3,7 @@ }: rec { - version = "0.8.5"; + version = "0.9.0"; rSrc = # local build -> `make ci`; `make clean` to restore # return to remote source @@ -14,6 +14,6 @@ rec { owner = "abathur"; repo = "resholve"; rev = "v${version}"; - hash = "sha256-DX1xe3YC0PlhwbjsvbmUzNjrwhxFpbZW87WWbKcD0us="; + hash = "sha256-FRdCeeC2c3bMEXekEyilgW0PwFfUWGstZ5mXdmRPM5w="; }; } diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix b/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix index 4d029622e8..9096a9249a 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/test.nix @@ -127,7 +127,7 @@ rec { ''; doCheck = true; buildInputs = [ resholve ]; - checkInputs = [ coreutils bats python27 ]; + nativeCheckInputs = [ coreutils bats python27 ]; # LOGLEVEL="DEBUG"; # default path diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/README.md b/third_party/nixpkgs/pkgs/development/mobile/androidenv/README.md index 159265abb4..04cb157dba 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/README.md +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/README.md @@ -4,3 +4,12 @@ 2. `./mkrepo.sh` 3. Check the `repo.json` diff for new stable versions of `tools`, `platform-tools`, `build-tools`, `emulator` and/or `ndk` 4. Update the relevant argument defaults in `compose-android-packages.nix` + +# How to run tests +You may need to make yourself familiar with [tests](https://nixos.org/manual/nixpkgs/stable/#var-meta-tests), and [Writing larger package tests](https://nixos.org/manual/nixpkgs/stable/#ssec-package-tests-writing) in the Manual, then run tests locally with: + +```shell +$ export NIXPKGS_ALLOW_UNFREE=1 +$ cd path/to/nixpkgs +$ nix-build -A androidenv.test-suite.tests +``` diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/build-tools.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/build-tools.nix index 2b094df034..018298d322 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/build-tools.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,4 +1,4 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux}: +{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall}: deployAndroidPackage { inherit package os; @@ -19,6 +19,8 @@ deployAndroidPackage { wrapProgram $PWD/mainDexClasses \ --prefix PATH : ${pkgs.jdk8}/bin ''} - ''; + + cd $out/libexec/android-sdk + '' + postInstall; noAuditTmpdir = true; # The checker script gets confused by the build-tools path that is incorrectly identified as a reference to /build } diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/cmdline-tools.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/cmdline-tools.nix new file mode 100644 index 0000000000..b3ca1c171b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/cmdline-tools.nix @@ -0,0 +1,39 @@ +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, stdenv, cmdLineToolsVersion, postInstall}: + +deployAndroidPackage { + name = "androidsdk"; + inherit package os; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + + patchInstructions = '' + ${lib.optionalString (os == "linux") '' + # Auto patch all binaries + autoPatchelf . + ''} + + # Strip double dots from the root path + export ANDROID_SDK_ROOT="$out/libexec/android-sdk" + + # Wrap all scripts that require JAVA_HOME + find $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin -maxdepth 1 -type f -executable | while read program; do + if grep -q "JAVA_HOME" $program; then + wrapProgram $program --prefix PATH : ${pkgs.jdk11}/bin \ + --prefix ANDROID_SDK_ROOT : $ANDROID_SDK_ROOT + fi + done + + # Wrap sdkmanager script + wrapProgram $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin/sdkmanager \ + --prefix PATH : ${lib.makeBinPath [ pkgs.jdk11 ]} \ + --add-flags "--sdk_root=$ANDROID_SDK_ROOT" + + # Patch all script shebangs + patchShebangs $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin + + cd $ANDROID_SDK_ROOT + ${postInstall} + ''; + + meta.license = lib.licenses.unfree; +} diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix index a862aef1f3..75f393b3f9 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -2,7 +2,8 @@ , licenseAccepted ? false }: -{ toolsVersion ? "26.1.1" +{ cmdLineToolsVersion ? "8.0" +, toolsVersion ? "26.1.1" , platformToolsVersion ? "33.0.3" , buildToolsVersions ? [ "33.0.1" ] , includeEmulator ? false @@ -132,16 +133,40 @@ rec { package = packages.platform-tools.${platformToolsVersion}; }; + tools = callPackage ./tools.nix { + inherit deployAndroidPackage os; + package = packages.tools.${toolsVersion}; + + postInstall = '' + ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }} + ${linkPlugin { name = "patcher"; plugin = patcher; }} + ${linkPlugin { name = "emulator"; plugin = emulator; }} + ''; + }; + + patcher = callPackage ./patcher.nix { + inherit deployAndroidPackage os; + package = packages.patcher."1"; + }; + build-tools = map (version: callPackage ./build-tools.nix { inherit deployAndroidPackage os; package = packages.build-tools.${version}; + + postInstall = '' + ${linkPlugin { name = "tools"; plugin = tools; check = toolsVersion != null; }} + ''; } ) buildToolsVersions; emulator = callPackage ./emulator.nix { inherit deployAndroidPackage os; package = packages.emulator.${emulatorVersion}; + + postInstall = '' + ${linkSystemImages { images = system-images; check = includeSystemImages; }} + ''; }; platforms = map (version: @@ -238,9 +263,19 @@ rec { # Function that automatically links a plugin for which only one version exists linkPlugin = {name, plugin, check ? true}: lib.optionalString check '' - ln -s ${plugin}/libexec/android-sdk/* ${name} + ln -s ${plugin}/libexec/android-sdk/${name} ${name} ''; + linkSystemImages = { images, check }: lib.optionalString check '' + mkdir -p system-images + ${lib.concatMapStrings (system-image: '' + apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*)) + type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*)) + mkdir -p system-images/$apiVersion/$type + ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type/* system-images/$apiVersion/$type + '') images} + ''; + # Links all plugins related to a requested platform linkPlatformPlugins = {name, plugins, check}: lib.optionalString check '' @@ -260,12 +295,16 @@ rec { ${lib.concatMapStringsSep "\n" (str: " - ${str}") licenseNames} by setting nixpkgs config option 'android_sdk.accept_license = true;'. - '' else callPackage ./tools.nix { - inherit deployAndroidPackage packages toolsVersion os; + '' else callPackage ./cmdline-tools.nix { + inherit deployAndroidPackage os cmdLineToolsVersion; + + package = packages.cmdline-tools.${cmdLineToolsVersion}; postInstall = '' # Symlink all requested plugins ${linkPlugin { name = "platform-tools"; plugin = platform-tools; }} + ${linkPlugin { name = "tools"; plugin = tools; check = toolsVersion != null; }} + ${linkPlugin { name = "patcher"; plugin = patcher; }} ${linkPlugins { name = "build-tools"; plugins = build-tools; }} ${linkPlugin { name = "emulator"; plugin = emulator; check = includeEmulator; }} ${linkPlugins { name = "platforms"; plugins = platforms; }} @@ -273,17 +312,7 @@ rec { ${linkPlugins { name = "cmake"; plugins = cmake; }} ${linkNdkPlugins { name = "ndk-bundle"; rootName = "ndk"; plugins = ndk-bundles; }} ${linkNdkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }} - - ${lib.optionalString includeSystemImages '' - mkdir -p system-images - ${lib.concatMapStrings (system-image: '' - apiVersion=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*)) - type=$(basename $(echo ${system-image}/libexec/android-sdk/system-images/*/*)) - mkdir -p system-images/$apiVersion/$type - ln -s ${system-image}/libexec/android-sdk/system-images/$apiVersion/$type/* system-images/$apiVersion/$type - '') system-images} - ''} - + ${linkSystemImages { images = system-images; check = includeSystemImages; }} ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleAPIs; }} ${linkPlatformPlugins { name = "add-ons"; plugins = google-apis; check = useGoogleTVAddOns; }} @@ -304,27 +333,19 @@ rec { # Expose common executables in bin/ mkdir -p $out/bin - find $PWD/tools -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i - do + + for i in ${platform-tools}/bin/*; do ln -s $i $out/bin done - find $PWD/tools/bin -not -path '*/\.*' -type f -executable -mindepth 1 -maxdepth 1 | while read i - do + for i in ${emulator}/bin/*; do ln -s $i $out/bin done - for i in ${platform-tools}/bin/* - do + find $ANDROID_SDK_ROOT/cmdline-tools/${cmdLineToolsVersion}/bin -type f -executable | while read i; do ln -s $i $out/bin done - # the emulator auto-linked from platform-tools does not find its local qemu, while this one does - ${lib.optionalString includeEmulator '' - rm $out/bin/emulator - ln -s $out/libexec/android-sdk/emulator/emulator $out/bin - ''} - # Write licenses mkdir -p licenses ${lib.concatMapStrings (licenseName: diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/default.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/default.nix index 90064becfb..9bd9fb9a54 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/default.nix @@ -19,4 +19,6 @@ rec { platformVersions = [ "28" ]; abiVersions = [ "x86" "x86_64"]; }; + + test-suite = pkgs.callPackage ./test-suite.nix {}; } diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackages.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackages.nix index d495f2afd4..aaedae1eb4 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackages.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackages.nix @@ -4,6 +4,59 @@ let extraParams = removeAttrs args [ "packages" "os" "buildInputs" "nativeBuildInputs" "patchesInstructions" ]; sortedPackages = builtins.sort (x: y: builtins.lessThan x.name y.name) packages; + + mkXmlAttrs = attrs: + lib.concatStrings (lib.mapAttrsToList (name: value: " ${name}=\"${value}\"") attrs); + mkXmlValues = attrs: + lib.concatStrings (lib.mapAttrsToList (name: value: + let + tag = builtins.head (builtins.match "([^:]+).*" name); + in + if builtins.typeOf value == "string" then "<${tag}>${value}" else mkXmlDoc name value + ) attrs); + mkXmlDoc = name: doc: + let + tag = builtins.head (builtins.match "([^:]+).*" name); + hasXmlAttrs = builtins.hasAttr "element-attributes" doc; + xmlValues = removeAttrs doc [ "element-attributes" ]; + hasXmlValues = builtins.length (builtins.attrNames xmlValues) > 0; + in + if hasXmlAttrs && hasXmlValues then "<${tag}${mkXmlAttrs doc.element-attributes}>${mkXmlValues xmlValues }" + else if hasXmlAttrs && !hasXmlValues then "<${tag}${mkXmlAttrs doc.element-attributes}/>" + else if !hasXmlAttrs && hasXmlValues then "<${tag}>${mkXmlValues xmlValues}" + else "<${tag}/>"; + mkXmlPackage = package: '' + + + ${lib.concatStringsSep "---" (mkLicenses package.license)} + + ${mkXmlDoc "type-details" package.type-details} + ${mkXmlDoc "revision" package.revision-details} + ${lib.optionalString (lib.hasAttrByPath [ "dependencies" ] package) + (mkXmlDoc "dependencies" package.dependencies) + } + ${package.displayName} + + + + ''; in stdenv.mkDerivation ({ inherit buildInputs; @@ -44,6 +97,12 @@ stdenv.mkDerivation ({ cd $packageBaseDir cp -a $extractedZip/* . ${patchesInstructions.${package.name}} + + if [ ! -f $packageBaseDir/package.xml ]; then + cat << EOF > $packageBaseDir/package.xml + ${mkXmlPackage package} + EOF + fi '') packages); # Some executables that have been patched with patchelf may not work any longer after they have been stripped. diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix index 0a680fd360..273cc3d8a8 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/emulator.nix @@ -1,4 +1,4 @@ -{ deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux }: +{ deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgsi686Linux, postInstall }: deployAndroidPackage { inherit package os; @@ -47,6 +47,15 @@ deployAndroidPackage { ]} \ --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \ --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale + + mkdir -p $out/bin + cd $out/bin + find $out/libexec/android-sdk/emulator -type f -executable -mindepth 1 -maxdepth 1 | while read i; do + ln -s $i + done + + cd $out/libexec/android-sdk + ${postInstall} ''; dontMoveLib64 = true; } diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix index 36c3d4da0c..8c51ba09e5 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/examples/shell.nix @@ -25,7 +25,7 @@ let # versions may be used in multiple places in this Nix expression. android = { versions = { - tools = "26.1.1"; + cmdLineToolsVersion = "8.0"; platformTools = "33.0.3"; buildTools = "30.0.3"; ndk = [ @@ -60,7 +60,7 @@ let }; androidComposition = androidEnv.composeAndroidPackages { - toolsVersion = android.versions.tools; + cmdLineToolsVersion = android.versions.cmdLineToolsVersion; platformToolsVersion = android.versions.platformTools; buildToolsVersions = [android.versions.buildTools]; platformVersions = android.platforms; @@ -138,11 +138,55 @@ pkgs.mkShell rec { # Write out local.properties for Android Studio. cat < local.properties -# This file was automatically generated by nix-shell. -sdk.dir=$ANDROID_SDK_ROOT -ndk.dir=$ANDROID_NDK_ROOT -cmake.dir=$cmake_root -EOF + # This file was automatically generated by nix-shell. + sdk.dir=$ANDROID_SDK_ROOT + ndk.dir=$ANDROID_NDK_ROOT + cmake.dir=$cmake_root + EOF ''; + + passthru.tests = { + sdkmanager-licenses-test = pkgs.runCommand "sdkmanager-licenses-test" { + buildInputs = [ androidSdk jdk ]; + } '' + if [[ ! "$(sdkmanager --licenses)" =~ "All SDK package licenses accepted." ]]; then + echo "At least one of SDK package licenses are not accepted." + exit 1 + fi + touch $out + ''; + + sdkmanager-packages-test = pkgs.runCommand "sdkmanager-packages-test" { + buildInputs = [ androidSdk jdk ]; + } '' + output="$(sdkmanager --list)" + installed_packages_section=$(echo "''${output%%Available Packages*}" | awk 'NR>4 {print $1}') + + packages=( + "build-tools;30.0.3" "ndk-bundle" "platform-tools" \ + "platforms;android-23" "platforms;android-24" "platforms;android-25" "platforms;android-26" \ + "platforms;android-27" "platforms;android-28" "platforms;android-29" "platforms;android-30" \ + "platforms;android-31" "platforms;android-32" "platforms;android-33" \ + "sources;android-23" "sources;android-24" "sources;android-25" "sources;android-26" \ + "sources;android-27" "sources;android-28" "sources;android-29" "sources;android-30" \ + "sources;android-31" "sources;android-32" "sources;android-33" \ + "system-images;android-28;google_apis_playstore;arm64-v8a" \ + "system-images;android-29;google_apis_playstore;arm64-v8a" \ + "system-images;android-30;google_apis_playstore;arm64-v8a" \ + "system-images;android-31;google_apis_playstore;arm64-v8a" \ + "system-images;android-32;google_apis_playstore;arm64-v8a" \ + "system-images;android-33;google_apis_playstore;arm64-v8a" + ) + + for package in "''${packages[@]}"; do + if [[ ! $installed_packages_section =~ "$package" ]]; then + echo "$package package was not installed." + exit 1 + fi + done + + touch "$out" + ''; + }; } diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/mkrepo.rb b/third_party/nixpkgs/pkgs/development/mobile/androidenv/mkrepo.rb index 06ed081dc7..fa81330155 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/mkrepo.rb +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/mkrepo.rb @@ -29,6 +29,49 @@ def image_url value, dir end end +# Returns a JSON with the data and structure of the input XML +def to_json_collector doc + json = {} + index = 0 + doc.element_children.each { |node| + if node.children.length == 1 and node.children.first.text? + json["#{node.name}:#{index}"] ||= node.content + index += 1 + next + end + json["#{node.name}:#{index}"] ||= to_json_collector node + index += 1 + } + element_attributes = {} + doc.attribute_nodes.each do |attr| + if attr.name == "type" + type = attr.value.split(':', 2).last + case attr.value + when 'generic:genericDetailsType' + element_attributes["xsi:type"] ||= "ns5:#{type}" + when 'addon:extraDetailsType' + element_attributes["xsi:type"] ||= "ns8:#{type}" + when 'addon:mavenType' + element_attributes["xsi:type"] ||= "ns8:#{type}" + when 'sdk:platformDetailsType' + element_attributes["xsi:type"] ||= "ns11:#{type}" + when 'sdk:sourceDetailsType' + element_attributes["xsi:type"] ||= "ns11:#{type}" + when 'sys-img:sysImgDetailsType' + element_attributes["xsi:type"] ||= "ns12:#{type}" + when 'addon:addonDetailsType' then + element_attributes["xsi:type"] ||= "ns8:#{type}" + end + else + element_attributes[attr.name] ||= attr.value + end + end + if !element_attributes.empty? + json['element-attributes'] ||= element_attributes + end + json +end + # Returns a tuple of [type, revision, revision components] for a package node. def package_revision package type_details = package.at_css('> type-details') @@ -148,7 +191,7 @@ def fixup value else [k, v] end - end.sort {|(k1, v1), (k2, v2)| k1 <=> k2}] + end.sort {|(k1, v1), (k2, v2)| k1 <=> k2 }] end # Normalize the specified license text. @@ -189,7 +232,12 @@ def parse_package_xml doc display_name = text package.at_css('> display-name') uses_license = package.at_css('> uses-license') uses_license &&= uses_license['ref'] + obsolete ||= package['obsolete'] + type_details = to_json_collector package.at_css('> type-details') + revision_details = to_json_collector package.at_css('> revision') archives = package_archives(package) {|url| repo_url url} + dependencies_xml = package.at_css('> dependencies') + dependencies = to_json_collector dependencies_xml if dependencies_xml target = (packages[name] ||= {}) target = (target[revision] ||= {}) @@ -199,6 +247,10 @@ def parse_package_xml doc target['revision'] ||= revision target['displayName'] ||= display_name target['license'] ||= uses_license if uses_license + target['obsolete'] ||= obsolete if obsolete == 'true' + target['type-details'] ||= type_details + target['revision-details'] ||= revision_details + target['dependencies'] ||= dependencies if dependencies target['archives'] ||= {} merge target['archives'], archives end @@ -218,11 +270,17 @@ def parse_image_xml doc display_name = text package.at_css('> display-name') uses_license = package.at_css('> uses-license') uses_license &&= uses_license['ref'] + obsolete &&= package['obsolete'] + type_details = to_json_collector package.at_css('> type-details') + revision_details = to_json_collector package.at_css('> revision') archives = package_archives(package) {|url| image_url url, components[-2]} + dependencies_xml = package.at_css('> dependencies') + dependencies = to_json_collector dependencies_xml if dependencies_xml target = images components.each do |component| - target = (target[component] ||= {}) + target[component] ||= {} + target = target[component] end target['name'] ||= "system-image-#{revision}" @@ -230,6 +288,10 @@ def parse_image_xml doc target['revision'] ||= revision target['displayName'] ||= display_name target['license'] ||= uses_license if uses_license + target['obsolete'] ||= obsolete if obsolete + target['type-details'] ||= type_details + target['revision-details'] ||= revision_details + target['dependencies'] ||= dependencies if dependencies target['archives'] ||= {} merge target['archives'], archives end @@ -249,7 +311,12 @@ def parse_addon_xml doc display_name = text package.at_css('> display-name') uses_license = package.at_css('> uses-license') uses_license &&= uses_license['ref'] + obsolete &&= package['obsolete'] + type_details = to_json_collector package.at_css('> type-details') + revision_details = to_json_collector package.at_css('> revision') archives = package_archives(package) {|url| repo_url url} + dependencies_xml = package.at_css('> dependencies') + dependencies = to_json_collector dependencies_xml if dependencies_xml case type when 'addon:addonDetailsType' @@ -278,6 +345,10 @@ def parse_addon_xml doc target['revision'] ||= revision target['displayName'] ||= display_name target['license'] ||= uses_license if uses_license + target['obsolete'] ||= obsolete if obsolete + target['type-details'] ||= type_details + target['revision-details'] ||= revision_details + target['dependencies'] ||= dependencies if dependencies target['archives'] ||= {} merge target['archives'], archives end diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/patcher.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/patcher.nix new file mode 100644 index 0000000000..9fd112063c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/patcher.nix @@ -0,0 +1,9 @@ +{deployAndroidPackage, lib, package, os, autoPatchelfHook, pkgs, stdenv}: + +deployAndroidPackage { + inherit package os; + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + patchInstructions = lib.optionalString (os == "linux") '' + autoPatchelf $packageBaseDir/bin + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/platform-tools.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/platform-tools.nix index 49bc8da92a..eed3b896bf 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/platform-tools.nix @@ -4,6 +4,7 @@ deployAndroidPackage { inherit package os; nativeBuildInputs = lib.optionals (os == "linux") [ autoPatchelfHook ]; buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 ]; + patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib64 autoPatchelf --no-recurse $packageBaseDir/lib64 diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json b/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json index e27ec0bc30..0a4a733a49 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json @@ -14,7 +14,42 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-10", - "revision": "10" + "revision": "10", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "10", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "11": { @@ -31,7 +66,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-11", - "revision": "11" + "revision": "11", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "11", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "12": { @@ -48,7 +111,42 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-12", - "revision": "12" + "revision": "12", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "12", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "google_tv_addon": { "archives": [ @@ -63,7 +161,26 @@ "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-12", - "revision": "12" + "revision": "12", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "12", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "tag:3": { + "display:1": "Google TV Addon", + "id:0": "google_tv_addon" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "13": { @@ -80,7 +197,42 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-13", - "revision": "13" + "revision": "13", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "13", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "google_tv_addon": { "archives": [ @@ -95,7 +247,26 @@ "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-13", - "revision": "13" + "revision": "13", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "13", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "tag:3": { + "display:1": "Google TV Addon", + "id:0": "google_tv_addon" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "14": { @@ -112,7 +283,42 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-14", - "revision": "14" + "revision": "14", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "14", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "15": { @@ -129,7 +335,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-15", - "revision": "15" + "revision": "15", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "15", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "16": { @@ -146,7 +394,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-16", - "revision": "16" + "revision": "16", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "16", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "17": { @@ -163,7 +453,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-17", - "revision": "17" + "revision": "17", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "17", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "18": { @@ -180,7 +512,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-18", - "revision": "18" + "revision": "18", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "18", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "19": { @@ -197,7 +571,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-19", - "revision": "19" + "revision": "19", + "revision-details": { + "major:0": "20" + }, + "type-details": { + "api-level:0": "19", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "21": { @@ -214,7 +630,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-21", - "revision": "21" + "revision": "21", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "21", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "22": { @@ -231,7 +689,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-22", - "revision": "22" + "revision": "22", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "22", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "23": { @@ -248,7 +748,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-23", - "revision": "23" + "revision": "23", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "23", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "24": { @@ -265,7 +807,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-24", - "revision": "24" + "revision": "24", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "24", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "25": { @@ -282,7 +866,49 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-25", - "revision": "25" + "revision": "25", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "23", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + }, + "library:1": { + "description:0": "API for USB Accessories", + "element-attributes": { + "localJarPath": "usb.jar", + "name": "com.android.future.usb.accessory" + } + }, + "library:2": { + "description:0": "Collection of video effects", + "element-attributes": { + "localJarPath": "effects.jar", + "name": "com.google.android.media.effects" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "3": { @@ -299,7 +925,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-3", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "3", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "4": { @@ -316,7 +970,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-4", - "revision": "4" + "revision": "4", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "4", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "5": { @@ -333,7 +1015,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-5", - "revision": "5" + "revision": "5", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "5", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "6": { @@ -350,7 +1060,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-6", - "revision": "6" + "revision": "6", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "6", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "7": { @@ -367,7 +1105,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-7", - "revision": "7" + "revision": "7", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "7", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "8": { @@ -384,7 +1150,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-8", - "revision": "8" + "revision": "8", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "8", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "9": { @@ -401,7 +1195,35 @@ "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-9", - "revision": "9" + "revision": "9", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "9", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns8:addonDetailsType" + }, + "libraries:4": { + "library:0": { + "description:0": "API for Google Maps", + "element-attributes": { + "localJarPath": "maps.jar", + "name": "com.google.android.maps" + } + } + }, + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -419,7 +1241,21 @@ "license": "android-sdk-license", "name": "extras-android-m2repository", "path": "extras/android/m2repository", - "revision": "47.0.0" + "revision": "47.0.0", + "revision-details": { + "major:0": "47", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;google;Android_Emulator_Hypervisor_Driver": { "archives": [ @@ -434,7 +1270,21 @@ "license": "android-sdk-license", "name": "extras-google-Android_Emulator_Hypervisor_Driver", "path": "extras/google/Android_Emulator_Hypervisor_Driver", - "revision": "1.8.0" + "revision": "1.8.0", + "revision-details": { + "major:0": "1", + "micro:2": "0", + "minor:1": "8" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google LLC.", + "id:0": "google" + } + } }, "extras;google;admob_ads_sdk": { "archives": [ @@ -449,7 +1299,19 @@ "license": "android-sdk-license", "name": "extras-google-admob_ads_sdk", "path": "extras/google/admob_ads_sdk", - "revision": "11" + "revision": "11", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;analytics_sdk_v2": { "archives": [ @@ -464,7 +1326,19 @@ "license": "android-sdk-license", "name": "extras-google-analytics_sdk_v2", "path": "extras/google/analytics_sdk_v2", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;gcm": { "archives": [ @@ -479,7 +1353,19 @@ "license": "android-sdk-license", "name": "extras-google-gcm", "path": "extras/google/gcm", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;google_play_services": { "archives": [ @@ -490,11 +1376,30 @@ "url": "https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google Play services", "license": "android-sdk-license", "name": "extras-google-google_play_services", "path": "extras/google/google_play_services", - "revision": "49" + "revision": "49", + "revision-details": { + "major:0": "49" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;google_play_services_froyo": { "archives": [ @@ -509,7 +1414,19 @@ "license": "android-sdk-license", "name": "extras-google-google_play_services_froyo", "path": "extras/google/google_play_services_froyo", - "revision": "12" + "revision": "12", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;instantapps": { "archives": [ @@ -524,7 +1441,21 @@ "license": "android-sdk-license", "name": "extras-google-instantapps", "path": "extras/google/instantapps", - "revision": "1.9.0" + "revision": "1.9.0", + "revision-details": { + "major:0": "1", + "micro:2": "0", + "minor:1": "9" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;m2repository": { "archives": [ @@ -535,11 +1466,30 @@ "url": "https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google Repository", "license": "android-sdk-license", "name": "extras-google-m2repository", "path": "extras/google/m2repository", - "revision": "58" + "revision": "58", + "revision-details": { + "major:0": "58" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;market_apk_expansion": { "archives": [ @@ -554,7 +1504,19 @@ "license": "android-sdk-license", "name": "extras-google-market_apk_expansion", "path": "extras/google/market_apk_expansion", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;market_licensing": { "archives": [ @@ -569,7 +1531,20 @@ "license": "android-sdk-license", "name": "extras-google-market_licensing", "path": "extras/google/market_licensing", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": { + }, + "id:0": "google" + } + } }, "extras;google;simulators": { "archives": [ @@ -584,7 +1559,19 @@ "license": "android-sdk-license", "name": "extras-google-simulators", "path": "extras/google/simulators", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;usb_driver": { "archives": [ @@ -599,7 +1586,19 @@ "license": "android-sdk-license", "name": "extras-google-usb_driver", "path": "extras/google/usb_driver", - "revision": "13" + "revision": "13", + "revision-details": { + "major:0": "13" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;google;webdriver": { "archives": [ @@ -614,7 +1613,19 @@ "license": "android-sdk-license", "name": "extras-google-webdriver", "path": "extras/google/webdriver", - "revision": "2" + "revision": "2", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:extraDetailsType" + }, + "vendor:0": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0": { "archives": [ @@ -629,7 +1640,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4": { "archives": [ @@ -644,7 +1667,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8": { "archives": [ @@ -659,7 +1694,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1": { "archives": [ @@ -674,7 +1721,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta1", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2": { "archives": [ @@ -689,7 +1748,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta2", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3": { "archives": [ @@ -704,7 +1775,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta3", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta3", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4": { "archives": [ @@ -719,7 +1802,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5": { "archives": [ @@ -734,7 +1829,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-beta5", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-beta5", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1": { "archives": [ @@ -749,7 +1856,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.1", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2": { "archives": [ @@ -764,7 +1883,19 @@ "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.2", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0": { "archives": [ @@ -775,11 +1906,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4": { "archives": [ @@ -790,11 +1940,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" + } + } + }, "displayName": "com.android.support.constraint:constraint-layout:1.0.0-alpha4", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8": { "archives": [ @@ -805,11 +1974,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-alpha8", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1": { "archives": [ @@ -820,11 +2008,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta1", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta1", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2": { "archives": [ @@ -835,11 +2042,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta2", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta2", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3": { "archives": [ @@ -850,11 +2076,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta3", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta3", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta3", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4": { "archives": [ @@ -865,11 +2110,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta4", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta4", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5": { "archives": [ @@ -880,11 +2144,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.0-beta5", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-beta5", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-beta5", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.1": { "archives": [ @@ -895,11 +2178,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.1", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.1", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.1", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } }, "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2": { "archives": [ @@ -910,11 +2212,30 @@ "url": "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2" + } + } + }, "displayName": "ConstraintLayout for Android 1.0.2", "license": "android-sdk-license", "name": "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.2", "path": "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.2", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns8:mavenType" + }, + "vendor:0": { + "display:1": "Android", + "id:0": "android" + } + } } }, "images": { @@ -926,14 +2247,36 @@ "os": "all", "sha1": "8537616a7add47cce24c60f18bc2429e3dc90ae3", "size": 67927049, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-10_r05.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-10_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-10-default-armeabi-v7a", "path": "system-images/android-10/default/armeabi-v7a", - "revision": "10-default-armeabi-v7a" + "revision": "10-default-armeabi-v7a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "10", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -941,14 +2284,36 @@ "os": "all", "sha1": "a166d5ccbb165e1dd5464fbfeec30a61f77790d8", "size": 75386095, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-10_r05.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-10_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-10-default-x86", "path": "system-images/android-10/default/x86", - "revision": "10-default-x86" + "revision": "10-default-x86", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "10", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -961,11 +2326,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-10-google_apis-armeabi-v7a", "path": "system-images/android-10/google_apis/armeabi-v7a", - "revision": "10-google_apis-armeabi-v7a" + "revision": "10-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "10", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -976,11 +2366,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-10-google_apis-x86", "path": "system-images/android-10/google_apis/x86", - "revision": "10-google_apis-x86" + "revision": "10-google_apis-x86", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "10", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -992,14 +2407,29 @@ "os": "all", "sha1": "d8991b0c06b18d7d6ed4169d67460ee1add6661b", "size": 99621822, - "url": "https://dl.google.com/android/repository/sys-img/default/sysimg_armv7a-14_r02.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip" } ], "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-14-default-armeabi-v7a", "path": "system-images/android-14/default/armeabi-v7a", - "revision": "14-default-armeabi-v7a" + "revision": "14-default-armeabi-v7a", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "14", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } } }, @@ -1011,14 +2441,36 @@ "os": "all", "sha1": "03d7ed95a9d3b107e3f2e5b166d017ea12529e70", "size": 102452069, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-15_r05.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-15-default-armeabi-v7a", "path": "system-images/android-15/default/armeabi-v7a", - "revision": "15-default-armeabi-v7a" + "revision": "15-default-armeabi-v7a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "15", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1026,14 +2478,36 @@ "os": "all", "sha1": "61381aef3fd0cdc8255cb3298072a920c80186ca", "size": 116030933, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-15_r07.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-15_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-15-default-x86", "path": "system-images/android-15/default/x86", - "revision": "15-default-x86" + "revision": "15-default-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "15", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1046,11 +2520,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-15-google_apis-armeabi-v7a", "path": "system-images/android-15/google_apis/armeabi-v7a", - "revision": "15-google_apis-armeabi-v7a" + "revision": "15-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "15", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1061,11 +2560,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-15-google_apis-x86", "path": "system-images/android-15/google_apis/x86", - "revision": "15-google_apis-x86" + "revision": "15-google_apis-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "15", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1077,14 +2601,36 @@ "os": "all", "sha1": "69b944b0d5a18c8563fa80d7d229af64890f724e", "size": 118646340, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-16_r06.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-16_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-16-default-armeabi-v7a", "path": "system-images/android-16/default/armeabi-v7a", - "revision": "16-default-armeabi-v7a" + "revision": "16-default-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "mips": { "archives": [ @@ -1092,14 +2638,29 @@ "os": "all", "sha1": "67943c54fb3943943ffeb05fdd39c0b753681f6e", "size": 122482530, - "url": "https://dl.google.com/android/repository/sys-img/default/sysimg_mips-16_r04.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip" } ], "displayName": "MIPS System Image", "license": "mips-android-sysimage-license", "name": "system-image-16-default-mips", "path": "system-images/android-16/default/mips", - "revision": "16-default-mips" + "revision": "16-default-mips", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "mips", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1107,14 +2668,36 @@ "os": "all", "sha1": "ee6718e7556c8f8bd8d3f470b34f2c5dbf9bcff4", "size": 135305313, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-16_r07.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-16_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-16-default-x86", "path": "system-images/android-16/default/x86", - "revision": "16-default-x86" + "revision": "16-default-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1127,11 +2710,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-16_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-16-google_apis-armeabi-v7a", "path": "system-images/android-16/google_apis/armeabi-v7a", - "revision": "16-google_apis-armeabi-v7a" + "revision": "16-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1142,11 +2750,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-16-google_apis-x86", "path": "system-images/android-16/google_apis/x86", - "revision": "16-google_apis-x86" + "revision": "16-google_apis-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "16", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1158,14 +2791,36 @@ "os": "all", "sha1": "a18a3fd0958ec4ef52507f58e414fc5c7dfd59d6", "size": 124437041, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-17_r06.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-17-default-armeabi-v7a", "path": "system-images/android-17/default/armeabi-v7a", - "revision": "17-default-armeabi-v7a" + "revision": "17-default-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "mips": { "archives": [ @@ -1173,14 +2828,29 @@ "os": "all", "sha1": "f0c6e153bd584c29e51b5c9723cfbf30f996a05d", "size": 131781761, - "url": "https://dl.google.com/android/repository/sys-img/default/sysimg_mips-17_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip" } ], "displayName": "MIPS System Image", "license": "mips-android-sysimage-license", "name": "system-image-17-default-mips", "path": "system-images/android-17/default/mips", - "revision": "17-default-mips" + "revision": "17-default-mips", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "mips", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1188,14 +2858,39 @@ "os": "all", "sha1": "1ad5ffb51e31f5fe9fa47411fed2c2ade9a33865", "size": 194811128, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-17_r07.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-17_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-17-default-x86", "path": "system-images/android-17/default/x86", - "revision": "17-default-x86" + "revision": "17-default-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "default" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis": { @@ -1208,11 +2903,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-17-google_apis-armeabi-v7a", "path": "system-images/android-17/google_apis/armeabi-v7a", - "revision": "17-google_apis-armeabi-v7a" + "revision": "17-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1223,11 +2943,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-17-google_apis-x86", "path": "system-images/android-17/google_apis/x86", - "revision": "17-google_apis-x86" + "revision": "17-google_apis-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "17", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1239,14 +2984,36 @@ "os": "all", "sha1": "580b583720f7de671040d5917c8c9db0c7aa03fd", "size": 130590545, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-18_r05.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-18-default-armeabi-v7a", "path": "system-images/android-18/default/armeabi-v7a", - "revision": "18-default-armeabi-v7a" + "revision": "18-default-armeabi-v7a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "18", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1254,14 +3021,36 @@ "os": "all", "sha1": "7a4ced4d9b0ab48047825491b4072dc2eb9b610e", "size": 150097655, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-18_r04.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-18_r04.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-18-default-x86", "path": "system-images/android-18/default/x86", - "revision": "18-default-x86" + "revision": "18-default-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "18", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1274,11 +3063,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-18-google_apis-armeabi-v7a", "path": "system-images/android-18/google_apis/armeabi-v7a", - "revision": "18-google_apis-armeabi-v7a" + "revision": "18-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "18", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1289,11 +3103,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-18-google_apis-x86", "path": "system-images/android-18/google_apis/x86", - "revision": "18-google_apis-x86" + "revision": "18-google_apis-x86", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "18", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1305,14 +3144,36 @@ "os": "all", "sha1": "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa", "size": 159871567, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-19_r05.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-19-default-armeabi-v7a", "path": "system-images/android-19/default/armeabi-v7a", - "revision": "19-default-armeabi-v7a" + "revision": "19-default-armeabi-v7a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "19", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1320,14 +3181,36 @@ "os": "all", "sha1": "2ac82153aae97f7eae4c5a0761224fe04321d03d", "size": 185886274, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-19_r06.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-19-default-x86", "path": "system-images/android-19/default/x86", - "revision": "19-default-x86" + "revision": "19-default-x86", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "19", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1340,11 +3223,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r40.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-19-google_apis-armeabi-v7a", "path": "system-images/android-19/google_apis/armeabi-v7a", - "revision": "19-google_apis-armeabi-v7a" + "revision": "19-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "40" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "19", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1355,11 +3263,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r40.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-19-google_apis-x86", "path": "system-images/android-19/google_apis/x86", - "revision": "19-google_apis-x86" + "revision": "19-google_apis-x86", + "revision-details": { + "major:0": "40" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "19", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1378,7 +3311,21 @@ "license": "android-sdk-license", "name": "system-image-21-android-tv-armeabi-v7a", "path": "system-images/android-21/android-tv/armeabi-v7a", - "revision": "21-android-tv-armeabi-v7a" + "revision": "21-android-tv-armeabi-v7a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } }, "x86": { "archives": [ @@ -1393,7 +3340,21 @@ "license": "android-sdk-license", "name": "system-image-21-android-tv-x86", "path": "system-images/android-21/android-tv/x86", - "revision": "21-android-tv-x86" + "revision": "21-android-tv-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "default": { @@ -1403,14 +3364,29 @@ "os": "all", "sha1": "c4375f1b4b4cd21a8617660e25f621cedcbd8332", "size": 211426314, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-21_r04.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-21_r04.zip" } ], "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-21-default-arm64-v8a", "path": "system-images/android-21/default/arm64-v8a", - "revision": "21-default-arm64-v8a" + "revision": "21-default-arm64-v8a", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "armeabi-v7a": { "archives": [ @@ -1418,14 +3394,36 @@ "os": "all", "sha1": "8c606f81306564b65e41303d2603e4c42ded0d10", "size": 187163871, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-21_r04.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-21-default-armeabi-v7a", "path": "system-images/android-21/default/armeabi-v7a", - "revision": "21-default-armeabi-v7a" + "revision": "21-default-armeabi-v7a", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1433,14 +3431,36 @@ "os": "all", "sha1": "00f0eb0a1003efe3316347f762e20a85d8749cff", "size": 208212529, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-21_r05.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-21-default-x86", "path": "system-images/android-21/default/x86", - "revision": "21-default-x86" + "revision": "21-default-x86", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -1448,14 +3468,36 @@ "os": "all", "sha1": "9078a095825a69e5e215713f0866c83cef65a342", "size": 292623982, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-21_r05.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-21-default-x86_64", "path": "system-images/android-21/default/x86_64", - "revision": "21-default-x86_64" + "revision": "21-default-x86_64", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1472,7 +3514,25 @@ "license": "android-sdk-license", "name": "system-image-21-google_apis-arm64-v8a", "path": "system-images/android-21/google_apis/arm64-v8a", - "revision": "21-google_apis-arm64-v8a" + "revision": "21-google_apis-arm64-v8a", + "revision-details": { + "major:0": "32" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "armeabi-v7a": { "archives": [ @@ -1483,11 +3543,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r32.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-21-google_apis-armeabi-v7a", "path": "system-images/android-21/google_apis/armeabi-v7a", - "revision": "21-google_apis-armeabi-v7a" + "revision": "21-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "32" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1498,11 +3583,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r32.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-21-google_apis-x86", "path": "system-images/android-21/google_apis/x86", - "revision": "21-google_apis-x86" + "revision": "21-google_apis-x86", + "revision-details": { + "major:0": "32" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1513,11 +3623,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r32.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-21-google_apis-x86_64", "path": "system-images/android-21/google_apis/x86_64", - "revision": "21-google_apis-x86_64" + "revision": "21-google_apis-x86_64", + "revision-details": { + "major:0": "32" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "21", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1536,7 +3671,21 @@ "license": "android-sdk-license", "name": "system-image-22-android-tv-x86", "path": "system-images/android-22/android-tv/x86", - "revision": "22-android-tv-x86" + "revision": "22-android-tv-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "default": { @@ -1546,14 +3695,29 @@ "os": "all", "sha1": "703e27a9a4fb7a6e763cb7d713b89e5249a8fc99", "size": 219124634, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-22_r02.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-22_r02.zip" } ], "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-22-default-arm64-v8a", "path": "system-images/android-22/default/arm64-v8a", - "revision": "22-default-arm64-v8a" + "revision": "22-default-arm64-v8a", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "armeabi-v7a": { "archives": [ @@ -1561,14 +3725,36 @@ "os": "all", "sha1": "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1", "size": 194596267, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-22_r02.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-22-default-armeabi-v7a", "path": "system-images/android-22/default/armeabi-v7a", - "revision": "22-default-armeabi-v7a" + "revision": "22-default-armeabi-v7a", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1576,14 +3762,36 @@ "os": "all", "sha1": "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e", "size": 214268954, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-22_r06.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-22-default-x86", "path": "system-images/android-22/default/x86", - "revision": "22-default-x86" + "revision": "22-default-x86", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -1591,14 +3799,36 @@ "os": "all", "sha1": "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4", "size": 299976630, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-22_r06.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-22-default-x86_64", "path": "system-images/android-22/default/x86_64", - "revision": "22-default-x86_64" + "revision": "22-default-x86_64", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1615,7 +3845,25 @@ "license": "android-sdk-license", "name": "system-image-22-google_apis-arm64-v8a", "path": "system-images/android-22/google_apis/arm64-v8a", - "revision": "22-google_apis-arm64-v8a" + "revision": "22-google_apis-arm64-v8a", + "revision-details": { + "major:0": "26" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "armeabi-v7a": { "archives": [ @@ -1626,11 +3874,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r26.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-22-google_apis-armeabi-v7a", "path": "system-images/android-22/google_apis/armeabi-v7a", - "revision": "22-google_apis-armeabi-v7a" + "revision": "22-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "26" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1641,11 +3914,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r26.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-22-google_apis-x86", "path": "system-images/android-22/google_apis/x86", - "revision": "22-google_apis-x86" + "revision": "22-google_apis-x86", + "revision-details": { + "major:0": "26" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1656,11 +3954,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r26.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-22-google_apis-x86_64", "path": "system-images/android-22/google_apis/x86_64", - "revision": "22-google_apis-x86_64" + "revision": "22-google_apis-x86_64", + "revision-details": { + "major:0": "26" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "22", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1679,7 +4002,21 @@ "license": "android-sdk-license", "name": "system-image-23-android-tv-armeabi-v7a", "path": "system-images/android-23/android-tv/armeabi-v7a", - "revision": "23-android-tv-armeabi-v7a" + "revision": "23-android-tv-armeabi-v7a", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } }, "x86": { "archives": [ @@ -1690,11 +4027,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r21.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-23-android-tv-x86", "path": "system-images/android-23/android-tv/x86", - "revision": "23-android-tv-x86" + "revision": "23-android-tv-x86", + "revision-details": { + "major:0": "21" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "default": { @@ -1704,14 +4062,29 @@ "os": "all", "sha1": "ac18f3bd717e02804eee585e029f5dbc1a2616bf", "size": 253807785, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-23_r07.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-23_r07.zip" } ], "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-23-default-arm64-v8a", "path": "system-images/android-23/default/arm64-v8a", - "revision": "23-default-arm64-v8a" + "revision": "23-default-arm64-v8a", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "armeabi-v7a": { "archives": [ @@ -1719,14 +4092,36 @@ "os": "all", "sha1": "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d", "size": 238333358, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-23_r06.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-23-default-armeabi-v7a", "path": "system-images/android-23/default/armeabi-v7a", - "revision": "23-default-armeabi-v7a" + "revision": "23-default-armeabi-v7a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1734,14 +4129,36 @@ "os": "all", "sha1": "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb", "size": 260804863, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-23_r10.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-23-default-x86", "path": "system-images/android-23/default/x86", - "revision": "23-default-x86" + "revision": "23-default-x86", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -1749,14 +4166,36 @@ "os": "all", "sha1": "7cbc291483ca07dc67b71268c5f08a5755f50f51", "size": 365009313, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-23_r10.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-23-default-x86_64", "path": "system-images/android-23/default/x86_64", - "revision": "23-default-x86_64" + "revision": "23-default-x86_64", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1773,7 +4212,25 @@ "license": "android-sdk-license", "name": "system-image-23-google_apis-arm64-v8a", "path": "system-images/android-23/google_apis/arm64-v8a", - "revision": "23-google_apis-arm64-v8a" + "revision": "23-google_apis-arm64-v8a", + "revision-details": { + "major:0": "33" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "armeabi-v7a": { "archives": [ @@ -1784,11 +4241,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r33.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-23-google_apis-armeabi-v7a", "path": "system-images/android-23/google_apis/armeabi-v7a", - "revision": "23-google_apis-armeabi-v7a" + "revision": "23-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "33" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1799,11 +4281,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r33.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-23-google_apis-x86", "path": "system-images/android-23/google_apis/x86", - "revision": "23-google_apis-x86" + "revision": "23-google_apis-x86", + "revision-details": { + "major:0": "33" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1814,11 +4321,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r33.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-23-google_apis-x86_64", "path": "system-images/android-23/google_apis/x86_64", - "revision": "23-google_apis-x86_64" + "revision": "23-google_apis-x86_64", + "revision-details": { + "major:0": "33" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "23", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1833,11 +4365,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r22.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-24-android-tv-x86", "path": "system-images/android-24/android-tv/x86", - "revision": "24-android-tv-x86" + "revision": "24-android-tv-x86", + "revision-details": { + "major:0": "22" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "default": { @@ -1847,14 +4400,29 @@ "os": "all", "sha1": "e88ebdf4533efa0370603ee4ab0e7834e0cc364f", "size": 305854153, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-24_r09.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r09.zip" } ], "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-24-default-arm64-v8a", "path": "system-images/android-24/default/arm64-v8a", - "revision": "24-default-arm64-v8a" + "revision": "24-default-arm64-v8a", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "armeabi-v7a": { "archives": [ @@ -1862,14 +4430,36 @@ "os": "all", "sha1": "e22c47afd06398b35f2705ca2e7fa85323351568", "size": 782997866, - "url": "https://dl.google.com/android/repository/sys-img/default/armeabi-v7a-24_r07.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-24-default-armeabi-v7a", "path": "system-images/android-24/default/armeabi-v7a", - "revision": "24-default-armeabi-v7a" + "revision": "24-default-armeabi-v7a", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -1877,14 +4467,36 @@ "os": "all", "sha1": "c1cae7634b0216c0b5990f2c144eb8ca948e3511", "size": 313489224, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-24_r08.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-24-default-x86", "path": "system-images/android-24/default/x86", - "revision": "24-default-x86" + "revision": "24-default-x86", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -1892,14 +4504,36 @@ "os": "all", "sha1": "f6559e1949a5879f31a9662f4f0e50ad60181684", "size": 419261998, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-24_r08.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-24-default-x86_64", "path": "system-images/android-24/default/x86_64", - "revision": "24-default-x86_64" + "revision": "24-default-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -1912,11 +4546,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r29.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-24-google_apis-arm64-v8a", "path": "system-images/android-24/google_apis/arm64-v8a", - "revision": "24-google_apis-arm64-v8a" + "revision": "24-google_apis-arm64-v8a", + "revision-details": { + "major:0": "27" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -1927,11 +4586,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r27.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-24-google_apis-x86", "path": "system-images/android-24/google_apis/x86", - "revision": "24-google_apis-x86" + "revision": "24-google_apis-x86", + "revision-details": { + "major:0": "27" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -1942,11 +4626,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r27.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-24-google_apis-x86_64", "path": "system-images/android-24/google_apis/x86_64", - "revision": "24-google_apis-x86_64" + "revision": "24-google_apis-x86_64", + "revision-details": { + "major:0": "27" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -1959,11 +4668,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-24-google_apis_playstore-x86", "path": "system-images/android-24/google_apis_playstore/x86", - "revision": "24-google_apis_playstore-x86" + "revision": "24-google_apis_playstore-x86", + "revision-details": { + "major:0": "19" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "24", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -1978,11 +4712,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r16.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-25-android-tv-x86", "path": "system-images/android-25/android-tv/x86", - "revision": "25-android-tv-x86" + "revision": "25-android-tv-x86", + "revision-details": { + "major:0": "16" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "android-wear": { @@ -1995,11 +4750,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android Wear ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-25-android-wear-armeabi-v7a", "path": "system-images/android-25/android-wear/armeabi-v7a", - "revision": "25-android-wear-armeabi-v7a" + "revision": "25-android-wear-armeabi-v7a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "armeabi-v7a", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android Wear", + "id:0": "android-wear" + } + } }, "x86": { "archives": [ @@ -2010,11 +4786,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android Wear Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-25-android-wear-x86", "path": "system-images/android-25/android-wear/x86", - "revision": "25-android-wear-x86" + "revision": "25-android-wear-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android Wear", + "id:0": "android-wear" + } + } } }, "default": { @@ -2024,14 +4821,29 @@ "os": "all", "sha1": "b39d359623323a1b4906c071dec396040016ea73", "size": 308416103, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-25_r02.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-25_r02.zip" } ], "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-25-default-arm64-v8a", "path": "system-images/android-25/default/arm64-v8a", - "revision": "25-default-arm64-v8a" + "revision": "25-default-arm64-v8a", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -2039,14 +4851,36 @@ "os": "all", "sha1": "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f", "size": 316695942, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-25_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-25-default-x86", "path": "system-images/android-25/default/x86", - "revision": "25-default-x86" + "revision": "25-default-x86", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -2054,14 +4888,36 @@ "os": "all", "sha1": "7093d7b39216020226ff430a3b7b81c94d31ad37", "size": 422702097, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-25_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-25-default-x86_64", "path": "system-images/android-25/default/x86_64", - "revision": "25-default-x86_64" + "revision": "25-default-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": { + }, + "id:0": "default" + } + } } }, "google_apis": { @@ -2078,7 +4934,25 @@ "license": "android-sdk-license", "name": "system-image-25-google_apis-arm64-v8a", "path": "system-images/android-25/google_apis/arm64-v8a", - "revision": "25-google_apis-arm64-v8a" + "revision": "25-google_apis-arm64-v8a", + "revision-details": { + "major:0": "20" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "armeabi-v7a": { "archives": [ @@ -2089,11 +4963,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r18.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs ARM EABI v7a System Image", "license": "android-sdk-license", "name": "system-image-25-google_apis-armeabi-v7a", "path": "system-images/android-25/google_apis/armeabi-v7a", - "revision": "25-google_apis-armeabi-v7a" + "revision": "25-google_apis-armeabi-v7a", + "revision-details": { + "major:0": "18" + }, + "type-details": { + "abi:3": "armeabi-v7a", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2104,11 +5003,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r18.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-25-google_apis-x86", "path": "system-images/android-25/google_apis/x86", - "revision": "25-google_apis-x86" + "revision": "25-google_apis-x86", + "revision-details": { + "major:0": "18" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2119,11 +5043,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r18.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-25-google_apis-x86_64", "path": "system-images/android-25/google_apis/x86_64", - "revision": "25-google_apis-x86_64" + "revision": "25-google_apis-x86_64", + "revision-details": { + "major:0": "18" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -2136,11 +5085,36 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-25-google_apis_playstore-x86", "path": "system-images/android-25/google_apis_playstore/x86", - "revision": "25-google_apis_playstore-x86" + "revision": "25-google_apis_playstore-x86", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "25", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -2155,11 +5129,42 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r14.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-26-android-tv-x86", "path": "system-images/android-26/android-tv/x86", - "revision": "26-android-tv-x86" + "revision": "26-android-tv-x86", + "revision-details": { + "major:0": "14" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "android-wear": { @@ -2172,11 +5177,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android Wear Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-26-android-wear-x86", "path": "system-images/android-26/android-wear/x86", - "revision": "26-android-wear-x86" + "revision": "26-android-wear-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android Wear", + "id:0": "android-wear" + } + } } }, "default": { @@ -2186,14 +5212,40 @@ "os": "all", "sha1": "c3199baf49790fc65f90f7ce734435d5778f6a30", "size": 328910124, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-26_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-26_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-26-default-arm64-v8a", "path": "system-images/android-26/default/arm64-v8a", - "revision": "26-default-arm64-v8a" + "revision": "26-default-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -2201,14 +5253,35 @@ "os": "all", "sha1": "e613d6e0da668e30daf547f3c6627a6352846f90", "size": 350195807, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-26_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-26-default-x86", "path": "system-images/android-26/default/x86", - "revision": "26-default-x86" + "revision": "26-default-x86", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -2216,14 +5289,35 @@ "os": "all", "sha1": "432f149c048bffce7f9de526ec65b336daf7a0a3", "size": 474178332, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-26_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-26-default-x86_64", "path": "system-images/android-26/default/x86_64", - "revision": "26-default-x86_64" + "revision": "26-default-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } } }, "google_apis": { @@ -2236,11 +5330,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-26_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-26-google_apis-arm64-v8a", "path": "system-images/android-26/google_apis/arm64-v8a", - "revision": "26-google_apis-arm64-v8a" + "revision": "26-google_apis-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2251,11 +5375,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r16.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-26-google_apis-x86", "path": "system-images/android-26/google_apis/x86", - "revision": "26-google_apis-x86" + "revision": "26-google_apis-x86", + "revision-details": { + "major:0": "16" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2266,11 +5425,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r16.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-26-google_apis-x86_64", "path": "system-images/android-26/google_apis/x86_64", - "revision": "26-google_apis-x86_64" + "revision": "26-google_apis-x86_64", + "revision-details": { + "major:0": "16" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -2283,11 +5477,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-26-google_apis_playstore-x86", "path": "system-images/android-26/google_apis_playstore/x86", - "revision": "26-google_apis_playstore-x86" + "revision": "26-google_apis_playstore-x86", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "26", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -2302,11 +5531,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-27-android-tv-x86", "path": "system-images/android-27/android-tv/x86", - "revision": "27-android-tv-x86" + "revision": "27-android-tv-x86", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "default": { @@ -2316,14 +5566,40 @@ "os": "all", "sha1": "cb01199edae33ce375c6d8e08aea08911ff0d583", "size": 331796092, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-27_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-27_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-27-default-arm64-v8a", "path": "system-images/android-27/default/arm64-v8a", - "revision": "27-default-arm64-v8a" + "revision": "27-default-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -2331,14 +5607,35 @@ "os": "all", "sha1": "4ec990fac7b62958decd12e18a4cd389dfe7c582", "size": 360984187, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-27_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-27-default-x86", "path": "system-images/android-27/default/x86", - "revision": "27-default-x86" + "revision": "27-default-x86", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -2346,14 +5643,35 @@ "os": "all", "sha1": "2878261011a59ca3de29dc5b457a495fdb268d60", "size": 491675204, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-27_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-27-default-x86_64", "path": "system-images/android-27/default/x86_64", - "revision": "27-default-x86_64" + "revision": "27-default-x86_64", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } } }, "google_apis": { @@ -2366,11 +5684,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-27_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-27-google_apis-arm64-v8a", "path": "system-images/android-27/google_apis/arm64-v8a", - "revision": "27-google_apis-arm64-v8a" + "revision": "27-google_apis-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2381,11 +5729,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r11.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "27", + "micro:2": "7", + "minor:1": "1" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-27-google_apis-x86", "path": "system-images/android-27/google_apis/x86", - "revision": "27-google_apis-x86" + "revision": "27-google_apis-x86", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -2398,11 +5781,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "26", + "micro:2": "3", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-27-google_apis_playstore-x86", "path": "system-images/android-27/google_apis_playstore/x86", - "revision": "27-google_apis_playstore-x86" + "revision": "27-google_apis_playstore-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "27", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -2417,11 +5835,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r10.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-28-android-tv-x86", "path": "system-images/android-28/android-tv/x86", - "revision": "28-android-tv-x86" + "revision": "28-android-tv-x86", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "android-wear": { @@ -2434,11 +5873,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-28_r09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Wear OS Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-28-android-wear-x86", "path": "system-images/android-28/android-wear/x86", - "revision": "28-android-wear-x86" + "revision": "28-android-wear-x86", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS", + "id:0": "android-wear" + } + } } }, "default": { @@ -2448,14 +5908,40 @@ "os": "all", "sha1": "4de0491612ca12097be7deb76af835ebabadefca", "size": 425671679, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-28_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-28_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-28-default-arm64-v8a", "path": "system-images/android-28/default/arm64-v8a", - "revision": "28-default-arm64-v8a" + "revision": "28-default-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -2463,14 +5949,28 @@ "os": "all", "sha1": "ce03c42d80c0fc6dc47f6455dbee7aa275d02780", "size": 437320152, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-28_r04.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip" } ], "displayName": "Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-28-default-x86", "path": "system-images/android-28/default/x86", - "revision": "28-default-x86" + "revision": "28-default-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -2478,14 +5978,28 @@ "os": "all", "sha1": "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0", "size": 564792723, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-28_r04.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip" } ], "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", "name": "system-image-28-default-x86_64", "path": "system-images/android-28/default/x86_64", - "revision": "28-default-x86_64" + "revision": "28-default-x86_64", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } } }, "google_apis": { @@ -2498,11 +6012,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-28_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis-arm64-v8a", "path": "system-images/android-28/google_apis/arm64-v8a", - "revision": "28-google_apis-arm64-v8a" + "revision": "28-google_apis-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2513,11 +6057,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r12.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "12", + "minor:1": "1" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis-x86", "path": "system-images/android-28/google_apis/x86", - "revision": "28-google_apis-x86" + "revision": "28-google_apis-x86", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2528,11 +6107,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r11.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "12", + "minor:1": "1" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-28-google_apis-x86_64", "path": "system-images/android-28/google_apis/x86_64", - "revision": "28-google_apis-x86_64" + "revision": "28-google_apis-x86_64", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -2545,11 +6159,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-28_r01.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "1", + "minor:1": "1" + } + } + }, "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis_playstore-arm64-v8a", "path": "system-images/android-28/google_apis_playstore/arm64-v8a", - "revision": "28-google_apis_playstore-arm64-v8a" + "revision": "28-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google ARM64-V8a Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2560,11 +6204,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "27", + "micro:2": "7", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86", "path": "system-images/android-28/google_apis_playstore/x86", - "revision": "28-google_apis_playstore-x86" + "revision": "28-google_apis_playstore-x86", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2575,11 +6254,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r08.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "27", + "micro:2": "7", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86_64", "path": "system-images/android-28/google_apis_playstore/x86_64", - "revision": "28-google_apis_playstore-x86_64" + "revision": "28-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "28", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -2594,11 +6308,42 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-29_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-29-android-tv-x86", "path": "system-images/android-29/android-tv/x86", - "revision": "29-android-tv-x86" + "revision": "29-android-tv-x86", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "default": { @@ -2608,14 +6353,28 @@ "os": "all", "sha1": "fa0d67d7430fcc84b2fe2508ea81e92ac644e264", "size": 498049256, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-29_r08.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-29_r08.zip" } ], "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-29-default-arm64-v8a", "path": "system-images/android-29/default/arm64-v8a", - "revision": "29-default-arm64-v8a" + "revision": "29-default-arm64-v8a", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86": { "archives": [ @@ -2623,26 +6382,52 @@ "os": "windows", "sha1": "cc4fa13e49cb2e93770d4f2e90ea1dd2a81e315b", "size": 516543600, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-29_r08-windows.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-29_r08-windows.zip" }, { "os": "macosx", "sha1": "cc4fa13e49cb2e93770d4f2e90ea1dd2a81e315b", "size": 516543600, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-29_r08-darwin.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-29_r08-darwin.zip" }, { "os": "linux", "sha1": "cc4fa13e49cb2e93770d4f2e90ea1dd2a81e315b", "size": 516543600, - "url": "https://dl.google.com/android/repository/sys-img/default/x86-29_r08-linux.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86-29_r08-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "9", + "minor:1": "1" + } + } + }, "displayName": "Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-29-default-x86", "path": "system-images/android-29/default/x86", - "revision": "29-default-x86" + "revision": "29-default-x86", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -2650,26 +6435,52 @@ "os": "windows", "sha1": "e4b798d6fcddff90d528d74ef22ce3dd4a2ca798", "size": 689676765, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-29_r08-windows.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-29_r08-windows.zip" }, { "os": "macosx", "sha1": "e4b798d6fcddff90d528d74ef22ce3dd4a2ca798", "size": 689676765, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-29_r08-darwin.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-29_r08-darwin.zip" }, { "os": "linux", "sha1": "e4b798d6fcddff90d528d74ef22ce3dd4a2ca798", "size": 689676765, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-29_r08-linux.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-29_r08-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "9", + "minor:1": "1" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-29-default-x86_64", "path": "system-images/android-29/default/x86_64", - "revision": "29-default-x86_64" + "revision": "29-default-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } } }, "google_apis": { @@ -2682,11 +6493,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-29_r12.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "2", + "minor:1": "8" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis-arm64-v8a", "path": "system-images/android-29/google_apis/arm64-v8a", - "revision": "29-google_apis-arm64-v8a" + "revision": "29-google_apis-arm64-v8a", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2697,11 +6538,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-29_r12.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "2", + "minor:1": "8" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-29-google_apis-x86", "path": "system-images/android-29/google_apis/x86", - "revision": "29-google_apis-x86" + "revision": "29-google_apis-x86", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2712,11 +6583,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-29_r12.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "2", + "minor:1": "8" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-29-google_apis-x86_64", "path": "system-images/android-29/google_apis/x86_64", - "revision": "29-google_apis-x86_64" + "revision": "29-google_apis-x86_64", + "revision-details": { + "major:0": "12" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -2735,11 +6636,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-29_r09-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "2", + "minor:1": "8" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis_playstore-arm64-v8a", "path": "system-images/android-29/google_apis_playstore/arm64-v8a", - "revision": "29-google_apis_playstore-arm64-v8a" + "revision": "29-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2762,11 +6693,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-29_r08-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "9", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86", "path": "system-images/android-29/google_apis_playstore/x86", - "revision": "29-google_apis_playstore-x86" + "revision": "29-google_apis_playstore-x86", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2789,11 +6755,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-29_r08-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "9", + "minor:1": "1" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86_64", "path": "system-images/android-29/google_apis_playstore/x86_64", - "revision": "29-google_apis_playstore-x86_64" + "revision": "29-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "29", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -2808,11 +6809,42 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-30_r04.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-preview-license", "name": "system-image-30-android-tv-x86", "path": "system-images/android-30/android-tv/x86", - "revision": "30-android-tv-x86" + "revision": "30-android-tv-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "android-wear": { @@ -2825,11 +6857,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-wear/arm64-v8a-30_r11.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Wear OS 3 ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-30-android-wear-arm64-v8a", "path": "system-images/android-30/android-wear/arm64-v8a", - "revision": "30-android-wear-arm64-v8a" + "revision": "30-android-wear-arm64-v8a", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS 3", + "id:0": "android-wear" + } + } }, "x86": { "archives": [ @@ -2840,11 +6893,32 @@ "url": "https://dl.google.com/android/repository/sys-img/android-wear/x86-30_r11.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Wear OS 3 Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-30-android-wear-x86", "path": "system-images/android-30/android-wear/x86", - "revision": "30-android-wear-x86" + "revision": "30-android-wear-x86", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Wear OS 3", + "id:0": "android-wear" + } + } } }, "default": { @@ -2854,14 +6928,28 @@ "os": "all", "sha1": "2462af138023fbbd1114421818890884d4ebceab", "size": 548363604, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-30_r01.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-30_r01.zip" } ], "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-30-default-arm64-v8a", "path": "system-images/android-30/default/arm64-v8a", - "revision": "30-default-arm64-v8a" + "revision": "30-default-arm64-v8a", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -2869,14 +6957,40 @@ "os": "all", "sha1": "e08119b65d2c188ef69f127028eb4c8cc632cd8f", "size": 676379913, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-30_r10.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-30_r10.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "29", + "micro:2": "11", + "minor:1": "1" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-30-default-x86_64", "path": "system-images/android-30/default/x86_64", - "revision": "30-default-x86_64" + "revision": "30-default-x86_64", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } } }, "google_apis": { @@ -2889,11 +7003,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-30_r11.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "0", + "minor:1": "8" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis-arm64-v8a", "path": "system-images/android-30/google_apis/arm64-v8a", - "revision": "30-google_apis-arm64-v8a" + "revision": "30-google_apis-arm64-v8a", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2904,11 +7048,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86-30_r10.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "4", + "minor:1": "0" + } + } + }, "displayName": "Google APIs Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-30-google_apis-x86", "path": "system-images/android-30/google_apis/x86", - "revision": "30-google_apis-x86" + "revision": "30-google_apis-x86", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2919,11 +7098,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-30_r11.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "0", + "minor:1": "8" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-30-google_apis-x86_64", "path": "system-images/android-30/google_apis/x86_64", - "revision": "30-google_apis-x86_64" + "revision": "30-google_apis-x86_64", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -2942,11 +7156,41 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-30_r10-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "0", + "minor:1": "8" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-arm64-v8a", "path": "system-images/android-30/google_apis_playstore/arm64-v8a", - "revision": "30-google_apis_playstore-arm64-v8a" + "revision": "30-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86": { "archives": [ @@ -2969,11 +7213,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-30_r09-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "4", + "minor:1": "0" + } + } + }, "displayName": "Google Play Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-30-google_apis_playstore-x86", "path": "system-images/android-30/google_apis_playstore/x86", - "revision": "30-google_apis_playstore-x86" + "revision": "30-google_apis_playstore-x86", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "x86", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -2996,11 +7275,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-30_r10-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "4", + "minor:1": "0" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-x86_64", "path": "system-images/android-30/google_apis_playstore/x86_64", - "revision": "30-google_apis_playstore-x86_64" + "revision": "30-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "10" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "30", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -3015,11 +7329,42 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-31_r04.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, "displayName": "Android TV ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-31-android-tv-arm64-v8a", "path": "system-images/android-31/android-tv/arm64-v8a", - "revision": "31-android-tv-arm64-v8a" + "revision": "31-android-tv-arm64-v8a", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } }, "x86": { "archives": [ @@ -3030,11 +7375,42 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-31_r04.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-31-android-tv-x86", "path": "system-images/android-31/android-tv/x86", - "revision": "31-android-tv-x86" + "revision": "31-android-tv-x86", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "default": { @@ -3044,14 +7420,40 @@ "os": "all", "sha1": "1052df2d0afc8fe57138db19d5ebd82d10c607da", "size": 635481190, - "url": "https://dl.google.com/android/repository/sys-img/default/arm64-v8a-31_r03.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-31_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, "displayName": "ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-31-default-arm64-v8a", "path": "system-images/android-31/default/arm64-v8a", - "revision": "31-default-arm64-v8a" + "revision": "31-default-arm64-v8a", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } }, "x86_64": { "archives": [ @@ -3059,14 +7461,40 @@ "os": "all", "sha1": "1200d6983af477fd6439f11cc5cabf9866bc4a16", "size": 657244568, - "url": "https://dl.google.com/android/repository/sys-img/default/x86_64-31_r03.zip" + "url": "https://dl.google.com/android/repository/sys-img/android/x86_64-31_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, "displayName": "Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-31-default-x86_64", "path": "system-images/android-31/default/x86_64", - "revision": "31-default-x86_64" + "revision": "31-default-x86_64", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "abi:2": "x86_64", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Default Android System Image", + "id:0": "default" + } + } } }, "google_apis": { @@ -3079,11 +7507,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-31_r10.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis-arm64-v8a", "path": "system-images/android-31/google_apis/arm64-v8a", - "revision": "31-google_apis-arm64-v8a" + "revision": "31-google_apis-arm64-v8a", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -3094,11 +7557,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-31_r11.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", "name": "system-image-31-google_apis-x86_64", "path": "system-images/android-31/google_apis/x86_64", - "revision": "31-google_apis-x86_64" + "revision": "31-google_apis-x86_64", + "revision-details": { + "major:0": "11" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -3117,11 +7615,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-31_r09-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "31", + "micro:2": "7", + "minor:1": "2" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-arm64-v8a", "path": "system-images/android-31/google_apis_playstore/arm64-v8a", - "revision": "31-google_apis_playstore-arm64-v8a" + "revision": "31-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -3132,11 +7665,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-31_r09.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-x86_64", "path": "system-images/android-31/google_apis_playstore/x86_64", - "revision": "31-google_apis_playstore-x86_64" + "revision": "31-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "9" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "31", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -3151,11 +7719,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-32_r03.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", "name": "system-image-32-google_apis-x86_64", "path": "system-images/android-32/google_apis/x86_64", - "revision": "32-google_apis-x86_64" + "revision": "32-google_apis-x86_64", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "32", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -3174,11 +7777,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-32_r03-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis_playstore-arm64-v8a", "path": "system-images/android-32/google_apis_playstore/arm64-v8a", - "revision": "32-google_apis_playstore-arm64-v8a" + "revision": "32-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "32", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -3201,11 +7839,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-32_r03-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", "name": "system-image-32-google_apis_playstore-x86_64", "path": "system-images/android-32/google_apis_playstore/x86_64", - "revision": "32-google_apis_playstore-x86_64" + "revision": "32-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "32", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -3220,11 +7893,42 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-33_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, "displayName": "Android TV ARM 64 v8a System Image", "license": "android-sdk-license", "name": "system-image-33-android-tv-arm64-v8a", "path": "system-images/android-33/android-tv/arm64-v8a", - "revision": "33-android-tv-arm64-v8a" + "revision": "33-android-tv-arm64-v8a", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "arm64-v8a", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } }, "x86": { "archives": [ @@ -3235,11 +7939,42 @@ "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-33_r05.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "28", + "micro:2": "6", + "minor:1": "1" + } + } + }, "displayName": "Android TV Intel x86 Atom System Image", "license": "android-sdk-license", "name": "system-image-33-android-tv-x86", "path": "system-images/android-33/android-tv/x86", - "revision": "33-android-tv-x86" + "revision": "33-android-tv-x86", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "abi:2": "x86", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Android TV", + "id:0": "android-tv" + } + } } }, "google_apis": { @@ -3252,11 +7987,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-33_r08.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google APIs ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis-arm64-v8a", "path": "system-images/android-33/google_apis/arm64-v8a", - "revision": "33-google_apis-arm64-v8a" + "revision": "33-google_apis-arm64-v8a", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -3267,11 +8037,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-33_r08.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google APIs Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-33-google_apis-x86_64", "path": "system-images/android-33/google_apis/x86_64", - "revision": "33-google_apis-x86_64" + "revision": "33-google_apis-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } }, "google_apis_playstore": { @@ -3290,11 +8095,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r07-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis_playstore-arm64-v8a", "path": "system-images/android-33/google_apis_playstore/arm64-v8a", - "revision": "33-google_apis_playstore-arm64-v8a" + "revision": "33-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "arm64-v8a", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -3305,11 +8145,46 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-33_r07.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-license", "name": "system-image-33-google_apis_playstore-x86_64", "path": "system-images/android-33/google_apis_playstore/x86_64", - "revision": "33-google_apis_playstore-x86_64" + "revision": "33-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "7" + }, + "type-details": { + "abi:3": "x86_64", + "api-level:0": "33", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:1": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:2": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } }, @@ -3330,11 +8205,47 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-TiramisuPrivacySandbox_r08-linux.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/arm64-v8a", - "revision": "TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a" + "revision": "TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:4": "arm64-v8a", + "api-level:0": "33", + "codename:1": "TiramisuPrivacySandbox", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" + } + } }, "x86_64": { "archives": [ @@ -3345,11 +8256,47 @@ "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-TiramisuPrivacySandbox_r08.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "30", + "micro:2": "3", + "minor:1": "7" + } + } + }, "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-x86_64", "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64", - "revision": "TiramisuPrivacySandbox-google_apis_playstore-x86_64" + "revision": "TiramisuPrivacySandbox-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "abi:4": "x86_64", + "api-level:0": "33", + "codename:1": "TiramisuPrivacySandbox", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "tag:2": { + "display:1": "Google Play", + "id:0": "google_apis_playstore" + }, + "vendor:3": { + "display:1": "Google Inc.", + "id:0": "google" + } + } } } } @@ -3403,11 +8350,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r17-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 17", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/17.0.0", - "revision": "17.0.0" + "revision": "17.0.0", + "revision-details": { + "major:0": "17", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.0.1": { "archives": [ @@ -3430,11 +8395,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r18.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 18.0.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/18.0.1", - "revision": "18.0.1" + "revision": "18.0.1", + "revision-details": { + "major:0": "18", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.1.0": { "archives": [ @@ -3457,11 +8440,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r18.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 18.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/18.1.0", - "revision": "18.1.0" + "revision": "18.1.0", + "revision-details": { + "major:0": "18", + "micro:2": "0", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.1.1": { "archives": [ @@ -3484,11 +8485,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r18.1.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 18.1.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/18.1.1", - "revision": "18.1.1" + "revision": "18.1.1", + "revision-details": { + "major:0": "18", + "micro:2": "1", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.0": { "archives": [ @@ -3511,11 +8530,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r19-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/19.0.0", - "revision": "19.0.0" + "revision": "19.0.0", + "revision-details": { + "major:0": "19", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.1": { "archives": [ @@ -3538,11 +8575,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r19.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19.0.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/19.0.1", - "revision": "19.0.1" + "revision": "19.0.1", + "revision-details": { + "major:0": "19", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.2": { "archives": [ @@ -3565,11 +8620,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r19.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19.0.2", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/19.0.2", - "revision": "19.0.2" + "revision": "19.0.2", + "revision-details": { + "major:0": "19", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.3": { "archives": [ @@ -3592,11 +8665,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r19.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19.0.3", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/19.0.3", - "revision": "19.0.3" + "revision": "19.0.3", + "revision-details": { + "major:0": "19", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.1.0": { "archives": [ @@ -3619,11 +8710,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r19.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 19.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/19.1.0", - "revision": "19.1.0" + "revision": "19.1.0", + "revision-details": { + "major:0": "19", + "micro:2": "0", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.0": { "archives": [ @@ -3646,11 +8754,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r20-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 20", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/20.0.0", - "revision": "20.0.0" + "revision": "20.0.0", + "revision-details": { + "major:0": "20", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.0": { "archives": [ @@ -3673,11 +8798,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.0.0", - "revision": "21.0.0" + "revision": "21.0.0", + "revision-details": { + "major:0": "21", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.1": { "archives": [ @@ -3700,11 +8843,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.0.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.0.1", - "revision": "21.0.1" + "revision": "21.0.1", + "revision-details": { + "major:0": "21", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.2": { "archives": [ @@ -3727,11 +8888,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.0.2", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.0.2", - "revision": "21.0.2" + "revision": "21.0.2", + "revision-details": { + "major:0": "21", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.0": { "archives": [ @@ -3754,11 +8933,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.1.0", - "revision": "21.1.0" + "revision": "21.1.0", + "revision-details": { + "major:0": "21", + "micro:2": "0", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.1": { "archives": [ @@ -3781,11 +8978,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.1.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.1.1", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/21.1.1", - "revision": "21.1.1" + "revision": "21.1.1", + "revision-details": { + "major:0": "21", + "micro:2": "1", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.2": { "archives": [ @@ -3808,11 +9023,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r21.1.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 21.1.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/21.1.2", - "revision": "21.1.2" + "revision": "21.1.2", + "revision-details": { + "major:0": "21", + "micro:2": "2", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.0": { "archives": [ @@ -3835,11 +9067,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r22-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 22", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/22.0.0", - "revision": "22.0.0" + "revision": "22.0.0", + "revision-details": { + "major:0": "22", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.1": { "archives": [ @@ -3862,11 +9112,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r22.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 22.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/22.0.1", - "revision": "22.0.1" + "revision": "22.0.1", + "revision-details": { + "major:0": "22", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.0": { "archives": [ @@ -3889,11 +9156,29 @@ "url": "https://dl.google.com/android/repository/build-tools_r23-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 23", "license": "android-sdk-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/23.0.0", - "revision": "23.0.0" + "revision": "23.0.0", + "revision-details": { + "major:0": "23", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.1": { "archives": [ @@ -3916,11 +9201,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r23.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 23.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.1", - "revision": "23.0.1" + "revision": "23.0.1", + "revision-details": { + "major:0": "23", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.2": { "archives": [ @@ -3943,11 +9245,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r23.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 23.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.2", - "revision": "23.0.2" + "revision": "23.0.2", + "revision-details": { + "major:0": "23", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.3": { "archives": [ @@ -3970,11 +9289,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r23.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 23.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.3", - "revision": "23.0.3" + "revision": "23.0.3", + "revision-details": { + "major:0": "23", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.0": { "archives": [ @@ -3997,11 +9333,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r24-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 24", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.0", - "revision": "24.0.0" + "revision": "24.0.0", + "revision-details": { + "major:0": "24", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.1": { "archives": [ @@ -4024,11 +9377,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r24.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 24.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.1", - "revision": "24.0.1" + "revision": "24.0.1", + "revision-details": { + "major:0": "24", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.2": { "archives": [ @@ -4051,11 +9421,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r24.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 24.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.2", - "revision": "24.0.2" + "revision": "24.0.2", + "revision-details": { + "major:0": "24", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.3": { "archives": [ @@ -4078,11 +9465,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r24.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 24.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.3", - "revision": "24.0.3" + "revision": "24.0.3", + "revision-details": { + "major:0": "24", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.0": { "archives": [ @@ -4105,11 +9509,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r25-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 25", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.0", - "revision": "25.0.0" + "revision": "25.0.0", + "revision-details": { + "major:0": "25", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.1": { "archives": [ @@ -4132,11 +9553,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r25.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 25.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.1", - "revision": "25.0.1" + "revision": "25.0.1", + "revision-details": { + "major:0": "25", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.2": { "archives": [ @@ -4159,11 +9597,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r25.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 25.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.2", - "revision": "25.0.2" + "revision": "25.0.2", + "revision-details": { + "major:0": "25", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.3": { "archives": [ @@ -4186,11 +9641,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r25.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 25.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.3", - "revision": "25.0.3" + "revision": "25.0.3", + "revision-details": { + "major:0": "25", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "26.0.0": { "archives": [ @@ -4213,11 +9685,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r26-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 26", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.0", - "revision": "26.0.0" + "revision": "26.0.0", + "revision-details": { + "major:0": "26", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "26.0.1": { "archives": [ @@ -4240,11 +9729,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r26.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 26.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.1", - "revision": "26.0.1" + "revision": "26.0.1", + "revision-details": { + "major:0": "26", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "26.0.2": { "archives": [ @@ -4267,11 +9773,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r26.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 26.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.2", - "revision": "26.0.2" + "revision": "26.0.2", + "revision-details": { + "major:0": "26", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "26.0.3": { "archives": [ @@ -4294,11 +9817,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r26.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 26.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.3", - "revision": "26.0.3" + "revision": "26.0.3", + "revision-details": { + "major:0": "26", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "27.0.0": { "archives": [ @@ -4321,11 +9861,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r27-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 27", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.0", - "revision": "27.0.0" + "revision": "27.0.0", + "revision-details": { + "major:0": "27", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "27.0.1": { "archives": [ @@ -4348,11 +9905,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r27.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 27.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.1", - "revision": "27.0.1" + "revision": "27.0.1", + "revision-details": { + "major:0": "27", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "27.0.2": { "archives": [ @@ -4375,11 +9949,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r27.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 27.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.2", - "revision": "27.0.2" + "revision": "27.0.2", + "revision-details": { + "major:0": "27", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "27.0.3": { "archives": [ @@ -4402,11 +9993,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r27.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 27.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.3", - "revision": "27.0.3" + "revision": "27.0.3", + "revision-details": { + "major:0": "27", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.0": { "archives": [ @@ -4429,11 +10037,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r28-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.0", - "revision": "28.0.0" + "revision": "28.0.0", + "revision-details": { + "major:0": "28", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.0-rc1": { "archives": [ @@ -4456,11 +10081,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r28-rc1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28-rc1", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/28.0.0-rc1", - "revision": "28.0.0-rc1" + "revision": "28.0.0-rc1", + "revision-details": { + "major:0": "28", + "micro:2": "0", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.0-rc2": { "archives": [ @@ -4483,11 +10127,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r28-rc2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28-rc2", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/28.0.0-rc2", - "revision": "28.0.0-rc2" + "revision": "28.0.0-rc2", + "revision-details": { + "major:0": "28", + "micro:2": "0", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.1": { "archives": [ @@ -4510,11 +10173,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r28.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.1", - "revision": "28.0.1" + "revision": "28.0.1", + "revision-details": { + "major:0": "28", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.2": { "archives": [ @@ -4537,11 +10217,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r28.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.2", - "revision": "28.0.2" + "revision": "28.0.2", + "revision-details": { + "major:0": "28", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "28.0.3": { "archives": [ @@ -4564,11 +10261,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r28.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 28.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.3", - "revision": "28.0.3" + "revision": "28.0.3", + "revision-details": { + "major:0": "28", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.0": { "archives": [ @@ -4591,11 +10305,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r29-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.0", - "revision": "29.0.0" + "revision": "29.0.0", + "revision-details": { + "major:0": "29", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.0-rc1": { "archives": [ @@ -4618,11 +10349,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r29-rc1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29-rc1", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/29.0.0-rc1", - "revision": "29.0.0-rc1" + "revision": "29.0.0-rc1", + "revision-details": { + "major:0": "29", + "micro:2": "0", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.0-rc2": { "archives": [ @@ -4645,11 +10395,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r29-rc2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29-rc2", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/29.0.0-rc2", - "revision": "29.0.0-rc2" + "revision": "29.0.0-rc2", + "revision-details": { + "major:0": "29", + "micro:2": "0", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.0-rc3": { "archives": [ @@ -4672,11 +10441,30 @@ "url": "https://dl.google.com/android/repository/build-tools_r29-rc3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29-rc3", "license": "android-sdk-preview-license", "name": "build-tools", + "obsolete": "true", "path": "build-tools/29.0.0-rc3", - "revision": "29.0.0-rc3" + "revision": "29.0.0-rc3", + "revision-details": { + "major:0": "29", + "micro:2": "0", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.1": { "archives": [ @@ -4699,11 +10487,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r29.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.1", - "revision": "29.0.1" + "revision": "29.0.1", + "revision-details": { + "major:0": "29", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.2": { "archives": [ @@ -4726,11 +10531,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r29.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.2", - "revision": "29.0.2" + "revision": "29.0.2", + "revision-details": { + "major:0": "29", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "29.0.3": { "archives": [ @@ -4753,11 +10575,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r29.0.3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 29.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.3", - "revision": "29.0.3" + "revision": "29.0.3", + "revision-details": { + "major:0": "29", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "30.0.0": { "archives": [ @@ -4780,11 +10619,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r30-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 30", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.0", - "revision": "30.0.0" + "revision": "30.0.0", + "revision-details": { + "major:0": "30", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "30.0.1": { "archives": [ @@ -4807,11 +10663,28 @@ "url": "https://dl.google.com/android/repository/build-tools_r30.0.1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 30.0.1", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.1", - "revision": "30.0.1" + "revision": "30.0.1", + "revision-details": { + "major:0": "30", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "30.0.2": { "archives": [ @@ -4834,11 +10707,28 @@ "url": "https://dl.google.com/android/repository/efbaa277338195608aa4e3dbd43927e97f60218c.build-tools_r30.0.2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 30.0.2", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.2", - "revision": "30.0.2" + "revision": "30.0.2", + "revision-details": { + "major:0": "30", + "micro:2": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "30.0.3": { "archives": [ @@ -4861,11 +10751,28 @@ "url": "https://dl.google.com/android/repository/f6d24b187cc6bd534c6c37604205171784ac5621.build-tools_r30.0.3-macosx.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "tools" + } + } + }, "displayName": "Android SDK Build-Tools 30.0.3", "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.3", - "revision": "30.0.3" + "revision": "30.0.3", + "revision-details": { + "major:0": "30", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "31.0.0": { "archives": [ @@ -4892,7 +10799,17 @@ "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/31.0.0", - "revision": "31.0.0" + "revision": "31.0.0", + "revision-details": { + "major:0": "31", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "32.0.0": { "archives": [ @@ -4919,7 +10836,17 @@ "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/32.0.0", - "revision": "32.0.0" + "revision": "32.0.0", + "revision-details": { + "major:0": "32", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "32.1.0-rc1": { "archives": [ @@ -4946,7 +10873,18 @@ "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/32.1.0-rc1", - "revision": "32.1.0-rc1" + "revision": "32.1.0-rc1", + "revision-details": { + "major:0": "32", + "micro:2": "0", + "minor:1": "1", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "33.0.0": { "archives": [ @@ -4973,7 +10911,17 @@ "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.0", - "revision": "33.0.0" + "revision": "33.0.0", + "revision-details": { + "major:0": "33", + "micro:2": "0", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "33.0.1": { "archives": [ @@ -5000,7 +10948,17 @@ "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.1", - "revision": "33.0.1" + "revision": "33.0.1", + "revision-details": { + "major:0": "33", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "cmake": { @@ -5029,7 +10987,17 @@ "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.10.2.4988404", - "revision": "3.10.2" + "revision": "3.10.2", + "revision-details": { + "major:0": "3", + "micro:2": "2", + "minor:1": "10" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3.18.1": { "archives": [ @@ -5056,7 +11024,17 @@ "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.18.1", - "revision": "3.18.1" + "revision": "3.18.1", + "revision-details": { + "major:0": "3", + "micro:2": "1", + "minor:1": "18" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3.22.1": { "archives": [ @@ -5083,7 +11061,17 @@ "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.22.1", - "revision": "3.22.1" + "revision": "3.22.1", + "revision-details": { + "major:0": "3", + "micro:2": "1", + "minor:1": "22" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3.6.4111459": { "archives": [ @@ -5110,7 +11098,17 @@ "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.6.4111459", - "revision": "3.6.4111459" + "revision": "3.6.4111459", + "revision-details": { + "major:0": "3", + "micro:2": "4111459", + "minor:1": "6" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "cmdline-tools": { @@ -5139,7 +11137,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/1.0", - "revision": "1.0" + "revision": "1.0", + "revision-details": { + "major:0": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "2.0": { "archives": [ @@ -5165,8 +11172,18 @@ "displayName": "Android SDK Command-line Tools", "license": "android-sdk-license", "name": "cmdline-tools", + "obsolete": "true", "path": "cmdline-tools/2.0", - "revision": "2.0" + "revision": "2.0", + "revision-details": { + "major:0": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "2.1": { "archives": [ @@ -5193,7 +11210,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/2.1", - "revision": "2.1" + "revision": "2.1", + "revision-details": { + "major:0": "2", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3.0": { "archives": [ @@ -5220,7 +11246,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/3.0", - "revision": "3.0" + "revision": "3.0", + "revision-details": { + "major:0": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "4.0": { "archives": [ @@ -5247,7 +11282,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/4.0", - "revision": "4.0" + "revision": "4.0", + "revision-details": { + "major:0": "4", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "5.0": { "archives": [ @@ -5274,7 +11318,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/5.0", - "revision": "5.0" + "revision": "5.0", + "revision-details": { + "major:0": "5", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "6.0": { "archives": [ @@ -5301,7 +11354,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/6.0", - "revision": "6.0" + "revision": "6.0", + "revision-details": { + "major:0": "6", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "7.0": { "archives": [ @@ -5328,7 +11390,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/7.0", - "revision": "7.0" + "revision": "7.0", + "revision-details": { + "major:0": "7", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "8.0": { "archives": [ @@ -5355,7 +11426,16 @@ "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/8.0", - "revision": "8.0" + "revision": "8.0", + "revision-details": { + "major:0": "8", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "emulator": { @@ -5380,11 +11460,28 @@ "url": "https://dl.google.com/android/repository/emulator-windows_x64-8807927.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android Emulator", "license": "android-sdk-license", "name": "emulator", "path": "emulator", - "revision": "31.3.10" + "revision": "31.3.10", + "revision-details": { + "major:0": "31", + "micro:2": "10", + "minor:1": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "31.3.14": { "archives": [ @@ -5407,11 +11504,28 @@ "url": "https://dl.google.com/android/repository/emulator-darwin_x64-9322596.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android Emulator", "license": "android-sdk-license", "name": "emulator", "path": "emulator", - "revision": "31.3.14" + "revision": "31.3.14", + "revision-details": { + "major:0": "31", + "micro:2": "14", + "minor:1": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "32.1.8": { "archives": [ @@ -5434,11 +11548,28 @@ "url": "https://dl.google.com/android/repository/emulator-windows_x64-9310560.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "Android Emulator", "license": "android-sdk-preview-license", "name": "emulator", "path": "emulator", - "revision": "32.1.8" + "revision": "32.1.8", + "revision-details": { + "major:0": "32", + "micro:2": "8", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "extras": { @@ -5467,7 +11598,16 @@ "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", - "revision": "2.0" + "revision": "2.0", + "revision-details": { + "major:0": "2", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "2.1": { "archives": [ @@ -5494,7 +11634,16 @@ "license": "android-sdk-license", "name": "extras", "path": "extras/google/auto", - "revision": "2.1" + "revision": "2.1", + "revision-details": { + "major:0": "2", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk": { @@ -5519,11 +11668,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 16.1.4479499", "license": "android-sdk-license", "name": "ndk", "path": "ndk/16.1.4479499", - "revision": "16.1.4479499" + "revision": "16.1.4479499", + "revision-details": { + "major:0": "16", + "micro:2": "4479499", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "17.2.4988734": { "archives": [ @@ -5546,11 +11712,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r17c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 17.2.4988734", "license": "android-sdk-license", "name": "ndk", "path": "ndk/17.2.4988734", - "revision": "17.2.4988734" + "revision": "17.2.4988734", + "revision-details": { + "major:0": "17", + "micro:2": "4988734", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.1.5063045": { "archives": [ @@ -5573,11 +11756,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r18b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 18.1.5063045", "license": "android-sdk-license", "name": "ndk", "path": "ndk/18.1.5063045", - "revision": "18.1.5063045" + "revision": "18.1.5063045", + "revision-details": { + "major:0": "18", + "micro:2": "5063045", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.5232133": { "archives": [ @@ -5600,11 +11800,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 19.0.5232133", "license": "android-sdk-license", "name": "ndk", + "obsolete": "true", "path": "ndk/19.0.5232133", - "revision": "19.0.5232133" + "revision": "19.0.5232133", + "revision-details": { + "major:0": "19", + "micro:2": "5232133", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.2.5345600": { "archives": [ @@ -5627,11 +11845,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 19.2.5345600", "license": "android-sdk-license", "name": "ndk", "path": "ndk/19.2.5345600", - "revision": "19.2.5345600" + "revision": "19.2.5345600", + "revision-details": { + "major:0": "19", + "micro:2": "5345600", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5392854-rc2": { "archives": [ @@ -5654,11 +11889,30 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 20.0.5392854", "license": "android-sdk-preview-license", "name": "ndk", + "obsolete": "true", "path": "ndk/20.0.5392854", - "revision": "20.0.5392854-rc2" + "revision": "20.0.5392854-rc2", + "revision-details": { + "major:0": "20", + "micro:2": "5392854", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5471264-rc3": { "archives": [ @@ -5681,11 +11935,30 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 20.0.5471264", "license": "android-sdk-preview-license", "name": "ndk", + "obsolete": "true", "path": "ndk/20.0.5471264", - "revision": "20.0.5471264-rc3" + "revision": "20.0.5471264-rc3", + "revision-details": { + "major:0": "20", + "micro:2": "5471264", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5594570": { "archives": [ @@ -5708,11 +11981,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 20.0.5594570", "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.0.5594570", - "revision": "20.0.5594570" + "revision": "20.0.5594570", + "revision-details": { + "major:0": "20", + "micro:2": "5594570", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.1.5948944": { "archives": [ @@ -5735,11 +12025,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 20.1.5948944", "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.1.5948944", - "revision": "20.1.5948944" + "revision": "20.1.5948944", + "revision-details": { + "major:0": "20", + "micro:2": "5948944", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.6011959-rc2": { "archives": [ @@ -5762,11 +12069,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.0.6011959", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.0.6011959", - "revision": "21.0.6011959-rc2" + "revision": "21.0.6011959-rc2", + "revision-details": { + "major:0": "21", + "micro:2": "6011959", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.6113669": { "archives": [ @@ -5789,11 +12114,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.0.6113669", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.0.6113669", - "revision": "21.0.6113669" + "revision": "21.0.6113669", + "revision-details": { + "major:0": "21", + "micro:2": "6113669", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6210238-rc1": { "archives": [ @@ -5816,11 +12158,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.1.6210238", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6210238", - "revision": "21.1.6210238-rc1" + "revision": "21.1.6210238-rc1", + "revision-details": { + "major:0": "21", + "micro:2": "6210238", + "minor:1": "1", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6273396-rc2": { "archives": [ @@ -5843,11 +12203,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.1.6273396", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6273396", - "revision": "21.1.6273396-rc2" + "revision": "21.1.6273396-rc2", + "revision-details": { + "major:0": "21", + "micro:2": "6273396", + "minor:1": "1", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6352462": { "archives": [ @@ -5870,11 +12248,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.1.6352462", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.1.6352462", - "revision": "21.1.6352462" + "revision": "21.1.6352462", + "revision-details": { + "major:0": "21", + "micro:2": "6352462", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6363665-rc3": { "archives": [ @@ -5897,11 +12292,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.1.6363665", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6363665", - "revision": "21.1.6363665-rc3" + "revision": "21.1.6363665-rc3", + "revision-details": { + "major:0": "21", + "micro:2": "6363665", + "minor:1": "1", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.2.6472646": { "archives": [ @@ -5924,11 +12337,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.2.6472646", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.2.6472646", - "revision": "21.2.6472646" + "revision": "21.2.6472646", + "revision-details": { + "major:0": "21", + "micro:2": "6472646", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.3.6528147": { "archives": [ @@ -5951,11 +12381,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.3.6528147", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.3.6528147", - "revision": "21.3.6528147" + "revision": "21.3.6528147", + "revision-details": { + "major:0": "21", + "micro:2": "6528147", + "minor:1": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.4.7075529": { "archives": [ @@ -5978,11 +12425,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 21.4.7075529", "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.4.7075529", - "revision": "21.4.7075529" + "revision": "21.4.7075529", + "revision-details": { + "major:0": "21", + "micro:2": "7075529", + "minor:1": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.6917172-rc1": { "archives": [ @@ -6005,11 +12469,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 22.0.6917172", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/22.0.6917172", - "revision": "22.0.6917172-rc1" + "revision": "22.0.6917172-rc1", + "revision-details": { + "major:0": "22", + "micro:2": "6917172", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.7026061": { "archives": [ @@ -6032,11 +12514,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 22.0.7026061", "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.0.7026061", - "revision": "22.0.7026061" + "revision": "22.0.7026061", + "revision-details": { + "major:0": "22", + "micro:2": "7026061", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.1.7171670": { "archives": [ @@ -6059,11 +12558,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 22.1.7171670", "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.1.7171670", - "revision": "22.1.7171670" + "revision": "22.1.7171670", + "revision-details": { + "major:0": "22", + "micro:2": "7171670", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7123448-rc1": { "archives": [ @@ -6086,11 +12602,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7123448", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7123448", - "revision": "23.0.7123448-rc1" + "revision": "23.0.7123448-rc1", + "revision-details": { + "major:0": "23", + "micro:2": "7123448", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7196353-rc2": { "archives": [ @@ -6113,11 +12647,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7196353", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7196353", - "revision": "23.0.7196353-rc2" + "revision": "23.0.7196353-rc2", + "revision-details": { + "major:0": "23", + "micro:2": "7196353", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7272597-rc3": { "archives": [ @@ -6140,11 +12692,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7272597", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7272597", - "revision": "23.0.7272597-rc3" + "revision": "23.0.7272597-rc3", + "revision-details": { + "major:0": "23", + "micro:2": "7272597", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7344513-rc4": { "archives": [ @@ -6167,11 +12737,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7344513", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7344513", - "revision": "23.0.7344513-rc4" + "revision": "23.0.7344513-rc4", + "revision-details": { + "major:0": "23", + "micro:2": "7344513", + "minor:1": "0", + "preview:3": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7421159-rc5": { "archives": [ @@ -6194,11 +12782,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta5-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7421159", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7421159", - "revision": "23.0.7421159-rc5" + "revision": "23.0.7421159-rc5", + "revision-details": { + "major:0": "23", + "micro:2": "7421159", + "minor:1": "0", + "preview:3": "5" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7530507-rc6": { "archives": [ @@ -6221,11 +12827,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta6-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7530507", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7530507", - "revision": "23.0.7530507-rc6" + "revision": "23.0.7530507-rc6", + "revision-details": { + "major:0": "23", + "micro:2": "7530507", + "minor:1": "0", + "preview:3": "6" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7599858": { "archives": [ @@ -6248,11 +12872,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.0.7599858", "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.0.7599858", - "revision": "23.0.7599858" + "revision": "23.0.7599858", + "revision-details": { + "major:0": "23", + "micro:2": "7599858", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.1.7779620": { "archives": [ @@ -6275,11 +12916,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23b-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.1.7779620", "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.1.7779620", - "revision": "23.1.7779620" + "revision": "23.1.7779620", + "revision-details": { + "major:0": "23", + "micro:2": "7779620", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.2.8568313": { "archives": [ @@ -6302,11 +12960,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23c-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 23.2.8568313", "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.2.8568313", - "revision": "23.2.8568313" + "revision": "23.2.8568313", + "revision-details": { + "major:0": "23", + "micro:2": "8568313", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.7856742-rc1": { "archives": [ @@ -6329,11 +13004,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r24-beta1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 24.0.7856742", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7856742", - "revision": "24.0.7856742-rc1" + "revision": "24.0.7856742-rc1", + "revision-details": { + "major:0": "24", + "micro:2": "7856742", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.7956693-rc2": { "archives": [ @@ -6356,11 +13049,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r24-beta2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 24.0.7956693", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7956693", - "revision": "24.0.7956693-rc2" + "revision": "24.0.7956693-rc2", + "revision-details": { + "major:0": "24", + "micro:2": "7956693", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.8079956-rc3": { "archives": [ @@ -6383,11 +13094,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r24-rc1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 24.0.8079956", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.8079956", - "revision": "24.0.8079956-rc3" + "revision": "24.0.8079956-rc3", + "revision-details": { + "major:0": "24", + "micro:2": "8079956", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "24.0.8215888": { "archives": [ @@ -6410,11 +13139,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r24-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 24.0.8215888", "license": "android-sdk-license", "name": "ndk", "path": "ndk/24.0.8215888", - "revision": "24.0.8215888" + "revision": "24.0.8215888", + "revision-details": { + "major:0": "24", + "micro:2": "8215888", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.8151533-rc1": { "archives": [ @@ -6437,11 +13183,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25-beta1-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.0.8151533", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8151533", - "revision": "25.0.8151533-rc1" + "revision": "25.0.8151533-rc1", + "revision-details": { + "major:0": "25", + "micro:2": "8151533", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.8221429-rc2": { "archives": [ @@ -6464,11 +13228,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25-beta2-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.0.8221429", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8221429", - "revision": "25.0.8221429-rc2" + "revision": "25.0.8221429-rc2", + "revision-details": { + "major:0": "25", + "micro:2": "8221429", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.8355429-rc3": { "archives": [ @@ -6491,11 +13273,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25-beta3-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.0.8355429", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8355429", - "revision": "25.0.8355429-rc3" + "revision": "25.0.8355429-rc3", + "revision-details": { + "major:0": "25", + "micro:2": "8355429", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.8528842-rc4": { "archives": [ @@ -6518,11 +13318,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25-beta4-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.0.8528842", "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8528842", - "revision": "25.0.8528842-rc4" + "revision": "25.0.8528842-rc4", + "revision-details": { + "major:0": "25", + "micro:2": "8528842", + "minor:1": "0", + "preview:3": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.0.8775105": { "archives": [ @@ -6545,11 +13363,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.0.8775105", "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.0.8775105", - "revision": "25.0.8775105" + "revision": "25.0.8775105", + "revision-details": { + "major:0": "25", + "micro:2": "8775105", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "25.1.8937393": { "archives": [ @@ -6572,11 +13407,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r25b-windows.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK (Side by side) 25.1.8937393", "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.1.8937393", - "revision": "25.1.8937393" + "revision": "25.1.8937393", + "revision-details": { + "major:0": "25", + "micro:2": "8937393", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk-bundle": { @@ -6601,11 +13453,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "16.1.4479499" + "revision": "16.1.4479499", + "revision-details": { + "major:0": "16", + "micro:2": "4479499", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "17.2.4988734": { "archives": [ @@ -6628,11 +13497,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r17c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "17.2.4988734" + "revision": "17.2.4988734", + "revision-details": { + "major:0": "17", + "micro:2": "4988734", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "18.1.5063045": { "archives": [ @@ -6655,11 +13541,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r18b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "18.1.5063045" + "revision": "18.1.5063045", + "revision-details": { + "major:0": "18", + "micro:2": "5063045", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.0.5232133": { "archives": [ @@ -6682,11 +13585,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r19-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", + "obsolete": "true", "path": "ndk-bundle", - "revision": "19.0.5232133" + "revision": "19.0.5232133", + "revision-details": { + "major:0": "19", + "micro:2": "5232133", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "19.2.5345600": { "archives": [ @@ -6709,11 +13630,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r19c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "19.2.5345600" + "revision": "19.2.5345600", + "revision-details": { + "major:0": "19", + "micro:2": "5345600", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5392854-rc2": { "archives": [ @@ -6736,11 +13674,30 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", + "obsolete": "true", "path": "ndk-bundle", - "revision": "20.0.5392854-rc2" + "revision": "20.0.5392854-rc2", + "revision-details": { + "major:0": "20", + "micro:2": "5392854", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5471264-rc3": { "archives": [ @@ -6763,11 +13720,30 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", + "obsolete": "true", "path": "ndk-bundle", - "revision": "20.0.5471264-rc3" + "revision": "20.0.5471264-rc3", + "revision-details": { + "major:0": "20", + "micro:2": "5471264", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.0.5594570": { "archives": [ @@ -6790,11 +13766,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "20.0.5594570" + "revision": "20.0.5594570", + "revision-details": { + "major:0": "20", + "micro:2": "5594570", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "20.1.5948944": { "archives": [ @@ -6817,11 +13810,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r20b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "20.1.5948944" + "revision": "20.1.5948944", + "revision-details": { + "major:0": "20", + "micro:2": "5948944", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.6011959-rc2": { "archives": [ @@ -6844,11 +13854,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.0.6011959-rc2" + "revision": "21.0.6011959-rc2", + "revision-details": { + "major:0": "21", + "micro:2": "6011959", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.0.6113669": { "archives": [ @@ -6871,11 +13899,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.0.6113669" + "revision": "21.0.6113669", + "revision-details": { + "major:0": "21", + "micro:2": "6113669", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6210238-rc1": { "archives": [ @@ -6898,11 +13943,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.1.6210238-rc1" + "revision": "21.1.6210238-rc1", + "revision-details": { + "major:0": "21", + "micro:2": "6210238", + "minor:1": "1", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6273396-rc2": { "archives": [ @@ -6925,11 +13988,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.1.6273396-rc2" + "revision": "21.1.6273396-rc2", + "revision-details": { + "major:0": "21", + "micro:2": "6273396", + "minor:1": "1", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6352462": { "archives": [ @@ -6952,11 +14033,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.1.6352462" + "revision": "21.1.6352462", + "revision-details": { + "major:0": "21", + "micro:2": "6352462", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.1.6363665-rc3": { "archives": [ @@ -6979,11 +14077,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21b-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.1.6363665-rc3" + "revision": "21.1.6363665-rc3", + "revision-details": { + "major:0": "21", + "micro:2": "6363665", + "minor:1": "1", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.2.6472646": { "archives": [ @@ -7006,11 +14122,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21c-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.2.6472646" + "revision": "21.2.6472646", + "revision-details": { + "major:0": "21", + "micro:2": "6472646", + "minor:1": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.3.6528147": { "archives": [ @@ -7033,11 +14166,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.3.6528147" + "revision": "21.3.6528147", + "revision-details": { + "major:0": "21", + "micro:2": "6528147", + "minor:1": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "21.4.7075529": { "archives": [ @@ -7060,11 +14210,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r21e-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "21.4.7075529" + "revision": "21.4.7075529", + "revision-details": { + "major:0": "21", + "micro:2": "7075529", + "minor:1": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.6917172-rc1": { "archives": [ @@ -7087,11 +14254,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "22.0.6917172-rc1" + "revision": "22.0.6917172-rc1", + "revision-details": { + "major:0": "22", + "micro:2": "6917172", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.0.7026061": { "archives": [ @@ -7114,11 +14299,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "22.0.7026061" + "revision": "22.0.7026061", + "revision-details": { + "major:0": "22", + "micro:2": "7026061", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "22.1.7171670": { "archives": [ @@ -7141,11 +14343,28 @@ "url": "https://dl.google.com/android/repository/android-ndk-r22b-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "22.1.7171670" + "revision": "22.1.7171670", + "revision-details": { + "major:0": "22", + "micro:2": "7171670", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7123448-rc1": { "archives": [ @@ -7168,11 +14387,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta1-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "23.0.7123448-rc1" + "revision": "23.0.7123448-rc1", + "revision-details": { + "major:0": "23", + "micro:2": "7123448", + "minor:1": "0", + "preview:3": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7196353-rc2": { "archives": [ @@ -7195,11 +14432,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta2-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "23.0.7196353-rc2" + "revision": "23.0.7196353-rc2", + "revision-details": { + "major:0": "23", + "micro:2": "7196353", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7272597-rc3": { "archives": [ @@ -7222,11 +14477,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta3-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "23.0.7272597-rc3" + "revision": "23.0.7272597-rc3", + "revision-details": { + "major:0": "23", + "micro:2": "7272597", + "minor:1": "0", + "preview:3": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "23.0.7344513-rc4": { "archives": [ @@ -7249,11 +14522,29 @@ "url": "https://dl.google.com/android/repository/android-ndk-r23-beta4-windows-x86_64.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + } + }, "displayName": "NDK", "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", - "revision": "23.0.7344513-rc4" + "revision": "23.0.7344513-rc4", + "revision-details": { + "major:0": "23", + "micro:2": "7344513", + "minor:1": "0", + "preview:3": "4" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "patcher": { @@ -7270,7 +14561,15 @@ "license": "android-sdk-license", "name": "patcher", "path": "patcher/v4", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "platform-tools": { @@ -7299,7 +14598,17 @@ "license": "android-sdk-license", "name": "platform-tools", "path": "platform-tools", - "revision": "33.0.3" + "revision": "33.0.3", + "revision-details": { + "major:0": "33", + "micro:2": "3", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "platforms": { @@ -7316,7 +14625,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-10", - "revision": "10" + "revision": "10", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "10", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "11": { "archives": [ @@ -7331,7 +14656,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-11", - "revision": "11" + "revision": "11", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "11", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "12": { "archives": [ @@ -7346,7 +14687,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-12", - "revision": "12" + "revision": "12", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "12", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "13": { "archives": [ @@ -7361,7 +14718,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-13", - "revision": "13" + "revision": "13", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "13", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "14": { "archives": [ @@ -7376,7 +14749,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-14", - "revision": "14" + "revision": "14", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "14", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "15": { "archives": [ @@ -7391,7 +14780,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-15", - "revision": "15" + "revision": "15", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "api-level:0": "15", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "16": { "archives": [ @@ -7406,7 +14811,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-16", - "revision": "16" + "revision": "16", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "api-level:0": "16", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "17": { "archives": [ @@ -7421,7 +14842,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-17", - "revision": "17" + "revision": "17", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "17", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "18": { "archives": [ @@ -7436,7 +14873,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-18", - "revision": "18" + "revision": "18", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "18", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "19": { "archives": [ @@ -7451,7 +14904,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-19", - "revision": "19" + "revision": "19", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "19", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "2": { "archives": [ @@ -7477,8 +14946,25 @@ "displayName": "Android SDK Platform 2", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-2", - "revision": "2" + "revision": "2", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "2", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "20": { "archives": [ @@ -7493,7 +14979,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-20", - "revision": "20" + "revision": "20", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "20", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "21": { "archives": [ @@ -7508,7 +15010,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-21", - "revision": "21" + "revision": "21", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "21", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "12" + } + } + } }, "22": { "archives": [ @@ -7523,7 +15041,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-22", - "revision": "22" + "revision": "22", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "22", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "14" + } + } + } }, "23": { "archives": [ @@ -7538,7 +15072,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-23", - "revision": "23" + "revision": "23", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "23", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "16" + } + } + } }, "24": { "archives": [ @@ -7553,7 +15103,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-24", - "revision": "24" + "revision": "24", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "24", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "16" + } + } + } }, "25": { "archives": [ @@ -7568,7 +15134,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-25", - "revision": "25" + "revision": "25", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "25", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "16" + } + } + } }, "26": { "archives": [ @@ -7583,7 +15165,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-26", - "revision": "26" + "revision": "26", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "26", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "27": { "archives": [ @@ -7598,7 +15196,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-27", - "revision": "27" + "revision": "27", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "27", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "28": { "archives": [ @@ -7613,7 +15227,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-28", - "revision": "28" + "revision": "28", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "api-level:0": "28", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "29": { "archives": [ @@ -7628,7 +15258,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-29", - "revision": "29" + "revision": "29", + "revision-details": { + "major:0": "5" + }, + "type-details": { + "api-level:0": "29", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "3": { "archives": [ @@ -7654,8 +15300,25 @@ "displayName": "Android SDK Platform 3", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-3", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "4" + }, + "type-details": { + "api-level:0": "3", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "30": { "archives": [ @@ -7670,7 +15333,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-30", - "revision": "30" + "revision": "30", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "30", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "31": { "archives": [ @@ -7685,7 +15364,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-31", - "revision": "31" + "revision": "31", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "31", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "32": { "archives": [ @@ -7700,7 +15395,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-32", - "revision": "32" + "revision": "32", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "32", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "33": { "archives": [ @@ -7715,7 +15426,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33", - "revision": "33" + "revision": "33", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "33", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } }, "4": { "archives": [ @@ -7741,8 +15468,25 @@ "displayName": "Android SDK Platform 4", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-4", - "revision": "4" + "revision": "4", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "4", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "5": { "archives": [ @@ -7768,8 +15512,25 @@ "displayName": "Android SDK Platform 5", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-5", - "revision": "5" + "revision": "5", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "5", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "6": { "archives": [ @@ -7795,8 +15556,25 @@ "displayName": "Android SDK Platform 6", "license": "android-sdk-license", "name": "platforms", + "obsolete": "true", "path": "platforms/android-6", - "revision": "6" + "revision": "6", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "6", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "7": { "archives": [ @@ -7811,7 +15589,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-7", - "revision": "7" + "revision": "7", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "7", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "8": { "archives": [ @@ -7826,7 +15620,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-8", - "revision": "8" + "revision": "8", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "api-level:0": "8", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "9": { "archives": [ @@ -7841,7 +15651,23 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-9", - "revision": "9" + "revision": "9", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "9", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "4" + } + } + } }, "TiramisuPrivacySandbox": { "archives": [ @@ -7856,7 +15682,22 @@ "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-TiramisuPrivacySandbox", - "revision": "TiramisuPrivacySandbox" + "revision": "TiramisuPrivacySandbox", + "revision-details": { + "major:0": "8" + }, + "type-details": { + "api-level:0": "33", + "codename:1": "TiramisuPrivacySandbox", + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "layoutlib:2": { + "element-attributes": { + "api": "15" + } + } + } } }, "skiaparser": { @@ -7885,7 +15726,15 @@ "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/3", - "revision": "1" + "revision": "1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "3": { "archives": [ @@ -7912,7 +15761,15 @@ "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/2", - "revision": "3" + "revision": "3", + "revision-details": { + "major:0": "3" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } }, "6": { "archives": [ @@ -7939,7 +15796,15 @@ "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/1", - "revision": "6" + "revision": "6", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "sources": { @@ -7955,8 +15820,20 @@ "displayName": "Sources for Android 14", "license": "android-sdk-license", "name": "sources", + "obsolete": "true", "path": "sources/android-14", - "revision": "14" + "revision": "14", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "14", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "15": { "archives": [ @@ -7971,7 +15848,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-15", - "revision": "15" + "revision": "15", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "15", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "16": { "archives": [ @@ -7986,7 +15874,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-16", - "revision": "16" + "revision": "16", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "16", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "17": { "archives": [ @@ -8001,7 +15900,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-17", - "revision": "17" + "revision": "17", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "17", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "18": { "archives": [ @@ -8016,7 +15926,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-18", - "revision": "18" + "revision": "18", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "18", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "19": { "archives": [ @@ -8031,7 +15952,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-19", - "revision": "19" + "revision": "19", + "revision-details": { + "major:0": "2" + }, + "type-details": { + "api-level:0": "19", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "20": { "archives": [ @@ -8046,7 +15978,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-20", - "revision": "20" + "revision": "20", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "20", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "21": { "archives": [ @@ -8061,7 +16004,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-21", - "revision": "21" + "revision": "21", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "21", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "22": { "archives": [ @@ -8076,7 +16030,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-22", - "revision": "22" + "revision": "22", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "22", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "23": { "archives": [ @@ -8091,7 +16056,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-23", - "revision": "23" + "revision": "23", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "23", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "24": { "archives": [ @@ -8106,7 +16082,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-24", - "revision": "24" + "revision": "24", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "24", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "25": { "archives": [ @@ -8121,7 +16108,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-25", - "revision": "25" + "revision": "25", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "25", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "26": { "archives": [ @@ -8136,7 +16134,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-26", - "revision": "26" + "revision": "26", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "26", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "27": { "archives": [ @@ -8151,7 +16160,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-27", - "revision": "27" + "revision": "27", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "27", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "28": { "archives": [ @@ -8166,7 +16186,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-28", - "revision": "28" + "revision": "28", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "28", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "29": { "archives": [ @@ -8181,7 +16212,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-29", - "revision": "29" + "revision": "29", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "29", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "30": { "archives": [ @@ -8196,7 +16238,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-30", - "revision": "30" + "revision": "30", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "30", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "31": { "archives": [ @@ -8211,7 +16264,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-31", - "revision": "31" + "revision": "31", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "31", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "32": { "archives": [ @@ -8226,7 +16290,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-32", - "revision": "32" + "revision": "32", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "32", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } }, "33": { "archives": [ @@ -8241,7 +16316,18 @@ "license": "android-sdk-license", "name": "sources", "path": "sources/android-33", - "revision": "33" + "revision": "33", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "33", + "codename:1": { + }, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + } + } } }, "tools": { @@ -8266,11 +16352,42 @@ "url": "https://dl.google.com/android/repository/sdk-tools-windows-4333796.zip" } ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "patcher;v4" + } + }, + "dependency:1": { + "element-attributes": { + "path": "emulator" + } + }, + "dependency:2": { + "element-attributes": { + "path": "platform-tools" + }, + "min-revision:0": { + "major:0": "20" + } + } + }, "displayName": "Android SDK Tools", "license": "android-sdk-license", "name": "tools", + "obsolete": "true", "path": "tools", - "revision": "26.1.1" + "revision": "26.1.1", + "revision-details": { + "major:0": "26", + "micro:2": "1", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } } } diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/test-suite.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/test-suite.nix new file mode 100644 index 0000000000..d063b73ccb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/test-suite.nix @@ -0,0 +1,16 @@ +{ stdenv, callPackage }: +let + examples-shell = callPackage ./examples/shell.nix {}; +in +stdenv.mkDerivation { + name = "androidenv-test-suite"; + + src = ./.; + + dontConfigure = true; + dontBuild = true; + + passthru.tests = { } // examples-shell.passthru.tests; + + meta.timeout = 60; +} diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/tools.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/tools.nix index 36e7e52b80..091b944894 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/tools.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/tools.nix @@ -1,26 +1,42 @@ -{deployAndroidPackage, requireFile, lib, packages, toolsVersion, os, callPackage, postInstall ? ""}: +{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall}: -if toolsVersion == "26.0.1" then callPackage ./tools/26.nix { - inherit deployAndroidPackage lib os postInstall; - package = { - name = "tools"; - path = "tools"; - revision = "26.0.1"; - archives = { - linux = requireFile { - url = "https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip"; - sha256 = "185yq7qwxflw24ccm5d6zziwlc9pxmsm3f54pm9p7xm0ik724kj4"; - }; - macosx = requireFile { - url = "https://dl.google.com/android/repository/sdk-tools-darwin-3859397.zip"; - sha256 = "1ycx9gzdaqaw6n19yvxjawywacavn1jc6sadlz5qikhgfr57b0aa"; - }; - }; - }; -} else if toolsVersion == "26.1.1" then callPackage ./tools/26.nix { - inherit deployAndroidPackage lib os postInstall; - package = packages.tools.${toolsVersion}; -} else callPackage ./tools/25.nix { - inherit deployAndroidPackage lib os postInstall; - package = packages.tools.${toolsVersion}; +deployAndroidPackage { + name = "androidsdk"; + inherit os package; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; + buildInputs = lib.optional (os == "linux") ( + (with pkgs; [ glibc freetype fontconfig fontconfig.lib]) + ++ (with pkgs.xorg; [ libX11 libXrender libXext ]) + ++ (with pkgsi686Linux; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ]) + ); + + patchInstructions = '' + ${lib.optionalString (os == "linux") '' + # Auto patch all binaries + autoPatchelf . + ''} + + # Wrap all scripts that require JAVA_HOME + for i in bin; do + find $i -maxdepth 1 -type f -executable | while read program; do + if grep -q "JAVA_HOME" $program; then + wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin + fi + done + done + + # Wrap monitor script + wrapProgram $PWD/monitor \ + --prefix PATH : ${pkgs.jdk8}/bin \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with pkgs; [ xorg.libX11 xorg.libXtst ])} + + # Patch all script shebangs + patchShebangs . + + cd $out/libexec/android-sdk + ${postInstall} + ''; + + meta.license = lib.licenses.unfree; } diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/tools/25.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/tools/25.nix deleted file mode 100644 index 85a114fbc2..0000000000 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/tools/25.nix +++ /dev/null @@ -1,62 +0,0 @@ -{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall ? ""}: - -deployAndroidPackage { - name = "androidsdk"; - nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - buildInputs = lib.optionals (os == "linux") [ pkgs.glibc pkgs.xorg.libX11 pkgs.xorg.libXext pkgs.xorg.libXdamage pkgs.xorg.libxcb pkgs.xorg.libXfixes pkgs.xorg.libXrender pkgs.fontconfig.lib pkgs.freetype pkgs.libGL pkgs.zlib pkgs.ncurses5 pkgs.libpulseaudio pkgsi686Linux.glibc pkgsi686Linux.xorg.libX11 pkgsi686Linux.xorg.libXrender pkgsi686Linux.fontconfig pkgsi686Linux.freetype pkgsi686Linux.zlib ]; - inherit package os; - - patchInstructions = '' - ${lib.optionalString (os == "linux") '' - # Auto patch all binaries - addAutoPatchelfSearchPath $PWD/lib64 - addAutoPatchelfSearchPath $PWD/lib64/libstdc++ - addAutoPatchelfSearchPath $PWD/lib64/qt/lib - addAutoPatchelfSearchPath $PWD/lib - addAutoPatchelfSearchPath $PWD/lib/libstdc++ - autoPatchelf . - ''} - - # Wrap all scripts that require JAVA_HOME - for i in bin - do - find $i -maxdepth 1 -type f -executable | while read program - do - if grep -q "JAVA_HOME" $program - then - wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin - fi - done - done - - # Wrap programs that require java - for i in draw9patch jobb lint screenshot2 - do - wrapProgram $PWD/$i \ - --prefix PATH : ${pkgs.jdk8}/bin - done - - # Wrap programs that require java and SWT - for i in android ddms hierarchyviewer monitor monkeyrunner traceview uiautomatorviewer - do - wrapProgram $PWD/$i \ - --prefix PATH : ${pkgs.jdk8}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]} - done - - ${lib.optionalString (os == "linux") '' - wrapProgram $PWD/emulator \ - --prefix PATH : ${pkgs.file}/bin:${pkgs.glxinfo}/bin:${pkgs.pciutils}/bin \ - --set QT_XKB_CONFIG_ROOT ${pkgs.xkeyboard_config}/share/X11/xkb \ - --set QTCOMPOSE ${pkgs.xorg.libX11.out}/share/X11/locale - ''} - - # Patch all script shebangs - patchShebangs . - - cd .. - ${postInstall} - ''; - - meta.license = lib.licenses.unfree; -} diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix deleted file mode 100644 index 527d360271..0000000000 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/tools/26.nix +++ /dev/null @@ -1,45 +0,0 @@ -{deployAndroidPackage, lib, package, autoPatchelfHook, makeWrapper, os, pkgs, pkgsi686Linux, postInstall ? ""}: - -deployAndroidPackage { - name = "androidsdk"; - inherit os package; - nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; - buildInputs = lib.optional (os == "linux") ( - (with pkgs; [ glibc freetype fontconfig fontconfig.lib]) - ++ (with pkgs.xorg; [ libX11 libXrender libXext ]) - ++ (with pkgsi686Linux; [ glibc xorg.libX11 xorg.libXrender xorg.libXext fontconfig.lib freetype zlib ]) - ); - - patchInstructions = '' - ${lib.optionalString (os == "linux") '' - # Auto patch all binaries - autoPatchelf . - ''} - - # Wrap all scripts that require JAVA_HOME - for i in bin - do - find $i -maxdepth 1 -type f -executable | while read program - do - if grep -q "JAVA_HOME" $program - then - wrapProgram $PWD/$program --prefix PATH : ${pkgs.jdk8}/bin - fi - done - done - - # Wrap monitor script - wrapProgram $PWD/monitor \ - --prefix PATH : ${pkgs.jdk8}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.xorg.libX11 pkgs.xorg.libXtst ]} - - # Patch all script shebangs - patchShebangs . - - cd .. - ${postInstall} - ''; - - meta.license = lib.licenses.unfree; -} diff --git a/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix b/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix index 847789db5e..0df241ad37 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.19.0"; + version = "1.21.3"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "1q5yz2lw3g3y11k9wgq8k5ghxmdp7c2qrz0as7r175rbmvxlf4xn"; + sha256 = "1sphkzknz4lidj3vxzvq31x6k6si32smn2yylibccv4p4hjwvn68"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/asynctools/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/asynctools/default.nix new file mode 100644 index 0000000000..54893d00a9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/nim-packages/asynctools/default.nix @@ -0,0 +1,20 @@ +{ lib, buildNimPackage, fetchFromGitHub, astpatternmatching }: + +buildNimPackage rec { + pname = "asynctools"; + version = "unstable-2021-07-06"; + + src = fetchFromGitHub { + owner = "cheatfate"; + repo = "asynctools"; + rev = "84ced6d002789567f2396c75800ffd6dff2866f7"; + hash = "sha256-mrO+WeSzCBclqC2UNCY+IIv7Gs8EdTDaTeSgXy3TgNM="; + }; + + meta = with lib; { + description = "Various asynchronous tools for Nim language"; + homepage = "https://github.com/cheatfate/asynctools"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/base45/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/base45/default.nix new file mode 100644 index 0000000000..b63f3073e7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/nim-packages/base45/default.nix @@ -0,0 +1,19 @@ +{ lib, buildNimPackage, fetchFromSourcehut }: + +buildNimPackage rec { + pname = "base45"; + version = "20230124"; + src = fetchFromSourcehut { + owner = "~ehmry"; + repo = pname; + rev = version; + hash = "sha256-9he+14yYVGt2s1IuRLPRsv23xnJzERkWRvIHr3PxFYk="; + }; + doCheck = true; + meta = src.meta // { + description = "Base45 library for Nim"; + license = lib.licenses.unlicense; + mainProgram = pname; + maintainers = with lib.maintainers; [ ehmry ]; + }; +} 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 c687e763c2..5869a0e172 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -183,7 +183,6 @@ , "insect" , "intelephense" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v15.6.3.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" 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 57364cbde4..6b11be178f 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "ULSIYPy4ZPM301dfCxRz0l2GJjOwIo/PqmWonIu1bLml7UmnVQmH+juJcoyXp6E8gIRRNAjGYftJnNQlfy4vPg=="; }; }; - "@adobe/css-tools-4.0.2" = { + "@adobe/css-tools-4.1.0" = { name = "_at_adobe_slash_css-tools"; packageName = "@adobe/css-tools"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.2.tgz"; - sha512 = "Fx6tYjk2wKUgLi8uMANZr8GNZx05u44ArIJldn9VxLvolzlJVgHbTUCbwhMd6bcYky178+WUSxPHO3DAtGLWpw=="; + url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.1.0.tgz"; + sha512 = "mMVJ/j/GbZ/De4ZHWbQAQO1J6iVnjtZLc9WEdkUQb8S/Bu2cAF2bETXUgMAdvMG3/ngtKmcNBe+Zms9bg6jnQQ=="; }; }; "@akryum/winattr-3.0.0" = { @@ -148,13 +148,13 @@ let sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; }; }; - "@angular-devkit/architect-0.1501.1" = { + "@angular-devkit/architect-0.1501.3" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1501.1"; + version = "0.1501.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.1.tgz"; - sha512 = "2uDa/+nVGwQ5X6UJtB14V37SbD/64WSg0hKyX5z1yp6wYrSuk7PWV8hddIsiYM3aIT5wTGqfLil6NkV4G/BzQw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1501.3.tgz"; + sha512 = "+hvesYUgChdAkBcWSO2pseIGBzRDAATyIw36UBwOmYkL7wM65TEXpspbo5ZIfU1M/l7X/lHzDXLTzCMfb0Qxbg=="; }; }; "@angular-devkit/core-15.0.4" = { @@ -166,13 +166,13 @@ let sha512 = "4ITpRAevd652SxB+qNesIQ9qfbm7wT5UBU5kJOPPwGL77I21g8CQpkmV1n5VSacPvC9Zbz90feOWexf7w7JzcA=="; }; }; - "@angular-devkit/core-15.1.1" = { + "@angular-devkit/core-15.1.3" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "15.1.1"; + version = "15.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.1.tgz"; - sha512 = "wss76zfw4oPHs+Dd0OIbLv8os/BXDkDErj9hCjBbycQN768EqF8z7EBNGy6SKHYhmfXJy9REUkEgt9qPMJb4CQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-15.1.3.tgz"; + sha512 = "biuS+DceyZEqcE/cLvndtslqn3Q6uCmJ0RLpACikH6ESYorvk+A91H0ofuGue6HB/2CUN/F+mPSr7sWVI1W9sA=="; }; }; "@angular-devkit/schematics-15.0.4" = { @@ -184,13 +184,13 @@ let sha512 = "/gXiLFS0+xFdx6wPoBpe/c6/K9I5edMpaASqPf4XheKtrsSvL+qTlIi3nsbfItzOiDXbaBmlbxGfkMHz/yg0Ig=="; }; }; - "@angular-devkit/schematics-15.1.1" = { + "@angular-devkit/schematics-15.1.3" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "15.1.1"; + version = "15.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.1.1.tgz"; - sha512 = "ullwoxFT9aMhQR2aNwb/66A6l4HTgp4I6thbBywt86nn+ZGbJCzLKRdv2vmYh9JaxZYh1pydxWjKLEUdlycKXg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.1.3.tgz"; + sha512 = "IXZ56/5uFnHqnLq+80JhmFx5mflyW8LgS/8Tr2l5DYVA71Fh3b1q+vGrEZB1X2zPoFeDOGAxv3Fi+kmjcz1GZg=="; }; }; "@angular-devkit/schematics-cli-15.0.4" = { @@ -364,13 +364,13 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; - "@apidevtools/json-schema-ref-parser-9.1.0" = { + "@apidevtools/json-schema-ref-parser-9.1.2" = { name = "_at_apidevtools_slash_json-schema-ref-parser"; packageName = "@apidevtools/json-schema-ref-parser"; - version = "9.1.0"; + version = "9.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.1.0.tgz"; - sha512 = "teB30tFooE3iQs2HQIKJ02D8UZA1Xy1zaczzhUjJs0CymYxeC0g+y5rCY2p8NHBM6DBUVoR8rSM4kHLj1WE9mQ=="; + url = "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.1.2.tgz"; + sha512 = "r1w81DpR+KyRWd3f+rk6TNqMgedmAxZP5v5KWlXQWlgMUUtyEJch0DKEci1SorPMiSeM8XPl7MZ3miJ60JIpQg=="; }; }; "@apidevtools/openapi-schemas-2.1.0" = { @@ -562,85 +562,85 @@ let sha512 = "FO+EteK+Gk3zwumrBw6frpp9cJ4oQL5++hBBpfM81w16e9KaiA4sKrzvQsvVjifoZZHNvVEX4D2zoz9i8CLccQ=="; }; }; - "@aws-crypto/crc32-2.0.0" = { + "@aws-crypto/crc32-3.0.0" = { name = "_at_aws-crypto_slash_crc32"; packageName = "@aws-crypto/crc32"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-2.0.0.tgz"; - sha512 = "TvE1r2CUueyXOuHdEigYjIZVesInd9KN+K/TFFNfkkxRThiNxO6i4ZqqAVMoEjAamZZ1AA8WXJkjCz7YShHPQA=="; + url = "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz"; + sha512 = "IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA=="; }; }; - "@aws-crypto/crc32c-2.0.0" = { + "@aws-crypto/crc32c-3.0.0" = { name = "_at_aws-crypto_slash_crc32c"; packageName = "@aws-crypto/crc32c"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-2.0.0.tgz"; - sha512 = "vF0eMdMHx3O3MoOXUfBZry8Y4ZDtcuskjjKgJz8YfIDjLStxTZrYXk+kZqtl6A0uCmmiN/Eb/JbC/CndTV1MHg=="; + url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-3.0.0.tgz"; + sha512 = "ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w=="; }; }; - "@aws-crypto/ie11-detection-2.0.2" = { + "@aws-crypto/ie11-detection-3.0.0" = { name = "_at_aws-crypto_slash_ie11-detection"; packageName = "@aws-crypto/ie11-detection"; - version = "2.0.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz"; - sha512 = "5XDMQY98gMAf/WRTic5G++jfmS/VLM0rwpiOpaainKi4L0nqWMSB1SzsrEG5rjFZGYN6ZAefO+/Yta2dFM0kMw=="; + url = "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz"; + sha512 = "341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q=="; }; }; - "@aws-crypto/sha1-browser-2.0.0" = { + "@aws-crypto/sha1-browser-3.0.0" = { name = "_at_aws-crypto_slash_sha1-browser"; packageName = "@aws-crypto/sha1-browser"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-2.0.0.tgz"; - sha512 = "3fIVRjPFY8EG5HWXR+ZJZMdWNRpwbxGzJ9IH9q93FpbgCH8u8GHRi46mZXp3cYD7gealmyqpm3ThZwLKJjWJhA=="; + url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-3.0.0.tgz"; + sha512 = "NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw=="; }; }; - "@aws-crypto/sha256-browser-2.0.0" = { + "@aws-crypto/sha256-browser-3.0.0" = { name = "_at_aws-crypto_slash_sha256-browser"; packageName = "@aws-crypto/sha256-browser"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz"; - sha512 = "rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A=="; + url = "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz"; + sha512 = "8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ=="; }; }; - "@aws-crypto/sha256-js-2.0.0" = { + "@aws-crypto/sha256-js-3.0.0" = { name = "_at_aws-crypto_slash_sha256-js"; packageName = "@aws-crypto/sha256-js"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz"; - sha512 = "VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig=="; + url = "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz"; + sha512 = "PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ=="; }; }; - "@aws-crypto/supports-web-crypto-2.0.2" = { + "@aws-crypto/supports-web-crypto-3.0.0" = { name = "_at_aws-crypto_slash_supports-web-crypto"; packageName = "@aws-crypto/supports-web-crypto"; - version = "2.0.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.2.tgz"; - sha512 = "6mbSsLHwZ99CTOOswvCRP3C+VCWnzBf+1SnbWxzzJ9lR0mA0JnY2JEAhp8rqmTE0GPFy88rrM27ffgp62oErMQ=="; + url = "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz"; + sha512 = "06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg=="; }; }; - "@aws-crypto/util-2.0.2" = { + "@aws-crypto/util-3.0.0" = { name = "_at_aws-crypto_slash_util"; packageName = "@aws-crypto/util"; - version = "2.0.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-crypto/util/-/util-2.0.2.tgz"; - sha512 = "Lgu5v/0e/BcrZ5m/IWqzPUf3UYFTy/PpeED+uc9SWUR1iZQL8XXbGQg10UfllwwBryO3hFF5dizK+78aoXC1eA=="; + url = "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz"; + sha512 = "2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w=="; }; }; - "@aws-sdk/abort-controller-3.226.0" = { + "@aws-sdk/abort-controller-3.257.0" = { name = "_at_aws-sdk_slash_abort-controller"; packageName = "@aws-sdk/abort-controller"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.226.0.tgz"; - sha512 = "cJVzr1xxPBd08voknXvR0RLgtZKGKt6WyDpH/BaPCu3rfSqWCDZKzwqe940eqosjmKrxC6pUZNKASIqHOQ8xxQ=="; + url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.257.0.tgz"; + sha512 = "ekWy391lOerS0ZECdhp/c+X7AToJIpfNrCPjuj3bKr+GMQYckGsYsdbm6AUD4sxBmfvuaQmVniSXWovaxwcFcQ=="; }; }; "@aws-sdk/chunked-blob-reader-3.188.0" = { @@ -661,202 +661,202 @@ let sha512 = "JeOZ95PW+fJ6bbuqPySYqLqHk1n4+4ueEEraJsiUrPBV0S1ZtyvOGHcnGztKUjr2PYNaiexmpWuvUve9K12HRA=="; }; }; - "@aws-sdk/client-s3-3.252.0" = { + "@aws-sdk/client-s3-3.259.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.252.0.tgz"; - sha512 = "VsTDuztgrwwBnkTZKm3t3cyXNTnWRCxDN4fCeEabw8/GB6KKSrs1a9pYXyWXuXtuvV5lFG4tIZMcXF7UkVXqyg=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.259.0.tgz"; + sha512 = "yZy7oTTqPAn5H1SxbsynzVRr6kSf5hJQYl00P1dpzsAjTJmRzV4CdHwUxsBkyfUeC6u324iJi9zir1v8HHgUJw=="; }; }; - "@aws-sdk/client-sso-3.252.0" = { + "@aws-sdk/client-sso-3.259.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.252.0.tgz"; - sha512 = "VgBqJvvCU4y9zAHJwYj5nOeNGcCxKdCO4edUxWQVHcpLsVWu49maOVtWuteq9MOrHYeWfQi8bVWGt8MPvv9+bA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.259.0.tgz"; + sha512 = "TKi9Lj0zqxsrQWOZ+e4WchNDtLDz6B+ahMzYDIOFlglDPPEzbZE//PBMZCba/AAIe6U3xaUQSnni+4mNbRLg7Q=="; }; }; - "@aws-sdk/client-sso-oidc-3.252.0" = { + "@aws-sdk/client-sso-oidc-3.259.0" = { name = "_at_aws-sdk_slash_client-sso-oidc"; packageName = "@aws-sdk/client-sso-oidc"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.252.0.tgz"; - sha512 = "OOwfEXFS+UliGZorEleARsXXUp3ObZSXo9/YY+8XF7/8froAqYjKCEi0tflghgYlh7d6qe7wzD7/6gDL1a/qgA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.259.0.tgz"; + sha512 = "TKpUX55qLM35sQXx96VnB/ZcQCcBxVU/0j0wqL8Hij+blD7fy6KrGGJPORzRphmFg8Ehf1IoCivFxrQwLrjZ6A=="; }; }; - "@aws-sdk/client-sts-3.252.0" = { + "@aws-sdk/client-sts-3.259.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.252.0.tgz"; - sha512 = "wzfsWOlDFLdmeML8R7DUJWGl9wcRKf2uiunfB1aWzpdlgms0Z7FkHWgkDYHjCPyYHL6EBm84ajGl1UkE7AcmqQ=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.259.0.tgz"; + sha512 = "LXqua4FoXxR30sM4BSwmPI6x0YmDTw6yQhxQQXA5hrx+YwUf8CSpa0K6Xwfv8M5+zP0uHfY1iVxx/rnT8FOEmA=="; }; }; - "@aws-sdk/config-resolver-3.234.0" = { + "@aws-sdk/config-resolver-3.259.0" = { name = "_at_aws-sdk_slash_config-resolver"; packageName = "@aws-sdk/config-resolver"; - version = "3.234.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.234.0.tgz"; - sha512 = "uZxy4wzllfvgCQxVc+Iqhde0NGAnfmV2hWR6ejadJaAFTuYNvQiRg9IqJy3pkyDPqXySiJ8Bom5PoJfgn55J/A=="; + url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.259.0.tgz"; + sha512 = "gViMRsc4Ye6+nzJ0OYTZIT8m4glIAdtugN2Sr/t6P2iJW5X0bSL/EcbcHBgsve1lHjeGPeyzVkT7UnyGOZ5Z/A=="; }; }; - "@aws-sdk/credential-provider-env-3.226.0" = { + "@aws-sdk/credential-provider-env-3.257.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.226.0.tgz"; - sha512 = "sd8uK1ojbXxaZXlthzw/VXZwCPUtU3PjObOfr3Evj7MPIM2IH8h29foOlggx939MdLQGboJf9gKvLlvKDWtJRA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.257.0.tgz"; + sha512 = "GsmBi5Di6hk1JAi1iB6/LCY8o+GmlCvJoB7wuoVmXI3VxRVwptUVjuj8EtJbIrVGrF9dSuIRPCzUoSuzEzYGlg=="; }; }; - "@aws-sdk/credential-provider-imds-3.226.0" = { + "@aws-sdk/credential-provider-imds-3.259.0" = { name = "_at_aws-sdk_slash_credential-provider-imds"; packageName = "@aws-sdk/credential-provider-imds"; - version = "3.226.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.226.0.tgz"; - sha512 = "//z/COQm2AjYFI1Lb0wKHTQSrvLFTyuKLFQGPJsKS7DPoxGOCKB7hmYerlbl01IDoCxTdyL//TyyPxbZEOQD5Q=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.259.0.tgz"; + sha512 = "yCxoYWZAaDrCUEWxRfrpB0Mp1cFgJEMYW8T6GIb/+DQ5QLpZmorgaVD/j90QXupqFrR5tlxwuskBIkdD2E9YNg=="; }; }; - "@aws-sdk/credential-provider-ini-3.252.0" = { + "@aws-sdk/credential-provider-ini-3.259.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.252.0.tgz"; - sha512 = "OfpU8xMYK7+6XQ2dUO4rN0gUhhb/ZLV7iwSL6Ji2pI9gglGhKdOSfmbn6fBfCB50kzWZRNoiQJVaBu/d0Kr0EQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.259.0.tgz"; + sha512 = "/sjZv+XvcSMnvDTsau0cHxMFcbz4f4ksvgu10JQ1PpcH5CPQJviDJjZRzzijcOuMZ3SOO0skyuYU6tjY18cgIg=="; }; }; - "@aws-sdk/credential-provider-node-3.252.0" = { + "@aws-sdk/credential-provider-node-3.259.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.252.0.tgz"; - sha512 = "Jt854JnB7izkJ/gb3S0hBFqAQPUNUP3eL8gXX2uqk9A9bQFQdS57/Ci0FXaEPwOXzJwAAPazD8dTf6HXMhnm3w=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.259.0.tgz"; + sha512 = "7doM6hCPTZD0H+A7VtElLY4Ztuhg3MbjoHs00TyPZNCym7f/AKmKi9Exiw1tGgxTJkfn/SzcAWz+TyqMP078ow=="; }; }; - "@aws-sdk/credential-provider-process-3.226.0" = { + "@aws-sdk/credential-provider-process-3.257.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.226.0.tgz"; - sha512 = "iUDMdnrTvbvaCFhWwqyXrhvQ9+ojPqPqXhwZtY1X/Qaz+73S9gXBPJHZaZb2Ke0yKE1Ql3bJbKvmmxC/qLQMng=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.257.0.tgz"; + sha512 = "xK8uYeNXaclaBCGrLi4z2pxPRngqLf5BM5jg2fn57zqvlL9V5gJF972FehrVBL0bfp1/laG0ZJtD2K2sapyWAw=="; }; }; - "@aws-sdk/credential-provider-sso-3.252.0" = { + "@aws-sdk/credential-provider-sso-3.259.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.252.0.tgz"; - sha512 = "2JGoojMOBjG9/DenctEszjdPechq0uDTpH5nx+z1xxIAugA5+HYG/ncNfpwhmUBCrnOxpRaQViTNqXddEPHlAg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.259.0.tgz"; + sha512 = "cz+8aNKxvZ8ikd0JDcB9MZredOJNRZkbco8QAM0gXfy6ziyX+23oU8+aekZljDzQR5QNRouvMz1KKmBxZLpNyg=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.226.0" = { + "@aws-sdk/credential-provider-web-identity-3.257.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.226.0.tgz"; - sha512 = "CCpv847rLB0SFOHz2igvUMFAzeT2fD3YnY4C8jltuJoEkn0ITn1Hlgt13nTJ5BUuvyti2mvyXZHmNzhMIMrIlw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.257.0.tgz"; + sha512 = "Cm0uvRv4JuIbD0Kp3W0J/vwjADIyCx8HoZi5yg+QIi5nilocuTQ3ajvLeuPVSvFvdy+yaxSc5FxNXquWt7Mngw=="; }; }; - "@aws-sdk/eventstream-codec-3.226.0" = { + "@aws-sdk/eventstream-codec-3.258.0" = { name = "_at_aws-sdk_slash_eventstream-codec"; packageName = "@aws-sdk/eventstream-codec"; - version = "3.226.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.226.0.tgz"; - sha512 = "6uPtR8vSwz3fqoZk9hrb6qBYdp3PJ22+JxV5Wimdesvow4kJXSgDQXIxEkxbv6SxB9tNRB4uJHD84RetHEi15Q=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.258.0.tgz"; + sha512 = "DTd6aggICXOH74tBQEliwLbeoXRbQ3uROBWYl7DdrbAemzHACDFzPCXXa9MTJMZcq3Tva8/E/3bv1fXuU/xkAA=="; }; }; - "@aws-sdk/eventstream-serde-browser-3.226.0" = { + "@aws-sdk/eventstream-serde-browser-3.258.0" = { name = "_at_aws-sdk_slash_eventstream-serde-browser"; packageName = "@aws-sdk/eventstream-serde-browser"; - version = "3.226.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.226.0.tgz"; - sha512 = "otYC5aZE9eJUqAlKpy8w0rPDQ1eKGvZPtgxWXmFYSO2lDVGfI1nBBNmdZ4MdHqNuQ7ucsKMQYF8BFJ65K2tYPA=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.258.0.tgz"; + sha512 = "bRcNxDrBFd0UsrLh88kwpvGDHjVupZP3gPJ5b7wseCuuWJzp56/7hNI97IywgARta91rcaf4K147VxFkSNaVlw=="; }; }; - "@aws-sdk/eventstream-serde-config-resolver-3.226.0" = { + "@aws-sdk/eventstream-serde-config-resolver-3.257.0" = { name = "_at_aws-sdk_slash_eventstream-serde-config-resolver"; packageName = "@aws-sdk/eventstream-serde-config-resolver"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.226.0.tgz"; - sha512 = "A56Gypg+lyEfA5cna+EUH9XTrj0SvRG1gwNW7lrUzviN36SeA/LFTUIOEjxVML3Lowy+EPAcrSZ67h6aepoAig=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.257.0.tgz"; + sha512 = "YbUETgkcFqPJmwcBozHbx3Xloh7mPk9SunNB+Ndy8egwV3L/jNZnEzZnPOtWbD10AXSuJvSbGQ8+l4FblRqZqw=="; }; }; - "@aws-sdk/eventstream-serde-node-3.226.0" = { + "@aws-sdk/eventstream-serde-node-3.258.0" = { name = "_at_aws-sdk_slash_eventstream-serde-node"; packageName = "@aws-sdk/eventstream-serde-node"; - version = "3.226.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.226.0.tgz"; - sha512 = "KWLnKkKDzI9RNkiK6OiSYpG/XjZfue6Bsp/vRG+H5z3fbXdHv4X2+iW+Efu2Kvn7jsUyUv82TCl57DyJ/HKYhQ=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.258.0.tgz"; + sha512 = "KvuitKB3fK1ZjWcB+U6d8JNv0WJtE1zvW5DXI/OabzaIR4i/LNis7469EwTsEkTqG3mV3wUa6cBA6kBSJWTVeA=="; }; }; - "@aws-sdk/eventstream-serde-universal-3.226.0" = { + "@aws-sdk/eventstream-serde-universal-3.258.0" = { name = "_at_aws-sdk_slash_eventstream-serde-universal"; packageName = "@aws-sdk/eventstream-serde-universal"; - version = "3.226.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.226.0.tgz"; - sha512 = "Q8viYM1Sv90/yIUqyWNeG1GEvyVlAI3GIrInQcCMC+xT59jS+IKGy2y7ojCvSWXnhf5/HMXKcmG092QsqeKy0Q=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.258.0.tgz"; + sha512 = "woHNrBp8YSIaf3mcRJA0SyKFnjeLX2fRudLZq9wd555Zz/U7f45AuZOpXlU66tIZiYJI1xm32VRSIYfpIwXI+A=="; }; }; - "@aws-sdk/fetch-http-handler-3.226.0" = { + "@aws-sdk/fetch-http-handler-3.257.0" = { name = "_at_aws-sdk_slash_fetch-http-handler"; packageName = "@aws-sdk/fetch-http-handler"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.226.0.tgz"; - sha512 = "JewZPMNEBXfi1xVnRa7pVtK/zgZD8/lQ/YnD8pq79WuMa2cwyhDtr8oqCoqsPW+WJT5ScXoMtuHxN78l8eKWgg=="; + url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.257.0.tgz"; + sha512 = "zOF+RzQ+wfF7tq7tGUdPcqUTh3+k2f8KCVJE07A8kCopVq4nBu4NH6Eq29Tjpwdya3YlKvE+kFssuQRRRRex+Q=="; }; }; - "@aws-sdk/hash-blob-browser-3.226.0" = { + "@aws-sdk/hash-blob-browser-3.257.0" = { name = "_at_aws-sdk_slash_hash-blob-browser"; packageName = "@aws-sdk/hash-blob-browser"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.226.0.tgz"; - sha512 = "5DCvWE6L4xGoViEHyjcPFuUe1G2EtNx8TqswWaoaKgyasP/yuRm4H99Ra7rqIrjCcSTAGD9NVsUQvVVw1bGt9w=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.257.0.tgz"; + sha512 = "3Nrcci3pCCc0ZILMGa/oUMq9le6nhvgCoVxFy5skYs/mQu4QnA8HcK0u4bTueW41rBj0ZW6BHLk/2SmigIkjCQ=="; }; }; - "@aws-sdk/hash-node-3.226.0" = { + "@aws-sdk/hash-node-3.257.0" = { name = "_at_aws-sdk_slash_hash-node"; packageName = "@aws-sdk/hash-node"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.226.0.tgz"; - sha512 = "MdlJhJ9/Espwd0+gUXdZRsHuostB2WxEVAszWxobP0FTT9PnicqnfK7ExmW+DUAc0ywxtEbR3e0UND65rlSTVw=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.257.0.tgz"; + sha512 = "W/USUuea5Ep3OJ2U7Ve8/5KN1YsDun2WzOFUxc1PyxXP5pW6OgC15/op0e+bmWPG851clvp5S8ZuroUr3aKi3Q=="; }; }; - "@aws-sdk/hash-stream-node-3.226.0" = { + "@aws-sdk/hash-stream-node-3.257.0" = { name = "_at_aws-sdk_slash_hash-stream-node"; packageName = "@aws-sdk/hash-stream-node"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.226.0.tgz"; - sha512 = "cgNTGlF8SdHaQXtjEmuLXz2U8SLM2JDKtIVPku/lHTMsUsEn+fuv2C+h1f/hvd4aNw5t1zggym7sO1/h/rv56Q=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.257.0.tgz"; + sha512 = "A24+EI0sO+IYO78sQPY4vVx7vzToc6XAobQqowmBJ6GXXILK72d3MR3NVbm0lmcS4Dh6MVZEFQD/DCyKvj2C7g=="; }; }; - "@aws-sdk/invalid-dependency-3.226.0" = { + "@aws-sdk/invalid-dependency-3.257.0" = { name = "_at_aws-sdk_slash_invalid-dependency"; packageName = "@aws-sdk/invalid-dependency"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.226.0.tgz"; - sha512 = "QXOYFmap8g9QzRjumcRCIo2GEZkdCwd7ePQW0OABWPhKHzlJ74vvBxywjU3s39EEBEluWXtZ7Iufg6GxZM4ifw=="; + url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.257.0.tgz"; + sha512 = "T68SAPRNMEhpke0wlxURgogL7q0B8dfqZsSeS20BVR/lksJxLse9+pbmCDxiu1RrXoEIsEwl5rbLN+Hw8BFFYw=="; }; }; "@aws-sdk/is-array-buffer-3.201.0" = { @@ -868,310 +868,310 @@ let sha512 = "UPez5qLh3dNgt0DYnPD/q0mVJY84rA17QE26hVNOW3fAji8W2wrwrxdacWOxyXvlxWsVRcKmr+lay1MDqpAMfg=="; }; }; - "@aws-sdk/md5-js-3.226.0" = { + "@aws-sdk/md5-js-3.258.0" = { name = "_at_aws-sdk_slash_md5-js"; packageName = "@aws-sdk/md5-js"; - version = "3.226.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.226.0.tgz"; - sha512 = "ENigJRNudqyh6xsch166SZ4gggHd3XzZJ8gkCU4CWPne04HcR3BkWSO774IuWooCHt8zkaEHKecPurRz6qR+Vw=="; + url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.258.0.tgz"; + sha512 = "aLdZ43sEiT68p7YYPHwKsWU1WDC8Wf8UQfb4pzbvhYNgr5VxN46AtbWTKxLAqK2adKS4FnbyX2i66fINg2dHdw=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.226.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.259.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.226.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.226.0.tgz"; - sha512 = "A1Vq5W2X7jgTfjqcKPmjoHohF0poP+9fxwL97fQMvzcwmjhtoCV3bLEpo6CGYx0pKPiSlRJXZkRwRPj2hDHDmA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.259.0.tgz"; + sha512 = "eY4Bf7ZeiYK2c2XQ5IU0TDneEYSnZbaFk+ysgAkNmGoLKBhybXiKy7Dh8djB3uXeNtsZ+fZaazWmsU2kxf6Ntg=="; }; }; - "@aws-sdk/middleware-content-length-3.226.0" = { + "@aws-sdk/middleware-content-length-3.257.0" = { name = "_at_aws-sdk_slash_middleware-content-length"; packageName = "@aws-sdk/middleware-content-length"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.226.0.tgz"; - sha512 = "ksUzlHJN2JMuyavjA46a4sctvnrnITqt2tbGGWWrAuXY1mel2j+VbgnmJUiwHKUO6bTFBBeft5Vd1TSOb4JmiA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.257.0.tgz"; + sha512 = "yiawbV2azm6QnMY1L2ypG8PDRdjOcEIvFmT0T7y0F49rfbKJOu21j1ONAoCkLrINK6kMqcD5JSQLVCoURxiTxQ=="; }; }; - "@aws-sdk/middleware-endpoint-3.226.0" = { + "@aws-sdk/middleware-endpoint-3.257.0" = { name = "_at_aws-sdk_slash_middleware-endpoint"; packageName = "@aws-sdk/middleware-endpoint"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.226.0.tgz"; - sha512 = "EvLFafjtUxTT0AC9p3aBQu1/fjhWdIeK58jIXaNFONfZ3F8QbEYUPuF/SqZvJM6cWfOO9qwYKkRDbCSTYhprIg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.257.0.tgz"; + sha512 = "RQNQe/jeVuWZtXXfcOm+e3qMFICY6ERsXUrbt0rjHgvajZCklcrRJgxJSCwrcS7Le3nl9azFPMAMj9L7uSK28g=="; }; }; - "@aws-sdk/middleware-expect-continue-3.226.0" = { + "@aws-sdk/middleware-expect-continue-3.257.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.226.0.tgz"; - sha512 = "YxvQKTV/eA9P8AgW0hXOgj5Qa+TSnNFfyOkfeP089aP3f6p92b1cESf33TEOKsddive2mHT5LRCN6MuPcgWWrA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.257.0.tgz"; + sha512 = "7HSRA2Ta0fTq9Ewznp6fYG7CYOoqr5TeqEhKL1HyFb5i6YmsCiz88JKNJTllD5O7uFcd7Td/fJ66pK4JttfaaQ=="; }; }; - "@aws-sdk/middleware-flexible-checksums-3.226.0" = { + "@aws-sdk/middleware-flexible-checksums-3.259.0" = { name = "_at_aws-sdk_slash_middleware-flexible-checksums"; packageName = "@aws-sdk/middleware-flexible-checksums"; - version = "3.226.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.226.0.tgz"; - sha512 = "8A9Ot9A7794UP5tMGl2MnfTW/UM/jYy1wRWF9YkR/hPIcPb7OmE0hmlwIQGzb/7grxpYw66ETKf0WeH/41YfeQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.259.0.tgz"; + sha512 = "DwY3+cWaONvzJSVYQncfX+ZnoPnLVA7LfgR0mrgcvVZJFrqCr1lJeUmJOmE2/kcOQefPfSbKB/L4BP6vg2EUMQ=="; }; }; - "@aws-sdk/middleware-host-header-3.226.0" = { + "@aws-sdk/middleware-host-header-3.257.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.226.0.tgz"; - sha512 = "haVkWVh6BUPwKgWwkL6sDvTkcZWvJjv8AgC8jiQuSl8GLZdzHTB8Qhi3IsfFta9HAuoLjxheWBE5Z/L0UrfhLA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.257.0.tgz"; + sha512 = "gEi9AJdJfRfU8Qr6HK1hfhxTzyV3Giq4B/h7um99hIFAT/GCg9xiPvAOKPo6UeuiKEv3b7RpSL4s6cBvnJMJBA=="; }; }; - "@aws-sdk/middleware-location-constraint-3.226.0" = { + "@aws-sdk/middleware-location-constraint-3.257.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.226.0.tgz"; - sha512 = "qHiYaBYPc2R37KxG2uqsUUwh4usrQMHfGkrpTUnx5d4rGzM3mC+muPsTpSHnAL63K2/yJOHQJFjss3GGwV4SSA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.257.0.tgz"; + sha512 = "pmm5rJR5aatXG0kC0KPBxkgoNn/ePcyVIYHGMEuJXRJm3ENy569QAH9UZeMFjprp3uuAbkqItQbY3MP8TYvuYA=="; }; }; - "@aws-sdk/middleware-logger-3.226.0" = { + "@aws-sdk/middleware-logger-3.257.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.226.0.tgz"; - sha512 = "m9gtLrrYnpN6yckcQ09rV7ExWOLMuq8mMPF/K3DbL/YL0TuILu9i2T1W+JuxSX+K9FMG2HrLAKivE/kMLr55xA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.257.0.tgz"; + sha512 = "8RDXW/VbMKBsXDfcCLmROZcWKyrekyiPa3J1aIaBy0tq9o4xpGoXw/lwwIrNVvISAFslb57rteup34bfn6ta6w=="; }; }; - "@aws-sdk/middleware-recursion-detection-3.226.0" = { + "@aws-sdk/middleware-recursion-detection-3.257.0" = { name = "_at_aws-sdk_slash_middleware-recursion-detection"; packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.226.0.tgz"; - sha512 = "mwRbdKEUeuNH5TEkyZ5FWxp6bL2UC1WbY+LDv6YjHxmSMKpAoOueEdtU34PqDOLrpXXxIGHDFmjeGeMfktyEcA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.257.0.tgz"; + sha512 = "rUCih6zHh8k9Edf5N5Er4s508FYbwLM0MWTD2axzlj9TjLqEQ9OKED3wHaLffXSDzodd3oTAfJCLPbWQyoZ3ZQ=="; }; }; - "@aws-sdk/middleware-retry-3.235.0" = { + "@aws-sdk/middleware-retry-3.259.0" = { name = "_at_aws-sdk_slash_middleware-retry"; packageName = "@aws-sdk/middleware-retry"; - version = "3.235.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.235.0.tgz"; - sha512 = "50WHbJGpD3SNp9763MAlHqIhXil++JdQbKejNpHg7HsJne/ao3ub+fDOfx//mMBjpzBV25BGd5UlfL6blrClSg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.259.0.tgz"; + sha512 = "pVh1g8e84MAi7eVtWLiiiCtn82LzxOP7+LxTRHatmgIeN22yGQBZILliPDJypUPvDYlwxI1ekiK+oPTcte0Uww=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.231.0" = { + "@aws-sdk/middleware-sdk-s3-3.257.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.231.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.231.0.tgz"; - sha512 = "UGaSvevd2TanfKgStF46dDSHkh4bxOr1gdUkyHm9i+1pF5lx4KdbnBZv/5SKnn7XifhHRXrs1M3lTzemXREhTA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.257.0.tgz"; + sha512 = "l9KRlUgsDKV1MB3zfttX/syhIBsG5Z3VVslz6EW09eSqZVreCudW3TMdyeLemup57xC2veEpkgVj8igiXd/LVQ=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.226.0" = { + "@aws-sdk/middleware-sdk-sts-3.257.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.226.0.tgz"; - sha512 = "NN9T/qoSD1kZvAT+VLny3NnlqgylYQcsgV3rvi/8lYzw/G/2s8VS6sm/VTWGGZhx08wZRv20MWzYu3bftcyqUg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.257.0.tgz"; + sha512 = "d6IJCLRi3O2tm4AFK60WNhIwmMmspj1WzKR1q1TaoPzoREPG2xg+Am18wZBRkCyYuRPPrbizmkvAmAJiUolMAw=="; }; }; - "@aws-sdk/middleware-serde-3.226.0" = { + "@aws-sdk/middleware-serde-3.257.0" = { name = "_at_aws-sdk_slash_middleware-serde"; packageName = "@aws-sdk/middleware-serde"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.226.0.tgz"; - sha512 = "nPuOOAkSfx9TxzdKFx0X2bDlinOxGrqD7iof926K/AEflxGD1DBdcaDdjlYlPDW2CVE8LV/rAgbYuLxh/E/1VA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.257.0.tgz"; + sha512 = "/JasfXPWFq24mnCrx9fxW/ISBSp07RJwhsF14qzm8Qy3Z0z470C+QRM6otTwAkYuuVt1wuLjja5agq3Jtzq7dQ=="; }; }; - "@aws-sdk/middleware-signing-3.226.0" = { + "@aws-sdk/middleware-signing-3.257.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.226.0.tgz"; - sha512 = "E6HmtPcl+IjYDDzi1xI2HpCbBq2avNWcjvCriMZWuTAtRVpnA6XDDGW5GY85IfS3A8G8vuWqEVPr8JcYUcjfew=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.257.0.tgz"; + sha512 = "hCH3D83LHmm6nqmtNrGTWZCVjsQXrGHIXbd17/qrw7aPFvcAhsiiCncGFP+XsUXEKa2ZqcSNMUyPrx69ofNRZQ=="; }; }; - "@aws-sdk/middleware-ssec-3.226.0" = { + "@aws-sdk/middleware-ssec-3.257.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.226.0.tgz"; - sha512 = "DR97oWoLHiMdaUP/wu99HtzG7/ijvCrjZGDH37WBO1rxFtEti6L7T09wgHzwxMN8gtL8FJA7dU8IrffGSC9VmA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.257.0.tgz"; + sha512 = "YcZrKeZk/0bsFvnTqp2rcF+6BSmeLTA65ZtyNNP2hh7Imaxg3kAQcueOJBeK4YP/5nU7a1mtt/4Q8BqbIjc41g=="; }; }; - "@aws-sdk/middleware-stack-3.226.0" = { + "@aws-sdk/middleware-stack-3.257.0" = { name = "_at_aws-sdk_slash_middleware-stack"; packageName = "@aws-sdk/middleware-stack"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.226.0.tgz"; - sha512 = "85wF29LvPvpoed60fZGDYLwv1Zpd/cM0C22WSSFPw1SSJeqO4gtFYyCg2squfT3KI6kF43IIkOCJ+L7GtryPug=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.257.0.tgz"; + sha512 = "awg2F0SvwACBaw4HIObK8pQGfSqAc4Vy+YFzWSfZNVC35oRO6RsRdKHVU99lRC0LrT2Ptmfghl2DMPSrRDbvlQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.226.0" = { + "@aws-sdk/middleware-user-agent-3.257.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.226.0.tgz"; - sha512 = "N1WnfzCW1Y5yWhVAphf8OPGTe8Df3vmV7/LdsoQfmpkCZgLZeK2o0xITkUQhRj1mbw7yp8tVFLFV3R2lMurdAQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.257.0.tgz"; + sha512 = "37rt75LZyD0UWpbcFuxEGqwF3DZKSixQPl7AsDe6q3KtrO5gGQB+diH5vbY0txNNYyv5IK9WMwvY73mVmoWRmw=="; }; }; - "@aws-sdk/node-config-provider-3.226.0" = { + "@aws-sdk/node-config-provider-3.259.0" = { name = "_at_aws-sdk_slash_node-config-provider"; packageName = "@aws-sdk/node-config-provider"; - version = "3.226.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.226.0.tgz"; - sha512 = "B8lQDqiRk7X5izFEUMXmi8CZLOKCTWQJU9HQf3ako+sF0gexo4nHN3jhoRWyLtcgC5S3on/2jxpAcqtm7kuY3w=="; + url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.259.0.tgz"; + sha512 = "DUOqr71oonBvM6yKPdhDBmraqgXHCFrVWFw7hc5ZNxL2wS/EsbKfGPJp+C+SUgpn1upIWPNnh/bNoLAbBkcLsA=="; }; }; - "@aws-sdk/node-http-handler-3.226.0" = { + "@aws-sdk/node-http-handler-3.257.0" = { name = "_at_aws-sdk_slash_node-http-handler"; packageName = "@aws-sdk/node-http-handler"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.226.0.tgz"; - sha512 = "xQCddnZNMiPmjr3W7HYM+f5ir4VfxgJh37eqZwX6EZmyItFpNNeVzKUgA920ka1VPz/ZUYB+2OFGiX3LCLkkaA=="; + url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.257.0.tgz"; + sha512 = "8KnWHVVwaGKyTlkTU9BSOAiSovNDoagxemU2l10QqBbzUCVpljCUMUkABEGRJ1yoQCl6DJ7RtNkAyZ8Ne/E15A=="; }; }; - "@aws-sdk/property-provider-3.226.0" = { + "@aws-sdk/property-provider-3.257.0" = { name = "_at_aws-sdk_slash_property-provider"; packageName = "@aws-sdk/property-provider"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.226.0.tgz"; - sha512 = "TsljjG+Sg0LmdgfiAlWohluWKnxB/k8xenjeozZfzOr5bHmNHtdbWv6BtNvD/R83hw7SFXxbJHlD5H4u9p2NFg=="; + url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.257.0.tgz"; + sha512 = "3rUbRAcF0GZ5PhDiXhS4yREfZ5hOEtvYEa9S/19OdM5eoypOaLU5XnFcCKfnccSP8SkdgpJujzxOMRWNWadlAQ=="; }; }; - "@aws-sdk/protocol-http-3.226.0" = { + "@aws-sdk/protocol-http-3.257.0" = { name = "_at_aws-sdk_slash_protocol-http"; packageName = "@aws-sdk/protocol-http"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.226.0.tgz"; - sha512 = "zWkVqiTA9RXL6y0hhfZc9bcU4DX2NI6Hw9IhQmSPeM59mdbPjJlY4bLlMr5YxywqO3yQ/ylNoAfrEzrDjlOSRg=="; + url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.257.0.tgz"; + sha512 = "xt7LGOgZIvbLS3418AYQLacOqx+mo5j4mPiIMz7f6AaUg+/fBUgESVsncKDqxbEJVwwCXSka8Ca0cntJmoeMSw=="; }; }; - "@aws-sdk/querystring-builder-3.226.0" = { + "@aws-sdk/querystring-builder-3.257.0" = { name = "_at_aws-sdk_slash_querystring-builder"; packageName = "@aws-sdk/querystring-builder"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.226.0.tgz"; - sha512 = "LVurypuNeotO4lmirKXRC4NYrZRAyMJXuwO0f2a5ZAUJCjauwYrifKue6yCfU7bls7gut7nfcR6B99WBYpHs3g=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.257.0.tgz"; + sha512 = "mZHWLP7XIkzx1GIXO5WfX/iJ+aY9TWs02RE9FkdL2+by0HEMR65L3brQTbU1mIBJ7BjaPwYH24dljUOSABX7yg=="; }; }; - "@aws-sdk/querystring-parser-3.226.0" = { + "@aws-sdk/querystring-parser-3.257.0" = { name = "_at_aws-sdk_slash_querystring-parser"; packageName = "@aws-sdk/querystring-parser"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.226.0.tgz"; - sha512 = "FzB+VrQ47KAFxiPt2YXrKZ8AOLZQqGTLCKHzx4bjxGmwgsjV8yIbtJiJhZLMcUQV4LtGeIY9ixIqQhGvnZHE4A=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.257.0.tgz"; + sha512 = "UDrE1dEwWrWT8dG2VCrGYrPxCWOkZ1fPTPkjpkR4KZEdQDZBqU5gYZF2xPj8Nz7pjQVHFuW2wFm3XYEk56GEjg=="; }; }; - "@aws-sdk/s3-request-presigner-3.252.0" = { + "@aws-sdk/s3-request-presigner-3.259.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.252.0.tgz"; - sha512 = "9V94Fi30Yz5pYPd3aDlbzRYMCUfe7C5D5srMeygZ/XPFsvKC+B16xGKYc2fXb74V+gm68W+6pUVCshOT/AThzA=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.259.0.tgz"; + sha512 = "1qoVZk/HEnnfsbcsbBa5Y/P34T2wI209+VyEtPQzzmZbBJvOONKWySk2sAS+AJO2ZjZZur/sUS61wteuklDZEA=="; }; }; - "@aws-sdk/service-error-classification-3.229.0" = { + "@aws-sdk/service-error-classification-3.257.0" = { name = "_at_aws-sdk_slash_service-error-classification"; packageName = "@aws-sdk/service-error-classification"; - version = "3.229.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.229.0.tgz"; - sha512 = "dnzWWQ0/NoWMUZ5C0DW3dPm0wC1O76Y/SpKbuJzWPkx1EYy6r8p32Ly4D9vUzrKDbRGf48YHIF2kOkBmu21CLg=="; + url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.257.0.tgz"; + sha512 = "FAyR0XsueGkkqDtkP03cTJQk52NdQ9sZelLynmmlGPUP75LApRPvFe1riKrou6+LsDbwVNVffj6mbDfIcOhaOw=="; }; }; - "@aws-sdk/shared-ini-file-loader-3.226.0" = { + "@aws-sdk/shared-ini-file-loader-3.257.0" = { name = "_at_aws-sdk_slash_shared-ini-file-loader"; packageName = "@aws-sdk/shared-ini-file-loader"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.226.0.tgz"; - sha512 = "661VQefsARxVyyV2FX9V61V+nNgImk7aN2hYlFKla6BCwZfMng+dEtD0xVGyg1PfRw0qvEv5LQyxMVgHcUSevA=="; + url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.257.0.tgz"; + sha512 = "HNjC1+Wx3xHiJc+CP14GhIdVhfQGSjroAsWseRxAhONocA9Fl1ZX4hx7+sA5c9nOoMVOovi6ivJ/6lCRPTDRrQ=="; }; }; - "@aws-sdk/signature-v4-3.226.0" = { + "@aws-sdk/signature-v4-3.257.0" = { name = "_at_aws-sdk_slash_signature-v4"; packageName = "@aws-sdk/signature-v4"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.226.0.tgz"; - sha512 = "/R5q5agdPd7HJB68XMzpxrNPk158EHUvkFkuRu5Qf3kkkHebEzWEBlWoVpUe6ss4rP9Tqcue6xPuaftEmhjpYw=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.257.0.tgz"; + sha512 = "aLQQN59X/D0+ShzPD3Anj5ntdMA/RFeNLOUCDyDvremViGi6yxUS98usQ/8bG5Rq0sW2GGMdbFUFmrDvqdiqEQ=="; }; }; - "@aws-sdk/signature-v4-crt-3.226.0" = { + "@aws-sdk/signature-v4-crt-3.257.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.226.0.tgz"; - sha512 = "zaosVAgCnPzIv2qXPi1PGa9RrD3DZ7zfKg/ZGCsYhvFku8+zMK/Ky29+2lS+QB1OzGBW8+ddSuZxJcg0xQi36g=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.257.0.tgz"; + sha512 = "FHM/QulXKxCpAVmAgGduHLps6HAQHZvhY7nnWY+G2Q1S6+d8ijZeaG0fAl7bpZW6FrBbijkWEZV+F7p+V/AHqQ=="; }; }; - "@aws-sdk/signature-v4-multi-region-3.226.0" = { + "@aws-sdk/signature-v4-multi-region-3.257.0" = { name = "_at_aws-sdk_slash_signature-v4-multi-region"; packageName = "@aws-sdk/signature-v4-multi-region"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.226.0.tgz"; - sha512 = "QHxNuf9ynK208v7Y3imdsa3Cz8ynYV7ZOf3sBJdItuEtHN6uy/KxaOrtvpF8I5Hyn48Hc8z5miTSMujFKT7GEw=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.257.0.tgz"; + sha512 = "4ZyJp6my6F6R8jG+zlIR+Sw3W2vZcBTcpzAnSAHI0UBWjx5/buiKU5QY7oj29H3pESDD7DovZinD7TtHvMNoZw=="; }; }; - "@aws-sdk/smithy-client-3.234.0" = { + "@aws-sdk/smithy-client-3.257.0" = { name = "_at_aws-sdk_slash_smithy-client"; packageName = "@aws-sdk/smithy-client"; - version = "3.234.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.234.0.tgz"; - sha512 = "8AtR/k4vsFvjXeQbIzq/Wy7Nbk48Ou0wUEeVYPHWHPSU8QamFWORkOwmKtKMfHAyZvmqiAPeQqHFkq+UJhWyyQ=="; + url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.257.0.tgz"; + sha512 = "Vy/en+llpslHG6WZ2yuN+On6u7p2hROEURwAST/lpReAwBETjbsxylkWvP8maeGKQ54u9uC6lIZAOJut2I3INw=="; }; }; - "@aws-sdk/token-providers-3.252.0" = { + "@aws-sdk/token-providers-3.259.0" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.252.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.252.0.tgz"; - sha512 = "xi3pUP31tyKF4lJFCOgtkwSWESE9W1vE23Vybsq53wzXEYfnRql8RP+C9FFkUouAR6ixPHEcEYplB+l92CY49g=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.259.0.tgz"; + sha512 = "61lbk+vjlHBtNK7ZOTdR0rgk9dQ6++tklHpXZY3AQWAl3xx6K4y00HsyAtcP6k24s8B356QwXlrQJrQY5nnkQQ=="; }; }; - "@aws-sdk/types-3.226.0" = { + "@aws-sdk/types-3.257.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.226.0.tgz"; - sha512 = "MmmNHrWeO4man7wpOwrAhXlevqtOV9ZLcH4RhnG5LmRce0RFOApx24HoKENfFCcOyCm5LQBlsXCqi0dZWDWU0A=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.257.0.tgz"; + sha512 = "LmqXuBQBGeaGi/3Rp7XiEX1B5IPO2UUfBVvu0wwGqVsmstT0SbOVDZGPmxygACbm64n+PRx3uTSDefRfoiWYZg=="; }; }; - "@aws-sdk/url-parser-3.226.0" = { + "@aws-sdk/url-parser-3.257.0" = { name = "_at_aws-sdk_slash_url-parser"; packageName = "@aws-sdk/url-parser"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.226.0.tgz"; - sha512 = "p5RLE0QWyP0OcTOLmFcLdVgUcUEzmEfmdrnOxyNzomcYb0p3vUagA5zfa1HVK2azsQJFBv28GfvMnba9bGhObg=="; + url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.257.0.tgz"; + sha512 = "Qe/AcFe/NFZHa6cN2afXEQn9ehXxh57dWGdRjfjd2lQqNV4WW1R2pl2Tm1ZJ1dwuCNLJi4NHLMk8lrD3QQ8rdg=="; }; }; "@aws-sdk/util-arn-parser-3.208.0" = { @@ -1228,49 +1228,49 @@ let sha512 = "DSRqwrERUsT34ug+anlMBIFooBEGwM8GejC7q00Y/9IPrQy50KnG5PW2NiTjuLKNi7pdEOlwTSEocJE15eDZIg=="; }; }; - "@aws-sdk/util-create-request-3.234.0" = { + "@aws-sdk/util-create-request-3.257.0" = { name = "_at_aws-sdk_slash_util-create-request"; packageName = "@aws-sdk/util-create-request"; - version = "3.234.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.234.0.tgz"; - sha512 = "rKaM2q1jRru724crQx36V6cy07f8yO6KGrsAbRdXzuS2n1c6/w56vwyAw7ArUqjPeIc8pgDxZ0K99Te/RinzdQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.257.0.tgz"; + sha512 = "2s1/LuNtauhwULdYTDMlLCKKmaYZTO8AcAVGOU5n8rCe9eQYWV77xITcf0iB7ilKq/nXBstIpYsbuldq4AIqXQ=="; }; }; - "@aws-sdk/util-defaults-mode-browser-3.234.0" = { + "@aws-sdk/util-defaults-mode-browser-3.257.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-browser"; packageName = "@aws-sdk/util-defaults-mode-browser"; - version = "3.234.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.234.0.tgz"; - sha512 = "IHMKXjTbOD8XMz5+2oCOsVP94BYb9YyjXdns0aAXr2NAo7k2+RCzXQ2DebJXppGda1F6opFutoKwyVSN0cmbMw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.257.0.tgz"; + sha512 = "nkfK+MNacVd3Px/fcAvU0hDeh+r7d+RLLt3sJ5Zc0gGd+i3OQEP58V8QzR9PYMvUvSvGQP16fQVQHSbRZtuWyQ=="; }; }; - "@aws-sdk/util-defaults-mode-node-3.234.0" = { + "@aws-sdk/util-defaults-mode-node-3.259.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-node"; packageName = "@aws-sdk/util-defaults-mode-node"; - version = "3.234.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.234.0.tgz"; - sha512 = "UGjQ+OjBYYhxFVtUY+jtr0ZZgzZh6OHtYwRhFt8IHewJXFCfZTyfsbX20szBj5y1S4HRIUJ7cwBLIytTqMbI5w=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.259.0.tgz"; + sha512 = "wRiiwT7ayIcTYGHUg/Ho9UN/Kd4V37OAxP2IbkG9rPZJNuvtKopQJhUSMDERXaMQ47dG5US8G4YVYJIEO4cKgw=="; }; }; - "@aws-sdk/util-endpoints-3.245.0" = { + "@aws-sdk/util-endpoints-3.257.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.245.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.245.0.tgz"; - sha512 = "UNOFquB1tKx+8RT8n82Zb5tIwDyZHVPBg/m0LB0RsLETjr6krien5ASpqWezsXKIR1hftN9uaxN4bvf2dZrWHg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.257.0.tgz"; + sha512 = "3bvmRn5XGYzPPWjLuvHBKdJOb+fijnb8Ungu9bfXnTYFsng/ndHUWeHC22O/p8w3OWoRYUIMaZHxdxe27BFozg=="; }; }; - "@aws-sdk/util-format-url-3.226.0" = { + "@aws-sdk/util-format-url-3.257.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.226.0.tgz"; - sha512 = "IhuA8iuJL1urWqZZmVzW79mHnwFEEP6rMsSKgAfMmuzowhtgk9p/sT2OVPkXk0LeZL2Ghsnw1W2JfPIs8x1qVg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.257.0.tgz"; + sha512 = "Q/c1BLoEZLvnjagAE0nQryhQlFoC/a8ZrXJn4XljWPeFcFAVLpCoSzcTbQM1N4oQvDIgMvl5gBeGzp0BiW30QA=="; }; }; "@aws-sdk/util-hex-encoding-3.201.0" = { @@ -1291,40 +1291,40 @@ let sha512 = "iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg=="; }; }; - "@aws-sdk/util-middleware-3.226.0" = { + "@aws-sdk/util-middleware-3.257.0" = { name = "_at_aws-sdk_slash_util-middleware"; packageName = "@aws-sdk/util-middleware"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.226.0.tgz"; - sha512 = "B96CQnwX4gRvQdaQkdUtqvDPkrptV5+va6FVeJOocU/DbSYMAScLxtR3peMS8cnlOT6nL1Eoa42OI9AfZz1VwQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.257.0.tgz"; + sha512 = "F9ieon8B8eGVs5tyZtAIG3DZEObDvujkspho0qRbUTHUosM0ylJLsMU800fmC/uRHLRrZvb/RSp59+kNDwSAMw=="; }; }; - "@aws-sdk/util-retry-3.229.0" = { + "@aws-sdk/util-retry-3.257.0" = { name = "_at_aws-sdk_slash_util-retry"; packageName = "@aws-sdk/util-retry"; - version = "3.229.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.229.0.tgz"; - sha512 = "0zKTqi0P1inD0LzIMuXRIYYQ/8c1lWMg/cfiqUcIAF1TpatlpZuN7umU0ierpBFud7S+zDgg0oemh+Nj8xliJw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.257.0.tgz"; + sha512 = "l9TOsOAYtZxwW3q5fQKW4rsD9t2HVaBfQ4zBamHkNTfB4vBVvCnz4oxkvSvA2MlxCA6am+K1K/oj917Tpqk53g=="; }; }; - "@aws-sdk/util-stream-browser-3.226.0" = { + "@aws-sdk/util-stream-browser-3.258.0" = { name = "_at_aws-sdk_slash_util-stream-browser"; packageName = "@aws-sdk/util-stream-browser"; - version = "3.226.0"; + version = "3.258.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.226.0.tgz"; - sha512 = "ZvjlA1ySaLd0DqUWTKmL7LsxfPhroAONpzsinaHmw9aZVL40s2cADU9eWgBdHTuAOeFklL7NP0cc6UiTFHKe8g=="; + url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.258.0.tgz"; + sha512 = "MCAxHL3Hz/+eU4LZk0ZbLWAIUueH/jHpSbrloxZ3Dil2RL3w6NSJd5gE8zS7gs1B/eMcE600Brf5xSDR8kA5HA=="; }; }; - "@aws-sdk/util-stream-node-3.226.0" = { + "@aws-sdk/util-stream-node-3.257.0" = { name = "_at_aws-sdk_slash_util-stream-node"; packageName = "@aws-sdk/util-stream-node"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.226.0.tgz"; - sha512 = "HADXiIgDGoXcCLSKuPnjCLENf0iC0lzqqnymZu9H2FoACZhJB7DvJ9LnP51Pvw9lfCu+yvLzbMqSPdbXtMbRWg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.257.0.tgz"; + sha512 = "UlLEerQCNejNulYmGXm/4X463n8n21foA2d6kgJ4AUSMWWhoRBjfwrM4gI7tA30zh9U81d6xbUtoOQTqKVtMTw=="; }; }; "@aws-sdk/util-uri-escape-3.201.0" = { @@ -1336,49 +1336,49 @@ let sha512 = "TeTWbGx4LU2c5rx0obHeDFeO9HvwYwQtMh1yniBz00pQb6Qt6YVOETVQikRZ+XRQwEyCg/dA375UplIpiy54mA=="; }; }; - "@aws-sdk/util-user-agent-browser-3.226.0" = { + "@aws-sdk/util-user-agent-browser-3.257.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.226.0.tgz"; - sha512 = "PhBIu2h6sPJPcv2I7ELfFizdl5pNiL4LfxrasMCYXQkJvVnoXztHA1x+CQbXIdtZOIlpjC+6BjDcE0uhnpvfcA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.257.0.tgz"; + sha512 = "YdavWK6/8Cw6mypEgysGGX/dT9p9qnzFbnN5PQsUY+JJk2Nx8fKFydjGiQ+6rWPeW17RAv9mmbboh9uPVWxVlw=="; }; }; - "@aws-sdk/util-user-agent-node-3.226.0" = { + "@aws-sdk/util-user-agent-node-3.259.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.226.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.226.0.tgz"; - sha512 = "othPc5Dz/pkYkxH+nZPhc1Al0HndQT8zHD4e9h+EZ+8lkd8n+IsnLfTS/mSJWrfiC6UlNRVw55cItstmJyMe/A=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.259.0.tgz"; + sha512 = "R0VTmNs+ySDDebU98BUbsLyeIM5YmAEr9esPpy15XfSy3AWmAeru8nLlztdaLilHZzLIDzvM2t7NGk/FzZFCvA=="; }; }; - "@aws-sdk/util-utf8-browser-3.188.0" = { + "@aws-sdk/util-utf8-3.254.0" = { + name = "_at_aws-sdk_slash_util-utf8"; + packageName = "@aws-sdk/util-utf8"; + version = "3.254.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/util-utf8/-/util-utf8-3.254.0.tgz"; + sha512 = "14Kso/eIt5/qfIBmhEL9L1IfyUqswjSTqO2mY7KOzUZ9SZbwn3rpxmtkhmATkRjD7XIlLKaxBkI7tU9Zjzj8Kw=="; + }; + }; + "@aws-sdk/util-utf8-browser-3.259.0" = { name = "_at_aws-sdk_slash_util-utf8-browser"; packageName = "@aws-sdk/util-utf8-browser"; - version = "3.188.0"; + version = "3.259.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.188.0.tgz"; - sha512 = "jt627x0+jE+Ydr9NwkFstg3cUvgWh56qdaqAMDsqgRlKD21md/6G226z/Qxl7lb1VEW2LlmCx43ai/37Qwcj2Q=="; + url = "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz"; + sha512 = "UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw=="; }; }; - "@aws-sdk/util-utf8-node-3.208.0" = { - name = "_at_aws-sdk_slash_util-utf8-node"; - packageName = "@aws-sdk/util-utf8-node"; - version = "3.208.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-utf8-node/-/util-utf8-node-3.208.0.tgz"; - sha512 = "jKY87Acv0yWBdFxx6bveagy5FYjz+dtV8IPT7ay1E2WPWH1czoIdMAkc8tSInK31T6CRnHWkLZ1qYwCbgRfERQ=="; - }; - }; - "@aws-sdk/util-waiter-3.226.0" = { + "@aws-sdk/util-waiter-3.257.0" = { name = "_at_aws-sdk_slash_util-waiter"; packageName = "@aws-sdk/util-waiter"; - version = "3.226.0"; + version = "3.257.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.226.0.tgz"; - sha512 = "qYQMRxnu5k8qQihJXoIWMkBOj0+XkHHj/drLdbRnwL6ni6NcG8++cs9M3DSjIcxmxgF/7SLpDjn1H3sC7cYo4g=="; + url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.257.0.tgz"; + sha512 = "Fr6of3EDOcXVDs5534o7VsJMXdybB0uLy2LzeFAVSwGOY3geKhIquBAiUDqCVu9B+iTldrC0rQ9NIM7ZSpPG8w=="; }; }; "@aws-sdk/xml-builder-3.201.0" = { @@ -1552,13 +1552,13 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-common-9.1.0" = { + "@azure/msal-common-9.1.1" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.1.0.tgz"; - sha512 = "Ai7SUJPkHOVUNAjepKp753ZXI8Haw5snTNIu+Vi6fdNPAH1KCuxSyWeBZT6hLDJSgfmYf/kazZqz7Q0BjyAGTA=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.1.1.tgz"; + sha512 = "we9xR8lvu47fF0h+J8KyXoRy9+G/fPzm3QEa2TrdR3jaVS3LKAyE2qyMuUkNdbVkvzl8Zr9f7l+IUSP22HeqXw=="; }; }; "@azure/msal-node-1.14.6" = { @@ -1615,13 +1615,13 @@ let sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.20.10" = { + "@babel/compat-data-7.20.14" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.20.10"; + version = "7.20.14"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.10.tgz"; - sha512 = "sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz"; + sha512 = "0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw=="; }; }; "@babel/core-7.0.0" = { @@ -1642,15 +1642,6 @@ let sha512 = "XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg=="; }; }; - "@babel/core-7.9.0" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz"; - sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; - }; - }; "@babel/generator-7.18.2" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -1660,13 +1651,13 @@ let sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; - "@babel/generator-7.20.7" = { + "@babel/generator-7.20.14" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.20.7"; + version = "7.20.14"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz"; - sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz"; + sha512 = "AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg=="; }; }; "@babel/helper-annotate-as-pure-7.18.6" = { @@ -1885,13 +1876,13 @@ let sha512 = "bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q=="; }; }; - "@babel/helpers-7.20.7" = { + "@babel/helpers-7.20.13" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.20.7"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.7.tgz"; - sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz"; + sha512 = "nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg=="; }; }; "@babel/highlight-7.18.6" = { @@ -1930,13 +1921,13 @@ let sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; }; - "@babel/parser-7.20.7" = { + "@babel/parser-7.20.13" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.20.7"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.7.tgz"; - sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.20.13.tgz"; + sha512 = "gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { @@ -1993,13 +1984,13 @@ let sha512 = "AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ=="; }; }; - "@babel/plugin-proposal-decorators-7.20.7" = { + "@babel/plugin-proposal-decorators-7.20.13" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.20.7"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.7.tgz"; - sha512 = "JB45hbUweYpwAGjkiM7uCyXMENH2lG+9r3G2E+ttc2PRXAoEkpfd/KW5jDg4j8RS6tLtTG1jZi9LbHZVSfs1/A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.20.13.tgz"; + sha512 = "7T6BKHa9Cpd7lCueHBBzP0nkXNina+h5giOZw+a8ZpMfPFY19VjJAjIxyFHuWkhCWgL6QMqRiY/wB1fLXzm6Mw=="; }; }; "@babel/plugin-proposal-dynamic-import-7.18.6" = { @@ -2344,13 +2335,13 @@ let sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.20.11" = { + "@babel/plugin-transform-block-scoping-7.20.14" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.20.11"; + version = "7.20.14"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.11.tgz"; - sha512 = "tA4N427a7fjf1P0/2I4ScsHGc5jcHPbb30xMbaTke2gxDuWpUfXDuX1FEymJwKk4tuGUvGcejAR6HdZVqmmPyw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.14.tgz"; + sha512 = "sMPepQtsOs5fM1bwNvuJJHvaCfOEQfmc01FGw0ELlTpTJj5Ql/zuNRRldYhAPys4ghXdBIQJbRVYi44/7QflQQ=="; }; }; "@babel/plugin-transform-classes-7.20.7" = { @@ -2542,13 +2533,13 @@ let sha512 = "TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA=="; }; }; - "@babel/plugin-transform-react-jsx-7.20.7" = { + "@babel/plugin-transform-react-jsx-7.20.13" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.20.7"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.7.tgz"; - sha512 = "Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.13.tgz"; + sha512 = "MmTZx/bkUrfJhhYAYt3Urjm+h8DQGrPrnKQ94jLo7NLuOU+T89a7IByhKmrb8SKhrIYIQ0FN0CHMbnFRen4qNw=="; }; }; "@babel/plugin-transform-react-jsx-development-7.18.6" = { @@ -2668,13 +2659,13 @@ let sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; }; }; - "@babel/plugin-transform-typescript-7.20.7" = { + "@babel/plugin-transform-typescript-7.20.13" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.20.7"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.7.tgz"; - sha512 = "m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.20.13.tgz"; + sha512 = "O7I/THxarGcDZxkgWKMUrk7NK1/WbHAg3Xx86gqS6x9MTrNL6AwIluuZ96ms4xeDe6AVx6rjHbWHP7x26EPQBA=="; }; }; "@babel/plugin-transform-unicode-escapes-7.18.10" = { @@ -2794,22 +2785,22 @@ let sha512 = "7hGhzlcmg01CvH1EHdSPVXYX1aJ8KCEyz6I9xYIi/asDtzBPMyMhVibhM/K6g/5qnKBwjZtp10bNZIEFTRW1MA=="; }; }; - "@babel/runtime-7.20.1" = { + "@babel/runtime-7.12.1" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.1"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz"; - sha512 = "mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz"; + sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA=="; }; }; - "@babel/runtime-7.20.7" = { + "@babel/runtime-7.20.13" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.7"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz"; - sha512 = "UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz"; + sha512 = "gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA=="; }; }; "@babel/runtime-7.9.0" = { @@ -2830,15 +2821,6 @@ let sha512 = "Yww0jXgolNtkhcK+Txo5JN+DjBpNmmAtD7G99HOebhEjBzjnACG09Tip9C8lSOF6PrhA56OeJWeOZduNJaKxBA=="; }; }; - "@babel/runtime-corejs3-7.20.7" = { - name = "_at_babel_slash_runtime-corejs3"; - packageName = "@babel/runtime-corejs3"; - version = "7.20.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.7.tgz"; - sha512 = "jr9lCZ4RbRQmCR28Q8U8Fu49zvFqLxTY9AMOUz+iyMohMoAgpEcVxY+wJNay99oXOpOcCTODkk70NDN2aaJEeg=="; - }; - }; "@babel/template-7.0.0" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; @@ -2857,13 +2839,13 @@ let sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; }; - "@babel/traverse-7.20.12" = { + "@babel/traverse-7.20.13" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.20.12"; + version = "7.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.12.tgz"; - sha512 = "MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz"; + sha512 = "kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ=="; }; }; "@babel/types-7.18.4" = { @@ -2911,40 +2893,40 @@ let sha512 = "Tbsj02wXCbqGmzdnXNk0SOF19ChhRU70BsroIi4Pm6Ehp56in6vch94mfbdQ17DozxkL3BAVjbZ4Qc1a0HFRAg=="; }; }; - "@cdktf/cli-core-0.15.0" = { + "@cdktf/cli-core-0.15.2" = { name = "_at_cdktf_slash_cli-core"; packageName = "@cdktf/cli-core"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.15.0.tgz"; - sha512 = "1N1N66dMl1kfAXcxTgKgePO9RfhB/p5T4dCAhfMCzLe+R0rOO1xfYQcIEXWqoORwRiIE2EyW9O9OSkxLx0DuyQ=="; + url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.15.2.tgz"; + sha512 = "uiOqLik/s6LETazIOkHhwReSiBlw7sPYWGaJ/VU1btmbaVbVBpHKrLY/Nr7Vf8kRN80WsboBDAgaX4RQYpYu3Q=="; }; }; - "@cdktf/commons-0.15.0" = { + "@cdktf/commons-0.15.2" = { name = "_at_cdktf_slash_commons"; packageName = "@cdktf/commons"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.15.0.tgz"; - sha512 = "c3NB2X4OsUGUicpUMJSV9MGnmU+/nYNs0n7G98c/N7nctxWpm1oPoXkoSC8GsDbc3n44cuokBDgW2JiscB/YRA=="; + url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.15.2.tgz"; + sha512 = "4uVx5L+FJV+G5zoC545MmFSPohUWy/x3Iq9UGW/kf4U7xkVE9oYHeupEc7TSLXp54vPcze+VCuYvgLWtO5Lzpg=="; }; }; - "@cdktf/hcl2cdk-0.15.0" = { + "@cdktf/hcl2cdk-0.15.2" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.15.0.tgz"; - sha512 = "X88IejdGoYpB7DkAf09v8YLMQiYu1VTKWVvggiGkS0q7DgFb79Q/S9aFfC5RfPrMNhZSV01Jrt/pDCQdcFJQ1A=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.15.2.tgz"; + sha512 = "LF++X2n4XOuLR2boBNzv/ihRt9ZySO3feYndRdusLtgOC3HppbTKjwlS7+2xHyH2/DYZYKMWps2gtAsqhYa4IA=="; }; }; - "@cdktf/hcl2json-0.15.0" = { + "@cdktf/hcl2json-0.15.2" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.15.0.tgz"; - sha512 = "pVYjTosthO0Mro/VD5x4iUM6TcVk0hdeNzk8uaaxk49/XnJB4DiwHbvIdjKJk4BuY2YuW+bCsz6X2QjKJmz2jA=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.15.2.tgz"; + sha512 = "f98sMnJEFmo2bSrMbkNGtg8gfE9sP6wBLu5G5u7qLkR747wtF0eA7mYc2751XMyeGDwAP1IwetlG5zOpENuW0g=="; }; }; "@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.10" = { @@ -2956,13 +2938,13 @@ let sha512 = "5ysQrHJvqYLYg407KvaDNu+xx68ZGaqeF0SohXe5e4yNqJhPFPUQ536rkReQcPc2yZiF5PDmmvf5T9MOacHpSQ=="; }; }; - "@cdktf/provider-generator-0.15.0" = { + "@cdktf/provider-generator-0.15.2" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.15.0.tgz"; - sha512 = "YY2ANbC9xuhq1yXc6dhVPvMCCKMjcXNRBUP6BqvlE2smD0RWx1s0uWKAG5Tw4D4kx4Nb6EXYpvFHRIEnjVJ4wA=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.15.2.tgz"; + sha512 = "153jtaorRZsdWy3Wt56rOlTi7SoNXNWo3hl4By4v585T1WDFMa/NIsT8qBibLrJmiwmnHyh4r5KRjrn1KQpi1Q=="; }; }; "@chemzqm/msgpack-lite-0.1.29" = { @@ -3820,13 +3802,13 @@ let sha512 = "pfF3Ys2gRffu5ElqkH7FQMDMi/iZMyOzpGMb3FSH0PJ2AnRQ5rRNWght1h2L36YxvXl0mWVaFrrfwiOyRIc8ZQ=="; }; }; - "@cspell/dict-software-terms-3.1.0" = { + "@cspell/dict-software-terms-3.1.1" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.1.0.tgz"; - sha512 = "KQVpHmuGJprkriClbwTf1TfCjkCkS+GqLBO8ytltmYylCHZumJMfA3sM10e3zmsVIlungrtNLG9xz5opIdm/2A=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.1.1.tgz"; + sha512 = "11vzKnocWDEUnwh03ea5Pr0vfMkGgUvDsAAjNQmnXVzDMYIjPVbttrRy54pEfBv0/RxtDFR0lDKFUAcdyjPX2w=="; }; }; "@cspell/dict-sql-2.0.1" = { @@ -3919,13 +3901,13 @@ let sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; }; }; - "@csstools/selector-specificity-2.0.2" = { + "@csstools/selector-specificity-2.1.1" = { name = "_at_csstools_slash_selector-specificity"; packageName = "@csstools/selector-specificity"; - version = "2.0.2"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz"; - sha512 = "IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg=="; + url = "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.1.1.tgz"; + sha512 = "jwx+WCqszn53YHOfvFMJJRd/B2GqkCBt+1MJSG6o5/s8+ytHMvDZXsJgUEWLk12UnLd7HYKac4BYU5i/Ron1Cw=="; }; }; "@cycle/dom-18.3.0" = { @@ -4324,6 +4306,96 @@ let sha512 = "5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw=="; }; }; + "@esbuild/android-arm-0.16.17" = { + name = "_at_esbuild_slash_android-arm"; + packageName = "@esbuild/android-arm"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.16.17.tgz"; + sha512 = "N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw=="; + }; + }; + "@esbuild/android-arm64-0.16.17" = { + name = "_at_esbuild_slash_android-arm64"; + packageName = "@esbuild/android-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz"; + sha512 = "MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg=="; + }; + }; + "@esbuild/android-x64-0.16.17" = { + name = "_at_esbuild_slash_android-x64"; + packageName = "@esbuild/android-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.16.17.tgz"; + sha512 = "a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ=="; + }; + }; + "@esbuild/darwin-arm64-0.16.17" = { + name = "_at_esbuild_slash_darwin-arm64"; + packageName = "@esbuild/darwin-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz"; + sha512 = "/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w=="; + }; + }; + "@esbuild/darwin-x64-0.16.17" = { + name = "_at_esbuild_slash_darwin-x64"; + packageName = "@esbuild/darwin-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz"; + sha512 = "2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg=="; + }; + }; + "@esbuild/freebsd-arm64-0.16.17" = { + name = "_at_esbuild_slash_freebsd-arm64"; + packageName = "@esbuild/freebsd-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz"; + sha512 = "mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw=="; + }; + }; + "@esbuild/freebsd-x64-0.16.17" = { + name = "_at_esbuild_slash_freebsd-x64"; + packageName = "@esbuild/freebsd-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz"; + sha512 = "8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug=="; + }; + }; + "@esbuild/linux-arm-0.16.17" = { + name = "_at_esbuild_slash_linux-arm"; + packageName = "@esbuild/linux-arm"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz"; + sha512 = "iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ=="; + }; + }; + "@esbuild/linux-arm64-0.16.17" = { + name = "_at_esbuild_slash_linux-arm64"; + packageName = "@esbuild/linux-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz"; + sha512 = "7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g=="; + }; + }; + "@esbuild/linux-ia32-0.16.17" = { + name = "_at_esbuild_slash_linux-ia32"; + packageName = "@esbuild/linux-ia32"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz"; + sha512 = "kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg=="; + }; + }; "@esbuild/linux-loong64-0.15.18" = { name = "_at_esbuild_slash_linux-loong64"; packageName = "@esbuild/linux-loong64"; @@ -4333,6 +4405,114 @@ let sha512 = "L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ=="; }; }; + "@esbuild/linux-loong64-0.16.17" = { + name = "_at_esbuild_slash_linux-loong64"; + packageName = "@esbuild/linux-loong64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz"; + sha512 = "dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ=="; + }; + }; + "@esbuild/linux-mips64el-0.16.17" = { + name = "_at_esbuild_slash_linux-mips64el"; + packageName = "@esbuild/linux-mips64el"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz"; + sha512 = "ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw=="; + }; + }; + "@esbuild/linux-ppc64-0.16.17" = { + name = "_at_esbuild_slash_linux-ppc64"; + packageName = "@esbuild/linux-ppc64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz"; + sha512 = "dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g=="; + }; + }; + "@esbuild/linux-riscv64-0.16.17" = { + name = "_at_esbuild_slash_linux-riscv64"; + packageName = "@esbuild/linux-riscv64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz"; + sha512 = "ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw=="; + }; + }; + "@esbuild/linux-s390x-0.16.17" = { + name = "_at_esbuild_slash_linux-s390x"; + packageName = "@esbuild/linux-s390x"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz"; + sha512 = "gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w=="; + }; + }; + "@esbuild/linux-x64-0.16.17" = { + name = "_at_esbuild_slash_linux-x64"; + packageName = "@esbuild/linux-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz"; + sha512 = "mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw=="; + }; + }; + "@esbuild/netbsd-x64-0.16.17" = { + name = "_at_esbuild_slash_netbsd-x64"; + packageName = "@esbuild/netbsd-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz"; + sha512 = "/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA=="; + }; + }; + "@esbuild/openbsd-x64-0.16.17" = { + name = "_at_esbuild_slash_openbsd-x64"; + packageName = "@esbuild/openbsd-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz"; + sha512 = "2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg=="; + }; + }; + "@esbuild/sunos-x64-0.16.17" = { + name = "_at_esbuild_slash_sunos-x64"; + packageName = "@esbuild/sunos-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz"; + sha512 = "xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw=="; + }; + }; + "@esbuild/win32-arm64-0.16.17" = { + name = "_at_esbuild_slash_win32-arm64"; + packageName = "@esbuild/win32-arm64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz"; + sha512 = "ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw=="; + }; + }; + "@esbuild/win32-ia32-0.16.17" = { + name = "_at_esbuild_slash_win32-ia32"; + packageName = "@esbuild/win32-ia32"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz"; + sha512 = "WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig=="; + }; + }; + "@esbuild/win32-x64-0.16.17" = { + name = "_at_esbuild_slash_win32-x64"; + packageName = "@esbuild/win32-x64"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz"; + sha512 = "y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q=="; + }; + }; "@eslint/eslintrc-0.4.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; @@ -4531,6 +4711,15 @@ let sha512 = "BNhXkY1bblxKZpltzAx98G2Egj9g1Q+JRcvR7E99DOj862FTCX+ZPsAUtPTr7aHxwtrL7+fL3r0JSmM9kBm+Bw=="; }; }; + "@expo/config-6.0.20" = { + name = "_at_expo_slash_config"; + packageName = "@expo/config"; + version = "6.0.20"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/config/-/config-6.0.20.tgz"; + sha512 = "m2T1/hB4TyLkQElOUwOajn/7gBcPaGyfVwoVsuJMEh0yrNvNFtXP+nl87Cm53g5q+VyfwJUgbewPQ3j/UXkI6Q=="; + }; + }; "@expo/config-6.0.24" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; @@ -4549,6 +4738,15 @@ let sha512 = "joVtB5o+NF40Tmsdp65UzryRtbnCuMbXkVO4wJnNJO4aaK0EYLdHCYSewORVqNcDfGN0LphQr8VTG2npbd9CJA=="; }; }; + "@expo/config-plugins-4.1.1" = { + name = "_at_expo_slash_config-plugins"; + packageName = "@expo/config-plugins"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.1.1.tgz"; + sha512 = "lo3tVxRhwM9jfxPHJcURsH5WvU26kX12h5EB3C7kjVhgdQPLkvT8Jk8Cx0KSL8MXKcry2xQvZ2uuwWLkMeplJw=="; + }; + }; "@expo/config-plugins-4.1.5" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; @@ -4567,6 +4765,15 @@ let sha512 = "vzUcVpqOMs3h+hyRdhGwk+eGIOhXa5xYdd92yO17RMNHav3v/+ekMbs7XA2c3lepMO8Yd4/5hqmRw9ZTL6jGzg=="; }; }; + "@expo/config-types-44.0.0" = { + name = "_at_expo_slash_config-types"; + packageName = "@expo/config-types"; + version = "44.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/config-types/-/config-types-44.0.0.tgz"; + sha512 = "d+gpdKOAhqaD5RmcMzGgKzNtvE1w+GCqpFQNSXLliYlXjj+Tv0eL8EPeAdPtvke0vowpPFwd5McXLA90dgY6Jg=="; + }; + }; "@expo/config-types-45.0.0" = { name = "_at_expo_slash_config-types"; packageName = "@expo/config-types"; @@ -4657,6 +4864,15 @@ let sha512 = "nhUVvW0TrRE4jtWzHQl8TR4ox7kcmrc2I0itaeJGjxF5A54uk7avgA0wRt7jP1rdvqQo1Ke1lXyLYREdhN9tPw=="; }; }; + "@expo/json-file-8.2.35" = { + name = "_at_expo_slash_json-file"; + packageName = "@expo/json-file"; + version = "8.2.35"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.35.tgz"; + sha512 = "cQFLGSNRRFbN9EIhVDpMCYuzXbrHUOmKEqitBR+nrU6surjKGsOsN9Ubyn/L/LAGlFvT293E4XY5zsOtJyiPZQ=="; + }; + }; "@expo/json-file-8.2.36" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; @@ -4864,13 +5080,13 @@ let sha512 = "TI+l71+5aSKnShYclFa14Kum+hQMZ86b95SH6tQUG3qZEmLTarvWpKwqtTwQKqvlJSJrpFiSFu3eCuZokY6zWA=="; }; }; - "@expo/webpack-config-0.17.4" = { + "@expo/webpack-config-18.0.1" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.17.4"; + version = "18.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.17.4.tgz"; - sha512 = "vn37RDhYowfLc2oRaXhmbI/9FStjQFXPONG3yRLfwUnA4dRtfXapJUSKHJKRwOy4fBBmTrb2tthtsdb4zeWmsw=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-18.0.1.tgz"; + sha512 = "0C+wjmmQ0usySdhtzeRp0yYuf9zkUZ/kNgA6AHQ9N7eG4JIr0DM1c87g119smxcJTbd8N+//mv5znPxSJqBqmg=="; }; }; "@expo/xcpretty-4.2.2" = { @@ -5008,22 +5224,22 @@ let sha512 = "X4fN5zbvAETw9LE8bw9x5otKcpS3A3cB9wn/BookbTD4hkBESx06SzmX/WdabFq7qqbDqbURiQMpmdGUUlLsqw=="; }; }; - "@fluentui/font-icons-mdl2-8.5.6" = { + "@fluentui/font-icons-mdl2-8.5.7" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.5.6"; + version = "8.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.5.6.tgz"; - sha512 = "6yGZcc/fIeT/HDPjnn003TNuC/EUoiZTiyZQyPSSQl5PeOzkmNOqG8nq/l8s+qXHs4uZC/FH081vxPxSwA2qWA=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.5.7.tgz"; + sha512 = "IAZ4nLWW6JDzGsCAymLS7ncaxWpQDY48K8650IfIlcsdhxv027joQEgd+HiIIImgusMl+OS9nAQE04a68mE6Zw=="; }; }; - "@fluentui/foundation-legacy-8.2.26" = { + "@fluentui/foundation-legacy-8.2.27" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.2.26"; + version = "8.2.27"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.26.tgz"; - sha512 = "7XKz23HB7IeIIXORS1os2fIakYTLTTGFcs+mnK5f/b4xFJAOxxdte6i10f2WsPPFiTjW1kLOzICsRsfwuHAVRw=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.27.tgz"; + sha512 = "KIK7N6thJ9EzwQBLysavdsJHt6mnsA1O2ZHLI9d4yDQlx17EVa0aXrdsSNgqfa1czya3OmBDVQMFR2gqy38voQ=="; }; }; "@fluentui/keyboard-key-0.4.4" = { @@ -5044,22 +5260,22 @@ let sha512 = "+cyN28iRAn8BWlZkMSEWzXpsJJiy3wWFxdJx5UnvU3iLK1slwog94inJak/BmnQKk3dFXK9vVPtDp2s3l+2/hg=="; }; }; - "@fluentui/react-8.104.5" = { + "@fluentui/react-8.104.8" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.104.5"; + version = "8.104.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.104.5.tgz"; - sha512 = "BdyDS6yEccDuzUzYQ1h1idO2wrKLi9iMkErg1wJfODlnnqVVU5x+3x8cjkH8xHndScQ0zaVBuw84xxqP7ZCPFA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.104.8.tgz"; + sha512 = "FVpyhZwPfpkHcP9d7Q5lQ7PPeSD2tLPaWGCGNhPHBsD0BS/A5Sv1+XN2LN1E+wbJUIvKrdVfxoWmUqDaNlpZjg=="; }; }; - "@fluentui/react-focus-8.8.12" = { + "@fluentui/react-focus-8.8.13" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.8.12"; + version = "8.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.12.tgz"; - sha512 = "2uuU/CQ371YnNxKqUVfnxahW93OT3y2Tp8calmBVxzmyBwZxGpI5JF+PdNorNWhDSaruX+j31QwxoXUNz1vI9Q=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.8.13.tgz"; + sha512 = "Y9RlqjJdWB7of/GJt/M8Ezf5tP2JSFjfEqe7W6Ttjr7wxiZZr4X8hJISWOksPSzvWyc0CT5J9uPEX0IWBHFsFQ=="; }; }; "@fluentui/react-hooks-8.6.15" = { @@ -5098,13 +5314,13 @@ let sha512 = "v12VUrpThYcJESFrnu3LdL7/s957hoSCJ3t8C014Hp2IOmk3dnZRZJymf1k/RAOXztS4w9dF2Zhs8uP31qwcZw=="; }; }; - "@fluentui/style-utilities-8.8.5" = { + "@fluentui/style-utilities-8.9.0" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.8.5"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.8.5.tgz"; - sha512 = "qUi+1a2v0nWo3LB4c13Qf81qQH1yO9YHAgfbRNLqs4w7Oie7NDBDkq7UgRmLErpSVEafvlcCZeCSKW5pvSxz5w=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.9.0.tgz"; + sha512 = "n64tj38ndvT9WSwzt3tQl5MuOaRQmRBzfv7GM2dCjJ6CblWHpSV8jRXX44RnkOFr/QRCrq+gv8sEveXKsyRtag=="; }; }; "@fluentui/theme-2.6.21" = { @@ -5125,13 +5341,13 @@ let sha512 = "YusKxwTEQmsJidEWxn8blf5ehBmBDMZDrOjQkSX4piCvi/57MfigQZ57L3Bdic8kDKsabVtS1IVMHLZzGy4zcQ=="; }; }; - "@forge/api-2.9.1" = { + "@forge/api-2.10.0" = { name = "_at_forge_slash_api"; packageName = "@forge/api"; - version = "2.9.1"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/api/-/api-2.9.1.tgz"; - sha512 = "ZGW5WW9NmWkYaGXLqbZ7HwAvYO0sSCY7j8IX0ij7vMuQb7myFXk5jCFYxaA3a4uI2RnYf2v0ROZxfPx4kxd5Aw=="; + url = "https://registry.npmjs.org/@forge/api/-/api-2.10.0.tgz"; + sha512 = "o8xmjOUIJcQfGAiaKdpowO2FNdm74icD+KT0SdnMXCQ7wToLUcJE4K4vSFoebBov+HGRAQphnmlC/KbgkgWXFQ=="; }; }; "@forge/auth-0.0.1" = { @@ -5152,22 +5368,22 @@ let sha512 = "+GFtFqBhFzwKaKmeEfw1jWQgZJNX4q11CCx1fSPFJB49Fdjb7k3lx74jAyzHlX0UWnm6DMK+/cYT7j5t6G9LfA=="; }; }; - "@forge/bundler-4.2.0" = { + "@forge/bundler-4.3.0" = { name = "_at_forge_slash_bundler"; packageName = "@forge/bundler"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/bundler/-/bundler-4.2.0.tgz"; - sha512 = "4xL9ZjPVgIrrpVeg1S3187FhDbCB4EBa/9nhCBAG8abDujb+D8/zJuiapin5AmUkWl6bFS1PjTBmetanBD4gcA=="; + url = "https://registry.npmjs.org/@forge/bundler/-/bundler-4.3.0.tgz"; + sha512 = "S1XXXYpaiKXRdNV0Eqv4e6uyc1m+lwvnwRUZKoUsP5tpdBTUPNTT3W0jckKYtpCkHueuwh5BM/J4B9LGp7PpWQ=="; }; }; - "@forge/cli-shared-3.5.0" = { + "@forge/cli-shared-3.5.1" = { name = "_at_forge_slash_cli-shared"; packageName = "@forge/cli-shared"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.5.0.tgz"; - sha512 = "n7CSsL55BCAm3s4g/duDpk/khlARggcjGoTT3KhVYe0duZ0okN47XtRo2D7mSnfM/a3jHac5zCiv+BOEFyYSag=="; + url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-3.5.1.tgz"; + sha512 = "a88bF0v8+H/JKRpPVamfdoi0Bd59vWbAy0LISrmfcE18chCQKHEeZ4ZzOI5KDII4QxXIGc7hWzxJ0aGhQyNKIQ=="; }; }; "@forge/egress-1.1.1" = { @@ -5179,22 +5395,22 @@ let sha512 = "ycnIIOKyurzchlocjjvTwqtQNsCF98XRT+YvwVwZWwKZ0OmSzPcXPZImrIFw3dF1qySwRwRL31R0xZ1HYUEs8w=="; }; }; - "@forge/lint-3.2.12" = { + "@forge/lint-3.2.13" = { name = "_at_forge_slash_lint"; packageName = "@forge/lint"; - version = "3.2.12"; + version = "3.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/lint/-/lint-3.2.12.tgz"; - sha512 = "Z1dRnj3zRf+Rf9BMA2ompNYQdAAXYwOVw2NHBrYK0zwQjfnKC7Aco1tAyvYjkSbnyXnDSLlWAsFocgzJ7pX5Cw=="; + url = "https://registry.npmjs.org/@forge/lint/-/lint-3.2.13.tgz"; + sha512 = "kP0s77zmdyT3qWGL0auScWCU0WTaOCS6tTErpbp94IUO3yruiyLMoTLrtKdbefuFbkTLPv7vFkeXkcK7et2/tw=="; }; }; - "@forge/manifest-4.5.3" = { + "@forge/manifest-4.6.0" = { name = "_at_forge_slash_manifest"; packageName = "@forge/manifest"; - version = "4.5.3"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/manifest/-/manifest-4.5.3.tgz"; - sha512 = "px02/hJJk31JiEdMhm4kUgZwNlr6b7wAyL72cxnul2PjQ9bsMUXoP22/nSCV1uIzNznqGbXNnKJ+GKGqIhyQ1g=="; + url = "https://registry.npmjs.org/@forge/manifest/-/manifest-4.6.0.tgz"; + sha512 = "wmARdfQAZlqfmPXjgL8pbEzcXi/oYoyy7Eh5mH4k4NEa5rii/rwg9gz7S7Q1sFhUEdDOBjYgkonmUUc2X48DcQ=="; }; }; "@forge/storage-1.3.1" = { @@ -5296,13 +5512,13 @@ let sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; }; }; - "@google-cloud/pubsub-3.2.1" = { + "@google-cloud/pubsub-3.3.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-3.2.1.tgz"; - sha512 = "TcGPqNkCYNwM3LTWBYjdryv1WQX2a4H52gaL9IAMZCp1i28r90syWjZoFhcUObowb3v3StTCL6a9YlPef4LY3g=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-3.3.0.tgz"; + sha512 = "pypP7JYqKnVOO7wES71TkyxQD7UluWMc/7zH5wFZ6ycLRfonLvO1XBBS3Hcg4ltMEjBlYxRC6ODbzYLfuZm9/g=="; }; }; "@grammarly/sdk-1.11.0" = { @@ -5368,13 +5584,13 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/delegate-9.0.22" = { + "@graphql-tools/delegate-9.0.23" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "9.0.22"; + version = "9.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-9.0.22.tgz"; - sha512 = "dWJGMN8V7KORtbI8eDAjHYTWiMyis/md27M6pPhrlYVlcsDk3U0jbNdgkswBBUEBvqumPRCv8pVOxKcLS4caKA=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-9.0.23.tgz"; + sha512 = "pTmC2ZUGRp/j4bwQRccZV+J2ETMeHYF9RmEXHHdj0S7/LOpyfFE3mGvRV2+n6MzXpPCPp+mh037LWF+q4wLcJw=="; }; }; "@graphql-tools/executor-0.0.12" = { @@ -5386,13 +5602,13 @@ let sha512 = "bWpZcYRo81jDoTVONTnxS9dDHhEkNVjxzvFCH4CRpuyzD3uL+5w3MhtxIh24QyWm4LvQ4f+Bz3eMV2xU2I5+FA=="; }; }; - "@graphql-tools/executor-graphql-ws-0.0.6" = { + "@graphql-tools/executor-graphql-ws-0.0.7" = { name = "_at_graphql-tools_slash_executor-graphql-ws"; packageName = "@graphql-tools/executor-graphql-ws"; - version = "0.0.6"; + version = "0.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-0.0.6.tgz"; - sha512 = "n6JvIviYO8iiasV/baclimQqNkYGP7JRlkNSnphNG5LULmVpQ2WsyvbgJHV7wtlTZ8ZQ3+dILgQF83PFyLsfdA=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-0.0.7.tgz"; + sha512 = "C6EExKoukn4vu3BbvlqsqtC91F4pTLPDZvRceYjpFzTCQSGFSjfrxQGP/haGlemXVRpIDxBy7wpXoQlsF8UmFA=="; }; }; "@graphql-tools/executor-http-0.1.1" = { @@ -5467,13 +5683,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/load-7.8.9" = { + "@graphql-tools/load-7.8.10" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "7.8.9"; + version = "7.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.8.9.tgz"; - sha512 = "/eHRv6OCTI/Ir5XcbtSx0XbW3zOQVscp2MZQFGZKDzqCcGD+NVy4mLCoBwR/OsOUpvWAwMnc+Llb4SDKAYGmjQ=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.8.10.tgz"; + sha512 = "Mc1p7ZSxrW5yGG3BLQnhiL8RPG0HdxFVoHV7fpx2adp4o1V7BzDjKRSbCnAxShA1wA4n8wbA+n7NTC0edi4eNA=="; }; }; "@graphql-tools/merge-6.2.17" = { @@ -5494,22 +5710,22 @@ let sha512 = "BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg=="; }; }; - "@graphql-tools/merge-8.3.15" = { + "@graphql-tools/merge-8.3.16" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.3.15"; + version = "8.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.15.tgz"; - sha512 = "hYYOlsqkUlL6oOo7zzuk6hIv7xQzy+x21sgK84d5FWaiWYkLYh9As8myuDd9SD5xovWWQ9m/iRhIOVDEMSyEKA=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.16.tgz"; + sha512 = "In0kcOZcPIpYOKaqdrJ3thdLPE7TutFnL9tbrHUy2zCinR2O/blpRC48jPckcs0HHrUQ0pGT4HqvzMkZUeEBAw=="; }; }; - "@graphql-tools/mock-8.7.15" = { + "@graphql-tools/mock-8.7.16" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.7.15"; + version = "8.7.16"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.15.tgz"; - sha512 = "0zImG5tuObhowqtijlB6TMAIVtCIBsnGGwNW8gnCOa+xZAqfGdUMsSma17tHC2XuI7xhv7A0O8pika9e3APLUg=="; + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.16.tgz"; + sha512 = "g1BcIk6OKeqDwezbn6QOQ+UkbzfZDvcolomXOoGTaE+KNw5JV9EKKIt1COyWtKeNrwtIdPPBS/zcLAqOw1MUdQ=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -5530,13 +5746,13 @@ let sha512 = "0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg=="; }; }; - "@graphql-tools/schema-9.0.13" = { + "@graphql-tools/schema-9.0.14" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "9.0.13"; + version = "9.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.13.tgz"; - sha512 = "guRA3fwAtv+M1Kh930P4ydH9aKJTWscIkhVFcWpj/cnjYYxj88jkEJ15ZNiJX/2breNY+sbVgmlgLKb6aXi/Jg=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.14.tgz"; + sha512 = "U6k+HY3Git+dsOEhq+dtWQwYg2CAgue8qBvnBXoKu5eEeH284wymMUoNm0e4IycOgMCJANVhClGEBIkLRu3FQQ=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -5548,13 +5764,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.17.2" = { + "@graphql-tools/url-loader-7.17.4" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.17.2"; + version = "7.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.17.2.tgz"; - sha512 = "VgCXa5vQzcM13+loJvVHLXltp3qN8PHUTeth50cImUhCm3qtRwOeuSYjpph38vllPb8DKxsZkNFxzYgzscWIow=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.17.4.tgz"; + sha512 = "nB2fhkn4LTYjU2qoTOBZYmWQRVYsCI0K2LScwD49QVMNAPWthg/lHao4hFUe70aTInT8oquvl8d0rIb7fRWOvA=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -5620,13 +5836,13 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; - "@graphql-tools/wrap-9.3.1" = { + "@graphql-tools/wrap-9.3.2" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "9.3.1"; + version = "9.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-9.3.1.tgz"; - sha512 = "uzY1HKc7qMErWL3ybv8bFG3hI1rTJPVYQ8WeJkCF/r/+aHEkUj0Bo2PYZrZTX1UIr3Tb4P5GyhqYBgZOXraZjw=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-9.3.2.tgz"; + sha512 = "jqBMJZyKFATxWA3alPhGRWh/ZluaPWrXFumXRaqAwK9QdCAxM24jG8Kmy3FrTfeyxNqDyzDlHZobtwwDKurm5g=="; }; }; "@graphql-typed-document-node/core-3.1.1" = { @@ -5647,15 +5863,6 @@ let sha512 = "H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog=="; }; }; - "@grpc/grpc-js-1.8.0" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.8.0.tgz"; - sha512 = "ySMTXQuMvvswoobvN+0LsaPf7ITO2JVfJmHxQKI4cGehNrrUms+n81BlHEX7Hl/LExji6XE3fnI9U04GSkRruA=="; - }; - }; "@grpc/grpc-js-1.8.1" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -6097,6 +6304,285 @@ let sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw=="; }; }; + "@jimp/bmp-0.16.2" = { + name = "_at_jimp_slash_bmp"; + packageName = "@jimp/bmp"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.16.2.tgz"; + sha512 = "4g9vW45QfMoGhLVvaFj26h4e7cC+McHUQwyFQmNTLW4FfC1OonN9oUr2m/FEDGkTYKR7aqdXR5XUqqIkHWLaFw=="; + }; + }; + "@jimp/core-0.16.2" = { + name = "_at_jimp_slash_core"; + packageName = "@jimp/core"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/core/-/core-0.16.2.tgz"; + sha512 = "dp7HcyUMzjXphXYodI6PaXue+I9PXAavbb+AN+1XqFbotN22Z12DosNPEyy+UhLY/hZiQQqUkEaJHkvV31rs+w=="; + }; + }; + "@jimp/custom-0.16.2" = { + name = "_at_jimp_slash_custom"; + packageName = "@jimp/custom"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/custom/-/custom-0.16.2.tgz"; + sha512 = "GtNwOs4hcVS2GIbqRUf42rUuX07oLB92cj7cqxZb0ZGWwcwhnmSW0TFLAkNafXmqn9ug4VTpNvcJSUdiuECVKg=="; + }; + }; + "@jimp/gif-0.16.2" = { + name = "_at_jimp_slash_gif"; + packageName = "@jimp/gif"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/gif/-/gif-0.16.2.tgz"; + sha512 = "TMdyT9Q0paIKNtT7c5KzQD29CNCsI/t8ka28jMrBjEK7j5RRTvBfuoOnHv7pDJRCjCIqeUoaUSJ7QcciKic6CA=="; + }; + }; + "@jimp/jpeg-0.16.2" = { + name = "_at_jimp_slash_jpeg"; + packageName = "@jimp/jpeg"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.16.2.tgz"; + sha512 = "BW5gZydgq6wdIwHd+3iUNgrTklvoQc/FUKSj9meM6A0FU21lUaansRX5BDdJqHkyXJLnnlDGwDt27J+hQuBAVw=="; + }; + }; + "@jimp/plugin-blit-0.16.2" = { + name = "_at_jimp_slash_plugin-blit"; + packageName = "@jimp/plugin-blit"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.16.2.tgz"; + sha512 = "Z31rRfV80gC/r+B/bOPSVVpJEWXUV248j7MdnMOFLu4vr8DMqXVo9jYqvwU/s4LSTMAMXqm4Jg6E/jQfadPKAg=="; + }; + }; + "@jimp/plugin-blur-0.16.2" = { + name = "_at_jimp_slash_plugin-blur"; + packageName = "@jimp/plugin-blur"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.16.2.tgz"; + sha512 = "ShkJCAzRI+1fAKPuLLgEkixpSpVmKTYaKEFROUcgmrv9AansDXGNCupchqVMTdxf8zPyW8rR1ilvG3OJobufLQ=="; + }; + }; + "@jimp/plugin-circle-0.16.2" = { + name = "_at_jimp_slash_plugin-circle"; + packageName = "@jimp/plugin-circle"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.16.2.tgz"; + sha512 = "6T4z/48F4Z5+YwAVCLOvXQcyGmo0E3WztxCz6XGQf66r4JJK78+zcCDYZFLMx0BGM0091FogNK4QniP8JaOkrA=="; + }; + }; + "@jimp/plugin-color-0.16.2" = { + name = "_at_jimp_slash_plugin-color"; + packageName = "@jimp/plugin-color"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.16.2.tgz"; + sha512 = "6oBV0g0J17/7E+aTquvUsgSc85nUbUi+64tIK5eFIDzvjhlqhjGNJYlc46KJMCWIs61qRJayQoZdL/iT/iQuGQ=="; + }; + }; + "@jimp/plugin-contain-0.16.2" = { + name = "_at_jimp_slash_plugin-contain"; + packageName = "@jimp/plugin-contain"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.16.2.tgz"; + sha512 = "pLcxO3hVN3LCEhMNvpZ9B7xILHVlS433Vv16zFFJxLRqZdYvPLsc+ZzJhjAiHHuEjVblQrktHE3LGeQwGJPo0w=="; + }; + }; + "@jimp/plugin-cover-0.16.2" = { + name = "_at_jimp_slash_plugin-cover"; + packageName = "@jimp/plugin-cover"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.16.2.tgz"; + sha512 = "gzWM7VvYeI8msyiwbUZxH+sGQEgO6Vd6adGxZ0CeKX00uQOe5lDzxb1Wjx7sHcJGz8a/5fmAuwz7rdDtpDUbkw=="; + }; + }; + "@jimp/plugin-crop-0.16.2" = { + name = "_at_jimp_slash_plugin-crop"; + packageName = "@jimp/plugin-crop"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.16.2.tgz"; + sha512 = "qCd3hfMEE+Z2EuuyXewgXRTtKJGIerWzc1zLEJztsUkPz5i73IGgkOL+mrNutZwGaXZbm+8SwUaGb46sxAO6Tw=="; + }; + }; + "@jimp/plugin-displace-0.16.2" = { + name = "_at_jimp_slash_plugin-displace"; + packageName = "@jimp/plugin-displace"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.16.2.tgz"; + sha512 = "6nXdvNNjCdD95v2o3/jPeur903dz08lG4Y8gmr5oL2yVv9LSSbMonoXYrR/ASesdyXqGdXJLU4NL+yZs4zUqbQ=="; + }; + }; + "@jimp/plugin-dither-0.16.2" = { + name = "_at_jimp_slash_plugin-dither"; + packageName = "@jimp/plugin-dither"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.16.2.tgz"; + sha512 = "DERpIzy21ZanMkVsD0Tdy8HQLbD1E41OuvIzaMRoW4183PA6AgGNlrQoFTyXmzjy6FTy1SxaQgTEdouInAWZ9Q=="; + }; + }; + "@jimp/plugin-fisheye-0.16.2" = { + name = "_at_jimp_slash_plugin-fisheye"; + packageName = "@jimp/plugin-fisheye"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.2.tgz"; + sha512 = "Df7PsGIwiIpQu3EygYCnaJyTfOwvwtYV3cmYJS7yFLtdiFUuod+hlSo5GkwEPLAy+QBxhUbDuUqnsWo4NQtbiQ=="; + }; + }; + "@jimp/plugin-flip-0.16.2" = { + name = "_at_jimp_slash_plugin-flip"; + packageName = "@jimp/plugin-flip"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.16.2.tgz"; + sha512 = "+2uC8ioVQUr06mnjSWraskz2L33nJHze35LkQ8ZNsIpoZLkgvfiWatqAs5bj+1jGI/9kxoCFAaT1Is0f+a4/rw=="; + }; + }; + "@jimp/plugin-gaussian-0.16.2" = { + name = "_at_jimp_slash_plugin-gaussian"; + packageName = "@jimp/plugin-gaussian"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.2.tgz"; + sha512 = "2mnuDSg4ZEH8zcJig7DZZf4st/cYmQ5UYJKP76iGhZ+6JDACk6uejwAgT5xHecNhkVAaXMdCybA2eknH/9OE1w=="; + }; + }; + "@jimp/plugin-invert-0.16.2" = { + name = "_at_jimp_slash_plugin-invert"; + packageName = "@jimp/plugin-invert"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.16.2.tgz"; + sha512 = "xFvHbVepTY/nus+6yXiYN1iq+UBRkT0MdnObbiQPstUrAsz0Imn6MWISsnAyMvcNxHGrxaxjuU777JT/esM0gg=="; + }; + }; + "@jimp/plugin-mask-0.16.2" = { + name = "_at_jimp_slash_plugin-mask"; + packageName = "@jimp/plugin-mask"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.16.2.tgz"; + sha512 = "AbdO85xxhfgEDdxYKpUotEI9ixiCMaIpfYHD5a5O/VWeimz2kuwhcrzlHGiyq1kKAgRcl0WEneTCZAHVSyvPKA=="; + }; + }; + "@jimp/plugin-normalize-0.16.2" = { + name = "_at_jimp_slash_plugin-normalize"; + packageName = "@jimp/plugin-normalize"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.16.2.tgz"; + sha512 = "+ItBWFwmB0Od7OfOtTYT1gm543PpHUgU8/DN55z83l1JqS0OomDJAe7BmCppo2405TN6YtVm/csXo7p4iWd/SQ=="; + }; + }; + "@jimp/plugin-print-0.16.2" = { + name = "_at_jimp_slash_plugin-print"; + packageName = "@jimp/plugin-print"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.16.2.tgz"; + sha512 = "ifTGEeJ5UZTCiqC70HMeU3iXk/vsOmhWiwVGOXSFXhFeE8ZpDWvlmBsrMYnRrJGuaaogHOIrrQPI+kCdDBSBIQ=="; + }; + }; + "@jimp/plugin-resize-0.16.2" = { + name = "_at_jimp_slash_plugin-resize"; + packageName = "@jimp/plugin-resize"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.16.2.tgz"; + sha512 = "gE4N9l6xuwzacFZ2EPCGZCJ/xR+aX2V7GdMndIl/6kYIw5/eib1SFuF9AZLvIPSFuE1FnGo8+vT0pr++SSbhYg=="; + }; + }; + "@jimp/plugin-rotate-0.16.2" = { + name = "_at_jimp_slash_plugin-rotate"; + packageName = "@jimp/plugin-rotate"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.16.2.tgz"; + sha512 = "/CTEYkR1HrgmnE0VqPhhbBARbDAfFX590LWGIpxcYIYsUUGQCadl+8Qo4UX13FH0Nt8UHEtPA+O2x08uPYg9UA=="; + }; + }; + "@jimp/plugin-scale-0.16.2" = { + name = "_at_jimp_slash_plugin-scale"; + packageName = "@jimp/plugin-scale"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.16.2.tgz"; + sha512 = "3inuxfrlquyLaqFdiiiQNJUurR0WbvN5wAf1qcYX2LubG1AG8grayYD6H7XVoxfUGTZXh1kpmeirEYlqA2zxcw=="; + }; + }; + "@jimp/plugin-shadow-0.16.2" = { + name = "_at_jimp_slash_plugin-shadow"; + packageName = "@jimp/plugin-shadow"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.16.2.tgz"; + sha512 = "Q0aIs2/L6fWMcEh9Ms73u34bT1hyUMw/oxaVoIzOLo6/E8YzCs2Bi63H0/qaPS0MQpEppI++kvosPbblABY79w=="; + }; + }; + "@jimp/plugin-threshold-0.16.2" = { + name = "_at_jimp_slash_plugin-threshold"; + packageName = "@jimp/plugin-threshold"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.16.2.tgz"; + sha512 = "gyOwmBgjtMPvcuyOhkP6dOGWbQdaTfhcBRN22mYeI/k/Wh/Zh1OI21F6eKLApsVRmg15MoFnkrCz64RROC34sw=="; + }; + }; + "@jimp/plugins-0.16.2" = { + name = "_at_jimp_slash_plugins"; + packageName = "@jimp/plugins"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.16.2.tgz"; + sha512 = "zCvYtCgctmC0tkYEu+y+kSwSIZBsNznqJ3/3vkpzxdyjd6wCfNY5Qc/68MPrLc1lmdeGo4cOOTYHG7Vc6myzRw=="; + }; + }; + "@jimp/png-0.16.2" = { + name = "_at_jimp_slash_png"; + packageName = "@jimp/png"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/png/-/png-0.16.2.tgz"; + sha512 = "sFOtOSz/tzDwXEChFQ/Nxe+0+vG3Tj0eUxnZVDUG/StXE9dI8Bqmwj3MIa0EgK5s+QG3YlnDOmlPUa4JqmeYeQ=="; + }; + }; + "@jimp/tiff-0.16.2" = { + name = "_at_jimp_slash_tiff"; + packageName = "@jimp/tiff"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.16.2.tgz"; + sha512 = "ADcdqmtZF+U2YoaaHTzFX8D6NFpmN4WZUT0BPMerEuY7Cq8QoLYU22z2h034FrVW+Rbi1b3y04sB9iDiQAlf2w=="; + }; + }; + "@jimp/types-0.16.2" = { + name = "_at_jimp_slash_types"; + packageName = "@jimp/types"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/types/-/types-0.16.2.tgz"; + sha512 = "0Ue5Sq0XnDF6TirisWv5E+8uOnRcd8vRLuwocJOhF76NIlcQrz+5r2k2XWKcr3d+11n28dHLXW5TKSqrUopxhA=="; + }; + }; + "@jimp/utils-0.16.2" = { + name = "_at_jimp_slash_utils"; + packageName = "@jimp/utils"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jimp/utils/-/utils-0.16.2.tgz"; + sha512 = "XENrPvmigiXZQ8E2nxJqO6UVvWBLzbNwyYi3Y8Q1IECoYhYI3kgOQ0fmy4G269Vz1V0omh1bNmC42r4OfXg1Jg=="; + }; + }; "@joplin/fork-htmlparser2-4.1.41" = { name = "_at_joplin_slash_fork-htmlparser2"; packageName = "@joplin/fork-htmlparser2"; @@ -6313,6 +6799,24 @@ let sha512 = "h0BeA6WQfxvYl5BaacmlvB5bAIdhlgf9SInJljxtERn2eYN+VjgMyU/1iv0Ww4Lp71xMGL96bmfXpdlFgRQFEg=="; }; }; + "@json2csv/formatters-6.1.2" = { + name = "_at_json2csv_slash_formatters"; + packageName = "@json2csv/formatters"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@json2csv/formatters/-/formatters-6.1.2.tgz"; + sha512 = "l8i5EdQvHZHrtSgRFEXMkRnIn8CBopT/ecZSIyPKuee9+pm/Sxcb/r/N2jQWARnOQc7uyqQWAtpPpxU7HhZ2tg=="; + }; + }; + "@json2csv/plainjs-6.1.2" = { + name = "_at_json2csv_slash_plainjs"; + packageName = "@json2csv/plainjs"; + version = "6.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@json2csv/plainjs/-/plainjs-6.1.2.tgz"; + sha512 = "XNcBd6W4G5mlP6ZL13idEx21diQAM5AJgIe78RxRfZctWRppaZrtpiGTzhc/sNv7UM1FpfO/aa5wel4+aQW7MQ=="; + }; + }; "@koa/multer-3.0.2" = { name = "_at_koa_slash_multer"; packageName = "@koa/multer"; @@ -7204,13 +7708,13 @@ let sha512 = "ES5rj6J39FUkHe/b3C9SJs8bqIungYhuU7rBINTBaHOv/Ce4RCb3Gw08CZVl32W33UEkgRkzyWaIedV4at+QHg=="; }; }; - "@mdn/browser-compat-data-5.2.17" = { + "@mdn/browser-compat-data-5.2.29" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; - version = "5.2.17"; + version = "5.2.29"; src = fetchurl { - url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.2.17.tgz"; - sha512 = "aA+rFHhXmq14GVIcEWNk8OntLEOQFwEZk9ZgG5VcDquz+pQhIjJPXacR+rwL9Z0Elfg909EcRRHC96p06/CNUg=="; + url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.2.29.tgz"; + sha512 = "bEBrkTWbDAs/PB4IdRg4CtU750oBRytXHK/wC2oIDkgKZqnt76nACSooQQuHF11mK5k43f/IgFUMO5t5quRPVA=="; }; }; "@medable/mdctl-api-1.0.68" = { @@ -7393,13 +7897,13 @@ let sha512 = "W+IzEBw8a6LOOfRJM02dTT7BDZijxm+Z7lhtOAz1+y9vQm1Kdz9jlAO+qCEKsfxtUOmKilW8DIRqFw2aUgKeGg=="; }; }; - "@microsoft/rush-lib-5.88.0" = { + "@microsoft/rush-lib-5.89.1" = { name = "_at_microsoft_slash_rush-lib"; packageName = "@microsoft/rush-lib"; - version = "5.88.0"; + version = "5.89.1"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.88.0.tgz"; - sha512 = "YgZPnp/hAD43jclvGMMy6B84JR0pB1odK+Cfe2Ag7s4omwe/+u6gJjGfHme6vzB4Hs7jpEkmRe76R3nyVKcFoA=="; + url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.89.1.tgz"; + sha512 = "yOzZ6LY0OkAp9pUB3mVA8wjWsQ1bnRRrBYpmho5/Cy3TM6cUgjdPUhEzpx4THbu8lcYtdvJ10Ivki4V1rI6Qdg=="; }; }; "@miniflare/cache-2.11.0" = { @@ -8212,31 +8716,31 @@ let sha512 = "ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ=="; }; }; - "@nrwl/cli-15.5.2" = { + "@nrwl/cli-15.6.3" = { name = "_at_nrwl_slash_cli"; packageName = "@nrwl/cli"; - version = "15.5.2"; + version = "15.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/cli/-/cli-15.5.2.tgz"; - sha512 = "T0nN2hYDtkY9SsbtZqFwRSYC8Td2zPqQ7dj6FrwvjFGbHLAxN6rknVPPKN4S7Dt6feXX1Woe8XYwWouk9Cg6nw=="; + url = "https://registry.npmjs.org/@nrwl/cli/-/cli-15.6.3.tgz"; + sha512 = "K4E0spofThZXMnhA6R8hkUTdfqmwSnUE2+DlD5Y3jqsvKTAgwF5U41IFkEouFZCf+dWjy0RA20bWoX48EVFtmQ=="; }; }; - "@nrwl/devkit-15.5.2" = { + "@nrwl/devkit-15.6.3" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; - version = "15.5.2"; + version = "15.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-15.5.2.tgz"; - sha512 = "rvxuiYVpGDB9RzjOAWTNm7IBPwuYG6kL24LkJMUS8gCNqLBNNlYUsdkpa0PLRt5eNeGLKqpSDB8BpA+e1ty/zA=="; + url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-15.6.3.tgz"; + sha512 = "/JDvdzNxUM+C1PCZPCrvmFx+OfywqZdOq1GS9QR8C0VctTLG4D/SGSFD88O1SAdcbH/f1mMiBGfEYZYd23fghQ=="; }; }; - "@nrwl/tao-15.5.2" = { + "@nrwl/tao-15.6.3" = { name = "_at_nrwl_slash_tao"; packageName = "@nrwl/tao"; - version = "15.5.2"; + version = "15.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/tao/-/tao-15.5.2.tgz"; - sha512 = "1thpCNcdpHfTf+o3p+VB6v8TEj6to3YVhA9d+3VhDKN9mq/RVcoMQQRIAgNOKbYWYNo8eC8MvuNqxgRPz2ESyg=="; + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-15.6.3.tgz"; + sha512 = "bDZbPIbU5Mf2BvX0q8GjPxrm1WkYyfW+gp7mLuuJth2sEpZiCr47mSwuGko/y4CKXvIX46VQcAS0pKQMKugXsg=="; }; }; "@oclif/command-1.8.0" = { @@ -8248,13 +8752,13 @@ let sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; }; }; - "@oclif/command-1.8.21" = { + "@oclif/command-1.8.22" = { name = "_at_oclif_slash_command"; packageName = "@oclif/command"; - version = "1.8.21"; + version = "1.8.22"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.21.tgz"; - sha512 = "kIDrRIbAcicVl+CWMzXeZkg5dRNuF1VI7koyFTAQMNYwRNZpeya5x7XDPr+fh7rDiBL7psnxc3B1+zoOWj96lQ=="; + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.22.tgz"; + sha512 = "lystv7IKsWRmCv6K68jSvHrO/DILUPBDb5GZ3absTA5XTnNXTaMrcwVzTcMPfTf+gCrgIaPPD1bmbRStwfQxFw=="; }; }; "@oclif/config-1.17.0" = { @@ -8338,13 +8842,13 @@ let sha512 = "Ups2dShK52xXa8w6iBWLgcjPJWjais6KPJQq3gQ/88AY6BXoTX+MIGFPrWQO1KLMiQfoTpcLnUwloN4brrVUHw=="; }; }; - "@oclif/parser-3.8.9" = { + "@oclif/parser-3.8.10" = { name = "_at_oclif_slash_parser"; packageName = "@oclif/parser"; - version = "3.8.9"; + version = "3.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.9.tgz"; - sha512 = "1j/kThdse7yHQz6+c3v8RA1I3gD6+SGt2O7IAb/MAMoxqyBrFQDabQHH2UU4eVFGMLN7U91AiYJp11zJ9LcQAg=="; + url = "https://registry.npmjs.org/@oclif/parser/-/parser-3.8.10.tgz"; + sha512 = "J4l/NcnfbIU84+NNdy6bxq9yJt4joFWNvpk59hq+uaQPUNtjmNJDVGuRvf6GUOxHNgRsVK1JRmd/Ez+v7Z9GqQ=="; }; }; "@oclif/plugin-autocomplete-0.1.5" = { @@ -8419,13 +8923,13 @@ let sha512 = "r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g=="; }; }; - "@octokit/auth-token-3.0.2" = { + "@octokit/auth-token-3.0.3" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.2.tgz"; - sha512 = "pq7CwIMV1kmzkFTimdwjAINCXKTajZErLB4wMLYapR2nuB/Jpr66+05wOTZMSCBXP6n4DdDWT2W19Bm17vU69Q=="; + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.3.tgz"; + sha512 = "/aFM2M4HVDBT/jjDBa84sJniv1t9Gm/rLkalaz9htOm+L+8JMj1k9w0CkUdcxNyNxZPlTxKPVko+m1VlM58ZVA=="; }; }; "@octokit/core-3.6.0" = { @@ -8437,13 +8941,13 @@ let sha512 = "7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q=="; }; }; - "@octokit/core-4.1.0" = { + "@octokit/core-4.2.0" = { name = "_at_octokit_slash_core"; packageName = "@octokit/core"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/core/-/core-4.1.0.tgz"; - sha512 = "Czz/59VefU+kKDy+ZfDwtOIYIkFjExOKf+HA92aiTZJ6EfWpFzYQWw0l54ji8bVmyhc+mGaLUbSUmXazG7z5OQ=="; + url = "https://registry.npmjs.org/@octokit/core/-/core-4.2.0.tgz"; + sha512 = "AgvDRUg3COpR82P7PBdGZF/NNqGmtMq2NiPqeSsDIeCfYFOZ9gddqWNQHnFdEUf+YwOj4aZYmJnlPp7OXmDIDg=="; }; }; "@octokit/endpoint-6.0.12" = { @@ -8455,13 +8959,13 @@ let sha512 = "lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA=="; }; }; - "@octokit/endpoint-7.0.3" = { + "@octokit/endpoint-7.0.5" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "7.0.3"; + version = "7.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.3.tgz"; - sha512 = "57gRlb28bwTsdNXq+O3JTQ7ERmBTuik9+LelgcLIVfYwf235VHbN9QNo4kXExtp/h8T423cR5iJThKtFYxC7Lw=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.5.tgz"; + sha512 = "LG4o4HMY1Xoaec87IqQ41TQ+glvIeTKqfjkCEmt5AIwDZJwQeVZFIEYXrYY6yLwK+pAScb9Gj4q+Nz2qSw1roA=="; }; }; "@octokit/graphql-4.8.0" = { @@ -8473,13 +8977,13 @@ let sha512 = "0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg=="; }; }; - "@octokit/graphql-5.0.4" = { + "@octokit/graphql-5.0.5" = { name = "_at_octokit_slash_graphql"; packageName = "@octokit/graphql"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.4.tgz"; - sha512 = "amO1M5QUQgYQo09aStR/XO7KAl13xpigcy/kI8/N1PnZYSS69fgte+xA4+c2DISKqUZfsh0wwjc2FaCt99L41A=="; + url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.5.tgz"; + sha512 = "Qwfvh3xdqKtIznjX9lz2D458r7dJPP8l6r4GQkIdWQouZwHQK0mVT88uwiU2bdTU2OtT1uOlKpRciUWldpG0yQ=="; }; }; "@octokit/openapi-types-12.11.0" = { @@ -8491,13 +8995,13 @@ let sha512 = "VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ=="; }; }; - "@octokit/openapi-types-14.0.0" = { + "@octokit/openapi-types-16.0.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "14.0.0"; + version = "16.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-14.0.0.tgz"; - sha512 = "HNWisMYlR8VCnNurDU6os2ikx0s0VyEjDYHNS/h4cgb8DeOxQ0n72HyinUtdDVxJhFy3FWLGl0DJhfEWk3P5Iw=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-16.0.0.tgz"; + sha512 = "JbFWOqTJVLHZSUUoF4FzAZKYtqdxWu9Z5m2QQnOyEa04fOFljvyh7D3GYKbfuaSWisqehImiVIMG4eyJeP5VEA=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -8518,13 +9022,13 @@ let sha512 = "aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw=="; }; }; - "@octokit/plugin-paginate-rest-5.0.1" = { + "@octokit/plugin-paginate-rest-6.0.0" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "5.0.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-5.0.1.tgz"; - sha512 = "7A+rEkS70pH36Z6JivSlR7Zqepz3KVucEFVDnSrgHXzG7WLAzYwcHZbKdfTXHwuTHbkT1vKvz7dHl1+HNf6Qyw=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-6.0.0.tgz"; + sha512 = "Sq5VU1PfT6/JyuXPyt04KZNVsFOSBaYOAq2QRZUwzVlI10KFvcbUo8lR258AAQL1Et60b0WuVik+zOWKLuDZxw=="; }; }; "@octokit/plugin-request-log-1.0.4" = { @@ -8545,13 +9049,13 @@ let sha512 = "8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw=="; }; }; - "@octokit/plugin-rest-endpoint-methods-6.7.0" = { + "@octokit/plugin-rest-endpoint-methods-7.0.1" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "6.7.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.7.0.tgz"; - sha512 = "orxQ0fAHA7IpYhG2flD2AygztPlGYNAdlzYz8yrD8NDgelPfOYoRPROfEyIe035PlxvbYrgkfUZIhSBKju/Cvw=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-7.0.1.tgz"; + sha512 = "pnCaLwZBudK5xCdrR823xHGNgqOzRnJ/mpC/76YPpNP7DybdsJtP7mdOwh+wYZxK5jqeQuhu59ogMI4NRlBUvA=="; }; }; "@octokit/plugin-retry-3.0.9" = { @@ -8581,13 +9085,13 @@ let sha512 = "bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A=="; }; }; - "@octokit/request-6.2.2" = { + "@octokit/request-6.2.3" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-6.2.2.tgz"; - sha512 = "6VDqgj0HMc2FUX2awIs+sM6OwLgwHvAi4KCK3mT2H2IKRt6oH9d0fej5LluF5mck1lRR/rFWN0YIDSYXYSylbw=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-6.2.3.tgz"; + sha512 = "TNAodj5yNzrrZ/VxP+H5HiYaZep0H3GU0O7PaF+fhDrt8FPrnkei9Aal/txsN/1P7V3CPiThG0tIvpPDYUsyAA=="; }; }; "@octokit/request-error-2.1.0" = { @@ -8599,13 +9103,13 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/request-error-3.0.2" = { + "@octokit/request-error-3.0.3" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.2.tgz"; - sha512 = "WMNOFYrSaX8zXWoJg9u/pKgWPo94JXilMLb2VManNOby9EZxrQaBe/QSC4a1TzpAlpxofg2X/jMnCyZgL6y7eg=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.3.tgz"; + sha512 = "crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ=="; }; }; "@octokit/rest-18.12.0" = { @@ -8617,13 +9121,13 @@ let sha512 = "gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q=="; }; }; - "@octokit/rest-19.0.5" = { + "@octokit/rest-19.0.7" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "19.0.5"; + version = "19.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.5.tgz"; - sha512 = "+4qdrUFq2lk7Va+Qff3ofREQWGBeoTKNqlJO+FGjFP35ZahP+nBenhZiGdu8USSgmq4Ky3IJ/i4u0xbLqHaeow=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.7.tgz"; + sha512 = "HRtSfjrWmWVNp2uAkEpQnuGMJsu/+dBr47dRc5QVgsCbnIc1+GFEaoKBWkYG+zjrsHpSqcAElMio+n10c0b5JA=="; }; }; "@octokit/types-6.41.0" = { @@ -8635,13 +9139,13 @@ let sha512 = "eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg=="; }; }; - "@octokit/types-8.1.1" = { + "@octokit/types-9.0.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "8.1.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-8.1.1.tgz"; - sha512 = "7tjk+6DyhYAmei8FOEwPfGKc0VE1x56CKPJ+eE44zhDbOyMT+9yan8apfQFxo8oEFsy+0O7PiBtH8w0Yo0Y9Kw=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-9.0.0.tgz"; + sha512 = "LUewfj94xCMH2rbD5YJ+6AQ4AVjFYTgpp6rboWM5T7N3IsIF65SBEOVcYMGAEzO/kKNiNaW4LoWtoThOhH06gw=="; }; }; "@opencensus/core-0.0.8" = { @@ -8743,454 +9247,454 @@ let sha512 = "po7penSfQ/Z8352lRVDpaBrd9znwA5mHGqXR7nDEiVnxkDFkBIhVf/tKeAJDIq/erFpcRowKFeCsr5eqqcSyFQ=="; }; }; - "@orval/angular-6.11.0" = { + "@orval/angular-6.11.1" = { name = "_at_orval_slash_angular"; packageName = "@orval/angular"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/angular/-/angular-6.11.0.tgz"; - sha512 = "4mYJ1KIloPn8W+ZWRszNJBxiV2AE2mCQ3KfQnUa/jh4YllOOjWto03GA3sr3IRGdJXwlN3/Esp6dQNQjto5Z+w=="; + url = "https://registry.npmjs.org/@orval/angular/-/angular-6.11.1.tgz"; + sha512 = "L1sdQ7b7cq5jtL2OBacpyQ2MwGRUcWm1U5BEJg0R+K3eWN7LfFAQk99karMEbre1C5U/s2BXh/hxmWHK24i1+A=="; }; }; - "@orval/axios-6.11.0" = { + "@orval/axios-6.11.1" = { name = "_at_orval_slash_axios"; packageName = "@orval/axios"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/axios/-/axios-6.11.0.tgz"; - sha512 = "SSuWbS68v/nfcvxDdXntyPxRY0lCAbgMwnZ+V0cnq00G9Lgljiql2gPKOO3cnQhmpAiYIf8Zs6skSeIzrXxfiA=="; + url = "https://registry.npmjs.org/@orval/axios/-/axios-6.11.1.tgz"; + sha512 = "iemXAYoTuguCIgzK4yHRuUWNxIYk8umpI7FYNYCk+YZ1MJfWa+GAKeem9Fzb3EbmWWvlH4bNfFkXsygvorS1nw=="; }; }; - "@orval/core-6.11.0" = { + "@orval/core-6.11.1" = { name = "_at_orval_slash_core"; packageName = "@orval/core"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/core/-/core-6.11.0.tgz"; - sha512 = "PbH2PbpHbnLXrQWvLHUAm0lZHiD+Np7IGcVTLyXdDE9lGDpMY7jVxMLAB2aYhTZiSiyI6tIhSeaXPOykgVL8+g=="; + url = "https://registry.npmjs.org/@orval/core/-/core-6.11.1.tgz"; + sha512 = "0d8K4gmeMovYYdagRQ5pj0KsgtB8JKDYP/RjzQfr40ootAjbP6egaAjhSzogv0vfSr5GDwNPPzD+S0cK6pQsAw=="; }; }; - "@orval/msw-6.11.0" = { + "@orval/msw-6.11.1" = { name = "_at_orval_slash_msw"; packageName = "@orval/msw"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/msw/-/msw-6.11.0.tgz"; - sha512 = "g9oHX6IgqEQIJS6J0SJa3dUkDeZe/Iv6dgZ5Y0LorOgYfduAcfVjRepG/vnNu6mxmHbh5d2ZrxrSDZmxmuWU6Q=="; + url = "https://registry.npmjs.org/@orval/msw/-/msw-6.11.1.tgz"; + sha512 = "1WA9nLBhvBTu0MZ0V+UAlipNMkOmhy0vv2RfcAGrqiq8TCHkdVvVOZvrIuQkJxYkELEBAXTPfGnIzqCVwRkwiA=="; }; }; - "@orval/query-6.11.0" = { + "@orval/query-6.11.1" = { name = "_at_orval_slash_query"; packageName = "@orval/query"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/query/-/query-6.11.0.tgz"; - sha512 = "nYgHVpEc3reHGryWhyap74+NoZlCAqZh0aULKcJD5jYCIXn8+SNt3kEeB1tjIzTbiESc5DGa3pUzEP8hJ7FN9Q=="; + url = "https://registry.npmjs.org/@orval/query/-/query-6.11.1.tgz"; + sha512 = "FV5mGQ9fpyqPJl82AkGvft2WQGr0GLyrVp7k7Nrlr0I2j+F0PByvlvtvTbS0CCXY9m9ot6tE3NDXkISZEczG4w=="; }; }; - "@orval/swr-6.11.0" = { + "@orval/swr-6.11.1" = { name = "_at_orval_slash_swr"; packageName = "@orval/swr"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@orval/swr/-/swr-6.11.0.tgz"; - sha512 = "ONwjmk6Hxt+ozVVZast4pvc/hnhBzC+KkWPmpdFdoyrpgvIkAsulkuWQV12Sgo3KwSDH5abIOvexgeha7UaZxA=="; + url = "https://registry.npmjs.org/@orval/swr/-/swr-6.11.1.tgz"; + sha512 = "Oi/cgNzFWU0ukXoq5RselfJLcoy9l+MmLpmgnqTghXewRq67q1iIc5ee5/8Kf9m36dLCfb7uk8m1i3e6F5LhwA=="; }; }; - "@ot-builder/bin-composite-types-1.5.5" = { + "@ot-builder/bin-composite-types-1.6.1" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.5.5.tgz"; - sha512 = "CK8DmpDC/BILM57mX5jq1aAKRGqHPIRknnBTOtr+kAEdyYPJ28ATAojk7jcBb+tw6WPCdDRmmAj9XvKkXfwTdg=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.6.1.tgz"; + sha512 = "xYJeoZ4vJMYv8UcWMOuuhCwsO061FHgsakr81XeKXVw2iJ5DknDvNv1Q7+ss34XlXl+Cj6vXe8i86tsa1AjU4g=="; }; }; - "@ot-builder/bin-util-1.5.5" = { + "@ot-builder/bin-util-1.6.1" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.5.5.tgz"; - sha512 = "YilwtBHMAcqa+C/8gCqekM4nZkIGkdS64Sd/N4Q2aw68ly3l94hgPOioNRq7Ixju+reg1HHQrn6e/ug8UJ1F4A=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.6.1.tgz"; + sha512 = "k4CKNu3i+h17S1yzYi1ih1cXSCKyKWKDuQrCgV/6igMeZ8eAMnk1Y3+/eN4EXDODCa9LrYK/jZs643lfejMr9A=="; }; }; - "@ot-builder/cli-help-shower-1.5.5" = { + "@ot-builder/cli-help-shower-1.6.1" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.5.5.tgz"; - sha512 = "TwopK3Xwhhsw8o9rEz4eV4Fov9AvAA4bWSfCpt7vv1E8Ri+oXGVGZKiStjnrQJSr2WaZ4KqZcEvZew8F+ZYDbQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.6.1.tgz"; + sha512 = "J3aX1FtjGN7VMWA87xPwkIrXYtCNTT60fqE6izIU8X7mpRqgJlzVgg8ePQu3dLtUqo21oH8FUDLX5z1KjwInew=="; }; }; - "@ot-builder/cli-proc-1.5.5" = { + "@ot-builder/cli-proc-1.6.1" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.5.5.tgz"; - sha512 = "kxwViISxgMpK00eronqF+StDAfWcqF0nIm2l84zs4qJY6ddsBbhVgSNtY19DfDDjJPEEHDoNGEOJYAeyxquRIg=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.6.1.tgz"; + sha512 = "zjXAbWIvW52/lLhMCw1STLHDiwtTV/2eF09+PGxn77PenBynw0f0+opxkL9wvrA83OEu3N2eEIK89JmRM+j89A=="; }; }; - "@ot-builder/cli-shared-1.5.5" = { + "@ot-builder/cli-shared-1.6.1" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.5.5.tgz"; - sha512 = "lqIaWGEJ+Xw3tJLF7faX5gH7GWaNLjRnnadiR/fK6o2wdRhjEiw+DQa4hmE9mXdBCNaAxPSDkRR3GA6hvsw4lA=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.6.1.tgz"; + sha512 = "RXbC9TqfcSVwo0gpqm8k+F3IrwzVHX67lxu0Fv2NCX/9HzgmzzusmD7tzLIYIs9fIdF2hOOhjT9JVPyFJkkS9A=="; }; }; - "@ot-builder/common-impl-1.5.5" = { + "@ot-builder/common-impl-1.6.1" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.5.5.tgz"; - sha512 = "BhNB6m/dIaXMUbRlYLcmnEYwFoPVcvUD7fpij2wL/sbuSXh5IVj/wvcGqNDaRMJN7jWF1iApoWYb25s2cMI0eg=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.6.1.tgz"; + sha512 = "Sg8PegFN/CoekaRQ1hGvQJLcUREF1ugRIwjbewLRPGTHGECSIsEipq4gyVsmHSUiUSlQRwycwAsaQMB8l9amww=="; }; }; - "@ot-builder/errors-1.5.5" = { + "@ot-builder/errors-1.6.1" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.5.5.tgz"; - sha512 = "r1/31jN6MXb+sUMgFa7fl7cvh6WbyUrWHtU2aWNXo+v3ANF02pAANm3kHRYeo1A5hbsPdpYGT59eA2wKsFv6pg=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.6.1.tgz"; + sha512 = "04vPz6CI2O69Tfpby5K7dLZkRg21yQFSyAvvUJx22OU9SfDI4KTmtcwlYRwHAYBC9GFc4S+nx/+50pNZ5XJTqw=="; }; }; - "@ot-builder/io-bin-cff-1.5.5" = { + "@ot-builder/io-bin-cff-1.6.1" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.5.5.tgz"; - sha512 = "fZXVdnCsV2xGd12ixn/ZD7I73NUJty2RzAru0/SPcKh9+MM9+0WAaC8K2959JoK1k+uWTwkm9GfVFWBrqgkm1Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.6.1.tgz"; + sha512 = "Ce/nnjzL/tF2VaUEk22jBk1wM28UoJttXl3mTPzuurSxfJTpXNPkib3KqoHN1/PdesNlhqiQr2FCdx9uOyjedg=="; }; }; - "@ot-builder/io-bin-encoding-1.5.5" = { + "@ot-builder/io-bin-encoding-1.6.1" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.5.5.tgz"; - sha512 = "f9H94M2v3DaLQpWV9sG2e5vYubzI+I2AXlRCKplexfSWoIU7Wsusb3ZNXs+rWB3tFKTOVjwZ2c8prSNsKVPZWA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.6.1.tgz"; + sha512 = "3t8Yvu0rJStgmUr4T8cSx+WMkusyfc5gL2a80UVsSzofo7RTK+MIr8bvL7b2z85pEP/DkKR/GFDGzzU1mwb0AQ=="; }; }; - "@ot-builder/io-bin-ext-private-1.5.5" = { + "@ot-builder/io-bin-ext-private-1.6.1" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.5.5.tgz"; - sha512 = "kuybGd55HbVW+6E05yZLmR98IhH+BiwjHgyOq2+/DiD5iSE/SCqtqHJ7Gs94UfJp16PaCCnWDXjcJdkSPMhqKg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.6.1.tgz"; + sha512 = "QrzerNSAN5TVreNeAtO6zZpMsR2Lsq8SNtAJeChSq2n2pxPwBJJnBnDr8K3If6ykucvVb1sLCqHyjEXG2D9ReA=="; }; }; - "@ot-builder/io-bin-font-1.5.5" = { + "@ot-builder/io-bin-font-1.6.1" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.5.5.tgz"; - sha512 = "JCAYsJIXiV0nYrWZHK9WV1YgGkz+nNbngziQyTNoO4qp8qmrvuc0cCwd6TOwuBapgfd7WJTyW2h5RVqbICxZ3g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.6.1.tgz"; + sha512 = "JXzKYXf8NR2DdUQ+BsdB9Eg5oM4HIYtFEr9aKHFTFY+E7MXRrkO+lPm43vOETB6+dWns9vJ4LIcyCO3MvBwQ5A=="; }; }; - "@ot-builder/io-bin-glyph-store-1.5.5" = { + "@ot-builder/io-bin-glyph-store-1.6.1" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.5.5.tgz"; - sha512 = "9NurbkwdnmlnHEKzFRcrwleTU2PL8T++Gjl8TqDUZ+O2+RoNDOjZ8j0JnARv6+yj7w1+uFZlrdDd2r+/Hox5bQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.6.1.tgz"; + sha512 = "yWnzgzgpBcyLaDevWmd48BRifNbIEl1EaEiUfuOFT8UHxwKBZharL7RyDkgOQH1v/JiS1F/bc7+dV83SU7qHtw=="; }; }; - "@ot-builder/io-bin-layout-1.5.5" = { + "@ot-builder/io-bin-layout-1.6.1" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.5.5.tgz"; - sha512 = "mbI3XHVw++lUJPxtiUEBP+Cxxr38cJ9fdENH00snSyBAaM4NifYUcVab51Hw1idYqGhtT+HdXUDql5fHqmGLrg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.6.1.tgz"; + sha512 = "bdkBgGZ4d/ymmZxu3J5FOErn8MgdUBJDqETs8832U96sqb8aTB3vGtP0zIWB/ORuRXJNmBgPrZEa+Hi3ff51kw=="; }; }; - "@ot-builder/io-bin-metadata-1.5.5" = { + "@ot-builder/io-bin-metadata-1.6.1" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.5.5.tgz"; - sha512 = "avWLjS2IQ/g1qv+rDDuNovuu7lvmQSOr6rShk9uJNcSXU+w54n0auWquLyok42RFoW7YYmmPebgsJsTypSEUDQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.6.1.tgz"; + sha512 = "fKj2w5rXUNtOo69iY+4+I025ij+VSthpIWbp44dvQpwGHRDP2nAMZRDjdwpksKefKrHF0xUOZncoVk8cWUKnLQ=="; }; }; - "@ot-builder/io-bin-metric-1.5.5" = { + "@ot-builder/io-bin-metric-1.6.1" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.5.5.tgz"; - sha512 = "jjfyuHLwgQhyZEHP7hHVl3jX20i3dPbmDb2E7X3GbTmW+rTxodXrHN6OqnEzT+qluK+6RcQs5jdJ5GTW9r21wA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.6.1.tgz"; + sha512 = "W9qUW3Ldw7cz/MPp0NFJ0UlbccTZ0jjjLJdAJgUjRmNemnLSJINy76gJKQPcLqQzWf0g+ZaqFIBpzo2kbJFXXQ=="; }; }; - "@ot-builder/io-bin-name-1.5.5" = { + "@ot-builder/io-bin-name-1.6.1" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.5.5.tgz"; - sha512 = "pUjKYAXczvqsFfwki8IGJe6PkdxO28GR+4nLrIxyiK6ZSePtMjauDfTUC/mWAVHQZ0uI+tr7n9Un5BONM5PPOg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.6.1.tgz"; + sha512 = "5Ifb2iWM9CXwArQNT973YpWkClh7MxjjBJDaS2lt7WZl/CT2btBzHcZFubxxdplWloRMQQBsG+dM471BIs0gow=="; }; }; - "@ot-builder/io-bin-sfnt-1.5.5" = { + "@ot-builder/io-bin-sfnt-1.6.1" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.5.5.tgz"; - sha512 = "SiZRMR1jXhFFPQvBZgJuOb4kSrpaWtwAOQaq13Atmxsc855rTbC5u/p7ll55lj8RGcLBsZjwsw9fe4l/0NEJDw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.6.1.tgz"; + sha512 = "/dQ6XGGZMyB79kivB5ZNi2s6Q0sSPjGZNGn+Wv+S5Z1qSuoSZYE3HyQ6c2pPpmLDrats9KqxVXWFTJVEQsuYng=="; }; }; - "@ot-builder/io-bin-ttf-1.5.5" = { + "@ot-builder/io-bin-ttf-1.6.1" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.5.5.tgz"; - sha512 = "6idmtX8UHM7mqUt4J2o/I/102RksvitKlinOrvUUNj64JtS/Mjy82ugFObLPDZAhXm0CjQIuIOYDS7ULHMtQqg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.6.1.tgz"; + sha512 = "K6Bf183nGPuDeGfDNTK0B2o0Ohe/HnV79tUdQxlNX0YWkehtinp5uK8BcwrBzl1oKr64HCU4/4MJzfYDzGZLPw=="; }; }; - "@ot-builder/io-bin-vtt-private-1.5.5" = { + "@ot-builder/io-bin-vtt-private-1.6.1" = { name = "_at_ot-builder_slash_io-bin-vtt-private"; packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.5.5.tgz"; - sha512 = "TAdtW8L8iBOUY8L5HfiNo1fGVKbugw4Oy0k5jomA+nob4Jt87G1MCNof03Tzudw+ncTI0WfhqMAqpp/Z5DIqIw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.6.1.tgz"; + sha512 = "kQ7YzNU7Uji6wMF7zWptHrlU8/pGuFdhQSQAUxEh/20lMh3p6gKImI+EA91TOB4WPn9K1pNYIwc4Bbg2l/KoKw=="; }; }; - "@ot-builder/ot-1.5.5" = { + "@ot-builder/ot-1.6.1" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.5.5.tgz"; - sha512 = "Kbn1lGkQi/jfKdOU/72KZe5joNLtCIkuS/+RM37OimOGSBCZqrnHyldCBv3U+ANPXREUqoBsSug4ar53fwROIQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.6.1.tgz"; + sha512 = "QAsa5t+L2ud/Rfy7RGM47jJPVfsjhu1VSZhjqJlztjA2dYaWpesQPF5tacYuCz21UQHODdy3iumTAdugwZQYQw=="; }; }; - "@ot-builder/ot-encoding-1.5.5" = { + "@ot-builder/ot-encoding-1.6.1" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.5.5.tgz"; - sha512 = "WvtRzUCkYZ1t6hc6tBYFdgECuYGUT2sJ00qV0RHA/4k5KfofblavvduMD7DaTjMG+CP13lK1Hf2nZthY6Sjwvg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.6.1.tgz"; + sha512 = "1N544+6WkMCSp06WYyWe7TvF19NbiikTeJxH0LU1VSvBOaWI5syg3G7uSPzoLTezIkCV7nE5tj+tKOC6Lr45Ng=="; }; }; - "@ot-builder/ot-ext-private-1.5.5" = { + "@ot-builder/ot-ext-private-1.6.1" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.5.5.tgz"; - sha512 = "kJ7/bR83V73+WMDE59Uy22zb4po54/gCnrUDoWTDdo8jnhri9wHtFpuL5W1RMQSsegI9PnYTFgTXwAuCmX8EBg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.6.1.tgz"; + sha512 = "6hvBv2AGOAwJ9xOP2pHq1VLSmSggotRsyFGTOGLHSzpufSdfiWmshKPE3uw472nSQ4M3Bd+mK/WuxH1jVvogZw=="; }; }; - "@ot-builder/ot-glyphs-1.5.5" = { + "@ot-builder/ot-glyphs-1.6.1" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.5.5.tgz"; - sha512 = "8BIjHFzzsRjF0N+lRzna6mwmcQS61MIBFrRY2/hKzQVNqfmXfDRKPkFhbn/5tRb1mmvqNnLM7DrnQcz2r7sMew=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.6.1.tgz"; + sha512 = "O4r4fEcmioDGkO3QYeKH/IZFXToRZQkX4jqFQB4yq5qUiwjLJMKfi/giVnFK5jsu73NW+Ikq1mNNmxq4QpdtRQ=="; }; }; - "@ot-builder/ot-layout-1.5.5" = { + "@ot-builder/ot-layout-1.6.1" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.5.5.tgz"; - sha512 = "ABRaW09S1ynrEa61ZF5LuznpDqv6Q/zWVocrU4zaO6v42b5ZR87shbXDuYBTu10Ho+ieveMJkIgomjWWHSW4OQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.6.1.tgz"; + sha512 = "4Bnmr8Gz60HgGCBD0cHFeXea8cbH454oDDzfozu2t3xmE2TJV6x/xIW9MXyl+W88BOUlAOu9+hxOPkfxPvoASg=="; }; }; - "@ot-builder/ot-metadata-1.5.5" = { + "@ot-builder/ot-metadata-1.6.1" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.5.5.tgz"; - sha512 = "PHg5FS/4ayQcbRL2leT5PfWj/tw7hQsCJGYL0RNg+QvkY/IeExq+fHKzbC5HwLYZFCsVKdi5++cWM1rSaPCJIQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.6.1.tgz"; + sha512 = "ZXx0wx/cO/mivhGH5UbvfFe2QsTT74fw1N9NUCjmyupLz8og6kX//Lhj33/sjQqc9p+kBcjp9qVzL99D5tbx8A=="; }; }; - "@ot-builder/ot-name-1.5.5" = { + "@ot-builder/ot-name-1.6.1" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.5.5.tgz"; - sha512 = "HNHZbc2TFzFyJ1FHVlxV3sGQJqGQjdlTBW4CfgVxxHhbSe59/DMsX1oiplRQ3w7kYQ6SCfU2qp1JXVSXgVBPZw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.6.1.tgz"; + sha512 = "CdCmblvnr/M3PrQT4W0/12df5LhSQxM+eZbE64NLY7ZKekJK7C8MpSuo0lBTAduAQAczAmN3+HfQ2v1xXtBNOg=="; }; }; - "@ot-builder/ot-sfnt-1.5.5" = { + "@ot-builder/ot-sfnt-1.6.1" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.5.5.tgz"; - sha512 = "B3vMza3hSdGyOlzhIKsNVUHe6knOKpQlWuAZUQXIQCTuKdLGcDAsYBFuTEZEtLhpRzm+jSfEyGZ87V0YV2nUBg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.6.1.tgz"; + sha512 = "jKc2TnfTvQu/958TJrZwG9MxwTRbmcRc9ZvW1MjEK9FK7OqfjxiNAUXJLZm9x2ETxW5pMnkcrkCSD2QaLpuV7w=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.5.5" = { + "@ot-builder/ot-standard-glyph-namer-1.6.1" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.5.5.tgz"; - sha512 = "L+quAs3jQ1I4U3byONrPp9i8jTf8YT7CuF4ONUiExGyJnK9WIvD5NaVKdI/MPkxVUb1Udc9SaBYtoUm9ImUHQQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.6.1.tgz"; + sha512 = "qU5+2fzE0iana0BJQOuclGwDCA5BboJIc6e651+6SKfdg/lY+KhmdJR5IvjKSARz3c4Uk9r1bbtOjuiFAlnePQ=="; }; }; - "@ot-builder/ot-vtt-private-1.5.5" = { + "@ot-builder/ot-vtt-private-1.6.1" = { name = "_at_ot-builder_slash_ot-vtt-private"; packageName = "@ot-builder/ot-vtt-private"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.5.5.tgz"; - sha512 = "l8lY6BD1dzlHTW93TlBLcAxxRLHUjlRuFN7w+1Akmtfq/l15AWEW3OqxzxrGAw7TX7Q9Np7HhN0QGbTYjrul3g=="; + url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.6.1.tgz"; + sha512 = "tBCs7mK3+Potn4DLEOABd1xRZLhG9X7AOASeAJwPOGBNi831DyYuODLeFIE9BKZThoP5GlbTpn5zt2w51Spy8g=="; }; }; - "@ot-builder/prelude-1.5.5" = { + "@ot-builder/prelude-1.6.1" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.5.5.tgz"; - sha512 = "sTecdvnGlYdQ6Qbu4NSyYIzil72k7gwGaVJiFRZyudNouGiurijHt5F+RiWl05U83zrlcdpcN7iiXzHfr5NnWQ=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.6.1.tgz"; + sha512 = "EeO5vzAEpoRHrA9U39mANa5eoFk/LdS7zhSDiqe4wuDjw9MMcTlkPT1O9aKNNBWdC/ErMutM+AR5b7YWzgSFZw=="; }; }; - "@ot-builder/primitive-1.5.5" = { + "@ot-builder/primitive-1.6.1" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.5.5.tgz"; - sha512 = "AKrFDof1e6r7K5EC71wGhOfAjujf9GuJ0g56CKGps4FfDw7CwFg77KFwpqsFWjyt6t1fmvFAlKdhVXuNyH4c2Q=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.6.1.tgz"; + sha512 = "1NJpEeaRxrLdjA5nIr92U4DL7bfTMHJgJRIlBu2tGHYttnCOmBWqyRVA+g+prwwUR06EH8I7Dv3q042uc5Ji0A=="; }; }; - "@ot-builder/rectify-1.5.5" = { + "@ot-builder/rectify-1.6.1" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.5.5.tgz"; - sha512 = "nrx6Ubt7IX9IKUMJcAmNrHyi0kC83laGpnHKCGiBWGVfn/BdmFogRUGNR0NUpEImIVWTq0Y8Ae/tf/i9yI5eZQ=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.6.1.tgz"; + sha512 = "JFSO1YbH9G0pBqBk5xT01YvurUXiHH7k6daP4ceWfKp0Ch6cZCtgvxHIDvtSNxhYnlhBkBWye2+UyZSBlIu77w=="; }; }; - "@ot-builder/stat-glyphs-1.5.5" = { + "@ot-builder/stat-glyphs-1.6.1" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.5.5.tgz"; - sha512 = "DgWbUPy5de/2fL0JJ94UXJ5fibvDAtVWtjHUmgy38i+3vHYcQ14WPjq3sLxyOKRrrvBQ7CK7Z92N9JjBN+a5ZQ=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.6.1.tgz"; + sha512 = "IGZkR9QdVjPAEBXAe4qixlp4DvHioxD/bp/d+jlIUVgUGZzo/wpwUV/ktT/zjZXDdNpVSdTa/RSG5mUtWHqf8w=="; }; }; - "@ot-builder/trace-1.5.5" = { + "@ot-builder/trace-1.6.1" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.5.5.tgz"; - sha512 = "hOH55nKImSbq/5ZgZ8pya1/yIvC3IDRfqfWL/3Uz0Zp0StD6/9xhegK+9bM3Qs/llmDXZd7JYOsyWETw8f1iIg=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.6.1.tgz"; + sha512 = "r18ahZoSFv2bWl9oQCDM4IT4aPr8krMjHJHj0brHoMKhrPH/iE9k+d97UaqXUd+I8ZliTfihK/AzOArjIv2ZqQ=="; }; }; - "@ot-builder/var-store-1.5.5" = { + "@ot-builder/var-store-1.6.1" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.5.5.tgz"; - sha512 = "H18j0yR9qrwXC665lHDq07DBRKkxxlB3mcjUXYX8xElkv/UcD42FOI5lTlvLYV39e3f8uBTf9IhVYPNTYtZHmg=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.6.1.tgz"; + sha512 = "SHkiufkRd07hE4Y75lr013yN0TKdebCqe9VpY/W05EwFL+0DBX2w1cE8FYqiVeS2EYA2hE727BpxTJbTHcRa2Q=="; }; }; - "@ot-builder/variance-1.5.5" = { + "@ot-builder/variance-1.6.1" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.5.5.tgz"; - sha512 = "Jp20Ro43mLR32erJkLolduF1Q+jBYwDJitcEaGztVEmNGLbJNHb++jFIQSswIFDUrmj/3pKgret4ASiLc4WIkw=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.6.1.tgz"; + sha512 = "RQ9H+jCcshoEUOYjpaOhxSJ31uiKJ8FAOqAvd8JdmDNJAHmmQmaNINOUr+amR0bJk6GqbKnuK48Xs3+8OiAgcw=="; }; }; - "@parcel/bundler-default-2.8.2" = { + "@parcel/bundler-default-2.8.3" = { name = "_at_parcel_slash_bundler-default"; packageName = "@parcel/bundler-default"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.8.2.tgz"; - sha512 = "/7ao0vc/v8WGHZaS1SyS5R8wzqmmXEr9mhIIB2cbLQ4LA2WUtKsYcvZ2gjJuiAAN1CHC6GxqwYjIJScQCk/QXg=="; + url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.8.3.tgz"; + sha512 = "yJvRsNWWu5fVydsWk3O2L4yIy3UZiKWO2cPDukGOIWMgp/Vbpp+2Ct5IygVRtE22bnseW/E/oe0PV3d2IkEJGg=="; }; }; - "@parcel/cache-2.8.2" = { + "@parcel/cache-2.8.3" = { name = "_at_parcel_slash_cache"; packageName = "@parcel/cache"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.8.2.tgz"; - sha512 = "kiyoOgh1RXp5qp+wlb8Pi/Z7o9D82Oj5RlHnKSAauyR7jgnI8Vq8JTeBmlLqrf+kHxcDcp2p86hidSeANhlQNg=="; + url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.8.3.tgz"; + sha512 = "k7xv5vSQrJLdXuglo+Hv3yF4BCSs1tQ/8Vbd6CHTkOhf7LcGg6CPtLw053R/KdMpd/4GPn0QrAsOLdATm1ELtQ=="; }; }; - "@parcel/codeframe-2.8.2" = { + "@parcel/codeframe-2.8.3" = { name = "_at_parcel_slash_codeframe"; packageName = "@parcel/codeframe"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.8.2.tgz"; - sha512 = "U2GT9gq1Zs3Gr83j8JIs10bLbGOHFl57Y8D57nrdR05F4iilV/UR6K7jkhdoiFc9WiHh3ewvrko5+pSdAVFPgQ=="; + url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.8.3.tgz"; + sha512 = "FE7sY53D6n/+2Pgg6M9iuEC6F5fvmyBkRE4d9VdnOoxhTXtkEqpqYgX7RJ12FAQwNlxKq4suBJQMgQHMF2Kjeg=="; }; }; - "@parcel/compressor-raw-2.8.2" = { + "@parcel/compressor-raw-2.8.3" = { name = "_at_parcel_slash_compressor-raw"; packageName = "@parcel/compressor-raw"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.8.2.tgz"; - sha512 = "EFPTer/P+3axifH6LtYHS3E6ABgdZnjZomJZ/Nl19lypZh/NgZzmMZlINlEVqyYhCggoKfXzgeTgkIHPN2d5Vw=="; + url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.8.3.tgz"; + sha512 = "bVDsqleBUxRdKMakWSlWC9ZjOcqDKE60BE+Gh3JSN6WJrycJ02P5wxjTVF4CStNP/G7X17U+nkENxSlMG77ySg=="; }; }; - "@parcel/config-default-2.8.2" = { + "@parcel/config-default-2.8.3" = { name = "_at_parcel_slash_config-default"; packageName = "@parcel/config-default"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.8.2.tgz"; - sha512 = "1ELJAHx37fKSZZkYKWy6UdcuLRv5vrZJc89tVS6eRvvMt+udbIoSgIUzPXu7XemkcchF7Tryw3u2pRyxyLyL3w=="; + url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.8.3.tgz"; + sha512 = "o/A/mbrO6X/BfGS65Sib8d6SSG45NYrNooNBkH/o7zbOBSRQxwyTlysleK1/3Wa35YpvFyLOwgfakqCtbGy4fw=="; }; }; - "@parcel/core-2.8.2" = { + "@parcel/core-2.8.3" = { name = "_at_parcel_slash_core"; packageName = "@parcel/core"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/core/-/core-2.8.2.tgz"; - sha512 = "ZGuq6p+Lzx6fgufaVsuOBwgpU3hgskTvIDIMdIDi9gOZyhGPK7U2srXdX+VYUL5ZSGbX04/P6QlB9FMAXK+nEg=="; + url = "https://registry.npmjs.org/@parcel/core/-/core-2.8.3.tgz"; + sha512 = "Euf/un4ZAiClnlUXqPB9phQlKbveU+2CotZv7m7i+qkgvFn5nAGnrV4h1OzQU42j9dpgOxWi7AttUDMrvkbhCQ=="; }; }; - "@parcel/diagnostic-2.8.2" = { + "@parcel/diagnostic-2.8.3" = { name = "_at_parcel_slash_diagnostic"; packageName = "@parcel/diagnostic"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.8.2.tgz"; - sha512 = "tGSMwM2rSYLjJW0fCd9gb3tNjfCX/83PZ10/5u2E33UZVkk8OIHsQmsrtq2H2g4oQL3rFxkfEx6nGPDGHwlx7A=="; + url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.8.3.tgz"; + sha512 = "u7wSzuMhLGWZjVNYJZq/SOViS3uFG0xwIcqXw12w54Uozd6BH8JlhVtVyAsq9kqnn7YFkw6pXHqAo5Tzh4FqsQ=="; }; }; - "@parcel/events-2.8.2" = { + "@parcel/events-2.8.3" = { name = "_at_parcel_slash_events"; packageName = "@parcel/events"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/events/-/events-2.8.2.tgz"; - sha512 = "o5etrsKm16y8iRPnjtEBNy4lD0WAigD66yt/RZl9Rx0vPVDly/63Rr9+BrXWVW7bJ7x0S0VVpWW4j3f/qZOsXg=="; + url = "https://registry.npmjs.org/@parcel/events/-/events-2.8.3.tgz"; + sha512 = "hoIS4tAxWp8FJk3628bsgKxEvR7bq2scCVYHSqZ4fTi/s0+VymEATrRCUqf+12e5H47uw1/ZjoqrGtBI02pz4w=="; }; }; "@parcel/fs-1.11.0" = { @@ -9202,40 +9706,40 @@ let sha512 = "86RyEqULbbVoeo8OLcv+LQ1Vq2PKBAvWTU9fCgALxuCTbbs5Ppcvll4Vr+Ko1AnmMzja/k++SzNAwJfeQXVlpA=="; }; }; - "@parcel/fs-2.8.2" = { + "@parcel/fs-2.8.3" = { name = "_at_parcel_slash_fs"; packageName = "@parcel/fs"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.8.2.tgz"; - sha512 = "aN8znbMndSqn1xwZEmMblzqmJsxcExv2jKLl/a9RUHAP7LaPYcPZIykDL3YwGCiKTCzjmRpXnNoyosjFFeBaHA=="; + url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.8.3.tgz"; + sha512 = "y+i+oXbT7lP0e0pJZi/YSm1vg0LDsbycFuHZIL80pNwdEppUAtibfJZCp606B7HOjMAlNZOBo48e3hPG3d8jgQ=="; }; }; - "@parcel/fs-search-2.8.2" = { + "@parcel/fs-search-2.8.3" = { name = "_at_parcel_slash_fs-search"; packageName = "@parcel/fs-search"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.8.2.tgz"; - sha512 = "ovQnupRm/MoE/tbgH0Ivknk0QYenXAewjcog+T5umDmUlTmnIRZjURrgDf5Xtw8T/CD5Xv+HmIXpJ9Ez/LzJpw=="; + url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.8.3.tgz"; + sha512 = "DJBT2N8knfN7Na6PP2mett3spQLTqxFrvl0gv+TJRp61T8Ljc4VuUTb0hqBj+belaASIp3Q+e8+SgaFQu7wLiQ=="; }; }; - "@parcel/graph-2.8.2" = { + "@parcel/graph-2.8.3" = { name = "_at_parcel_slash_graph"; packageName = "@parcel/graph"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.8.2.tgz"; - sha512 = "SLEvBQBgfkXgU4EBu30+CNanpuKjcNuEv/x8SwobCF0i3Rk+QKbe7T36bNR7727mao++2Ha69q93Dd9dTPw0kQ=="; + url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.8.3.tgz"; + sha512 = "26GL8fYZPdsRhSXCZ0ZWliloK6DHlMJPWh6Z+3VVZ5mnDSbYg/rRKWmrkhnr99ZWmL9rJsv4G74ZwvDEXTMPBg=="; }; }; - "@parcel/hash-2.8.2" = { + "@parcel/hash-2.8.3" = { name = "_at_parcel_slash_hash"; packageName = "@parcel/hash"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.8.2.tgz"; - sha512 = "NBnP8Hu0xvAqAfZXRaMM66i8nJyxpKS86BbhwkbgTGbwO1OY87GERliHeREJfcER0E0ZzwNow7MNR8ZDm6IvJQ=="; + url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.8.3.tgz"; + sha512 = "FVItqzjWmnyP4ZsVgX+G00+6U2IzOvqDtdwQIWisCcVoXJFCqZJDy6oa2qDDFz96xCCCynjRjPdQx2jYBCpfYw=="; }; }; "@parcel/logger-1.11.1" = { @@ -9247,211 +9751,211 @@ let sha512 = "9NF3M6UVeP2udOBDILuoEHd8VrF4vQqoWHEafymO1pfSoOMfxrSJZw1MfyAAIUN/IFp9qjcpDCUbDZB+ioVevA=="; }; }; - "@parcel/logger-2.8.2" = { + "@parcel/logger-2.8.3" = { name = "_at_parcel_slash_logger"; packageName = "@parcel/logger"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.8.2.tgz"; - sha512 = "zlhK6QHxfFJMlVJxxcCw0xxBDrYPFPOhMxSD6p6b0z9Yct1l3NdpmfabgjKX8wnZmHokFsil6daleM+M80n2Ew=="; + url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.8.3.tgz"; + sha512 = "Kpxd3O/Vs7nYJIzkdmB6Bvp3l/85ydIxaZaPfGSGTYOfaffSOTkhcW9l6WemsxUrlts4za6CaEWcc4DOvaMOPA=="; }; }; - "@parcel/markdown-ansi-2.8.2" = { + "@parcel/markdown-ansi-2.8.3" = { name = "_at_parcel_slash_markdown-ansi"; packageName = "@parcel/markdown-ansi"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.8.2.tgz"; - sha512 = "5y29TXgRgG0ybuXaDsDk4Aofg/nDUeAAyVl9/toYCDDhxpQV4yZt8WNPu4PaNYKGLuNgXwsmz+ryZQHGmfbAIQ=="; + url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.8.3.tgz"; + sha512 = "4v+pjyoh9f5zuU/gJlNvNFGEAb6J90sOBwpKJYJhdWXLZMNFCVzSigxrYO+vCsi8G4rl6/B2c0LcwIMjGPHmFQ=="; }; }; - "@parcel/namer-default-2.8.2" = { + "@parcel/namer-default-2.8.3" = { name = "_at_parcel_slash_namer-default"; packageName = "@parcel/namer-default"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.8.2.tgz"; - sha512 = "sMLW/bDWXA6IE7TQKOsBnA5agZGNvZ9qIXKZEUTsTloUjMdAWI8NYA1s0i9HovnGxI5uGlgevrftK4S5V4AdkA=="; + url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.8.3.tgz"; + sha512 = "tJ7JehZviS5QwnxbARd8Uh63rkikZdZs1QOyivUhEvhN+DddSAVEdQLHGPzkl3YRk0tjFhbqo+Jci7TpezuAMw=="; }; }; - "@parcel/node-resolver-core-2.8.2" = { + "@parcel/node-resolver-core-2.8.3" = { name = "_at_parcel_slash_node-resolver-core"; packageName = "@parcel/node-resolver-core"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.8.2.tgz"; - sha512 = "D/NJEz/h/C3RmUOWSTg0cLwG3uRVHY9PL+3YGO/c8tKu8PlS2j55XtntdiVfwkK+P6avLCnrJnv/gwTa79dOPw=="; + url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.8.3.tgz"; + sha512 = "12YryWcA5Iw2WNoEVr/t2HDjYR1iEzbjEcxfh1vaVDdZ020PiGw67g5hyIE/tsnG7SRJ0xdRx1fQ2hDgED+0Ww=="; }; }; - "@parcel/optimizer-css-2.8.2" = { + "@parcel/optimizer-css-2.8.3" = { name = "_at_parcel_slash_optimizer-css"; packageName = "@parcel/optimizer-css"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.8.2.tgz"; - sha512 = "pQEuKhk0PJuYI3hrXlf4gpuuPy+MZUDzC44ulQM7kVcVJ0OofuJQQeHfTLE+v5wClFDd29ZQZ7RsLP5RyUQ+Lg=="; + url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.8.3.tgz"; + sha512 = "JotGAWo8JhuXsQDK0UkzeQB0UR5hDAKvAviXrjqB4KM9wZNLhLleeEAW4Hk8R9smCeQFP6Xg/N/NkLDpqMwT3g=="; }; }; - "@parcel/optimizer-htmlnano-2.8.2" = { + "@parcel/optimizer-htmlnano-2.8.3" = { name = "_at_parcel_slash_optimizer-htmlnano"; packageName = "@parcel/optimizer-htmlnano"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.8.2.tgz"; - sha512 = "4+3wi+Yi+hsf5/LolX59JXFe/7bLpI6NetUBgtoxOVm/EzFg1NGSNOcrthzEcgGj6+MMSdzBAxRTPObAfDxJCA=="; + url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.8.3.tgz"; + sha512 = "L8/fHbEy8Id2a2E0fwR5eKGlv9VYDjrH9PwdJE9Za9v1O/vEsfl/0T/79/x129l5O0yB6EFQkFa20MiK3b+vOg=="; }; }; - "@parcel/optimizer-image-2.8.2" = { + "@parcel/optimizer-image-2.8.3" = { name = "_at_parcel_slash_optimizer-image"; packageName = "@parcel/optimizer-image"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.8.2.tgz"; - sha512 = "/ICYG0smbMkli+su4m/ENQPxQDCPYYTJTjseKwl+t1vyj6wqNF99mNI4c0RE2TIPuDneGwSz7PlHhC2JmdgxfQ=="; + url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.8.3.tgz"; + sha512 = "SD71sSH27SkCDNUNx9A3jizqB/WIJr3dsfp+JZGZC42tpD/Siim6Rqy9M4To/BpMMQIIiEXa5ofwS+DgTEiEHQ=="; }; }; - "@parcel/optimizer-svgo-2.8.2" = { + "@parcel/optimizer-svgo-2.8.3" = { name = "_at_parcel_slash_optimizer-svgo"; packageName = "@parcel/optimizer-svgo"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.8.2.tgz"; - sha512 = "nFWyM+CBtgBixqknpbN4R92v8PK7Gjlrsb8vxN/IIr/3Pjk+DfoT51DnynhU7AixvDylYkgjjqrQ7uFYYl0OKA=="; + url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.8.3.tgz"; + sha512 = "9KQed99NZnQw3/W4qBYVQ7212rzA9EqrQG019TIWJzkA9tjGBMIm2c/nXpK1tc3hQ3e7KkXkFCQ3C+ibVUnHNA=="; }; }; - "@parcel/optimizer-terser-2.8.2" = { + "@parcel/optimizer-terser-2.8.3" = { name = "_at_parcel_slash_optimizer-terser"; packageName = "@parcel/optimizer-terser"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.8.2.tgz"; - sha512 = "jFAOh9WaO6oNc8B9qDsCWzNkH7nYlpvaPn0w3ZzpMDi0HWD+w+xgO737rWLJWZapqUDSOs0Q/hDFEZ82/z0yxA=="; + url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.8.3.tgz"; + sha512 = "9EeQlN6zIeUWwzrzu6Q2pQSaYsYGah8MtiQ/hog9KEPlYTP60hBv/+utDyYEHSQhL7y5ym08tPX5GzBvwAD/dA=="; }; }; - "@parcel/package-manager-2.8.2" = { + "@parcel/package-manager-2.8.3" = { name = "_at_parcel_slash_package-manager"; packageName = "@parcel/package-manager"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.8.2.tgz"; - sha512 = "hx4Imi0yhsSS0aNZkEANPYNNKqBuR63EUNWSxMyHh4ZOvbHoOXnMn1ySGdx6v0oi9HvKymNsLMQ1T5CuI4l4Bw=="; + url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.8.3.tgz"; + sha512 = "tIpY5pD2lH53p9hpi++GsODy6V3khSTX4pLEGuMpeSYbHthnOViobqIlFLsjni+QA1pfc8NNNIQwSNdGjYflVA=="; }; }; - "@parcel/packager-css-2.8.2" = { + "@parcel/packager-css-2.8.3" = { name = "_at_parcel_slash_packager-css"; packageName = "@parcel/packager-css"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.8.2.tgz"; - sha512 = "l2fR5qr1moUWLOqQZPxtH6DBKbaKcxzEPAmQ+f15dHt8eQxU15MyQ4DHX41b5B7HwaumgCqe0NkuTF3DedpJKg=="; + url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.8.3.tgz"; + sha512 = "WyvkMmsurlHG8d8oUVm7S+D+cC/T3qGeqogb7sTI52gB6uiywU7lRCizLNqGFyFGIxcVTVHWnSHqItBcLN76lA=="; }; }; - "@parcel/packager-html-2.8.2" = { + "@parcel/packager-html-2.8.3" = { name = "_at_parcel_slash_packager-html"; packageName = "@parcel/packager-html"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.8.2.tgz"; - sha512 = "/oiTsKZ5OyF9OwAVGHANNuW2TB3k3cVub1QfttSKJgG3sAhrOifb1dP8zBHMxvUrB0CJdYhGlgi1Jth9kjACCg=="; + url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.8.3.tgz"; + sha512 = "OhPu1Hx1RRKJodpiu86ZqL8el2Aa4uhBHF6RAL1Pcrh2EhRRlPf70Sk0tC22zUpYL7es+iNKZ/n0Rl+OWSHWEw=="; }; }; - "@parcel/packager-js-2.8.2" = { + "@parcel/packager-js-2.8.3" = { name = "_at_parcel_slash_packager-js"; packageName = "@parcel/packager-js"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.8.2.tgz"; - sha512 = "48LtHP4lJn8J1aBeD4Ix/YjsRxrBUkzbx7czdUeRh2PlCqY4wwIhciVlEFipj/ANr3ieSX44lXyVPk/ttnSdrw=="; + url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.8.3.tgz"; + sha512 = "0pGKC3Ax5vFuxuZCRB+nBucRfFRz4ioie19BbDxYnvBxrd4M3FIu45njf6zbBYsI9eXqaDnL1b3DcZJfYqtIzw=="; }; }; - "@parcel/packager-raw-2.8.2" = { + "@parcel/packager-raw-2.8.3" = { name = "_at_parcel_slash_packager-raw"; packageName = "@parcel/packager-raw"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.8.2.tgz"; - sha512 = "dGonfFptNV1lgqKaD17ecXBUyIfoG6cJI1cCE1sSoYCEt7r+Rq56X/Gq8oiA3+jjMC7QTls+SmFeMZh26fl77Q=="; + url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.8.3.tgz"; + sha512 = "BA6enNQo1RCnco9MhkxGrjOk59O71IZ9DPKu3lCtqqYEVd823tXff2clDKHK25i6cChmeHu6oB1Rb73hlPqhUA=="; }; }; - "@parcel/packager-svg-2.8.2" = { + "@parcel/packager-svg-2.8.3" = { name = "_at_parcel_slash_packager-svg"; packageName = "@parcel/packager-svg"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.8.2.tgz"; - sha512 = "k7LymTJ4XQA+UcPwFYqJfWs5/Awa4GirNxRWfiFflLqH3F1XvMiKSCIQXmrDM6IaeIqqDDsu6+P5U6YDAzzM3A=="; + url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.8.3.tgz"; + sha512 = "mvIoHpmv5yzl36OjrklTDFShLUfPFTwrmp1eIwiszGdEBuQaX7JVI3Oo2jbVQgcN4W7J6SENzGQ3Q5hPTW3pMw=="; }; }; - "@parcel/plugin-2.8.2" = { + "@parcel/plugin-2.8.3" = { name = "_at_parcel_slash_plugin"; packageName = "@parcel/plugin"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.8.2.tgz"; - sha512 = "YG7TWfKsoNm72jbz3b3TLec0qJHVkuAWSzGzowdIhX37cP1kRfp6BU2VcH+qYPP/KYJLzhcZa9n3by147mGcxw=="; + url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.8.3.tgz"; + sha512 = "jZ6mnsS4D9X9GaNnvrixDQwlUQJCohDX2hGyM0U0bY2NWU8Km97SjtoCpWjq+XBCx/gpC4g58+fk9VQeZq2vlw=="; }; }; - "@parcel/reporter-cli-2.8.2" = { + "@parcel/reporter-cli-2.8.3" = { name = "_at_parcel_slash_reporter-cli"; packageName = "@parcel/reporter-cli"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.8.2.tgz"; - sha512 = "OIRlBqpKqPpMWRHATT8az8fUAqfceLWlWqgX/CW5cG1i6gefbBWFq2qYxDVBEk1bPDLIUCtqNLhfO8hLyweMjA=="; + url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.8.3.tgz"; + sha512 = "3sJkS6tFFzgIOz3u3IpD/RsmRxvOKKiQHOTkiiqRt1l44mMDGKS7zANRnJYsQzdCsgwc9SOP30XFgJwtoVlMbw=="; }; }; - "@parcel/reporter-dev-server-2.8.2" = { + "@parcel/reporter-dev-server-2.8.3" = { name = "_at_parcel_slash_reporter-dev-server"; packageName = "@parcel/reporter-dev-server"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.8.2.tgz"; - sha512 = "A16pAQSAT8Yilo1yCPZcrtWbRhwyiMopEz0mOyGobA1ZDy6B3j4zjobIWzdPQCSIY7+v44vtWMDGbdGrxt6M1Q=="; + url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.8.3.tgz"; + sha512 = "Y8C8hzgzTd13IoWTj+COYXEyCkXfmVJs3//GDBsH22pbtSFMuzAZd+8J9qsCo0EWpiDow7V9f1LischvEh3FbQ=="; }; }; - "@parcel/resolver-default-2.8.2" = { + "@parcel/resolver-default-2.8.3" = { name = "_at_parcel_slash_resolver-default"; packageName = "@parcel/resolver-default"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.8.2.tgz"; - sha512 = "mlowJMjFjyps9my8wd13kgeExJ5EgkPAuIxRSSWW+GPR7N3uA5DBJ+SB/CzdhCkPrXR6kwVWxNkkOch38pzOQQ=="; + url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.8.3.tgz"; + sha512 = "k0B5M/PJ+3rFbNj4xZSBr6d6HVIe6DH/P3dClLcgBYSXAvElNDfXgtIimbjCyItFkW9/BfcgOVKEEIZOeySH/A=="; }; }; - "@parcel/runtime-browser-hmr-2.8.2" = { + "@parcel/runtime-browser-hmr-2.8.3" = { name = "_at_parcel_slash_runtime-browser-hmr"; packageName = "@parcel/runtime-browser-hmr"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.8.2.tgz"; - sha512 = "VRM8mxakMglqRB0f5eAuwCigjJ5vlaJMwHy+JuzOsn/yVSELOb+6psRKl2B9hhxp9sJPt4IU6KDdH2IOrgx87Q=="; + url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.8.3.tgz"; + sha512 = "2O1PYi2j/Q0lTyGNV3JdBYwg4rKo6TEVFlYGdd5wCYU9ZIN9RRuoCnWWH2qCPj3pjIVtBeppYxzfVjPEHINWVg=="; }; }; - "@parcel/runtime-js-2.8.2" = { + "@parcel/runtime-js-2.8.3" = { name = "_at_parcel_slash_runtime-js"; packageName = "@parcel/runtime-js"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.8.2.tgz"; - sha512 = "Vk3Gywn2M9qP5X4lF6tu8QXP4xNI90UOSOhKHQ9W5pCu+zvD0Gdvu7qwQPFuFjIAq08xU7+PvZzGnlnM+8NyRw=="; + url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.8.3.tgz"; + sha512 = "IRja0vNKwvMtPgIqkBQh0QtRn0XcxNC8HU1jrgWGRckzu10qJWO+5ULgtOeR4pv9krffmMPqywGXw6l/gvJKYQ=="; }; }; - "@parcel/runtime-react-refresh-2.8.2" = { + "@parcel/runtime-react-refresh-2.8.3" = { name = "_at_parcel_slash_runtime-react-refresh"; packageName = "@parcel/runtime-react-refresh"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.8.2.tgz"; - sha512 = "JjaMvBVx6v0zB1KHa7AopciIsl3FpjUMttr2tb6L7lzocti2muQGE6GBfinXOmD5oERwCf8HwGJ8SNFcIF0rKA=="; + url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.8.3.tgz"; + sha512 = "2v/qFKp00MfG0234OdOgQNAo6TLENpFYZMbVbAsPMY9ITiqG73MrEsrGXVoGbYiGTMB/Toer/lSWlJxtacOCuA=="; }; }; - "@parcel/runtime-service-worker-2.8.2" = { + "@parcel/runtime-service-worker-2.8.3" = { name = "_at_parcel_slash_runtime-service-worker"; packageName = "@parcel/runtime-service-worker"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.8.2.tgz"; - sha512 = "KSxbOKV8nuH5JjFvcUlCtBYnVVlmxreXpMxRUPphPwJnyxRGA4E0jofbQxWY5KPgp7x/ZnZU/nyzCvqURH3kHA=="; + url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.8.3.tgz"; + sha512 = "/Skkw+EeRiwzOJso5fQtK8c9b452uWLNhQH1ISTodbmlcyB4YalAiSsyHCtMYD0c3/t5Sx4ZS7vxBAtQd0RvOw=="; }; }; "@parcel/source-map-2.1.1" = { @@ -9463,112 +9967,112 @@ let sha512 = "Ejx1P/mj+kMjQb8/y5XxDUn4reGdr+WyKYloBljpppUy8gs42T+BNoEOuRYqDVdgPc6NxduzIDoJS9pOFfV5Ew=="; }; }; - "@parcel/transformer-babel-2.8.2" = { + "@parcel/transformer-babel-2.8.3" = { name = "_at_parcel_slash_transformer-babel"; packageName = "@parcel/transformer-babel"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.8.2.tgz"; - sha512 = "oL2BpvrPMwFiU9jUZ9UYGD1gRgvq9jLsOq+/PJl4GvPbOBVedIBE2nbHP/mYuWRpRnTTTiJQ/ItyOS0R2VQl7A=="; + url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.8.3.tgz"; + sha512 = "L6lExfpvvC7T/g3pxf3CIJRouQl+sgrSzuWQ0fD4PemUDHvHchSP4SNUVnd6gOytF3Y1KpnEZIunQGi5xVqQCQ=="; }; }; - "@parcel/transformer-css-2.8.2" = { + "@parcel/transformer-css-2.8.3" = { name = "_at_parcel_slash_transformer-css"; packageName = "@parcel/transformer-css"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.8.2.tgz"; - sha512 = "q8UDlX/TTCbuFBMU45q12/p92JNIz8MHkkH104dWDzXbRtvMKMg8jgNmr8S2bouZjtXMsSb2c54EO88DSM9G4A=="; + url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.8.3.tgz"; + sha512 = "xTqFwlSXtnaYen9ivAgz+xPW7yRl/u4QxtnDyDpz5dr8gSeOpQYRcjkd4RsYzKsWzZcGtB5EofEk8ayUbWKEUg=="; }; }; - "@parcel/transformer-html-2.8.2" = { + "@parcel/transformer-html-2.8.3" = { name = "_at_parcel_slash_transformer-html"; packageName = "@parcel/transformer-html"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.8.2.tgz"; - sha512 = "QDgDw6+DAcllaRQiRteMX0VgPIsxRUTXFS8jcXhbGio41LbUkLcT09M04L/cfJAAzvIKhXqiOxfNnyajTvCPDQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.8.3.tgz"; + sha512 = "kIZO3qsMYTbSnSpl9cnZog+SwL517ffWH54JeB410OSAYF1ouf4n5v9qBnALZbuCCmPwJRGs4jUtE452hxwN4g=="; }; }; - "@parcel/transformer-image-2.8.2" = { + "@parcel/transformer-image-2.8.3" = { name = "_at_parcel_slash_transformer-image"; packageName = "@parcel/transformer-image"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.8.2.tgz"; - sha512 = "B/D9v/BVyN5jxoi+wHPbIRfMIylmC6adp8GP+BtChjbuRjukgGT8RlAVz4vDm1l0bboeyPL2IuoWRQgXKGuPVg=="; + url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.8.3.tgz"; + sha512 = "cO4uptcCGTi5H6bvTrAWEFUsTNhA4kCo8BSvRSCHA2sf/4C5tGQPHt3JhdO0GQLPwZRCh/R41EkJs5HZ8A8DAg=="; }; }; - "@parcel/transformer-js-2.8.2" = { + "@parcel/transformer-js-2.8.3" = { name = "_at_parcel_slash_transformer-js"; packageName = "@parcel/transformer-js"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.8.2.tgz"; - sha512 = "mLksi6gu/20JdCFDNPl7Y0HTwJOAvf2ybC2HaJcy69PJCeUrrstgiFTjsCwv1eKcesgEHi9kKX+sMHVAH3B/dA=="; + url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.8.3.tgz"; + sha512 = "9Qd6bib+sWRcpovvzvxwy/PdFrLUXGfmSW9XcVVG8pvgXsZPFaNjnNT8stzGQj1pQiougCoxMY4aTM5p1lGHEQ=="; }; }; - "@parcel/transformer-json-2.8.2" = { + "@parcel/transformer-json-2.8.3" = { name = "_at_parcel_slash_transformer-json"; packageName = "@parcel/transformer-json"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.8.2.tgz"; - sha512 = "eZuaY5tMxcMDJwpHJbPVTgSaBIO4mamwAa3VulN9kRRaf29nc+Q0iM7zMFVHWFQAi/mZZ194IIQXbDX3r6oSSQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.8.3.tgz"; + sha512 = "B7LmVq5Q7bZO4ERb6NHtRuUKWGysEeaj9H4zelnyBv+wLgpo4f5FCxSE1/rTNmP9u1qHvQ3scGdK6EdSSokGPg=="; }; }; - "@parcel/transformer-postcss-2.8.2" = { + "@parcel/transformer-postcss-2.8.3" = { name = "_at_parcel_slash_transformer-postcss"; packageName = "@parcel/transformer-postcss"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.8.2.tgz"; - sha512 = "0Vb4T2e0QinNDps1/PxYsZwEzWieVxoW++AAUD3gzg0MfSyRc72MPc27CLOnziiRDyOUl+62gqpnNzq9xaKExA=="; + url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.8.3.tgz"; + sha512 = "e8luB/poIlz6jBsD1Izms+6ElbyzuoFVa4lFVLZnTAChI3UxPdt9p/uTsIO46HyBps/Bk8ocvt3J4YF84jzmvg=="; }; }; - "@parcel/transformer-posthtml-2.8.2" = { + "@parcel/transformer-posthtml-2.8.3" = { name = "_at_parcel_slash_transformer-posthtml"; packageName = "@parcel/transformer-posthtml"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.8.2.tgz"; - sha512 = "Ub7o6QlH7+xHHHdhvR7MxTqjyLVqeJopPSzy4yP+Bd72tWVjaVm7f76SUl+p7VjhLTMkmczr9OxG3k0SFHEbGw=="; + url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.8.3.tgz"; + sha512 = "pkzf9Smyeaw4uaRLsT41RGrPLT5Aip8ZPcntawAfIo+KivBQUV0erY1IvHYjyfFzq1ld/Fo2Ith9He6mxpPifA=="; }; }; - "@parcel/transformer-raw-2.8.2" = { + "@parcel/transformer-raw-2.8.3" = { name = "_at_parcel_slash_transformer-raw"; packageName = "@parcel/transformer-raw"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.8.2.tgz"; - sha512 = "xSzyZtrfisbx0R7xkuFJ/FksKyWaUFN18F9/0bLF8wo5LrOTQoYQatjun7/Rbq5mELBK/0ZPp7uJ02OqLRd2mA=="; + url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.8.3.tgz"; + sha512 = "G+5cXnd2/1O3nV/pgRxVKZY/HcGSseuhAe71gQdSQftb8uJEURyUHoQ9Eh0JUD3MgWh9V+nIKoyFEZdf9T0sUQ=="; }; }; - "@parcel/transformer-react-refresh-wrap-2.8.2" = { + "@parcel/transformer-react-refresh-wrap-2.8.3" = { name = "_at_parcel_slash_transformer-react-refresh-wrap"; packageName = "@parcel/transformer-react-refresh-wrap"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.8.2.tgz"; - sha512 = "UXBILYFXaj5zh1DzoYXoS3Wuq1+6WjoRQaFTUA5xrF3pjJb6LAXxWru3R20zR5INHIZXPxdQJB0b+epnmyjK4w=="; + url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.8.3.tgz"; + sha512 = "q8AAoEvBnCf/nPvgOwFwKZfEl/thwq7c2duxXkhl+tTLDRN2vGmyz4355IxCkavSX+pLWSQ5MexklSEeMkgthg=="; }; }; - "@parcel/transformer-svg-2.8.2" = { + "@parcel/transformer-svg-2.8.3" = { name = "_at_parcel_slash_transformer-svg"; packageName = "@parcel/transformer-svg"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.8.2.tgz"; - sha512 = "FyliRrNHOF6tGzwHSzA2CTbkq3iMvS27eozf1kFj6gbO8gfJ5HXYoppQrTb237YZ/WXCHqe/3HVmGyJDZiLr+Q=="; + url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.8.3.tgz"; + sha512 = "3Zr/gBzxi1ZH1fftH/+KsZU7w5GqkmxlB0ZM8ovS5E/Pl1lq1t0xvGJue9m2VuQqP8Mxfpl5qLFmsKlhaZdMIQ=="; }; }; - "@parcel/types-2.8.2" = { + "@parcel/types-2.8.3" = { name = "_at_parcel_slash_types"; packageName = "@parcel/types"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/types/-/types-2.8.2.tgz"; - sha512 = "HAYhokWxM10raIhqaYj9VR9eAvJ+xP2sNfQ1IcQybHpq3qblcBe/4jDeuUpwIyKeQ4gorp7xY+q8KDoR20j43w=="; + url = "https://registry.npmjs.org/@parcel/types/-/types-2.8.3.tgz"; + sha512 = "FECA1FB7+0UpITKU0D6TgGBpGxYpVSMNEENZbSJxFSajNy3wrko+zwBKQmFOLOiPcEtnGikxNs+jkFWbPlUAtw=="; }; }; "@parcel/utils-1.11.0" = { @@ -9580,13 +10084,13 @@ let sha512 = "cA3p4jTlaMeOtAKR/6AadanOPvKeg8VwgnHhOyfi0yClD0TZS/hi9xu12w4EzA/8NtHu0g6o4RDfcNjqN8l1AQ=="; }; }; - "@parcel/utils-2.8.2" = { + "@parcel/utils-2.8.3" = { name = "_at_parcel_slash_utils"; packageName = "@parcel/utils"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.8.2.tgz"; - sha512 = "Ufax7wZxC9FNsUpR0EU7Z22LEY/q9jjsDTwswctCdfpWb7TE/NudOfM9myycfRvwBVEYN50lPbkt1QltEVnXQQ=="; + url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.8.3.tgz"; + sha512 = "IhVrmNiJ+LOKHcCivG5dnuLGjhPYxQ/IzbnF2DKNQXWBTsYlHkJZpmz7THoeLtLliGmSOZ3ZCsbR8/tJJKmxjA=="; }; }; "@parcel/watcher-1.12.1" = { @@ -9625,13 +10129,13 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@parcel/workers-2.8.2" = { + "@parcel/workers-2.8.3" = { name = "_at_parcel_slash_workers"; packageName = "@parcel/workers"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.8.2.tgz"; - sha512 = "Eg6CofIrJSNBa2fjXwvnzVLPKwR/6fkfQTFAm3Jl+4JYLVknBtTSFzQNp/Fa+HUEG889H9ucTk2CBi/fVPBAFw=="; + url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.8.3.tgz"; + sha512 = "+AxBnKgjqVpUHBcHLWIHcjYgKIvHIpZjN33mG5LG9XXvrZiqdWvouEzqEXlVLq5VzzVbKIQQcmsvRy138YErkg=="; }; }; "@peculiar/asn1-schema-2.3.3" = { @@ -9715,6 +10219,15 @@ let sha512 = "SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA=="; }; }; + "@pnpm/crypto.base32-hash-1.0.1" = { + name = "_at_pnpm_slash_crypto.base32-hash"; + packageName = "@pnpm/crypto.base32-hash"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/crypto.base32-hash/-/crypto.base32-hash-1.0.1.tgz"; + sha512 = "pzAXNn6KxTA3kbcI3iEnYs4vtH51XEVqmK/1EiD18MaPKylhqy8UvMJK3zKG+jeP82cqQbozcTGm4yOQ8i3vNw=="; + }; + }; "@pnpm/error-1.4.0" = { name = "_at_pnpm_slash_error"; packageName = "@pnpm/error"; @@ -9796,6 +10309,15 @@ let sha512 = "nco4+4sZqNHn60Y4VE/fbtlShCBqipyUO+nKRPvDHqLrecMW9pzHWMVRxk4nrMRoeowj3q0rX3GYRBa8lsHTAg=="; }; }; + "@pnpm/types-8.9.0" = { + name = "_at_pnpm_slash_types"; + packageName = "@pnpm/types"; + version = "8.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/types/-/types-8.9.0.tgz"; + sha512 = "3MYHYm8epnciApn6w5Fzx6sepawmsNU7l6lvIq+ER22/DPSrr83YMhU/EQWnf4lORn2YyiXFj0FJSyJzEtIGmw=="; + }; + }; "@pnpm/write-project-manifest-1.1.7" = { name = "_at_pnpm_slash_write-project-manifest"; packageName = "@pnpm/write-project-manifest"; @@ -9823,13 +10345,13 @@ let sha512 = "50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="; }; }; - "@primer/octicons-17.8.0" = { + "@primer/octicons-17.10.2" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "17.8.0"; + version = "17.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-17.8.0.tgz"; - sha512 = "2OyvErMeqsJ/K1ZbQ902QowrwqXq+BMmGiL+PGqFzUQ85wmaWj+CobOwWPxBLs/xVGzacJJPt4fWcx4EMoRMkg=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-17.10.2.tgz"; + sha512 = "J/p2PcgT39Za4wpukbN6iUkEUvL5aE7Bs9kXBeEkrjEgc0Uu7J7B2ypwx9J0qM3m3lk2273RT5/4oGv8pfFLcg=="; }; }; "@prisma/engines-4.9.0" = { @@ -9940,13 +10462,13 @@ let sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="; }; }; - "@putdotio/api-client-8.33.0" = { + "@putdotio/api-client-8.33.1" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.33.0"; + version = "8.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.33.0.tgz"; - sha512 = "8GdqRQGfquU8WX1XNOuHnKqG4PJb2fgfS+7OH2g5wHRPKXdeStVbVYIVFxttwIeIcNPNtvjYHKyWhhWkFImEnQ=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.33.1.tgz"; + sha512 = "16mQ2diUm2/smxLG0PummI3G66GY3Fqtd1D6K64knPvaZUR1bRYhEJaXHdgiQLpl2PNYZl4MCyHXJ217t2RK2w=="; }; }; "@reach/router-1.3.4" = { @@ -9976,13 +10498,13 @@ let sha512 = "EBw7Ag1hPgFzdznK2PBblc1kdlj5B5Cw3XwI9/oG7tSn85/HKy3X9xHy/8tm/eNXJYHLXHJL/pkwBpFMVVefkw=="; }; }; - "@redis/bloom-1.1.0" = { + "@redis/bloom-1.2.0" = { name = "_at_redis_slash_bloom"; packageName = "@redis/bloom"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/bloom/-/bloom-1.1.0.tgz"; - sha512 = "9QovlxmpRtvxVbN0UBcv8WfdSMudNZZTFqCsnBszcQXqaZb/TVe30ScgGEO7u1EAIacTPAo7/oCYjYAxiHLanQ=="; + url = "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz"; + sha512 = "HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg=="; }; }; "@redis/client-1.2.0" = { @@ -9994,13 +10516,13 @@ let sha512 = "a8Nlw5fv2EIAFJxTDSSDVUT7yfBGpZO96ybZXzQpgkyLg/dxtQ1uiwTc0EGfzg1mrPjZokeBSEGTbGXekqTNOg=="; }; }; - "@redis/client-1.4.2" = { + "@redis/client-1.5.3" = { name = "_at_redis_slash_client"; packageName = "@redis/client"; - version = "1.4.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/client/-/client-1.4.2.tgz"; - sha512 = "oUdEjE0I7JS5AyaAjkD3aOXn9NhO7XKyPyXEyrgFDu++VrVBHUPnV6dgEya9TcMuj5nIJRuCzCm8ZP+c9zCHPw=="; + url = "https://registry.npmjs.org/@redis/client/-/client-1.5.3.tgz"; + sha512 = "kPad3QmWyRcmFj1gnb+SkzjXBV7oPpyTJmasVA+ocgNClxqZaTJjLFReqxm9cZQiCtqZK9vrcTISNrgzQXFpLg=="; }; }; "@redis/graph-1.0.1" = { @@ -10048,13 +10570,13 @@ let sha512 = "pP+ZQRis5P21SD6fjyCeLcQdps+LuTzp2wdUbzxEmNhleighDDTD5ck8+cYof+WLec4csZX7ks+BuoMw0RaZrA=="; }; }; - "@redis/search-1.1.0" = { + "@redis/search-1.1.1" = { name = "_at_redis_slash_search"; packageName = "@redis/search"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/search/-/search-1.1.0.tgz"; - sha512 = "NyFZEVnxIJEybpy+YskjgOJRNsfTYqaPbK/Buv6W2kmFNaRk85JiqjJZA5QkRmWvGbyQYwoO5QfDi2wHskKrQQ=="; + url = "https://registry.npmjs.org/@redis/search/-/search-1.1.1.tgz"; + sha512 = "pqCXTc5e7wJJgUuJiC3hBgfoFRoPxYzwn0BEfKgejTM7M/9zP3IpUcqcjgfp8hF+LoV8rHZzcNTz7V+pEIY7LQ=="; }; }; "@redis/time-series-1.0.3" = { @@ -10084,13 +10606,13 @@ let sha512 = "9GWx27t7xWhDIR02PA18nzBdLcKQRgc46xNQvjFkrYk4UOmvKhJ/dawwiX0cCOeetN5LcaaiqQbVOWYK62SGHw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.120" = { + "@redocly/openapi-core-1.0.0-beta.122" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.120"; + version = "1.0.0-beta.122"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.120.tgz"; - sha512 = "BvasunpVWm5O9F/mW6JmxUqat4XFU5zNnKJkMY6GJ9UYH2UxgKnGaMLWXKtbJEOBnMT12S/p9yeqrQHnk8rGhQ=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.122.tgz"; + sha512 = "oky8yeq0Bodw+lj+jxPP4PZPdsN+Fx71N0X5PPEGzMe8zBhFnOAXMR7auA02gHz7DhOnCZ7kTNV1KcftRtSRNg=="; }; }; "@repeaterjs/repeater-3.0.4" = { @@ -10102,6 +10624,123 @@ let sha512 = "AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA=="; }; }; + "@resvg/resvg-js-2.2.0" = { + name = "_at_resvg_slash_resvg-js"; + packageName = "@resvg/resvg-js"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js/-/resvg-js-2.2.0.tgz"; + sha512 = "Btc6Bht2Y8jBlS1RqVYsPWQaL1WgeGZd/TasmQpCsh0s5Ax1Kw0zyr6DCpvlNYG6b3mNnmJ5ib44A5MIQZmrEQ=="; + }; + }; + "@resvg/resvg-js-android-arm-eabi-2.2.0" = { + name = "_at_resvg_slash_resvg-js-android-arm-eabi"; + packageName = "@resvg/resvg-js-android-arm-eabi"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm-eabi/-/resvg-js-android-arm-eabi-2.2.0.tgz"; + sha512 = "w3lAI6R5cfxGM5oxX6XhEFob4mJkkyfKm0veUQJOg65J4dznwcaJ54lGuQPfjAPhcHxSk/w+7BvFLjbbjV09qw=="; + }; + }; + "@resvg/resvg-js-android-arm64-2.2.0" = { + name = "_at_resvg_slash_resvg-js-android-arm64"; + packageName = "@resvg/resvg-js-android-arm64"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-android-arm64/-/resvg-js-android-arm64-2.2.0.tgz"; + sha512 = "rzo0IqUErz1GzPthmU3wB25Vvdyr6KGI+J2WqALgSqmFxJ/sDygT2/6tirb4Lp1IjbvLhzO3uA6SP/sMwcWNfw=="; + }; + }; + "@resvg/resvg-js-darwin-arm64-2.2.0" = { + name = "_at_resvg_slash_resvg-js-darwin-arm64"; + packageName = "@resvg/resvg-js-darwin-arm64"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-arm64/-/resvg-js-darwin-arm64-2.2.0.tgz"; + sha512 = "MHJBjUh+xlZeMXcHqGiBO5d5CcgNAd0pXXaOmQtcamfBN5oc9SCJP3z137BEN5RhE6bgz6Wl88Sv1Jh3Wn0nlA=="; + }; + }; + "@resvg/resvg-js-darwin-x64-2.2.0" = { + name = "_at_resvg_slash_resvg-js-darwin-x64"; + packageName = "@resvg/resvg-js-darwin-x64"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-darwin-x64/-/resvg-js-darwin-x64-2.2.0.tgz"; + sha512 = "y6uaW/lWgvqpoeTA2hrgPlvNS7kbduBpUfYCpmk7KzOEMBzUUssOHT+DgqlQ7SZOi01mL6DHeDpAjvzM7K4Ocw=="; + }; + }; + "@resvg/resvg-js-linux-arm-gnueabihf-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-arm-gnueabihf"; + packageName = "@resvg/resvg-js-linux-arm-gnueabihf"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm-gnueabihf/-/resvg-js-linux-arm-gnueabihf-2.2.0.tgz"; + sha512 = "G32NqLnuYilT3z5oD5AKXZvpD/ZPRzP1t2T0dvqQC6kBE6c5ckhdCbyT0gnnarcvMoXP+J/xh7kadEp3V8wFDg=="; + }; + }; + "@resvg/resvg-js-linux-arm64-gnu-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-arm64-gnu"; + packageName = "@resvg/resvg-js-linux-arm64-gnu"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-gnu/-/resvg-js-linux-arm64-gnu-2.2.0.tgz"; + sha512 = "R0KJCCyjFcTDFT+nAVlP/CYUMIEjxSkSJsEED9QesulCxMY/aoO52p91FgQrGjecORkASNXovlqS3HsNYbCTOg=="; + }; + }; + "@resvg/resvg-js-linux-arm64-musl-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-arm64-musl"; + packageName = "@resvg/resvg-js-linux-arm64-musl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-arm64-musl/-/resvg-js-linux-arm64-musl-2.2.0.tgz"; + sha512 = "Ir83lcBsuB6YVkAVPW4AAOzYo/F9kjlx2HA/O3vCjy/Rn5u5Xf2fGANfJxfCHUCtDMcqmM4hjdF2fOzqS9fusw=="; + }; + }; + "@resvg/resvg-js-linux-x64-gnu-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-x64-gnu"; + packageName = "@resvg/resvg-js-linux-x64-gnu"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-gnu/-/resvg-js-linux-x64-gnu-2.2.0.tgz"; + sha512 = "pH1GdShtIDF3fmQZM9NTEEdZPkNKQ+XUJb7r1jaD8gusdXeD2ejWWi/uvlsugaoMoG0tUmMZi78eVm4IjlY+gw=="; + }; + }; + "@resvg/resvg-js-linux-x64-musl-2.2.0" = { + name = "_at_resvg_slash_resvg-js-linux-x64-musl"; + packageName = "@resvg/resvg-js-linux-x64-musl"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-linux-x64-musl/-/resvg-js-linux-x64-musl-2.2.0.tgz"; + sha512 = "7n2d4gfcyLb06RE/7aMGwiiMiqeCf/Ze/fBhKs9F2L60GX6rpgDC2PGJmWBiXIwz48PifvxmBiqD9XCUH5YGoA=="; + }; + }; + "@resvg/resvg-js-win32-arm64-msvc-2.2.0" = { + name = "_at_resvg_slash_resvg-js-win32-arm64-msvc"; + packageName = "@resvg/resvg-js-win32-arm64-msvc"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-arm64-msvc/-/resvg-js-win32-arm64-msvc-2.2.0.tgz"; + sha512 = "rJWhnui1+P9lakfx92zhm+HInZUU1NdvkL/G5KrFcRI8HH0rfdNHokfKknvuko4e7iUSia7kTsbuKDNe4fErtQ=="; + }; + }; + "@resvg/resvg-js-win32-ia32-msvc-2.2.0" = { + name = "_at_resvg_slash_resvg-js-win32-ia32-msvc"; + packageName = "@resvg/resvg-js-win32-ia32-msvc"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-ia32-msvc/-/resvg-js-win32-ia32-msvc-2.2.0.tgz"; + sha512 = "GlckTgsrlF9PQlWcXs1EySeGaT8TAkrSGhVZPRvSv46DUpZlhyVVvKMjsvpbDfqWltFkJTEgkTJ6uravnJrEMA=="; + }; + }; + "@resvg/resvg-js-win32-x64-msvc-2.2.0" = { + name = "_at_resvg_slash_resvg-js-win32-x64-msvc"; + packageName = "@resvg/resvg-js-win32-x64-msvc"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@resvg/resvg-js-win32-x64-msvc/-/resvg-js-win32-x64-msvc-2.2.0.tgz"; + sha512 = "4coA6J+MfrpbMaPynSLmmiq3DutmvNmCcNFyjnhhnytQW7+8zbrkVZGra7fty3364LY3unZGxS878WRa/AU7tw=="; + }; + }; "@rollup/plugin-commonjs-22.0.2" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; @@ -10129,13 +10768,13 @@ let sha512 = "iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ=="; }; }; - "@rushstack/heft-config-file-0.11.4" = { + "@rushstack/heft-config-file-0.11.5" = { name = "_at_rushstack_slash_heft-config-file"; packageName = "@rushstack/heft-config-file"; - version = "0.11.4"; + version = "0.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.11.4.tgz"; - sha512 = "EmXZbqc1akLjcVPagDKlX/rJFtNlkHwhIsd/GGpOPUgytuYNRmhvdXIy6aGLpGHvJpaDqvDmY6powbeOPrs52A=="; + url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.11.5.tgz"; + sha512 = "R6kZyvoZrNmhST3nyYd53N+N4RicQVOCciiglAj6/Y44bscAKIUijAMEHF17JD1+1xAYh/G3R+XIaWLbBpZDSw=="; }; }; "@rushstack/node-core-library-3.53.3" = { @@ -10147,13 +10786,13 @@ let sha512 = "H0+T5koi5MFhJUd5ND3dI3bwLhvlABetARl78L3lWftJVQEPyzcgTStvTTRiIM5mCltyTM8VYm6BuCtNUuxD0Q=="; }; }; - "@rushstack/package-deps-hash-3.2.66" = { + "@rushstack/package-deps-hash-4.0.3" = { name = "_at_rushstack_slash_package-deps-hash"; packageName = "@rushstack/package-deps-hash"; - version = "3.2.66"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-3.2.66.tgz"; - sha512 = "LpsJZ8H7bmEvPEluw9/6Ucf92xiqomZ0P4RSw1YGABYfwt/eOGBYQ2VhyBJsfkQFTRBlIOGCy3GvwvRMRUKz+A=="; + url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.0.3.tgz"; + sha512 = "dx3P51viHUuBTw2KakZ4DU8paIOPi2zuvj94TBA9Gv3XQAX6xguD+ZIa2r2P3SNPrv/KPLMVxMpAS9QneJfLsA=="; }; }; "@rushstack/rig-package-0.3.17" = { @@ -10165,49 +10804,49 @@ let sha512 = "nxvAGeIMnHl1LlZSQmacgcRV4y1EYtgcDIrw6KkeVjudOMonlxO482PhDj3LVZEp6L7emSf6YSO2s5JkHlwfZA=="; }; }; - "@rushstack/rush-amazon-s3-build-cache-plugin-5.88.0" = { + "@rushstack/rush-amazon-s3-build-cache-plugin-5.89.1" = { name = "_at_rushstack_slash_rush-amazon-s3-build-cache-plugin"; packageName = "@rushstack/rush-amazon-s3-build-cache-plugin"; - version = "5.88.0"; + version = "5.89.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.88.0.tgz"; - sha512 = "gHJZxMNOHnuCCr0MVnWumdHwn3/L9QJYwsw1gmPQ8bIH7sNoXDRNNLTH2PsrpsKdrfZIc1wJx9i//ZoBTUZy0g=="; + url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.89.1.tgz"; + sha512 = "TyvsweC16xNoZeFEbv4vCD4z2L6jO6GXmw+97y1ep+OVJXQzKJHPgV4Wct2i+jYjO1+cbUsqshUwyJif42UqvA=="; }; }; - "@rushstack/rush-azure-storage-build-cache-plugin-5.88.0" = { + "@rushstack/rush-azure-storage-build-cache-plugin-5.89.1" = { name = "_at_rushstack_slash_rush-azure-storage-build-cache-plugin"; packageName = "@rushstack/rush-azure-storage-build-cache-plugin"; - version = "5.88.0"; + version = "5.89.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.88.0.tgz"; - sha512 = "zya+KZVm0Z0OWn+yK4PcBVvUGcygNCU3AqcEy9t/dZJ5iw9uWSvWig4dMgmuJPRtqTL2zDHzGGpxxRzVcl2JhQ=="; + url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.89.1.tgz"; + sha512 = "YpF+18c/Z5YYCH9WRQ/X6lxhpxcxO8727XNWrOMBbYCIjQgPY83Dh3xGtDk8sLr2WFxJVKIetyEtHDJNh5ghGg=="; }; }; - "@rushstack/rush-sdk-5.88.0" = { + "@rushstack/rush-sdk-5.89.1" = { name = "_at_rushstack_slash_rush-sdk"; packageName = "@rushstack/rush-sdk"; - version = "5.88.0"; + version = "5.89.1"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.88.0.tgz"; - sha512 = "2oiD3/9XOdsq1uH5TkPIlp8Bur/60QbAEyAjSiHAlaHwFCXBfIpfRwEU5Yqso2QJz4Wk15yKJaOW8or8bF+m1A=="; + url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.89.1.tgz"; + sha512 = "KSrcfycU82dI3+XIVIwiESnIXsMyvzkDHgfDexl1K+094klzYlmQBvDc8ladaUmTWs/9eRadggN/Y2xhgE7wOg=="; }; }; - "@rushstack/stream-collator-4.0.219" = { + "@rushstack/stream-collator-4.0.222" = { name = "_at_rushstack_slash_stream-collator"; packageName = "@rushstack/stream-collator"; - version = "4.0.219"; + version = "4.0.222"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.0.219.tgz"; - sha512 = "dY3srmUXpPbrtFoqrXmRzkum6+TGl9XQkkQLM18ZvSQfihg1iNbkR4vxOUlw0YvkQq373TI5lHBoDbfUZB7Mmw=="; + url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.0.222.tgz"; + sha512 = "oE0DzdzqdaX3xRnbqIsNSRGTWSbSKPs3irDsHAE9Fj6diftfV++7EvDMpcEcD1owN0mJTyco6VeZdRjJf1Ytqw=="; }; }; - "@rushstack/terminal-0.3.88" = { + "@rushstack/terminal-0.3.91" = { name = "_at_rushstack_slash_terminal"; packageName = "@rushstack/terminal"; - version = "0.3.88"; + version = "0.3.91"; src = fetchurl { - url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.3.88.tgz"; - sha512 = "ZY6VqeOG+2mdis+6aV0EMay/aBE5OpQo931b7+YZuP2CxknljUuW/H/WGnnaSvbb54mvX3lmzK088hPfH4XrRQ=="; + url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.3.91.tgz"; + sha512 = "m4XqR8HeffmsWR4qpYm4FpUU66vqYFJZJf8xuYO33zSkHDL5qdNjQ9yrtRJFs1mF38hMsXSHkvo2djRuf9MM5A=="; }; }; "@rushstack/ts-command-line-4.13.1" = { @@ -10255,13 +10894,13 @@ let sha512 = "DJKkAvJf8ZpkTIZlxi29d/jRvraweA2I2KIqa7eSNhXuDnau8bIQBkOhSpnhVUckR8i/W8SNYdqwiHlUm5t9Lw=="; }; }; - "@schematics/angular-15.1.1" = { + "@schematics/angular-15.1.3" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "15.1.1"; + version = "15.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-15.1.1.tgz"; - sha512 = "Ujo4vt/r3WzIhGn2I2Lt3eOTWSsVxoXfcXxFRuxl3cil/9mH1X66hDTQ2DVYiXPFGcQMjcNaDwlQxyor4yGbqA=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-15.1.3.tgz"; + sha512 = "jCJ0Nq/FpoMnA63rPAhRWQJFVbS+K8NpdTHZ/7l4wx9iFtIH7khCdbp3QYMJSwZh5pEiw/NO7ouxsWo5YgapYQ=="; }; }; "@segment/ajv-human-errors-2.2.0" = { @@ -10300,13 +10939,13 @@ let sha512 = "tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw=="; }; }; - "@sentry/core-7.31.1" = { + "@sentry/core-7.34.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.31.1"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.31.1.tgz"; - sha512 = "quaNU6z8jabmatBTDi28Wpff2yzfWIp/IU4bbi2QOtEiCNT+TQJXqlRTRMu9xLrX7YzyKCL5X2gbit/85lyWUg=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.34.0.tgz"; + sha512 = "J1oxsYZX1N0tkEcaHt/uuDqk6zOnaivyampp+EvBsUMCdemjg7rwKvawlRB0ZtBEQu3HAhi8zecm03mlpWfCDw=="; }; }; "@sentry/hub-6.19.7" = { @@ -10318,13 +10957,13 @@ let sha512 = "y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA=="; }; }; - "@sentry/integrations-7.31.1" = { + "@sentry/integrations-7.34.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.31.1"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.31.1.tgz"; - sha512 = "El+qzwbiXHPDWg8ZmX+W/kCheoaYoaAJuaG2+l3D5Y4ny8JNYfSMCum9qXVEb8oB98fFHfSEoFzB+z54pH+p3w=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.34.0.tgz"; + sha512 = "xbWnTvG4gkKeCVpmhhdPtMbQkPO0RAfEJ8VPO5TWmUMT23ZWy2kE0gTZHtnBopy7AXxg231XxTi4fxnwgQGxEQ=="; }; }; "@sentry/minimal-6.19.7" = { @@ -10345,13 +10984,13 @@ let sha512 = "gtmRC4dAXKODMpHXKfrkfvyBL3cI8y64vEi3fDD046uqYcrWdgoQsffuBbxMAizc6Ez1ia+f0Flue6p15Qaltg=="; }; }; - "@sentry/node-7.31.1" = { + "@sentry/node-7.34.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.31.1"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.31.1.tgz"; - sha512 = "4VzfOU1YHeoGkBQmkVXlXoXITf+1NkZEREKhdzgpVAkVjb2Tk3sMoFov4wOKWnNTTj4ka50xyaw/ZmqApgQ4Pw=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.34.0.tgz"; + sha512 = "VM4XeydRdgeaNTRe8kwqYg2oNPddVyY74PlCFEFnPEN1NccycNuwiFno68kNrApeqxxLlTTmzkJy0BWo16x2Yg=="; }; }; "@sentry/types-6.19.7" = { @@ -10363,13 +11002,13 @@ let sha512 = "jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg=="; }; }; - "@sentry/types-7.31.1" = { + "@sentry/types-7.34.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.31.1"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.31.1.tgz"; - sha512 = "1uzr2l0AxEnxUX/S0EdmXUQ15/kDsam8Nbdw4Gai8SU764XwQgA/TTjoewVP597CDI/AHKan67Y630/Ylmkx9w=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.34.0.tgz"; + sha512 = "K+OeHIrl35PSYn6Zwqe4b8WWyAJQoI5NeWxHVkM7oQTGJ1YLG4BvLsR+UiUXnKdR5krE4EDtEA5jLsDlBEyPvw=="; }; }; "@sentry/utils-6.19.7" = { @@ -10381,13 +11020,13 @@ let sha512 = "z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA=="; }; }; - "@sentry/utils-7.31.1" = { + "@sentry/utils-7.34.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.31.1"; + version = "7.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.31.1.tgz"; - sha512 = "ZsIPq29aNdP9q3R7qIzJhZ9WW+4DzE9g5SfGwx3UjTIxoRRBfdUJUbf7S+LKEdvCkKbyoDt6FLt5MiSJV43xBA=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.34.0.tgz"; + sha512 = "VIHHXEBw0htzqxnU8A7WkXKvmsG2pZVqHlAn0H9W/yyFQtXMuP1j1i0NsjADB/3JXUKK83kTNWGzScXvp0o+Jg=="; }; }; "@serialport/binding-mock-10.2.2" = { @@ -10516,13 +11155,13 @@ let sha512 = "gbcUdvq9Kyv2HsnywS7QjnEB28g+6OGB5Z8TLP7X+UPpoMIWoUsoQIq5Kt0ZTgMoWn3JGM2lqwTsSHF+1qhniA=="; }; }; - "@serverless/dashboard-plugin-6.2.2" = { + "@serverless/dashboard-plugin-6.2.3" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.2.2.tgz"; - sha512 = "h3zOprpuWZCdAP7qoOKT2nboB+AaxMkGoSzOD0jIBpt9s0cXqLE2VFjR2vKn8Cvam47Qa3XYnT2/XN6tR6rZgQ=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-6.2.3.tgz"; + sha512 = "iTZhpZbiVl6G2AyfgoqxemqqpG4pUceWys3GsyZtjimnfnGd2UFBOMVUMTavLhYia7lQc4kQVuXQ+afLlkg+pQ=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -11029,6 +11668,15 @@ let sha512 = "sV+51I7WYnLJnKPn2EMWgS4EUfoP4iWEbrWwbXsj0MZCB/xOK8j6+C9fntIdOM50kpx45ZLC3s6kwKivWuqvyg=="; }; }; + "@streamparser/json-0.0.10" = { + name = "_at_streamparser_slash_json"; + packageName = "@streamparser/json"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@streamparser/json/-/json-0.0.10.tgz"; + sha512 = "juqNFdqqmY/nvsODq1Vba7PWIaqr01VcqICIrxbws97QKSQhQUMml8FqdHLmevwVpqH39H5mVXKFWiWCi1ke0w=="; + }; + }; "@stroncium/procfs-1.2.1" = { name = "_at_stroncium_slash_procfs"; packageName = "@stroncium/procfs"; @@ -11083,103 +11731,202 @@ let sha512 = "LOC/z9HDUmTqSAF08YIRLThGGNZLdRrjcEdoQu/EANxPSVRedYgh4AiZlOX8sY8Rp1p7S/StOmZogJLuvR4mcA=="; }; }; - "@swc/core-1.3.27" = { + "@swc/core-1.3.29" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.27.tgz"; - sha512 = "praRNgpeYGvwDIm/Cl6JU+yHMvwVraL0U6ejMgGyzvpcm1FVsZd1/EYXGqzbBJ0ALv7Gx4eK56h4GnwV6d4L0w=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.29.tgz"; + sha512 = "BYDBEqQ77ASZNQYTP7PlKnMLwbHh3lhtlzD/gQP2zIK9XhqQlcy/zIcLljYDn0EOogLn3IyaUiXgAzDWoAmWMg=="; }; }; - "@swc/core-darwin-arm64-1.3.27" = { + "@swc/core-1.3.30" = { + name = "_at_swc_slash_core"; + packageName = "@swc/core"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.30.tgz"; + sha512 = "pg6GWw615EwCh4vJ5k7xll1E4WJSPeINrRvF/EPyBvNNhlXR3s6+KZevJTx3PpA5PXjprDR0aqwi0/aigSCAPA=="; + }; + }; + "@swc/core-darwin-arm64-1.3.29" = { name = "_at_swc_slash_core-darwin-arm64"; packageName = "@swc/core-darwin-arm64"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.27.tgz"; - sha512 = "IKlxkhEy99CnP9nduaf5IJWIFcr6D5cZCjYmCs7nWkjMV+aAieyDO9AX4LT8AcHy6CF7ByOX7SKoqk+gVMAaKw=="; + url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.29.tgz"; + sha512 = "1RQ0MCmWOQmo3qG60vhbNaO/qMZ25lDfjhTayAzHjS1k7WyoUv3M8Em2Fip2VKJz5cN2M7MWiP5aHMotMovuaQ=="; }; }; - "@swc/core-darwin-x64-1.3.27" = { + "@swc/core-darwin-arm64-1.3.30" = { + name = "_at_swc_slash_core-darwin-arm64"; + packageName = "@swc/core-darwin-arm64"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.30.tgz"; + sha512 = "GZ4mZZbH77N8renK34A3Lkhl6x8z+c97SCbl43pn5E0Z0sifohA8WNhrtucKrUdid0svYibwotJzeFNpDtg7gQ=="; + }; + }; + "@swc/core-darwin-x64-1.3.29" = { name = "_at_swc_slash_core-darwin-x64"; packageName = "@swc/core-darwin-x64"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.27.tgz"; - sha512 = "MtabZIhFf/dL3vs6UMbd+vJsjIkm2NaFqulGV0Jofy2bfVZPTj/b5pXeOlUsTWy7JcH1uixjdx4RvJRyvqJxQA=="; + url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.29.tgz"; + sha512 = "UXiVOkt9i/mwarhHiN6o5RAi3Q7riCQTiOO2e98c/qi3SiYqbgd6kil+2gBcpVB0CGEFyyGB9rECwNBkaYe7zw=="; }; }; - "@swc/core-linux-arm-gnueabihf-1.3.27" = { + "@swc/core-darwin-x64-1.3.30" = { + name = "_at_swc_slash_core-darwin-x64"; + packageName = "@swc/core-darwin-x64"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.3.30.tgz"; + sha512 = "ppGrAJmKpT3vFr2vGaxXFL8JqHsb6kSAj0dVYTNYicl3c6XOjnMiNSfu6HRbdmXt0VpFHhC5L/a7Ta89mQ1sJA=="; + }; + }; + "@swc/core-linux-arm-gnueabihf-1.3.29" = { name = "_at_swc_slash_core-linux-arm-gnueabihf"; packageName = "@swc/core-linux-arm-gnueabihf"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.27.tgz"; - sha512 = "XELMoGcUTAkk+G4buwIIhu6AIr1U418Odt22HUW8+ZvV+Wty2ICgR/myOIhM3xMb6U2L8ay+evMqoVNMQ0RRTg=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.29.tgz"; + sha512 = "0B7+FoYgEE1Yg6j5EAtEpKVbHby3jnJo6Y4g0dGxecRtXUhu8TKVI4P93sj4PJ+l4XkAyzdhSsQ+ytFRsbOJ6w=="; }; }; - "@swc/core-linux-arm64-gnu-1.3.27" = { + "@swc/core-linux-arm-gnueabihf-1.3.30" = { + name = "_at_swc_slash_core-linux-arm-gnueabihf"; + packageName = "@swc/core-linux-arm-gnueabihf"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.30.tgz"; + sha512 = "XQYY/VNRnM0/779ehfMgh2poO3reOANvfzOprF8xmGK20+DxFqbMWjHhJutscQuEjLtdwk/LfgCkwmTaB1hhwg=="; + }; + }; + "@swc/core-linux-arm64-gnu-1.3.29" = { name = "_at_swc_slash_core-linux-arm64-gnu"; packageName = "@swc/core-linux-arm64-gnu"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.27.tgz"; - sha512 = "O6vtT6bnrVR9PzEIuA5U7tIfYo7bv97H9K9Vqy2oyHNeGN0H36DKwS4UqPreHtziXNF5+7ubdUYUkrG/j8UnUQ=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.29.tgz"; + sha512 = "XN9axiTuiFOm+UBnDDOQV3b2OekziXHtVPBAPSEssRsNGS4uN7YvCyVAcS8GYdK7GoZ+cmoZBYwD4trir48WXw=="; }; }; - "@swc/core-linux-arm64-musl-1.3.27" = { + "@swc/core-linux-arm64-gnu-1.3.30" = { + name = "_at_swc_slash_core-linux-arm64-gnu"; + packageName = "@swc/core-linux-arm64-gnu"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.30.tgz"; + sha512 = "ME4BjMYSXana0Lfswa3aQW0rTdmR9wa1NGQ3t6MYLdBVm+76Xwe29JKlOfnI1iCCtcbRBoWy4dlhyuxW8DN7cw=="; + }; + }; + "@swc/core-linux-arm64-musl-1.3.29" = { name = "_at_swc_slash_core-linux-arm64-musl"; packageName = "@swc/core-linux-arm64-musl"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.27.tgz"; - sha512 = "Oa0E1i7dOTWpaEZumKoNbTE/Ap+da6nlhqKVUdYrFDrOBi25tz76SdxZIyvAszzmgY89b5yd1naourKmkPXpww=="; + url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.29.tgz"; + sha512 = "M6eE02Dzl1efRLozitGvgjiNEee0VQInqMX4tvfpzQwqZsKNAD8/NGPeTG4763BLDHc4hnMZbnt5wncDLjFq7A=="; }; }; - "@swc/core-linux-x64-gnu-1.3.27" = { + "@swc/core-linux-arm64-musl-1.3.30" = { + name = "_at_swc_slash_core-linux-arm64-musl"; + packageName = "@swc/core-linux-arm64-musl"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.30.tgz"; + sha512 = "h3X9Pn1m5kuFSW8lJyDiMB4ELNZFJ+QxLva5GCxZDArQttkNeY4tMNWFcaG44xUXeywffrgjpXO7Yj2JGzmG4g=="; + }; + }; + "@swc/core-linux-x64-gnu-1.3.29" = { name = "_at_swc_slash_core-linux-x64-gnu"; packageName = "@swc/core-linux-x64-gnu"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.27.tgz"; - sha512 = "S3v9H8oL2a8Ur6AjQyhkC6HfBVPOxKMdBhcZmdNuVgEUHbHdbf/Lka85F9IOYXEarMn0FtQw3ywowS22O9L5Uw=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.29.tgz"; + sha512 = "t2e9byHRpxKyUsLeODlb3yKJcm8wMirsLIxjr24q5YbnChD3QUMQwA8aA9w2PWc86ihukw7Ksx3RYT7uR706HA=="; }; }; - "@swc/core-linux-x64-musl-1.3.27" = { + "@swc/core-linux-x64-gnu-1.3.30" = { + name = "_at_swc_slash_core-linux-x64-gnu"; + packageName = "@swc/core-linux-x64-gnu"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.30.tgz"; + sha512 = "vfPR8cakx5IZQSpNuXPrpkRprBdVxXsvN5JWN3fpuNVIgFFo3q8njihaItujKvePIHQwov4achfBZlm4JRitWQ=="; + }; + }; + "@swc/core-linux-x64-musl-1.3.29" = { name = "_at_swc_slash_core-linux-x64-musl"; packageName = "@swc/core-linux-x64-musl"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.27.tgz"; - sha512 = "6DDkdXlOADpwICFZTRphCR+cIeS8aEYh4NlyzBito0mOWwIIdfCgALzhkTQOzTOkcD42bP97CIoZ97hqV/puOg=="; + url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.29.tgz"; + sha512 = "3jDzDYIyHXrXKOSnTtsN56eINbTPuVQj65D3K8+zo1o52GGwNGyCvQt2RpxNfM8+ptb4j6v7weSU8kVvbUzGTQ=="; }; }; - "@swc/core-win32-arm64-msvc-1.3.27" = { + "@swc/core-linux-x64-musl-1.3.30" = { + name = "_at_swc_slash_core-linux-x64-musl"; + packageName = "@swc/core-linux-x64-musl"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.30.tgz"; + sha512 = "jtfv8N+00E2RMTVjwfTfimeqzo0B9FmbbSkzlnLvkmV8xDAPyLmX7v/xL5YiVJRLeSrlJ7DmkCSxLzpJao73dw=="; + }; + }; + "@swc/core-win32-arm64-msvc-1.3.29" = { name = "_at_swc_slash_core-win32-arm64-msvc"; packageName = "@swc/core-win32-arm64-msvc"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.27.tgz"; - sha512 = "baxfH4AbEcaTNo08wxV0W6hiMXwVCxPS4qc0amHpXPti92unvSqeDR1W3C9GjHqzXlWtmCRsq8Ww1pal6ZVLrw=="; + url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.29.tgz"; + sha512 = "3PadPieyslG++7SQ42OApfiXtQdzFpnCv/i/UJ6gOL5d0MluNzZ2nIxD8LwXXizVdmcm8bmc0WRhK3JhvhzVJA=="; }; }; - "@swc/core-win32-ia32-msvc-1.3.27" = { + "@swc/core-win32-arm64-msvc-1.3.30" = { + name = "_at_swc_slash_core-win32-arm64-msvc"; + packageName = "@swc/core-win32-arm64-msvc"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.30.tgz"; + sha512 = "fX3T6JzS5F8JJ/UZQWrZfdml8nLuSzgA0EFKetTNa5AHh1x9ltShmlFOJ3OPpD9BKI/QcQSLxyoAjxt7NtAnaQ=="; + }; + }; + "@swc/core-win32-ia32-msvc-1.3.29" = { name = "_at_swc_slash_core-win32-ia32-msvc"; packageName = "@swc/core-win32-ia32-msvc"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.27.tgz"; - sha512 = "7iLJnH71k5qCwxv9NcM/P7nIEzTsC7r1sIiQW6bu+CpC8qZvwl0PS+XvQRlLly2gCZM+Le98tksYG14MEh+Hrw=="; + url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.29.tgz"; + sha512 = "tUFrHxxYz9Cfz07yGwDXdtRziC3q1ia2SHodzZ3obTpY+HQiBDHs0QO/HkbUBNF+du0vhnsgtWilnsMQDILFDQ=="; }; }; - "@swc/core-win32-x64-msvc-1.3.27" = { + "@swc/core-win32-ia32-msvc-1.3.30" = { + name = "_at_swc_slash_core-win32-ia32-msvc"; + packageName = "@swc/core-win32-ia32-msvc"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.30.tgz"; + sha512 = "m88NjTcVFHFAciWRWTW7NbeQPrzjKKBzSoSPukhjvKSWQNk5v6BBbTAKpymNGQssPn5WLarC2QlQzCwjyh1QLA=="; + }; + }; + "@swc/core-win32-x64-msvc-1.3.29" = { name = "_at_swc_slash_core-win32-x64-msvc"; packageName = "@swc/core-win32-x64-msvc"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.27.tgz"; - sha512 = "mFM907PDw/jrQ44+TRjIVGEOy2Mu06mMMz0HPMFuRsBzl5t0Kajp3vmn8FkkpS9wH5982VPi6hPYVTb7QJo5Qg=="; + url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.29.tgz"; + sha512 = "/Z3kxMXGKlIhtkxBxsCSZl8j/qYfbA4dtW7RKv1RNxbPLbwk8k3Owhgk/Y3JeRavcUKwja1rUX5rhMjLYeN3tw=="; + }; + }; + "@swc/core-win32-x64-msvc-1.3.30" = { + name = "_at_swc_slash_core-win32-x64-msvc"; + packageName = "@swc/core-win32-x64-msvc"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.30.tgz"; + sha512 = "HsePRjbdD5XsnS8NkN+MmhtUyjF16cU3COd92DjRYKsB1rMDE51itfacBvOeZPHFV6VkrLsakubAZCMc+3d/Ag=="; }; }; "@swc/helpers-0.4.14" = { @@ -11191,13 +11938,22 @@ let sha512 = "4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw=="; }; }; - "@swc/wasm-1.3.27" = { + "@swc/wasm-1.3.29" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.27"; + version = "1.3.29"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.27.tgz"; - sha512 = "bSFeKxGU2zY/xC3K7Y4sjdtHMgbv6gM2Z01PTMGoC8b2PVubPKeW+BYmprZFSf2eCOsNLZaVzVufdVTQB/ORfg=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.29.tgz"; + sha512 = "Tzpl541GRLyzQufasGScL9tMOzk0SsdcVX0jYpG74u6VZHqr0u62Cw6nYtRhTtkcsFsfNpg7RQM+CycyXY8Nmw=="; + }; + }; + "@swc/wasm-1.3.30" = { + name = "_at_swc_slash_wasm"; + packageName = "@swc/wasm"; + version = "1.3.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.30.tgz"; + sha512 = "y5LnHLIaZ2mNmnY/b0jEJccV3eErxnIbF8K3RxqmnD4zWHsuvaOAVeQPKTK4vlM/V9ip+BUtCeFiUfnxCx8JwA=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -11236,22 +11992,31 @@ let sha512 = "/FcGQVvXAslhiC9aMG5gxKXJctg8N7XLZrP+wYrFTFccWEPZd/Xon5y7jUXpKOVSOFEA1MOKZKbPuK4ET5/T8Q=="; }; }; - "@tediousjs/connection-string-0.4.1" = { + "@tediousjs/connection-string-0.4.2" = { name = "_at_tediousjs_slash_connection-string"; packageName = "@tediousjs/connection-string"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.4.1.tgz"; - sha512 = "gr1mFN7KMOn+VviQKcrt+z1/7ttn7s9NSMFFyg5GrJylNH6JGrDDNRm7C5vE4PNwhW6hYT67QRUO44Ns2LQijg=="; + url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.4.2.tgz"; + sha512 = "1R9UC7Qc5wief2oJL+c1+d7v1/oPBayL85u8L/jV2DzIKput1TZ8ZUjj2nxQaSfzu210zp0oFWUrYUiUs8NhBQ=="; }; }; - "@textlint/ast-node-types-12.3.0" = { + "@textlint/ast-node-types-12.6.1" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "12.3.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.3.0.tgz"; - sha512 = "ke5hlKy/xZ/vQt6j+h4k9GradJPDsV3FKsUqWpCpF/X8qWCU2zM4e1SMUAFjoUcLuF9in+eXIQ71Qm/AdjjkZQ=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.6.1.tgz"; + sha512 = "uzlJ+ZsCAyJm+lBi7j0UeBbj+Oy6w/VWoGJ3iHRHE5eZ8Z4iK66mq+PG/spupmbllLtz77OJbY89BYqgFyjXmA=="; + }; + }; + "@textlint/ast-node-types-13.0.4" = { + name = "_at_textlint_slash_ast-node-types"; + packageName = "@textlint/ast-node-types"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-13.0.4.tgz"; + sha512 = "6/8reOpc7csrwR8Hd+WqP75QS2akk8U7lzCAUv5cyoGga2KzWlauCC6gy4ZU/Qw8UfSU2ri7ZcX975i6KYLtwQ=="; }; }; "@textlint/ast-node-types-4.4.3" = { @@ -11263,139 +12028,238 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-12.5.0" = { + "@textlint/ast-tester-12.6.1" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.5.0.tgz"; - sha512 = "osHf1OFLC3RnjGyoSBynn2u5pgj7qkik8TNaxgPekVwlLWtJTcyh22PHo+mXPF47XWM5gJQmy/72nUrqtbDMPg=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.6.1.tgz"; + sha512 = "Gxiq6xmDR3PnX0RqRGth/Lu5fyFWoXNPfGxXTLORPFpfs8JKPh/eXGhlwc1f0v4VQzPay2KwVl6SGXvJD5qLXw=="; }; }; - "@textlint/ast-traverse-12.5.0" = { + "@textlint/ast-tester-13.0.4" = { + name = "_at_textlint_slash_ast-tester"; + packageName = "@textlint/ast-tester"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-13.0.4.tgz"; + sha512 = "i/7bNipeeWsUqpYCxwxXXUmbiUBNJCZrVSVsZgFo1llJPa/uivyRy64Wgxy725GoWr3GdhAAGI3e7gtjGrZXjg=="; + }; + }; + "@textlint/ast-traverse-12.6.1" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.5.0.tgz"; - sha512 = "TAbfxz8x8Q/sn7D/h7OikzYp5NqPDrRExm3N+3v9yj+gq++fxHtskas48tm1TYcChTMq6BbPU+EGbdlMo3rWWA=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.6.1.tgz"; + sha512 = "Y/j7ip7yDuTjuIV4kTRPVnkJKfpI71U+eqXFnrM9sE2xBA9IsqzqiLQeDY+S5hhfQzmcEnZFtAP0hqrYaT6gNA=="; }; }; - "@textlint/config-loader-12.5.0" = { + "@textlint/ast-traverse-13.0.4" = { + name = "_at_textlint_slash_ast-traverse"; + packageName = "@textlint/ast-traverse"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-13.0.4.tgz"; + sha512 = "wK1HWrONMfJBhFby9Dpu2tEj0j1JRBlk1fVxLljBzmrV31v1nMI7Q9+ZMqGAZIZD7kDMUpHvGg7OsA6KjHiLcA=="; + }; + }; + "@textlint/config-loader-13.0.4" = { name = "_at_textlint_slash_config-loader"; packageName = "@textlint/config-loader"; - version = "12.5.0"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-12.5.0.tgz"; - sha512 = "g706+XwdsUGpVXzqW7OFcBO8XdxH1AqbD0D3UYEjlfUONXD0c4Bymctdjk49hzOwTVDGqj+CCyvL+cB/X2bG+Q=="; + url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-13.0.4.tgz"; + sha512 = "LGJeHEr3DosO1NlCOR3186Pqx2e2TcWAm3fydb3MD7kp5ko2mfMlGsJzo0wQOjuRGTtMV212b3OKsdKZBFo0TA=="; }; }; - "@textlint/feature-flag-12.5.0" = { + "@textlint/feature-flag-12.6.1" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.5.0.tgz"; - sha512 = "GdyRbbIsWRuZieWKvRxQA8j5wX5hzq+QqEmuputBrU/KKapNfkg6uNY2GOY6SWvC8QcwD0dYh3Dy1x2txT8p8Q=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.6.1.tgz"; + sha512 = "cY/AraTLdzbwDyAhdpaXB7n1Lw6zA+k+7UaT8mmxMmjs0uYGzdMQa499I0rQatctJ6izrdZXYW0NdUQfG2ugiA=="; }; }; - "@textlint/fixer-formatter-12.5.1" = { + "@textlint/feature-flag-13.0.4" = { + name = "_at_textlint_slash_feature-flag"; + packageName = "@textlint/feature-flag"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-13.0.4.tgz"; + sha512 = "mo4AaRrSbOgYhf6p+LSwo+UbMr62dsq12vMVqEkjHZ5tm5vrWbQkC2YrtMAM0ot9AY1x6RJFJ5ZO3Qn42N0JTQ=="; + }; + }; + "@textlint/fixer-formatter-13.0.4" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "12.5.1"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.5.1.tgz"; - sha512 = "dzOsgpkl5lIB25BHgW0saAohRW4ZF0s/SyK/FbweYtkDGd190USLGpCibx2M8/mAEFDs5YsnTqZlkbp1FLLuyQ=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-13.0.4.tgz"; + sha512 = "Sdx65V3e8Ggs2UBt/2VoN58w85YXOlaHnAoHV7aRoqMySHOf5You4y4Amby5AeHeXeltLXz1keLwloq5UiJdsQ=="; }; }; - "@textlint/kernel-12.5.0" = { + "@textlint/kernel-12.6.1" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.5.0.tgz"; - sha512 = "9UspUHtS2FShTO9pWnrZjadjIvJzFIdIZDKIYCdZuUdU8dEhJqwOdYosqM4N5Wy40aMKnv4Voxp80Ssaq7zZaA=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.6.1.tgz"; + sha512 = "GjNaI36pYx/boy1Xf7NPJFbS0uWHhY9y9DMMl/8ZJZoldN7XrCvJFivNdeYQxu+LTmfGGaUJoTjDpnllOs6XSQ=="; }; }; - "@textlint/linter-formatter-12.5.0" = { + "@textlint/kernel-13.0.4" = { + name = "_at_textlint_slash_kernel"; + packageName = "@textlint/kernel"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-13.0.4.tgz"; + sha512 = "lfZC2690xX7x5ZJn8kKfyx1/cD815+o5X80hbIjmhuY8pdoJgP4nqemaI/Y3Y+re/zg3YgT1PTayA6vcuxOw3g=="; + }; + }; + "@textlint/linter-formatter-13.0.4" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "12.5.0"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.5.0.tgz"; - sha512 = "cJ87VGmyqDyjxT2aL3492g/YyGh6AU7/3QqxKN9q8rxJtzaY2e1uJrUKdpj0oOj1xZzYYv8zPeIpFaiFtNW02Q=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-13.0.4.tgz"; + sha512 = "3hMOMlDIAgWPi1SXso35cqkwSzneH6qKdYGEpRejosSNTYePaY16ayRabQxPP07mx2m9X2Sa3ozrebq98Y9PXA=="; }; }; - "@textlint/markdown-to-ast-12.5.0" = { + "@textlint/markdown-to-ast-12.6.1" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.5.0.tgz"; - sha512 = "+fUslPm0+ukMnRVMPUQwKv1DEwmDP/rXFuzc5+k5tCMhighZ/Fv/e3Y9MUe7SgNDte7ilajTa3/uP0Iurr60WA=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.6.1.tgz"; + sha512 = "T0HO+VrU9VbLRiEx/kH4+gwGMHNMIGkp0Pok+p0I33saOOLyhfGvwOKQgvt2qkxzQEV2L5MtGB8EnW4r5d3CqQ=="; }; }; - "@textlint/module-interop-12.5.0" = { + "@textlint/markdown-to-ast-13.0.4" = { + name = "_at_textlint_slash_markdown-to-ast"; + packageName = "@textlint/markdown-to-ast"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-13.0.4.tgz"; + sha512 = "4Vs79pcBsFb7vzTp92K1ojhXQrNisK69e6QNVLc7sy8CdDhB4wWmP9tR783oBgvNgYrOfF5qwv8Z7ARCv+oFeg=="; + }; + }; + "@textlint/module-interop-13.0.4" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "12.5.0"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.5.0.tgz"; - sha512 = "NmkHL5tt+HEqLm00JSW1f03KTbEqOzupliboSZ2HeNhOqZxSX4wR3lBlGqVeVi5dImMWrt40oa+AbkqkD78b9Q=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-13.0.4.tgz"; + sha512 = "w63oM5dL1kbAdmg0JAcL6NU9r7x0xnsjGoimiUNx0nPZusBDjmFo18u//UwScDa3YmMYd10hQp+teAAsnsVuAg=="; }; }; - "@textlint/source-code-fixer-12.5.0" = { + "@textlint/source-code-fixer-12.6.1" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.5.0.tgz"; - sha512 = "7LebJ6Y64Rb4fVYyokpU8FnjNLdx+TehcHQJ9L/fi8PYVjpS/08klYtYfRtKWmi/vrWED7U0aGhb8Xr26NuWFw=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.6.1.tgz"; + sha512 = "J9UZ3uitT+T50ug5X6AoIOwn6kTl54ZmPYBPB9bmH4lwBamN7e4gT65lSweHY1D21elOkq+3bO/OAJMfQfAVHg=="; }; }; - "@textlint/text-to-ast-12.5.0" = { + "@textlint/source-code-fixer-13.0.4" = { + name = "_at_textlint_slash_source-code-fixer"; + packageName = "@textlint/source-code-fixer"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-13.0.4.tgz"; + sha512 = "C9SYHCQbgB6iJbRNtw+CUMRC7ACIqpLLMRDBw3VXyJfS4Ki9V3YZAlFvhe8kYTjeUe50skOQtDUMgvoIS5nNRA=="; + }; + }; + "@textlint/text-to-ast-12.6.1" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.5.0.tgz"; - sha512 = "wOWYX+d821ThwNYNk5hfxOBxvkqKUpNOBKkDaic4V+dkuBoAS0D9lE9fA9Ps62kL/I1uQwhU5d4qsAHWnFmQkw=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.6.1.tgz"; + sha512 = "22tgSBaNerpwb66eCivjXmdZ3CDX2Il38vpuAGchiI+cl+sENU9dpuntxwEJdZQePX5qrkmw8XGj5kgyMF015A=="; }; }; - "@textlint/textlint-plugin-markdown-12.5.0" = { + "@textlint/text-to-ast-13.0.4" = { + name = "_at_textlint_slash_text-to-ast"; + packageName = "@textlint/text-to-ast"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-13.0.4.tgz"; + sha512 = "KfR+4uuNOYQAwayzYNQUiv7GACvcjb+8ZOpJnpmu5FymI+c3g6EayYwt4cx01fmSLeZEL8njiyP1hQi3rzaR1g=="; + }; + }; + "@textlint/textlint-plugin-markdown-12.6.1" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.5.0.tgz"; - sha512 = "1B4mTmA1NOvK2kAk4Rl/TW3QFB80iwhsOKSJ16nCH/yvF82xgH+Gu4gQB/prNpACb4TivmzwvBRYp7rzhOTTyA=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.6.1.tgz"; + sha512 = "fRKsFCL2fGeu0Bt+08FuEc2WHiI8IMDRvy6KT1pmNWO5irS4yL2/OXNknLH3erXvwcJw/hQnd5WEl4hQzS0Erw=="; }; }; - "@textlint/textlint-plugin-text-12.5.0" = { + "@textlint/textlint-plugin-markdown-13.0.4" = { + name = "_at_textlint_slash_textlint-plugin-markdown"; + packageName = "@textlint/textlint-plugin-markdown"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-13.0.4.tgz"; + sha512 = "2w0kIO3xgCMNeCxl0TuMCkOqHprpa+gKyI5EPXSy0sj6ksSHlW3hntiPI7MsMzTA90qMXhKSJQAVwYYQ6ntpTA=="; + }; + }; + "@textlint/textlint-plugin-text-12.6.1" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.5.0.tgz"; - sha512 = "ec3rZaJYytoscwpAtuxD4UM3bUPqNAeWKia+LMaVMWREULwKfntlSAqSNmudujEkxdsKr028CkzYuP78q8Xmuw=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.6.1.tgz"; + sha512 = "ZUfG0Xb8qGymIPNp2eFTq9bHvkJo3N3Ia1Aff5W9fsgZib1/Eb55U16Sp60TjhBFns0/p7L7usBC3nd3+tB5mQ=="; }; }; - "@textlint/types-12.5.0" = { + "@textlint/textlint-plugin-text-13.0.4" = { + name = "_at_textlint_slash_textlint-plugin-text"; + packageName = "@textlint/textlint-plugin-text"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-13.0.4.tgz"; + sha512 = "wnAxJ4qQQrjur3zTiVhI6rxoO2vDV7ZCvR8i62LKzK8YyVN4tQM9P6NjiCwnZD0RaIyXTcYX6huiUBQZffmHHg=="; + }; + }; + "@textlint/types-12.6.1" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-12.5.0.tgz"; - sha512 = "Po5qOubilL/g3dx+ZUgaQzNXbROADBF4Z5xy7qqgV6pBQIEE/06INZDmmLE1Eesm2zoDpygoG/1f/0/Cy5Yupw=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-12.6.1.tgz"; + sha512 = "t1SZYahu2olnF8MUhlP6qDIEDyl7WmyIaBYxQdE2qU6xUkZWXS2zIxoAT/pVgvFCzDw3KO5HhIYGVeWRp90dTg=="; }; }; - "@textlint/utils-12.5.0" = { + "@textlint/types-13.0.4" = { + name = "_at_textlint_slash_types"; + packageName = "@textlint/types"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/types/-/types-13.0.4.tgz"; + sha512 = "ZYnrp+s/MUl1IMvEu92zafLwA8x1vMFaHEZV6BGP3ELf2GZVLZYns2hGYtJse1vb/+/PYH6OCSOTZqfsGwKARg=="; + }; + }; + "@textlint/utils-12.6.1" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.5.0.tgz"; - sha512 = "bQWrQ7Xaru1DRLQhAQQJgNnfGQIwgTgWUigdS5wSwpbmfLDnaMzHu3AG0lk5hEnELMKTCIej5uCR0+YscyUckg=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.6.1.tgz"; + sha512 = "HJkqYXT2FAAHDM5XLFpQLF/CEdm8c2ltMeKmPBSSty1VfPXQMi8tGPT1b58b8KWh6dVmi7w0YYB7NrquuzXOKA=="; + }; + }; + "@textlint/utils-13.0.4" = { + name = "_at_textlint_slash_utils"; + packageName = "@textlint/utils"; + version = "13.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/utils/-/utils-13.0.4.tgz"; + sha512 = "BrSShnYFzCeIYWCTsIIe7GQcFhapQhXq6b3FdZ3CMaAz1apzTKTpukyjfL4Wdiai99XfAWFLko4sld/uWF3/KA=="; }; }; "@tokenizer/token-0.1.1" = { @@ -11893,6 +12757,15 @@ let sha512 = "Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ=="; }; }; + "@types/express-4.17.16" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.16"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express/-/express-4.17.16.tgz"; + sha512 = "LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA=="; + }; + }; "@types/express-serve-static-core-4.17.31" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; @@ -11902,13 +12775,13 @@ let sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; }; }; - "@types/express-serve-static-core-4.17.32" = { + "@types/express-serve-static-core-4.17.33" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.32"; + version = "4.17.33"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz"; - sha512 = "aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz"; + sha512 = "TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA=="; }; }; "@types/file-type-10.9.1" = { @@ -11965,15 +12838,6 @@ let sha512 = "Po8ZPCsAcPPuf5OODPEkb6cdWJ/w4BdX1veP7IIOc2WG0x1SW4GEQ1+FHKN1AMG2AePJfNUceJbh5PKtP92yRQ=="; }; }; - "@types/html-minifier-terser-5.1.2" = { - name = "_at_types_slash_html-minifier-terser"; - packageName = "@types/html-minifier-terser"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz"; - sha512 = "h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w=="; - }; - }; "@types/html-minifier-terser-6.1.0" = { name = "_at_types_slash_html-minifier-terser"; packageName = "@types/html-minifier-terser"; @@ -12406,13 +13270,13 @@ let sha512 = "3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA=="; }; }; - "@types/node-18.11.16" = { + "@types/node-16.9.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.16"; + version = "16.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.16.tgz"; - sha512 = "6T7P5bDkRhqRxrQtwj7vru+bWTpelgtcETAZEUSdq0YISKz8WKdoBukQLYQQ6DFHvU9JRsbFq0JH5C51X2ZdnA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.9.1.tgz"; + sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="; }; }; "@types/node-18.11.18" = { @@ -12532,15 +13396,6 @@ let sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; }; }; - "@types/raf-3.4.0" = { - name = "_at_types_slash_raf"; - packageName = "@types/raf"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/raf/-/raf-3.4.0.tgz"; - sha512 = "taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw=="; - }; - }; "@types/range-parser-1.2.4" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; @@ -12550,22 +13405,22 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/react-17.0.52" = { + "@types/react-17.0.53" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "17.0.52"; + version = "17.0.53"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-17.0.52.tgz"; - sha512 = "vwk8QqVODi0VaZZpDXQCmEmiOuyjEFPY7Ttaw5vjM112LOq37yz1CDJGrRJwA1fYEq4Iitd5rnjd1yWAc/bT+A=="; + url = "https://registry.npmjs.org/@types/react/-/react-17.0.53.tgz"; + sha512 = "1yIpQR2zdYu1Z/dc1OxC+MA6GR240u3gcnP4l6mvj/PJiVaqHsQPmWttsvHsfnhfPbU2FuGmo0wSITPygjBmsw=="; }; }; - "@types/react-18.0.26" = { + "@types/react-18.0.27" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "18.0.26"; + version = "18.0.27"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz"; - sha512 = "hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug=="; + url = "https://registry.npmjs.org/@types/react/-/react-18.0.27.tgz"; + sha512 = "3vtRKHgVxu3Jp9t718R9BuzoD4NcQ8YJ5XRzsSKxNDiDonD2MXIT1TmSkenxuCycZJoQT5d2vE8LwWJxBC1gmA=="; }; }; "@types/react-dom-18.0.10" = { @@ -12982,15 +13837,6 @@ let sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; }; }; - "@types/ws-8.5.3" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "8.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz"; - sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; - }; - }; "@types/ws-8.5.4" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -13054,13 +13900,13 @@ let sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/eslint-plugin-5.48.2" = { + "@typescript-eslint/eslint-plugin-5.49.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.48.2.tgz"; - sha512 = "sR0Gja9Ky1teIq4qJOl0nC+Tk64/uYdX+mi+5iB//MH8gwyx8e3SOyhEzeLZEFEEfCaLf8KJq+Bd/6je1t+CAg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.49.0.tgz"; + sha512 = "IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q=="; }; }; "@typescript-eslint/experimental-utils-4.33.0" = { @@ -13081,13 +13927,13 @@ let sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/parser-5.48.2" = { + "@typescript-eslint/parser-5.49.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.48.2.tgz"; - sha512 = "38zMsKsG2sIuM5Oi/olurGwYJXzmtdsHhn5mI/pQogP+BjYVkK5iRazCQ8RGS0V+YLk282uWElN70zAAUmaYHw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.49.0.tgz"; + sha512 = "veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg=="; }; }; "@typescript-eslint/scope-manager-4.33.0" = { @@ -13099,22 +13945,22 @@ let sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/scope-manager-5.48.2" = { + "@typescript-eslint/scope-manager-5.49.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.2.tgz"; - sha512 = "zEUFfonQid5KRDKoI3O+uP1GnrFd4tIHlvs+sTJXiWuypUWMuDaottkJuR612wQfOkjYbsaskSIURV9xo4f+Fw=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.49.0.tgz"; + sha512 = "clpROBOiMIzpbWNxCe1xDK14uPZh35u4QaZO1GddilEzoCLAEz4szb51rBpdgurs5k2YzPtJeTEN3qVbG+LRUQ=="; }; }; - "@typescript-eslint/type-utils-5.48.2" = { + "@typescript-eslint/type-utils-5.49.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.48.2.tgz"; - sha512 = "QVWx7J5sPMRiOMJp5dYshPxABRoZV1xbRirqSk8yuIIsu0nvMTZesKErEA3Oix1k+uvsk8Cs8TGJ6kQ0ndAcew=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.49.0.tgz"; + sha512 = "eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA=="; }; }; "@typescript-eslint/types-4.33.0" = { @@ -13126,13 +13972,13 @@ let sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/types-5.48.2" = { + "@typescript-eslint/types-5.49.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.48.2.tgz"; - sha512 = "hE7dA77xxu7ByBc6KCzikgfRyBCTst6dZQpwaTy25iMYOnbNljDT4hjhrGEJJ0QoMjrfqrx+j1l1B9/LtKeuqA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.49.0.tgz"; + sha512 = "7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg=="; }; }; "@typescript-eslint/typescript-estree-4.33.0" = { @@ -13144,22 +13990,22 @@ let sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/typescript-estree-5.48.2" = { + "@typescript-eslint/typescript-estree-5.49.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.2.tgz"; - sha512 = "bibvD3z6ilnoVxUBFEgkO0k0aFvUc4Cttt0dAreEr+nrAHhWzkO83PEVVuieK3DqcgL6VAK5dkzK8XUVja5Zcg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.49.0.tgz"; + sha512 = "PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA=="; }; }; - "@typescript-eslint/utils-5.48.2" = { + "@typescript-eslint/utils-5.49.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.2.tgz"; - sha512 = "2h18c0d7jgkw6tdKTlNaM7wyopbLRBiit8oAxoP89YnuBOzCZ8g8aBCaCqq7h208qUTroL7Whgzam7UY3HVLow=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.49.0.tgz"; + sha512 = "cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ=="; }; }; "@typescript-eslint/visitor-keys-4.33.0" = { @@ -13171,13 +14017,13 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@typescript-eslint/visitor-keys-5.48.2" = { + "@typescript-eslint/visitor-keys-5.49.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.48.2"; + version = "5.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.2.tgz"; - sha512 = "z9njZLSkwmjFWUelGEwEbdf4NwKvfHxvGC0OcGN1Hp/XNDIcJ7D5DpPNPv6x6/mFvc1tQHsaWmpD/a4gOvvCJQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.49.0.tgz"; + sha512 = "v9jBMjpNWyn8B6k/Mjt6VbUS4J1GvUlR4x3Y+ibnP1z7y7V4n0WRz+50DY6+Myj0UaXVSuUlHohO+eZ8IJEnkg=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -13225,40 +14071,58 @@ let sha512 = "UGyyGAMXzop9C/fIoe7Ij63DkPSy1uMw2jipB5dnB8R3kl80za7LYzVnA1HvBEt2ZPWfMuwez/VGLOQ7XX4bTA=="; }; }; - "@vercel/build-utils-5.9.0" = { + "@vercel/build-utils-6.0.0" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "5.9.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-5.9.0.tgz"; - sha512 = "LJRhd/ritLGHH+YvZ+DC7AW3Jr87UZHFHz2h2ENULDZ8qAo5LJH+y+Cg11uxfXkhQKK2f/AZQJXyKVyu1BBwdQ=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-6.0.0.tgz"; + sha512 = "2AoVcDUyQCj516KrRNH92NeKI+KZGnVGjHkcb+VcXxGspYpKL/gC+AdFtC05qbgxX1e8U95Yd8ROucTftHErWw=="; }; }; - "@vercel/go-2.2.30" = { + "@vercel/gatsby-plugin-vercel-analytics-1.0.7" = { + name = "_at_vercel_slash_gatsby-plugin-vercel-analytics"; + packageName = "@vercel/gatsby-plugin-vercel-analytics"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-analytics/-/gatsby-plugin-vercel-analytics-1.0.7.tgz"; + sha512 = "j4DsneQ+oOF0Zurvisj+H2ds8s8ZEqfI4iD6xgFY9mB2UdGixhzFRjvDBH6g4pfUQXfO76K5GiA1afumGlJbwA=="; + }; + }; + "@vercel/gatsby-plugin-vercel-builder-1.0.2" = { + name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; + packageName = "@vercel/gatsby-plugin-vercel-builder"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-1.0.2.tgz"; + sha512 = "zhbLVDM8wdWK1Se0aYK5kB3w/LvR8ayzYSpeWZK2rzpTPmjWNbRBjJkWtoZvL5LlE4rEcSELaci7uxXIrflEag=="; + }; + }; + "@vercel/go-2.2.31" = { name = "_at_vercel_slash_go"; packageName = "@vercel/go"; - version = "2.2.30"; + version = "2.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/go/-/go-2.2.30.tgz"; - sha512 = "ODz5UrlBzYIpPVjfMZVofQGfsqHSn2WjLdHGw58UAgQH+rUYSWBwqsXvIcYT3QXy2hKCZGguahqeT0qXSqBpTw=="; + url = "https://registry.npmjs.org/@vercel/go/-/go-2.2.31.tgz"; + sha512 = "zDBxGi+M9AU18fNKSfZeD+hEALlIO/vQRD2kCh2f5k/Agjera6ughW0B3he+1s/M23vCDdx6N54E2j9GeTBZlQ=="; }; }; - "@vercel/hydrogen-0.0.44" = { + "@vercel/hydrogen-0.0.45" = { name = "_at_vercel_slash_hydrogen"; packageName = "@vercel/hydrogen"; - version = "0.0.44"; + version = "0.0.45"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-0.0.44.tgz"; - sha512 = "7RnSk10nE0tNLHcTCUTWCpO5rfcMQ7N6ECTaeozWcYWs2/Fol7tLjc9Uowo1ZqnV7wTm5mE/ooCD2FNlaKmiaA=="; + url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-0.0.45.tgz"; + sha512 = "ZE/1scAUiuYZTEmO3CN08mGPo6dbORR8/tGDzsF//KYjTNcsKQJ+szVRqxUH5ZbazS4F2h1+wNDM0XHwKuLbLA=="; }; }; - "@vercel/next-3.3.15" = { + "@vercel/next-3.3.19" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "3.3.15"; + version = "3.3.19"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-3.3.15.tgz"; - sha512 = "zfJ54JkalkMvxE4e0/OAL0sPEm9AplUCBR2Bq6JhGrOEaxBGdCyv2RPBAyZOV1JL+m9y06hJpWyFQGsOtI5RgA=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-3.3.19.tgz"; + sha512 = "Adu3i4eHcQqLmRLCpJteilCTxfMLdr9grwk4Yq4g66xwRgkYTHiupkDN7hXThsxEBQgtotfcTUlygYYJjXvBkA=="; }; }; "@vercel/nft-0.22.5" = { @@ -13270,49 +14134,49 @@ let sha512 = "mug57Wd1BL7GMj9gXMgMeKUjdqO0e4u+0QLPYMFE1rwdJ+55oPy6lp3nIBCS8gOvigT62UI4QKUL2sGqcoW4Hw=="; }; }; - "@vercel/node-2.8.13" = { + "@vercel/node-2.8.16" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "2.8.13"; + version = "2.8.16"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-2.8.13.tgz"; - sha512 = "RI0Ig2v7MK4N3EVPHKNEj3IK+D0/GtIbMFZB0WcUgE77UvdD++tf5JWTlqrwxPOYOxO/J0/0L8WZXTAzpPgdGA=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-2.8.16.tgz"; + sha512 = "aLuPHOm29cYjCK649/5j/zbYFXxRtNYcnNFdBd2gVg2II54SfByYIx/Tw3A6PeQmR23piBwPZMI5uEuYC0TGmA=="; }; }; - "@vercel/node-bridge-3.1.9" = { + "@vercel/node-bridge-3.1.10" = { name = "_at_vercel_slash_node-bridge"; packageName = "@vercel/node-bridge"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node-bridge/-/node-bridge-3.1.9.tgz"; - sha512 = "07Bgb6jm8OMTlxGRC4kOY0ewi4xLtMcK3z45T+GKRO7oKeA4vhRGFbT5BsJKF3V5/nj6TYAsWsErBf4RGVSBcw=="; + url = "https://registry.npmjs.org/@vercel/node-bridge/-/node-bridge-3.1.10.tgz"; + sha512 = "0DQzF5pdyP+xd5f1Ss2fAO+9xIvzUhngRAPazwg4XHZE9iLkv2L+A1u3L8NYi4hoUlAAZQ5GF3txlm/oBn4tNw=="; }; }; - "@vercel/python-3.1.40" = { + "@vercel/python-3.1.41" = { name = "_at_vercel_slash_python"; packageName = "@vercel/python"; - version = "3.1.40"; + version = "3.1.41"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.40.tgz"; - sha512 = "Cns+KTVBloQXtls72KaaXQ2gHgsH5/Mm7lwv80ysTZvp5x6loh+Faf6QJq93LxYh9lz2wqWjO+nq3XJ77N5twg=="; + url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.41.tgz"; + sha512 = "xS3LY1zzuKM2wTeW9tTQqQ3gNgsstSWMO8dnxcuFnYMP8JwN4ffLSreXeJm4S5pFsn5dNyH1EckgoXWgB9TgBQ=="; }; }; - "@vercel/redwood-1.0.51" = { + "@vercel/redwood-1.0.52" = { name = "_at_vercel_slash_redwood"; packageName = "@vercel/redwood"; - version = "1.0.51"; + version = "1.0.52"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-1.0.51.tgz"; - sha512 = "0i9+qe4branWzMfeLbIazvomxCX7scASJ9bqm2oMCdMxZrXeB3/hwRCUUdGJGXmRsrGp7ATsXjxynd+D1wZymw=="; + url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-1.0.52.tgz"; + sha512 = "ZZ+qWdYRYfL5wKYao4/oXHxbGpoN6MJEN+YtiOSCauDfolN/7c+qFbZu4P6MdEddY4/3Kq1CRMy9z89UfPPzew=="; }; }; - "@vercel/remix-1.2.5" = { + "@vercel/remix-1.2.8" = { name = "_at_vercel_slash_remix"; packageName = "@vercel/remix"; - version = "1.2.5"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix/-/remix-1.2.5.tgz"; - sha512 = "jbTDy+Ar+DRbk2UJqazOcGs1lgWhTSf5yvO27ZyN+mM4diTKg834McjJ9IUhpEyBGejS3+dPaz7U9dn+Bfbztw=="; + url = "https://registry.npmjs.org/@vercel/remix/-/remix-1.2.8.tgz"; + sha512 = "30Cfc+tl6L+L4+c9fGTBfS8YbCSfP/plqf+bTSHHU9wIGWmq/oKpIxInRbcT2+7oAb+EdehMDoZ1r/L7me7Dew=="; }; }; "@vercel/routing-utils-2.1.8" = { @@ -13324,22 +14188,22 @@ let sha512 = "rng+qyQ0VpnBjO2R7GQlpAdEx+yyvrcEp6XNe+4q6e+oW0n2H6dm6SLFEBA6B1QmHX4OTTCkq1GIiKsK6ENw4Q=="; }; }; - "@vercel/ruby-1.3.56" = { + "@vercel/ruby-1.3.57" = { name = "_at_vercel_slash_ruby"; packageName = "@vercel/ruby"; - version = "1.3.56"; + version = "1.3.57"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.56.tgz"; - sha512 = "fYjyU8ZhsouRC5WWZBuN8FQG+eHGTFzl8sCwCGdeaykJOpVa0FW9Xl/fDjBpAQoicbrdZhDH2HaEfnjBkLVIeA=="; + url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.57.tgz"; + sha512 = "AY9bhSwDPcWt20KNskpn/zGF8nP7JBkfWbddXwF0uP2Ui55b+hnBr2VjRf2qys2npOZu2O2jd70/KCOUGnkdIw=="; }; }; - "@vercel/static-build-1.1.7" = { + "@vercel/static-build-1.3.0" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "1.1.7"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.1.7.tgz"; - sha512 = "l0QBOuRD6NjewHyPTSMxk96MVJbeem46cjqKb9AB9Ochf2nb20JGZaON0VSqeJRtrQR19gWiqgTT+glz1G098A=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.3.0.tgz"; + sha512 = "Ai9xpqkMCxXT8lHtyn+qE9N+fQSdlBv9ph0ldeKdc+BhDx8T91LzAoCxqT2XnNii0TIakD2k/ZI/qusqTTMe6Q=="; }; }; "@vercel/static-config-2.0.11" = { @@ -13360,13 +14224,13 @@ let sha512 = "IIB8jbiKy37zN8bAIHx59YmnIelY78CGHtThnibD/d3tQOKRY83bYVi9blwmZVUZh6l9nfkYH3tvReaiNxY9EQ=="; }; }; - "@vscode/l10n-0.0.10" = { + "@vscode/l10n-0.0.11" = { name = "_at_vscode_slash_l10n"; packageName = "@vscode/l10n"; - version = "0.0.10"; + version = "0.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.10.tgz"; - sha512 = "E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ=="; + url = "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.11.tgz"; + sha512 = "ukOMWnCg1tCvT7WnDfsUKQOFDQGsyR5tNgRpwmqi+5/vzU3ghdDXzvIM4IOPdSb3OeSsBNvmSL8nxIVOqi2WXA=="; }; }; "@vscode/test-electron-2.2.2" = { @@ -14656,22 +15520,22 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; - "@yarnpkg/parsers-3.0.0-rc.35" = { + "@yarnpkg/parsers-3.0.0-rc.36" = { name = "_at_yarnpkg_slash_parsers"; packageName = "@yarnpkg/parsers"; - version = "3.0.0-rc.35"; + version = "3.0.0-rc.36"; src = fetchurl { - url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.35.tgz"; - sha512 = "J6ySgEdQUqAmlttvZOoXOEsrDTAnHyR/MtEvuAG5a+gwKY/2Cc7xn4CWcpgfuwkp+0a4vXmt2BDwzacDoGDN1g=="; + url = "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.36.tgz"; + sha512 = "PvTlgUr7WO2qDnph8tVdItbJlo9hEcGSVd8+ppn/tvcn8XZUaD1z4EgvMEZcJYZi3LmHJGzSgVZzcFE+zQiz8A=="; }; }; - "@zeit/schemas-2.21.0" = { + "@zeit/schemas-2.29.0" = { name = "_at_zeit_slash_schemas"; packageName = "@zeit/schemas"; - version = "2.21.0"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.21.0.tgz"; - sha512 = "/J4WBTpWtQ4itN1rb3ao8LfClmVcmz2pO6oYb7Qd4h7VSqUhIbJIvrykz9Ew1WMg6eFWsKdsMHc5uPbFxqlCpg=="; + url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.29.0.tgz"; + sha512 = "g5QiLIfbg3pLuYUJPlisNKY+epQJTcMDsOnVNkscrDP1oi7vmJnzOANYJI/1pZcVJ6umUkBv3aFtlg1UvUHGzA=="; }; }; "@zeit/schemas-2.6.0" = { @@ -14683,13 +15547,13 @@ let sha512 = "uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg=="; }; }; - "@zkochan/cmd-shim-5.4.0" = { + "@zkochan/cmd-shim-5.4.1" = { name = "_at_zkochan_slash_cmd-shim"; packageName = "@zkochan/cmd-shim"; - version = "5.4.0"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-5.4.0.tgz"; - sha512 = "Ldv5OxVJNNoHgwDPkJVdTT4l31hA4YLhJxpNNx3I5C9E3xXej66w6sQTL9Q/ZNVVTLplqDxTy+UjcnPx6cxwuA=="; + url = "https://registry.npmjs.org/@zkochan/cmd-shim/-/cmd-shim-5.4.1.tgz"; + sha512 = "odWb1qUzt0dIOEUPyWBEpFDYQPRjEMr/dbHHAfgBkVkYR9aO7Zo+I7oYWrXIxl+cKlC7+49ftPm8uJxL1MA9kw=="; }; }; "@zkochan/js-yaml-0.0.6" = { @@ -14701,58 +15565,58 @@ let sha512 = "nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg=="; }; }; - "@zwave-js/cc-10.4.0" = { + "@zwave-js/cc-10.5.2" = { name = "_at_zwave-js_slash_cc"; packageName = "@zwave-js/cc"; - version = "10.4.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-10.4.0.tgz"; - sha512 = "qKisjEz2fOCCNp8LREYyRZu0pib38lqO+pnJwZs5Gjni0EnEC3A1FW470AXPUVJw2cbGtFDaYnGfTW72xeJSpg=="; + url = "https://registry.npmjs.org/@zwave-js/cc/-/cc-10.5.2.tgz"; + sha512 = "RBuAJ6cWlhZTLDDppWx6ILmqXATN9L8lyIfjSbNIzdlJ6jzJK1sW7r+rvXlcubAOPdDBEQa2UYbCJ/PEdFdoBg=="; }; }; - "@zwave-js/config-10.4.0" = { + "@zwave-js/config-10.5.2" = { name = "_at_zwave-js_slash_config"; packageName = "@zwave-js/config"; - version = "10.4.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/config/-/config-10.4.0.tgz"; - sha512 = "Z3Gc8gmgUJUwP/on/EDgobksfazOxOxfxUGHDH/jfqxsF0adFSdhSeatF9cCfh5YM+UWFYEZLgVykbKtIW9XoA=="; + url = "https://registry.npmjs.org/@zwave-js/config/-/config-10.5.2.tgz"; + sha512 = "nnXehRQZlOSwvKOhDuLkjwkyR2dZVaNOqwxz9UKcovclIZyXV+1V2VhAxa0BeIyidDZYV/Ma2SzT4lGckW/3WQ=="; }; }; - "@zwave-js/core-10.4.0" = { + "@zwave-js/core-10.5.0" = { name = "_at_zwave-js_slash_core"; packageName = "@zwave-js/core"; - version = "10.4.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/core/-/core-10.4.0.tgz"; - sha512 = "/3gKj8dzxn1T3ymiMjNPN/ficAEti9cnCVxQvjjRyqNsBe6onsN+n4Te+Ed7LuSybGH+v9G8iH29YkjjgzU66g=="; + url = "https://registry.npmjs.org/@zwave-js/core/-/core-10.5.0.tgz"; + sha512 = "l5/YwSZMMg8MeUhi8bCnS2xu1EYFO9ocY9Zl2LWXF/8xMYKqZohgxjkUg4YzbIoTyE5vGuaxVoBHqQ4iQ7xj3g=="; }; }; - "@zwave-js/host-10.4.0" = { + "@zwave-js/host-10.5.2" = { name = "_at_zwave-js_slash_host"; packageName = "@zwave-js/host"; - version = "10.4.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/host/-/host-10.4.0.tgz"; - sha512 = "NLL18cmaXZcbT/rQ/vdVCvRo9GQF5xYWGDxgja6zjuAR5xrsYyfyvI1lJuiOD9i9iPmTiu1XFv1PfJl54Ird3A=="; + url = "https://registry.npmjs.org/@zwave-js/host/-/host-10.5.2.tgz"; + sha512 = "BTbIWobUI/YYlSe35U/hDkA/zyMFtktEyLis17r/FTYZR35zcmKO/jHpwwKii/EELsxTrCJnXMh017NrhJlpKA=="; }; }; - "@zwave-js/nvmedit-10.4.0" = { + "@zwave-js/nvmedit-10.5.0" = { name = "_at_zwave-js_slash_nvmedit"; packageName = "@zwave-js/nvmedit"; - version = "10.4.0"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-10.4.0.tgz"; - sha512 = "fxhIxRHBcDESafhdE6Qnil+IbQig+XncUMcVXm1m77/fT8Ee3QXLPbqte0O1+10KcnHdult3t9cB0hlBIk2OhA=="; + url = "https://registry.npmjs.org/@zwave-js/nvmedit/-/nvmedit-10.5.0.tgz"; + sha512 = "kXTToCLTytqdLBCfVZN1HaB7F4SrW8TVO/xMmG9D3n3yMEMaSDHRXobym9kOOb5aVwVCplASQiHwY+pL4t5R9A=="; }; }; - "@zwave-js/serial-10.4.0" = { + "@zwave-js/serial-10.5.2" = { name = "_at_zwave-js_slash_serial"; packageName = "@zwave-js/serial"; - version = "10.4.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-10.4.0.tgz"; - sha512 = "8NPH7MqjSpd8HeGTJYfw+bmCPpadMebpSlJsf2n/vAbMU6E8Sp1Gi3X347MzdMxDAQOzF3YaV9UBmGcRcxvfBQ=="; + url = "https://registry.npmjs.org/@zwave-js/serial/-/serial-10.5.2.tgz"; + sha512 = "IqAYBhNE+LsEVSRu2UDzoM3inV2dp3JMfIJXBN8iVa/revCXTjGWOPJkqhulj74cQX9brCuA919YQ33N9hlJwA=="; }; }; "@zwave-js/shared-10.4.0" = { @@ -14764,13 +15628,13 @@ let sha512 = "uuLYDDNqIkagJ40piNMhljVG9OepI31/labLnivJByxGdELJnIXGRKLQ8ZKvm/5Ba8qXpEw/t7UrV2plfP/QCg=="; }; }; - "@zwave-js/testing-10.4.0" = { + "@zwave-js/testing-10.5.2" = { name = "_at_zwave-js_slash_testing"; packageName = "@zwave-js/testing"; - version = "10.4.0"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-10.4.0.tgz"; - sha512 = "5rCxp7EJXK6B8td4SdVyqmZL+4WL3p7blVLKjT3LpZXcMolOTeEEptggJ9yhmFm2pUhkOHSoE12FwroJbRObXw=="; + url = "https://registry.npmjs.org/@zwave-js/testing/-/testing-10.5.2.tgz"; + sha512 = "3Si/nerD7I9pPpgiipUZqrEJUTNeFAPnbgXG9P5mZb+uhHzbrwVVDASK9wPgjGqWx2AJffAMl2MPEknqcMEaRA=="; }; }; "CSSselect-0.4.1" = { @@ -15034,13 +15898,13 @@ let sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; }; }; - "acorn-8.8.1" = { + "acorn-8.8.2" = { name = "acorn"; packageName = "acorn"; - version = "8.8.1"; + version = "8.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz"; - sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz"; + sha512 = "xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="; }; }; "acorn-dynamic-import-3.0.0" = { @@ -15205,13 +16069,13 @@ let sha512 = "qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ=="; }; }; - "addons-linter-5.23.0" = { + "addons-linter-5.27.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "5.23.0"; + version = "5.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-5.23.0.tgz"; - sha512 = "Vo6+5YlM2Ge3yYMY+gNg9Smcfcl1J0ZMfGVXnGJjUwDVHuszHVIvurunQuJURnO4FR1gi4Vy1sWye8ArRL5LOw=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-5.27.0.tgz"; + sha512 = "gDgl0FcmhZ5cs3St0qAaO9J1BoektwnY+p4dVgcvPu8WaBqH9MG2fk0gL/evCpoHSXeSw15GA87n8Y7zy7raVQ=="; }; }; "addons-moz-compare-1.3.0" = { @@ -15223,13 +16087,13 @@ let sha512 = "/rXpQeaY0nOKhNx00pmZXdk5Mu+KhVlL3/pSBuAYwrxRrNiTvI/9xfQI8Lmm7DMMl+PDhtfAHY/0ibTpdeoQQQ=="; }; }; - "addons-scanner-utils-8.1.0" = { + "addons-scanner-utils-8.3.0" = { name = "addons-scanner-utils"; packageName = "addons-scanner-utils"; - version = "8.1.0"; + version = "8.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-8.1.0.tgz"; - sha512 = "wxqnmmrzZXjz4B4GZbFcR4HJxTP+pGu+C6iOjMJdmL6mgZZey/UEVJlU6XTxu8GdGv0bUoJxyIioH8XEDxy91Q=="; + url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-8.3.0.tgz"; + sha512 = "XP+2kxhZxlxiVFXVJ7lyJEuxpUS8ryrolUDqnUEnvOZ/3p8qt9hWCYSliXhI2W+Swf/hZ3F4CLAG6tBnqdxDYA=="; }; }; "addr-to-ip-port-1.5.4" = { @@ -15241,15 +16105,6 @@ let sha512 = "ByxmJgv8vjmDcl3IDToxL2yrWFrRtFpZAToY0f46XFXl8zS081t7El5MXIodwm7RC6DhHBRoOSMLFSPKCtHukg=="; }; }; - "address-1.1.2" = { - name = "address"; - packageName = "address"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/address/-/address-1.1.2.tgz"; - sha512 = "aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA=="; - }; - }; "address-1.2.2" = { name = "address"; packageName = "address"; @@ -15439,15 +16294,6 @@ let sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; }; }; - "ajv-8.11.2" = { - name = "ajv"; - packageName = "ajv"; - version = "8.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz"; - sha512 = "E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg=="; - }; - }; "ajv-8.12.0" = { name = "ajv"; packageName = "ajv"; @@ -15538,15 +16384,6 @@ let sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw=="; }; }; - "ajv-merge-patch-5.0.1" = { - name = "ajv-merge-patch"; - packageName = "ajv-merge-patch"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv-merge-patch/-/ajv-merge-patch-5.0.1.tgz"; - sha512 = "0UP3aJCzfzBOkmLR+EinJDCfg6DNtprj3bVPo7JJNgUpZMKt097t9xxQOWFGRoB4JvKKIHE2qe0HkVaS/HyrjQ=="; - }; - }; "alcalzone-shared-4.0.8" = { name = "alcalzone-shared"; packageName = "alcalzone-shared"; @@ -15997,6 +16834,15 @@ let sha512 = "Ydgbey4zqUmmNN2i2OVeVHXig3PxHRbok2X6B2Sogmb92JzZUFfTL806dT7os6tBL1peXItfeFt76CP3zsoXUg=="; }; }; + "any-base-1.1.0" = { + name = "any-base"; + packageName = "any-base"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-base/-/any-base-1.1.0.tgz"; + sha512 = "uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="; + }; + }; "any-observable-0.3.0" = { name = "any-observable"; packageName = "any-observable"; @@ -17365,13 +18211,13 @@ let sha512 = "uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw=="; }; }; - "async-each-1.0.3" = { + "async-each-1.0.4" = { name = "async-each"; packageName = "async-each"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"; - sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; + url = "https://registry.npmjs.org/async-each/-/async-each-1.0.4.tgz"; + sha512 = "qL5v0vnRtD4rxlrzLz3WMnMfTvTrMf3IK1xFCF0Q5vqXJkULhM13gO2ynE8RZMjE+bPcH0AUHgcd5BU1FtO1tA=="; }; }; "async-each-series-0.1.1" = { @@ -17527,15 +18373,6 @@ let sha512 = "eKEYj1+jDgQ15jazjmelcPGXO77pa5epzlyXyEQcwwLtnACtBTCrxaW+96uXF2j4rzIikmUtVlzXwejx6iIhWw=="; }; }; - "asyncjs-util-1.2.10" = { - name = "asyncjs-util"; - packageName = "asyncjs-util"; - version = "1.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/asyncjs-util/-/asyncjs-util-1.2.10.tgz"; - sha512 = "p4U6HQUw4k/xZKrwEQO7ZuF+8/OkzAQS4iAMhFUBGtSD8p3KkKBaTBuUTEH8TWKB3ArNbrP0401TGE2vIiU7uQ=="; - }; - }; "asyncjs-util-1.2.11" = { name = "asyncjs-util"; packageName = "asyncjs-util"; @@ -17716,13 +18553,13 @@ let sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="; }; }; - "aws-crt-1.15.7" = { + "aws-crt-1.15.8" = { name = "aws-crt"; packageName = "aws-crt"; - version = "1.15.7"; + version = "1.15.8"; src = fetchurl { - url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.15.7.tgz"; - sha512 = "wq26kPlK6PYfJ1A4ckW5HDaf+mgkKqjDf3GoYdvQhGR97riO7mLltRRtbe1sPJ0CRUolA1ypt49HRvf1N/yp2g=="; + url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.15.8.tgz"; + sha512 = "2TLgxvcHwYaCpaZWwMTn7628Xa7mcpedE+pdGf+Vg2l6MiTrRKZ5X5YyXMqX4GvfvDB1I3EfIAi5iFxlHZ1J4w=="; }; }; "aws-sdk-1.18.0" = { @@ -17743,13 +18580,13 @@ let sha512 = "545VawhsCQ7yEx9jZKV0hTTW3FS/waycISWMvnNwqRfpU9o4FQ4DSu3je7ekn5yFKM+91dxJC+IfJgtIV8WaUw=="; }; }; - "aws-sdk-2.1296.0" = { + "aws-sdk-2.1304.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1296.0"; + version = "2.1304.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1296.0.tgz"; - sha512 = "6Nm6zQexyne8lVy+BW8jklGpS36mXJjq67zlsn5XuyB3+qAMlolzar9nxgtuabvb/tSQTP4RSwlhkVzOct+MvA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1304.0.tgz"; + sha512 = "9mf2uafa2M9yFC5IlMe85TIc7OUo1HSProCQWzpRmAAYhcSwmfbRyt02Wtr5YSVvJJPmcSgcyI92snsQR1c3nw=="; }; }; "aws-sign2-0.6.0" = { @@ -17779,13 +18616,13 @@ let sha512 = "NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg=="; }; }; - "axe-core-4.6.2" = { + "axe-core-4.6.3" = { name = "axe-core"; packageName = "axe-core"; - version = "4.6.2"; + version = "4.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/axe-core/-/axe-core-4.6.2.tgz"; - sha512 = "b1WlTV8+XKLj9gZy2DZXgQiyDp9xkkoe2a6U6UbYccScq2wgH/YwCeI2/Jq2mgo0HzQxqJOjWZBLeA/mqsk5Mg=="; + url = "https://registry.npmjs.org/axe-core/-/axe-core-4.6.3.tgz"; + sha512 = "/BQzOX780JhsxDnPpH4ZiyrJAzcd8AfzFPkv+89veFSr1rcMjuq2JDCwypKaPeB6ljHp9KjXhPpjgCvQlWYuqg=="; }; }; "axios-0.19.2" = { @@ -17851,13 +18688,13 @@ let sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "axios-1.2.3" = { + "axios-1.2.6" = { name = "axios"; packageName = "axios"; - version = "1.2.3"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-1.2.3.tgz"; - sha512 = "pdDkMYJeuXLZ6Xj/Q5J3Phpe+jbGdsSzlQaFVkMQzRUL05+6+tetX8TV3p4HrU4kzuO9bt+io/yGQxuyxA/xcw=="; + url = "https://registry.npmjs.org/axios/-/axios-1.2.6.tgz"; + sha512 = "rC/7F08XxZwjMV4iuWv+JpD3E0Ksqg9nac4IIg6RwNuF0JTeWoCo/mBNG54+tNhhI11G3/VDRbdDQTs9hGp4pQ=="; }; }; "axios-cookiejar-support-0.5.1" = { @@ -17941,15 +18778,6 @@ let sha512 = "Law0PGtRV1JL8Y9Wpzc0d6EE0GD7LzXWCfaeWwboUMcBWNG6gvaWTK1/+BK7a4X5EmeJiGEuDDFxUsOa8RSWCw=="; }; }; - "babel-loader-8.1.0" = { - name = "babel-loader"; - packageName = "babel-loader"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz"; - sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; - }; - }; "babel-loader-8.3.0" = { name = "babel-loader"; packageName = "babel-loader"; @@ -18013,13 +18841,13 @@ let sha512 = "NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw=="; }; }; - "babel-plugin-react-native-web-0.18.10" = { + "babel-plugin-react-native-web-0.18.12" = { name = "babel-plugin-react-native-web"; packageName = "babel-plugin-react-native-web"; - version = "0.18.10"; + version = "0.18.12"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.18.10.tgz"; - sha512 = "2UiwS6G7XKJvpo0X5OFkzGjHGFuNx9J+DgEG8TEmm+X5S0z6EB59W11RDEZghdKzsQzVbs1jB+2VHBuVgjMTiw=="; + url = "https://registry.npmjs.org/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.18.12.tgz"; + sha512 = "4djr9G6fMdwQoD6LQ7hOKAm39+y12flWgovAqS1k5O8f42YQ3A1FFMyV5kKfetZuGhZO5BmNmOdRRZQ1TixtDw=="; }; }; "babel-plugin-react-require-3.0.0" = { @@ -18985,15 +19813,6 @@ let sha512 = "5DcLxGUDejgNBYcieMIUfjORtUeNWl828VWLHJGVKZCb4zIS1oOySTUr0LGmcqJBQgTBz3bGbRQla4FgrdQEIQ=="; }; }; - "bitcoinjs-lib-6.0.2" = { - name = "bitcoinjs-lib"; - packageName = "bitcoinjs-lib"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.0.2.tgz"; - sha512 = "I994pGt9cL5s5OA6mkv1e8IuYcsKN2ORXnWbkqAXLNGvEnOHBhKBSvCjFl7YC2uVoJnfr/iwq7JMrq575SYO5w=="; - }; - }; "bitcoinjs-lib-6.1.0" = { name = "bitcoinjs-lib"; packageName = "bitcoinjs-lib"; @@ -19354,6 +20173,15 @@ let sha512 = "epsm3Z92j5xwek9p97pVw3KbsNc0F4QnbYh+N93SpbJYuHFQQ/UAh6K+bKFGyLePH3Hudtl/Sa95Quqp0gX8IQ=="; }; }; + "bmp-js-0.1.0" = { + name = "bmp-js"; + packageName = "bmp-js"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz"; + sha512 = "vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw=="; + }; + }; "bmutex-0.1.6" = { name = "bmutex"; packageName = "bmutex"; @@ -19525,15 +20353,6 @@ let sha512 = "7KQAp+lrtogthZ5UCkqhT3SBfVanGKmBnI4hYdQfcvNcGor4zZdyegUcovf7NmAXhx0c7pc0QiTjkPHFMvQ3mw=="; }; }; - "bolt07-1.8.2" = { - name = "bolt07"; - packageName = "bolt07"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bolt07/-/bolt07-1.8.2.tgz"; - sha512 = "jq1b/ZdMambhh+yi+pm+1PJBAnlYvQYljaBgSajvVAINHrHg32ovCBra8d0ADE3BAoj6G/tK7OSV4t/yT9A+/g=="; - }; - }; "bolt07-1.8.3" = { name = "bolt07"; packageName = "bolt07"; @@ -19543,15 +20362,6 @@ let sha512 = "NXML2vzFmxRrdWt+wNqphU6f8FmS7tkebqDLIhfc8xKoOcGFv4Kf7WuJbKBqcfFDQVXpCpKAF7FQAgTIN2/30A=="; }; }; - "bolt09-0.2.4" = { - name = "bolt09"; - packageName = "bolt09"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bolt09/-/bolt09-0.2.4.tgz"; - sha512 = "ulNUekEfVhJredkXxP970MrVcrbPbDYyybfagqKFa8J3/4MtkhrX1pR5DjHWeyIujEkFNLbZpo6QF/Og2gXxug=="; - }; - }; "bolt09-0.2.5" = { name = "bolt09"; packageName = "bolt09"; @@ -20110,15 +20920,6 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.14.2" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.2.tgz"; - sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; - }; - }; "browserslist-4.21.4" = { name = "browserslist"; packageName = "browserslist"; @@ -20588,6 +21389,15 @@ let sha512 = "bd1dDQhiC+bEbEfg56IdBv7faWa6OipMs/AFFFvtFnB3wAYjlwQpQRZ0pm6ZkgtfL0pILRXhKxOiQj6UzoMR7A=="; }; }; + "bufio-1.2.0" = { + name = "bufio"; + packageName = "bufio"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bufio/-/bufio-1.2.0.tgz"; + sha512 = "UlFk8z/PwdhYQTXSQQagwGAdtRI83gib2n4uy4rQnenxUM2yQi8lBDzF230BNk+3wAoZDxYRoBwVVUPgHa9MCA=="; + }; + }; "bufrw-1.3.0" = { name = "bufrw"; packageName = "bufrw"; @@ -20732,13 +21542,13 @@ let sha512 = "8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA=="; }; }; - "bval-0.1.6" = { + "bval-0.1.7" = { name = "bval"; packageName = "bval"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/bval/-/bval-0.1.6.tgz"; - sha512 = "jxNH9gSx7g749hQtS+nTxXYz/bLxwr4We1RHFkCYalNYcj12RfbW6qYWsKu0RYiKAdFcbNoZRHmWrIuXIyhiQQ=="; + url = "https://registry.npmjs.org/bval/-/bval-0.1.7.tgz"; + sha512 = "Ohv+MV7C0xAt5DJ4u681EVCArZ+ybEpz8yPjAozBEZYmR/rp9AX9QJB9PJ0aVlzEodjr3PIKTQrZfaONP8XR9w=="; }; }; "bweb-0.1.12" = { @@ -21236,15 +22046,6 @@ let sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; - "camelcase-7.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-7.0.0.tgz"; - sha512 = "JToIvOmz6nhGsUhAYScbo2d6Py5wojjNfoxoc2mEVLUdJ70gJK2gnd+ABY1Tc3sVMyK7QDPtN0T/XdlCQWITyQ=="; - }; - }; "camelcase-7.0.1" = { name = "camelcase"; packageName = "camelcase"; @@ -21326,13 +22127,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001445" = { + "caniuse-lite-1.0.30001449" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001445"; + version = "1.0.30001449"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001445.tgz"; - sha512 = "8sdQIdMztYmzfTMO6KfLny878Ln9c2M0fc7EH60IjlP4Dc4PiCy7K2Vl3ITmWgOyPgVQKa5x+UP/KqFsxj4mBg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001449.tgz"; + sha512 = "CPB+UL9XMT/Av+pJxCKGhdx+yg1hzplvFJQlJ2n68PyQGMz9L/E2zCyLdOL8uasbouTUgnPl+y0tccI/se+BEw=="; }; }; "canvas-2.11.0" = { @@ -21344,15 +22145,6 @@ let sha512 = "bdTjFexjKJEwtIo0oRx8eD4G2yWoUOXP9lj279jmQ2zMnTQhT8C3512OKz3s+ZOaQlLbE7TuVvRDYDB3Llyy5g=="; }; }; - "canvg-3.0.7" = { - name = "canvg"; - packageName = "canvg"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/canvg/-/canvg-3.0.7.tgz"; - sha512 = "4sq6iL5Q4VOXS3PL1BapiXIZItpxYyANVzsAKpTPS5oq4u3SKbGfUcbZh2gdLCQ3jWpG/y5wRkMlBBAJhXeiZA=="; - }; - }; "capability-0.2.5" = { name = "capability"; packageName = "capability"; @@ -21497,31 +22289,31 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.6.22" = { + "cdk8s-2.6.32" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.6.22"; + version = "2.6.32"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.6.22.tgz"; - sha512 = "mVeo+zJMJIwbQP/5p8grhxcIpl6Ff59IkOkUyF9JV89zTXD3D5HwoG4VYfhZxjDhgCzftXi31cqmQ8u+8XhgHQ=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.6.32.tgz"; + sha512 = "JofFfr6+qpFeUiZcVK8NwWdjgz5z4b7ZZrKSwOrbvE2g441X+EEu4F3HfWEt4q68RvdaLkvIAFZki/4k4XEp3A=="; }; }; - "cdk8s-plus-25-2.3.27" = { + "cdk8s-plus-25-2.4.3" = { name = "cdk8s-plus-25"; packageName = "cdk8s-plus-25"; - version = "2.3.27"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.3.27.tgz"; - sha512 = "GKBcvio3iYVYXHTZkH0IaR08omt2M2IdnUpcGnkTrlnxdbkZICRDLVqr1hTw+uq+DgyUSi+ThPy5FgokU00MHQ=="; + url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.4.3.tgz"; + sha512 = "oD1yQFUpazobHUOOuWOIjng0iKYkB8IGx7w4XIA7Un3jqU2jGqiRT+nEy94KidAMOBjUcJp6GPBDqrTB6K8YoQ=="; }; }; - "cdktf-0.15.0" = { + "cdktf-0.15.2" = { name = "cdktf"; packageName = "cdktf"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.15.0.tgz"; - sha512 = "Dzv/pfJWTFzxMxjcgI3cttK7hPLy69bUPzcZgUK0sI+k3kY4I67pmxKuXDh1XVK9AX+pCaiZT7wzQbCznTrQkQ=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.15.2.tgz"; + sha512 = "1V8u4nMtcgwfHq7V7+a+VkotMDDZUk6JJQ7BKPZyraN7MfiBjkUQUQo9PYJQdRONABFugwyggjy1Aqw8dto7Vw=="; }; }; "center-align-0.1.3" = { @@ -22316,13 +23108,13 @@ let sha512 = "EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A=="; }; }; - "clean-css-5.3.1" = { + "clean-css-5.3.2" = { name = "clean-css"; packageName = "clean-css"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz"; - sha512 = "lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg=="; + url = "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz"; + sha512 = "JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww=="; }; }; "clean-git-ref-2.0.1" = { @@ -22361,13 +23153,13 @@ let sha512 = "LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg=="; }; }; - "clean-webpack-plugin-3.0.0" = { + "clean-webpack-plugin-4.0.0" = { name = "clean-webpack-plugin"; packageName = "clean-webpack-plugin"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz"; - sha512 = "MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A=="; + url = "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz"; + sha512 = "WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w=="; }; }; "clear-module-4.1.2" = { @@ -22982,15 +23774,6 @@ let sha512 = "2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="; }; }; - "cluster-key-slot-1.1.1" = { - name = "cluster-key-slot"; - packageName = "cluster-key-slot"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.1.tgz"; - sha512 = "rwHwUfXL40Chm1r08yrhU3qpUvdVlgkKNeyeGPOxnW8/SyVDvgRaed/Uz54AqWNaTCAThlj6QAs3TZcKI0xDEw=="; - }; - }; "cluster-key-slot-1.1.2" = { name = "cluster-key-slot"; packageName = "cluster-key-slot"; @@ -24269,13 +25052,13 @@ let sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; }; - "constructs-10.1.223" = { + "constructs-10.1.233" = { name = "constructs"; packageName = "constructs"; - version = "10.1.223"; + version = "10.1.233"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.1.223.tgz"; - sha512 = "m/+jkHuVZiHmGpEaNwoB3toYdKu/EOd9xVlZ0uYivnWm7uertOPSTXl/Z1f35DXY518ir8X0VBOREAjtIT4F/g=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.1.233.tgz"; + sha512 = "Km1hjAx2e303J5YH64PwTxESrJZG067p3egdneoC4kgr158V9ES+i3roeBTc9hjR0zyM2GEfS6jaVUibEi9VjQ=="; }; }; "consume-http-header-1.0.0" = { @@ -24810,6 +25593,15 @@ let sha512 = "3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w=="; }; }; + "copy-webpack-plugin-10.2.4" = { + name = "copy-webpack-plugin"; + packageName = "copy-webpack-plugin"; + version = "10.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz"; + sha512 = "xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg=="; + }; + }; "copy-webpack-plugin-5.1.2" = { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; @@ -24819,15 +25611,6 @@ let sha512 = "Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ=="; }; }; - "copy-webpack-plugin-6.0.4" = { - name = "copy-webpack-plugin"; - packageName = "copy-webpack-plugin"; - version = "6.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.4.tgz"; - sha512 = "zCazfdYAh3q/O4VzZFiadWGpDA2zTs6FC6D7YTHD6H1J40pzo0H4z22h1NYMCl4ArQP4CK8y/KWqPrJ4rVkZ5A=="; - }; - }; "cordova-app-hello-world-6.0.0" = { name = "cordova-app-hello-world"; packageName = "cordova-app-hello-world"; @@ -24891,15 +25674,6 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.25.3" = { - name = "core-js"; - packageName = "core-js"; - version = "3.25.3"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.25.3.tgz"; - sha512 = "y1hvKXmPHvm5B7w4ln1S4uc9eV/O5+iFExSRUimnvIph11uaizFR8LFMdONN8hG3P2pipUfX4Y/fR8rAEtcHcQ=="; - }; - }; "core-js-3.27.1" = { name = "core-js"; packageName = "core-js"; @@ -24909,22 +25683,22 @@ let sha512 = "GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww=="; }; }; - "core-js-compat-3.27.1" = { - name = "core-js-compat"; - packageName = "core-js-compat"; - version = "3.27.1"; + "core-js-3.27.2" = { + name = "core-js"; + packageName = "core-js"; + version = "3.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.1.tgz"; - sha512 = "Dg91JFeCDA17FKnneN7oCMz4BkQ4TcffkgHP4OWwp9yx3pi7ubqMDXXSacfNak1PQqjc95skyt+YBLHQJnkJwA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.27.2.tgz"; + sha512 = "9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w=="; }; }; - "core-js-pure-3.27.1" = { - name = "core-js-pure"; - packageName = "core-js-pure"; - version = "3.27.1"; + "core-js-compat-3.27.2" = { + name = "core-js-compat"; + packageName = "core-js-compat"; + version = "3.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.27.1.tgz"; - sha512 = "BS2NHgwwUppfeoqOXqi08mUqS5FiZpuRuJJpKsaME7kJz0xxuk0xkhDdfMIlP/zLa80krBqss1LtD7f889heAw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.27.2.tgz"; + sha512 = "welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg=="; }; }; "core-util-is-1.0.2" = { @@ -25179,13 +25953,13 @@ let sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw=="; }; }; - "create-gatsby-3.4.0" = { + "create-gatsby-3.5.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-3.4.0.tgz"; - sha512 = "WD9WtsXzqa+5vMBF56iiq8IGdJQT7TlWGYLv1qeM5jgK7tCCFxHnzHZ/MnvTnwspeKGRQuFgWpbrnSgD4YyQdA=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-3.5.0.tgz"; + sha512 = "wRLAkmKlJZNwNqVxXCgayAdvAtUjRKP8vr9ZRt2FYXyqZQmQtzXVDn8aekDlPs720z33HBajAYa+xCvl8pZhDA=="; }; }; "create-graphback-1.0.1" = { @@ -25674,6 +26448,24 @@ let sha512 = "M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ=="; }; }; + "css-loader-6.7.3" = { + name = "css-loader"; + packageName = "css-loader"; + version = "6.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz"; + sha512 = "qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ=="; + }; + }; + "css-minimizer-webpack-plugin-3.4.1" = { + name = "css-minimizer-webpack-plugin"; + packageName = "css-minimizer-webpack-plugin"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz"; + sha512 = "1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q=="; + }; + }; "css-modules-loader-core-1.1.0" = { name = "css-modules-loader-core"; packageName = "css-modules-loader-core"; @@ -26223,13 +27015,13 @@ let sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; }; }; - "d3-7.8.1" = { + "d3-7.8.2" = { name = "d3"; packageName = "d3"; - version = "7.8.1"; + version = "7.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/d3/-/d3-7.8.1.tgz"; - sha512 = "fdipulGWUYTZTxxU9gDJ2P4mpZL2u7Oqe6n2FI95Q8UY0AjbKNYjPHvhLOsvR+HcSao4vo3YYy4Bk9CWOrt1Vw=="; + url = "https://registry.npmjs.org/d3/-/d3-7.8.2.tgz"; + sha512 = "WXty7qOGSHb7HR7CfOzwN1Gw04MUOzN8qh9ZUsvwycIMb4DYMpY9xczZ6jUorGtO6bR9BPMPaueIKwiDxu9uiQ=="; }; }; "d3-array-3.1.1" = { @@ -26241,13 +27033,13 @@ let sha512 = "33qQ+ZoZlli19IFiQx4QEpf2CBEayMRzhlisJHSCsSUbDXv6ZishqS1x7uFVClKG4Wr7rZVHvaAttoLow6GqdQ=="; }; }; - "d3-array-3.2.1" = { + "d3-array-3.2.2" = { name = "d3-array"; packageName = "d3-array"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-3.2.1.tgz"; - sha512 = "gUY/qeHq/yNqqoCKNq4vtpFLdoCdvyNpWoC/KNjhGbhDuQpAM9sIQQKkXSNpXa9h5KySs/gzm7R88WkUutgwWQ=="; + url = "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz"; + sha512 = "yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ=="; }; }; "d3-axis-3.0.0" = { @@ -27888,6 +28680,15 @@ let sha512 = "JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg=="; }; }; + "dependency-path-9.2.8" = { + name = "dependency-path"; + packageName = "dependency-path"; + version = "9.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/dependency-path/-/dependency-path-9.2.8.tgz"; + sha512 = "S0OhIK7sIyAsph8hVH/LMCTDL3jozKtlrPx3dMQrlE2nAlXTquTT+AcOufphDMTQqLkfn4acvfiem9I1IWZ4jQ=="; + }; + }; "deprecation-2.3.1" = { name = "deprecation"; packageName = "deprecation"; @@ -28041,15 +28842,6 @@ let sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; }; }; - "detect-port-alt-1.1.6" = { - name = "detect-port-alt"; - packageName = "detect-port-alt"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz"; - sha512 = "5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q=="; - }; - }; "detective-4.7.1" = { name = "detective"; packageName = "detective"; @@ -28077,13 +28869,13 @@ let sha512 = "LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A=="; }; }; - "devtools-protocol-0.0.1068969" = { + "devtools-protocol-0.0.1082910" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.1068969"; + version = "0.0.1082910"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1068969.tgz"; - sha512 = "ATFTrPbY1dKYhPPvpjtwWKSK2mIwGmRwX54UASn9THEuIZCe2n9k3vVuMmt6jWeL+e5QaaguEv/pMyR+JQB7VQ=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1082910.tgz"; + sha512 = "RqoZ2GmqaNxyx+99L/RemY5CkwG9D0WEfOKxekwCRXOGrDCep62ngezEJUVMq6rISYQ+085fJnWDQqGHlxVNww=="; }; }; "devtools-protocol-0.0.981744" = { @@ -28230,13 +29022,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.4.29" = { + "diff2html-3.4.31" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.29"; + version = "3.4.31"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.29.tgz"; - sha512 = "xS7LQgUEd5ALH9X5TTPP8nnSmaa7mm+cAt5pZE5hSnEEvXSdoYBTStTkLBHOHJu9rZmGXs4jdFRsU8q90VfWkg=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.31.tgz"; + sha512 = "bgL4kUUChpBqyFykgalwXRXbeW+zCkGmoH4Ftw6+WFP5JccBUJPNMapfX2WDEb+KOLflrE7eJwvb5r8+zutetw=="; }; }; "diff3-0.0.3" = { @@ -28734,15 +29526,6 @@ let sha512 = "eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw=="; }; }; - "domhandler-3.3.0" = { - name = "domhandler"; - packageName = "domhandler"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz"; - sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; - }; - }; "domhandler-4.3.1" = { name = "domhandler"; packageName = "domhandler"; @@ -29564,6 +30347,15 @@ let sha512 = "AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="; }; }; + "encode-registry-3.0.0" = { + name = "encode-registry"; + packageName = "encode-registry"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/encode-registry/-/encode-registry-3.0.0.tgz"; + sha512 = "2fRYji8K6FwYuQ6EPBKR/J9mcqb7kIoNqt1vGvJr3NrvKfncRiNm00Oxo6gi/YJF8R5Sp2bNFSFdGKTG0rje1Q=="; + }; + }; "encode-utf8-1.0.3" = { name = "encode-utf8"; packageName = "encode-utf8"; @@ -30267,6 +31059,15 @@ let sha512 = "x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q=="; }; }; + "esbuild-0.16.17" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.16.17"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.16.17.tgz"; + sha512 = "G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg=="; + }; + }; "esbuild-android-64-0.14.47" = { name = "esbuild-android-64"; packageName = "esbuild-android-64"; @@ -30996,15 +31797,6 @@ let sha512 = "VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA=="; }; }; - "eslint-8.28.0" = { - name = "eslint"; - packageName = "eslint"; - version = "8.28.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.28.0.tgz"; - sha512 = "S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ=="; - }; - }; "eslint-8.32.0" = { name = "eslint"; packageName = "eslint"; @@ -31086,13 +31878,13 @@ let sha512 = "63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA=="; }; }; - "eslint-plugin-no-unsanitized-4.0.1" = { + "eslint-plugin-no-unsanitized-4.0.2" = { name = "eslint-plugin-no-unsanitized"; packageName = "eslint-plugin-no-unsanitized"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-4.0.1.tgz"; - sha512 = "y/lAMWnPPC7RYuUdxlEL/XiCL8FehN9h9s3Kjqbp/Kv0i9NZs+IXSC2kS546Fa4Bumwy31HlVS/OdWX0Kxb5Xg=="; + url = "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-4.0.2.tgz"; + sha512 = "Pry0S9YmHoz8NCEMRQh7N0Yexh2MYCNPIlrV52hTmS7qXnTghWsjXouF08bgsrrZqaW9tt1ZiK3j5NEmPE+EjQ=="; }; }; "eslint-plugin-prettier-3.4.1" = { @@ -31419,22 +32211,22 @@ let sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; }; - "estree-util-is-identifier-name-2.0.1" = { + "estree-util-is-identifier-name-2.1.0" = { name = "estree-util-is-identifier-name"; packageName = "estree-util-is-identifier-name"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.0.1.tgz"; - sha512 = "rxZj1GkQhY4x1j/CSnybK9cGuMFQYFPLq0iNyopqf14aOVLFtMv7Esika+ObJWPWiOHuMOAHz3YkWoLYYRnzWQ=="; + url = "https://registry.npmjs.org/estree-util-is-identifier-name/-/estree-util-is-identifier-name-2.1.0.tgz"; + sha512 = "bEN9VHRyXAUOjkKVQVvArFym08BTWB0aJPppZZr0UNyAqWsLaVfAqP7hbaTJjzHifmB5ebnR8Wm7r7yGN/HonQ=="; }; }; - "estree-util-visit-1.2.0" = { + "estree-util-visit-1.2.1" = { name = "estree-util-visit"; packageName = "estree-util-visit"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/estree-util-visit/-/estree-util-visit-1.2.0.tgz"; - sha512 = "wdsoqhWueuJKsh5hqLw3j8lwFqNStm92VcwtAOAny8g/KS/l5Y8RISjR4k5W6skCj3Nirag/WUCMS0Nfy3sgsg=="; + url = "https://registry.npmjs.org/estree-util-visit/-/estree-util-visit-1.2.1.tgz"; + sha512 = "xbgqcrkIVbIG+lI/gzbvd9SGTJL4zqJKBFttUl5pP27KhAjtMKbX/mQXJ7qgyXpMgVy/zvpm0xoQQaGL8OloOw=="; }; }; "estree-walker-0.6.1" = { @@ -31743,15 +32535,6 @@ let sha512 = "6hULIO5fmncZ3CVTInnySP/ZC+Sqfdbkrhg79VCp5PMFjZdaGW6vA57qyK6/NRMZOVAbXxfopuGgps+cxHy1Ow=="; }; }; - "eventsource-1.1.2" = { - name = "eventsource"; - packageName = "eventsource"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/eventsource/-/eventsource-1.1.2.tgz"; - sha512 = "xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA=="; - }; - }; "eventsource-2.0.2" = { name = "eventsource"; packageName = "eventsource"; @@ -32319,13 +33102,13 @@ let sha512 = "ytpHAAOQ/G5Nm7jyyEKzaoGiDhrUGPHeeJfyI2q7jii5dcPCLogf8EyWzSNcxAX8FZy1U6gfGY46SMmEhP3lMw=="; }; }; - "express-validator-6.14.2" = { + "express-validator-6.14.3" = { name = "express-validator"; packageName = "express-validator"; - version = "6.14.2"; + version = "6.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/express-validator/-/express-validator-6.14.2.tgz"; - sha512 = "8XfAUrQ6Y7dIIuy9KcUPCfG/uCbvREctrxf5EeeME+ulanJ4iiW71lWmm9r4YcKKYOCBMan0WpVg7FtHu4Z4Wg=="; + url = "https://registry.npmjs.org/express-validator/-/express-validator-6.14.3.tgz"; + sha512 = "c4b9NMdhskfcLbH/FchsSfCt4Vb14gKzcotG9zLS+VoOJDox57aGhCL+kmAu7cl+ytaSed+HD5jdJhel8DQsdg=="; }; }; "express-ws-2.0.0" = { @@ -32976,15 +33759,6 @@ let sha512 = "36frUeNww/TF3mMCSyLMjSy0BLD+ZURrmev6M/Tf1Q+Bu8K1Bk1tHJI9Uf2+di8oxe/38Xzo37Mi4EGaekbrAg=="; }; }; - "faye-websocket-0.10.0" = { - name = "faye-websocket"; - packageName = "faye-websocket"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; - sha512 = "Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ=="; - }; - }; "faye-websocket-0.11.4" = { name = "faye-websocket"; packageName = "faye-websocket"; @@ -33282,15 +34056,6 @@ let sha512 = "aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA=="; }; }; - "file-loader-6.0.0" = { - name = "file-loader"; - packageName = "file-loader"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz"; - sha512 = "/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ=="; - }; - }; "file-loader-6.2.0" = { name = "file-loader"; packageName = "file-loader"; @@ -33408,6 +34173,15 @@ let sha512 = "qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ=="; }; }; + "file-type-9.0.0" = { + name = "file-type"; + packageName = "file-type"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-9.0.0.tgz"; + sha512 = "Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw=="; + }; + }; "file-uri-to-path-1.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -33498,15 +34272,6 @@ let sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; - "filesize-6.1.0" = { - name = "filesize"; - packageName = "filesize"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-6.1.0.tgz"; - sha512 = "LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="; - }; - }; "filesize-6.4.0" = { name = "filesize"; packageName = "filesize"; @@ -33957,13 +34722,13 @@ let sha512 = "d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA=="; }; }; - "flow-parser-0.197.0" = { + "flow-parser-0.198.2" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.197.0"; + version = "0.198.2"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.197.0.tgz"; - sha512 = "yhwkJPxH1JBg0aJunk/jVRy5p3UhVZBGkzL1hq/GK+GaBh6bKr2YKkv6gDuiufaw+i3pKWQgOLtD++1cvrgXLA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.198.2.tgz"; + sha512 = "tCQzqXbRAz0ZadIhAXGwdp/xsusADo8IK9idgc/2qCK5RmazbKDGedyykfRtzWgy7Klt4f4NZxq0o/wFUg6plQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -33975,13 +34740,13 @@ let sha512 = "IZTB4kq5GK0DPp7sGQ0q/BWurGHffRtQQwVkiqDgeO6wYJLLV5ZhgNOQ65loZxxuPMKZKZcICCUnaGtlxBiR0Q=="; }; }; - "fluent-syntax-0.13.0" = { + "fluent-syntax-0.14.0" = { name = "fluent-syntax"; packageName = "fluent-syntax"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.13.0.tgz"; - sha512 = "0Bk1AsliuYB550zr4JV9AYhsETsD3ELXUQzdXGJfIc1Ni/ukAfBdQInDhVMYJUaT2QxoamNslwkYF7MlOrPUwg=="; + url = "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.14.0.tgz"; + sha512 = "+k8uXWfRpSrE33764RbpjIKMzIX6R9EnSjFBgaA1s0Mboc3KnW9sYe0c6vjIoZQY1C4Gst1VFvAOP6YGJjTJuA=="; }; }; "flumecodec-0.0.0" = { @@ -34254,15 +35019,6 @@ let sha512 = "DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ=="; }; }; - "fork-ts-checker-webpack-plugin-4.1.6" = { - name = "fork-ts-checker-webpack-plugin"; - packageName = "fork-ts-checker-webpack-plugin"; - version = "4.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz"; - sha512 = "DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw=="; - }; - }; "fork-ts-checker-webpack-plugin-7.2.14" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; @@ -35010,22 +35766,22 @@ let sha512 = "w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w=="; }; }; - "gatsby-core-utils-4.4.0" = { + "gatsby-core-utils-4.5.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-4.4.0.tgz"; - sha512 = "/ibilcGENKH6qqkcT17SIZgc2kjZn3HiGpD+ixbXYkMGqHiM5pj9XIHjy3DfvZvDt2ujkYV5EinmUdqx7CI81w=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-4.5.0.tgz"; + sha512 = "8ckCNXB7iasqLLoBTJLDzXwUcJ/cNUZVHo3+3cyMA9CLc8pfZiXtlp5qaOl0J+Q1qdorfENAnTvNEddXABfIZw=="; }; }; - "gatsby-telemetry-4.4.0" = { + "gatsby-telemetry-4.5.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-4.4.0.tgz"; - sha512 = "rcGMNa4fWIQSDqaUYjMXccrtVr71YQNzw01BfDZ6jxnSc7j29tZ8YXZZh+caS9Fc9cdLpQ2UabFcIp5vAtKQqA=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-4.5.0.tgz"; + sha512 = "0lus63TNQXjlr4IwCyxtW+m7eP6RkOpzLB+KJ1eohuCTVPFsmxhtr4N1Kjub/Ip0IG1RtzNA0LW0xPg7ykJa7g=="; }; }; "gauge-1.2.7" = { @@ -35280,13 +36036,13 @@ let sha512 = "Qkn9eq6tW5/q9BDVdMpB8tOHljX9OSP0jRC5TRNVA4qRc839t4g8KQaR8t0Uv0EFVL0MlyG7m/ofjEgAROtYsA=="; }; }; - "get-intrinsic-1.1.3" = { + "get-intrinsic-1.2.0" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; - sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; + sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; }; }; "get-package-info-1.0.0" = { @@ -35532,6 +36288,15 @@ let sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; }; }; + "gifwrap-0.9.4" = { + name = "gifwrap"; + packageName = "gifwrap"; + version = "0.9.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gifwrap/-/gifwrap-0.9.4.tgz"; + sha512 = "MDMwbhASQuVeD4JKd1fKgNgCRL3fGqMM4WaqpNhWO0JiMOAjbQdumbs4BbBZEy9/M00EHEjKN3HieVhCUlwjeQ=="; + }; + }; "git-clone-0.1.0" = { name = "git-clone"; packageName = "git-clone"; @@ -36154,13 +36919,13 @@ let sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; }; }; - "globals-13.19.0" = { + "globals-13.20.0" = { name = "globals"; packageName = "globals"; - version = "13.19.0"; + version = "13.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz"; - sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ=="; + url = "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz"; + sha512 = "Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ=="; }; }; "globals-9.18.0" = { @@ -36217,6 +36982,15 @@ let sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; + "globby-12.2.0" = { + name = "globby"; + packageName = "globby"; + version = "12.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz"; + sha512 = "wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA=="; + }; + }; "globby-13.1.3" = { name = "globby"; packageName = "globby"; @@ -36334,15 +37108,6 @@ let sha512 = "YSwLaGMOgSBx9roJlNLL12c+FRiw7VECphinc6mGucphc/ZxTHgdEz6gmJqH6NOzYEd/yr64hwjom5pZ+tJVpg=="; }; }; - "goldengate-12.0.1" = { - name = "goldengate"; - packageName = "goldengate"; - version = "12.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-12.0.1.tgz"; - sha512 = "Ku6nujmXs0JWj1/Z6ZLN7Mtq3S4inAW8JSv6EtsNRORCofJ8r8BlwxDDV3EDYfZvOmttc2JbnfGFtcKoXKz/BA=="; - }; - }; "goldengate-12.0.2" = { name = "goldengate"; packageName = "goldengate"; @@ -36613,15 +37378,6 @@ let sha512 = "vH2bsdjoJLQ33sZCquG1GyiFyK+Qk8n04NzqHLWTnY9l8lg08AGUyA8ZgeZHdi3I81nrdcGO13V9qYyP6sdshw=="; }; }; - "grammy-1.13.0" = { - name = "grammy"; - packageName = "grammy"; - version = "1.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/grammy/-/grammy-1.13.0.tgz"; - sha512 = "3C9ClsH05NogyZ68MXGDjS3rsieIWsEfx904CR48cfwG1m8fAgSLRi2HLuZOF6HPMEHsyYFwjtvOU312QcADdw=="; - }; - }; "grammy-1.13.1" = { name = "grammy"; packageName = "grammy"; @@ -36775,13 +37531,13 @@ let sha512 = "QUrX7R4htnTBTi83a0IlIilWVfiLEG8ANFlHRcxoZiTvOXTbgan67SUdGe1OlopbDuyNgtcy4ladl3Gvk4C36A=="; }; }; - "graphql-language-service-5.1.0" = { + "graphql-language-service-5.1.1" = { name = "graphql-language-service"; packageName = "graphql-language-service"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.1.0.tgz"; - sha512 = "APffigZ/l2me6soek+Yq5Us3HBwmfw4vns4QoqsTePXkK3knVO8rn0uAC6PmTyglb1pmFFPbYaRIzW4wmcnnGQ=="; + url = "https://registry.npmjs.org/graphql-language-service/-/graphql-language-service-5.1.1.tgz"; + sha512 = "gpaDT9E3+3eWhoqO4C81CGhkzr7Vp2jH/eq+ykoUbgfvMEpqhGTfCeNmrf+S4K/+4WTkAAJBsYT0/ZPZkqe/Hg=="; }; }; "graphql-language-service-interface-2.10.2" = { @@ -36802,13 +37558,13 @@ let sha512 = "duDE+0aeKLFVrb9Kf28U84ZEHhHcvTjWIT6dJbIAQJWBaDoht0D4BK9EIhd94I3DtKRc1JCJb2+70y1lvP/hiA=="; }; }; - "graphql-language-service-server-2.9.4" = { + "graphql-language-service-server-2.9.5" = { name = "graphql-language-service-server"; packageName = "graphql-language-service-server"; - version = "2.9.4"; + version = "2.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.9.4.tgz"; - sha512 = "26PediCh1HWP6vIwiqCCUkh1QzKoLVFeEX79SerI3ETsfCS4RYyFAX4SiiFPLj0JKKM8Xmg7OBjRgiwwa1AdYw=="; + url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.9.5.tgz"; + sha512 = "u4X6mgoB5ufp64h9vT5UsFgQZ8GsbIIGLHfr/vndujlVpY+iHml9ea1o8on2c9i1LpB/ILa2zF90pJkBQgASfg=="; }; }; "graphql-language-service-types-1.8.7" = { @@ -37477,6 +38233,15 @@ let sha512 = "WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="; }; }; + "hash-wasm-4.9.0" = { + name = "hash-wasm"; + packageName = "hash-wasm"; + version = "4.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-wasm/-/hash-wasm-4.9.0.tgz"; + sha512 = "7SW7ejyfnRxuOc7ptQHSf4LDoZaWOivfzqw+5rpcQku0nHfmicPKE51ra9BiRLAmT8+gGLestr1XroUkqdjL6w=="; + }; + }; "hash.js-1.1.7" = { name = "hash.js"; packageName = "hash.js"; @@ -38278,15 +39043,6 @@ let sha512 = "ADd49pudM157uWHwHQPUSX4ssMsvR/yHIswOR5CUfBdK9g9ZYGMhVSE6KZVHJ6kCkR0gH4htsfzU6zECDNVwyw=="; }; }; - "html-loader-1.1.0" = { - name = "html-loader"; - packageName = "html-loader"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-loader/-/html-loader-1.1.0.tgz"; - sha512 = "zwLbEgy+i7sgIYTlxI9M7jwkn29IvdsV6f1y7a2aLv/w8l1RigVk0PFijBZLLFsdi2gvL8sf2VJhTjLlfnK8sA=="; - }; - }; "html-minifier-3.5.21" = { name = "html-minifier"; packageName = "html-minifier"; @@ -38296,15 +39052,6 @@ let sha512 = "LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA=="; }; }; - "html-minifier-terser-5.1.1" = { - name = "html-minifier-terser"; - packageName = "html-minifier-terser"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; - sha512 = "ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg=="; - }; - }; "html-minifier-terser-6.1.0" = { name = "html-minifier-terser"; packageName = "html-minifier-terser"; @@ -38368,15 +39115,6 @@ let sha512 = "Br4ifmjQojUP4EmHnRBoUIYcZ9J7M4bTMcm7u6xoIAIuq2Nte4TzXX0533owvkQKQD1WeMTTTyD4Ni4QKxS0Bg=="; }; }; - "html-webpack-plugin-4.3.0" = { - name = "html-webpack-plugin"; - packageName = "html-webpack-plugin"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz"; - sha512 = "C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w=="; - }; - }; "html-webpack-plugin-5.5.0" = { name = "html-webpack-plugin"; packageName = "html-webpack-plugin"; @@ -38449,15 +39187,6 @@ let sha512 = "hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q=="; }; }; - "htmlparser2-4.1.0" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz"; - sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; - }; - }; "htmlparser2-6.1.0" = { name = "htmlparser2"; packageName = "htmlparser2"; @@ -38521,13 +39250,13 @@ let sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; }; }; - "http-cache-semantics-4.1.0" = { + "http-cache-semantics-4.1.1" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz"; - sha512 = "carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="; + url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; + sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; }; }; "http-call-5.3.0" = { @@ -39106,6 +39835,15 @@ let sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA=="; }; }; + "icss-utils-5.1.0" = { + name = "icss-utils"; + packageName = "icss-utils"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"; + sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="; + }; + }; "idb-keyval-6.2.0" = { name = "idb-keyval"; packageName = "idb-keyval"; @@ -39241,6 +39979,15 @@ let sha512 = "BZh721F2Q5TwBdwpiqrBrHEdj8daj8KuMZK/DOCyqQlz1CqFhhuZWbK5ZCUnAvFJr8LaKHTaWl9ja3/a3DC2Ew=="; }; }; + "image-q-4.0.0" = { + name = "image-q"; + packageName = "image-q"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/image-q/-/image-q-4.0.0.tgz"; + sha512 = "PfJGVgIfKQJuq3s0tTDOKtztksibuUEbJQIYT3by6wctQo+Rdlh7ef4evJ5NCdxY4CfMbvFkocEwbl4BF8RlJw=="; + }; + }; "image-size-0.5.5" = { name = "image-size"; packageName = "image-size"; @@ -39340,22 +40087,13 @@ let sha512 = "yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA=="; }; }; - "immer-8.0.1" = { + "immer-9.0.19" = { name = "immer"; packageName = "immer"; - version = "8.0.1"; + version = "9.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz"; - sha512 = "aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA=="; - }; - }; - "immer-9.0.18" = { - name = "immer"; - packageName = "immer"; - version = "9.0.18"; - src = fetchurl { - url = "https://registry.npmjs.org/immer/-/immer-9.0.18.tgz"; - sha512 = "eAPNpsj7Ax1q6Y/3lm2PmlwRcFzpON7HSNQ3ru5WQH1/PSpnyed/HpNOELl2CxLKoj4r+bAHgdyKqW5gc2Se1A=="; + url = "https://registry.npmjs.org/immer/-/immer-9.0.19.tgz"; + sha512 = "eY+Y0qcsB4TZKwgQzLaE/lqYMlKhv5J9dyd2RhhtGhNo2njPXDqU9XPfcNfa3MIDsdtZt5KlkIsirlo4dHsWdQ=="; }; }; "immutable-3.8.2" = { @@ -40231,15 +40969,6 @@ let sha512 = "CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw=="; }; }; - "invoices-2.2.2" = { - name = "invoices"; - packageName = "invoices"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/invoices/-/invoices-2.2.2.tgz"; - sha512 = "flSBneW7IYRS2K7eVoL6Uemo5LkXkv++6wul8ZBbDz48j3GSGb1pVLdHUo1nvU9+WGNU3/Pqq27r99okyCnHdQ=="; - }; - }; "invoices-2.2.3" = { name = "invoices"; packageName = "invoices"; @@ -40267,13 +40996,13 @@ let sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; - "ioredis-5.2.5" = { + "ioredis-5.3.0" = { name = "ioredis"; packageName = "ioredis"; - version = "5.2.5"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ioredis/-/ioredis-5.2.5.tgz"; - sha512 = "7HKo/ClM2DGLRXdFq8ruS3Uuadensz4A76wPOU0adqlOqd1qkhoLPDaBhmVhUhNGpB+J65/bhLmNB8DDY99HJQ=="; + url = "https://registry.npmjs.org/ioredis/-/ioredis-5.3.0.tgz"; + sha512 = "Id9jKHhsILuIZpHc61QkagfVdUj2Rag5GzG1TGEvRNeM7dtTOjICgjC+tvqYxi//PuX2wjQ+Xjva2ONBuf92Pw=="; }; }; "iota-array-1.0.0" = { @@ -40465,13 +41194,13 @@ let sha512 = "kniTIJmaZYiwa17eTtWIfm0K342seyugl6vuC8DiiyiRAJWAVlLkqGCI0Im0neo0TkXw+pRcKaBPRdcKHnQJ6Q=="; }; }; - "irregular-plurals-3.3.0" = { + "irregular-plurals-3.4.0" = { name = "irregular-plurals"; packageName = "irregular-plurals"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.3.0.tgz"; - sha512 = "MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g=="; + url = "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.4.0.tgz"; + sha512 = "YXxECO/W6N9aMBVKMKKZ8TXESgq7EFrp3emCGGUcrYY1cgJIeZjoB75MTu8qi+NAKntS9NwPU8VdcQ3r6E6aWQ=="; }; }; "is-3.3.0" = { @@ -42544,15 +43273,6 @@ let sha512 = "Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw=="; }; }; - "jest-worker-26.6.2" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "26.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"; - sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; - }; - }; "jest-worker-27.5.1" = { name = "jest-worker"; packageName = "jest-worker"; @@ -42562,6 +43282,15 @@ let sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg=="; }; }; + "jimp-0.16.2" = { + name = "jimp"; + packageName = "jimp"; + version = "0.16.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jimp/-/jimp-0.16.2.tgz"; + sha512 = "UpItBk81a92f8oEyoGYbO3YK4QcM0hoIyuGHmShoF9Ov63P5Qo7Q/X2xsAgnODmSuDJFOtrPtJd5GSWW4LKdOQ=="; + }; + }; "jimp-compact-0.16.1" = { name = "jimp-compact"; packageName = "jimp-compact"; @@ -42661,13 +43390,13 @@ let sha512 = "jnt9OC34sLXMLJ6YfPQ2ZEKrR9mB5ZbSnQb4LPaOx1c5rTzxpR33L18jjp0r75mGGTJmsil3qwN1B5IBeTnSSA=="; }; }; - "jose-4.11.1" = { + "jose-4.11.2" = { name = "jose"; packageName = "jose"; - version = "4.11.1"; + version = "4.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/jose/-/jose-4.11.1.tgz"; - sha512 = "YRv4Tk/Wlug8qicwqFNFVEZSdbROCHRAC6qu/i0dyNKr5JQdoa2pIGoS04lLO/jXQX7Z9omoNewYIVIxqZBd9Q=="; + url = "https://registry.npmjs.org/jose/-/jose-4.11.2.tgz"; + sha512 = "njj0VL2TsIxCtgzhO+9RRobBvws4oYyCM8TpvoUQwl/MbIM3NFJRR9+e6x0sS5xXaP1t6OCBkaBME98OV9zU5A=="; }; }; "joycon-3.1.1" = { @@ -42833,22 +43562,13 @@ let sha512 = "efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA=="; }; }; - "js-sdsl-4.1.4" = { + "js-sdsl-4.3.0" = { name = "js-sdsl"; packageName = "js-sdsl"; - version = "4.1.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz"; - sha512 = "Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw=="; - }; - }; - "js-sdsl-4.2.0" = { - name = "js-sdsl"; - packageName = "js-sdsl"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz"; - sha512 = "dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ=="; + url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz"; + sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="; }; }; "js-sha256-0.9.0" = { @@ -43157,13 +43877,13 @@ let sha512 = "UrXBaM/7jJldrlDN2aV/vaIurIZJM4ikJtcE/ugSoAuJUW42Hpi0Qd5k9MiSaE/k+KNxRpihS+skRa2TETT3Cg=="; }; }; - "jsii-srcmak-0.1.797" = { + "jsii-srcmak-0.1.807" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.797"; + version = "0.1.807"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.797.tgz"; - sha512 = "SF41dMMOlMYWHDrvJ0PgTPzHR+RGxoyUBk+kUaAazE2WaWINLqwFxeT5rbrrXqcYNQ/JiprlrES69TllyWVAVA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.807.tgz"; + sha512 = "K4Sri59N7ckh1jSxjdEG386xmJERx4uJgN2CszTA/w8EFMe9cg1xcTgOKyue2Q674xlhNhQleC1ON0wUv/bu7A=="; }; }; "json-bigint-1.0.0" = { @@ -43526,22 +44246,13 @@ let sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; - "json2csv-5.0.7" = { - name = "json2csv"; - packageName = "json2csv"; - version = "5.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/json2csv/-/json2csv-5.0.7.tgz"; - sha512 = "YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA=="; - }; - }; - "json2jsii-0.3.247" = { + "json2jsii-0.3.257" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.3.247"; + version = "0.3.257"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.247.tgz"; - sha512 = "0TJVNcWTd3dRYT1Zz9thhceNAEYnK/k7TIhwfmyWP1KaqdZq1tvxLOWkBrzQX6rIEXFU7l8EX6u+Y7bWXP/oFA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.257.tgz"; + sha512 = "viB1ukEAISc2TQS2uSmyrwLm8TS/zyAhsXwSj2nNC4UU43F+j7MK0SqloosTPiJVGBgB+3iSUDaMy5Rb5BV34g=="; }; }; "json3-3.2.6" = { @@ -43553,15 +44264,6 @@ let sha512 = "KA+GHhYTLTo7Ri4DyjwUgW8kn98AYtVZtBC94qL5yD0ZSYct8/eF8qBmTNyk+gPE578bKeIL4WBq+MUyd1I26g=="; }; }; - "json3-3.3.3" = { - name = "json3"; - packageName = "json3"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz"; - sha512 = "c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="; - }; - }; "json5-0.5.1" = { name = "json5"; packageName = "json5"; @@ -43931,13 +44633,13 @@ let sha512 = "xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g=="; }; }; - "jszip-3.7.1" = { + "jszip-3.8.0" = { name = "jszip"; packageName = "jszip"; - version = "3.7.1"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.7.1.tgz"; - sha512 = "ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.8.0.tgz"; + sha512 = "cnpQrXvFSLdsR9KR5/x7zdf6c3m8IhZfZzSblFEHSqBaVwD2nvJ4CuCKLyvKvwBgZm08CgfSoiTBQLm5WW9hGw=="; }; }; "junk-1.0.3" = { @@ -45200,15 +45902,6 @@ let sha512 = "BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA=="; }; }; - "lightning-6.8.0" = { - name = "lightning"; - packageName = "lightning"; - version = "6.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-6.8.0.tgz"; - sha512 = "HzcRq5n4zkGIXuGefFCoCjKIG/4IbpGESUyKA/+3UvfiGhtrKymRM8zoSFjWRFoaLaosR2P2SuKlrTyMfDmPHg=="; - }; - }; "lightning-7.0.3" = { name = "lightning"; packageName = "lightning"; @@ -45470,13 +46163,13 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "listr2-5.0.6" = { + "listr2-5.0.7" = { name = "listr2"; packageName = "listr2"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/listr2/-/listr2-5.0.6.tgz"; - sha512 = "u60KxKBy1BR2uLJNTWNptzWQ1ob/gjMzIJPZffAENzpZqbMZ/5PrXXOomDcevIS/+IB7s1mmCEtSlT2qHWMqag=="; + url = "https://registry.npmjs.org/listr2/-/listr2-5.0.7.tgz"; + sha512 = "MD+qXHPmtivrHIDRwPYdfNkrzqDiuaKU/rfBcec3WMyMF3xylQj3jMq344OtvQxz7zaCFViRAeqlr2AFhPvXHw=="; }; }; "livereload-0.9.3" = { @@ -45515,22 +46208,13 @@ let sha512 = "iBA0cb13CobBSoGJLfZgnrykLlfJipDAnvtf+YwIqqzBEsTeQYsXrHaSBkaHd5wCWeabwrNvhjZoFMUrlo+eLw=="; }; }; - "ln-accounting-6.1.2" = { + "ln-accounting-6.1.3" = { name = "ln-accounting"; packageName = "ln-accounting"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-6.1.2.tgz"; - sha512 = "fVYvNmwyOzqpxKRhcBV4itOYbGRKtjnml5sbmS6lGsS2ZNDZgmopx4/cxl+ZQG5dO8W7/MlSJD7I5MVmFXOrOw=="; - }; - }; - "ln-service-54.8.0" = { - name = "ln-service"; - packageName = "ln-service"; - version = "54.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-54.8.0.tgz"; - sha512 = "QNOek7A5BFKGiHlCYHQfIwhehtRyO/oFndeaSn/11x2cvo461pgJXyu/zQETCb4yhGZUa1v3LU1Lmk4bPqsvyw=="; + url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-6.1.3.tgz"; + sha512 = "8eQvvZb/MiYcRUlg/iIaamWSSTLBpLidLiviqmZ3enpnliW1JIA6pgXsbfyKSWPK3bdzqPuRGnQKQevXsTAybQ=="; }; }; "ln-service-54.9.0" = { @@ -45542,24 +46226,6 @@ let sha512 = "aeuRa5B3EhCJf6RL2m2oTK7luClU90Evhqp9RRWcfxngQZc2BSbw47fav63WaoXwA/o7/3tgy6y/1bCZ5UfzgA=="; }; }; - "ln-sync-4.1.0" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.1.0.tgz"; - sha512 = "N02s3tCvlyiTSmhJYoawDLqVmZ63Yk/7k27F+244J8kOorwLNrtAjcy8WHn+YnR44yreAph9xHwacU4Nr+VQuQ=="; - }; - }; - "ln-sync-4.1.1" = { - name = "ln-sync"; - packageName = "ln-sync"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.1.1.tgz"; - sha512 = "Y0XIPFizypuIUNzjwEJMz2eBkgH+7UepCUjwWiVurp61QpLqDNW73dq8/ittFO+mf9bIFqebmTeIiORh0DETFQ=="; - }; - }; "ln-sync-4.2.0" = { name = "ln-sync"; packageName = "ln-sync"; @@ -45569,13 +46235,22 @@ let sha512 = "yRQZ7nQOIa97p4vWeUo8iqGXX0nVMoROqA3PVm29RnW+AgKPk3sXtJ+LUDu+vMNkOauocrGz1vXS61Q+WNLutg=="; }; }; - "ln-telegram-4.6.0" = { + "ln-sync-4.3.0" = { + name = "ln-sync"; + packageName = "ln-sync"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-4.3.0.tgz"; + sha512 = "DQr68yZBk9QmcSKRJ9Nto6WxB2xjRS2XcUFSQXNDWkM+r9vMFCsqNUFU5IMVt/aLiKnf4PdKQ3mhfrvbH+TMuQ=="; + }; + }; + "ln-telegram-4.6.1" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-4.6.0.tgz"; - sha512 = "rNnNgYUsXEbkLjX20AwgsAa8JBi5U938/NadOLW4ro+gMdb36TprMe/qDX8jOyoiXRVJs+0re9vdQPbHmXBxVw=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-4.6.1.tgz"; + sha512 = "0zoS1dDGXKwT2ixtSxfWRJsHdcz7ap+PNoNB5KEB3vKeAR1fuGZAz1kr5lbKXGLK8Y8RaR/S/qK3hV8e5khfkg=="; }; }; "load-bmfont-1.4.1" = { @@ -45722,15 +46397,6 @@ let sha512 = "I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg=="; }; }; - "loader-utils-2.0.0" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"; - sha512 = "rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="; - }; - }; "loader-utils-2.0.4" = { name = "loader-utils"; packageName = "loader-utils"; @@ -48549,13 +49215,13 @@ let sha512 = "vTFXtmbbF3rgnTh3Zl3irso4LtvwUq/jaDvT2D1JqTGAwaipcS7RpTxzi6KjoRqI9n2yuAhzLDAC8xVTF3XYVQ=="; }; }; - "mdast-comment-marker-2.1.0" = { + "mdast-comment-marker-2.1.1" = { name = "mdast-comment-marker"; packageName = "mdast-comment-marker"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-2.1.0.tgz"; - sha512 = "/+Cfm8A83PjkqjQDB9iYqHESGuXlriCWAwRGPJjkYmxXrF4r6saxeUlOKNrf+SogTwg9E8uyHRCFHLG6/BAAdA=="; + url = "https://registry.npmjs.org/mdast-comment-marker/-/mdast-comment-marker-2.1.1.tgz"; + sha512 = "ktFfySmbRfOPiWoLkRKqkkyYkDnBVX5b5FqXwnvV1TmgVOl49ETsYK4hPKqrlM15y7AtxNDKIKwJRkZa3TWkng=="; }; }; "mdast-util-compact-2.0.1" = { @@ -48576,13 +49242,13 @@ let sha512 = "9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA=="; }; }; - "mdast-util-find-and-replace-2.2.1" = { + "mdast-util-find-and-replace-2.2.2" = { name = "mdast-util-find-and-replace"; packageName = "mdast-util-find-and-replace"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.1.tgz"; - sha512 = "SobxkQXFAdd4b5WmEakmkVoh18icjQRxGy5OWTCzgsLRm1Fu/KCtwD1HIQSsmq5ZRjVH0Ehwg6/Fn3xIUk+nKw=="; + url = "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.2.tgz"; + sha512 = "MTtdFRz/eMDHXzeK6W3dO7mXUlF82Gom4y0oOgvHhh/HXZAGvIQDUvQ0SuUx+j2tv44b8xTHOm8K/9OoRFnXKw=="; }; }; "mdast-util-footnote-0.1.7" = { @@ -48603,13 +49269,13 @@ let sha512 = "2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ=="; }; }; - "mdast-util-from-markdown-1.2.0" = { + "mdast-util-from-markdown-1.3.0" = { name = "mdast-util-from-markdown"; packageName = "mdast-util-from-markdown"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.2.0.tgz"; - sha512 = "iZJyyvKD1+K7QX1b5jXdE7Sc5dtoTry1vzV28UZZe8Z1xVnB/czKntJ7ZAkG0tANqRnBF6p3p7GpU1y19DTf2Q=="; + url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.0.tgz"; + sha512 = "HN3W1gRIuN/ZW295c7zi7g9lVBllMgZE40RxCX37wrTPWXCWtpvOZdfnuK+1WNpvZje6XuJeI3Wnb4TJEUem+g=="; }; }; "mdast-util-frontmatter-0.2.0" = { @@ -48621,13 +49287,13 @@ let sha512 = "FHKL4w4S5fdt1KjJCwB0178WJ0evnyyQr5kXTM3wrOVpytD0hrkvd+AOOjU9Td8onOejCkmZ+HQRT3CZ3coHHQ=="; }; }; - "mdast-util-frontmatter-1.0.0" = { + "mdast-util-frontmatter-1.0.1" = { name = "mdast-util-frontmatter"; packageName = "mdast-util-frontmatter"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-1.0.0.tgz"; - sha512 = "7itKvp0arEVNpCktOET/eLFAYaZ+0cNjVtFtIPxgQ5tV+3i+D4SDDTjTzPWl44LT59PC+xdx+glNTawBdF98Mw=="; + url = "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-1.0.1.tgz"; + sha512 = "JjA2OjxRqAa8wEG8hloD0uTU0kdn8kbtOWpPP94NBkfAlbxn4S8gCGf/9DwFtEeGPXrDcNXdiDjVaRdUFqYokw=="; }; }; "mdast-util-gfm-0.1.2" = { @@ -48666,13 +49332,13 @@ let sha512 = "FzopkOd4xTTBeGXhXSBU0OCDDh5lUj2rd+HQqG92Ld+jL4lpUfgX2AT2OHAVP9aEeDKp7G92fuooSZcYJA3cRg=="; }; }; - "mdast-util-gfm-footnote-1.0.1" = { + "mdast-util-gfm-footnote-1.0.2" = { name = "mdast-util-gfm-footnote"; packageName = "mdast-util-gfm-footnote"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.1.tgz"; - sha512 = "p+PrYlkw9DeCRkTVw1duWqPRHX6Ywh2BNKJQcZbCwAuP/59B0Lk9kakuAd7KbQprVO4GzdW8eS5++A9PUSqIyw=="; + url = "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-1.0.2.tgz"; + sha512 = "56D19KOGbE00uKVj3sgIykpwKL179QsVFwx/DCW0u/0+URsryacI4MAdNJl0dh+u2PSsD9FtxPFbHCzJ78qJFQ=="; }; }; "mdast-util-gfm-strikethrough-0.2.3" = { @@ -48720,13 +49386,13 @@ let sha512 = "/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A=="; }; }; - "mdast-util-gfm-task-list-item-1.0.1" = { + "mdast-util-gfm-task-list-item-1.0.2" = { name = "mdast-util-gfm-task-list-item"; packageName = "mdast-util-gfm-task-list-item"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.1.tgz"; - sha512 = "KZ4KLmPdABXOsfnM6JHUIjxEvcx2ulk656Z/4Balw071/5qgnhz+H1uGtf2zIGnrnvDC8xR4Fj9uKbjAFGNIeA=="; + url = "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-1.0.2.tgz"; + sha512 = "PFTA1gzfp1B1UaiJVyhJZA1rm0+Tzn690frc/L8vNX1Jop4STZgOE6bxUhnzdVSB+vm2GU1tIsuQcA9bxTQpMQ=="; }; }; "mdast-util-heading-style-1.0.6" = { @@ -48774,13 +49440,13 @@ let sha512 = "7N5ihsOkAEGjFotIX9p/YPdl4TqUoMxL4ajNz7PbT89BqsdWJuBC9rvgt6wpbwTZqWWR0jKWqQbwsOWDBUZv4g=="; }; }; - "mdast-util-phrasing-3.0.0" = { + "mdast-util-phrasing-3.0.1" = { name = "mdast-util-phrasing"; packageName = "mdast-util-phrasing"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-3.0.0.tgz"; - sha512 = "S+QYsDRLkGi8U7o5JF1agKa/sdP+CNGXXLqC17pdTVL8FHHgQEiwFGa9yE5aYtUxNiFGYoaDy9V1kC85Sz86Gg=="; + url = "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-3.0.1.tgz"; + sha512 = "WmI1gTXUBJo4/ZmSk79Wcb2HcjPJBzM1nlI/OUWA8yk2X9ik3ffNbBGsU+09BFmXaL1IBb9fiuvq6/KMiNycSg=="; }; }; "mdast-util-to-markdown-0.6.5" = { @@ -48837,13 +49503,13 @@ let sha512 = "AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w=="; }; }; - "mdast-util-to-string-3.1.0" = { + "mdast-util-to-string-3.1.1" = { name = "mdast-util-to-string"; packageName = "mdast-util-to-string"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz"; - sha512 = "n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA=="; + url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-3.1.1.tgz"; + sha512 = "tGvhT94e+cVnQt8JWE9/b3cUQZWS732TJxXHktvP+BYo62PpYD53Ls/6cC60rW21dW+txxiM4zMdc6abASvZKA=="; }; }; "mdmanifest-1.0.8" = { @@ -48990,6 +49656,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"; @@ -48999,13 +49674,13 @@ let sha512 = "yiAivd4xFOH/WXlUi6v/nKopBh1QLzwjFi36NK88cGt/PRXI8WeBASqY+YSjIVWvQTx3hR8zHKDBMV6hWmglNA=="; }; }; - "mem-fs-editor-9.5.0" = { + "mem-fs-editor-9.6.0" = { name = "mem-fs-editor"; packageName = "mem-fs-editor"; - version = "9.5.0"; + version = "9.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.5.0.tgz"; - sha512 = "7p+bBDqsSisO20YIZf2ntYvST27fFJINn7CKE21XdPUQDcLV62b/yB5sTOooQeEoiZ3rldZQ+4RfONgL/gbRoA=="; + url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.6.0.tgz"; + sha512 = "CsuAd+s0UPZnGzm3kQ5X7gGmVmwiX9XXRAmXj9Mbq0CJa8YWUkPqneelp0aG2g+7uiwCBHlJbl30FYtToLT3VQ=="; }; }; "memfs-3.4.13" = { @@ -49548,13 +50223,13 @@ let sha512 = "PpysK2S1Q/5VXi72IIapbi/jliaiOFzv7THH4amwXeYXLq3l1uo8/2Be0Ac1rEwK20MQEsGH2ltAZLNY2KI/0Q=="; }; }; - "micromark-extension-mdx-expression-1.0.3" = { + "micromark-extension-mdx-expression-1.0.4" = { name = "micromark-extension-mdx-expression"; packageName = "micromark-extension-mdx-expression"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-1.0.3.tgz"; - sha512 = "TjYtjEMszWze51NJCZmhv7MEBcgYRgb3tJeMAJ+HQCAaZHHRBaDCccqQzGizR/H4ODefP44wRTgOn2vE5I6nZA=="; + url = "https://registry.npmjs.org/micromark-extension-mdx-expression/-/micromark-extension-mdx-expression-1.0.4.tgz"; + sha512 = "TCgLxqW6ReQ3AJgtj1P0P+8ZThBTloLbeb7jNaqr6mCOLDpxUiBFE/9STgooMZttEwOQu5iEcCCa3ZSDhY9FGw=="; }; }; "micromark-extension-mdx-jsx-1.0.3" = { @@ -49611,13 +50286,13 @@ let sha512 = "CTIwxlOnU7dEshXDQ+dsr2n+yxpP0+fn271pu0bwDIS8uqfFcumXpj5mLn3hSC8iw2MUr6Gx8EcKng1dD7i6hg=="; }; }; - "micromark-factory-mdx-expression-1.0.6" = { + "micromark-factory-mdx-expression-1.0.7" = { name = "micromark-factory-mdx-expression"; packageName = "micromark-factory-mdx-expression"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.6.tgz"; - sha512 = "WRQIc78FV7KrCfjsEf/sETopbYjElh3xAmNpLkd1ODPqxEngP42eVRGbiPEQWpRV27LzqW+XVTvQAMIIRLPnNA=="; + url = "https://registry.npmjs.org/micromark-factory-mdx-expression/-/micromark-factory-mdx-expression-1.0.7.tgz"; + sha512 = "QAdFbkQagTZ/eKb8zDGqmjvgevgJH3+aQpvvKrXWxNJp3o8/l2cAbbrBd0E04r0Gx6nssPpqWIjnbHFvZu5qsQ=="; }; }; "micromark-factory-space-1.0.0" = { @@ -49710,13 +50385,13 @@ let sha512 = "U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA=="; }; }; - "micromark-util-events-to-acorn-1.2.0" = { + "micromark-util-events-to-acorn-1.2.1" = { name = "micromark-util-events-to-acorn"; packageName = "micromark-util-events-to-acorn"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-1.2.0.tgz"; - sha512 = "WWp3bf7xT9MppNuw3yPjpnOxa8cj5ACivEzXJKu0WwnjBYfzaBvIAT9KfeyI0Qkll+bfQtfftSwdgTH6QhTOKw=="; + url = "https://registry.npmjs.org/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-1.2.1.tgz"; + sha512 = "mkg3BaWlw6ZTkQORrKVBW4o9ICXPxLtGz51vml5mQpKFdo9vqIX68CAx5JhTOdjQyAHH7JFmm4rh8toSPQZUmg=="; }; }; "micromark-util-html-tag-name-1.1.0" = { @@ -50106,15 +50781,6 @@ let sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; }; }; - "mini-css-extract-plugin-0.5.0" = { - name = "mini-css-extract-plugin"; - packageName = "mini-css-extract-plugin"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz"; - sha512 = "IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw=="; - }; - }; "mini-css-extract-plugin-0.9.0" = { name = "mini-css-extract-plugin"; packageName = "mini-css-extract-plugin"; @@ -50124,6 +50790,15 @@ let sha512 = "lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A=="; }; }; + "mini-css-extract-plugin-2.7.2" = { + name = "mini-css-extract-plugin"; + packageName = "mini-css-extract-plugin"; + version = "2.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz"; + sha512 = "EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw=="; + }; + }; "mini-svg-data-uri-1.4.4" = { name = "mini-svg-data-uri"; packageName = "mini-svg-data-uri"; @@ -50601,6 +51276,15 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; + "mkdirp-2.1.3" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.3.tgz"; + sha512 = "sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw=="; + }; + }; "mkdirp-classic-0.5.3" = { name = "mkdirp-classic"; packageName = "mkdirp-classic"; @@ -51033,13 +51717,13 @@ let sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg=="; }; }; - "msgpackr-1.8.1" = { + "msgpackr-1.8.2" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.8.1"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.1.tgz"; - sha512 = "05fT4J8ZqjYlR4QcRDIhLCYKUOHXk7C/xa62GzMKj74l3up9k2QZ3LgFc6qWdsPHl91QA2WLWqWc8b8t7GLNNw=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.2.tgz"; + sha512 = "eLuPeok0DMwsGN23AvuVg32mYpx55tsQnxI87d8V1yZsdT8U5jrWhmCa1INO/joGAFQFfo/eTlM/BxVwLKbBOQ=="; }; }; "msgpackr-extract-2.2.0" = { @@ -51051,13 +51735,13 @@ let sha512 = "0YcvWSv7ZOGl9Od6Y5iJ3XnPww8O7WLcpYMDwX+PAA/uXLDtyw94PJv9GLQV/nnp3cWlDhMoyKZIQLrx33sWog=="; }; }; - "mssql-9.1.0" = { + "mssql-9.1.1" = { name = "mssql"; packageName = "mssql"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-9.1.0.tgz"; - sha512 = "rAsD7xfOkzSUqmNMoWX9YT43QfxbabIbrhEuf/PGRCzhWCzwHf25jxNgaoAwqT7vcb5/1irDCi6l6DG05ZGEEQ=="; + url = "https://registry.npmjs.org/mssql/-/mssql-9.1.1.tgz"; + sha512 = "m0yTx9xzUtTvJpWJHqknUXUDPRnJXZYOOFNygnNIXn1PBkLsC/rkXQdquObd+M0ZPlBhGC00Jg28zG0wCl7VWg=="; }; }; "multer-1.4.3" = { @@ -52159,13 +52843,13 @@ let sha512 = "R+1OJEmRl3ZOp9d8PbiRxGpnvmpi3jU+lzSqCJoLeogdEh0FYDRH1aC223qUbaKffxNTJkEfeDOeQfziw749yA=="; }; }; - "nlcst-is-literal-2.1.0" = { + "nlcst-is-literal-2.1.1" = { name = "nlcst-is-literal"; packageName = "nlcst-is-literal"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-2.1.0.tgz"; - sha512 = "jaEIXvIreWx4lfkRa+B3toTTxQgDxnECncbEQVSUVfRWxamQFbRHgxyfrt0aMnuoq5AMd3CQHl5SHGGruOUOdQ=="; + url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-2.1.1.tgz"; + sha512 = "/PyEKNHN+SrcrmnZRwszzZYbvZSN2AVD506+rfMUzyFHB0PtUmqZOdUuXmQxQeZXv6o29pT5chLjQJdC9weOCQ=="; }; }; "nlcst-normalize-2.1.5" = { @@ -52177,13 +52861,13 @@ let sha512 = "xSqTKv8IHIy3n/orD7wj81BZljLfbrTot0Pv64MYUnQUXfDbi1xDSpJR4qEmbFWyFoHsmivcOdgrK+o7ky3mcw=="; }; }; - "nlcst-normalize-3.1.0" = { + "nlcst-normalize-3.1.1" = { name = "nlcst-normalize"; packageName = "nlcst-normalize"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-3.1.0.tgz"; - sha512 = "kRWfUwtffmU26wPAJ25St5rec29PhV8F6dKaa7PxGhH3uytsGakfLyOEEm1mULzWOdfyDb03aE+OKp7h0OJuhA=="; + url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-3.1.1.tgz"; + sha512 = "Fz6DhC0dmsuqilkz0viOScT+u9UGjgUpSrzo6yOZlcQ24F/m2BuoVF72KUOKZ06dRUeWyPpCSMxI5ONop9Qptw=="; }; }; "nlcst-search-2.0.0" = { @@ -52195,13 +52879,13 @@ let sha512 = "+3xdctMFTcG+76vKAa0wObNg1EYq7IIQlZcL+HxSFXkHO1DgSPRjsPJrmelVIvMg7rk+wmBcdPEoScv/CTT1Zw=="; }; }; - "nlcst-search-3.1.0" = { + "nlcst-search-3.1.1" = { name = "nlcst-search"; packageName = "nlcst-search"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-3.1.0.tgz"; - sha512 = "d+0fXxF0d5oFAeeyuoGbIYcbiixE9Xt/lsmt491jjPyabXRoIRBE0++U+G8kbDyJFRk1bMQnGFpMCzeoMlDYfQ=="; + url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-3.1.1.tgz"; + sha512 = "0KsxSqFzSYWVDTo/SPde0RYf5LVmW1eAje8rbRJm+Lev1NzrWj2bIwtXfwGvfPbCi2ABsTV8bqmGAiF/EVqVWA=="; }; }; "nlcst-to-string-2.0.4" = { @@ -52213,13 +52897,13 @@ let sha512 = "3x3jwTd6UPG7vi5k4GEzvxJ5rDA7hVUIRNHPblKuMVP9Z3xmlsd9cgLcpAMkc5uPOBna82EeshROFhsPkbnTZg=="; }; }; - "nlcst-to-string-3.1.0" = { + "nlcst-to-string-3.1.1" = { name = "nlcst-to-string"; packageName = "nlcst-to-string"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-3.1.0.tgz"; - sha512 = "Y8HQWKw/zrHTCnu2zcFBN1dV6vN0NUG7s5fkEj380G8tF3R+vA2KG+tDl2QoHVQCTHGHVXwoni2RQkDSFQb1PA=="; + url = "https://registry.npmjs.org/nlcst-to-string/-/nlcst-to-string-3.1.1.tgz"; + sha512 = "63mVyqaqt0cmn2VcI2aH6kxe1rLAmSROqHMA0i4qqg1tidkfExgpb0FGMikMCn86mw5dFtBtEANfmSSK7TjNHw=="; }; }; "no-case-2.3.2" = { @@ -52267,13 +52951,13 @@ let sha512 = "eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ=="; }; }; - "node-abort-controller-3.0.1" = { + "node-abort-controller-3.1.1" = { name = "node-abort-controller"; packageName = "node-abort-controller"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.0.1.tgz"; - sha512 = "/ujIVxthRs+7q6hsdjHMaj8hRG9NuWmwrz+JdRwZ14jdFoKSkm+vDsCbF9PLpnSqjaWQJuTmVtcWHNLr+vrOFw=="; + url = "https://registry.npmjs.org/node-abort-controller/-/node-abort-controller-3.1.1.tgz"; + sha512 = "AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ=="; }; }; "node-addon-api-1.7.2" = { @@ -52627,13 +53311,13 @@ let sha512 = "qhCyQqrPpP93F/6Wc/xUR7L8mAJW0Z6R7HMQV8jCHHksAxNDe/4z4Un/H9CpLOT+5K39OPyt9tIQlavxWES3lg=="; }; }; - "node-html-parser-1.4.9" = { + "node-html-parser-5.4.2" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "1.4.9"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.9.tgz"; - sha512 = "UVcirFD1Bn0O+TSmloHeHqZZCxHjvtIeGdVdGMhyZ8/PWlEiZaZ5iJzR189yKZr8p0FXN58BUeC7RHRkf/KYGw=="; + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.2.tgz"; + sha512 = "RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw=="; }; }; "node-int64-0.4.0" = { @@ -52780,15 +53464,6 @@ let sha512 = "1J1tcV+zkCIy24n0rcJ/DSPSCziEgLGld+QBYk1rNESIo+gFyL5RMkCOcII2IrBTZF/kcDTElepMTCILXbMDfQ=="; }; }; - "node-releases-1.1.77" = { - name = "node-releases"; - packageName = "node-releases"; - version = "1.1.77"; - src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz"; - sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; - }; - }; "node-releases-2.0.8" = { name = "node-releases"; packageName = "node-releases"; @@ -53797,13 +54472,13 @@ let sha512 = "Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg=="; }; }; - "number-allocator-1.0.12" = { + "number-allocator-1.0.14" = { name = "number-allocator"; packageName = "number-allocator"; - version = "1.0.12"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.12.tgz"; - sha512 = "sGB0qoQGmKimery9JubBQ9pQUr1V/LixJAk3Ygp7obZf6mpSXime8d7XHEobbIimkdZpgjkNlLt6G7LPEWFYWg=="; + url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.14.tgz"; + sha512 = "OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA=="; }; }; "number-is-nan-1.0.1" = { @@ -53869,13 +54544,13 @@ let sha512 = "90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="; }; }; - "nx-15.5.2" = { + "nx-15.6.3" = { name = "nx"; packageName = "nx"; - version = "15.5.2"; + version = "15.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/nx/-/nx-15.5.2.tgz"; - sha512 = "jo8DG7zt0EorKL6AihkoshaeiFkK25NOeGUEnF05BFCaqsIoS9s3uctrOumh2G9DhaGMEWzakc3kF4/LeLB9pg=="; + url = "https://registry.npmjs.org/nx/-/nx-15.6.3.tgz"; + sha512 = "3t0A0GPLNen1yPAyE+VGZ3nkAzZYb5nfXtAcx8SHBlKq4u42yBY3khBmP1y4Og3jhIwFIj7J7Npeh8ZKrthmYQ=="; }; }; "nyc-15.1.0" = { @@ -55247,22 +55922,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.5.5" = { + "ot-builder-1.6.1" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.5.5.tgz"; - sha512 = "LRzFRcx8+33inNTAcyxHY9vS1mp17VMIU0DUW2aPZmIEYLvOGYrL2oQl0ePESg+QB0/D40GbQB7oO9Hi8fjJpA=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.6.1.tgz"; + sha512 = "08u12lm5A2S9c16/QTHs/ZvsZhQQe8BQEkSdU1D/u9gpKccBV1jadJNJHXfkZA7N/Y1Yn0dlh274J35YHX1RNQ=="; }; }; - "otb-ttc-bundle-1.5.5" = { + "otb-ttc-bundle-1.6.1" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.5.5"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.5.5.tgz"; - sha512 = "BG36gFUPVBYhM4cgsHrTBQYU+7wuV98rwjNHLBTCXaXK3lU9P1lM2mE7l1o/sG2tx9OxWwNUupE8/N+usyTnpw=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.6.1.tgz"; + sha512 = "UN/85A4UWU6w1fkzpLwN60nh6bxCcg8E8gtz+yhOmjOQEhZ8g40rQG2mqqoy7Dubkc1kzsehtzCjKrhzp+YWLA=="; }; }; "ow-0.21.0" = { @@ -55949,15 +56624,6 @@ let sha512 = "8EKVBxCRSvLnsX1p2LlSFSH3c2/wuhY9/BXXWu8boL78FbVKqn2L5SpURt1x5iw6Gq8PTqJ7MdPoe5nCtX3I+g=="; }; }; - "paid-services-4.2.1" = { - name = "paid-services"; - packageName = "paid-services"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-4.2.1.tgz"; - sha512 = "XguuYsT5jQ9QZPLeS/OrUnodpawCFf79oRB033synxe2RvZYIs8QH52PuPPqwT+dyHR8KvuI9QcdZayLVYOE+A=="; - }; - }; "paid-services-4.3.0" = { name = "paid-services"; packageName = "paid-services"; @@ -56336,15 +57002,6 @@ let sha512 = "Eg1OuNntBMH0ojvEKSrvDSnwLmvVuUOSdylH/pSCPNMIspLlweJyIWXCE+k/5hm3cj/EBUYwmWkjhBALNP4LXQ=="; }; }; - "parse-srcset-1.0.2" = { - name = "parse-srcset"; - packageName = "parse-srcset"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; - sha512 = "/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="; - }; - }; "parse-torrent-4.1.0" = { name = "parse-torrent"; packageName = "parse-torrent"; @@ -57110,13 +57767,13 @@ let sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; }; }; - "pg-8.8.0" = { + "pg-8.9.0" = { name = "pg"; packageName = "pg"; - version = "8.8.0"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz"; - sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw=="; + url = "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz"; + sha512 = "ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg=="; }; }; "pg-connection-string-2.5.0" = { @@ -57128,13 +57785,13 @@ let sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; }; }; - "pg-cursor-2.7.4" = { + "pg-cursor-2.8.0" = { name = "pg-cursor"; packageName = "pg-cursor"; - version = "2.7.4"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.7.4.tgz"; - sha512 = "CNWwOzTTZ9QvphoOL+Wg/7pmVr9GnAWBjPbuK2FRclrB4A/WRO/ssCJ9BlkzIGmmofK2M/LyokNHgsLSn+fMHA=="; + url = "https://registry.npmjs.org/pg-cursor/-/pg-cursor-2.8.0.tgz"; + sha512 = "LrOaEHK+R1C40e+xeri3FTRY/VKp9uTOCVsKtGB7LJ57qbeaphYvWjbVly8AesdT1GfHXYcAnVdExKhW7DKOvA=="; }; }; "pg-int8-1.0.1" = { @@ -57164,22 +57821,22 @@ let sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w=="; }; }; - "pg-protocol-1.5.0" = { + "pg-protocol-1.6.0" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; - sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz"; + sha512 = "M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="; }; }; - "pg-query-stream-4.2.4" = { + "pg-query-stream-4.3.0" = { name = "pg-query-stream"; packageName = "pg-query-stream"; - version = "4.2.4"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.2.4.tgz"; - sha512 = "Et3gTrWn4C2rj4LVioNq1QDd7aH/3mSJcBm79jZALv3wopvx9bWENtbOYZbHQ6KM+IkfFxs0JF1ZLjMDJ9/N6Q=="; + url = "https://registry.npmjs.org/pg-query-stream/-/pg-query-stream-4.3.0.tgz"; + sha512 = "+Eer4Y1e43rAaphFNu9/VJKn9nKTApFKCSwVtDjXYnuO4QYqWHOEkApmGJv8gvaU5T6fcuEtjsN24gk+Rx7X9A=="; }; }; "pg-types-1.13.0" = { @@ -57371,6 +58028,15 @@ let sha512 = "l9sA5uPxmZzwydhMWUcm1gI0YxNnYl8MfSr2h8cwLvOAzQLBLewzF247h/vqHe3/tt6fgtXeG9wdjjoetdI/vA=="; }; }; + "pino-8.8.0" = { + name = "pino"; + packageName = "pino"; + version = "8.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pino/-/pino-8.8.0.tgz"; + sha512 = "cF8iGYeu2ODg2gIwgAHcPrtR63ILJz3f7gkogaHC/TXVVXxZgInmNYiIpDYEwgEkxZti2Se6P2W2DxlBIZe6eQ=="; + }; + }; "pino-abstract-transport-1.0.0" = { name = "pino-abstract-transport"; packageName = "pino-abstract-transport"; @@ -57911,15 +58577,6 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.19" = { - name = "postcss"; - packageName = "postcss"; - version = "8.4.19"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz"; - sha512 = "h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA=="; - }; - }; "postcss-8.4.21" = { name = "postcss"; packageName = "postcss"; @@ -58271,6 +58928,15 @@ let sha512 = "LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ=="; }; }; + "postcss-modules-extract-imports-3.0.0" = { + name = "postcss-modules-extract-imports"; + packageName = "postcss-modules-extract-imports"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; + sha512 = "bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="; + }; + }; "postcss-modules-local-by-default-1.2.0" = { name = "postcss-modules-local-by-default"; packageName = "postcss-modules-local-by-default"; @@ -58298,6 +58964,15 @@ let sha512 = "e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw=="; }; }; + "postcss-modules-local-by-default-4.0.0" = { + name = "postcss-modules-local-by-default"; + packageName = "postcss-modules-local-by-default"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; + sha512 = "sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ=="; + }; + }; "postcss-modules-scope-1.1.0" = { name = "postcss-modules-scope"; packageName = "postcss-modules-scope"; @@ -58316,6 +58991,15 @@ let sha512 = "YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ=="; }; }; + "postcss-modules-scope-3.0.0" = { + name = "postcss-modules-scope"; + packageName = "postcss-modules-scope"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; + sha512 = "hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg=="; + }; + }; "postcss-modules-values-1.3.0" = { name = "postcss-modules-values"; packageName = "postcss-modules-values"; @@ -58343,6 +59027,15 @@ let sha512 = "1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg=="; }; }; + "postcss-modules-values-4.0.0" = { + name = "postcss-modules-values"; + packageName = "postcss-modules-values"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; + sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ=="; + }; + }; "postcss-nested-6.0.0" = { name = "postcss-nested"; packageName = "postcss-nested"; @@ -59855,15 +60548,6 @@ let sha512 = "aC9j+BZsRSSzEsXBNBwDnAxujdx19HycZoKgRgzWnS8eOHg1asuf9heuLprfbe739zY3IdUQx+Egv6Jn135WHA=="; }; }; - "prompts-2.4.0" = { - name = "prompts"; - packageName = "prompts"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz"; - sha512 = "awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ=="; - }; - }; "prompts-2.4.2" = { name = "prompts"; packageName = "prompts"; @@ -59999,6 +60683,15 @@ let sha512 = "4ZPTPkXCdel3+L81yw3dG6+Kq3umdWKh7Dc7GW/CpNk4SX3hK58iPCWeCyhVTDrbkNeKrYNZ7EojM5WDaEWTLQ=="; }; }; + "protobufjs-7.2.0" = { + name = "protobufjs"; + packageName = "protobufjs"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.0.tgz"; + sha512 = "hYCqTDuII4iJ4stZqiuGCSU8xxWl5JeXYpwARGtn/tWcKCAro6h3WQz+xpsNbXW0UYqpmTQFEyFWO0G0Kjt64g=="; + }; + }; "protobufjs-cli-1.0.2" = { name = "protobufjs-cli"; packageName = "protobufjs-cli"; @@ -60116,15 +60809,6 @@ let sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="; }; }; - "psbt-2.7.1" = { - name = "psbt"; - packageName = "psbt"; - version = "2.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/psbt/-/psbt-2.7.1.tgz"; - sha512 = "qFnvwdQcDoQBHHi3jYVVX+W98CRTbyeQs3RlUdAIzdEVbwBHEcv1+xhVaEJHrYiF75n7L+i6roDmZHIXT6tDSQ=="; - }; - }; "psbt-2.7.2" = { name = "psbt"; packageName = "psbt"; @@ -60998,13 +61682,13 @@ let sha512 = "jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="; }; }; - "punycode-2.2.0" = { + "punycode-2.3.0" = { name = "punycode"; packageName = "punycode"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-2.2.0.tgz"; - sha512 = "LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw=="; + url = "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz"; + sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; }; }; "pupa-2.1.1" = { @@ -61043,22 +61727,22 @@ let sha512 = "U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA=="; }; }; - "puppeteer-19.5.2" = { + "puppeteer-19.6.2" = { name = "puppeteer"; packageName = "puppeteer"; - version = "19.5.2"; + version = "19.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.5.2.tgz"; - sha512 = "xlqRyrhXhVH114l79Y0XqYXUVG+Yfw4sKlvN55t8Y9DxtA5fzI1uqF8SVXbWK5DUMbD6Jo4lpixTZCTTZGD05g=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-19.6.2.tgz"; + sha512 = "Y5OAXXwXLfJYbl0dEFg8JKIhvCGxn+UYaBW9yra9ErmIhkVroDnYusM6oYxJCt/YIfC2pQWhvhxoZyf/E5fV6w=="; }; }; - "puppeteer-core-19.5.2" = { + "puppeteer-core-19.6.2" = { name = "puppeteer-core"; packageName = "puppeteer-core"; - version = "19.5.2"; + version = "19.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.5.2.tgz"; - sha512 = "Rqk+3kqM+Z2deooTYqcYt8lRtGffJdifWa9td9nbJSjhANWsFouk8kLBNUKycewCCFHM8TZUKS0x28OllavW2A=="; + url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-19.6.2.tgz"; + sha512 = "il7uK658MNC1FlxPABvcnv1RdpDa9CaBFHzvtEsl+9Y4tbAJKZurkegpcvWeIWcRYGiuBIVo+t+ZSh3G82CCjw=="; }; }; "purgecss-2.3.0" = { @@ -61133,13 +61817,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.290" = { + "pyright-1.1.291" = { name = "pyright"; packageName = "pyright"; - version = "1.1.290"; + version = "1.1.291"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.290.tgz"; - sha512 = "iHT8G2+R/GUfYWxxd4ud5Lj/0H0bE1eWVR0avKKgPtkBeLkUz3sorjKpfuaJdsuJNrunzMtZsmYPD366t39klg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.291.tgz"; + sha512 = "wkSlCEhF1OwtJqHuifwxk76UMr1NPqsAbPIlCh7tiZx8VUdZs17NCGNorhyb2M+GFEvp8pod9Xyu1LXN1JL2kQ=="; }; }; "q-0.9.7" = { @@ -61547,31 +62231,31 @@ let sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; }; }; - "quicktype-core-20.0.26" = { + "quicktype-core-21.0.4" = { name = "quicktype-core"; packageName = "quicktype-core"; - version = "20.0.26"; + version = "21.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-20.0.26.tgz"; - sha512 = "B+VGYa6adM0kZq6yhnwmAMeGMnHEFMjJbHRZQidPmTCbnzeY2cNuxDIhNV6JbPzyt+o8c+fZ/DkYMefWJynIHQ=="; + url = "https://registry.npmjs.org/quicktype-core/-/quicktype-core-21.0.4.tgz"; + sha512 = "JJiJ8dzBTh/l/gTNnVwKFx0g2A0CfLNzXlUxTHjdvyldXi/Jjckr+Z04calGXxlG8KunpE4G5vV+EtuFjoTIPQ=="; }; }; - "quicktype-graphql-input-20.0.26" = { + "quicktype-graphql-input-21.0.4" = { name = "quicktype-graphql-input"; packageName = "quicktype-graphql-input"; - version = "20.0.26"; + version = "21.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-20.0.26.tgz"; - sha512 = "AbvJp7g0Xbjb5jl3nP/go4GZ93vogky0HcEjDhzted/LCCSQK4tHYMPFECKcqtW7nxk0OB7/f9BEj5aZNHLvPg=="; + url = "https://registry.npmjs.org/quicktype-graphql-input/-/quicktype-graphql-input-21.0.4.tgz"; + sha512 = "WXHcXL2d2HLfihbJBsJvBhzDc8sAkR5cNF6Y36R9p1eY3b0PKKmdbdHSFif/SkW9HAVP0DyP8/6rskFLU5Z9KA=="; }; }; - "quicktype-typescript-input-20.0.26" = { + "quicktype-typescript-input-21.0.4" = { name = "quicktype-typescript-input"; packageName = "quicktype-typescript-input"; - version = "20.0.26"; + version = "21.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-20.0.26.tgz"; - sha512 = "OieJhc77M8mb3yEqZHQMF9LmzD3/6j8P1Khs4A1dTJT44lQAs6R3tK6EAIIF/5cfyXyOMGD3d3N7Ou6NoT0OfQ=="; + url = "https://registry.npmjs.org/quicktype-typescript-input/-/quicktype-typescript-input-21.0.4.tgz"; + sha512 = "Lc0dwFZUk+dRL95sjb2iNS92GsvuwVaXQQyPJ5y4RPXm15ASTdSE3U8U94ySy2QwhNOnsv23WkkCyrxDdvk0sg=="; }; }; "quotation-1.1.3" = { @@ -61925,15 +62609,6 @@ let sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; }; }; - "rc-config-loader-3.0.0" = { - name = "rc-config-loader"; - packageName = "rc-config-loader"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rc-config-loader/-/rc-config-loader-3.0.0.tgz"; - sha512 = "bwfUSB37TWkHfP+PPjb/x8BUjChFmmBK44JMfVnU7paisWqZl/o5k7ttCH+EQLnrbn2Aq8Fo1LAsyUiz+WF4CQ=="; - }; - }; "rc-config-loader-4.1.2" = { name = "rc-config-loader"; packageName = "rc-config-loader"; @@ -62006,15 +62681,6 @@ let sha512 = "gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA=="; }; }; - "react-dev-utils-11.0.4" = { - name = "react-dev-utils"; - packageName = "react-dev-utils"; - version = "11.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz"; - sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; - }; - }; "react-devtools-core-4.27.1" = { name = "react-devtools-core"; packageName = "react-devtools-core"; @@ -62051,15 +62717,6 @@ let sha512 = "FlsPxavEyMuR6TjVbSSywovXSEyOg6ZDj5+Z8nbsRl9EkOzAhEIcS+GLoQDC5fz/t9suhUXWmUrOBrgeUvrMxw=="; }; }; - "react-error-overlay-6.0.11" = { - name = "react-error-overlay"; - packageName = "react-error-overlay"; - version = "6.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz"; - sha512 = "/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="; - }; - }; "react-error-overlay-6.0.9" = { name = "react-error-overlay"; packageName = "react-error-overlay"; @@ -62744,15 +63401,6 @@ let sha512 = "4xod0yBv9Cvm9MXNjrSC/mi8RjrIMMMMRUVMs3I3uOGH5nEHf4gqN1+8ziIPL50qtPSybhcLSwXu6St1TBaqTA=="; }; }; - "recursive-readdir-2.2.2" = { - name = "recursive-readdir"; - packageName = "recursive-readdir"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz"; - sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; - }; - }; "recursive-readdir-2.2.3" = { name = "recursive-readdir"; packageName = "recursive-readdir"; @@ -62843,13 +63491,13 @@ let sha512 = "bCR0gKVhIXFg8zCQjXEANzgI01DDixtPZgIUZHBCmwqixnu+MK3Tb2yqGjh+HCLASQVVgApiwhNkv+FoedZOGQ=="; }; }; - "redis-4.5.1" = { + "redis-4.6.2" = { name = "redis"; packageName = "redis"; - version = "4.5.1"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-4.5.1.tgz"; - sha512 = "oxXSoIqMJCQVBTfxP6BNTCtDMyh9G6Vi5wjdPdV/sRKkufyZslDqCScSGcOr6XGR/reAWZefz7E4leM31RgdBA=="; + url = "https://registry.npmjs.org/redis/-/redis-4.6.2.tgz"; + sha512 = "Xoh7UyU6YnT458xA8svaZAJu6ZunKeW7Z/7GXrLWGGwhVLTsDX6pr3u7ENAoV+DHBPO+9LwIu45ClwUwpIjAxw=="; }; }; "redis-commands-1.7.0" = { @@ -64868,6 +65516,15 @@ let sha512 = "4LMcbvBonVhsufIwa7Po+HhK0rznNyvQxIG/14/wTm7W88eFQy1jU+T7i5afaWOQ53czEJlaI3ua9pzZtqXE0w=="; }; }; + "rfc4648-1.5.2" = { + name = "rfc4648"; + packageName = "rfc4648"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rfc4648/-/rfc4648-1.5.2.tgz"; + sha512 = "tLOizhR6YGovrEBLatX1sdcuhoSCXddw3mqNVAcKxGJ+J0hFeJ+SjeWCv5UPA/WU3YzWPPuCVYgXBKZUPGpKtg=="; + }; + }; "rfdc-1.3.0" = { name = "rfdc"; packageName = "rfdc"; @@ -64895,15 +65552,6 @@ let sha512 = "zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg=="; }; }; - "rgbcolor-1.0.1" = { - name = "rgbcolor"; - packageName = "rgbcolor"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz"; - sha512 = "9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw=="; - }; - }; "right-align-0.1.3" = { name = "right-align"; packageName = "right-align"; @@ -64976,6 +65624,15 @@ let sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; }; + "rimraf-4.1.2" = { + name = "rimraf"; + packageName = "rimraf"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-4.1.2.tgz"; + sha512 = "BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ=="; + }; + }; "ripemd160-2.0.2" = { name = "ripemd160"; packageName = "ripemd160"; @@ -66623,15 +67280,6 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; - "shell-quote-1.7.2" = { - name = "shell-quote"; - packageName = "shell-quote"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz"; - sha512 = "mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="; - }; - }; "shell-quote-1.7.3" = { name = "shell-quote"; packageName = "shell-quote"; @@ -66830,13 +67478,13 @@ let sha512 = "fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="; }; }; - "sign-addon-5.1.0" = { + "sign-addon-5.2.0" = { name = "sign-addon"; packageName = "sign-addon"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-5.1.0.tgz"; - sha512 = "fag/csbsw25WpW+G+uWE6rRImSjlfwQNjuP28fFhvXpfW+kXccxl/o1QEW+hXtTidwpysksb7Y0B8UCeMkYkSA=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-5.2.0.tgz"; + sha512 = "t5CZ4MSKAd3uJBUfjgWfSyKYC1pQS6BMUbgI5OytzMkTOQ9NkdkFE8bB0AJLQIGqDrNS2b1+/ghAP56iuCUE+g=="; }; }; "signal-exit-3.0.7" = { @@ -67595,22 +68243,13 @@ let sha512 = "j3kk71QLJuyQ/hh5F/L2t1goqzdTL0gvDzuhTuNSwihfuFUrcSji0qFZmJJPtG6Rmug153eOPsUizeirf1IIog=="; }; }; - "socket.io-parser-4.2.1" = { + "socket.io-parser-4.2.2" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz"; - sha512 = "V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g=="; - }; - }; - "sockjs-0.3.20" = { - name = "sockjs"; - packageName = "sockjs"; - version = "0.3.20"; - src = fetchurl { - url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz"; - sha512 = "SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.2.tgz"; + sha512 = "DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw=="; }; }; "sockjs-0.3.24" = { @@ -67622,15 +68261,6 @@ let sha512 = "GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="; }; }; - "sockjs-client-1.4.0" = { - name = "sockjs-client"; - packageName = "sockjs-client"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz"; - sha512 = "5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g=="; - }; - }; "sockjs-client-1.6.1" = { name = "sockjs-client"; packageName = "sockjs-client"; @@ -67802,6 +68432,15 @@ let sha512 = "R5ocFmKZQFfSTstfOtHjJuAwbpGyf9qjQa1egyhvXSbM7emjrtLXtGdZsDJDABC85YBfVvrOiGWKSYXPKdvP1g=="; }; }; + "sorcery-0.11.0" = { + name = "sorcery"; + packageName = "sorcery"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sorcery/-/sorcery-0.11.0.tgz"; + sha512 = "J69LQ22xrQB1cIFJhPfgtLuI6BpWRiWu1Y3vSsIwK/eAScqJxd/+CJlUuHQRdX2C9NGFamq+KqNywGgaThwfHw=="; + }; + }; "sort-json-2.0.1" = { name = "sort-json"; packageName = "sort-json"; @@ -67955,6 +68594,15 @@ let sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; }; }; + "source-map-loader-3.0.2" = { + name = "source-map-loader"; + packageName = "source-map-loader"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz"; + sha512 = "BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg=="; + }; + }; "source-map-resolve-0.5.3" = { name = "source-map-resolve"; packageName = "source-map-resolve"; @@ -69135,15 +69783,6 @@ let sha512 = "XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ=="; }; }; - "stackblur-canvas-2.5.0" = { - name = "stackblur-canvas"; - packageName = "stackblur-canvas"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz"; - sha512 = "EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ=="; - }; - }; "stackframe-1.3.4" = { name = "stackframe"; packageName = "stackframe"; @@ -70116,15 +70755,6 @@ let 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-ansi-6.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -70449,15 +71079,6 @@ let sha512 = "XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg=="; }; }; - "style-loader-1.2.1" = { - name = "style-loader"; - packageName = "style-loader"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/style-loader/-/style-loader-1.2.1.tgz"; - sha512 = "ByHSTQvHLkWE9Ir5+lGbVOXhxX10fbprhLvdg96wedFZb4NDekDPxVKv5Fwmio+QcMlkkNfuK+5W1peQ5CUhZg=="; - }; - }; "style-loader-3.3.1" = { name = "style-loader"; packageName = "style-loader"; @@ -70917,13 +71538,13 @@ let sha512 = "S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ=="; }; }; - "svelte-preprocess-5.0.0" = { + "svelte-preprocess-5.0.1" = { name = "svelte-preprocess"; packageName = "svelte-preprocess"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.0.0.tgz"; - sha512 = "q7lpa7i2FBu8Pa+G0MmuQQWETBwCKgsGmuq1Sf6n8q4uaG9ZLcLP0Y+etC6bF4sE6EbLxfiI38zV6RfPe3RSfg=="; + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.0.1.tgz"; + sha512 = "0HXyhCoc9rsW4zGOgtInylC6qj259E1hpFnJMJWTf+aIfeqh4O/QHT31KT2hvPEqQfdjmqBR/kO2JDkkciBLrQ=="; }; }; "svelte2tsx-0.6.0" = { @@ -70944,15 +71565,6 @@ let sha512 = "aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg=="; }; }; - "svg-pathdata-5.0.5" = { - name = "svg-pathdata"; - packageName = "svg-pathdata"; - version = "5.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-5.0.5.tgz"; - sha512 = "TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow=="; - }; - }; "svg-tags-1.0.0" = { name = "svg-tags"; packageName = "svg-tags"; @@ -70962,13 +71574,13 @@ let sha512 = "ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA=="; }; }; - "svg2img-0.9.4" = { + "svg2img-1.0.0-beta.2" = { name = "svg2img"; packageName = "svg2img"; - version = "0.9.4"; + version = "1.0.0-beta.2"; src = fetchurl { - url = "https://registry.npmjs.org/svg2img/-/svg2img-0.9.4.tgz"; - sha512 = "1XquM9CorP9Em58gS9NjTaKpoRrIBM4gSSGSOHnoU70Y4AB3D+vILbdcHfvyGcLJ80IdYTbcpznp8NVNKkCedQ=="; + url = "https://registry.npmjs.org/svg2img/-/svg2img-1.0.0-beta.2.tgz"; + sha512 = "Tq05Q0HTXDJZM+9ub9HCPPDbui2VavugF+/H9b1Ur9ykXbPsSUPFeXFZdDlutvDsVWZO8JjHKRdT3grpNSwwSg=="; }; }; "svgo-0.6.6" = { @@ -71214,13 +71826,13 @@ let sha512 = "dJp4qg+x4JwSEW1HibAuMi0IIrBI3wuQr2GimmqB7OXR50wmwzfdusG+p39R9w3R6aFtZ2mzvxvWKQ3Bd/vx3g=="; }; }; - "synckit-0.8.4" = { + "synckit-0.8.5" = { name = "synckit"; packageName = "synckit"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/synckit/-/synckit-0.8.4.tgz"; - sha512 = "Dn2ZkzMdSX827QbowGbU/4yjWuvNaCoScLLoMo/yKbu+P4GBR6cRGKZH27k6a9bRzdqcyd1DE96pQtQ6uNkmyw=="; + url = "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz"; + sha512 = "L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q=="; }; }; "syntax-error-1.4.0" = { @@ -71232,13 +71844,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.17.3" = { + "systeminformation-5.17.4" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.17.3"; + version = "5.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.17.3.tgz"; - sha512 = "IAmnUJdeFUWqY+YneAWJ9rceTdRRIaTiwspvd1B6SG7yhqpxLrSosHgGZKiE8lcaBlBYpLQpY3BRLtus4n8PNQ=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.17.4.tgz"; + sha512 = "mEiIYrw7X5ABX8tJUgzbumQAuFQxNyHdZDz6+UtwNKUbKgIoZqLtug2z1spFB/LiXZne5tdPBJOlvVckbvfhiQ=="; }; }; "sywac-1.3.0" = { @@ -71791,15 +72403,6 @@ let sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="; }; }; - "terser-webpack-plugin-3.1.0" = { - name = "terser-webpack-plugin"; - packageName = "terser-webpack-plugin"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.1.0.tgz"; - sha512 = "cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA=="; - }; - }; "terser-webpack-plugin-5.3.6" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; @@ -71881,13 +72484,13 @@ let sha512 = "MeqZRHLuaGamUXGuVn2ivtU3LA3mLCCIO5kUGoohTCoGmCBg/+8yPhWVX9WSl9telvVd8erftjFk9Fwb2dD6rw=="; }; }; - "textlint-12.5.1" = { + "textlint-13.0.4" = { name = "textlint"; packageName = "textlint"; - version = "12.5.1"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.5.1.tgz"; - sha512 = "LoFU1yBIm/gxM++jDdvdfS2diW14NBHsimRyChi8Kb5h5pUHcG0rGfW2PflUzfYcHF0XykgW9WBdPd1WWnyS7Q=="; + url = "https://registry.npmjs.org/textlint/-/textlint-13.0.4.tgz"; + sha512 = "XBPK+cRMYLY3NodKoCFMncmVJRk59S+aSgkwpdNnV8VXFo1hF0EEysbwEp9s8ov0LhVO8flfd51/L+VlUFeTlg=="; }; }; "textlint-rule-helper-1.2.0" = { @@ -71899,22 +72502,22 @@ let sha512 = "yJmVbmyuUPOndKsxOijpx/G7mwybXXf4M10U2up0BeIZSN+6drUl+aSKAoC+RUHY7bG4ogLwRcmWoNG1lSrRIQ=="; }; }; - "textlint-rule-helper-2.2.4" = { + "textlint-rule-helper-2.3.0" = { name = "textlint-rule-helper"; packageName = "textlint-rule-helper"; - version = "2.2.4"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-helper/-/textlint-rule-helper-2.2.4.tgz"; - sha512 = "aQDn83+L6uG8tA6IjAsfFLWxR0/OJg51/C0k6OxNuGJnn/rgQnX+6Lh/bWh9dJ0RmOIQk7VkZ1uHUny5PXkjwQ=="; + url = "https://registry.npmjs.org/textlint-rule-helper/-/textlint-rule-helper-2.3.0.tgz"; + sha512 = "Ug78Saahb/qVImttL0NSFyT5/JJ5wXvOPepR2pYAjNi54BsQAAz/hAyyEgKuYeR0+yjFb0KPhby4f880X5vqHA=="; }; }; - "textlint-tester-12.5.0" = { + "textlint-tester-12.6.1" = { name = "textlint-tester"; packageName = "textlint-tester"; - version = "12.5.0"; + version = "12.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-tester/-/textlint-tester-12.5.0.tgz"; - sha512 = "4BKh/eWCc73T6mvBwXz1q53gbzCm+S0iHet2nmOQWF9aEbGkVnLbFbEKNdPiayAJ5tugIdvpfT/5iUb1RXDjeg=="; + url = "https://registry.npmjs.org/textlint-tester/-/textlint-tester-12.6.1.tgz"; + sha512 = "4O8hrXNb0BUePg+yvueWdR+ViXC8R7RgUcmo+56iU28pgqcrAjSEpz2YGpbsSF54wlyxJuP4v98whgjlEJtCmw=="; }; }; "textlint-util-to-string-3.1.1" = { @@ -72295,6 +72898,15 @@ let sha512 = "b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ=="; }; }; + "timm-1.7.1" = { + name = "timm"; + packageName = "timm"; + version = "1.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/timm/-/timm-1.7.1.tgz"; + sha512 = "IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw=="; + }; + }; "timsort-0.3.0" = { name = "timsort"; packageName = "timsort"; @@ -73456,6 +74068,15 @@ let sha512 = "tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA=="; }; }; + "tslib-2.5.0" = { + name = "tslib"; + packageName = "tslib"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"; + sha512 = "336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="; + }; + }; "tslint-5.20.1" = { name = "tslint"; packageName = "tslint"; @@ -73861,15 +74482,6 @@ let sha512 = "RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="; }; }; - "type-fest-3.4.0" = { - name = "type-fest"; - packageName = "type-fest"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-3.4.0.tgz"; - sha512 = "PEPg6RHlB9cFwoTMNENNrQFL0cXX04voWr2UPwQBJ3pVs7Mt8Y1oLWdUeMdGEwZE8HFFlujq8gS9enmyiQ8pLg=="; - }; - }; "type-fest-3.5.1" = { name = "type-fest"; packageName = "type-fest"; @@ -73879,13 +74491,13 @@ let sha512 = "70T99cpILFk2fzwuljwWxmazSphFrdOe3gRHbp6bqs71pxFBbJwFqnmkLO2lQL6aLHxHmYAnP/sL+AJWpT70jA=="; }; }; - "type-fest-3.5.2" = { + "type-fest-3.5.3" = { name = "type-fest"; packageName = "type-fest"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-3.5.2.tgz"; - sha512 = "Ph7S4EhXzWy0sbljEuZo0tTNoLl+K2tPauGrQpcwUWrOVneLePTuhVzcuzVJJ6RU5DsNwQZka+8YtkXXU4z9cA=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-3.5.3.tgz"; + sha512 = "V2+og4j/rWReWvaFrse3s9g2xvUv/K9Azm/xo6CjIuq7oeGqsoimC7+9/A3tfvNcbQf8RPSVj/HV81fB4DJrjA=="; }; }; "type-is-1.6.18" = { @@ -74050,15 +74662,6 @@ let sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; }; }; - "typescript-4.8.4" = { - name = "typescript"; - packageName = "typescript"; - version = "4.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz"; - sha512 = "QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="; - }; - }; "typescript-4.9.4" = { name = "typescript"; packageName = "typescript"; @@ -74140,13 +74743,13 @@ let sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="; }; }; - "typo-geom-0.12.1" = { + "typo-geom-0.13.0" = { name = "typo-geom"; packageName = "typo-geom"; - version = "0.12.1"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.12.1.tgz"; - sha512 = "W20RYp2OCEGMhEYayR0cAP67AUWiGRUufMs6Clul7MAmu5SpLuOG/RWk7+LkL65wsugcfhPQlFEJ231C2xHNQg=="; + url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.13.0.tgz"; + sha512 = "s7BV1wSA+kcv2kNjJXrXgl9By8BGqwRu1llbxfkv45McR/ZyxWOFXUgTMUZdUFn79UQuVc0yzKisrj8XzkR27A=="; }; }; "u2f-api-0.2.7" = { @@ -74185,13 +74788,13 @@ let sha512 = "+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ=="; }; }; - "ua-parser-js-0.7.32" = { + "ua-parser-js-0.7.33" = { name = "ua-parser-js"; packageName = "ua-parser-js"; - version = "0.7.32"; + version = "0.7.33"; src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.32.tgz"; - sha512 = "f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw=="; + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.33.tgz"; + sha512 = "s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw=="; }; }; "ua-parser-js-1.0.2" = { @@ -74545,13 +75148,13 @@ let sha512 = "UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw=="; }; }; - "undici-5.15.0" = { + "undici-5.16.0" = { name = "undici"; packageName = "undici"; - version = "5.15.0"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.15.0.tgz"; - sha512 = "wCAZJDyjw9Myv+Ay62LAoB+hZLPW9SmKbQkbHIhMw/acKSlpn7WohdMUc/Vd4j1iSMBO0hWwU8mjB7a5p5bl8g=="; + url = "https://registry.npmjs.org/undici/-/undici-5.16.0.tgz"; + sha512 = "KWBOXNv6VX+oJQhchXieUznEmnJMqgXMbs0xxH2t8q/FUAWSJvOSr/rMaZKnX5RIVq7JDn0JbP4BOnKG2SGXLQ=="; }; }; "undici-5.9.1" = { @@ -74995,13 +75598,13 @@ let sha512 = "fPNWewS593JSmg49HbnE86BJKuBi1/nMWhDSccBvbARfxezEuJV85EaARR9/VplveiwCoLm2kWq+DhP8TBaDpw=="; }; }; - "unist-util-inspect-7.0.1" = { + "unist-util-inspect-7.0.2" = { name = "unist-util-inspect"; packageName = "unist-util-inspect"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-7.0.1.tgz"; - sha512 = "gEPeSrsYXus8012VJ00p9uZC8D0iogtLLiHlBgvS61hU22KNKduQhMKezJm83viHlLf3TYS2y9SDEFglWPDMKw=="; + url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-7.0.2.tgz"; + sha512 = "Op0XnmHUl6C2zo/yJCwhXQSm/SmW22eDZdWP2qdf4WpGrgO1ZxFodq+5zFyeRGasFjJotAnLgfuD1jkcKqiH1Q=="; }; }; "unist-util-is-2.1.3" = { @@ -75031,13 +75634,13 @@ let sha512 = "ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg=="; }; }; - "unist-util-is-5.1.1" = { + "unist-util-is-5.2.0" = { name = "unist-util-is"; packageName = "unist-util-is"; - version = "5.1.1"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.1.1.tgz"; - sha512 = "F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ=="; + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-5.2.0.tgz"; + sha512 = "Glt17jWwZeyqrFqOK0pF1Ded5U3yzJnFr8CG1GMjCWTp9zDo2p+cmD6pWbZU8AgM5WU3IzRv6+rBwhzsGh6hBQ=="; }; }; "unist-util-map-1.0.5" = { @@ -75067,13 +75670,13 @@ let sha512 = "HGrj7JQo9DwZt8XFsX8UD4gGqOsIlCih9opG6Y+N11XqkBGKzHo8cvDi+MfQQgiZ7zXRUiQREYHhjOBHERTMdg=="; }; }; - "unist-util-modify-children-3.1.0" = { + "unist-util-modify-children-3.1.1" = { name = "unist-util-modify-children"; packageName = "unist-util-modify-children"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-3.1.0.tgz"; - sha512 = "L0UizdncPZ1NIwpmkwFdLo2NaK2Eb5LU/vaQ7lZGkAaOBZfsHp+8T/gVWPVmmMO1hj6gc+XeMoytut8jr7fdyA=="; + url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-3.1.1.tgz"; + sha512 = "yXi4Lm+TG5VG+qvokP6tpnk+r1EPwyYL04JWDxLvgvPV40jANh7nm3udk65OOWquvbMDe+PL9+LmkxDpTv/7BA=="; }; }; "unist-util-position-3.1.0" = { @@ -75085,22 +75688,22 @@ let sha512 = "w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA=="; }; }; - "unist-util-position-4.0.3" = { + "unist-util-position-4.0.4" = { name = "unist-util-position"; packageName = "unist-util-position"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.3.tgz"; - sha512 = "p/5EMGIa1qwbXjA+QgcBXaPWjSnZfQ2Sc3yBEEfgPwsEmJd8Qh+DSk3LGnmOM4S1bY2C0AjmMnB8RuEYxpPwXQ=="; + url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-4.0.4.tgz"; + sha512 = "kUBE91efOWfIVBo8xzh/uZQ7p9ffYRtUbMRZBNFYwf0RK8koUMx6dGUfwylLOKmaT2cs4wSW96QoYUSXAyEtpg=="; }; }; - "unist-util-position-from-estree-1.1.1" = { + "unist-util-position-from-estree-1.1.2" = { name = "unist-util-position-from-estree"; packageName = "unist-util-position-from-estree"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-position-from-estree/-/unist-util-position-from-estree-1.1.1.tgz"; - sha512 = "xtoY50b5+7IH8tFbkw64gisG9tMSpxDjhX9TmaJJae/XuxQ9R/Kc8Nv1eOsf43Gt4KV/LkriMy9mptDr7XLcaw=="; + url = "https://registry.npmjs.org/unist-util-position-from-estree/-/unist-util-position-from-estree-1.1.2.tgz"; + sha512 = "poZa0eXpS+/XpoQwGwl79UUdea4ol2ZuCYguVaJS4qzIOMDzbqz8a3erUCOmubSZkaOuGamb3tX790iwOIROww=="; }; }; "unist-util-remove-position-2.0.1" = { @@ -75112,13 +75715,13 @@ let sha512 = "fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA=="; }; }; - "unist-util-remove-position-4.0.1" = { + "unist-util-remove-position-4.0.2" = { name = "unist-util-remove-position"; packageName = "unist-util-remove-position"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-4.0.1.tgz"; - sha512 = "0yDkppiIhDlPrfHELgB+NLQD5mfjup3a8UYclHruTJWmY74je8g+CIFr79x5f6AkmzSwlvKLbs63hC0meOMowQ=="; + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-4.0.2.tgz"; + sha512 = "TkBb0HABNmxzAcfLf4qsIbFbaPDvMO6wa3b3j4VcEzFVaw1LBKwnW4/sRJ/atSLSzoIg41JWEdnE7N6DIhGDGQ=="; }; }; "unist-util-stringify-position-1.1.2" = { @@ -75139,13 +75742,13 @@ let sha512 = "3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g=="; }; }; - "unist-util-stringify-position-3.0.2" = { + "unist-util-stringify-position-3.0.3" = { name = "unist-util-stringify-position"; packageName = "unist-util-stringify-position"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.2.tgz"; - sha512 = "7A6eiDCs9UtjcwZOcCpM4aPII3bAAGv13E96IkawkOAW0OhH+yRxtY0lzo8KiHpzEMfH7Q+FizUmwp8Iqy5EWg=="; + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-3.0.3.tgz"; + sha512 = "k5GzIBZ/QatR8N5X2y+drfpWG8IDBzdnVj6OInRNWm1oXrzydiaAT2OQiA8DPRRZyAKb9b6I2a6PxYklZD0gKg=="; }; }; "unist-util-to-list-of-char-0.1.3" = { @@ -75184,13 +75787,13 @@ let sha512 = "Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA=="; }; }; - "unist-util-visit-4.1.1" = { + "unist-util-visit-4.1.2" = { name = "unist-util-visit"; packageName = "unist-util-visit"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.1.tgz"; - sha512 = "n9KN3WV9k4h1DxYR1LoajgN93wpEi/7ZplVe02IoB4gH5ctI1AaF2670BLHQYbwj+pY83gFtyeySFiyMHJklrg=="; + url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-4.1.2.tgz"; + sha512 = "MSd8OUGISqHdVvfY9TPhyK2VdUrPgxkUtWSuMHF6XAAFuL4LokseigBnZtPnJMu+FbynTkFNnFlyjxpVKujMRg=="; }; }; "unist-util-visit-children-1.1.4" = { @@ -75202,13 +75805,13 @@ let sha512 = "sA/nXwYRCQVRwZU2/tQWUqJ9JSFM1X3x7JIOsIgSzrFHcfVt6NkzDtKzyxg2cZWkCwGF9CO8x4QNZRJRMK8FeQ=="; }; }; - "unist-util-visit-children-2.0.1" = { + "unist-util-visit-children-2.0.2" = { name = "unist-util-visit-children"; packageName = "unist-util-visit-children"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-2.0.1.tgz"; - sha512 = "2cEU3dhV1hMfO9ajwb8rJsDedMfsahsm6fCfR8LxDR/w7KcB5lzHQ9dBTQIXsWGNWBFH5MPmaFP3Xh0dWLqClQ=="; + url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-2.0.2.tgz"; + sha512 = "+LWpMFqyUwLGpsQxpumsQ9o9DG2VGLFrpz+rpVXYIEdPy57GSy5HioC0g3bg/8WP9oCLlapQtklOzQ8uLS496Q=="; }; }; "unist-util-visit-parents-2.1.2" = { @@ -75238,13 +75841,13 @@ let sha512 = "1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw=="; }; }; - "unist-util-visit-parents-5.1.1" = { + "unist-util-visit-parents-5.1.3" = { name = "unist-util-visit-parents"; packageName = "unist-util-visit-parents"; - version = "5.1.1"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.1.tgz"; - sha512 = "gks4baapT/kNRaWxuGkl5BIhoanZo7sC/cUT/JToSRNL1dYoXRFl75d++NkjYk4TAu2uv2Px+l8guMajogeuiw=="; + url = "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-5.1.3.tgz"; + sha512 = "x6+y8g7wWMyQhL1iZfhIPhDAs7Xwbn9nRosDXl7qoPTSCy0yNxnKc+hWokFifWQIDGi154rdUqKvbCa4+1kLhg=="; }; }; "universal-analytics-0.5.3" = { @@ -75670,13 +76273,13 @@ let sha512 = "Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="; }; }; - "urkel-1.0.2" = { + "urkel-1.0.3" = { name = "urkel"; packageName = "urkel"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/urkel/-/urkel-1.0.2.tgz"; - sha512 = "Y5UXbgBr6pczrD08N0SYJkWjtdtTTpmZsOvuftdrEHLnTjuxwSNjKsXYLQkICTptvnHAJ2OjI6XdAxtYTyOHew=="; + url = "https://registry.npmjs.org/urkel/-/urkel-1.0.3.tgz"; + sha512 = "L2M46WWSaz1LpyUYFgnQg7WSOWtNcRx3uH+4GwHK1jbmYj6phLuIwirTVMlhfcZ0o/CWn5Y04UWLhmlvijZiDg=="; }; }; "url-0.10.3" = { @@ -75742,15 +76345,6 @@ let sha512 = "goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog=="; }; }; - "url-loader-4.1.1" = { - name = "url-loader"; - packageName = "url-loader"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz"; - sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; - }; - }; "url-parse-1.5.10" = { name = "url-parse"; packageName = "url-parse"; @@ -75922,13 +76516,13 @@ let sha512 = "vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q=="; }; }; - "utf-8-validate-6.0.0" = { + "utf-8-validate-6.0.2" = { name = "utf-8-validate"; packageName = "utf-8-validate"; - version = "6.0.0"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.0.tgz"; - sha512 = "OCJuwxQsnG51swYmNloViggxNOFO/leOZpnb/vVeoastJbrzrZZU7lGsYlUcdkCl9nsBu2nkKLjpljb3Ckvb/Q=="; + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.2.tgz"; + sha512 = "yd7PQEOW+EgecUzSD7XUXTyq/vREGXk7t7fzGfOvwOAr0Z64h5rfGrmkNk8+ddVmf/FrkjPPhVyYBa7fuSPVTg=="; }; }; "utf7-1.0.2" = { @@ -75985,6 +76579,15 @@ let sha512 = "Rv9/OsKlBgMlLGai2EAoVheIbdBlndMunkXH4BuU81R2+Nky24I670OdGIb+NMpCbuHGyKjk9OQ7hdyOxuNXgw=="; }; }; + "utif-2.0.1" = { + name = "utif"; + packageName = "utif"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utif/-/utif-2.0.1.tgz"; + sha512 = "Z/S1fNKCicQTf375lIP9G8Sa1H/phcysstNrrSdZKj1f9g58J4NMgb5IgiEZN9/nLMPDwF0W7hdOe9Qq2IYoLg=="; + }; + }; "util-0.10.3" = { name = "util"; packageName = "util"; @@ -77227,13 +77830,13 @@ let sha512 = "jWi+297PJUUWTHwlcrZz0zIuEXuHOBJIQMapXmEzbosWGv/gMnNSAMV4hTKnl5wzxvZKZzV6j+WFdrSlKQ5qnw=="; }; }; - "vscode-css-languageservice-6.2.1" = { + "vscode-css-languageservice-6.2.3" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "6.2.1"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.1.tgz"; - sha512 = "FMaMjB2LQdkHjTCP2CWh2S94xuGsxSc8xr0H9nAACVd/iUDyZLoKFjwoB+mA3v0rpCH2U5vVCVwxyULy61CgqA=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.3.tgz"; + sha512 = "EAyhyIVHpEaf+GjtI+tVe7SekdoANfG0aubnspsQwak3Qkimn/97FpAufNyXk636ngW05pjNKAR9zyTCzo6avQ=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -77254,13 +77857,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-html-languageservice-5.0.3" = { + "vscode-html-languageservice-5.0.4" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.3.tgz"; - sha512 = "6rfrtcHhXDMXmC5pR2WXrx02HiNCzQDynOBMn+53zLxr2hvZrDzoc0QgC0FaFGfcglf7GeOsfhkWvJBFC/a70g=="; + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.4.tgz"; + sha512 = "tvrySfpglu4B2rQgWGVO/IL+skvU7kBkQotRlxA7ocSyRXOZUd6GA13XHkxo8LPe07KWjeoBlN1aVGqdfTK4xA=="; }; }; "vscode-json-languageservice-3.11.0" = { @@ -77290,13 +77893,13 @@ let sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA=="; }; }; - "vscode-json-languageservice-5.1.3" = { + "vscode-json-languageservice-5.1.4" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "5.1.3"; + version = "5.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.1.3.tgz"; - sha512 = "p0O1Ql5+zyWFIBU4cSxnDcuq9OnbE0MmvNKDYYvz4EPsZ9EHBT3I6KJb5Gk3snkj+jQTFILEZ06cfY7WZxxqPw=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.1.4.tgz"; + sha512 = "ROZ1ezYQUbq9b/07xYpHtZSyyhoUk3oTTGVAEr6bU1DKr8ELaz9fsDoHno34tKtHj/Tf3deQqfjQNGKdbRuvTw=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -78109,13 +78712,13 @@ let sha512 = "/lRBpLn2TvEwrIW5i35ZCpb+SIq4VWq4c1yxN311we+E4eXRW7EB5nybrv4fJEuBmgqyqVkT2gtQ6Zqu+u66mA=="; }; }; - "wavedrom-2.9.1" = { + "wavedrom-3.1.1" = { name = "wavedrom"; packageName = "wavedrom"; - version = "2.9.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/wavedrom/-/wavedrom-2.9.1.tgz"; - sha512 = "IPv1bKVwh4Zo8dMMQfnNy4KFqU/v0buoPDwLkTrtHE2nr0dV4pHqryhWpqNCSUm7xTWroER+nE5xRkng96xLUA=="; + url = "https://registry.npmjs.org/wavedrom/-/wavedrom-3.1.1.tgz"; + sha512 = "+6w4AvzsD+yHVP/mEYzn2sQ1VKn0UZNEt4QeO4X74cxEt8NhZOB+fxfHrUkbArfyC32AhhbTd5ZtD8RtBChA0Q=="; }; }; "wawoff2-2.0.1" = { @@ -78244,6 +78847,15 @@ let sha512 = "flC9JJmTII9uAeeYpWF8hxDJ7bfY+leldQryetll8Nv4WgI+MXc6h7TiyAZASWl9uC9TvmfdgOjZn1DAQecb3A=="; }; }; + "web-vitals-0.2.4" = { + name = "web-vitals"; + packageName = "web-vitals"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/web-vitals/-/web-vitals-0.2.4.tgz"; + sha512 = "6BjspCO9VriYy12z356nL6JBS0GYeEcA457YyRzD+dD6XYCQ75NKhcOHUMHentOE7OcVCIXXDvOm0jKFfQG2Gg=="; + }; + }; "web3-utils-1.8.1" = { name = "web3-utils"; packageName = "web3-utils"; @@ -78343,15 +78955,6 @@ let sha512 = "75WFUMblcWYcocjSLlXCb71QuGyH7egdBZu50FtBGl2Nso8CK3Ej+J7bTZz2FPFq5l6fzCisD9modB7t30ikuA=="; }; }; - "webpack-4.43.0" = { - name = "webpack"; - packageName = "webpack"; - version = "4.43.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; - sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; - }; - }; "webpack-4.46.0" = { name = "webpack"; packageName = "webpack"; @@ -78442,15 +79045,6 @@ let sha512 = "hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA=="; }; }; - "webpack-dev-server-3.11.0" = { - name = "webpack-dev-server"; - packageName = "webpack-dev-server"; - version = "3.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz"; - sha512 = "PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg=="; - }; - }; "webpack-dev-server-3.11.3" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; @@ -78460,6 +79054,15 @@ let sha512 = "3x31rjbEQWKMNzacUZRE6wXvUFuGpH7vr0lIEbYpMAG9BOxi0928QU1BBswOAP3kg3H1O4hiS+sq4YyAn6ANnA=="; }; }; + "webpack-dev-server-4.11.1" = { + name = "webpack-dev-server"; + packageName = "webpack-dev-server"; + version = "4.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz"; + sha512 = "lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw=="; + }; + }; "webpack-flush-chunks-2.0.3" = { name = "webpack-flush-chunks"; packageName = "webpack-flush-chunks"; @@ -78487,13 +79090,13 @@ let sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; }; }; - "webpack-manifest-plugin-2.2.0" = { + "webpack-manifest-plugin-4.1.1" = { name = "webpack-manifest-plugin"; packageName = "webpack-manifest-plugin"; - version = "2.2.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-2.2.0.tgz"; - sha512 = "9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ=="; + url = "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz"; + sha512 = "YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow=="; }; }; "webpack-merge-4.2.2" = { @@ -78550,6 +79153,15 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; + "webpack-sources-2.3.1" = { + name = "webpack-sources"; + packageName = "webpack-sources"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz"; + sha512 = "y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA=="; + }; + }; "webpack-sources-3.2.3" = { name = "webpack-sources"; packageName = "webpack-sources"; @@ -78568,15 +79180,6 @@ let sha512 = "UlTm7Yz4meJV0THhZMrgRTE9v/vZ0xfUoJ/eOig98TvzsqNiW+FLSv5WaZeML3uJUPrMQ6K5jo1FJJFXNCc8+g=="; }; }; - "websocket-driver-0.6.5" = { - name = "websocket-driver"; - packageName = "websocket-driver"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; - sha512 = "oBx6ZM1Gs5q2jwZuSN/Qxyy/fbgomV8+vqsmipaPKB/74hjHlKuM07jNmRhn4qa2AdUwsgxrltq+gaPsHgcl0Q=="; - }; - }; "websocket-driver-0.7.4" = { name = "websocket-driver"; packageName = "websocket-driver"; @@ -79333,13 +79936,13 @@ let sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; }; }; - "wrap-ansi-8.0.1" = { + "wrap-ansi-8.1.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.0.1.tgz"; - sha512 = "QFF+ufAqhoYHvoHdajT/Po7KoXVBPXS2bgjIam5isfWJPfIOnQZ50JtUiVvCv/sjgacf3yRrt2ZKUZ/V4itN4g=="; + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz"; + sha512 = "si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ=="; }; }; "wrap-fn-0.1.5" = { @@ -79729,13 +80332,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.3.0" = { + "xdl-60.0.1" = { name = "xdl"; packageName = "xdl"; - version = "59.3.0"; + version = "60.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.3.0.tgz"; - sha512 = "+7HeQDo13SWNCktnmggutegmWBIgF5TzKLPpaZe3qhlTXRETdNvQUbuYfaETLlcwk372jzvO7navUgxUvFrpNA=="; + url = "https://registry.npmjs.org/xdl/-/xdl-60.0.1.tgz"; + sha512 = "L9T0faRdF8hH3LUOkYV4dJc43peV3WSYV3l+edonWbNGPdbhhVvbFgriEL9yWJrxlHmTLC/vRJ4unUXGkUTk4A=="; }; }; "xenvar-0.5.1" = { @@ -80126,13 +80729,13 @@ let sha512 = "F6WF5s6xG/bm8Oxi2ETuzwGQW8yleL5I4JPxZl49m7Uw7D4LAXu+4dvUK78Uo4D863sM8auqw6+1Xmj9mFlmDQ=="; }; }; - "xstate-4.35.2" = { + "xstate-4.35.3" = { name = "xstate"; packageName = "xstate"; - version = "4.35.2"; + version = "4.35.3"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.35.2.tgz"; - sha512 = "5X7EyJv5OHHtGQwN7DsmCAbSnDs3Mxl1cXQ4PVaLwi+7p/RRapERnd1dFyHjYin+KQoLLfuXpl1dPBThgyIGNg=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.35.3.tgz"; + sha512 = "/vM8la6OPcmT2P4R8p37P/Pzo8fTeEjvg+lxCfQ7vTeJg6NmzPHDJ5RdlrGfojEIabMxKW22Tm2kz8oV390Awg=="; }; }; "xstream-11.14.0" = { @@ -80909,13 +81512,13 @@ let sha512 = "1MzNQdAvO+54H+EaK5YpyEy0T+Ejo/7YLHS93G3RnYWh5gaotGHwGeN/ZO687qEDU2y4CdStQYXVHIgrUl5UVQ=="; }; }; - "zwave-js-10.4.0" = { + "zwave-js-10.5.4" = { name = "zwave-js"; packageName = "zwave-js"; - version = "10.4.0"; + version = "10.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/zwave-js/-/zwave-js-10.4.0.tgz"; - sha512 = "9eVe+7xli+KOvoyakXPMI1a5Mhkjlwi2t6Gniuyu+s6U8rOCd8NmhHvvzB2p+2KLRjuYjBRqPNA5c8qAsvC+ug=="; + url = "https://registry.npmjs.org/zwave-js/-/zwave-js-10.5.4.tgz"; + sha512 = "Zo2aSYLYKLUca0Wxp7m1Ju83CZeAvJorKjww9MkIvR85hqi/I5QZCC0nXQ2sQb3q0171tGndtICdfsuAE7dfRg=="; }; }; "zwitch-1.0.5" = { @@ -80951,15 +81554,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "15.1.1"; + version = "15.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-15.1.1.tgz"; - sha512 = "539I3B5yTasaX/EQrXZyXOc9eZUyVBxMWiGj3/bmlCsft7/Y8J+A92uftjxIO4P8lYWzSdSxFT3Bu1zI1b6yzw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-15.1.3.tgz"; + sha512 = "gNVvyvkGZ1zKiDdWjPqCLst8iHcB1C4B2nXrr3B+/YAd1G/y87VI1aBKFlK9ulG4tkwktog5uQaut7xs48IsEQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1501.1" - sources."@angular-devkit/core-15.1.1" - sources."@angular-devkit/schematics-15.1.1" + sources."@angular-devkit/architect-0.1501.3" + sources."@angular-devkit/core-15.1.3" + sources."@angular-devkit/schematics-15.1.3" sources."@gar/promisify-1.1.3" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@npmcli/fs-2.1.2" @@ -80969,7 +81572,7 @@ in sources."@npmcli/node-gyp-3.0.0" sources."@npmcli/promise-spawn-6.0.2" sources."@npmcli/run-script-6.0.0" - sources."@schematics/angular-15.1.1" + sources."@schematics/angular-15.1.3" sources."@tootallnate/once-2.0.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -81050,7 +81653,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-6.1.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" @@ -81071,7 +81674,7 @@ in (sources."inquirer-8.2.4" // { dependencies = [ sources."rxjs-7.8.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."ip-2.0.0" @@ -81182,7 +81785,7 @@ in sources."proc-log-3.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" (sources."read-package-json-6.0.0" // { dependencies = [ sources."brace-expansion-2.0.1" @@ -81268,10 +81871,10 @@ in "@antfu/ni" = nodeEnv.buildNodePackage { name = "_at_antfu_slash_ni"; packageName = "@antfu/ni"; - version = "0.18.8"; + version = "0.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.18.8.tgz"; - sha512 = "0m++AudwQq+wWAz/Ax7g+sh/wFW51HHQ6BtPLsuTAsFIzWB/bv/0COwZE7BRS+u0nqMb6Ks6nlk6cY1TpPDwHg=="; + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.19.0.tgz"; + sha512 = "33VKTuBjoW2canoVMGa4g5oGCg7KK8UVmBBmUKzvQ+Fa69kk2YI8sqt94WCpvSWmW/yD5ZXsD9G9s689b9KwwQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -81443,7 +82046,7 @@ in sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.1.3" sources."glob-parent-6.0.2" (sources."glob-stream-7.0.0" // { @@ -81610,10 +82213,10 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "0.29.4"; + version = "0.29.5"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.29.4.tgz"; - sha512 = "ZcvMVz4ItsLe+Ey6Ucrp+HYYT5Bc9BeNlQ7QYWVyHYqoke/HvlHXHPScj04LxVJ2Iq9FXjj4yRNFxBWj8P5J2g=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.29.5.tgz"; + sha512 = "HRPpAicAE+nyuC7wX3f8W2HOcXgWOU+++hZk1290wQUp1SUHAziZ4VWtnqMAm9n8h4VfS09yM/cvXOtHzGd/BQ=="; }; dependencies = [ sources."@astrojs/compiler-0.31.4" @@ -81629,7 +82232,7 @@ in sources."vscode-uri-2.1.2" ]; }) - sources."@vscode/l10n-0.0.10" + sources."@vscode/l10n-0.0.11" sources."cross-spawn-7.0.3" sources."define-lazy-prop-2.0.0" sources."emmet-2.3.6" @@ -81652,11 +82255,11 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."suf-log-2.5.3" - sources."synckit-0.8.4" + sources."synckit-0.8.5" sources."tiny-glob-0.2.9" - sources."tslib-2.4.1" - sources."vscode-css-languageservice-6.2.1" - sources."vscode-html-languageservice-5.0.3" + sources."tslib-2.5.0" + sources."vscode-css-languageservice-6.2.3" + sources."vscode-html-languageservice-5.0.4" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" @@ -81685,9 +82288,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -81704,18 +82307,18 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-proposal-export-namespace-from-7.18.9" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-transform-modules-commonjs-7.20.11" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -81739,7 +82342,7 @@ in sources."abab-2.0.6" sources."abbrev-1.1.1" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -81772,7 +82375,7 @@ in sources."bytes-3.1.2" sources."cache-content-type-1.0.1" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."canvas-2.11.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -81873,7 +82476,7 @@ in sources."function-bind-1.1.1" sources."gauge-3.0.2" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."globals-11.12.0" sources."graceful-fs-4.2.10" @@ -82002,7 +82605,7 @@ in sources."process-nextick-args-2.0.1" sources."proper-lockfile-4.1.2" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."querystringify-2.2.0" (sources."raw-body-2.5.1" // { @@ -82020,7 +82623,7 @@ in sources."run-async-2.4.1" (sources."rxjs-7.8.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."safe-buffer-5.1.2" @@ -82151,18 +82754,18 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -82171,7 +82774,7 @@ in sources."@types/node-18.11.18" sources."@types/normalize-package-data-2.4.1" sources."JSONStream-1.3.5" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" @@ -82279,7 +82882,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-type-4.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -82384,10 +82987,10 @@ in "@emacs-eask/cli" = nodeEnv.buildNodePackage { name = "_at_emacs-eask_slash_cli"; packageName = "@emacs-eask/cli"; - version = "0.7.8"; + version = "0.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/@emacs-eask/cli/-/cli-0.7.8.tgz"; - sha512 = "Vr7nZf9H/T6wQyrC+vj3x2ysGbRlyRsayp6TrWu5jBWUi2ocYCq2/0O48HUKj9lkyEPWKjwr+ANehC95S727Sg=="; + url = "https://registry.npmjs.org/@emacs-eask/cli/-/cli-0.7.10.tgz"; + sha512 = "Gwr5PsyH+JSsM3jaJLW00EqwMD151wu0v3lBa58mnbBVVXOEG6Fnynv9jE9vLzOkhAVcDH9dtCtYlurDH7/YZg=="; }; dependencies = [ sources."ansi-regex-5.0.1" @@ -82420,10 +83023,10 @@ in "@forge/cli" = nodeEnv.buildNodePackage { name = "_at_forge_slash_cli"; packageName = "@forge/cli"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli/-/cli-6.4.0.tgz"; - sha512 = "inTrWbkBbgnFX+L+RJ4XRxo6GgXGGiECZLnE1WrCpgoNI8j+SSvk11UPz5YA3krebKeiSJseMQ/VyswePvzsMg=="; + url = "https://registry.npmjs.org/@forge/cli/-/cli-6.4.1.tgz"; + sha512 = "tG2Zoq63T256wmA9BteJwFqef2qFxySHurs1WOZ4j1Dnz23w2tQLa86X0Sz3P6/43td+j74TMklPqRdu1jJIEg=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" @@ -82434,9 +83037,9 @@ in ]; }) sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -82459,9 +83062,9 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-proposal-class-properties-7.18.6" sources."@babel/plugin-proposal-numeric-separator-7.18.6" sources."@babel/plugin-proposal-optional-chaining-7.20.7" @@ -82469,23 +83072,23 @@ in sources."@babel/plugin-syntax-numeric-separator-7.10.4" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-typescript-7.20.0" - sources."@babel/plugin-transform-react-jsx-7.20.7" - sources."@babel/plugin-transform-typescript-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" + sources."@babel/plugin-transform-typescript-7.20.13" sources."@babel/preset-typescript-7.18.6" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@colors/colors-1.5.0" sources."@discoveryjs/json-ext-0.5.7" - sources."@forge/api-2.9.1" + sources."@forge/api-2.10.0" (sources."@forge/auth-0.0.1" // { dependencies = [ sources."tslib-1.14.1" ]; }) sources."@forge/babel-plugin-transform-ui-1.1.0" - sources."@forge/bundler-4.2.0" - (sources."@forge/cli-shared-3.5.0" // { + sources."@forge/bundler-4.3.0" + (sources."@forge/cli-shared-3.5.1" // { dependencies = [ sources."glob-7.2.3" ]; @@ -82496,8 +83099,8 @@ in sources."minimatch-5.1.6" ]; }) - sources."@forge/lint-3.2.12" - sources."@forge/manifest-4.5.3" + sources."@forge/lint-3.2.13" + sources."@forge/manifest-4.6.0" sources."@forge/storage-1.3.1" sources."@forge/util-1.2.0" sources."@jridgewell/gen-mapping-0.1.1" @@ -82515,6 +83118,22 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@polka/url-1.0.0-next.21" + (sources."@sentry/core-7.34.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + (sources."@sentry/node-7.34.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."@sentry/types-7.34.0" + (sources."@sentry/utils-7.34.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/eslint-8.4.10" @@ -82524,15 +83143,15 @@ in sources."@types/json-schema-7.0.11" sources."@types/node-18.11.18" sources."@types/node-fetch-2.6.2" - sources."@typescript-eslint/types-5.48.2" - (sources."@typescript-eslint/typescript-estree-5.48.2" // { + sources."@typescript-eslint/types-5.49.0" + (sources."@typescript-eslint/typescript-estree-5.49.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."semver-7.3.8" sources."yallist-4.0.0" ]; }) - sources."@typescript-eslint/visitor-keys-5.48.2" + sources."@typescript-eslint/visitor-keys-5.49.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -82553,9 +83172,10 @@ in sources."@webpack-cli/serve-1.7.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."acorn-walk-8.2.0" + sources."agent-base-6.0.2" (sources."ajv-6.12.6" // { dependencies = [ sources."fast-deep-equal-3.1.3" @@ -82639,7 +83259,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" sources."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."case-1.6.3" sources."chainsaw-0.1.0" sources."chalk-2.4.2" @@ -82660,7 +83280,7 @@ in sources."chownr-1.1.4" sources."chrome-trace-event-1.0.3" sources."cipher-base-1.0.4" - sources."clean-css-5.3.1" + sources."clean-css-5.3.2" sources."cli-color-2.0.3" sources."cli-cursor-3.1.0" sources."cli-spinners-2.7.0" @@ -82686,6 +83306,7 @@ in sources."conf-6.2.4" sources."console-browserify-1.2.0" sources."convert-source-map-1.9.0" + sources."cookie-0.4.2" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."crc32-stream-4.0.2" @@ -82821,7 +83442,7 @@ in sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-folder-size-2.0.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."github-from-package-0.0.0" @@ -82869,7 +83490,8 @@ in }) sources."html-webpack-plugin-5.5.0" sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" + sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-5.2.4" @@ -82999,6 +83621,7 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" sources."lru-queue-0.1.0" + sources."lru_map-0.3.3" sources."make-dir-3.1.0" sources."md5.js-1.3.5" sources."memfs-3.4.13" @@ -83254,7 +83877,7 @@ in sources."totalist-1.1.0" (sources."tr46-1.0.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."traverse-0.3.9" @@ -83272,7 +83895,7 @@ in sources."yallist-4.0.0" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -83302,7 +83925,7 @@ in sources."update-browserslist-db-1.0.10" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."urijs-1.19.11" @@ -83480,7 +84103,7 @@ in sources."fuzzy-0.1.3" sources."gaxios-4.3.3" sources."gcp-metadata-4.3.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."glob-parent-5.1.2" sources."google-auth-library-7.14.1" @@ -83494,7 +84117,7 @@ in sources."has-flag-4.0.0" sources."has-symbols-1.0.3" sources."hosted-git-info-4.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" @@ -83671,7 +84294,7 @@ in sources."type-fest-2.19.0" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.21.3" sources."typescript-4.9.4" sources."universalify-2.0.0" @@ -83715,7 +84338,7 @@ in sha512 = "zCtMCbQxJc5k2iaB/nV+1FrGQBEfbnFh427BD7O3jR6wJjVGBIamXtVKnqYqC5Kjtam7Eb9jvusZNpRcnVcAFQ=="; }; dependencies = [ - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@medable/mdctl-api-1.0.68" sources."@medable/mdctl-api-driver-1.0.68" sources."@medable/mdctl-axon-tools-1.0.68" @@ -84383,7 +85006,7 @@ in sources."promise-nodify-1.0.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.5.3" sources."queue-microtask-1.2.3" @@ -84640,25 +85263,25 @@ in "@microsoft/rush" = nodeEnv.buildNodePackage { name = "_at_microsoft_slash_rush"; packageName = "@microsoft/rush"; - version = "5.88.0"; + version = "5.89.1"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.88.0.tgz"; - sha512 = "SEgQvrlCmBrjWogSXtk0cA9QAV7XqdeTurWYjjXLSNP56MMpqmF3e8b7FqnZcdT1r9i+rkWrBuQF/K3q+5bT7A=="; + url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.89.1.tgz"; + sha512 = "i21mAr6U+fo7+td9zlJ9R0MA9sqbpcq8dkod0keiFJkzOJnzIb0y8yJAvr7rEzxKKZqXdfktI/8gBi+GTvdMig=="; }; dependencies = [ (sources."@azure/abort-controller-1.1.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-auth-1.4.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-client-1.7.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-http-2.3.1" // { @@ -84669,63 +85292,63 @@ in sources."form-data-3.0.1" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-lro-2.5.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-paging-1.4.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-rest-pipeline-1.10.1" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-tracing-1.0.1" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/core-util-1.1.1" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/identity-2.1.0" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/logger-1.0.3" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@azure/msal-browser-2.32.2" // { dependencies = [ - sources."@azure/msal-common-9.1.0" + sources."@azure/msal-common-9.1.1" ]; }) sources."@azure/msal-common-7.6.0" (sources."@azure/msal-node-1.14.6" // { dependencies = [ - sources."@azure/msal-common-9.1.0" + sources."@azure/msal-common-9.1.1" ]; }) (sources."@azure/storage-blob-12.11.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.20.14" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" sources."@babel/helper-hoist-variables-7.18.6" @@ -84736,12 +85359,12 @@ in sources."@babel/parser-7.16.4" (sources."@babel/template-7.20.7" // { dependencies = [ - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" ]; }) - (sources."@babel/traverse-7.20.12" // { + (sources."@babel/traverse-7.20.13" // { dependencies = [ - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" ]; }) sources."@babel/types-7.20.7" @@ -84751,11 +85374,12 @@ in sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."@microsoft/rush-lib-5.88.0" + sources."@microsoft/rush-lib-5.89.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@opentelemetry/api-1.4.0" + sources."@pnpm/crypto.base32-hash-1.0.1" sources."@pnpm/error-1.4.0" sources."@pnpm/link-bins-5.3.25" sources."@pnpm/package-bins-4.1.0" @@ -84768,24 +85392,24 @@ in }) sources."@pnpm/types-6.4.0" sources."@pnpm/write-project-manifest-1.1.7" - sources."@rushstack/heft-config-file-0.11.4" + sources."@rushstack/heft-config-file-0.11.5" (sources."@rushstack/node-core-library-3.53.3" // { dependencies = [ sources."import-lazy-4.0.0" sources."resolve-1.17.0" ]; }) - sources."@rushstack/package-deps-hash-3.2.66" + sources."@rushstack/package-deps-hash-4.0.3" (sources."@rushstack/rig-package-0.3.17" // { dependencies = [ sources."resolve-1.17.0" ]; }) - sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.88.0" - sources."@rushstack/rush-azure-storage-build-cache-plugin-5.88.0" - sources."@rushstack/rush-sdk-5.88.0" - sources."@rushstack/stream-collator-4.0.219" - sources."@rushstack/terminal-0.3.88" + sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.89.1" + sources."@rushstack/rush-azure-storage-build-cache-plugin-5.89.1" + sources."@rushstack/rush-sdk-5.89.1" + sources."@rushstack/stream-collator-4.0.222" + sources."@rushstack/terminal-0.3.91" (sources."@rushstack/ts-command-line-4.13.1" // { dependencies = [ sources."argparse-1.0.10" @@ -84810,7 +85434,7 @@ in sources."@vue/reactivity-transform-3.2.45" sources."@vue/shared-3.2.45" sources."@yarnpkg/lockfile-1.0.2" - sources."@zkochan/cmd-shim-5.4.0" + sources."@zkochan/cmd-shim-5.4.1" sources."agent-base-6.0.2" sources."ansi-align-3.0.1" (sources."ansi-escapes-4.3.2" // { @@ -84919,6 +85543,11 @@ in sources."js-yaml-3.14.1" ]; }) + (sources."dependency-path-9.2.8" // { + dependencies = [ + sources."@pnpm/types-8.9.0" + ]; + }) sources."deps-regex-0.1.4" sources."detect-indent-6.1.0" sources."dezalgo-1.0.4" @@ -84927,6 +85556,7 @@ in sources."duplexer3-0.1.5" sources."ecdsa-sig-formatter-1.0.11" sources."emoji-regex-8.0.0" + sources."encode-registry-3.0.0" (sources."encoding-0.1.13" // { dependencies = [ sources."iconv-lite-0.6.3" @@ -85003,7 +85633,7 @@ in ]; }) sources."hosted-git-info-4.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" @@ -85074,7 +85704,7 @@ in sources."jws-3.2.2" ]; }) - sources."jszip-3.7.1" + sources."jszip-3.8.0" sources."jwa-1.4.1" (sources."jws-4.0.0" // { dependencies = [ @@ -85115,7 +85745,9 @@ in sources."semver-6.3.0" ]; }) + sources."map-age-cleaner-0.1.3" sources."map-obj-4.3.0" + sources."mem-8.1.1" (sources."meow-9.0.0" // { dependencies = [ sources."type-fest-0.18.1" @@ -85126,7 +85758,7 @@ in sources."micromatch-4.0.5" sources."mime-db-1.52.0" sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" + sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" sources."minimatch-3.1.2" @@ -85176,7 +85808,11 @@ in sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."onetime-5.1.2" + (sources."onetime-5.1.2" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) sources."open-8.4.0" (sources."ora-5.4.1" // { dependencies = [ @@ -85192,6 +85828,7 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-cancelable-1.1.0" + sources."p-defer-1.0.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-reflect-2.1.0" @@ -85238,7 +85875,7 @@ in sources."process-nextick-args-2.0.1" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pupa-2.1.1" sources."query-ast-1.0.5" sources."querystringify-2.2.0" @@ -85296,6 +85933,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" + sources."rfc4648-1.5.2" sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."rxjs-6.6.7" @@ -85540,10 +86178,10 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "9.1.8"; + version = "9.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-9.1.8.tgz"; - sha512 = "53laCMoPLAkjyz3405FlMSrHnbr3DGeoaQjY963bEroezLlm/qfQhwj6oGJwtgA28eNFgx68mvQV2f1VZNUJtw=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-9.1.9.tgz"; + sha512 = "oRiJArvQcYUJRO0jRWG99KkXuw+HafSnlfWcO4028gTDb4IanRwbl6fw4mELTEAaXAwDGOcuk8R0QY8H3muyiQ=="; }; dependencies = [ sources."@angular-devkit/core-15.0.4" @@ -85553,7 +86191,7 @@ in sources."chalk-4.1.2" sources."inquirer-8.2.4" sources."rxjs-7.8.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."@babel/code-frame-7.18.6" @@ -85599,7 +86237,7 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."ajv-8.11.0" sources."ajv-formats-2.1.1" @@ -85624,7 +86262,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" @@ -85738,7 +86376,7 @@ in sources."minimist-1.2.7" sources."mute-stream-0.0.8" sources."neo-async-2.6.2" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-emoji-1.11.0" sources."node-releases-2.0.8" sources."normalize-path-3.0.0" @@ -85762,7 +86400,7 @@ in sources."picomatch-2.3.1" sources."pluralize-8.0.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."randombytes-2.1.0" sources."readable-stream-3.6.0" sources."readdirp-3.6.0" @@ -85923,18 +86561,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -86009,7 +86647,7 @@ in sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; @@ -86047,18 +86685,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -86134,7 +86772,7 @@ in sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; @@ -86190,18 +86828,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -86276,7 +86914,7 @@ in sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; @@ -86314,18 +86952,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -86403,7 +87041,7 @@ in sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; @@ -86428,10 +87066,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.1.1.tgz"; - sha512 = "uNKVXXJ/LTeUgdaoLg0bQr27ccVRZx6weD9H2UR0/pHkwb+vXptJB81LwPmvRldlaK7G35N2i/w2Mjqbz/Lakg=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.2.0.tgz"; + sha512 = "ybgxZqfGlqGQu65rClEEBllT8rrnTcEPkz3Q+asjOwIzbmLZhRniKWXCNIW/Z5VPzSzg32zQsEPjFaSE1+iJxg=="; }; dependencies = [ sources."@redis/bloom-1.0.2" @@ -86453,7 +87091,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1296.0" + sources."aws-sdk-2.1304.0" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { dependencies = [ @@ -86535,7 +87173,7 @@ in sources."fresh-0.5.2" sources."function-bind-1.1.1" sources."generic-pool-3.8.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."gopd-1.0.1" sources."got-11.8.6" @@ -86547,7 +87185,7 @@ in sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."helmet-4.6.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http2-wrapper-1.0.3" sources."iconv-lite-0.4.24" @@ -86724,13 +87362,13 @@ in sources."@apollographql/apollo-tools-0.5.4" sources."@apollographql/graphql-playground-html-1.6.29" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -86769,7 +87407,7 @@ in sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -86780,7 +87418,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" @@ -86818,7 +87456,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.11" + sources."@babel/plugin-transform-block-scoping-7.20.14" sources."@babel/plugin-transform-classes-7.20.7" sources."@babel/plugin-transform-computed-properties-7.20.7" sources."@babel/plugin-transform-destructuring-7.20.7" @@ -86846,7 +87484,7 @@ in sources."@babel/plugin-transform-sticky-regex-7.18.6" sources."@babel/plugin-transform-template-literals-7.18.9" sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-typescript-7.20.7" + sources."@babel/plugin-transform-typescript-7.20.13" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" (sources."@babel/preset-env-7.20.2" // { @@ -86864,15 +87502,15 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@graphql-tools/merge-8.3.1" - (sources."@graphql-tools/mock-8.7.15" // { + (sources."@graphql-tools/mock-8.7.16" // { dependencies = [ - sources."@graphql-tools/merge-8.3.15" - sources."@graphql-tools/schema-9.0.13" + sources."@graphql-tools/merge-8.3.16" + sources."@graphql-tools/schema-9.0.14" sources."@graphql-tools/utils-9.1.4" sources."value-or-promise-1.0.12" ]; @@ -87030,7 +87668,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -87079,7 +87717,7 @@ in sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-compat-3.27.1" + sources."core-js-compat-3.27.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -87248,7 +87886,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.197.0" + sources."flow-parser-0.198.2" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -87267,7 +87905,7 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -87433,7 +88071,7 @@ in sources."negotiator-0.6.3" sources."neo-async-2.6.2" sources."nice-try-1.0.5" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-dir-0.1.17" sources."node-fetch-2.6.8" sources."node-gyp-build-4.6.0" @@ -87740,7 +88378,7 @@ in sources."toidentifier-1.0.1" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.6.0" sources."type-is-1.6.18" @@ -87951,11 +88589,11 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.20.14" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/template-7.20.7" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.3.2" @@ -88062,7 +88700,7 @@ in sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."abbrev-2.0.0" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" (sources."ansi-align-3.0.1" // { dependencies = [ @@ -88148,8 +88786,8 @@ in sources."error-ex-1.3.2" sources."escape-goat-4.0.0" sources."escape-string-regexp-1.0.5" - sources."estree-util-is-identifier-name-2.0.1" - sources."estree-util-visit-1.2.0" + sources."estree-util-is-identifier-name-2.1.0" + sources."estree-util-visit-1.2.1" sources."event-stream-3.1.7" sources."extend-3.0.2" sources."fault-2.0.1" @@ -88186,7 +88824,7 @@ in sources."hast-util-whitespace-2.0.1" sources."hastscript-7.2.0" sources."hosted-git-info-5.2.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http2-wrapper-2.2.0" // { dependencies = [ sources."quick-lru-5.1.1" @@ -88235,28 +88873,28 @@ in sources."map-obj-4.3.0" sources."map-stream-0.1.0" sources."markdown-table-3.0.3" - sources."mdast-comment-marker-2.1.0" - (sources."mdast-util-find-and-replace-2.2.1" // { + sources."mdast-comment-marker-2.1.1" + (sources."mdast-util-find-and-replace-2.2.2" // { dependencies = [ sources."escape-string-regexp-5.0.0" ]; }) - sources."mdast-util-from-markdown-1.2.0" - sources."mdast-util-frontmatter-1.0.0" + sources."mdast-util-from-markdown-1.3.0" + sources."mdast-util-frontmatter-1.0.1" sources."mdast-util-gfm-2.0.1" sources."mdast-util-gfm-autolink-literal-1.0.2" - sources."mdast-util-gfm-footnote-1.0.1" + sources."mdast-util-gfm-footnote-1.0.2" sources."mdast-util-gfm-strikethrough-1.0.2" sources."mdast-util-gfm-table-1.0.6" - sources."mdast-util-gfm-task-list-item-1.0.1" + sources."mdast-util-gfm-task-list-item-1.0.2" sources."mdast-util-mdx-2.0.0" sources."mdast-util-mdx-expression-1.3.1" sources."mdast-util-mdx-jsx-2.1.0" sources."mdast-util-mdxjs-esm-1.3.0" - sources."mdast-util-phrasing-3.0.0" + sources."mdast-util-phrasing-3.0.1" sources."mdast-util-to-markdown-1.5.0" sources."mdast-util-to-nlcst-5.2.1" - sources."mdast-util-to-string-3.1.0" + sources."mdast-util-to-string-3.1.1" sources."meow-11.0.0" sources."micromark-3.1.0" sources."micromark-core-commonmark-1.0.6" @@ -88268,14 +88906,14 @@ in sources."micromark-extension-gfm-table-1.0.5" sources."micromark-extension-gfm-tagfilter-1.0.1" sources."micromark-extension-gfm-task-list-item-1.0.3" - sources."micromark-extension-mdx-expression-1.0.3" + sources."micromark-extension-mdx-expression-1.0.4" sources."micromark-extension-mdx-jsx-1.0.3" sources."micromark-extension-mdx-md-1.0.0" sources."micromark-extension-mdxjs-1.0.0" sources."micromark-extension-mdxjs-esm-1.0.3" sources."micromark-factory-destination-1.0.0" sources."micromark-factory-label-1.0.2" - sources."micromark-factory-mdx-expression-1.0.6" + sources."micromark-factory-mdx-expression-1.0.7" sources."micromark-factory-space-1.0.0" sources."micromark-factory-title-1.0.2" sources."micromark-factory-whitespace-1.0.0" @@ -88286,7 +88924,7 @@ in sources."micromark-util-decode-numeric-character-reference-1.0.0" sources."micromark-util-decode-string-1.0.2" sources."micromark-util-encode-1.0.1" - sources."micromark-util-events-to-acorn-1.2.0" + sources."micromark-util-events-to-acorn-1.2.1" sources."micromark-util-html-tag-name-1.1.0" sources."micromark-util-normalize-identifier-1.0.0" sources."micromark-util-resolve-all-1.0.0" @@ -88301,10 +88939,10 @@ in sources."minimist-options-4.1.0" sources."mri-1.2.0" sources."ms-2.1.2" - sources."nlcst-is-literal-2.1.0" - sources."nlcst-normalize-3.1.0" - sources."nlcst-search-3.1.0" - sources."nlcst-to-string-3.1.0" + sources."nlcst-is-literal-2.1.1" + sources."nlcst-normalize-3.1.1" + sources."nlcst-search-3.1.1" + sources."nlcst-to-string-3.1.1" sources."nopt-7.0.0" sources."normalize-package-data-4.0.1" sources."normalize-url-8.0.0" @@ -88324,8 +88962,8 @@ in sources."parse-json-5.2.0" (sources."parse-latin-5.0.1" // { dependencies = [ - sources."unist-util-modify-children-3.1.0" - sources."unist-util-visit-children-2.0.1" + sources."unist-util-modify-children-3.1.1" + sources."unist-util-visit-children-2.0.2" ]; }) sources."parse5-6.0.1" @@ -88433,7 +89071,7 @@ in sources."to-vfile-7.2.3" sources."trim-newlines-4.0.2" sources."trough-2.1.0" - sources."type-fest-3.5.2" + sources."type-fest-3.5.3" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unherit-3.0.1" @@ -88457,20 +89095,20 @@ in ]; }) sources."unique-string-3.0.0" - sources."unist-util-inspect-7.0.1" - sources."unist-util-is-5.1.1" + sources."unist-util-inspect-7.0.2" + sources."unist-util-is-5.2.0" (sources."unist-util-modify-children-2.0.0" // { dependencies = [ sources."array-iterate-1.1.4" ]; }) - sources."unist-util-position-4.0.3" - sources."unist-util-position-from-estree-1.1.1" - sources."unist-util-remove-position-4.0.1" - sources."unist-util-stringify-position-3.0.2" - sources."unist-util-visit-4.1.1" + sources."unist-util-position-4.0.4" + sources."unist-util-position-from-estree-1.1.2" + sources."unist-util-remove-position-4.0.2" + sources."unist-util-stringify-position-3.0.3" + sources."unist-util-visit-4.1.2" sources."unist-util-visit-children-1.1.4" - sources."unist-util-visit-parents-5.1.1" + sources."unist-util-visit-parents-5.1.3" (sources."update-notifier-6.0.2" // { dependencies = [ sources."chalk-5.2.0" @@ -88493,7 +89131,7 @@ in sources."walk-up-path-1.0.0" sources."web-namespaces-2.0.1" sources."widest-line-4.0.1" - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" sources."ansi-styles-6.2.1" @@ -88531,9 +89169,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -88549,11 +89187,11 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -88568,7 +89206,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" sources."browserslist-4.21.4" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -88814,7 +89452,7 @@ in sources."path-to-regexp-1.8.0" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."request-2.88.2" sources."require-directory-2.1.1" @@ -88966,7 +89604,7 @@ in }; dependencies = [ sources."browserslist-4.21.4" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."electron-to-chromium-1.4.284" sources."escalade-3.1.1" sources."fraction.js-4.2.0" @@ -89039,7 +89677,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/node-18.11.18" sources."@types/yauzl-2.10.0" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" @@ -89047,7 +89685,7 @@ in sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1296.0" // { + (sources."aws-sdk-2.1304.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -89128,7 +89766,7 @@ in ]; }) sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."get-uri-3.0.2" sources."glob-7.2.3" @@ -89228,7 +89866,7 @@ in sources."tmp-0.0.33" sources."toidentifier-1.0.1" sources."tr46-0.0.3" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-check-0.3.2" sources."type-fest-0.21.3" (sources."unbzip2-stream-1.4.3" // { @@ -89271,10 +89909,10 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.60.0"; + version = "2.62.2"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.60.0.tgz"; - sha512 = "/kO8KGuJVCnkhnR+SmDHsAaaqmaTR6Vp/kpryohsBfKh/ZdOH1oKpviMiz167K6tUdin7x95Wjz/GZAfeiKPKg=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.62.2.tgz"; + sha512 = "fACUQEdc43AfiqKKXUZLuHB2VADLU965hl50Fn6BhMemFmUsc+iS/GFfOwvfCUO3/iaRtsn/gk+dQ3zZ+snKRw=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -89412,7 +90050,7 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."hosted-git-info-4.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."ieee754-1.2.1" sources."ignore-5.2.4" sources."indent-string-4.0.0" @@ -89420,7 +90058,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inspect-with-kind-1.0.5" - sources."irregular-plurals-3.3.0" + sources."irregular-plurals-3.4.0" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" @@ -89710,10 +90348,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "13.21.0"; + version = "13.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-13.21.0.tgz"; - sha512 = "4y0t3tAZiAMqRpyw0Yc8EbbRlikIpJRSKkcbi/0i3QcNg85FYaMeL7f2+BxfkMWzTjmN6XA4WWaPgqTV7W69eg=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-13.24.0.tgz"; + sha512 = "QP3hY4Ehgjnl5mXmHuXzgU/rnRpMTlpMxr3+JytC2NTNTUTjD5NSm+jJ+fUTHfcfGa8Plos2RTTmiqamHEE7uw=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.4" // { @@ -89743,6 +90381,8 @@ in sources."@grpc/grpc-js-1.8.4" sources."@grpc/proto-loader-0.7.4" sources."@handsontable/formulajs-2.0.2" + sources."@json2csv/formatters-6.1.2" + sources."@json2csv/plainjs-6.1.2" sources."@mitmaro/errors-1.0.0" sources."@mitmaro/http-authorization-header-1.0.0" sources."@protobufjs/aspromise-1.1.2" @@ -89755,11 +90395,12 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" + sources."@streamparser/json-0.0.10" sources."@types/body-parser-1.19.2" sources."@types/caseless-0.12.2" sources."@types/connect-3.4.35" sources."@types/express-4.17.15" - sources."@types/express-serve-static-core-4.17.32" + sources."@types/express-serve-static-core-4.17.33" sources."@types/long-4.0.2" sources."@types/mime-3.0.1" sources."@types/node-18.11.18" @@ -89768,7 +90409,7 @@ in sources."@types/request-2.48.8" sources."@types/serve-static-1.15.0" sources."@types/tough-cookie-4.0.2" - sources."@types/ws-8.5.3" + sources."@types/ws-8.5.4" sources."abort-controller-3.0.0" sources."accepts-1.3.8" (sources."agent-base-6.0.2" // { @@ -89811,7 +90452,7 @@ in sources."bolt01-1.2.6" sources."bolt03-1.2.15" sources."bolt07-1.8.3" - sources."bolt09-0.2.4" + sources."bolt09-0.2.5" sources."bs58-4.0.1" sources."bs58check-2.1.2" sources."buffer-6.0.3" @@ -89842,7 +90483,6 @@ in sources."colors-1.4.0" sources."colorspace-1.1.4" sources."combined-stream-1.0.8" - sources."commander-6.2.1" sources."concat-stream-1.6.2" (sources."content-disposition-0.5.4" // { dependencies = [ @@ -89900,8 +90540,12 @@ in sources."function-bind-1.1.1" sources."gauge-1.2.7" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" - sources."goldengate-12.0.2" + sources."get-intrinsic-1.2.0" + (sources."goldengate-12.0.2" // { + dependencies = [ + sources."ln-sync-4.2.0" + ]; + }) (sources."grammy-1.13.1" // { dependencies = [ sources."debug-4.3.4" @@ -89947,15 +90591,10 @@ in sources."string-width-5.1.2" sources."strip-ansi-7.0.1" sources."tmp-0.0.33" - sources."wrap-ansi-8.0.1" - ]; - }) - (sources."invoices-2.2.2" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.2" - sources."bolt07-1.8.2" + sources."wrap-ansi-8.1.0" ]; }) + sources."invoices-2.2.3" sources."ip-2.0.0" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" @@ -89974,82 +90613,19 @@ in sources."is-unicode-supported-1.3.0" sources."isarray-1.0.0" sources."json-schema-traverse-1.0.0" - sources."json2csv-5.0.7" - sources."jsonparse-1.3.1" sources."jstat-1.9.6" sources."kind-of-6.0.3" sources."kuler-2.0.0" - (sources."lightning-6.8.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.8.0" - sources."@types/node-18.11.16" - sources."asyncjs-util-1.2.10" - sources."bolt07-1.8.2" - (sources."psbt-2.7.1" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.2" - ]; - }) - sources."type-fest-3.4.0" - ]; - }) - (sources."ln-accounting-6.1.2" // { + (sources."lightning-7.0.3" // { dependencies = [ sources."@grpc/grpc-js-1.8.1" - sources."bolt07-1.8.2" - sources."goldengate-12.0.1" - (sources."ln-sync-4.1.0" // { - dependencies = [ - sources."asyncjs-util-1.2.10" - sources."ln-service-54.8.0" - ]; - }) - (sources."psbt-2.7.1" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.2" - ]; - }) - ]; - }) - (sources."ln-service-54.9.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.8.1" - sources."@types/ws-8.5.4" - sources."bolt09-0.2.5" - sources."invoices-2.2.3" - sources."lightning-7.0.3" sources."type-fest-3.5.1" ]; }) - sources."ln-sync-4.2.0" - (sources."ln-telegram-4.6.0" // { - dependencies = [ - sources."@grpc/grpc-js-1.8.1" - sources."bolt09-0.2.5" - sources."debug-4.3.4" - (sources."goldengate-12.0.1" // { - dependencies = [ - sources."bolt07-1.8.2" - (sources."ln-sync-4.1.0" // { - dependencies = [ - sources."asyncjs-util-1.2.10" - sources."ln-service-54.8.0" - (sources."psbt-2.7.1" // { - dependencies = [ - sources."bitcoinjs-lib-6.0.2" - ]; - }) - ]; - }) - ]; - }) - sources."grammy-1.13.0" - sources."invoices-2.2.3" - sources."ln-sync-4.1.1" - sources."ms-2.1.2" - sources."paid-services-4.2.1" - ]; - }) + sources."ln-accounting-6.1.3" + sources."ln-service-54.9.0" + sources."ln-sync-4.3.0" + sources."ln-telegram-4.6.1" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.difference-4.5.0" @@ -90118,8 +90694,7 @@ in sources."p2tr-1.3.3" (sources."paid-services-4.3.0" // { dependencies = [ - sources."bolt09-0.2.5" - sources."invoices-2.2.3" + sources."ln-sync-4.2.0" ]; }) sources."parseurl-1.3.3" @@ -90128,14 +90703,14 @@ in sources."pinkie-promise-2.0.1" sources."probing-3.0.1" sources."process-nextick-args-2.0.1" - (sources."protobufjs-7.1.2" // { + (sources."protobufjs-7.2.0" // { dependencies = [ sources."long-5.2.1" ]; }) sources."proxy-addr-2.0.7" sources."psbt-2.7.2" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pushdata-bitcoin-1.0.1" sources."qrcode-terminal-0.12.0" sources."qs-6.11.0" @@ -90207,10 +90782,10 @@ in sources."tr46-0.0.3" sources."triple-beam-1.3.0" sources."truncate-utf8-bytes-1.0.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tweetnacl-1.0.3" sources."tweetnacl-util-0.15.1" - sources."type-fest-3.5.2" + sources."type-fest-3.5.3" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."typeforce-1.18.0" @@ -90263,10 +90838,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "4.5.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.5.0.tgz"; - sha512 = "Vnq+3KScmrj6MYujzUhiZ4DJDMI/Pyc5EC2gxi1bIW8Qg+ASlOeUnm485/3Q6Ro3jNf+T6E9opQFbh6O606xfg=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-4.6.1.tgz"; + sha512 = "3pzB92+0/+rrR4TdONFhOtczPLQBgobu+27/X2icnS32YzgdMJd7GMzM4V6nBZsrl5jMUY4W/0ExSVGIV3o4aw=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -90295,7 +90870,6 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."turndown-7.1.1" - sources."urijs-1.19.11" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" @@ -90556,7 +91130,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."gopd-1.0.1" sources."has-1.0.3" @@ -90767,7 +91341,7 @@ in sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.10" sources."has-1.0.3" @@ -90861,7 +91435,7 @@ in sources."socket.io-4.5.4" sources."socket.io-adapter-2.4.0" sources."socket.io-client-4.5.4" - sources."socket.io-parser-4.2.1" + sources."socket.io-parser-4.2.2" sources."statuses-1.3.1" sources."stream-throttle-0.1.3" (sources."string-width-4.2.3" // { @@ -90926,7 +91500,7 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/types-7.20.7" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" @@ -91103,7 +91677,7 @@ in sources."fresh-0.5.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."glob-6.0.4" sources."har-schema-2.0.0" @@ -91236,7 +91810,7 @@ in sources."pug-runtime-3.0.1" sources."pug-strip-comments-2.0.0" sources."pug-walk-2.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pushdata-bitcoin-1.0.1" sources."qrcode-1.5.1" sources."qs-6.11.0" @@ -91646,7 +92220,7 @@ in sources."once-1.2.0" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qap-3.3.1" sources."qs-6.5.3" sources."query-string-1.0.1" @@ -92489,10 +93063,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.1.109"; + version = "2.1.119"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.109.tgz"; - sha512 = "ebHJcPSosOi62963Roe3HB05ibu4bj2HXdFnWBbbiQB9JQtmJCfE8Ml2wmi9U1e5LMvw7xwh6NiRM/2U0I8gkg=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.1.119.tgz"; + sha512 = "zz7Y0MQgJQxOXOOh/ctmjlGBGrAN1D/V8d+zvrombUIADuX0jE6CYk1zhQVQra82egzpLcxJVtH49FOKjrlXmQ=="; }; dependencies = [ sources."@jsii/check-node-1.73.0" @@ -92510,8 +93084,8 @@ in sources."braces-3.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.6.22" - sources."cdk8s-plus-25-2.3.27" + sources."cdk8s-2.6.32" + sources."cdk8s-plus-25-2.4.3" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -92524,7 +93098,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-10.1.223" + sources."constructs-10.1.233" sources."date-format-4.0.14" sources."debug-4.3.4" sources."decamelize-5.0.1" @@ -92578,14 +93152,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.797" // { + (sources."jsii-srcmak-0.1.807" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.3.247" + sources."json2jsii-0.3.257" sources."jsonfile-6.1.0" sources."locate-path-5.0.0" sources."lodash.truncate-4.4.2" @@ -92605,7 +93179,7 @@ in sources."p-try-2.2.0" sources."path-exists-4.0.0" sources."picomatch-2.3.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" @@ -92632,7 +93206,7 @@ in sources."supports-color-7.2.0" sources."table-6.8.1" sources."to-regex-range-5.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."typescript-3.9.10" sources."universalify-2.0.0" sources."uri-js-4.4.1" @@ -92667,26 +93241,26 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.15.0.tgz"; - sha512 = "wPVkiuoId7u1Jy1C1d+D4ktfQde5GfHkZBMppmkO/daZXsI2kH7yIFZpJ81/0k9hNRHvoK1d0/gDMMywqwWcmg=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.15.2.tgz"; + sha512 = "RAwXojqBZT8evWDwYCPzXiI/usUrciBhu9sopgm9MpcX55OLZMr2/R8/ZmX/oCxrvZxwboDD18dNJpi2hyXJ7w=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.20.14" sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/template-7.20.7" sources."@babel/types-7.20.7" - sources."@cdktf/cli-core-0.15.0" - sources."@cdktf/commons-0.15.0" - sources."@cdktf/hcl2cdk-0.15.0" - sources."@cdktf/hcl2json-0.15.0" + sources."@cdktf/cli-core-0.15.2" + sources."@cdktf/commons-0.15.2" + sources."@cdktf/hcl2cdk-0.15.2" + sources."@cdktf/hcl2json-0.15.2" sources."@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.10" - sources."@cdktf/provider-generator-0.15.0" + sources."@cdktf/provider-generator-0.15.2" sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" @@ -92716,7 +93290,7 @@ in sources."@types/node-18.11.18" sources."@types/node-fetch-2.6.2" sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.26" + sources."@types/react-18.0.27" sources."@types/scheduler-0.16.2" sources."@types/yoga-layout-1.9.2" sources."@xmldom/xmldom-0.8.6" @@ -92743,7 +93317,7 @@ in sources."bufferutil-4.0.7" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdktf-0.15.0" + sources."cdktf-0.15.2" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -92766,7 +93340,7 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.1.223" + sources."constructs-10.1.233" sources."convert-to-spaces-1.0.2" sources."cookie-0.4.2" sources."cross-spawn-7.0.3" @@ -92909,7 +93483,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.797" // { + (sources."jsii-srcmak-0.1.807" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -92945,7 +93519,7 @@ in sources."napi-build-utils-1.0.2" sources."ncp-2.0.0" sources."node-abi-3.31.0" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-fetch-2.6.8" sources."node-gyp-build-4.6.0" sources."object-assign-4.1.1" @@ -92965,7 +93539,7 @@ in sources."prebuild-install-7.1.1" sources."prettier-2.8.3" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."react-17.0.2" @@ -93049,7 +93623,7 @@ in sources."ws-7.5.9" sources."xml-js-1.6.11" sources."xmlbuilder-15.1.1" - sources."xstate-4.35.2" + sources."xstate-4.35.3" sources."y18n-4.0.3" sources."yallist-4.0.0" (sources."yargs-17.6.2" // { @@ -93084,10 +93658,10 @@ in clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.6.1.tgz"; - sha512 = "/StJu1YODZY6cOwkBx5FMhSoc9YmvEJXtwNN+udGg1GIKrr4PkdsCdUqC26GfdPdt5IuZnu+5y9/3mrdIJa40Q=="; + url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.6.2.tgz"; + sha512 = "GDQkr6zVqHJhO3yWTy3sA22sMCT6iUqaJuBdqZMW6oI25MtiJ2iZXDmWzErpjoRotsB+TYPTpuZSNSgaC1n4lA=="; }; dependencies = [ sources."anymatch-3.1.3" @@ -93096,7 +93670,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."chokidar-3.5.3" - sources."clean-css-5.3.1" + sources."clean-css-5.3.2" sources."commander-7.2.0" sources."concat-map-0.0.1" sources."fill-range-7.0.1" @@ -93272,7 +93846,7 @@ in sources."mute-stream-0.0.8" sources."node-fetch-1.7.3" sources."prompt-1.3.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."query-string-6.14.1" sources."read-1.0.7" sources."revalidator-0.1.8" @@ -93358,10 +93932,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.23.7"; + version = "0.23.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.7.tgz"; - sha512 = "CRFEcusfy8ATbYswZV2205Et/qjfe82KvJunQnLL8VlhKkymwgrfbgMZCTr35WPX0Dv3PItUSZZYq91LcYIm6w=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.23.8.tgz"; + sha512 = "knOr++uIcb+RppNXja+JrU1heoRDiW4v3GEzApJPsEgyjAaH6sZMh/XU5upFp7OSmeX++ZLndPUeumjzQuAbOg=="; }; buildInputs = globalBuildInputs; meta = { @@ -93386,7 +93960,7 @@ in sources."dockerfile-language-server-nodejs-0.2.2" sources."dockerfile-language-service-0.1.1" sources."dockerfile-utils-0.1.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."vscode-jsonrpc-8.0.2" (sources."vscode-languageserver-7.0.0" // { dependencies = [ @@ -93550,10 +94124,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.6.0.tgz"; - sha512 = "1Xo6++/ml/ozfBi2ubDXPVz49I1ewI5v8tZysn/Rz3/PojQuOcroXs48aqYx8rPADt7zSXAVGs+uN9lAkLgrLA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.6.1.tgz"; + sha512 = "GUkltYI/RTAx3vUIb+lQuEoF96ByfliYokoqM/Gn4hMRtl0IE/XaxqRj71byaj9eO1boSGzqMQtpx8ju1xhWuQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -93575,7 +94149,7 @@ in }; dependencies = [ sources."isexe-2.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."vscode-languageserver-textdocument-1.0.9" sources."vscode-uri-3.0.7" sources."which-2.0.2" @@ -93665,10 +94239,10 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.5.6"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.6.tgz"; - sha512 = "AwIVgKdfmeVnf56cI3bOGSGM+SHZ5cIXtWI0xU5ToFGAFk/wJ3YJlpUsHensuBrBrMTIAYHk+O3Mu+FuG9jKZg=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.6.0.tgz"; + sha512 = "fMEM9CUlsUODmXtmFQG+ppOqnem65X9qR+SqWndhw9LiE4NdsLsRm7pJmTT5Dz/R0AT7JaOfJeWi0gyUSSL25A=="; }; buildInputs = globalBuildInputs; meta = { @@ -93718,10 +94292,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.5.0.tgz"; - sha512 = "X3xt19f5CtRZ9/zMzNjjxuBaZLmyJt1KUnbvt1njFrBa80SK5pCkuTcJC+/CnkFhHwFeJbMyKNfw1AG68h4d6Q=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.5.1.tgz"; + sha512 = "tJYhsDHadL6YYEsHAUc+tFi8MYklHmPx3AcjiUHTYRAtkAyKoZb+BPpAwG8gvfSqdkCxu55eHLeJ9lGhXNztZA=="; }; buildInputs = globalBuildInputs; meta = { @@ -93843,7 +94417,7 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."glob-7.2.3" @@ -93962,7 +94536,7 @@ in sources."tar-6.1.13" sources."tr46-0.0.3" sources."traverse-0.3.9" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."universalify-0.1.2" @@ -93998,10 +94572,10 @@ in coc-pairs = nodeEnv.buildNodePackage { name = "coc-pairs"; packageName = "coc-pairs"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.4.1.tgz"; - sha512 = "iWLgnUnd8MXi5k1RQQ5GiCboRg+lpOkcziPCpn8eWpFmXc947XZuZF3CB6zFdNZD8ifNbs9mZtcf31DnLPQuew=="; + url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.4.2.tgz"; + sha512 = "4qcKB1i4SdQUKv8HT+/owk+fZn4zssX4NUOEZ5IFt+hP5pb6hdWMyuJvqnH5A0+5SYQuwg5zdtQeZnneUIApfg=="; }; buildInputs = globalBuildInputs; meta = { @@ -94037,13 +94611,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.284"; + version = "1.1.291"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.284.tgz"; - sha512 = "MP4yyTx1C7WCp6/l1JIBlSIZLmnoNLSjHPyt2rCKQyglt8T+4zt6pHDRgoG+nGs9SjxMASQJLU7y4tURHTV+4g=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.291.tgz"; + sha512 = "Ffl7Gynb4zqsmUelEFuB1gqV5tFGGR/+Btd8l7/YVZVZ3M2/Ur9nBa6K8+inWPMQUkZ00nQEbXGDKeOzDLDcJQ=="; }; dependencies = [ - sources."pyright-1.1.290" + sources."pyright-1.1.291" ]; buildInputs = globalBuildInputs; meta = { @@ -94117,10 +94691,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.71.1"; + version = "0.72.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.71.1.tgz"; - sha512 = "O8gH7wk6AMoRKBvfwvI9rF9MeZapS5fmN+U8/xlgB12IqcqkQliOWMbQYoH+jmb1/CWEnCg3hY6MjwWIwe9HBA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.72.0.tgz"; + sha512 = "kKbvsKyEDa+SND3mgOjdo3mGUUJwcHCt92fwZ9D7qLaE4y4SCxaHxrp3uAncaiMQUMicMT3a+5KEu0iaIXVnnQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -94188,7 +94762,7 @@ in sources."once-1.4.0" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."request-2.88.2" sources."request-promise-core-1.1.4" @@ -94198,7 +94772,7 @@ in sources."sshpk-1.17.0" sources."stealthy-require-1.1.1" sources."tough-cookie-2.5.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."turndown-7.1.1" sources."tweetnacl-0.14.5" @@ -94421,9 +94995,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -94439,15 +95013,15 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -94487,7 +95061,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -94665,7 +95239,7 @@ in sources."postcss-selector-parser-6.0.11" sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.2.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -94961,10 +95535,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "2.1.0"; + version = "2.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-2.1.0.tgz"; - sha512 = "gjc0WOlYu42m46+0kN+uBjSUPKq8kf+1aLuhnCTA6bp6cNRoen4Oe2QtTDGE71CHWSVbNYmAw1TYfRZBmHV8sQ=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-2.1.3.tgz"; + sha512 = "rzom53icaFoCF7p6Ps0dHqflS8yv+hOtQw43qOS4NL3b+rnulkfNracHFzuH1n1tyQWCzLgs73cAL1pBGrkUHQ=="; }; dependencies = [ sources."typescript-4.9.4" @@ -95092,10 +95666,10 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.3" @@ -95138,7 +95712,7 @@ in sources."progress-2.0.3" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."regexpp-3.2.0" sources."require-from-string-2.0.2" sources."resolve-1.22.1" @@ -95564,7 +96138,7 @@ in sources."strip-ansi-6.0.1" sources."supports-color-8.1.1" sources."tree-kill-1.2.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yargs-17.6.2" @@ -96097,7 +96671,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-2.7.4" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-6.0.1" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -96118,7 +96692,7 @@ in sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" sources."hosted-git-info-4.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http-errors-2.0.0" // { dependencies = [ sources."depd-2.0.0" @@ -96308,7 +96882,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pupa-2.1.1" sources."q-1.5.1" sources."qs-6.5.3" @@ -96398,7 +96972,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.17.3" + sources."systeminformation-5.17.4" (sources."tar-6.1.13" // { dependencies = [ sources."minipass-4.0.0" @@ -96687,7 +97261,7 @@ in sources."form-data-2.5.1" sources."formidable-1.2.6" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."globalthis-1.0.3" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -96960,7 +97534,7 @@ in sources."@cspell/dict-ruby-4.0.1" sources."@cspell/dict-rust-4.0.0" sources."@cspell/dict-scala-4.0.0" - sources."@cspell/dict-software-terms-3.1.0" + sources."@cspell/dict-software-terms-3.1.1" sources."@cspell/dict-sql-2.0.1" sources."@cspell/dict-svelte-1.0.2" sources."@cspell/dict-swift-2.0.1" @@ -97526,7 +98100,7 @@ in sources."pseudomap-1.0.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."queue-tick-1.0.1" sources."random-access-file-2.2.1" @@ -97907,10 +98481,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.96.0"; + version = "6.96.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.96.0.tgz"; - sha512 = "GJsJF+yxOBv5s/KS1h4nCnkhXbJtHm0nEq7xUTDxpI6aqHj9wWaWCURNjdGziN4lv3hNPtnHXt7TsM57nzAXbQ=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.96.1.tgz"; + sha512 = "YXsVhkOvhfSRj1oQsb+30nAX7VNEwAM8hoNV+DSz9uj+HrW4t5DWm2g7Cbc/LzpxPqFnLzp0nQCAvn84oudxMQ=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -98022,14 +98596,14 @@ in sources."through-2.3.8" (sources."tough-cookie-2.5.0" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."url-0.10.3" @@ -98250,7 +98824,7 @@ in sources."gauge-4.0.4" sources."get-caller-file-2.0.5" sources."get-installed-path-2.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" (sources."get-package-info-1.0.0" // { dependencies = [ sources."debug-2.6.9" @@ -98277,7 +98851,7 @@ in sources."has-unicode-2.0.1" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.1" @@ -98312,7 +98886,7 @@ in sources."jsonfile-6.1.0" sources."junk-3.1.0" sources."keyv-4.5.2" - sources."listr2-5.0.6" + sources."listr2-5.0.7" sources."load-json-file-2.0.0" sources."locate-path-2.0.0" sources."lodash-4.17.21" @@ -98478,7 +99052,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.13.1" sources."unique-filename-2.0.1" sources."unique-slug-3.0.0" @@ -98524,10 +99098,10 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "3.3.2"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-3.3.2.tgz"; - sha512 = "YHlGUS+qkSXOnwin67gC+6IfV87fkCUNUS/t8Lm9aXVTClLPNVOI3LPPJqnabPn6TzhYU3zSIP+S7IzOL8zqzA=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-3.4.1.tgz"; + sha512 = "YLeowqdlv7xHh7JBo3uYOjh5g2nZJFH5l6xIY/MO/f3vEEgHDltE8oXwgZ8JHzQ8n/PntyRZwffxVDsxMMS7vw=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -98909,7 +99483,7 @@ in sources."promise-limit-2.7.0" sources."promise-retry-2.0.1" sources."prompts-2.4.2" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qrcode-terminal-0.12.0" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" @@ -99103,13 +99677,13 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -99133,17 +99707,17 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.20.7" sources."@babel/plugin-transform-parameters-7.20.7" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -99153,7 +99727,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.26" + sources."@types/react-18.0.27" sources."@types/scheduler-0.16.2" sources."@types/yoga-layout-1.9.2" sources."ajv-6.12.6" @@ -99178,7 +99752,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -99331,7 +99905,7 @@ in sources."pkg-up-3.1.0" sources."prop-types-15.8.1" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."quick-lru-4.0.1" sources."react-16.14.0" sources."react-devtools-core-4.27.1" @@ -99471,13 +100045,13 @@ in sources."@azure/logger-1.0.3" (sources."@azure/msal-browser-2.32.2" // { dependencies = [ - sources."@azure/msal-common-9.1.0" + sources."@azure/msal-common-9.1.1" ]; }) sources."@azure/msal-common-7.6.0" (sources."@azure/msal-node-1.14.6" // { dependencies = [ - sources."@azure/msal-common-9.1.0" + sources."@azure/msal-common-9.1.1" sources."uuid-8.3.2" ]; }) @@ -99515,17 +100089,17 @@ in }) sources."@fluentui/date-time-utilities-8.5.4" sources."@fluentui/dom-utilities-2.2.4" - sources."@fluentui/font-icons-mdl2-8.5.6" - sources."@fluentui/foundation-legacy-8.2.26" + sources."@fluentui/font-icons-mdl2-8.5.7" + sources."@fluentui/foundation-legacy-8.2.27" sources."@fluentui/keyboard-key-0.4.4" sources."@fluentui/merge-styles-8.5.5" - sources."@fluentui/react-8.104.5" - sources."@fluentui/react-focus-8.8.12" + sources."@fluentui/react-8.104.8" + sources."@fluentui/react-focus-8.8.13" sources."@fluentui/react-hooks-8.6.15" sources."@fluentui/react-portal-compat-context-9.0.4" sources."@fluentui/react-window-provider-2.2.5" sources."@fluentui/set-version-8.2.4" - sources."@fluentui/style-utilities-8.8.5" + sources."@fluentui/style-utilities-8.9.0" sources."@fluentui/theme-2.6.21" sources."@fluentui/utilities-8.13.5" sources."@gar/promisify-1.1.3" @@ -99579,15 +100153,11 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/fs-1.1.1" sources."@npmcli/move-file-1.1.2" - sources."@redis/bloom-1.1.0" - (sources."@redis/client-1.4.2" // { - dependencies = [ - sources."cluster-key-slot-1.1.1" - ]; - }) + sources."@redis/bloom-1.2.0" + sources."@redis/client-1.5.3" sources."@redis/graph-1.1.0" sources."@redis/json-1.0.4" - sources."@redis/search-1.1.0" + sources."@redis/search-1.1.1" sources."@redis/time-series-1.0.4" (sources."@sap/hana-client-2.15.19" // { dependencies = [ @@ -99596,20 +100166,20 @@ in }) sources."@sindresorhus/is-0.14.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@szmarczak/http-timer-1.1.2" - sources."@tediousjs/connection-string-0.4.1" + sources."@tediousjs/connection-string-0.4.2" sources."@tokenizer/token-0.3.0" sources."@tootallnate/once-1.1.2" sources."@tsconfig/node10-1.0.9" @@ -99625,7 +100195,7 @@ in sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.32" + sources."@types/express-serve-static-core-4.17.33" sources."@types/file-type-10.9.1" sources."@types/js-yaml-4.0.4" sources."@types/json-schema-7.0.11" @@ -99639,7 +100209,7 @@ in sources."@types/prop-types-15.7.5" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/react-18.0.26" + sources."@types/react-18.0.27" sources."@types/react-dom-18.0.10" sources."@types/scheduler-0.16.2" sources."@types/serve-static-1.15.0" @@ -99693,7 +100263,7 @@ in sources."acorn-7.4.1" (sources."acorn-import-assertions-1.8.0" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" ]; }) sources."acorn-jsx-5.3.2" @@ -99793,7 +100363,7 @@ in sources."assign-symbols-1.0.0" sources."astral-regex-2.0.0" sources."async-done-1.3.2" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-limiter-1.0.1" sources."async-settle-1.0.0" sources."asynckit-0.4.0" @@ -99856,7 +100426,7 @@ in sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-4.1.2" sources."chardet-0.7.0" (sources."chokidar-2.1.8" // { @@ -100206,7 +100776,7 @@ in sources."generate-function-2.3.1" sources."generic-pool-3.9.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" @@ -100233,7 +100803,7 @@ in sources."which-1.3.1" ]; }) - sources."globals-13.19.0" + sources."globals-13.20.0" sources."globalthis-1.0.3" sources."globby-11.1.0" sources."glogg-1.0.2" @@ -100367,7 +100937,7 @@ in sources."highlight.js-10.7.3" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-1.7.2" (sources."http-proxy-agent-4.0.1" // { dependencies = [ @@ -100397,7 +100967,7 @@ in sources."interpret-1.4.0" sources."inversify-5.1.1" sources."invert-kv-1.0.0" - (sources."ioredis-5.2.5" // { + (sources."ioredis-5.3.0" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -100675,7 +101245,7 @@ in ]; }) sources."ms-2.0.0" - (sources."mssql-9.1.0" // { + (sources."mssql-9.1.1" // { dependencies = [ sources."commander-9.5.0" sources."debug-4.3.4" @@ -100720,7 +101290,7 @@ in sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-abi-3.31.0" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" sources."node-fetch-2.6.8" (sources."node-gyp-8.4.1" // { @@ -100859,9 +101429,9 @@ in sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."peek-readable-4.1.0" - sources."pg-8.8.0" + sources."pg-8.9.0" sources."pg-connection-string-2.5.0" - sources."pg-cursor-2.7.4" + sources."pg-cursor-2.8.0" sources."pg-int8-1.0.1" (sources."pg-native-3.0.1" // { dependencies = [ @@ -100872,8 +101442,8 @@ in ]; }) sources."pg-pool-3.5.2" - sources."pg-protocol-1.5.0" - sources."pg-query-stream-4.2.4" + sources."pg-protocol-1.6.0" + sources."pg-query-stream-4.3.0" sources."pg-types-2.2.0" sources."pgpass-1.0.5" sources."picocolors-0.2.1" @@ -100910,7 +101480,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.7.0" sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" @@ -100942,7 +101512,7 @@ in ]; }) sources."rechoir-0.6.2" - sources."redis-4.5.1" + sources."redis-4.6.2" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" sources."reflect-metadata-0.1.13" @@ -101174,7 +101744,7 @@ in }) (sources."terser-5.16.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."commander-2.20.3" ]; }) @@ -101211,10 +101781,10 @@ in sources."ts-log-2.2.5" (sources."ts-node-10.4.0" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -101302,7 +101872,7 @@ in sources."webidl-conversions-3.0.1" (sources."webpack-5.75.0" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" ]; }) sources."webpack-sources-3.2.3" @@ -101367,12 +101937,12 @@ in sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ sources."eslint-visitor-keys-1.3.0" sources."espree-7.3.1" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."ignore-4.0.6" sources."type-fest-0.20.2" ]; @@ -101415,8 +101985,8 @@ in sources."@types/body-parser-1.19.2" sources."@types/connect-3.4.35" sources."@types/connect-history-api-fallback-1.3.5" - sources."@types/express-4.17.15" - sources."@types/express-serve-static-core-4.17.32" + sources."@types/express-4.17.16" + sources."@types/express-serve-static-core-4.17.33" sources."@types/glob-7.2.0" sources."@types/hls.js-0.13.3" sources."@types/http-proxy-1.17.9" @@ -101665,7 +102235,7 @@ in sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" sources."async-2.6.4" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-foreach-0.1.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" @@ -101778,7 +102348,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -102114,7 +102684,7 @@ in sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" sources."flatted-3.2.7" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."is-fullwidth-code-point-3.0.0" @@ -102316,7 +102886,7 @@ in }) sources."gaze-1.1.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-6.0.0" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" @@ -103060,7 +103630,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.5.3" sources."query-string-4.3.4" @@ -103719,7 +104289,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -103761,7 +104331,7 @@ in sources."fs.realpath-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."grapheme-splitter-1.0.4" sources."has-flag-4.0.0" sources."ignore-5.2.4" @@ -103773,7 +104343,7 @@ in sources."is-glob-4.0.3" sources."is-path-inside-3.0.3" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + sources."js-sdsl-4.3.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -103792,7 +104362,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."prelude-ls-1.2.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."regexpp-3.2.0" sources."resolve-from-4.0.0" @@ -103839,7 +104409,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" @@ -103886,7 +104456,7 @@ in sources."fs.realpath-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."grapheme-splitter-1.0.4" sources."has-flag-4.0.0" sources."ignore-5.2.4" @@ -103898,7 +104468,7 @@ in sources."is-glob-4.0.3" sources."is-path-inside-3.0.3" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + sources."js-sdsl-4.3.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -103918,7 +104488,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."prelude-ls-1.2.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."regexpp-3.2.0" sources."resolve-from-4.0.0" @@ -103969,26 +104539,27 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "6.1.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-6.1.0.tgz"; - sha512 = "yhbevPdwof7oyjQup/dEYbxYZCiK/vYYQVnZA3CbYxtz0TG6LcEumz1Pn5WhAwU6vGCSmKpsJ02r4O0/bwIB/Q=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-6.2.1.tgz"; + sha512 = "trFLjh02d+KqN+7ENaaMEYr2ankQLZZO93uQAzSP7eJd5VxnUBNQj96Qr0XXIy5cSffViftBsDOkmTbQA++oMw=="; }; dependencies = [ - (sources."@ampproject/remapping-2.2.0" // { - dependencies = [ - sources."@jridgewell/gen-mapping-0.1.1" - ]; - }) + sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.20.10" - (sources."@babel/core-7.9.0" // { + sources."@babel/compat-data-7.20.14" + (sources."@babel/core-7.20.12" // { dependencies = [ + sources."@babel/code-frame-7.18.6" sources."json5-2.2.3" - sources."semver-5.7.1" + sources."semver-6.3.0" + ]; + }) + (sources."@babel/generator-7.20.14" // { + dependencies = [ + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/generator-7.20.7" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" (sources."@babel/helper-compilation-targets-7.20.7" // { @@ -104023,33 +104594,19 @@ in sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" - (sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" // { - dependencies = [ - sources."@babel/code-frame-7.18.6" - sources."@babel/core-7.20.12" - sources."json5-2.2.3" - sources."semver-6.3.0" - ]; - }) + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.18.6" - (sources."@babel/plugin-proposal-class-static-block-7.20.7" // { - dependencies = [ - sources."@babel/code-frame-7.18.6" - sources."@babel/core-7.20.12" - sources."json5-2.2.3" - sources."semver-6.3.0" - ]; - }) - sources."@babel/plugin-proposal-decorators-7.20.7" + sources."@babel/plugin-proposal-class-static-block-7.20.7" + sources."@babel/plugin-proposal-decorators-7.20.13" sources."@babel/plugin-proposal-dynamic-import-7.18.6" sources."@babel/plugin-proposal-export-default-from-7.18.10" sources."@babel/plugin-proposal-export-namespace-from-7.18.9" @@ -104086,7 +104643,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.11" + sources."@babel/plugin-transform-block-scoping-7.20.14" sources."@babel/plugin-transform-classes-7.20.7" sources."@babel/plugin-transform-computed-properties-7.20.7" sources."@babel/plugin-transform-destructuring-7.20.7" @@ -104108,7 +104665,7 @@ in sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-property-literals-7.18.6" sources."@babel/plugin-transform-react-display-name-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/plugin-transform-react-jsx-self-7.18.6" sources."@babel/plugin-transform-react-jsx-source-7.19.6" sources."@babel/plugin-transform-regenerator-7.20.5" @@ -104123,7 +104680,7 @@ in sources."@babel/plugin-transform-sticky-regex-7.18.6" sources."@babel/plugin-transform-template-literals-7.18.9" sources."@babel/plugin-transform-typeof-symbol-7.18.9" - sources."@babel/plugin-transform-typescript-7.20.7" + sources."@babel/plugin-transform-typescript-7.20.13" sources."@babel/plugin-transform-unicode-escapes-7.18.10" sources."@babel/plugin-transform-unicode-regex-7.18.6" (sources."@babel/preset-env-7.20.2" // { @@ -104138,7 +104695,7 @@ in sources."@babel/code-frame-7.18.6" ]; }) - (sources."@babel/traverse-7.20.12" // { + (sources."@babel/traverse-7.20.13" // { dependencies = [ sources."@babel/code-frame-7.18.6" ]; @@ -104149,7 +104706,7 @@ in sources."@expo/bunyan-4.0.0" (sources."@expo/cli-0.4.11" // { dependencies = [ - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" (sources."@expo/config-7.0.3" // { dependencies = [ sources."@expo/json-file-8.2.36" @@ -104293,7 +104850,19 @@ in sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.5.0" sources."@expo/vector-icons-13.0.0" - sources."@expo/webpack-config-0.17.4" + (sources."@expo/webpack-config-18.0.1" // { + dependencies = [ + sources."@expo/config-6.0.20" + (sources."@expo/config-plugins-4.1.1" // { + dependencies = [ + sources."semver-7.3.8" + ]; + }) + sources."@expo/config-types-44.0.0" + sources."@expo/json-file-8.2.35" + sources."@expo/plist-0.0.18" + ]; + }) (sources."@expo/xcpretty-4.2.2" // { dependencies = [ sources."js-yaml-4.1.0" @@ -104304,11 +104873,17 @@ in sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jest/types-26.6.2" - sources."@jridgewell/gen-mapping-0.3.2" + sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/set-array-1.1.2" + (sources."@jridgewell/source-map-0.3.2" // { + dependencies = [ + sources."@jridgewell/gen-mapping-0.3.2" + ]; + }) sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" + sources."@leichtgewicht/ip-codec-2.0.4" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -104330,69 +104905,66 @@ in sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" + sources."@trysound/sax-0.2.0" + sources."@types/body-parser-1.19.2" + sources."@types/bonjour-3.5.10" sources."@types/cacheable-request-6.0.3" + sources."@types/connect-3.4.35" + sources."@types/connect-history-api-fallback-1.3.5" + sources."@types/eslint-8.4.10" + sources."@types/eslint-scope-3.7.4" + sources."@types/estree-0.0.51" + sources."@types/express-4.17.16" + sources."@types/express-serve-static-core-4.17.33" sources."@types/glob-7.2.0" - sources."@types/html-minifier-terser-5.1.2" + sources."@types/html-minifier-terser-6.1.0" sources."@types/http-cache-semantics-4.0.1" + sources."@types/http-proxy-1.17.9" sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" sources."@types/json-schema-7.0.11" sources."@types/keyv-3.1.4" + sources."@types/mime-3.0.1" sources."@types/minimatch-5.1.2" sources."@types/node-18.11.18" - sources."@types/q-1.5.5" + sources."@types/qs-6.9.7" + sources."@types/range-parser-1.2.4" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.2" - sources."@types/source-list-map-0.1.2" - sources."@types/tapable-1.0.8" - (sources."@types/uglify-js-3.17.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - (sources."@types/webpack-4.41.33" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - (sources."@types/webpack-sources-3.2.0" // { - dependencies = [ - sources."source-map-0.7.4" - ]; - }) + sources."@types/serve-index-1.9.1" + sources."@types/serve-static-1.15.0" + sources."@types/sockjs-0.3.33" + sources."@types/ws-8.5.4" sources."@types/yargs-15.0.15" sources."@types/yargs-parser-21.0.0" sources."@urql/core-2.3.6" sources."@urql/exchange-retry-0.3.0" - sources."@webassemblyjs/ast-1.9.0" - sources."@webassemblyjs/floating-point-hex-parser-1.9.0" - sources."@webassemblyjs/helper-api-error-1.9.0" - sources."@webassemblyjs/helper-buffer-1.9.0" - sources."@webassemblyjs/helper-code-frame-1.9.0" - sources."@webassemblyjs/helper-fsm-1.9.0" - sources."@webassemblyjs/helper-module-context-1.9.0" - sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" - sources."@webassemblyjs/helper-wasm-section-1.9.0" - sources."@webassemblyjs/ieee754-1.9.0" - sources."@webassemblyjs/leb128-1.9.0" - sources."@webassemblyjs/utf8-1.9.0" - sources."@webassemblyjs/wasm-edit-1.9.0" - sources."@webassemblyjs/wasm-gen-1.9.0" - sources."@webassemblyjs/wasm-opt-1.9.0" - sources."@webassemblyjs/wasm-parser-1.9.0" - sources."@webassemblyjs/wast-parser-1.9.0" - sources."@webassemblyjs/wast-printer-1.9.0" + sources."@webassemblyjs/ast-1.11.1" + sources."@webassemblyjs/floating-point-hex-parser-1.11.1" + sources."@webassemblyjs/helper-api-error-1.11.1" + sources."@webassemblyjs/helper-buffer-1.11.1" + sources."@webassemblyjs/helper-numbers-1.11.1" + sources."@webassemblyjs/helper-wasm-bytecode-1.11.1" + sources."@webassemblyjs/helper-wasm-section-1.11.1" + sources."@webassemblyjs/ieee754-1.11.1" + sources."@webassemblyjs/leb128-1.11.1" + sources."@webassemblyjs/utf8-1.11.1" + sources."@webassemblyjs/wasm-edit-1.11.1" + sources."@webassemblyjs/wasm-gen-1.11.1" + sources."@webassemblyjs/wasm-opt-1.11.1" + sources."@webassemblyjs/wasm-parser-1.11.1" + sources."@webassemblyjs/wast-printer-1.11.1" sources."@xmldom/xmldom-0.7.9" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" + sources."abab-2.0.6" sources."accepts-1.3.8" - sources."acorn-6.4.2" - sources."address-1.1.2" + sources."acorn-8.8.2" + sources."acorn-import-assertions-1.8.0" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" sources."ajv-8.12.0" - sources."ajv-errors-1.0.1" sources."ajv-formats-2.1.1" (sources."ajv-keywords-3.5.2" // { dependencies = [ @@ -104400,61 +104972,30 @@ in sources."json-schema-traverse-0.4.1" ]; }) - sources."alphanum-sort-1.0.2" sources."ansi-align-3.0.1" - sources."ansi-colors-3.2.4" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" ]; }) - sources."ansi-html-0.0.7" + sources."ansi-html-community-0.0.8" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."any-promise-1.3.0" sources."anymatch-3.1.3" sources."application-config-path-0.1.1" - sources."aproba-1.2.0" sources."arg-4.1.0" sources."argparse-2.0.1" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."array.prototype.reduce-1.0.5" sources."arrify-2.0.1" sources."asap-2.0.6" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - (sources."assert-1.5.0" // { - dependencies = [ - sources."inherits-2.0.1" - sources."util-0.10.3" - ]; - }) - sources."assign-symbols-1.0.0" sources."async-1.5.2" - 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."available-typed-arrays-1.0.5" sources."axios-0.21.1" - (sources."babel-loader-8.1.0" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."loader-utils-1.4.2" - sources."schema-utils-2.7.1" - ]; - }) + sources."babel-loader-8.3.0" sources."babel-plugin-module-resolver-4.1.0" (sources."babel-plugin-polyfill-corejs2-0.3.3" // { dependencies = [ @@ -104463,31 +105004,23 @@ in }) sources."babel-plugin-polyfill-corejs3-0.6.0" sources."babel-plugin-polyfill-regenerator-0.4.1" - sources."babel-plugin-react-native-web-0.18.10" + sources."babel-plugin-react-native-web-0.18.12" sources."babel-preset-expo-9.2.2" sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) sources."base64-js-1.5.1" sources."batch-0.6.1" sources."better-opn-3.0.2" sources."big-integer-1.6.51" sources."big.js-5.2.2" sources."binary-extensions-2.2.0" - sources."bindings-1.5.0" - sources."bluebird-3.7.2" sources."blueimp-md5-2.19.0" - sources."bn.js-5.2.1" (sources."body-parser-1.19.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) - (sources."bonjour-3.5.0" // { + (sources."bonjour-service-1.1.0" // { dependencies = [ sources."array-flatten-2.1.2" ]; @@ -104502,26 +105035,12 @@ in sources."bplist-parser-0.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."brorand-1.1.0" - sources."browserify-aes-1.2.0" - sources."browserify-cipher-1.0.1" - sources."browserify-des-1.0.2" - sources."browserify-rsa-4.1.0" - (sources."browserify-sign-4.2.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."browserify-zlib-0.2.0" sources."browserslist-4.21.4" - sources."buffer-4.9.2" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" - sources."buffer-indexof-1.1.1" - sources."buffer-xor-1.0.3" - sources."builtin-status-codes-3.0.0" + sources."bufferutil-4.0.7" sources."builtins-1.0.3" sources."bytes-3.1.0" (sources."cacache-15.3.0" // { @@ -104530,18 +105049,14 @@ in sources."rimraf-3.0.2" ]; }) - sources."cache-base-1.0.1" sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.2" sources."call-bind-1.0.2" - sources."caller-callsite-2.0.0" - sources."caller-path-2.0.0" sources."callsite-1.0.0" - sources."callsites-2.0.0" sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -104556,31 +105071,9 @@ in sources."chownr-2.0.0" sources."chrome-trace-event-1.0.3" sources."ci-info-3.7.1" - sources."cipher-base-1.0.4" - (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."clean-css-4.2.4" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."clean-css-5.3.2" sources."clean-stack-2.2.0" - (sources."clean-webpack-plugin-3.0.0" // { + (sources."clean-webpack-plugin-4.0.0" // { dependencies = [ sources."array-union-1.0.2" sources."del-4.1.1" @@ -104594,34 +105087,17 @@ in sources."cli-cursor-2.1.0" sources."cli-spinners-2.7.0" sources."cli-table3-0.6.3" - (sources."cliui-5.0.0" // { - dependencies = [ - sources."ansi-regex-4.1.1" - 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."wrap-ansi-5.1.0" - ]; - }) sources."clone-1.0.4" sources."clone-response-1.0.3" - (sources."coa-2.0.2" // { - dependencies = [ - sources."chalk-2.4.2" - ]; - }) - sources."collection-visit-1.0.0" - sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.9.1" + sources."colord-2.9.3" + sources."colorette-2.0.19" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.17.1" sources."commondir-1.0.1" sources."compare-versions-3.6.0" - sources."component-emitter-1.3.0" sources."component-type-1.2.1" sources."compressible-2.0.18" (sources."compression-1.7.4" // { @@ -104640,48 +105116,24 @@ in sources."ms-2.0.0" ]; }) - sources."connect-history-api-fallback-1.6.0" - sources."console-browserify-1.2.0" - sources."constants-browserify-1.0.0" + sources."connect-history-api-fallback-2.0.0" sources."content-disposition-0.5.2" sources."content-type-1.0.4" sources."convert-source-map-1.9.0" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" - (sources."copy-concurrently-1.0.5" // { + (sources."copy-webpack-plugin-10.2.4" // { dependencies = [ - sources."rimraf-2.7.1" + sources."ajv-keywords-5.1.0" + sources."array-union-3.0.1" + sources."glob-parent-6.0.2" + sources."globby-12.2.0" + sources."schema-utils-4.0.0" + sources."slash-4.0.0" ]; }) - sources."copy-descriptor-0.1.1" - (sources."copy-webpack-plugin-6.0.4" // { - dependencies = [ - sources."ajv-6.12.6" - sources."find-cache-dir-3.3.2" - sources."find-up-4.1.0" - sources."json-schema-traverse-0.4.1" - sources."locate-path-5.0.0" - sources."make-dir-3.1.0" - (sources."p-locate-4.1.0" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) - sources."pkg-dir-4.2.0" - sources."schema-utils-2.7.1" - sources."semver-6.3.0" - ]; - }) - sources."core-js-compat-3.27.1" + sources."core-js-compat-3.27.2" sources."core-util-is-1.0.3" - sources."cosmiconfig-5.2.1" - (sources."create-ecdh-4.0.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."create-hash-1.2.0" - sources."create-hmac-1.1.7" (sources."cross-fetch-3.1.5" // { dependencies = [ sources."node-fetch-2.6.7" @@ -104693,67 +105145,42 @@ in ]; }) sources."crypt-0.0.2" - sources."crypto-browserify-3.12.0" sources."crypto-random-string-1.0.0" - sources."css-color-names-0.0.4" - sources."css-declaration-sorter-4.0.1" - (sources."css-loader-3.6.0" // { + sources."css-declaration-sorter-6.3.1" + (sources."css-loader-6.7.3" // { dependencies = [ - sources."ajv-6.12.6" - sources."camelcase-5.3.1" - sources."json-schema-traverse-0.4.1" - sources."loader-utils-1.4.2" - sources."schema-utils-2.7.1" - sources."semver-6.3.0" + sources."semver-7.3.8" ]; }) - (sources."css-select-4.3.0" // { + (sources."css-minimizer-webpack-plugin-3.4.1" // { dependencies = [ - sources."domhandler-4.3.1" - ]; - }) - sources."css-select-base-adapter-0.1.1" - (sources."css-tree-1.0.0-alpha.37" // { - dependencies = [ - sources."source-map-0.6.1" + sources."ajv-keywords-5.1.0" + sources."schema-utils-4.0.0" ]; }) + sources."css-select-4.3.0" + sources."css-tree-1.1.3" sources."css-what-6.1.0" sources."cssesc-3.0.0" - sources."cssnano-4.1.11" - sources."cssnano-preset-default-4.0.8" - sources."cssnano-util-get-arguments-4.0.0" - sources."cssnano-util-get-match-4.0.0" - sources."cssnano-util-raw-cache-4.0.1" - sources."cssnano-util-same-parent-4.0.1" - (sources."csso-4.2.0" // { - dependencies = [ - sources."css-tree-1.1.3" - sources."mdn-data-2.0.14" - sources."source-map-0.6.1" - ]; - }) - sources."cyclist-1.0.1" + sources."cssnano-5.1.14" + sources."cssnano-preset-default-5.2.13" + sources."cssnano-utils-3.1.0" + sources."csso-4.2.0" sources."dag-map-1.0.2" sources."dateformat-3.0.3" sources."debug-4.3.4" sources."decache-4.4.0" - sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.2" (sources."decompress-response-6.0.0" // { dependencies = [ sources."mimic-response-3.1.0" ]; }) - sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" sources."deepmerge-4.2.2" sources."default-gateway-4.2.0" sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" - sources."define-properties-1.1.4" - sources."define-property-2.0.2" (sources."del-6.1.1" // { dependencies = [ sources."rimraf-3.0.2" @@ -104761,51 +105188,21 @@ in }) sources."delayed-stream-1.0.0" sources."depd-1.1.2" - sources."des.js-1.0.1" sources."destroy-1.2.0" sources."detect-node-2.1.0" - (sources."detect-port-alt-1.1.6" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.12.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."dns-packet-5.4.0" sources."dom-converter-0.2.0" - (sources."dom-serializer-1.4.1" // { - dependencies = [ - sources."domhandler-4.3.1" - ]; - }) - sources."domain-browser-1.2.0" + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" - sources."domhandler-3.3.0" + sources."domhandler-4.3.1" sources."domino-2.1.6" - (sources."domutils-2.8.0" // { - dependencies = [ - sources."domhandler-4.3.1" - ]; - }) + sources."domutils-2.8.0" sources."dot-case-3.0.4" - sources."dot-prop-5.3.0" - sources."duplexer-0.1.2" sources."duplexer3-0.1.5" - sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."electron-to-chromium-1.4.284" - (sources."elliptic-6.5.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -104815,24 +105212,15 @@ in ]; }) sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-4.5.0" // { - dependencies = [ - sources."memory-fs-0.5.0" - ]; - }) + sources."enhanced-resolve-5.12.0" sources."entities-2.2.0" sources."env-editor-0.4.2" sources."eol-0.9.1" - sources."errno-0.1.8" - sources."error-ex-1.3.2" - sources."es-abstract-1.21.1" - sources."es-array-method-boxes-properly-1.0.0" - sources."es-set-tostringtag-2.0.1" - sources."es-to-primitive-1.2.1" + sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."eslint-scope-4.0.3" + sources."eslint-scope-5.1.1" sources."esprima-4.0.1" (sources."esrecurse-4.3.0" // { dependencies = [ @@ -104844,8 +105232,6 @@ in sources."etag-1.8.1" sources."eventemitter3-4.0.7" sources."events-3.3.0" - sources."eventsource-1.1.2" - sources."evp_bytestokey-1.0.3" sources."exec-async-2.2.0" (sources."execa-1.0.0" // { dependencies = [ @@ -104853,29 +105239,9 @@ in sources."is-stream-1.1.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."kind-of-5.1.0" - sources."ms-2.0.0" - ]; - }) (sources."expo-47.0.13" // { dependencies = [ - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" (sources."@expo/config-7.0.3" // { dependencies = [ sources."semver-7.3.2" @@ -104949,36 +105315,15 @@ in sources."statuses-1.4.0" ]; }) - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.15.0" - sources."faye-websocket-0.10.0" + sources."faye-websocket-0.11.4" sources."fbemitter-3.0.0" sources."fbjs-3.0.4" sources."fbjs-css-vars-1.0.2" sources."fetch-retry-4.1.1" - sources."figgy-pudding-3.5.2" - (sources."file-loader-6.0.0" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."schema-utils-2.7.1" - ]; - }) - sources."file-uri-to-path-1.0.0" - sources."filesize-6.1.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ @@ -104992,195 +105337,86 @@ in sources."path-exists-3.0.0" ]; }) - sources."find-cache-dir-2.1.0" + sources."find-cache-dir-3.3.2" 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.15.2" sources."fontfaceobserver-2.3.0" - sources."for-each-0.3.3" - sources."for-in-1.0.2" - (sources."fork-ts-checker-webpack-plugin-4.1.6" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."chalk-2.4.2" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."micromatch-3.1.10" - sources."semver-5.7.1" - sources."to-regex-range-2.1.1" - ]; - }) sources."form-data-2.5.1" sources."forwarded-0.2.0" - sources."fragment-cache-0.2.1" sources."freeport-async-2.0.0" sources."fresh-0.5.2" - sources."from2-2.3.0" (sources."fs-extra-9.0.0" // { dependencies = [ sources."universalify-1.0.0" ]; }) sources."fs-minipass-2.1.0" - sources."fs-write-stream-atomic-1.0.10" + sources."fs-monkey-1.0.3" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" - sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-port-3.2.0" sources."get-stream-5.2.0" - sources."get-symbol-description-1.0.0" - sources."get-value-2.0.6" sources."getenv-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.2" - sources."global-modules-2.0.0" - sources."global-prefix-3.0.0" + sources."glob-to-regexp-0.4.1" sources."globals-11.12.0" - sources."globalthis-1.0.3" sources."globby-11.1.0" - sources."gopd-1.0.1" sources."got-11.8.6" sources."graceful-fs-4.2.10" sources."graphql-15.8.0" sources."graphql-tag-2.12.6" - sources."gzip-size-5.1.1" sources."handle-thing-2.0.1" sources."has-1.0.3" - sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."has-value-1.0.0" - (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."hasbin-1.2.3" - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."hash.js-1.1.7" sources."hashids-1.1.4" sources."he-1.2.0" - sources."hex-color-regex-1.1.0" - sources."hmac-drbg-1.0.1" sources."hosted-git-info-3.0.8" sources."hpack.js-2.1.6" - sources."hsl-regex-1.0.0" - sources."hsla-regex-1.0.0" - sources."html-entities-1.4.0" - (sources."html-loader-1.1.0" // { + sources."html-entities-2.3.3" + (sources."html-minifier-terser-6.1.0" // { dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."schema-utils-2.7.1" + sources."commander-8.3.0" ]; }) - (sources."html-minifier-terser-5.1.1" // { - dependencies = [ - sources."commander-4.1.1" - ]; - }) - (sources."html-webpack-plugin-4.3.0" // { - dependencies = [ - sources."loader-utils-1.4.2" - ]; - }) - sources."htmlparser2-4.1.0" - sources."http-cache-semantics-4.1.0" + sources."html-webpack-plugin-5.5.0" + sources."htmlparser2-6.1.0" + sources."http-cache-semantics-4.1.1" sources."http-deceiver-1.2.7" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" ]; }) + sources."http-parser-js-0.5.8" sources."http-proxy-1.18.1" - (sources."http-proxy-middleware-0.19.1" // { - dependencies = [ - sources."braces-2.3.2" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - sources."to-regex-range-2.1.1" - ]; - }) + sources."http-proxy-middleware-2.0.6" sources."http2-wrapper-1.0.3" - sources."https-browserify-1.0.0" sources."https-proxy-agent-5.0.1" + sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" - sources."icss-utils-4.1.1" - sources."ieee754-1.2.1" - sources."iferr-0.1.5" + sources."icss-utils-5.1.0" sources."ignore-5.2.4" - sources."image-size-1.0.2" - sources."immer-8.0.1" - (sources."import-fresh-2.0.0" // { - dependencies = [ - sources."resolve-from-3.0.0" - ]; - }) - sources."import-local-2.0.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."indexes-of-1.0.1" sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."internal-ip-4.3.0" - sources."internal-slot-1.0.4" sources."invariant-2.2.4" - sources."ip-1.1.8" 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-array-buffer-3.0.1" - sources."is-arrayish-0.2.1" - 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.7" - sources."is-color-stop-1.1.0" sources."is-core-module-2.11.0" - sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.5" - sources."is-descriptor-1.0.2" - sources."is-directory-0.3.1" sources."is-docker-2.2.1" - sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" @@ -105190,10 +105426,7 @@ in sources."is-glob-2.0.1" ]; }) - sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" - sources."is-number-object-1.0.7" - sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" (sources."is-path-in-cwd-2.1.0" // { dependencies = [ @@ -105201,7 +105434,7 @@ in ]; }) sources."is-path-inside-3.0.3" - sources."is-plain-object-2.0.4" + sources."is-plain-obj-3.0.0" sources."is-port-reachable-2.0.1" (sources."is-reachable-4.0.0" // { dependencies = [ @@ -105226,25 +105459,16 @@ in sources."responselike-1.0.2" ]; }) - sources."is-regex-1.1.4" - sources."is-resolvable-1.1.0" sources."is-root-2.1.0" - sources."is-shared-array-buffer-1.0.2" sources."is-stream-2.0.1" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.10" sources."is-valid-path-0.1.1" - sources."is-weakref-1.0.2" - sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" - (sources."jest-worker-26.6.2" // { + (sources."jest-worker-27.5.1" // { dependencies = [ sources."has-flag-4.0.0" - sources."supports-color-7.2.0" + sources."supports-color-8.1.1" ]; }) sources."jimp-compact-0.16.1" @@ -105258,7 +105482,7 @@ in }) sources."jsesc-2.5.2" sources."json-buffer-3.0.1" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.1" (sources."json-schema-deref-sync-0.13.0" // { dependencies = [ sources."clone-2.1.2" @@ -105266,19 +105490,16 @@ in ]; }) sources."json-schema-traverse-1.0.0" - sources."json3-3.3.3" sources."json5-1.0.2" sources."jsonfile-6.1.0" sources."keychain-1.3.0" sources."keyv-4.5.2" - sources."killable-1.0.1" - sources."kind-of-6.0.3" sources."kleur-3.0.3" - sources."last-call-webpack-plugin-3.0.0" sources."latest-version-5.1.0" sources."leven-3.1.0" + sources."lilconfig-2.0.6" sources."lines-and-columns-1.2.4" - sources."loader-runner-2.4.0" + sources."loader-runner-4.3.0" (sources."loader-utils-2.0.4" // { dependencies = [ sources."json5-2.2.3" @@ -105295,60 +105516,40 @@ in sources."chalk-2.4.2" ]; }) - sources."loglevel-1.8.1" sources."loose-envify-1.4.0" sources."lower-case-2.0.2" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" - (sources."make-dir-2.1.0" // { + (sources."make-dir-3.1.0" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-6.3.0" ]; }) - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" sources."md5-2.3.0" sources."md5-file-3.2.3" - sources."md5.js-1.3.5" sources."md5hex-1.0.0" - sources."mdn-data-2.0.4" + sources."mdn-data-2.0.14" sources."media-typer-0.3.0" + sources."memfs-3.4.13" sources."memory-cache-0.2.0" - sources."memory-fs-0.4.1" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" - (sources."metro-react-native-babel-preset-0.72.3" // { - dependencies = [ - sources."@babel/code-frame-7.18.6" - sources."@babel/core-7.20.12" - sources."json5-2.2.3" - sources."semver-6.3.0" - ]; - }) - sources."microevent.ts-0.1.1" + sources."metro-react-native-babel-preset-0.72.3" sources."micromatch-4.0.5" - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."mime-2.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - (sources."mini-css-extract-plugin-0.5.0" // { + (sources."mini-css-extract-plugin-2.7.2" // { dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."loader-utils-1.4.2" - sources."schema-utils-1.0.0" + sources."ajv-keywords-5.1.0" + sources."schema-utils-4.0.0" ]; }) sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" sources."minipass-3.1.6" @@ -105356,25 +105557,12 @@ in sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minizlib-2.1.2" - sources."mississippi-3.0.0" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."mkdirp-0.5.6" - (sources."move-concurrently-1.0.1" // { - dependencies = [ - sources."rimraf-2.7.1" - ]; - }) sources."ms-2.1.2" - sources."multicast-dns-6.2.3" - sources."multicast-dns-service-types-1.1.0" + sources."multicast-dns-7.2.5" sources."mv-2.1.1" sources."mz-2.7.0" - sources."nan-2.17.0" - sources."nanomatch-1.2.13" + sources."nanoid-3.3.4" sources."ncp-2.0.0" (sources."needle-2.9.1" // { dependencies = [ @@ -105388,13 +105576,8 @@ in sources."no-case-3.0.4" sources."node-fetch-2.6.8" sources."node-forge-0.10.0" - sources."node-html-parser-1.4.9" - (sources."node-libs-browser-2.2.1" // { - dependencies = [ - sources."path-browserify-0.0.1" - sources."punycode-1.4.1" - ]; - }) + sources."node-gyp-build-4.6.0" + sources."node-html-parser-5.4.2" sources."node-releases-2.0.8" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" @@ -105408,40 +105591,13 @@ in sources."nth-check-2.1.1" sources."nullthrows-1.1.1" sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) sources."object-inspect-1.12.3" - sources."object-is-1.1.5" - sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.4" - sources."object.entries-1.1.6" - sources."object.getownpropertydescriptors-2.1.5" - sources."object.pick-1.3.0" - sources."object.values-1.1.6" sources."obuf-1.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-8.4.0" - (sources."opn-5.5.0" // { - dependencies = [ - sources."is-wsl-1.1.0" - ]; - }) - sources."optimize-css-assets-webpack-plugin-5.0.8" (sources."ora-3.4.0" // { dependencies = [ sources."ansi-regex-4.1.1" @@ -105449,7 +105605,6 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" @@ -105492,23 +105647,16 @@ in sources."semver-6.3.0" ]; }) - sources."pako-1.0.11" - sources."parallel-transform-1.2.0" sources."param-case-3.0.4" - sources."parse-asn1-5.1.6" - sources."parse-json-4.0.0" sources."parse-png-2.1.0" - sources."parse-srcset-1.0.2" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" - sources."pascalcase-0.1.1" (sources."password-prompt-1.1.2" // { dependencies = [ sources."ansi-escapes-3.2.0" ]; }) sources."path-browserify-1.0.1" - sources."path-dirname-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -105516,20 +105664,18 @@ in sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" - sources."pbkdf2-3.1.2" - sources."picocolors-0.2.1" + sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pirates-4.0.5" - (sources."pkg-dir-3.0.0" // { + (sources."pkg-dir-4.2.0" // { dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" + sources."find-up-4.1.0" + sources."locate-path-5.0.0" sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" + sources."p-locate-4.1.0" ]; }) (sources."pkg-up-3.1.0" // { @@ -105547,133 +105693,43 @@ in ]; }) sources."pngjs-3.4.0" - sources."pnp-webpack-plugin-1.7.0" - (sources."portfinder-1.0.32" // { - dependencies = [ - sources."async-2.6.4" - sources."debug-3.2.7" - ]; - }) - sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.39" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."postcss-calc-7.0.5" - (sources."postcss-colormin-4.0.3" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-convert-values-4.0.1" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-discard-comments-4.0.2" - sources."postcss-discard-duplicates-4.0.2" - sources."postcss-discard-empty-4.0.1" - sources."postcss-discard-overridden-4.0.1" - (sources."postcss-merge-longhand-4.0.11" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-merge-rules-4.0.3" // { - dependencies = [ - sources."postcss-selector-parser-3.1.2" - ]; - }) - (sources."postcss-minify-font-values-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-minify-gradients-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-minify-params-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-minify-selectors-4.0.2" // { - dependencies = [ - sources."postcss-selector-parser-3.1.2" - ]; - }) - sources."postcss-modules-extract-imports-2.0.0" - sources."postcss-modules-local-by-default-3.0.3" - sources."postcss-modules-scope-2.2.0" - sources."postcss-modules-values-3.0.0" - sources."postcss-normalize-charset-4.0.1" - (sources."postcss-normalize-display-values-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-positions-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-repeat-style-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-string-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-timing-functions-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-unicode-4.0.1" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-url-4.0.1" // { - dependencies = [ - sources."normalize-url-3.3.0" - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-normalize-whitespace-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - (sources."postcss-ordered-values-4.1.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-reduce-initial-4.0.3" - (sources."postcss-reduce-transforms-4.0.2" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-safe-parser-4.0.2" + sources."postcss-8.4.21" + sources."postcss-calc-8.2.4" + sources."postcss-colormin-5.3.0" + sources."postcss-convert-values-5.1.3" + sources."postcss-discard-comments-5.1.2" + sources."postcss-discard-duplicates-5.1.0" + sources."postcss-discard-empty-5.1.1" + sources."postcss-discard-overridden-5.1.0" + sources."postcss-merge-longhand-5.1.7" + sources."postcss-merge-rules-5.1.3" + sources."postcss-minify-font-values-5.1.0" + sources."postcss-minify-gradients-5.1.1" + sources."postcss-minify-params-5.1.4" + sources."postcss-minify-selectors-5.2.1" + sources."postcss-modules-extract-imports-3.0.0" + sources."postcss-modules-local-by-default-4.0.0" + sources."postcss-modules-scope-3.0.0" + sources."postcss-modules-values-4.0.0" + sources."postcss-normalize-charset-5.1.0" + sources."postcss-normalize-display-values-5.1.0" + sources."postcss-normalize-positions-5.1.1" + sources."postcss-normalize-repeat-style-5.1.1" + sources."postcss-normalize-string-5.1.0" + sources."postcss-normalize-timing-functions-5.1.0" + sources."postcss-normalize-unicode-5.1.1" + sources."postcss-normalize-url-5.1.0" + sources."postcss-normalize-whitespace-5.1.1" + sources."postcss-ordered-values-5.1.3" + sources."postcss-reduce-initial-5.1.1" + sources."postcss-reduce-transforms-5.1.0" sources."postcss-selector-parser-6.0.11" - (sources."postcss-svgo-4.0.3" // { - dependencies = [ - sources."postcss-value-parser-3.3.1" - ]; - }) - sources."postcss-unique-selectors-4.0.1" + sources."postcss-svgo-5.1.0" + sources."postcss-unique-selectors-5.1.1" sources."postcss-value-parser-4.2.0" sources."prepend-http-3.0.1" sources."pretty-bytes-5.6.0" - sources."pretty-error-2.1.2" + sources."pretty-error-4.0.0" (sources."pretty-format-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -105682,68 +105738,23 @@ in ]; }) sources."probe-image-size-6.0.0" - sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-7.3.1" sources."promise-inflight-1.0.1" sources."prompts-2.4.2" sources."proxy-addr-2.0.7" - sources."prr-1.0.1" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."pump-3.0.0" - (sources."pumpify-1.5.1" // { - dependencies = [ - sources."pump-2.0.1" - ]; - }) - sources."punycode-2.2.0" - sources."q-1.5.1" + sources."punycode-2.3.0" sources."qrcode-terminal-0.11.0" sources."qs-6.7.0" - sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" sources."querystringify-2.2.0" - sources."queue-6.0.2" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."randombytes-2.1.0" - sources."randomfill-1.0.4" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - (sources."react-dev-utils-11.0.4" // { - dependencies = [ - sources."browserslist-4.14.2" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."escape-string-regexp-1.0.5" - ]; - }) - sources."cross-spawn-7.0.3" - sources."escape-string-regexp-2.0.0" - sources."find-up-4.1.0" - sources."globby-11.0.1" - sources."json5-2.2.3" - sources."loader-utils-2.0.0" - sources."locate-path-5.0.0" - sources."node-releases-1.1.77" - sources."open-7.4.2" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."path-key-3.1.1" - sources."prompts-2.4.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."strip-ansi-6.0.0" - sources."which-2.0.2" - ]; - }) - sources."react-error-overlay-6.0.11" sources."react-is-17.0.2" sources."react-refresh-0.4.3" sources."read-chunk-3.2.0" @@ -105754,17 +105765,10 @@ in ]; }) sources."readdirp-3.6.0" - (sources."recursive-readdir-2.2.2" // { - dependencies = [ - sources."minimatch-3.0.4" - ]; - }) sources."regenerate-1.4.2" sources."regenerate-unicode-properties-10.1.0" sources."regenerator-runtime-0.13.11" sources."regenerator-transform-0.15.1" - sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.3" sources."regexpu-core-5.2.2" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" @@ -105775,21 +105779,9 @@ in ]; }) sources."relateurl-0.2.7" - sources."remove-trailing-separator-1.1.0" sources."remove-trailing-slash-0.1.1" - (sources."renderkid-2.0.7" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."domhandler-4.3.1" - sources."htmlparser2-6.1.0" - sources."strip-ansi-3.0.1" - ]; - }) - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."require-directory-2.1.1" + sources."renderkid-3.0.0" sources."require-from-string-2.0.2" - sources."require-main-filename-2.0.0" (sources."requireg-0.2.2" // { dependencies = [ sources."resolve-1.7.1" @@ -105799,43 +105791,34 @@ in sources."reselect-4.1.7" sources."resolve-1.22.1" sources."resolve-alpn-1.2.1" - (sources."resolve-cwd-2.0.0" // { - dependencies = [ - sources."resolve-from-3.0.0" - ]; - }) sources."resolve-from-5.0.0" - sources."resolve-url-0.2.1" sources."responselike-2.0.1" sources."restore-cursor-2.0.0" - sources."ret-0.1.15" sources."retry-0.12.0" sources."reusify-1.0.4" - sources."rgb-regex-1.0.1" - sources."rgba-regex-1.0.0" (sources."rimraf-2.4.5" // { dependencies = [ sources."glob-6.0.4" ]; }) - sources."ripemd160-2.0.2" sources."router-ips-1.0.0" sources."run-parallel-1.2.0" - sources."run-queue-1.0.3" sources."safe-buffer-5.2.1" sources."safe-json-stringify-1.2.0" - sources."safe-regex-1.1.0" - sources."safe-regex-test-1.0.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - (sources."schema-utils-3.1.1" // { + (sources."schema-utils-2.7.1" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" ]; }) sources."select-hose-2.0.0" - sources."selfsigned-1.10.14" + (sources."selfsigned-2.1.1" // { + dependencies = [ + sources."node-forge-1.3.1" + ]; + }) sources."semver-7.3.2" (sources."send-0.18.0" // { dependencies = [ @@ -105855,7 +105838,7 @@ in ]; }) sources."serialize-error-6.0.0" - sources."serialize-javascript-4.0.0" + sources."serialize-javascript-6.0.1" (sources."serve-index-1.9.1" // { dependencies = [ sources."debug-2.6.9" @@ -105878,18 +105861,10 @@ in sources."statuses-1.4.0" ]; }) - sources."set-blocking-2.0.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) sources."setimmediate-1.0.5" sources."setprototypeof-1.1.1" - sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.2" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" (sources."simple-plist-1.4.0" // { @@ -105897,60 +105872,23 @@ in sources."bplist-parser-0.3.2" ]; }) - (sources."simple-swizzle-0.2.2" // { - dependencies = [ - sources."is-arrayish-0.3.2" - ]; - }) sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."slugify-1.6.5" - (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."kind-of-5.1.0" - sources."ms-2.0.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."sockjs-0.3.20" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - (sources."sockjs-client-1.4.0" // { - dependencies = [ - sources."debug-3.2.7" - sources."faye-websocket-0.11.4" - ]; - }) + sources."sockjs-0.3.24" sources."source-list-map-2.0.1" - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-support-0.4.18" - sources."source-map-url-0.4.1" + sources."source-map-0.6.1" + sources."source-map-js-1.0.2" + (sources."source-map-loader-3.0.2" // { + dependencies = [ + sources."iconv-lite-0.6.3" + ]; + }) + (sources."source-map-support-0.4.18" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -105958,42 +105896,18 @@ in ]; }) sources."split-1.0.1" - sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."ssri-8.0.1" sources."stable-0.1.8" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."statuses-1.5.0" - sources."stream-browserify-2.0.2" sources."stream-buffers-2.2.0" - sources."stream-each-1.2.3" - sources."stream-http-2.8.3" (sources."stream-parser-0.3.1" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" ]; }) - sources."stream-shift-1.0.1" sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.6" - sources."string.prototype.trimstart-1.0.6" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -106001,20 +105915,11 @@ in }) sources."strip-ansi-6.0.1" sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."structured-headers-0.4.1" - (sources."style-loader-1.2.1" // { - dependencies = [ - sources."ajv-6.12.6" - sources."json-schema-traverse-0.4.1" - sources."schema-utils-2.7.1" - ]; - }) - (sources."stylehacks-4.0.3" // { - dependencies = [ - sources."postcss-selector-parser-3.1.2" - ]; - }) + sources."style-loader-3.3.1" + sources."stylehacks-5.1.1" (sources."sucrase-3.29.0" // { dependencies = [ sources."commander-4.1.1" @@ -106029,22 +105934,12 @@ in ]; }) sources."supports-preserve-symlinks-flag-1.0.0" - (sources."svgo-1.3.2" // { + (sources."svgo-2.8.0" // { dependencies = [ - sources."chalk-2.4.2" - sources."css-select-2.1.0" - sources."css-what-3.4.2" - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.3.0" - ]; - }) - sources."domelementtype-1.3.1" - sources."domutils-1.7.0" - sources."nth-check-1.0.2" + sources."commander-7.2.0" ]; }) - sources."tapable-1.1.3" + sources."tapable-2.2.1" (sources."tar-6.1.13" // { dependencies = [ sources."minipass-4.0.0" @@ -106060,269 +105955,133 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-4.8.1" // { + (sources."terser-5.16.1" // { dependencies = [ sources."commander-2.20.3" - sources."source-map-0.6.1" sources."source-map-support-0.5.21" ]; }) - (sources."terser-webpack-plugin-3.1.0" // { + (sources."terser-webpack-plugin-5.3.6" // { dependencies = [ sources."ajv-6.12.6" - sources."find-cache-dir-3.3.2" - sources."find-up-4.1.0" sources."json-schema-traverse-0.4.1" - sources."locate-path-5.0.0" - sources."make-dir-3.1.0" - (sources."p-locate-4.1.0" // { - dependencies = [ - sources."p-limit-2.3.0" - ]; - }) - sources."pkg-dir-4.2.0" - sources."schema-utils-2.7.1" - sources."semver-6.3.0" - sources."source-map-0.6.1" + sources."schema-utils-3.1.1" ]; }) sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" sources."through-2.3.8" - sources."through2-2.0.5" sources."thunky-1.1.0" - sources."timers-browserify-2.0.12" - sources."timsort-0.3.0" sources."tmp-0.0.33" - sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."to-readable-stream-1.0.0" - sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tr46-0.0.3" sources."traverse-0.6.7" sources."tree-kill-1.2.2" sources."ts-interface-checker-0.1.13" - sources."ts-pnp-1.2.0" - sources."tslib-2.4.1" - sources."tty-browserify-0.0.0" + sources."tslib-2.5.0" sources."turndown-7.0.0" sources."type-fest-0.12.0" sources."type-is-1.6.18" - sources."typed-array-length-1.0.4" sources."typedarray-0.0.6" - sources."ua-parser-js-0.7.32" - sources."unbox-primitive-1.0.2" + sources."ua-parser-js-0.7.33" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.1.0" sources."unicode-property-aliases-ecmascript-2.1.0" - sources."union-value-1.0.1" - sources."uniq-1.0.1" - sources."uniqs-2.0.0" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-1.0.0" sources."universalify-2.0.0" sources."unpipe-1.0.0" - sources."unquote-1.1.1" - (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."untildify-3.0.3" - sources."upath-1.2.0" - (sources."update-browserslist-db-1.0.10" // { - dependencies = [ - sources."picocolors-1.0.0" - ]; - }) + sources."update-browserslist-db-1.0.10" sources."update-check-1.5.3" sources."uri-js-4.4.1" - sources."urix-0.1.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) sources."url-join-4.0.0" - sources."url-loader-4.1.1" sources."url-parse-1.5.10" (sources."url-parse-lax-3.0.0" // { dependencies = [ sources."prepend-http-2.0.0" ]; }) - sources."use-3.1.1" - (sources."util-0.11.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.0" sources."utila-0.4.0" sources."utils-merge-1.0.1" sources."uuid-8.3.2" sources."valid-url-1.0.9" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" - sources."vendors-1.0.4" - sources."vm-browserify-1.1.2" - sources."watchpack-1.7.5" - (sources."watchpack-chokidar2-2.0.1" // { - dependencies = [ - sources."anymatch-2.0.0" - sources."binary-extensions-1.13.1" - sources."braces-2.3.2" - sources."chokidar-2.1.8" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."fsevents-1.2.13" - sources."glob-parent-3.1.0" - sources."is-binary-path-1.0.1" - sources."is-glob-3.1.0" - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - sources."normalize-path-2.1.1" - sources."readdirp-2.2.1" - sources."to-regex-range-2.1.1" - ]; - }) + sources."watchpack-2.4.0" sources."wbuf-1.7.3" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" - (sources."webpack-4.43.0" // { + (sources."webpack-5.75.0" // { dependencies = [ sources."ajv-6.12.6" - sources."braces-2.3.2" - sources."cacache-12.0.4" - sources."chownr-1.1.4" - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - sources."is-number-3.0.0" - sources."is-wsl-1.1.0" sources."json-schema-traverse-0.4.1" - sources."kind-of-3.2.2" - sources."loader-utils-1.4.2" - sources."lru-cache-5.1.1" - sources."micromatch-3.1.10" - sources."rimraf-2.7.1" - sources."schema-utils-1.0.0" - sources."source-map-0.6.1" - sources."ssri-6.0.2" - sources."terser-webpack-plugin-1.4.5" - sources."to-regex-range-2.1.1" - sources."yallist-3.1.1" + sources."schema-utils-3.1.1" + sources."webpack-sources-3.2.3" ]; }) - sources."webpack-dev-middleware-3.7.3" - (sources."webpack-dev-server-3.11.0" // { + (sources."webpack-dev-middleware-5.3.3" // { dependencies = [ - sources."ajv-6.12.6" - sources."ansi-regex-2.1.1" - sources."anymatch-2.0.0" - sources."array-union-1.0.2" - sources."binary-extensions-1.13.1" - (sources."body-parser-1.20.1" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."braces-2.3.2" + sources."ajv-keywords-5.1.0" + sources."schema-utils-4.0.0" + ]; + }) + (sources."webpack-dev-server-4.11.1" // { + dependencies = [ + sources."@types/retry-0.12.0" + sources."ajv-keywords-5.1.0" + sources."body-parser-1.20.1" sources."bytes-3.1.2" - sources."chokidar-2.1.8" sources."content-disposition-0.5.4" sources."cookie-0.5.0" - sources."del-4.1.1" + sources."cross-spawn-7.0.3" + sources."debug-2.6.9" + sources."default-gateway-6.0.3" sources."depd-2.0.0" - (sources."express-4.18.2" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."extend-shallow-2.0.1" - sources."fill-range-4.0.0" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."fsevents-1.2.13" - sources."glob-parent-3.1.0" - sources."globby-6.1.0" + sources."execa-5.1.1" + sources."express-4.18.2" + sources."finalhandler-1.2.0" + sources."get-stream-6.0.1" sources."http-errors-2.0.0" - sources."is-absolute-url-3.0.3" - sources."is-binary-path-1.0.1" - sources."is-glob-3.1.0" - sources."is-number-3.0.0" - sources."json-schema-traverse-0.4.1" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" + sources."ipaddr.js-2.0.1" + sources."mimic-fn-2.1.0" sources."ms-2.0.0" - sources."normalize-path-2.1.1" + sources."npm-run-path-4.0.1" sources."on-finished-2.4.1" - sources."p-map-2.1.0" - sources."p-retry-3.0.1" - sources."pify-2.3.0" + sources."onetime-5.1.2" + sources."p-retry-4.6.2" + sources."path-key-3.1.1" sources."qs-6.11.0" sources."raw-body-2.5.1" - sources."readdirp-2.2.1" - sources."rimraf-2.7.1" - sources."schema-utils-1.0.0" - sources."semver-6.3.0" + sources."retry-0.13.1" + sources."rimraf-3.0.2" + sources."schema-utils-4.0.0" sources."serve-static-1.15.0" sources."setprototypeof-1.2.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."statuses-2.0.1" - sources."strip-ansi-3.0.1" - sources."supports-color-6.1.0" - sources."to-regex-range-2.1.1" sources."toidentifier-1.0.1" + sources."which-2.0.2" ]; }) - (sources."webpack-log-2.0.0" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) - (sources."webpack-manifest-plugin-2.2.0" // { - dependencies = [ - sources."fs-extra-7.0.1" - sources."jsonfile-4.0.0" - sources."universalify-0.1.2" - ]; - }) - (sources."webpack-sources-1.4.3" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."websocket-driver-0.6.5" + sources."webpack-manifest-plugin-4.1.1" + sources."webpack-sources-2.3.1" + sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" sources."whatwg-url-5.0.0" sources."which-1.3.1" - sources."which-boxed-primitive-1.0.2" - sources."which-module-2.0.0" - sources."which-typed-array-1.1.9" sources."widest-line-3.1.0" sources."with-open-file-0.1.7" sources."wonka-4.0.15" - sources."worker-farm-1.7.0" - sources."worker-rpc-0.1.1" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -106332,13 +106091,13 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-6.2.2" + sources."ws-8.12.0" (sources."xcode-3.0.1" // { dependencies = [ sources."uuid-7.0.3" ]; }) - (sources."xdl-59.3.0" // { + (sources."xdl-60.0.1" // { dependencies = [ sources."bplist-parser-0.3.2" sources."minimatch-3.0.4" @@ -106351,28 +106110,8 @@ in ]; }) sources."xmlbuilder-14.0.0" - sources."xtend-4.0.2" - sources."y18n-4.0.3" sources."yallist-4.0.0" - (sources."yargs-13.3.2" // { - dependencies = [ - sources."ansi-regex-4.1.1" - sources."emoji-regex-7.0.3" - sources."find-up-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."locate-path-3.0.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) - (sources."yargs-parser-13.1.2" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) + sources."yaml-1.10.2" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -106396,9 +106135,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -106416,17 +106155,17 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-proposal-object-rest-spread-7.20.7" sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.20.7" sources."@babel/plugin-transform-parameters-7.20.7" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -106437,7 +106176,7 @@ in sources."@types/node-18.11.18" sources."@types/normalize-package-data-2.4.1" sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.26" + sources."@types/react-18.0.27" sources."@types/scheduler-0.16.2" sources."@types/yauzl-2.10.0" sources."@types/yoga-layout-1.9.2" @@ -106465,7 +106204,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -106711,7 +106450,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/command-1.8.21" + sources."@oclif/command-1.8.22" sources."@oclif/config-1.18.6" sources."@oclif/errors-1.3.6" (sources."@oclif/help-1.0.5" // { @@ -106720,7 +106459,7 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.9" + sources."@oclif/parser-3.8.10" (sources."@oclif/plugin-autocomplete-0.1.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -106965,7 +106704,7 @@ in ]; }) sources."nice-try-1.0.5" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-fetch-2.6.8" sources."normalize-url-2.0.1" sources."npm-run-path-2.0.2" @@ -106992,7 +106731,7 @@ in sources."prettier-2.8.3" sources."process-nextick-args-2.0.1" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."query-string-5.1.1" sources."queue-microtask-1.2.3" @@ -107047,7 +106786,7 @@ in sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."treeify-1.1.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -107085,18 +106824,18 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "11.20.0"; + version = "11.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.20.0.tgz"; - sha512 = "jFDqWcYuydvHbx1uE1iDSx2pmqyIe2YuF7Jrf28HxU4VZyRPXII010v9OfT8cn5EJlA47WTDWuO2Fbx8EYPL7g=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.21.0.tgz"; + sha512 = "9J70y9E4t80rAGs9fvtTt2jhqMUNwOch0F7uqG/OQn6rRSkKGqpnaozUkCjRCmWaQi0bM8vYxruGyD0E+sqZlw=="; }; dependencies = [ - (sources."@apidevtools/json-schema-ref-parser-9.1.0" // { + (sources."@apidevtools/json-schema-ref-parser-9.1.2" // { dependencies = [ sources."js-yaml-4.1.0" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@gar/promisify-1.1.3" @@ -107104,7 +106843,7 @@ in sources."@google-cloud/precise-date-3.0.1" sources."@google-cloud/projectify-3.0.0" sources."@google-cloud/promisify-2.0.4" - (sources."@google-cloud/pubsub-3.2.1" // { + (sources."@google-cloud/pubsub-3.3.0" // { dependencies = [ sources."google-auth-library-8.7.0" ]; @@ -107132,8 +106871,6 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" sources."@types/duplexify-3.6.1" sources."@types/json-schema-7.0.11" @@ -107145,7 +106882,7 @@ in sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" @@ -107232,12 +106969,6 @@ in sources."minimatch-5.1.6" ]; }) - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) sources."call-bind-1.0.2" sources."call-me-maybe-1.0.2" sources."camelcase-6.3.0" @@ -107260,7 +106991,6 @@ in sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-1.0.4" - sources."clone-response-1.0.3" (sources."color-3.2.1" // { dependencies = [ sources."color-convert-1.9.3" @@ -107329,12 +107059,10 @@ in sources."dashdash-1.14.1" sources."data-uri-to-buffer-3.0.1" sources."debug-4.3.4" - sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."deep-freeze-0.0.1" sources."deep-is-0.1.4" sources."defaults-1.0.4" - sources."defer-to-connect-1.1.3" sources."degenerator-3.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -107348,7 +107076,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."duplexer3-0.1.5" sources."duplexify-4.1.2" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" @@ -107455,8 +107182,7 @@ in sources."gaxios-5.0.2" sources."gcp-metadata-5.2.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" - sources."get-stream-4.1.0" + sources."get-intrinsic-1.2.0" (sources."get-uri-3.0.2" // { dependencies = [ sources."fs-extra-8.1.0" @@ -107484,7 +107210,6 @@ in ]; }) sources."google-p12-pem-4.0.1" - sources."got-9.6.0" sources."graceful-fs-4.2.10" sources."gtoken-6.1.2" sources."har-schema-2.0.0" @@ -107495,7 +107220,7 @@ in sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" sources."heap-js-2.2.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" @@ -107551,26 +107276,24 @@ in sources."jsbn-0.1.1" sources."jsdoc-3.6.11" sources."json-bigint-1.0.0" - sources."json-buffer-3.0.0" sources."json-parse-helpfulerror-1.0.3" sources."json-ptr-3.1.1" sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" - (sources."jsonwebtoken-8.5.1" // { + (sources."jsonwebtoken-9.0.0" // { dependencies = [ sources."jwa-1.4.1" sources."jws-3.2.2" + sources."semver-7.3.8" ]; }) sources."jsprim-1.4.2" sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-3.1.0" sources."klaw-3.0.0" sources."kuler-2.0.0" - sources."latest-version-5.1.0" (sources."lazystream-1.0.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -107590,20 +107313,13 @@ in sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" - sources."lodash.includes-4.3.0" - sources."lodash.isboolean-3.0.3" - sources."lodash.isinteger-4.0.4" - sources."lodash.isnumber-3.0.3" sources."lodash.isobject-2.4.1" sources."lodash.isplainobject-4.0.6" - sources."lodash.isstring-4.0.1" - sources."lodash.once-4.1.1" sources."lodash.snakecase-4.1.1" sources."lodash.union-4.6.0" sources."log-symbols-4.1.0" sources."logform-2.4.2" sources."long-4.0.0" - sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -107636,7 +107352,6 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" - sources."mimic-response-1.0.1" (sources."minimatch-3.1.2" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -107676,7 +107391,6 @@ in sources."node-gyp-build-4.6.0" sources."nopt-6.0.0" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" sources."npmlog-6.0.2" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" @@ -107692,17 +107406,10 @@ in sources."optionator-0.8.3" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" - sources."p-cancelable-1.1.0" sources."p-defer-3.0.0" sources."p-map-4.0.0" sources."pac-proxy-agent-5.0.0" sources."pac-resolver-5.0.1" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."registry-auth-token-4.2.2" - sources."semver-6.3.0" - ]; - }) sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" @@ -107717,7 +107424,6 @@ in ]; }) sources."prelude-ls-1.1.2" - sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-breaker-6.0.0" @@ -107751,7 +107457,7 @@ in sources."proxy-from-env-1.1.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pupa-2.1.1" sources."qs-6.11.0" sources."range-parser-1.2.1" @@ -107783,7 +107489,6 @@ in sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."requizzle-0.2.4" - sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."retry-0.13.1" sources."retry-request-5.0.2" @@ -107871,7 +107576,6 @@ in sources."text-hex-1.0.0" sources."through-2.3.8" sources."tmp-0.2.1" - sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" @@ -107879,7 +107583,7 @@ in sources."tr46-0.0.3" sources."traverse-0.3.9" sources."triple-beam-1.3.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -107903,11 +107607,6 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."update-notifier-5.1.0" // { - dependencies = [ - sources."semver-7.3.8" - ]; - }) (sources."update-notifier-cjs-5.1.6" // { dependencies = [ sources."semver-7.3.8" @@ -107915,7 +107614,6 @@ in }) sources."uri-js-4.4.1" sources."url-join-0.0.1" - sources."url-parse-lax-3.0.0" sources."utf-8-validate-5.0.10" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -108204,7 +107902,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."trim-newlines-4.0.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.21.3" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" @@ -108390,7 +108088,7 @@ in sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."querystring-0.2.1" sources."randombytes-2.1.0" @@ -108497,7 +108195,7 @@ in sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-1.5.2" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" sources."balanced-match-1.0.2" @@ -108629,7 +108327,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."glob-7.2.3" (sources."glob-parent-3.1.0" // { @@ -109008,21 +108706,21 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-5.4.0.tgz"; - sha512 = "3b6PGhv89mtIabur6Al7O/0cDoazgQfNjQzeKqsboRyaZCanJZsZnk6mDaHBYBSUfq6M+8TQWZvNlvxnF2kwig=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-5.5.0.tgz"; + sha512 = "BLWk1iw7f4XCAWiRXfrINPgqBHLbCrNff7tkvAMnyJt6l2IwbwxQVA0zcZ6TRGC3mJQH+tU6JDH9OPlnW2yDsw=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -109049,19 +108747,19 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-syntax-typescript-7.20.0" - sources."@babel/plugin-transform-typescript-7.20.7" + sources."@babel/plugin-transform-typescript-7.20.13" sources."@babel/preset-typescript-7.18.6" - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" @@ -109121,7 +108819,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109158,7 +108856,7 @@ in sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" sources."convert-source-map-1.9.0" - sources."create-gatsby-3.4.0" + sources."create-gatsby-3.5.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -109214,22 +108912,10 @@ in sources."find-up-4.1.0" sources."form-data-3.0.1" sources."fs-exists-cached-1.0.0" - sources."fs-extra-10.1.0" + sources."fs-extra-11.1.0" sources."fs.realpath-1.0.0" - sources."gatsby-core-utils-4.4.0" - (sources."gatsby-telemetry-4.4.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."boxen-4.2.0" - sources."camelcase-5.3.1" - sources."chalk-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - sources."type-fest-0.8.1" - ]; - }) + sources."gatsby-core-utils-4.5.0" + sources."gatsby-telemetry-4.5.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" @@ -109239,6 +108925,7 @@ in sources."got-11.8.6" sources."graceful-fs-4.2.10" sources."has-flag-3.0.0" + sources."hash-wasm-4.9.0" (sources."hosted-git-info-3.0.8" // { dependencies = [ sources."lru-cache-6.0.0" @@ -109246,7 +108933,7 @@ in ]; }) sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" sources."human-signals-2.1.0" sources."iconv-lite-0.6.3" @@ -109295,7 +108982,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."ms-2.1.2" - sources."msgpackr-1.8.1" + sources."msgpackr-1.8.2" sources."msgpackr-extract-2.2.0" sources."mute-stream-0.0.8" sources."nice-try-1.0.5" @@ -109379,7 +109066,6 @@ in sources."strip-final-newline-2.0.0" sources."strtok3-6.3.0" sources."supports-color-5.5.0" - sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" sources."to-fast-properties-2.0.0" @@ -109641,7 +109327,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" @@ -109696,7 +109382,7 @@ in sources."lru-cache-6.0.0" sources."make-fetch-happen-9.1.0" sources."mem-fs-2.2.1" - sources."mem-fs-editor-9.5.0" + sources."mem-fs-editor-9.6.0" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" @@ -109878,7 +109564,7 @@ in sources."tr46-0.0.3" sources."treeverse-1.0.4" sources."truncate-utf8-bytes-1.0.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.8.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -110286,13 +109972,13 @@ in sources."filter-obj-1.1.0" sources."form-data-4.0.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."got-11.8.6" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.3" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" sources."ieee754-1.2.1" sources."inherits-2.0.4" @@ -110380,7 +110066,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."ajv-8.12.0" @@ -110514,7 +110200,7 @@ in sources."lru-cache-7.14.1" ]; }) - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" (sources."http2-wrapper-2.2.0" // { @@ -110619,7 +110305,7 @@ in ]; }) sources."proxy-from-env-1.1.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pupa-3.1.0" sources."quick-lru-6.1.1" sources."raw-body-2.5.1" @@ -110686,9 +110372,9 @@ in sources."tmp-0.0.33" sources."toidentifier-1.0.1" sources."trim-newlines-4.0.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-check-0.3.2" - sources."type-fest-3.5.2" + sources."type-fest-3.5.3" sources."typedarray-to-buffer-3.1.5" sources."unique-string-3.0.0" sources."universalify-0.1.2" @@ -110704,7 +110390,7 @@ in sources."which-2.0.2" sources."widest-line-4.0.1" sources."word-wrap-1.2.3" - sources."wrap-ansi-8.0.1" + sources."wrap-ansi-8.1.0" sources."write-file-atomic-3.0.3" sources."xdg-basedir-5.1.0" sources."xregexp-2.0.0" @@ -111035,7 +110721,7 @@ in (sources."@graphql-tools/import-6.7.15" // { dependencies = [ sources."@graphql-tools/utils-9.1.4" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@graphql-tools/json-file-loader-6.2.6" // { @@ -111047,7 +110733,7 @@ in }) (sources."camel-case-4.1.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) ]; @@ -111063,7 +110749,7 @@ in dependencies = [ sources."@graphql-tools/merge-8.3.1" sources."@graphql-tools/utils-8.9.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) (sources."@graphql-tools/url-loader-6.10.1" // { @@ -111224,7 +110910,7 @@ in sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -111255,7 +110941,7 @@ in sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-signature-1.2.0" sources."http2-client-1.3.5" sources."iconv-lite-0.4.24" @@ -111348,7 +111034,7 @@ in }) (sources."lower-case-2.0.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."lowercase-keys-1.0.1" @@ -111375,7 +111061,7 @@ in sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."node-emoji-1.10.0" @@ -111434,7 +111120,7 @@ in sources."parse-json-5.2.0" (sources."pascal-case-3.1.2" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."passwd-user-3.0.0" @@ -111447,7 +111133,7 @@ in sources."prepend-http-2.0.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."queue-microtask-1.2.3" sources."rc-1.2.8" @@ -111565,10 +111251,10 @@ in graphql-language-service-cli = nodeEnv.buildNodePackage { name = "graphql-language-service-cli"; packageName = "graphql-language-service-cli"; - version = "3.3.14"; + version = "3.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.3.14.tgz"; - sha512 = "1jPvSEWMTNiro1Ao0wJV9ApMP4R0axnXKS0jTJqh+IsySgHBmO2suflPxewYdWMMv6StMqF9ITX5IXrW9E7bbw=="; + url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.3.15.tgz"; + sha512 = "YIWyxOxvrvcXb+IzkmMEtH22Uor4SKGl6E27xaMS2IkVpZtaEgwXeN7kEPFVeSn6I3fCahdMVtfz70IL4tWGxw=="; }; dependencies = [ sources."@ardatan/sync-fetch-0.0.1" @@ -111576,25 +111262,29 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/polyfill-7.12.1" sources."@babel/types-7.20.7" sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" sources."@graphql-tools/batch-execute-8.5.15" - sources."@graphql-tools/delegate-9.0.22" + (sources."@graphql-tools/delegate-9.0.23" // { + dependencies = [ + sources."tslib-2.4.1" + ]; + }) sources."@graphql-tools/executor-0.0.12" - sources."@graphql-tools/executor-graphql-ws-0.0.6" + sources."@graphql-tools/executor-graphql-ws-0.0.7" sources."@graphql-tools/executor-http-0.1.1" sources."@graphql-tools/executor-legacy-ws-0.0.6" sources."@graphql-tools/graphql-file-loader-7.5.14" sources."@graphql-tools/import-6.7.15" sources."@graphql-tools/json-file-loader-7.4.15" - sources."@graphql-tools/load-7.8.9" - sources."@graphql-tools/merge-8.3.15" - sources."@graphql-tools/schema-9.0.13" - sources."@graphql-tools/url-loader-7.17.2" + sources."@graphql-tools/load-7.8.10" + sources."@graphql-tools/merge-8.3.16" + sources."@graphql-tools/schema-9.0.14" + sources."@graphql-tools/url-loader-7.17.4" sources."@graphql-tools/utils-9.1.4" - sources."@graphql-tools/wrap-9.3.1" + sources."@graphql-tools/wrap-9.3.2" sources."@graphql-typed-document-node/core-3.1.1" sources."@iarna/toml-2.2.5" sources."@nodelib/fs.scandir-2.1.5" @@ -111670,8 +111360,8 @@ in sources."minimatch-4.2.1" ]; }) - sources."graphql-language-service-5.1.0" - sources."graphql-language-service-server-2.9.4" + sources."graphql-language-service-5.1.1" + sources."graphql-language-service-server-2.9.5" sources."graphql-ws-5.11.2" sources."has-flag-3.0.0" sources."iconv-lite-0.6.3" @@ -111701,7 +111391,7 @@ in sources."minimatch-3.1.2" sources."mkdirp-1.0.4" sources."nanoid-3.3.4" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."node-domexception-1.0.0" sources."node-fetch-2.6.8" sources."node-gyp-build-4.6.0" @@ -111740,12 +111430,12 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."ts-node-9.1.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."typescript-4.9.4" - sources."undici-5.15.0" + sources."undici-5.16.0" sources."unixify-1.0.0" sources."urlpattern-polyfill-6.0.2" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."value-or-promise-1.0.12" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" @@ -111808,9 +111498,13 @@ in sources."@cronvel/get-pixels-3.4.1" sources."@cspotcode/source-map-support-0.8.1" sources."@graphql-tools/batch-execute-8.5.15" - sources."@graphql-tools/delegate-9.0.22" + (sources."@graphql-tools/delegate-9.0.23" // { + dependencies = [ + sources."tslib-2.4.1" + ]; + }) sources."@graphql-tools/executor-0.0.12" - (sources."@graphql-tools/executor-graphql-ws-0.0.6" // { + (sources."@graphql-tools/executor-graphql-ws-0.0.7" // { dependencies = [ sources."isomorphic-ws-5.0.0" sources."ws-8.12.0" @@ -111826,17 +111520,17 @@ in sources."@graphql-tools/graphql-file-loader-7.5.14" sources."@graphql-tools/import-6.7.15" sources."@graphql-tools/json-file-loader-7.4.15" - sources."@graphql-tools/load-7.8.9" - sources."@graphql-tools/merge-8.3.15" - sources."@graphql-tools/schema-9.0.13" - (sources."@graphql-tools/url-loader-7.17.2" // { + sources."@graphql-tools/load-7.8.10" + sources."@graphql-tools/merge-8.3.16" + sources."@graphql-tools/schema-9.0.14" + (sources."@graphql-tools/url-loader-7.17.4" // { dependencies = [ sources."isomorphic-ws-5.0.0" sources."ws-8.12.0" ]; }) sources."@graphql-tools/utils-9.1.4" - sources."@graphql-tools/wrap-9.3.1" + sources."@graphql-tools/wrap-9.3.2" sources."@graphql-typed-document-node/core-3.1.1" sources."@iarna/toml-2.2.5" sources."@jridgewell/resolve-uri-3.1.0" @@ -111849,7 +111543,7 @@ in sources."@oclif/config-1.17.0" sources."@oclif/errors-1.3.4" sources."@oclif/linewrap-1.0.0" - (sources."@oclif/parser-3.8.9" // { + (sources."@oclif/parser-3.8.10" // { dependencies = [ sources."@oclif/errors-1.3.6" ]; @@ -111878,18 +111572,18 @@ in sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.1" sources."@repeaterjs/repeater-3.0.4" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.29" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -111900,7 +111594,7 @@ in sources."@whatwg-node/fetch-0.6.2" sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-5.0.1" @@ -112174,16 +111868,16 @@ in sources."tree-kit-0.7.4" sources."treeify-1.1.0" sources."ts-node-10.9.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-is-1.6.18" sources."typescript-4.9.4" - sources."undici-5.15.0" + sources."undici-5.16.0" sources."uniq-1.0.1" sources."universalify-0.1.2" sources."unixify-1.0.0" sources."unpipe-1.0.0" sources."urlpattern-polyfill-6.0.2" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."utils-merge-1.0.1" sources."v8-compile-cache-lib-3.0.1" sources."value-or-promise-1.0.12" @@ -112343,7 +112037,7 @@ in sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."has-1.0.3" sources."has-symbols-1.0.3" sources."http-errors-2.0.0" @@ -112516,7 +112210,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.17.3" + sources."systeminformation-5.17.4" sources."term-canvas-0.0.5" sources."type-fest-1.4.0" sources."wordwrap-0.0.3" @@ -112579,7 +112273,7 @@ in sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-done-1.3.2" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-settle-1.0.0" sources."atob-2.1.2" sources."bach-1.2.0" @@ -112718,7 +112412,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."glob-7.2.3" (sources."glob-parent-3.1.0" // { @@ -113129,7 +112823,7 @@ in sources."fragment-cache-0.2.1" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" @@ -113500,7 +113194,7 @@ in sources."eventemitter3-4.0.7" sources."follow-redirects-1.15.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.3" @@ -113540,27 +113234,39 @@ in hsd = nodeEnv.buildNodePackage { name = "hsd"; packageName = "hsd"; - version = "4.0.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hsd/-/hsd-4.0.1.tgz"; - sha512 = "5kb4Cp3/XjrFLmUZxl0tQxqVfmFxfrfys1sT9jmUK/Aq/tw+6/GkRGJjgrdTuzRL48zLrczOwL7/Q2e3Ufg2vA=="; + url = "https://registry.npmjs.org/hsd/-/hsd-5.0.1.tgz"; + sha512 = "G+4iLhKHEEOHYbk/VEvkVO4oNn1rVlH8N3LdsbH+sYZQo8qJTVP5Zwtz1pMa4vWLzA3mjrFSGG3nBFYoIJHpMQ=="; }; dependencies = [ sources."bcfg-0.1.7" - sources."bcrypto-5.4.0" + (sources."bcrypto-5.4.0" // { + dependencies = [ + sources."bufio-1.0.7" + ]; + }) sources."bcurl-0.2.0" sources."bdb-1.4.0" sources."bdns-0.1.5" sources."bevent-0.1.5" sources."bfile-0.2.2" - sources."bfilter-1.0.5" + (sources."bfilter-1.0.5" // { + dependencies = [ + sources."bufio-1.0.7" + ]; + }) sources."bheep-0.1.5" sources."binet-0.3.7" sources."blgr-0.2.0" sources."blru-0.1.6" sources."blst-0.1.5" sources."bmutex-0.1.6" - sources."bns-0.15.0" + (sources."bns-0.15.0" // { + dependencies = [ + sources."bufio-1.0.7" + ]; + }) sources."brq-0.1.8" sources."bs32-0.1.6" sources."bsert-0.0.10" @@ -113569,9 +113275,9 @@ in sources."btcp-0.1.5" sources."budp-0.1.6" sources."buffer-map-0.0.7" - sources."bufio-1.0.7" + sources."bufio-1.2.0" sources."bupnp-0.2.6" - sources."bval-0.1.6" + sources."bval-0.1.7" sources."bweb-0.1.12" sources."goosig-0.10.0" sources."hs-client-0.0.13" @@ -113579,7 +113285,7 @@ in sources."mrmr-0.1.10" sources."n64-0.2.10" sources."unbound-0.4.3" - sources."urkel-1.0.2" + sources."urkel-1.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -113725,7 +113431,7 @@ in sources."async-2.6.4" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - sources."aws-sdk-2.1296.0" + sources."aws-sdk-2.1304.0" sources."aws-sign2-0.7.0" sources."aws4-1.12.0" sources."base64-js-1.5.1" @@ -113775,7 +113481,7 @@ in sources."form-data-2.3.3" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."gopd-1.0.1" sources."har-schema-2.0.0" @@ -113890,7 +113596,7 @@ in sources."strip-ansi-6.0.1" (sources."tough-cookie-2.5.0" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."tunnel-agent-0.6.0" @@ -113899,7 +113605,7 @@ in sources."underscore-1.12.1" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) sources."url-0.10.3" @@ -114113,7 +113819,7 @@ in sources."process-nextick-args-2.0.1" sources."promise-7.3.1" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.5.3" sources."rc-1.2.8" @@ -114247,10 +113953,10 @@ in immich = nodeEnv.buildNodePackage { name = "immich"; packageName = "immich"; - version = "0.28.0"; + version = "0.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/immich/-/immich-0.28.0.tgz"; - sha512 = "Dz/z1OBeB4r9PJY1Owzk6JQZVHjPja8rx7icUuPIGXaAajohO5mjgE0/j+/846Of5X1P5wQW6aIS3Y3QCA1v8A=="; + url = "https://registry.npmjs.org/immich/-/immich-0.30.0.tgz"; + sha512 = "G+Kv+tYTruxAkUL4sZet51Bee4foJS7zl2igAn80S4nZEb0ATiiQhnzaMDO6zBOfxxtsaU/CD7tlrsRI8nvHIw=="; }; dependencies = [ sources."@ffprobe-installer/darwin-arm64-5.0.1" @@ -114314,7 +114020,7 @@ in sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."supports-color-5.5.0" - sources."systeminformation-5.17.3" + sources."systeminformation-5.17.4" sources."util-deprecate-1.0.2" sources."which-2.0.2" sources."wrappy-1.0.2" @@ -114472,7 +114178,7 @@ in ]; }) sources."@types/tunnel-0.0.3" - sources."@vscode/l10n-0.0.10" + sources."@vscode/l10n-0.0.11" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."ajv-6.12.6" @@ -114635,7 +114341,7 @@ in sources."protobufjs-7.1.2" sources."pseudomap-1.0.2" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."querystringify-2.2.0" sources."queue-microtask-1.2.3" @@ -114684,7 +114390,7 @@ in sources."to-regex-range-5.0.1" sources."tough-cookie-4.1.2" sources."tr46-0.0.3" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."turndown-7.1.1" @@ -114697,8 +114403,8 @@ in sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."verror-1.10.0" - sources."vscode-css-languageservice-6.2.1" - sources."vscode-html-languageservice-5.0.3" + sources."vscode-css-languageservice-6.2.3" + sources."vscode-html-languageservice-5.0.4" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" @@ -114751,7 +114457,7 @@ in sources."ansi-styles-3.2.1" (sources."ast-types-0.13.4" // { dependencies = [ - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; }) sources."astral-regex-2.0.0" @@ -114829,7 +114535,7 @@ in ]; }) sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."get-uri-3.0.2" sources."glob-7.2.3" @@ -115040,75 +114746,118 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v15.6.3.tar.gz" = nodeEnv.buildNodePackage { + "iosevka-https://github.com/be5invis/Iosevka/archive/v17.1.0.tar.gz" = nodeEnv.buildNodePackage { name = "iosevka"; packageName = "iosevka"; - version = "15.6.3"; + version = "17.1.0"; src = fetchurl { - name = "iosevka-15.6.3.tar.gz"; - url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v15.6.3"; - sha256 = "38902065a20081dd240d06a47f238d4a9e04063eb1094337538c1d37d64581c7"; + name = "iosevka-17.1.0.tar.gz"; + url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v17.1.0"; + sha256 = "99900713a323b5464c232118237f2ff303dc20d5c2b1b14e4dc93fd5b7df083b"; }; dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.8.0" - sources."@ot-builder/bin-composite-types-1.5.5" - sources."@ot-builder/bin-util-1.5.5" - sources."@ot-builder/cli-help-shower-1.5.5" - sources."@ot-builder/cli-proc-1.5.5" - sources."@ot-builder/cli-shared-1.5.5" - sources."@ot-builder/common-impl-1.5.5" - sources."@ot-builder/errors-1.5.5" - sources."@ot-builder/io-bin-cff-1.5.5" - sources."@ot-builder/io-bin-encoding-1.5.5" - sources."@ot-builder/io-bin-ext-private-1.5.5" - sources."@ot-builder/io-bin-font-1.5.5" - sources."@ot-builder/io-bin-glyph-store-1.5.5" - sources."@ot-builder/io-bin-layout-1.5.5" - sources."@ot-builder/io-bin-metadata-1.5.5" - sources."@ot-builder/io-bin-metric-1.5.5" - sources."@ot-builder/io-bin-name-1.5.5" - sources."@ot-builder/io-bin-sfnt-1.5.5" - sources."@ot-builder/io-bin-ttf-1.5.5" - sources."@ot-builder/io-bin-vtt-private-1.5.5" - sources."@ot-builder/ot-1.5.5" - sources."@ot-builder/ot-encoding-1.5.5" - sources."@ot-builder/ot-ext-private-1.5.5" - sources."@ot-builder/ot-glyphs-1.5.5" - sources."@ot-builder/ot-layout-1.5.5" - sources."@ot-builder/ot-metadata-1.5.5" - sources."@ot-builder/ot-name-1.5.5" - sources."@ot-builder/ot-sfnt-1.5.5" - sources."@ot-builder/ot-standard-glyph-namer-1.5.5" - sources."@ot-builder/ot-vtt-private-1.5.5" - sources."@ot-builder/prelude-1.5.5" - sources."@ot-builder/primitive-1.5.5" - sources."@ot-builder/rectify-1.5.5" - sources."@ot-builder/stat-glyphs-1.5.5" - sources."@ot-builder/trace-1.5.5" - sources."@ot-builder/var-store-1.5.5" - sources."@ot-builder/variance-1.5.5" + sources."@ot-builder/bin-composite-types-1.6.1" + sources."@ot-builder/bin-util-1.6.1" + sources."@ot-builder/cli-help-shower-1.6.1" + sources."@ot-builder/cli-proc-1.6.1" + sources."@ot-builder/cli-shared-1.6.1" + sources."@ot-builder/common-impl-1.6.1" + sources."@ot-builder/errors-1.6.1" + sources."@ot-builder/io-bin-cff-1.6.1" + sources."@ot-builder/io-bin-encoding-1.6.1" + sources."@ot-builder/io-bin-ext-private-1.6.1" + sources."@ot-builder/io-bin-font-1.6.1" + sources."@ot-builder/io-bin-glyph-store-1.6.1" + sources."@ot-builder/io-bin-layout-1.6.1" + sources."@ot-builder/io-bin-metadata-1.6.1" + sources."@ot-builder/io-bin-metric-1.6.1" + sources."@ot-builder/io-bin-name-1.6.1" + sources."@ot-builder/io-bin-sfnt-1.6.1" + sources."@ot-builder/io-bin-ttf-1.6.1" + sources."@ot-builder/io-bin-vtt-private-1.6.1" + sources."@ot-builder/ot-1.6.1" + sources."@ot-builder/ot-encoding-1.6.1" + sources."@ot-builder/ot-ext-private-1.6.1" + sources."@ot-builder/ot-glyphs-1.6.1" + sources."@ot-builder/ot-layout-1.6.1" + sources."@ot-builder/ot-metadata-1.6.1" + sources."@ot-builder/ot-name-1.6.1" + sources."@ot-builder/ot-sfnt-1.6.1" + sources."@ot-builder/ot-standard-glyph-namer-1.6.1" + sources."@ot-builder/ot-vtt-private-1.6.1" + sources."@ot-builder/prelude-1.6.1" + sources."@ot-builder/primitive-1.6.1" + sources."@ot-builder/rectify-1.6.1" + sources."@ot-builder/stat-glyphs-1.6.1" + sources."@ot-builder/trace-1.6.1" + sources."@ot-builder/var-store-1.6.1" + sources."@ot-builder/variance-1.6.1" sources."aglfn-1.0.2" sources."ansi-styles-4.3.0" sources."argparse-2.0.1" + sources."available-typed-arrays-1.0.5" + sources."call-bind-1.0.2" sources."chalk-4.1.2" sources."clipper-lib-6.4.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."deep-equal-2.2.0" + sources."define-properties-1.1.4" + sources."es-get-iterator-1.1.3" + sources."for-each-0.3.3" + sources."function-bind-1.1.1" + sources."functions-have-names-1.2.3" + sources."get-intrinsic-1.2.0" + sources."gopd-1.0.1" + sources."has-1.0.3" + sources."has-bigints-1.0.2" sources."has-flag-4.0.0" + sources."has-property-descriptors-1.0.0" + sources."has-symbols-1.0.3" + sources."has-tostringtag-1.0.0" sources."iconv-lite-0.6.3" + sources."internal-slot-1.0.4" + sources."is-arguments-1.1.1" + sources."is-array-buffer-3.0.1" + sources."is-bigint-1.0.4" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.7" + sources."is-date-object-1.0.5" + sources."is-map-2.0.2" + sources."is-number-object-1.0.7" + sources."is-regex-1.1.4" + sources."is-set-2.0.2" + sources."is-shared-array-buffer-1.0.2" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.10" + sources."is-weakmap-2.0.1" + sources."is-weakset-2.0.2" + sources."isarray-2.0.5" sources."lru-cache-6.0.0" - sources."ot-builder-1.5.5" - sources."otb-ttc-bundle-1.5.5" + sources."object-inspect-1.12.3" + sources."object-is-1.1.5" + sources."object-keys-1.1.1" + sources."object.assign-4.1.4" + sources."ot-builder-1.6.1" + sources."otb-ttc-bundle-1.6.1" + sources."regexp.prototype.flags-1.4.3" sources."safer-buffer-2.1.2" sources."semver-7.3.8" + sources."side-channel-1.0.4" sources."spiro-3.0.0" + sources."stop-iteration-iterator-1.0.0" sources."supports-color-7.2.0" sources."toposort-2.0.2" - sources."tslib-2.4.1" - sources."typo-geom-0.12.1" - sources."uuid-8.3.2" + sources."tslib-2.5.0" + sources."typo-geom-0.13.0" + sources."uuid-9.0.0" sources."wawoff2-2.0.1" + sources."which-boxed-primitive-1.0.2" + sources."which-collection-1.0.1" + sources."which-typed-array-1.1.9" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -115254,141 +115003,141 @@ in sha512 = "5kjhOG5a2BA4KOkWsfGG0qDbVXkOoYEC9h6tb6KY1zFQTJ7bdLCeR35eyPy5ANfKmHh4tzc1A5SWcnHM8j3hNw=="; }; dependencies = [ - (sources."@aws-crypto/crc32-2.0.0" // { + (sources."@aws-crypto/crc32-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/crc32c-2.0.0" // { + (sources."@aws-crypto/crc32c-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/ie11-detection-2.0.2" // { + (sources."@aws-crypto/ie11-detection-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/sha1-browser-2.0.0" // { + (sources."@aws-crypto/sha1-browser-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/sha256-browser-2.0.0" // { + (sources."@aws-crypto/sha256-browser-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/sha256-js-2.0.0" // { + (sources."@aws-crypto/sha256-js-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/supports-web-crypto-2.0.2" // { + (sources."@aws-crypto/supports-web-crypto-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@aws-crypto/util-2.0.2" // { + (sources."@aws-crypto/util-3.0.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/abort-controller-3.226.0" + sources."@aws-sdk/abort-controller-3.257.0" sources."@aws-sdk/chunked-blob-reader-3.188.0" sources."@aws-sdk/chunked-blob-reader-native-3.208.0" - (sources."@aws-sdk/client-s3-3.252.0" // { + (sources."@aws-sdk/client-s3-3.259.0" // { dependencies = [ sources."fast-xml-parser-4.0.11" ]; }) - sources."@aws-sdk/client-sso-3.252.0" - sources."@aws-sdk/client-sso-oidc-3.252.0" - (sources."@aws-sdk/client-sts-3.252.0" // { + sources."@aws-sdk/client-sso-3.259.0" + sources."@aws-sdk/client-sso-oidc-3.259.0" + (sources."@aws-sdk/client-sts-3.259.0" // { dependencies = [ sources."fast-xml-parser-4.0.11" ]; }) - sources."@aws-sdk/config-resolver-3.234.0" - sources."@aws-sdk/credential-provider-env-3.226.0" - sources."@aws-sdk/credential-provider-imds-3.226.0" - sources."@aws-sdk/credential-provider-ini-3.252.0" - sources."@aws-sdk/credential-provider-node-3.252.0" - sources."@aws-sdk/credential-provider-process-3.226.0" - sources."@aws-sdk/credential-provider-sso-3.252.0" - sources."@aws-sdk/credential-provider-web-identity-3.226.0" - sources."@aws-sdk/eventstream-codec-3.226.0" - sources."@aws-sdk/eventstream-serde-browser-3.226.0" - sources."@aws-sdk/eventstream-serde-config-resolver-3.226.0" - sources."@aws-sdk/eventstream-serde-node-3.226.0" - sources."@aws-sdk/eventstream-serde-universal-3.226.0" - sources."@aws-sdk/fetch-http-handler-3.226.0" - sources."@aws-sdk/hash-blob-browser-3.226.0" - sources."@aws-sdk/hash-node-3.226.0" - sources."@aws-sdk/hash-stream-node-3.226.0" - sources."@aws-sdk/invalid-dependency-3.226.0" + sources."@aws-sdk/config-resolver-3.259.0" + sources."@aws-sdk/credential-provider-env-3.257.0" + sources."@aws-sdk/credential-provider-imds-3.259.0" + sources."@aws-sdk/credential-provider-ini-3.259.0" + sources."@aws-sdk/credential-provider-node-3.259.0" + sources."@aws-sdk/credential-provider-process-3.257.0" + sources."@aws-sdk/credential-provider-sso-3.259.0" + sources."@aws-sdk/credential-provider-web-identity-3.257.0" + sources."@aws-sdk/eventstream-codec-3.258.0" + sources."@aws-sdk/eventstream-serde-browser-3.258.0" + sources."@aws-sdk/eventstream-serde-config-resolver-3.257.0" + sources."@aws-sdk/eventstream-serde-node-3.258.0" + sources."@aws-sdk/eventstream-serde-universal-3.258.0" + sources."@aws-sdk/fetch-http-handler-3.257.0" + sources."@aws-sdk/hash-blob-browser-3.257.0" + sources."@aws-sdk/hash-node-3.257.0" + sources."@aws-sdk/hash-stream-node-3.257.0" + sources."@aws-sdk/invalid-dependency-3.257.0" sources."@aws-sdk/is-array-buffer-3.201.0" - sources."@aws-sdk/md5-js-3.226.0" - sources."@aws-sdk/middleware-bucket-endpoint-3.226.0" - sources."@aws-sdk/middleware-content-length-3.226.0" - sources."@aws-sdk/middleware-endpoint-3.226.0" - sources."@aws-sdk/middleware-expect-continue-3.226.0" - sources."@aws-sdk/middleware-flexible-checksums-3.226.0" - sources."@aws-sdk/middleware-host-header-3.226.0" - sources."@aws-sdk/middleware-location-constraint-3.226.0" - sources."@aws-sdk/middleware-logger-3.226.0" - sources."@aws-sdk/middleware-recursion-detection-3.226.0" - (sources."@aws-sdk/middleware-retry-3.235.0" // { + sources."@aws-sdk/md5-js-3.258.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.259.0" + sources."@aws-sdk/middleware-content-length-3.257.0" + sources."@aws-sdk/middleware-endpoint-3.257.0" + sources."@aws-sdk/middleware-expect-continue-3.257.0" + sources."@aws-sdk/middleware-flexible-checksums-3.259.0" + sources."@aws-sdk/middleware-host-header-3.257.0" + sources."@aws-sdk/middleware-location-constraint-3.257.0" + sources."@aws-sdk/middleware-logger-3.257.0" + sources."@aws-sdk/middleware-recursion-detection-3.257.0" + (sources."@aws-sdk/middleware-retry-3.259.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/middleware-sdk-s3-3.231.0" - sources."@aws-sdk/middleware-sdk-sts-3.226.0" - sources."@aws-sdk/middleware-serde-3.226.0" - sources."@aws-sdk/middleware-signing-3.226.0" - sources."@aws-sdk/middleware-ssec-3.226.0" - sources."@aws-sdk/middleware-stack-3.226.0" - sources."@aws-sdk/middleware-user-agent-3.226.0" - sources."@aws-sdk/node-config-provider-3.226.0" - sources."@aws-sdk/node-http-handler-3.226.0" - sources."@aws-sdk/property-provider-3.226.0" - sources."@aws-sdk/protocol-http-3.226.0" - sources."@aws-sdk/querystring-builder-3.226.0" - sources."@aws-sdk/querystring-parser-3.226.0" - sources."@aws-sdk/s3-request-presigner-3.252.0" - sources."@aws-sdk/service-error-classification-3.229.0" - sources."@aws-sdk/shared-ini-file-loader-3.226.0" - sources."@aws-sdk/signature-v4-3.226.0" - sources."@aws-sdk/signature-v4-crt-3.226.0" - sources."@aws-sdk/signature-v4-multi-region-3.226.0" - sources."@aws-sdk/smithy-client-3.234.0" - sources."@aws-sdk/token-providers-3.252.0" - sources."@aws-sdk/types-3.226.0" - sources."@aws-sdk/url-parser-3.226.0" + sources."@aws-sdk/middleware-sdk-s3-3.257.0" + sources."@aws-sdk/middleware-sdk-sts-3.257.0" + sources."@aws-sdk/middleware-serde-3.257.0" + sources."@aws-sdk/middleware-signing-3.257.0" + sources."@aws-sdk/middleware-ssec-3.257.0" + sources."@aws-sdk/middleware-stack-3.257.0" + sources."@aws-sdk/middleware-user-agent-3.257.0" + sources."@aws-sdk/node-config-provider-3.259.0" + sources."@aws-sdk/node-http-handler-3.257.0" + sources."@aws-sdk/property-provider-3.257.0" + sources."@aws-sdk/protocol-http-3.257.0" + sources."@aws-sdk/querystring-builder-3.257.0" + sources."@aws-sdk/querystring-parser-3.257.0" + sources."@aws-sdk/s3-request-presigner-3.259.0" + sources."@aws-sdk/service-error-classification-3.257.0" + sources."@aws-sdk/shared-ini-file-loader-3.257.0" + sources."@aws-sdk/signature-v4-3.257.0" + sources."@aws-sdk/signature-v4-crt-3.257.0" + sources."@aws-sdk/signature-v4-multi-region-3.257.0" + sources."@aws-sdk/smithy-client-3.257.0" + sources."@aws-sdk/token-providers-3.259.0" + sources."@aws-sdk/types-3.257.0" + sources."@aws-sdk/url-parser-3.257.0" sources."@aws-sdk/util-arn-parser-3.208.0" sources."@aws-sdk/util-base64-3.208.0" sources."@aws-sdk/util-body-length-browser-3.188.0" sources."@aws-sdk/util-body-length-node-3.208.0" sources."@aws-sdk/util-buffer-from-3.208.0" sources."@aws-sdk/util-config-provider-3.208.0" - sources."@aws-sdk/util-create-request-3.234.0" - sources."@aws-sdk/util-defaults-mode-browser-3.234.0" - sources."@aws-sdk/util-defaults-mode-node-3.234.0" - sources."@aws-sdk/util-endpoints-3.245.0" - sources."@aws-sdk/util-format-url-3.226.0" + sources."@aws-sdk/util-create-request-3.257.0" + sources."@aws-sdk/util-defaults-mode-browser-3.257.0" + sources."@aws-sdk/util-defaults-mode-node-3.259.0" + sources."@aws-sdk/util-endpoints-3.257.0" + sources."@aws-sdk/util-format-url-3.257.0" sources."@aws-sdk/util-hex-encoding-3.201.0" sources."@aws-sdk/util-locate-window-3.208.0" - sources."@aws-sdk/util-middleware-3.226.0" - sources."@aws-sdk/util-retry-3.229.0" - sources."@aws-sdk/util-stream-browser-3.226.0" - sources."@aws-sdk/util-stream-node-3.226.0" + sources."@aws-sdk/util-middleware-3.257.0" + sources."@aws-sdk/util-retry-3.257.0" + sources."@aws-sdk/util-stream-browser-3.258.0" + sources."@aws-sdk/util-stream-node-3.257.0" sources."@aws-sdk/util-uri-escape-3.201.0" - sources."@aws-sdk/util-user-agent-browser-3.226.0" - sources."@aws-sdk/util-user-agent-node-3.226.0" - sources."@aws-sdk/util-utf8-browser-3.188.0" - sources."@aws-sdk/util-utf8-node-3.208.0" - sources."@aws-sdk/util-waiter-3.226.0" + sources."@aws-sdk/util-user-agent-browser-3.257.0" + sources."@aws-sdk/util-user-agent-node-3.259.0" + sources."@aws-sdk/util-utf8-3.254.0" + sources."@aws-sdk/util-utf8-browser-3.259.0" + sources."@aws-sdk/util-waiter-3.257.0" sources."@aws-sdk/xml-builder-3.201.0" sources."@braintree/sanitize-url-6.0.2" sources."@cronvel/get-pixels-3.4.1" @@ -115497,13 +115246,13 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.5" - (sources."aws-crt-1.15.7" // { + (sources."aws-crt-1.15.8" // { dependencies = [ sources."mkdirp-1.0.4" sources."tar-6.1.13" ]; }) - (sources."aws-sdk-2.1296.0" // { + (sources."aws-sdk-2.1304.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -115611,8 +115360,8 @@ in ]; }) sources."cwise-compiler-1.1.3" - sources."d3-7.8.1" - sources."d3-array-3.2.1" + sources."d3-7.8.2" + sources."d3-array-3.2.2" sources."d3-axis-3.0.0" sources."d3-brush-3.0.0" sources."d3-chord-3.0.1" @@ -115743,7 +115492,7 @@ in sources."fstream-1.0.12" sources."function-bind-1.1.1" sources."gauge-1.2.7" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-prototype-chain-1.0.1" sources."get-stdin-5.0.1" sources."getpass-0.1.7" @@ -115772,7 +115521,7 @@ in sources."html-encoding-sniffer-1.0.2" sources."html-entities-1.4.0" sources."html-minifier-3.5.21" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-1.8.1" sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" @@ -115860,7 +115609,7 @@ in sources."isstream-0.1.2" sources."jmespath-0.16.0" sources."jpeg-js-0.4.4" - sources."js-sdsl-4.1.4" + sources."js-sdsl-4.3.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" @@ -116052,7 +115801,7 @@ in sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."npmlog-1.2.1" - sources."number-allocator-1.0.12" + sources."number-allocator-1.0.14" sources."number-is-nan-1.0.1" sources."nwsapi-2.2.2" sources."oauth-sign-0.9.0" @@ -116101,7 +115850,7 @@ in sources."proper-lockfile-2.0.1" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.1.2" sources."qs-6.5.3" sources."query-string-4.3.4" @@ -116293,7 +116042,7 @@ in sources."tr46-1.0.1" sources."traverse-0.3.9" sources."tree-kit-0.7.4" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -116332,7 +116081,7 @@ in }) sources."url-join-0.0.1" sources."url-parse-1.5.10" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."util-0.12.5" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" @@ -116456,7 +116205,7 @@ in sha512 = "tzTgkklbWKrlaQL2+e3NNgLcZu3NaK2vsHRx7tyHQ+H5jcB9Gx0txSd2eJWlMC/xU1+7LQu4s58Ry0RkuaEQVg=="; }; dependencies = [ - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@jsdoc/salty-0.2.3" sources."@types/linkify-it-3.0.2" sources."@types/markdown-it-12.2.3" @@ -116632,7 +116381,7 @@ in sources."form-data-4.0.0" sources."formidable-2.1.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."graphlib-2.1.8" sources."has-1.0.3" sources."has-symbols-1.0.3" @@ -116650,7 +116399,7 @@ in sources."object-inspect-1.12.3" sources."once-1.4.0" sources."path-loader-1.0.12" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -116737,7 +116486,7 @@ in sources."fresh-0.5.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -116873,7 +116622,7 @@ in sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -117008,7 +116757,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-base-0.3.0" @@ -117198,7 +116947,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" (sources."randomatic-3.1.1" // { dependencies = [ @@ -117442,7 +117191,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@oclif/command-1.8.21" + sources."@oclif/command-1.8.22" sources."@oclif/config-1.18.6" sources."@oclif/errors-1.3.6" (sources."@oclif/help-1.0.5" // { @@ -117451,7 +117200,7 @@ in ]; }) sources."@oclif/linewrap-1.0.0" - sources."@oclif/parser-3.8.9" + sources."@oclif/parser-3.8.10" (sources."@oclif/plugin-help-3.3.1" // { dependencies = [ sources."@oclif/config-1.18.2" @@ -117464,7 +117213,7 @@ in ]; }) sources."@oclif/screen-1.0.4" - (sources."@putdotio/api-client-8.33.0" // { + (sources."@putdotio/api-client-8.33.1" // { dependencies = [ sources."axios-0.21.4" ]; @@ -117548,7 +117297,7 @@ in sources."form-data-3.0.1" sources."fs-extra-8.1.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-parent-5.1.2" sources."globby-11.1.0" sources."graceful-fs-4.2.10" @@ -117612,7 +117361,7 @@ in sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."pkg-up-3.1.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" @@ -117640,7 +117389,7 @@ in sources."through-2.3.8" sources."tmp-0.0.33" sources."to-regex-range-5.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-2.7.2" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" @@ -117757,7 +117506,7 @@ in sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.10" @@ -117819,7 +117568,7 @@ in ]; }) sources."socket.io-adapter-2.4.0" - (sources."socket.io-parser-4.2.1" // { + (sources."socket.io-parser-4.2.2" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -117839,7 +117588,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."type-is-1.6.18" - sources."ua-parser-js-0.7.32" + sources."ua-parser-js-0.7.33" sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."utf-8-validate-5.0.10" @@ -117875,13 +117624,13 @@ in sources."@ampproject/remapping-2.2.0" sources."@babel/cli-7.20.7" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -117903,15 +117652,15 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" sources."@babel/node-7.20.7" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-syntax-jsx-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/register-7.18.9" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -117969,7 +117718,7 @@ in sources."abab-2.0.6" sources."abbrev-1.1.1" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -118016,7 +117765,7 @@ in sources."bufferutil-4.0.7" sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."canvas-2.11.0" sources."chalk-2.4.2" sources."chardet-1.5.1" @@ -118038,7 +117787,7 @@ in sources."convert-source-map-1.9.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" @@ -118103,7 +117852,7 @@ in sources."ms-2.0.0" ]; }) - sources."express-validator-6.14.2" + sources."express-validator-6.14.3" sources."fast-glob-3.2.12" sources."fast-levenshtein-2.0.6" sources."fastq-1.15.0" @@ -118149,7 +117898,7 @@ in sources."gauge-3.0.2" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."github-from-package-0.0.0" sources."glob-7.2.3" @@ -118362,7 +118111,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pvtsutils-1.3.2" sources."pvutils-1.1.3" sources."qs-6.11.0" @@ -118458,7 +118207,7 @@ in sources."toidentifier-1.0.1" sources."tough-cookie-4.1.2" sources."tr46-0.0.3" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."type-is-1.6.18" @@ -118468,7 +118217,7 @@ in sources."unpipe-1.0.0" sources."update-browserslist-db-1.0.10" sources."url-parse-1.5.10" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" @@ -118745,7 +118494,7 @@ in sources."prompt-1.0.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-1.0.7" sources."readable-stream-1.1.14" @@ -118984,7 +118733,7 @@ in sources."prelude-ls-1.1.2" sources."prompt-1.0.0" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-1.0.7" sources."readable-stream-1.1.14" @@ -119244,57 +118993,57 @@ in sources."@npmcli/package-json-2.0.0" sources."@npmcli/promise-spawn-3.0.0" sources."@npmcli/run-script-4.2.1" - sources."@nrwl/cli-15.5.2" - (sources."@nrwl/devkit-15.5.2" // { + sources."@nrwl/cli-15.6.3" + (sources."@nrwl/devkit-15.6.3" // { dependencies = [ sources."semver-7.3.4" ]; }) - sources."@nrwl/tao-15.5.2" - sources."@octokit/auth-token-3.0.2" - sources."@octokit/core-4.1.0" - (sources."@octokit/endpoint-7.0.3" // { + sources."@nrwl/tao-15.6.3" + sources."@octokit/auth-token-3.0.3" + sources."@octokit/core-4.2.0" + (sources."@octokit/endpoint-7.0.5" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/graphql-5.0.4" - sources."@octokit/openapi-types-14.0.0" + sources."@octokit/graphql-5.0.5" + sources."@octokit/openapi-types-16.0.0" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-5.0.1" + sources."@octokit/plugin-paginate-rest-6.0.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-6.7.0" - (sources."@octokit/request-6.2.2" // { + sources."@octokit/plugin-rest-endpoint-methods-7.0.1" + (sources."@octokit/request-6.2.3" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/request-error-3.0.2" - sources."@octokit/rest-19.0.5" - sources."@octokit/types-8.1.1" + sources."@octokit/request-error-3.0.3" + sources."@octokit/rest-19.0.7" + sources."@octokit/types-9.0.0" sources."@parcel/watcher-2.0.4" sources."@phenomnomnominal/tsquery-4.1.1" sources."@swc-node/core-1.9.2" sources."@swc-node/register-1.5.5" sources."@swc-node/sourcemap-support-0.2.3" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" sources."@tootallnate/once-2.0.0" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@yarnpkg/lockfile-1.1.0" - (sources."@yarnpkg/parsers-3.0.0-rc.35" // { + (sources."@yarnpkg/parsers-3.0.0-rc.36" // { dependencies = [ sources."argparse-1.0.10" sources."js-yaml-3.14.1" @@ -119326,7 +119075,7 @@ in sources."async-3.2.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - sources."axios-1.2.3" + sources."axios-1.2.6" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."before-after-hook-2.2.3" @@ -119501,7 +119250,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."hosted-git-info-3.0.8" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" @@ -119710,7 +119459,7 @@ in }) sources."npm-run-path-4.0.1" sources."npmlog-6.0.2" - (sources."nx-15.5.2" // { + (sources."nx-15.6.3" // { dependencies = [ sources."cli-spinners-2.6.1" sources."fast-glob-3.2.7" @@ -119879,7 +119628,7 @@ in sources."strip-bom-3.0.0" ]; }) - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" @@ -119955,7 +119704,7 @@ in sources."sax-1.2.4" sources."semver-5.7.1" sources."source-map-0.6.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" ]; buildInputs = globalBuildInputs; meta = { @@ -120013,7 +119762,7 @@ in sources."arr-union-3.1.0" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."atob-2.1.2" (sources."base-0.11.2" // { dependencies = [ @@ -120346,7 +120095,7 @@ in sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" @@ -120469,7 +120218,7 @@ in sources."fresh-0.5.2" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."github-slugger-1.5.0" @@ -120625,7 +120374,7 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" (sources."randomatic-3.1.1" // { dependencies = [ @@ -121315,7 +121064,7 @@ in sources."parse5-7.1.2" sources."parse5-htmlparser2-tree-adapter-7.0.0" sources."progress-2.0.3" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."supports-color-7.2.0" @@ -121337,13 +121086,13 @@ in src = ../../applications/editors/vim/plugins/markdown-preview-nvim; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.0.0" // { dependencies = [ sources."debug-3.2.7" ]; }) - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.20.14" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" (sources."@babel/helper-compilation-targets-7.20.7" // { @@ -121386,13 +121135,13 @@ in sources."@babel/template-7.20.7" ]; }) - (sources."@babel/helpers-7.20.7" // { + (sources."@babel/helpers-7.20.13" // { dependencies = [ sources."@babel/template-7.20.7" ]; }) sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" sources."@babel/plugin-proposal-class-properties-7.0.0" sources."@babel/plugin-proposal-json-strings-7.18.6" @@ -121409,7 +121158,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.11" + sources."@babel/plugin-transform-block-scoping-7.20.14" sources."@babel/plugin-transform-classes-7.20.7" (sources."@babel/plugin-transform-computed-properties-7.20.7" // { dependencies = [ @@ -121431,7 +121180,7 @@ in sources."@babel/plugin-transform-object-super-7.18.6" sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-react-display-name-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/plugin-transform-react-jsx-self-7.18.6" sources."@babel/plugin-transform-react-jsx-source-7.19.6" sources."@babel/plugin-transform-regenerator-7.20.5" @@ -121459,7 +121208,7 @@ in ]; }) sources."@babel/template-7.0.0" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@chemzqm/msgpack-lite-0.1.29" sources."@chemzqm/neovim-5.9.5" @@ -121527,7 +121276,7 @@ in ]; }) sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."atob-2.1.2" (sources."autodll-webpack-plugin-0.4.2" // { dependencies = [ @@ -121603,7 +121352,7 @@ in }) sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."case-sensitive-paths-webpack-plugin-2.1.2" sources."chalk-2.4.2" sources."chart.js-2.9.4" @@ -121814,7 +121563,7 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."glob-7.1.2" @@ -122089,7 +121838,7 @@ in sources."pump-2.0.1" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."randombytes-2.1.0" @@ -122114,7 +121863,7 @@ in sources."regenerator-runtime-0.13.11" (sources."regenerator-transform-0.15.1" // { dependencies = [ - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" ]; }) sources."regex-not-1.0.2" @@ -122656,7 +122405,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-1.1.8" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."readable-stream-2.3.7" sources."readline-1.3.0" @@ -122831,7 +122580,7 @@ in sources."cosmiconfig-8.0.0" sources."cross-fetch-3.1.5" sources."debug-4.3.4" - sources."devtools-protocol-0.0.1068969" + sources."devtools-protocol-0.0.1082910" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -122868,8 +122617,8 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-19.5.2" - sources."puppeteer-core-19.5.2" + sources."puppeteer-19.6.2" + sources."puppeteer-core-19.6.2" sources."readable-stream-3.6.0" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" @@ -123034,7 +122783,7 @@ in sources."form-data-4.0.0" sources."formidable-2.1.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."graphlib-2.1.8" sources."has-1.0.3" sources."has-symbols-1.0.3" @@ -123057,7 +122806,7 @@ in sources."object-inspect-1.12.3" sources."once-1.4.0" sources."path-loader-1.0.12" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -123325,7 +123074,7 @@ in sources."has-yarn-2.1.0" sources."hash-base-3.1.0" sources."homedir-polyfill-1.0.3" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http-errors-1.8.1" // { dependencies = [ sources."depd-1.1.2" @@ -123645,7 +123394,7 @@ in sources."glob-7.2.3" sources."graceful-fs-4.2.10" sources."has-unicode-2.0.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" @@ -123826,7 +123575,7 @@ in sources."fstream-ignore-1.0.5" sources."function-bind-1.1.1" sources."gauge-2.7.4" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-4.0.1" (sources."getpass-0.1.7" // { dependencies = [ @@ -124150,7 +123899,7 @@ in sha512 = "B6q576kLw96eKOiqNpNJsUiwl5vRipc46T0w/LUI7O3fPAVxwu5zklIBhE6Iefj8FV1IdbLwXULESqMWlwjlGQ=="; }; dependencies = [ - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" sources."@mapbox/node-pre-gyp-1.0.10" sources."@node-red/editor-api-3.0.2" sources."@node-red/editor-client-3.0.2" @@ -124304,7 +124053,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-3.0.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."glob-7.2.3" sources."got-11.8.5" @@ -124320,7 +124069,7 @@ in }) sources."hpagent-1.0.0" sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http2-wrapper-1.0.3" (sources."https-proxy-agent-5.0.1" // { @@ -124338,7 +124087,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" - sources."js-sdsl-4.1.4" + sources."js-sdsl-4.3.0" sources."js-yaml-4.1.0" sources."json-buffer-3.0.1" sources."json-schema-traverse-1.0.0" @@ -124417,7 +124166,7 @@ in sources."normalize-url-6.1.0" sources."npmlog-5.0.1" sources."nth-check-2.1.1" - (sources."number-allocator-1.0.12" // { + (sources."number-allocator-1.0.14" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -124445,7 +124194,7 @@ in sources."pseudomap-1.0.2" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.10.3" sources."quick-lru-5.1.1" sources."random-bytes-1.0.0" @@ -124508,7 +124257,7 @@ in sources."toidentifier-1.0.1" sources."tough-cookie-4.0.0" sources."tr46-0.0.3" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."uglify-js-3.16.3" @@ -124673,7 +124422,7 @@ in sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" (sources."readable-stream-2.3.7" // { dependencies = [ @@ -124958,7 +124707,7 @@ in sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.8" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ignore-5.2.4" @@ -125331,10 +125080,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "9.3.1"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-9.3.1.tgz"; - sha512 = "ydRVmnWEVXmc3DCM+F9BjiNj3IHkZ3Mwz5VbJYS2BpY/6d4PcKxNW+Xb0vzGeE6PkVhLcPxwhoIi+RFV2fSfEA=="; + url = "https://registry.npmjs.org/npm/-/npm-9.4.0.tgz"; + sha512 = "eT/yB9VFgnqJjMZN++RDcKPyuvEl3iM//bfJzAa3F9+x9l/x8XJUYnHAy0K6ep4JVNTxCUAp/wgy0pBicTZr5A=="; }; buildInputs = globalBuildInputs; meta = { @@ -125349,10 +125098,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "16.6.2"; + version = "16.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.6.2.tgz"; - sha512 = "J/L90a+NDDWscBQGKIsPKer+qbQEQRJDpK+BPsVZf9YWDN5DCAMicPqRb+Emnxfi8QboiNmvDJWRUFFWRQzDMg=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.6.3.tgz"; + sha512 = "EKhsCbBcVrPlYKzaYQtRhGv9fxpexwROcvl5HebCUNpiCSlOWrzaJvrMlwi9i9GCyJCnH+YAeBPYdqnArA390A=="; }; dependencies = [ sources."@gar/promisify-1.1.3" @@ -125484,7 +125233,7 @@ in sources."has-unicode-2.0.1" sources."has-yarn-3.0.0" sources."hosted-git-info-5.2.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."http2-wrapper-2.2.0" sources."https-proxy-agent-5.0.1" @@ -125716,7 +125465,7 @@ in sources."strip-ansi-7.0.1" ]; }) - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" sources."emoji-regex-9.2.2" @@ -125813,7 +125562,7 @@ in sources."open-8.4.0" sources."performance-now-2.1.0" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."request-2.88.2" sources."safe-buffer-5.2.1" @@ -125881,10 +125630,10 @@ in orval = nodeEnv.buildNodePackage { name = "orval"; packageName = "orval"; - version = "6.11.0"; + version = "6.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/orval/-/orval-6.11.0.tgz"; - sha512 = "oABYZWFKW4PtEv0Kb3Zqg0mIi75J3gMvq9Km8fjo+Ku0gzpdXhUKkeQUisvJXBPsRBTGkWBDRtCuRhqakCNH4w=="; + url = "https://registry.npmjs.org/orval/-/orval-6.11.1.tgz"; + sha512 = "3QjI9i8mp/lT+ufJQWghQyCf6vNXqKVHva2IgLL/OWEuBA8AsGPXvJvCeqzFmi+fBSC7LzpR2Mkyle7dxfycLQ=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-9.0.6" @@ -125902,12 +125651,12 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@orval/angular-6.11.0" - sources."@orval/axios-6.11.0" - sources."@orval/core-6.11.0" - sources."@orval/msw-6.11.0" - sources."@orval/query-6.11.0" - sources."@orval/swr-6.11.0" + sources."@orval/angular-6.11.1" + sources."@orval/axios-6.11.1" + sources."@orval/core-6.11.1" + sources."@orval/msw-6.11.1" + sources."@orval/query-6.11.1" + sources."@orval/swr-6.11.1" sources."@rollup/plugin-commonjs-22.0.2" (sources."@rollup/pluginutils-3.1.0" // { dependencies = [ @@ -125956,7 +125705,7 @@ in sources."@types/node-18.11.18" sources."@types/urijs-1.19.19" sources."abort-controller-3.0.0" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."ajv-8.12.0" @@ -126080,7 +125829,7 @@ in sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" (sources."get-source-2.0.12" // { dependencies = [ sources."data-uri-to-buffer-2.0.2" @@ -126118,7 +125867,7 @@ in }) sources."iconv-lite-0.6.3" sources."ignore-5.2.4" - sources."immer-9.0.18" + sources."immer-9.0.19" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."internal-slot-1.0.4" @@ -126227,8 +125976,7 @@ in sources."printable-characters-1.0.42" sources."proxy-agent-5.0.0" sources."proxy-from-env-1.1.0" - sources."punycode-1.3.2" - sources."querystring-0.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" (sources."raw-body-2.5.1" // { dependencies = [ @@ -126291,20 +126039,15 @@ in sources."toidentifier-1.0.1" sources."tr46-0.0.3" sources."tsconfck-2.0.2" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-check-0.3.2" sources."typed-array-length-1.0.4" sources."typescript-4.9.4" sources."unbox-primitive-1.0.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" - (sources."uri-js-4.4.1" // { - dependencies = [ - sources."punycode-2.2.0" - ]; - }) + sources."uri-js-4.4.1" sources."urijs-1.19.11" - sources."url-0.11.0" sources."utility-types-3.10.0" sources."validate-npm-package-name-3.0.0" sources."validator-13.7.0" @@ -126348,14 +126091,14 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.20.12" // { dependencies = [ sources."json5-2.2.3" sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -126392,9 +126135,9 @@ in sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" @@ -126432,7 +126175,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.11" + sources."@babel/plugin-transform-block-scoping-7.20.14" sources."@babel/plugin-transform-classes-7.20.7" sources."@babel/plugin-transform-computed-properties-7.20.7" sources."@babel/plugin-transform-destructuring-7.20.7" @@ -126453,7 +126196,7 @@ in sources."@babel/plugin-transform-object-super-7.18.6" sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-property-literals-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/plugin-transform-regenerator-7.20.5" sources."@babel/plugin-transform-reserved-words-7.18.6" sources."@babel/plugin-transform-shorthand-properties-7.18.6" @@ -126469,9 +126212,9 @@ in ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@iarna/toml-2.2.5" sources."@jridgewell/gen-mapping-0.1.1" @@ -126531,7 +126274,7 @@ in }) sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" @@ -126605,7 +126348,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -126631,7 +126374,7 @@ in sources."convert-source-map-1.9.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - sources."core-js-compat-3.27.1" + sources."core-js-compat-3.27.2" sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { @@ -126801,7 +126544,7 @@ in sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-port-3.2.0" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" @@ -126853,7 +126596,7 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.9" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" sources."terser-5.16.1" @@ -127140,7 +126883,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" (sources."purgecss-2.3.0" // { dependencies = [ sources."commander-5.1.0" @@ -127395,10 +127138,10 @@ in parcel = nodeEnv.buildNodePackage { name = "parcel"; packageName = "parcel"; - version = "2.8.2"; + version = "2.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/parcel/-/parcel-2.8.2.tgz"; - sha512 = "XMVf3Ip9Iokv0FC3ulN/B0cb5O21qaw0RhUPz7zULQlY794ZpFP9mNtN7HvCVEgjl5/q2sYMcTA8l+5QJ2zZ/Q=="; + url = "https://registry.npmjs.org/parcel/-/parcel-2.8.3.tgz"; + sha512 = "5rMBpbNE72g6jZvkdR5gS2nyhwIXaJy8i65osOqs/+5b7zgf3eMKgjSsDrv6bhz3gzifsba6MBJiZdBckl+vnA=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -127429,79 +127172,79 @@ in sources."@msgpackr-extract/msgpackr-extract-linux-arm64-2.2.0" sources."@msgpackr-extract/msgpackr-extract-linux-x64-2.2.0" sources."@msgpackr-extract/msgpackr-extract-win32-x64-2.2.0" - sources."@parcel/bundler-default-2.8.2" - sources."@parcel/cache-2.8.2" - sources."@parcel/codeframe-2.8.2" - sources."@parcel/compressor-raw-2.8.2" - sources."@parcel/config-default-2.8.2" - sources."@parcel/core-2.8.2" - sources."@parcel/diagnostic-2.8.2" - sources."@parcel/events-2.8.2" - sources."@parcel/fs-2.8.2" - sources."@parcel/fs-search-2.8.2" - sources."@parcel/graph-2.8.2" - sources."@parcel/hash-2.8.2" - sources."@parcel/logger-2.8.2" - sources."@parcel/markdown-ansi-2.8.2" - sources."@parcel/namer-default-2.8.2" - sources."@parcel/node-resolver-core-2.8.2" - sources."@parcel/optimizer-css-2.8.2" - sources."@parcel/optimizer-htmlnano-2.8.2" - sources."@parcel/optimizer-image-2.8.2" - sources."@parcel/optimizer-svgo-2.8.2" - sources."@parcel/optimizer-terser-2.8.2" - sources."@parcel/package-manager-2.8.2" - sources."@parcel/packager-css-2.8.2" - sources."@parcel/packager-html-2.8.2" - sources."@parcel/packager-js-2.8.2" - sources."@parcel/packager-raw-2.8.2" - sources."@parcel/packager-svg-2.8.2" - sources."@parcel/plugin-2.8.2" - sources."@parcel/reporter-cli-2.8.2" - sources."@parcel/reporter-dev-server-2.8.2" - sources."@parcel/resolver-default-2.8.2" - sources."@parcel/runtime-browser-hmr-2.8.2" - sources."@parcel/runtime-js-2.8.2" - sources."@parcel/runtime-react-refresh-2.8.2" - sources."@parcel/runtime-service-worker-2.8.2" + sources."@parcel/bundler-default-2.8.3" + sources."@parcel/cache-2.8.3" + sources."@parcel/codeframe-2.8.3" + sources."@parcel/compressor-raw-2.8.3" + sources."@parcel/config-default-2.8.3" + sources."@parcel/core-2.8.3" + sources."@parcel/diagnostic-2.8.3" + sources."@parcel/events-2.8.3" + sources."@parcel/fs-2.8.3" + sources."@parcel/fs-search-2.8.3" + sources."@parcel/graph-2.8.3" + sources."@parcel/hash-2.8.3" + sources."@parcel/logger-2.8.3" + sources."@parcel/markdown-ansi-2.8.3" + sources."@parcel/namer-default-2.8.3" + sources."@parcel/node-resolver-core-2.8.3" + sources."@parcel/optimizer-css-2.8.3" + sources."@parcel/optimizer-htmlnano-2.8.3" + sources."@parcel/optimizer-image-2.8.3" + sources."@parcel/optimizer-svgo-2.8.3" + sources."@parcel/optimizer-terser-2.8.3" + sources."@parcel/package-manager-2.8.3" + sources."@parcel/packager-css-2.8.3" + sources."@parcel/packager-html-2.8.3" + sources."@parcel/packager-js-2.8.3" + sources."@parcel/packager-raw-2.8.3" + sources."@parcel/packager-svg-2.8.3" + sources."@parcel/plugin-2.8.3" + sources."@parcel/reporter-cli-2.8.3" + sources."@parcel/reporter-dev-server-2.8.3" + sources."@parcel/resolver-default-2.8.3" + sources."@parcel/runtime-browser-hmr-2.8.3" + sources."@parcel/runtime-js-2.8.3" + sources."@parcel/runtime-react-refresh-2.8.3" + sources."@parcel/runtime-service-worker-2.8.3" sources."@parcel/source-map-2.1.1" - sources."@parcel/transformer-babel-2.8.2" - sources."@parcel/transformer-css-2.8.2" - (sources."@parcel/transformer-html-2.8.2" // { + sources."@parcel/transformer-babel-2.8.3" + sources."@parcel/transformer-css-2.8.3" + (sources."@parcel/transformer-html-2.8.3" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/transformer-image-2.8.2" - sources."@parcel/transformer-js-2.8.2" - sources."@parcel/transformer-json-2.8.2" - sources."@parcel/transformer-postcss-2.8.2" - (sources."@parcel/transformer-posthtml-2.8.2" // { + sources."@parcel/transformer-image-2.8.3" + sources."@parcel/transformer-js-2.8.3" + sources."@parcel/transformer-json-2.8.3" + sources."@parcel/transformer-postcss-2.8.3" + (sources."@parcel/transformer-posthtml-2.8.3" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/transformer-raw-2.8.2" - sources."@parcel/transformer-react-refresh-wrap-2.8.2" - (sources."@parcel/transformer-svg-2.8.2" // { + sources."@parcel/transformer-raw-2.8.3" + sources."@parcel/transformer-react-refresh-wrap-2.8.3" + (sources."@parcel/transformer-svg-2.8.3" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/types-2.8.2" - sources."@parcel/utils-2.8.2" + sources."@parcel/types-2.8.3" + sources."@parcel/utils-2.8.3" (sources."@parcel/watcher-2.1.0" // { dependencies = [ sources."node-addon-api-3.2.1" ]; }) - sources."@parcel/workers-2.8.2" + sources."@parcel/workers-2.8.3" sources."@swc/helpers-0.4.14" sources."@trysound/sax-0.2.0" sources."@types/parse-json-4.0.0" sources."abab-2.0.6" sources."abortcontroller-polyfill-1.7.5" - sources."acorn-8.8.1" + sources."acorn-8.8.2" (sources."acorn-globals-4.3.4" // { dependencies = [ sources."acorn-6.4.2" @@ -127528,7 +127271,7 @@ in sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -127598,7 +127341,7 @@ in sources."get-port-4.2.0" sources."getpass-0.1.7" sources."glob-8.1.0" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -127656,7 +127399,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimatch-5.1.6" - sources."msgpackr-1.8.1" + sources."msgpackr-1.8.2" sources."msgpackr-extract-2.2.0" sources."nanoid-3.3.4" sources."node-addon-api-4.3.0" @@ -127715,7 +127458,7 @@ in sources."posthtml-render-3.0.0" sources."prelude-ls-1.1.2" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" (sources."purgecss-5.0.0" // { dependencies = [ sources."commander-9.5.0" @@ -127755,7 +127498,7 @@ in sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" sources."tr46-1.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -127915,7 +127658,7 @@ in sources."gelf-stream-1.1.1" sources."gelfling-0.3.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."glob-7.2.3" sources."graceful-fs-4.2.10" @@ -127996,7 +127739,7 @@ in sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."range-parser-1.2.1" (sources."raw-body-2.5.1" // { @@ -128267,7 +128010,7 @@ in sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-4.0.1" sources."glob-7.2.3" sources."graceful-fs-4.2.10" @@ -128632,7 +128375,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."glob-7.2.3" sources."graceful-fs-4.2.10" @@ -128750,7 +128493,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."queue-tick-1.0.1" @@ -129110,7 +128853,7 @@ in }) sources."@pm2/pm2-version-check-1.0.4" sources."@tootallnate/once-1.1.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."amp-0.3.1" @@ -129280,10 +129023,10 @@ in sources."string_decoder-0.10.31" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.17.3" + sources."systeminformation-5.17.4" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tv4-1.3.0" sources."tx2-1.0.5" sources."type-check-0.3.2" @@ -129317,10 +129060,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "7.25.0"; + version = "7.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-7.25.0.tgz"; - sha512 = "FGFQUON8kJ6ma39elJ8lyD8wPIfgp3opGJD9sX0TgIJk4zSr556qCgC8AN+3BFHe4yuRkEauf4JVLW2RKyyEcA=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-7.26.1.tgz"; + sha512 = "l86ZNy8RZmG2aDxZVk6+vt9c8aV0tMZICQxPksRQOL5r2n92kgaIauYSFUZ+LNmPJFsbSGKpsvgOF41oiS7JWw=="; }; buildInputs = globalBuildInputs; meta = { @@ -129399,24 +129142,24 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.29" + sources."@swc/core-darwin-arm64-1.3.29" + sources."@swc/core-darwin-x64-1.3.29" + sources."@swc/core-linux-arm-gnueabihf-1.3.29" + sources."@swc/core-linux-arm64-gnu-1.3.29" + sources."@swc/core-linux-arm64-musl-1.3.29" + sources."@swc/core-linux-x64-gnu-1.3.29" + sources."@swc/core-linux-x64-musl-1.3.29" + sources."@swc/core-win32-arm64-msvc-1.3.29" + sources."@swc/core-win32-ia32-msvc-1.3.29" + sources."@swc/core-win32-x64-msvc-1.3.29" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/node-18.11.18" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -129665,9 +129408,9 @@ in dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -129683,11 +129426,11 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" @@ -129709,7 +129452,7 @@ in sources."browserslist-4.21.4" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -130283,13 +130026,13 @@ in sources."follow-redirects-1.15.2" sources."fs-extra-10.1.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."got-9.6.0" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-symbols-1.0.3" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."https-proxy-agent-5.0.1" sources."ini-1.3.8" sources."ip-2.0.0" @@ -130307,7 +130050,7 @@ in sources."minimist-1.2.7" sources."moment-2.29.4" sources."ms-2.1.2" - sources."node-abort-controller-3.0.1" + sources."node-abort-controller-3.1.1" sources."normalize-url-4.5.1" sources."object-inspect-1.12.3" sources."once-1.4.0" @@ -130355,10 +130098,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.290"; + version = "1.1.291"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.290.tgz"; - sha512 = "iHT8G2+R/GUfYWxxd4ud5Lj/0H0bE1eWVR0avKKgPtkBeLkUz3sorjKpfuaJdsuJNrunzMtZsmYPD366t39klg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.291.tgz"; + sha512 = "wkSlCEhF1OwtJqHuifwxk76UMr1NPqsAbPIlCh7tiZx8VUdZs17NCGNorhyb2M+GFEvp8pod9Xyu1LXN1JL2kQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -130373,10 +130116,10 @@ in quicktype = nodeEnv.buildNodePackage { name = "quicktype"; packageName = "quicktype"; - version = "20.0.26"; + version = "21.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/quicktype/-/quicktype-20.0.26.tgz"; - sha512 = "q0pOSWfVgGEATW96fvbAOEe9od48EqMCGpv86XNt9aznVngdB4eJRyPK1Z0Jvl10/cWDze2bvzPT2b+LChSfAQ=="; + url = "https://registry.npmjs.org/quicktype/-/quicktype-21.0.4.tgz"; + sha512 = "zpmXft8rIemnKKA/aNmwUk21QY5GDRSNJegD3ESPBAVt1/V40lsZDF3h1oYqjYCawOjEpPOizYaxMMNhbVEL3w=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" @@ -130385,18 +130128,18 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" sources."@mark.probst/typescript-json-schema-0.55.0" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -130405,7 +130148,7 @@ in sources."@types/node-16.18.11" sources."@types/urijs-1.19.19" sources."abort-controller-3.0.0" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -130471,9 +130214,9 @@ in sources."path-is-absolute-1.0.1" sources."pluralize-8.0.0" sources."process-0.11.10" - sources."quicktype-core-20.0.26" - sources."quicktype-graphql-input-20.0.26" - sources."quicktype-typescript-input-20.0.26" + sources."quicktype-core-21.0.4" + sources."quicktype-graphql-input-21.0.4" + sources."quicktype-typescript-input-21.0.4" sources."readable-stream-4.3.0" sources."reduce-flatten-2.0.0" sources."require-directory-2.1.1" @@ -130566,7 +130309,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."gopd-1.0.1" sources."has-1.0.3" @@ -130653,13 +130396,13 @@ in sources."@ampproject/remapping-2.2.0" sources."@babel/cli-7.20.7" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" (sources."@babel/core-7.20.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -130696,9 +130439,9 @@ in sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" sources."@babel/helper-wrap-function-7.20.5" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7" sources."@babel/plugin-proposal-async-generator-functions-7.20.7" @@ -130737,7 +130480,7 @@ in sources."@babel/plugin-transform-arrow-functions-7.20.7" sources."@babel/plugin-transform-async-to-generator-7.20.7" sources."@babel/plugin-transform-block-scoped-functions-7.18.6" - sources."@babel/plugin-transform-block-scoping-7.20.11" + sources."@babel/plugin-transform-block-scoping-7.20.14" sources."@babel/plugin-transform-classes-7.20.7" sources."@babel/plugin-transform-computed-properties-7.20.7" sources."@babel/plugin-transform-destructuring-7.20.7" @@ -130758,7 +130501,7 @@ in sources."@babel/plugin-transform-parameters-7.20.7" sources."@babel/plugin-transform-property-literals-7.18.6" sources."@babel/plugin-transform-react-display-name-7.18.6" - sources."@babel/plugin-transform-react-jsx-7.20.7" + sources."@babel/plugin-transform-react-jsx-7.20.13" sources."@babel/plugin-transform-react-jsx-development-7.18.6" sources."@babel/plugin-transform-react-pure-annotations-7.18.6" sources."@babel/plugin-transform-regenerator-7.20.5" @@ -130784,9 +130527,9 @@ in sources."@babel/preset-react-7.18.6" sources."@babel/preset-stage-0-7.8.3" sources."@babel/register-7.18.9" - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@jridgewell/gen-mapping-0.1.1" sources."@jridgewell/resolve-uri-3.1.0" @@ -130802,7 +130545,7 @@ in sources."@types/parse-json-4.0.0" sources."@types/prop-types-15.7.5" sources."@types/q-1.5.5" - sources."@types/react-17.0.52" + sources."@types/react-17.0.53" sources."@types/scheduler-0.16.2" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" @@ -130871,7 +130614,7 @@ in }) sources."assign-symbols-1.0.0" sources."async-2.6.4" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-limiter-1.0.1" sources."atob-2.1.2" (sources."autoprefixer-9.8.8" // { @@ -130989,7 +130732,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -131066,7 +130809,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.27.1" + sources."core-js-compat-3.27.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."cosmiconfig-6.0.0" @@ -131366,7 +131109,7 @@ in sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-proxy-2.1.0" sources."get-stream-3.0.0" sources."get-symbol-description-1.0.0" @@ -131907,7 +131650,7 @@ in }) sources."pump-2.0.1" sources."pumpify-1.5.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."q-1.5.1" sources."qs-6.11.0" sources."query-string-5.1.1" @@ -132506,10 +132249,10 @@ in readability-cli = nodeEnv.buildNodePackage { name = "readability-cli"; packageName = "readability-cli"; - version = "2.4.2"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.4.2.tgz"; - sha512 = "dQ0EuULmLd65pa9H27xreYuQiNFerDQxI3weqPRHcuiFQnK0b4YNhcZHZw7w3a0YYpXVlcP6bKK/BaiUUuqBoQ=="; + url = "https://registry.npmjs.org/readability-cli/-/readability-cli-2.4.4.tgz"; + sha512 = "KNVRUT4JKrnNCkD4IuMm9zU5bkFc699lue7xT66lIhjXTARwKlBRwiSZYgx7mCKC/Zj40dw89UULFAyihnXLXQ=="; }; dependencies = [ sources."@mapbox/node-pre-gyp-1.0.10" @@ -132517,7 +132260,7 @@ in sources."@tootallnate/once-2.0.0" sources."abab-2.0.6" sources."abbrev-1.1.1" - sources."acorn-8.8.1" + sources."acorn-8.8.2" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -132629,7 +132372,7 @@ in sources."path-is-absolute-1.0.1" sources."prelude-ls-1.1.2" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."querystringify-2.2.0" sources."readable-stream-3.6.0" sources."require-directory-2.1.1" @@ -132654,7 +132397,7 @@ in sources."type-check-0.3.2" sources."universalify-0.2.0" sources."url-parse-1.5.10" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-3.0.0" @@ -132694,7 +132437,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.18.6" - sources."@babel/generator-7.20.7" + sources."@babel/generator-7.20.14" sources."@babel/helper-annotate-as-pure-7.18.6" sources."@babel/helper-environment-visitor-7.18.9" sources."@babel/helper-function-name-7.19.0" @@ -132704,10 +132447,10 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" - sources."@babel/runtime-7.20.7" + sources."@babel/parser-7.20.13" + sources."@babel/runtime-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" sources."@emotion/is-prop-valid-1.2.0" sources."@emotion/memoize-0.8.0" @@ -132721,7 +132464,7 @@ in sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" sources."@redocly/ajv-8.11.0" - sources."@redocly/openapi-core-1.0.0-beta.120" + sources."@redocly/openapi-core-1.0.0-beta.122" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/eslint-8.4.10" @@ -132746,7 +132489,7 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" (sources."ajv-6.12.6" // { dependencies = [ @@ -132816,7 +132559,7 @@ in sources."call-me-maybe-1.0.2" sources."camelcase-6.3.0" sources."camelize-1.0.1" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" (sources."chalk-2.4.2" // { dependencies = [ sources."has-flag-3.0.0" @@ -132839,7 +132582,7 @@ in sources."configstore-5.0.1" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.3" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -132923,7 +132666,7 @@ in }) sources."hmac-drbg-1.0.1" sources."hoist-non-react-statics-3.3.2" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-client-1.3.5" sources."https-browserify-1.0.0" sources."iconv-lite-0.6.3" @@ -133136,7 +132879,7 @@ in }) (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) (sources."url-0.11.0" // { @@ -133198,7 +132941,7 @@ in }; dependencies = [ sources."@types/prop-types-15.7.5" - sources."@types/react-18.0.26" + sources."@types/react-18.0.27" sources."@types/scheduler-0.16.2" sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.2" @@ -133456,7 +133199,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."glob-8.0.3" sources."glob-parent-5.1.2" @@ -133468,7 +133211,7 @@ in sources."has-symbols-1.0.3" sources."has-yarn-2.1.0" sources."highlight.js-11.7.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" (sources."https-proxy-agent-2.2.4" // { dependencies = [ @@ -133662,10 +133405,10 @@ in rimraf = nodeEnv.buildNodePackage { name = "rimraf"; packageName = "rimraf"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-4.1.1.tgz"; - sha512 = "Z4Y81w8atcvaJuJuBB88VpADRH66okZAuEm+Jtaufa+s7rZmIz+Hik2G53kGaNytE7lsfXyWktTmfVz0H9xuDg=="; + url = "https://registry.npmjs.org/rimraf/-/rimraf-4.1.2.tgz"; + sha512 = "BlIbgFryTbw3Dz6hyoWFhKk+unCcHMSkZGrTFVAx2WmttdBSonsdtRlwiuTbDqTKr+UlXIUqJVS4QT5tUzGENQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -133680,10 +133423,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "3.10.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-3.10.0.tgz"; - sha512 = "JmRYz44NjC1MjVF2VKxc0M1a97vn+cDxeqWmnwyAF4FvpjK8YFdHpaqvQB+3IxCvX05vJxKZkoMDU8TShhmJVA=="; + url = "https://registry.npmjs.org/rollup/-/rollup-3.12.0.tgz"; + sha512 = "4MZ8kA2HNYahIjz63rzrMMRvDqQDeS9LoriJvMuV0V6zIGysP36e9t4yObUfwdT9h/szXoHQideICftcdZklWg=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -133717,16 +133460,16 @@ in sources."@types/node-14.17.34" sources."@types/semver-7.3.13" sources."@types/vscode-1.66.0" - sources."@typescript-eslint/eslint-plugin-5.48.2" - sources."@typescript-eslint/parser-5.48.2" - sources."@typescript-eslint/scope-manager-5.48.2" - sources."@typescript-eslint/type-utils-5.48.2" - sources."@typescript-eslint/types-5.48.2" - sources."@typescript-eslint/typescript-estree-5.48.2" - sources."@typescript-eslint/utils-5.48.2" - sources."@typescript-eslint/visitor-keys-5.48.2" + sources."@typescript-eslint/eslint-plugin-5.49.0" + sources."@typescript-eslint/parser-5.49.0" + sources."@typescript-eslint/scope-manager-5.49.0" + sources."@typescript-eslint/type-utils-5.49.0" + sources."@typescript-eslint/types-5.49.0" + sources."@typescript-eslint/typescript-estree-5.49.0" + sources."@typescript-eslint/utils-5.49.0" + sources."@typescript-eslint/visitor-keys-5.49.0" sources."@vscode/test-electron-2.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" sources."ajv-6.12.6" @@ -133770,8 +133513,8 @@ in sources."cross-spawn-7.0.3" sources."css-select-5.1.0" sources."css-what-6.1.0" - sources."d3-7.8.1" - sources."d3-array-3.2.1" + sources."d3-7.8.2" + sources."d3-array-3.2.2" sources."d3-axis-3.0.0" sources."d3-brush-3.0.0" sources."d3-chord-3.0.1" @@ -133890,11 +133633,11 @@ in }) sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."github-from-package-0.0.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."globby-11.1.0" sources."graceful-fs-4.2.10" sources."grapheme-splitter-1.0.4" @@ -133921,7 +133664,7 @@ in sources."is-path-inside-3.0.3" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + sources."js-sdsl-4.3.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -133979,7 +133722,7 @@ in sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."queue-microtask-1.2.3" (sources."rc-1.2.8" // { @@ -134024,7 +133767,7 @@ in sources."tmp-0.2.1" sources."to-regex-range-5.0.1" sources."traverse-0.3.9" - sources."tslib-2.4.1" + sources."tslib-2.5.0" (sources."tsutils-3.21.0" // { dependencies = [ sources."tslib-1.14.1" @@ -134156,7 +133899,7 @@ in sources."formidable-1.0.11" sources."fresh-0.2.0" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."has-1.0.3" sources."has-symbols-1.0.3" sources."http-auth-2.0.7" @@ -134265,13 +134008,13 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "14.1.2"; + version = "14.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-14.1.2.tgz"; - sha512 = "luwVfJwbeE7dhCKeRU0vIBpt4bXdbAfzwsWJIQ5eqrIW2e+4nLWXbSlZ0WzelSFHQq+FlueOW6dr90jEewS9zw=="; + url = "https://registry.npmjs.org/serve/-/serve-14.2.0.tgz"; + sha512 = "+HOw/XK1bW8tw5iBilBz/mJLWRzM8XM6MPxL4J/dKzdxq1vfdEWSwhaR7/yS8EJp5wzvP92p1qirysJvnEtjXg=="; }; dependencies = [ - sources."@zeit/schemas-2.21.0" + sources."@zeit/schemas-2.29.0" sources."accepts-1.3.8" sources."ajv-8.11.0" (sources."ansi-align-3.0.1" // { @@ -134340,7 +134083,7 @@ in sources."path-is-inside-1.0.2" sources."path-key-3.1.1" sources."path-to-regexp-2.2.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."registry-auth-token-3.3.2" @@ -134373,7 +134116,7 @@ in sources."vary-1.1.2" sources."which-2.0.2" sources."widest-line-4.0.1" - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" sources."strip-ansi-7.0.1" @@ -134393,10 +134136,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "3.26.0"; + version = "3.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.26.0.tgz"; - sha512 = "drVr4akkQwm2Pj7ZN9boh5PoI2nKvlXmy+Cb8Hh1Zv8ybsf47ZUQE6t7dakGA4irYf4SQCbVc72nKqISfarMCQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.27.0.tgz"; + sha512 = "+8EDo7x8IJxTj4KqQG71qpX7oq+EZy0NGm/04q3M5jK7L8rLowEtnzq82s93yeNSgmJSMopd3pTzuH9CCWkNMw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -134405,7 +134148,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - (sources."@serverless/dashboard-plugin-6.2.2" // { + (sources."@serverless/dashboard-plugin-6.2.3" // { dependencies = [ sources."fs-extra-9.1.0" sources."open-7.4.2" @@ -134459,7 +134202,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1296.0" // { + (sources."aws-sdk-2.1304.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -134652,7 +134395,7 @@ in sources."fs2-0.3.9" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-8.0.0" sources."get-stream-6.0.1" sources."glob-7.2.3" @@ -134667,7 +134410,7 @@ in sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hexoid-1.0.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.4.24" @@ -134793,7 +134536,7 @@ in sources."process-utils-4.0.0" sources."promise-queue-2.2.5" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."querystring-0.2.1" sources."queue-microtask-1.2.3" @@ -134874,7 +134617,7 @@ in sources."tr46-0.0.3" sources."traverse-0.6.7" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-2.7.2" sources."type-fest-0.21.3" sources."unbzip2-stream-1.4.3" @@ -135013,7 +134756,7 @@ in sources."fresh-0.5.2" sources."from-0.1.7" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."getpass-0.1.7" sources."global-https://github.com/component/global/archive/v2.0.1.tar.gz" sources."har-schema-2.0.0" @@ -135074,7 +134817,7 @@ in sources."performance-now-2.1.0" sources."proxy-addr-2.0.7" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" @@ -135560,10 +135303,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.1087.0"; + version = "1.1091.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.1087.0.tgz"; - sha512 = "4Ap2O59+qHCKmzeJu0Kq6S74M409UwRer3ss3wLCNO7vwj8hpfi4wvA+bZc8ywwKv028X9nLhw8hzcJ7bmsavQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.1091.0.tgz"; + sha512 = "NUofOS3cf4KoT0V3vS1NDC86eG86L29SIno8yIMiVvW7azOxw/IgO09oUhKzFUMXixzU0I9z6Ja+Uv0JsrMQnw=="; }; buildInputs = globalBuildInputs; meta = { @@ -135602,7 +135345,7 @@ in sources."node-gyp-build-4.6.0" sources."object-assign-4.1.1" sources."socket.io-adapter-2.4.0" - sources."socket.io-parser-4.2.1" + sources."socket.io-parser-4.2.2" sources."utf-8-validate-5.0.10" sources."vary-1.1.2" sources."ws-8.2.3" @@ -135758,7 +135501,7 @@ in sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."wcwidth-1.0.1" - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-styles-6.2.1" ]; @@ -135782,10 +135525,10 @@ in sql-formatter = nodeEnv.buildNodePackage { name = "sql-formatter"; packageName = "sql-formatter"; - version = "12.0.5"; + version = "12.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-12.0.5.tgz"; - sha512 = "nKils1bIf99WyDqr7252W6NhHjgJoL2mw7bvWb79uDzVd1xZceZ8zyy05behD92+xJIUzEibNMXwTuDFMwrHyg=="; + url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-12.1.0.tgz"; + sha512 = "XwbFwdes2SuETEj/a0WY2MjweFFzgn5phDum4WOdWjk+aay84xXPUl9BzevB89PLykx+4d9GRdXRaiY1VHzytg=="; }; dependencies = [ sources."argparse-2.0.1" @@ -135842,7 +135585,7 @@ in sources."push-stream-11.2.0" ]; }) - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."async-single-1.0.5" sources."async-write-2.1.0" sources."atob-2.1.2" @@ -136047,7 +135790,7 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."glob-6.0.4" @@ -136856,7 +136599,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."available-typed-arrays-1.0.5" - (sources."aws-sdk-2.1296.0" // { + (sources."aws-sdk-2.1304.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -137065,7 +136808,7 @@ in sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" (sources."getpass-0.1.7" // { dependencies = [ @@ -137153,7 +136896,7 @@ in dependencies = [ sources."esprima-4.0.1" sources."js-yaml-3.14.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."uri-js-3.0.2" ]; }) @@ -137362,7 +137105,7 @@ in sources."har-validator-5.1.5" sources."http-signature-1.2.0" sources."oauth-sign-0.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" @@ -137540,7 +137283,7 @@ in sources."unpipe-1.0.0" (sources."uri-js-4.4.1" // { dependencies = [ - sources."punycode-2.2.0" + sources."punycode-2.3.0" ]; }) (sources."url-0.10.3" // { @@ -137664,7 +137407,7 @@ in sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" - sources."@csstools/selector-specificity-2.0.2" + sources."@csstools/selector-specificity-2.1.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -137788,7 +137531,7 @@ in sources."postcss-safe-parser-6.0.0" sources."postcss-selector-parser-6.0.11" sources."postcss-value-parser-4.2.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" (sources."read-pkg-5.2.0" // { @@ -137960,7 +137703,7 @@ in sources."performance-now-2.1.0" sources."progress-1.1.8" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-1.0.5" sources."request-2.88.2" @@ -138004,17 +137747,17 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.0.2.tgz"; - sha512 = "DkhKhV0Jt0gh7q9DBB26+J2Vfb9y4/4JWxnbkXBZha7542LOhwvj3edJFjyJ+xjdaXyInZ+YRRYc3V6wytP2ew=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.0.3.tgz"; + sha512 = "ByBFXo3bfHRGIsYEasHkdMhLkNleVfszX/Ns1oip58tPJlKdo5Ssr8kgVIuo5oq00hss8AIcdesuy0Xt0BcTvg=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -138030,11 +137773,11 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ @@ -138049,18 +137792,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -138068,7 +137811,7 @@ in sources."@types/node-18.11.18" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.3" @@ -138085,7 +137828,7 @@ in sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -138115,7 +137858,7 @@ in sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globals-11.12.0" @@ -138213,11 +137956,10 @@ in sources."sass-1.57.1" sources."sax-1.2.4" sources."semver-6.3.0" - sources."sorcery-0.10.0" + sources."sorcery-0.11.0" sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."source-map-resolve-0.6.0" - sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" (sources."stylus-0.55.0" // { dependencies = [ @@ -138231,12 +137973,12 @@ in sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."svelte-3.55.1" - sources."svelte-preprocess-5.0.0" + sources."svelte-preprocess-5.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" sources."ts-node-10.9.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."typescript-4.9.4" sources."update-browserslist-db-1.0.10" sources."v8-compile-cache-lib-3.0.1" @@ -138260,17 +138002,17 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.15.2"; + version = "0.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.2.tgz"; - sha512 = "U8V3ZBx6IQbTfCkyf1Hss+xNmDTJJ2KyLLo7hv+JxBJpqZzBdfWkyJpCTrvN9FP10X4LFKbb3vIl558fKl9Meg=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.15.3.tgz"; + sha512 = "HwPvDZGMCSBkdRD0cfEBTPfy5F3qxqcYNIyMrD0zUH9FoWy7gpEpUZVbCTZ7d5QQVst9rgNdGhzfd+O/s+3b8g=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.18.6" - sources."@babel/compat-data-7.20.10" + sources."@babel/compat-data-7.20.14" sources."@babel/core-7.20.12" - (sources."@babel/generator-7.20.7" // { + (sources."@babel/generator-7.20.14" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.2" ]; @@ -138286,11 +138028,11 @@ in sources."@babel/helper-string-parser-7.19.4" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/helper-validator-option-7.18.6" - sources."@babel/helpers-7.20.7" + sources."@babel/helpers-7.20.13" sources."@babel/highlight-7.18.6" - sources."@babel/parser-7.20.7" + sources."@babel/parser-7.20.13" sources."@babel/template-7.20.7" - sources."@babel/traverse-7.20.12" + sources."@babel/traverse-7.20.13" sources."@babel/types-7.20.7" (sources."@cspotcode/source-map-support-0.8.1" // { dependencies = [ @@ -138308,18 +138050,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -138332,8 +138074,8 @@ in sources."vscode-uri-2.1.2" ]; }) - sources."@vscode/l10n-0.0.10" - sources."acorn-8.8.1" + sources."@vscode/l10n-0.0.11" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.3" @@ -138349,7 +138091,7 @@ in sources."browserslist-4.21.4" sources."buffer-crc32-0.2.13" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."chokidar-3.5.3" @@ -138382,7 +138124,7 @@ in sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globals-11.12.0" @@ -138482,11 +138224,10 @@ in sources."sass-1.57.1" sources."sax-1.2.4" sources."semver-6.3.0" - sources."sorcery-0.10.0" + sources."sorcery-0.11.0" sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."source-map-resolve-0.6.0" - sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" (sources."stylus-0.55.0" // { dependencies = [ @@ -138500,19 +138241,19 @@ in sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."svelte-3.55.1" - sources."svelte-preprocess-5.0.0" + sources."svelte-preprocess-5.0.1" sources."svelte2tsx-0.6.0" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" sources."ts-node-10.9.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."typescript-4.9.4" sources."update-browserslist-db-1.0.10" sources."v8-compile-cache-lib-3.0.1" sources."void-elements-3.1.0" - sources."vscode-css-languageservice-6.2.1" - sources."vscode-html-languageservice-5.0.3" + sources."vscode-css-languageservice-6.2.3" + sources."vscode-html-languageservice-5.0.4" sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-8.0.2" sources."vscode-languageserver-protocol-3.17.2" @@ -138605,7 +138346,7 @@ in sources."asap-2.0.6" sources."assign-symbols-1.0.0" sources."async-1.5.2" - sources."async-each-1.0.3" + sources."async-each-1.0.4" sources."asynckit-0.4.0" sources."atob-2.1.2" sources."balanced-match-1.0.2" @@ -138780,7 +138521,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."glob-7.2.3" @@ -139014,7 +138755,7 @@ in sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" sources."pstree.remy-1.1.8" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-4.0.0" sources."range-parser-1.2.1" (sources."raw-body-2.0.2" // { @@ -139251,18 +138992,18 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" @@ -139336,7 +139077,7 @@ in sources."to-regex-range-5.0.1" (sources."ts-node-10.9.1" // { dependencies = [ - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" ]; @@ -139510,7 +139251,7 @@ in sources."prism-media-0.0.4" sources."process-nextick-args-2.0.1" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."ramda-0.25.0" sources."rc-1.2.8" @@ -139698,7 +139439,7 @@ in sources."@jridgewell/source-map-0.3.2" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.17" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."buffer-from-1.1.2" sources."commander-2.20.3" sources."source-map-0.6.1" @@ -139717,51 +139458,41 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "12.5.1"; + version = "13.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.5.1.tgz"; - sha512 = "LoFU1yBIm/gxM++jDdvdfS2diW14NBHsimRyChi8Kb5h5pUHcG0rGfW2PflUzfYcHF0XykgW9WBdPd1WWnyS7Q=="; + url = "https://registry.npmjs.org/textlint/-/textlint-13.0.4.tgz"; + sha512 = "XBPK+cRMYLY3NodKoCFMncmVJRk59S+aSgkwpdNnV8VXFo1hF0EEysbwEp9s8ov0LhVO8flfd51/L+VlUFeTlg=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-12.3.0" - sources."@textlint/ast-tester-12.5.0" - sources."@textlint/ast-traverse-12.5.0" - (sources."@textlint/config-loader-12.5.0" // { - dependencies = [ - sources."rc-config-loader-4.1.2" - ]; - }) - sources."@textlint/feature-flag-12.5.0" - sources."@textlint/fixer-formatter-12.5.1" - sources."@textlint/kernel-12.5.0" - (sources."@textlint/linter-formatter-12.5.0" // { - dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" - ]; - }) - sources."@textlint/markdown-to-ast-12.5.0" - sources."@textlint/module-interop-12.5.0" - sources."@textlint/source-code-fixer-12.5.0" - sources."@textlint/text-to-ast-12.5.0" - sources."@textlint/textlint-plugin-markdown-12.5.0" - sources."@textlint/textlint-plugin-text-12.5.0" - sources."@textlint/types-12.5.0" - sources."@textlint/utils-12.5.0" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/ast-tester-13.0.4" + sources."@textlint/ast-traverse-13.0.4" + sources."@textlint/config-loader-13.0.4" + sources."@textlint/feature-flag-13.0.4" + sources."@textlint/fixer-formatter-13.0.4" + sources."@textlint/kernel-13.0.4" + sources."@textlint/linter-formatter-13.0.4" + sources."@textlint/markdown-to-ast-13.0.4" + sources."@textlint/module-interop-13.0.4" + sources."@textlint/source-code-fixer-13.0.4" + sources."@textlint/text-to-ast-13.0.4" + sources."@textlint/textlint-plugin-markdown-13.0.4" + sources."@textlint/textlint-plugin-text-13.0.4" + sources."@textlint/types-13.0.4" + sources."@textlint/utils-13.0.4" sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" + sources."argparse-1.0.10" sources."astral-regex-2.0.0" sources."bail-1.0.5" sources."balanced-match-1.0.2" - sources."boundary-1.0.1" + sources."boundary-2.0.0" sources."brace-expansion-1.1.11" - sources."call-bind-1.0.2" sources."ccount-1.1.0" sources."chalk-4.1.2" sources."character-entities-1.2.4" @@ -139773,9 +139504,7 @@ in sources."concat-map-0.0.1" sources."crypt-0.0.2" sources."debug-4.3.4" - sources."deep-equal-1.1.1" sources."deep-is-0.1.4" - sources."define-properties-1.1.4" sources."diff-4.0.2" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" @@ -139783,6 +139512,7 @@ in sources."esprima-4.0.1" sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" + sources."fast-equals-4.0.3" sources."fast-levenshtein-2.0.6" sources."fault-1.0.4" sources."file-entry-cache-5.0.1" @@ -139792,34 +139522,26 @@ in sources."format-0.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" sources."get-stdin-5.0.1" sources."glob-7.2.3" sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.0" - sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" sources."hosted-git-info-2.8.9" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" - sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-core-module-2.11.0" - sources."is-date-object-1.0.5" sources."is-decimal-1.0.4" sources."is-file-1.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-hexadecimal-1.0.4" sources."is-plain-obj-2.1.0" - sources."is-regex-1.1.4" sources."is-utf8-0.2.1" - sources."js-yaml-4.1.0" + sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-1.0.0" sources."json5-2.2.3" @@ -139860,8 +139582,6 @@ in sources."mkdirp-0.5.6" sources."ms-2.1.2" sources."normalize-package-data-2.5.0" - sources."object-is-1.1.5" - sources."object-keys-1.1.1" sources."once-1.4.0" sources."optionator-0.9.1" sources."p-limit-1.3.0" @@ -139879,11 +139599,11 @@ in sources."pinkie-promise-2.0.1" sources."pluralize-2.0.0" sources."prelude-ls-1.2.1" - sources."punycode-2.2.0" - (sources."rc-config-loader-3.0.0" // { + sources."punycode-2.3.0" + (sources."rc-config-loader-4.1.2" // { dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" + sources."argparse-2.0.1" + sources."js-yaml-4.1.0" ]; }) sources."read-pkg-1.1.0" @@ -139897,7 +139617,6 @@ in sources."strip-bom-3.0.0" ]; }) - sources."regexp.prototype.flags-1.4.3" sources."remark-footnotes-3.0.0" sources."remark-frontmatter-3.0.0" sources."remark-gfm-1.0.0" @@ -139916,7 +139635,7 @@ in sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."strip-bom-2.0.0" - sources."structured-source-3.0.2" + sources."structured-source-4.0.0" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."table-6.8.1" @@ -139984,7 +139703,7 @@ in sources."define-properties-1.1.4" sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."has-1.0.3" sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" @@ -140016,7 +139735,7 @@ in sources."@babel/highlight-7.18.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" sources."@types/hast-2.3.4" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" @@ -140139,7 +139858,7 @@ in sources."hast-util-whitespace-1.0.4" sources."hastscript-6.0.0" sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."ignore-5.2.4" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -140318,7 +140037,7 @@ in sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."term-size-2.2.1" - sources."textlint-rule-helper-2.2.4" + sources."textlint-rule-helper-2.3.0" sources."through-2.3.8" (sources."through2-2.0.0" // { dependencies = [ @@ -140459,61 +140178,77 @@ in sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" sources."@textlint/ast-node-types-4.4.3" - (sources."@textlint/ast-tester-12.5.0" // { + (sources."@textlint/ast-tester-12.6.1" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-12.6.1" ]; }) - (sources."@textlint/ast-traverse-12.5.0" // { + (sources."@textlint/ast-traverse-12.6.1" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-12.6.1" ]; }) - (sources."@textlint/config-loader-12.5.0" // { + (sources."@textlint/config-loader-13.0.4" // { dependencies = [ - sources."rc-config-loader-4.1.2" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/ast-tester-13.0.4" + sources."@textlint/ast-traverse-13.0.4" + sources."@textlint/feature-flag-13.0.4" + sources."@textlint/kernel-13.0.4" + sources."@textlint/source-code-fixer-13.0.4" + sources."@textlint/types-13.0.4" + sources."@textlint/utils-13.0.4" + sources."boundary-2.0.0" + sources."structured-source-4.0.0" ]; }) - sources."@textlint/feature-flag-12.5.0" - sources."@textlint/fixer-formatter-12.5.1" - (sources."@textlint/kernel-12.5.0" // { + sources."@textlint/feature-flag-12.6.1" + (sources."@textlint/fixer-formatter-13.0.4" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/types-13.0.4" ]; }) - (sources."@textlint/linter-formatter-12.5.0" // { + (sources."@textlint/kernel-12.6.1" // { dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" + sources."@textlint/ast-node-types-12.6.1" + sources."boundary-2.0.0" + sources."structured-source-4.0.0" ]; }) - (sources."@textlint/markdown-to-ast-12.5.0" // { + (sources."@textlint/linter-formatter-13.0.4" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/types-13.0.4" ]; }) - sources."@textlint/module-interop-12.5.0" - sources."@textlint/source-code-fixer-12.5.0" - (sources."@textlint/text-to-ast-12.5.0" // { + (sources."@textlint/markdown-to-ast-12.6.1" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-12.6.1" ]; }) - sources."@textlint/textlint-plugin-markdown-12.5.0" - sources."@textlint/textlint-plugin-text-12.5.0" - (sources."@textlint/types-12.5.0" // { + sources."@textlint/module-interop-13.0.4" + sources."@textlint/source-code-fixer-12.6.1" + (sources."@textlint/text-to-ast-12.6.1" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-12.6.1" ]; }) - sources."@textlint/utils-12.5.0" + sources."@textlint/textlint-plugin-markdown-12.6.1" + sources."@textlint/textlint-plugin-text-12.6.1" + (sources."@textlint/types-12.6.1" // { + dependencies = [ + sources."@textlint/ast-node-types-12.6.1" + ]; + }) + sources."@textlint/utils-12.6.1" sources."@types/mdast-3.0.10" sources."@types/structured-source-3.0.0" sources."@types/unist-2.0.6" sources."ajv-8.12.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" + sources."argparse-1.0.10" sources."astral-regex-2.0.0" sources."bail-1.0.5" sources."balanced-match-1.0.2" @@ -140544,6 +140279,7 @@ in sources."esprima-4.0.1" sources."extend-3.0.2" sources."fast-deep-equal-3.1.3" + sources."fast-equals-4.0.3" sources."fast-levenshtein-2.0.6" sources."fault-1.0.4" sources."file-entry-cache-5.0.1" @@ -140554,7 +140290,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-5.0.1" sources."glob-7.2.3" sources."graceful-fs-4.2.10" @@ -140583,7 +140319,7 @@ in sources."is-plain-obj-2.1.0" sources."is-regex-1.1.4" sources."is-utf8-0.2.1" - sources."js-yaml-4.1.0" + sources."js-yaml-3.14.1" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-1.0.0" sources."json5-2.2.3" @@ -140647,11 +140383,11 @@ in sources."pluralize-2.0.0" sources."prelude-ls-1.2.1" sources."property-information-5.6.0" - sources."punycode-2.2.0" - (sources."rc-config-loader-3.0.0" // { + sources."punycode-2.3.0" + (sources."rc-config-loader-4.1.2" // { dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" + sources."argparse-2.0.1" + sources."js-yaml-4.1.0" ]; }) sources."read-pkg-1.1.0" @@ -140695,12 +140431,25 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."table-6.8.1" sources."text-table-0.2.0" - (sources."textlint-12.5.1" // { + (sources."textlint-13.0.4" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" + sources."@textlint/ast-tester-13.0.4" + sources."@textlint/ast-traverse-13.0.4" + sources."@textlint/feature-flag-13.0.4" + sources."@textlint/kernel-13.0.4" + sources."@textlint/markdown-to-ast-13.0.4" + sources."@textlint/source-code-fixer-13.0.4" + sources."@textlint/text-to-ast-13.0.4" + sources."@textlint/textlint-plugin-markdown-13.0.4" + sources."@textlint/textlint-plugin-text-13.0.4" + sources."@textlint/types-13.0.4" + sources."@textlint/utils-13.0.4" + sources."boundary-2.0.0" + sources."structured-source-4.0.0" ]; }) - sources."textlint-tester-12.5.0" + sources."textlint-tester-12.6.1" (sources."textlint-util-to-string-3.1.1" // { dependencies = [ sources."unified-8.4.2" @@ -140819,9 +140568,9 @@ in sources."sentence-splitter-3.2.2" sources."string_decoder-1.3.0" sources."structured-source-3.0.2" - (sources."textlint-rule-helper-2.2.4" // { + (sources."textlint-rule-helper-2.3.0" // { dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" sources."boundary-2.0.0" sources."structured-source-4.0.0" ]; @@ -140873,13 +140622,13 @@ in sha512 = "gO4N3OnPLvE6+fvJ1Y5m8MzDVrqMEWzW8pTGMXjL8VAXmQkD6YQ9eDMbsVN0/DzEe8tcsBqNgA/iIrQ64oECuQ=="; }; dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" sources."@types/unist-2.0.6" sources."boundary-2.0.0" sources."lodash-4.17.21" sources."split-lines-2.1.0" sources."structured-source-4.0.0" - sources."textlint-rule-helper-2.2.4" + sources."textlint-rule-helper-2.3.0" sources."unist-util-is-4.1.0" sources."unist-util-visit-2.0.3" sources."unist-util-visit-parents-3.1.1" @@ -140903,13 +140652,13 @@ in sha512 = "obQ3y0hqX6OWCrM8K5K6WSJGE4BOyNfGF6hUGPet56taTm/xzkRu8XA6vpn2GFr4zom/oMa0sBJ3OtDWCgrS/g=="; }; dependencies = [ - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" sources."@types/unist-2.0.6" sources."boundary-2.0.0" sources."lodash-4.17.21" sources."strip-json-comments-3.1.1" sources."structured-source-4.0.0" - sources."textlint-rule-helper-2.2.4" + sources."textlint-rule-helper-2.3.0" sources."unist-util-is-4.1.0" sources."unist-util-visit-2.0.3" sources."unist-util-visit-parents-3.1.1" @@ -140944,7 +140693,7 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."globalthis-1.0.3" sources."gopd-1.0.1" @@ -141001,7 +140750,7 @@ in sha512 = "yvOJavJD+PgyUzvsoLDDzDtgCVBva/HNhEvsFnYVugrWz0qy2hr+/4B4wkzjro4wfPbwz20GQe5h13N4DeUEeA=="; }; dependencies = [ - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" (sources."@eslint/eslintrc-1.4.1" // { dependencies = [ sources."debug-4.3.4" @@ -141019,10 +140768,10 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@textlint/ast-node-types-12.3.0" + sources."@textlint/ast-node-types-13.0.4" sources."@types/json5-0.0.29" sources."@types/unist-2.0.6" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."adverb-where-0.2.5" sources."ajv-6.12.6" @@ -141036,7 +140785,7 @@ in sources."array.prototype.tosorted-1.1.1" sources."ast-types-flow-0.0.7" sources."available-typed-arrays-1.0.5" - sources."axe-core-4.6.2" + sources."axe-core-4.6.3" sources."axobject-query-3.1.1" sources."balanced-match-1.0.2" sources."boundary-2.0.0" @@ -141105,11 +140854,11 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."globalthis-1.0.3" sources."gopd-1.0.1" sources."grapheme-splitter-1.0.4" @@ -141150,7 +140899,7 @@ in sources."is-weakset-2.0.2" sources."isarray-2.0.5" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + sources."js-sdsl-4.3.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" @@ -141189,7 +140938,7 @@ in sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" sources."prop-types-15.8.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."react-is-16.13.1" sources."regenerator-runtime-0.13.11" @@ -141216,7 +140965,7 @@ in sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."text-table-0.2.0" - sources."textlint-rule-helper-2.2.4" + sources."textlint-rule-helper-2.3.0" sources."too-wordy-0.3.4" sources."tsconfig-paths-3.14.1" sources."type-check-0.4.0" @@ -141327,7 +141076,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -141397,7 +141146,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-3.0.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -141413,7 +141162,7 @@ in sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-1.8.1" sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" @@ -141538,7 +141287,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.9.7" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -141606,7 +141355,7 @@ in sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -141729,7 +141478,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -141799,7 +141548,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-3.0.2" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -141815,7 +141564,7 @@ in sources."has-tostringtag-1.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-6.1.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-1.8.1" sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" @@ -141940,7 +141689,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.9.7" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -142009,7 +141758,7 @@ in sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" @@ -142147,7 +141896,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -142225,7 +141974,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-2.7.4" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -142241,7 +141990,7 @@ in sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -142364,7 +142113,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" @@ -142822,7 +142571,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -142908,7 +142657,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -143061,7 +142810,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.7.0" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -143290,7 +143039,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -143376,7 +143125,7 @@ in sources."has-flag-4.0.0" sources."has-unicode-2.0.1" sources."htmlparser2-3.10.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" (sources."http-errors-1.7.2" // { dependencies = [ sources."inherits-2.0.3" @@ -143529,7 +143278,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.7.0" sources."quick-lru-5.1.1" sources."range-parser-1.2.1" @@ -144061,10 +143810,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.148.0"; + version = "0.149.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.148.0.tgz"; - sha512 = "8uzVV+qhTPi0bOFs/3te3RW6hb3urL8jYEl6irjCWo/l6sr8MPNMcClFev/MMYeIxr0gmDcoXTy/8LXh/LXkfw=="; + url = "https://registry.npmjs.org/three/-/three-0.149.0.tgz"; + sha512 = "tohpUxPDht0qExRLDTM8sjRLc5d9STURNrdnK3w9A+V4pxaTBfKWWT/IqtiLfg23Vfc3Z+ImNfvRw1/0CtxrkQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -144164,7 +143913,7 @@ in sources."graceful-fs-4.2.10" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-signature-1.2.0" sources."http2-wrapper-1.0.3" sources."humanize-0.0.9" @@ -144199,7 +143948,7 @@ in sources."performance-now-2.1.0" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."quick-lru-5.1.1" (sources."request-2.88.2" // { @@ -144513,24 +144262,24 @@ in sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.3" sources."@types/node-18.11.18" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."arg-4.1.3" sources."create-require-1.1.1" @@ -144592,10 +144341,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-3.0.2.tgz"; - sha512 = "KJ5kdKzdlNO0mfHbnb9nDKiL244fEd/fqW+b8trVchaLcCFo1aAd0sGX/vP563tdstBew/P1TzKLTnYa17/b8A=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-3.0.3.tgz"; + sha512 = "7FQOXbyWQOnRmOujX/Td2/mBICLuDaVdecALzwx5x7CreV5/GL8+o1KLIMvS7D3/OShV0CiRGmkNmF3Y5L/pdg=="; }; buildInputs = globalBuildInputs; meta = { @@ -144645,17 +144394,17 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.22"; + version = "1.5.23"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.22.tgz"; - sha512 = "zLD9pr4aFn0wzP31xUyag5jpaWmjJHEBp5+xdOC5j0PgmacgKn+PloZYg2rB1rQ/zmOJTo5nOYhkNAoledz9ZA=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.23.tgz"; + sha512 = "3FJW6C12Cn71UiRPTUKmyUYy4qPrJjY7El8bEMqOvakn6knHMuPuM7ijOiNGm7nfKdsRY95gR7pDveqULd367w=="; }; dependencies = [ sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@pnpm/network.ca-file-1.0.2" sources."@pnpm/npm-conf-1.0.5" - sources."@primer/octicons-17.8.0" + sources."@primer/octicons-17.10.2" sources."@sindresorhus/is-5.3.0" sources."@socket.io/component-emitter-3.1.0" sources."@szmarczak/http-timer-5.0.1" @@ -144775,7 +144524,7 @@ in sources."destroy-1.2.0" sources."detective-5.2.1" sources."diff-5.1.0" - sources."diff2html-3.4.29" + sources."diff2html-3.4.31" (sources."diffie-hellman-5.0.3" // { dependencies = [ sources."bn.js-4.12.0" @@ -144829,7 +144578,7 @@ in sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-6.0.1" sources."getmac-5.20.0" sources."glob-7.2.3" @@ -144853,7 +144602,7 @@ in ]; }) sources."htmlescape-1.1.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http2-wrapper-2.2.0" sources."https-browserify-1.0.0" @@ -144921,7 +144670,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."mkdirp-1.0.4" + sources."mkdirp-2.1.3" sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.3" sources."moment-2.29.4" @@ -144993,7 +144742,7 @@ in sources."resolve-1.22.1" sources."resolve-alpn-1.2.1" sources."responselike-3.0.0" - sources."rimraf-3.0.2" + sources."rimraf-4.1.2" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.4.2" @@ -145030,7 +144779,7 @@ in ]; }) sources."socket.io-adapter-2.4.0" - (sources."socket.io-parser-4.2.1" // { + (sources."socket.io-parser-4.2.2" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -145084,7 +144833,7 @@ in sources."tty-browserify-0.0.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."typescript-4.8.4" + sources."typescript-4.9.4" sources."uid-safe-2.1.5" sources."umd-3.0.3" sources."undeclared-identifiers-1.1.3" @@ -145215,8 +144964,8 @@ in sources."trough-2.1.0" sources."typedarray-0.0.6" sources."unified-engine-10.1.0" - sources."unist-util-inspect-7.0.1" - sources."unist-util-stringify-position-3.0.2" + sources."unist-util-inspect-7.0.2" + sources."unist-util-stringify-position-3.0.3" sources."util-deprecate-1.0.2" sources."vfile-5.3.6" sources."vfile-message-3.1.3" @@ -145276,7 +145025,7 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."d3-array-3.2.1" + sources."d3-array-3.2.2" sources."d3-color-3.1.0" sources."d3-delaunay-6.0.2" sources."d3-dispatch-3.0.1" @@ -145436,7 +145185,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-7.2.0" - sources."d3-array-3.2.1" + sources."d3-array-3.2.2" sources."d3-color-3.1.0" sources."d3-delaunay-6.0.2" sources."d3-dispatch-3.0.1" @@ -145533,16 +145282,39 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "28.12.6"; + version = "28.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-28.12.6.tgz"; - sha512 = "hDR6CfEu2kp5QNbQwS7tS87t7BTYkkF62lIlDx5KXSD/1OniYmVr8P1fyWNmkQ1biRjMNMa6/MMHT/md5b7Qlg=="; + url = "https://registry.npmjs.org/vercel/-/vercel-28.14.0.tgz"; + sha512 = "WMAWwJpj7zxPyMpnpEB4ofsu6ERvjXxzjtsd7AfzNBrgRZ88yBZ3yW5vKHPTVnEtJX8BvGq5o5lBQJOKlm2nfg=="; }; dependencies = [ + sources."@babel/runtime-7.12.1" sources."@cspotcode/source-map-support-0.8.1" sources."@edge-runtime/format-1.1.0" sources."@edge-runtime/primitives-2.0.0" sources."@edge-runtime/vm-2.0.0" + sources."@esbuild/android-arm-0.16.17" + sources."@esbuild/android-arm64-0.16.17" + sources."@esbuild/android-x64-0.16.17" + sources."@esbuild/darwin-arm64-0.16.17" + sources."@esbuild/darwin-x64-0.16.17" + sources."@esbuild/freebsd-arm64-0.16.17" + sources."@esbuild/freebsd-x64-0.16.17" + sources."@esbuild/linux-arm-0.16.17" + sources."@esbuild/linux-arm64-0.16.17" + sources."@esbuild/linux-ia32-0.16.17" + sources."@esbuild/linux-loong64-0.16.17" + sources."@esbuild/linux-mips64el-0.16.17" + sources."@esbuild/linux-ppc64-0.16.17" + sources."@esbuild/linux-riscv64-0.16.17" + sources."@esbuild/linux-s390x-0.16.17" + sources."@esbuild/linux-x64-0.16.17" + sources."@esbuild/netbsd-x64-0.16.17" + sources."@esbuild/openbsd-x64-0.16.17" + sources."@esbuild/sunos-x64-0.16.17" + sources."@esbuild/win32-arm64-0.16.17" + sources."@esbuild/win32-ia32-0.16.17" + sources."@esbuild/win32-x64-0.16.17" sources."@jridgewell/resolve-uri-3.1.0" sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" @@ -145555,18 +145327,18 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@rollup/pluginutils-4.2.1" - sources."@swc/core-1.3.27" - sources."@swc/core-darwin-arm64-1.3.27" - sources."@swc/core-darwin-x64-1.3.27" - sources."@swc/core-linux-arm-gnueabihf-1.3.27" - sources."@swc/core-linux-arm64-gnu-1.3.27" - sources."@swc/core-linux-arm64-musl-1.3.27" - sources."@swc/core-linux-x64-gnu-1.3.27" - sources."@swc/core-linux-x64-musl-1.3.27" - sources."@swc/core-win32-arm64-msvc-1.3.27" - sources."@swc/core-win32-ia32-msvc-1.3.27" - sources."@swc/core-win32-x64-msvc-1.3.27" - sources."@swc/wasm-1.3.27" + sources."@swc/core-1.3.30" + sources."@swc/core-darwin-arm64-1.3.30" + sources."@swc/core-darwin-x64-1.3.30" + sources."@swc/core-linux-arm-gnueabihf-1.3.30" + sources."@swc/core-linux-arm64-gnu-1.3.30" + sources."@swc/core-linux-arm64-musl-1.3.30" + sources."@swc/core-linux-x64-gnu-1.3.30" + sources."@swc/core-linux-x64-musl-1.3.30" + sources."@swc/core-win32-arm64-msvc-1.3.30" + sources."@swc/core-win32-ia32-msvc-1.3.30" + sources."@swc/core-win32-x64-msvc-1.3.30" + sources."@swc/wasm-1.3.30" sources."@ts-morph/common-0.11.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" @@ -145574,27 +145346,34 @@ in sources."@tsconfig/node16-1.0.3" sources."@types/json-schema-7.0.11" sources."@types/node-14.18.33" - sources."@vercel/build-utils-5.9.0" - sources."@vercel/go-2.2.30" - sources."@vercel/hydrogen-0.0.44" - sources."@vercel/next-3.3.15" + sources."@vercel/build-utils-6.0.0" + sources."@vercel/gatsby-plugin-vercel-analytics-1.0.7" + (sources."@vercel/gatsby-plugin-vercel-builder-1.0.2" // { + dependencies = [ + sources."ajv-8.12.0" + sources."esbuild-0.16.17" + ]; + }) + sources."@vercel/go-2.2.31" + sources."@vercel/hydrogen-0.0.45" + sources."@vercel/next-3.3.19" sources."@vercel/nft-0.22.5" - sources."@vercel/node-2.8.13" - sources."@vercel/node-bridge-3.1.9" - sources."@vercel/python-3.1.40" - sources."@vercel/redwood-1.0.51" - sources."@vercel/remix-1.2.5" + sources."@vercel/node-2.8.16" + sources."@vercel/node-bridge-3.1.10" + sources."@vercel/python-3.1.41" + sources."@vercel/redwood-1.0.52" + sources."@vercel/remix-1.2.8" (sources."@vercel/routing-utils-2.1.8" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" ]; }) - sources."@vercel/ruby-1.3.56" - sources."@vercel/static-build-1.1.7" + sources."@vercel/ruby-1.3.57" + sources."@vercel/static-build-1.3.0" sources."@vercel/static-config-2.0.11" sources."abbrev-1.1.1" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."ajv-8.6.3" @@ -145643,6 +145422,7 @@ in sources."esbuild-windows-64-0.14.47" sources."esbuild-windows-arm64-0.14.47" sources."estree-walker-2.0.2" + sources."etag-1.8.1" sources."exit-hook-2.2.1" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.12" @@ -145650,6 +145430,7 @@ in sources."fastq-1.15.0" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" + sources."fs-extra-11.1.0" (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.3.6" @@ -145672,6 +145453,7 @@ in sources."is-number-7.0.0" sources."json-schema-to-ts-1.6.4" sources."json-schema-traverse-1.0.0" + sources."jsonfile-6.1.0" sources."lru-cache-6.0.0" sources."make-dir-3.1.0" sources."make-error-1.3.6" @@ -145701,9 +145483,10 @@ in sources."picomatch-2.3.1" sources."pretty-bytes-5.6.0" sources."pretty-ms-7.0.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."readable-stream-3.6.0" + sources."regenerator-runtime-0.13.11" sources."require-from-string-2.0.2" sources."resolve-from-5.0.0" sources."reusify-1.0.4" @@ -145725,9 +145508,11 @@ in sources."ts-node-10.9.1" sources."ts-toolbelt-6.15.5" sources."typescript-4.3.4" + sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" + sources."web-vitals-0.2.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wide-align-1.1.5" @@ -145858,10 +145643,10 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.3" @@ -145904,7 +145689,7 @@ in sources."progress-2.0.3" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."regexpp-3.2.0" sources."require-from-string-2.0.2" sources."resolve-1.22.1" @@ -146139,16 +145924,16 @@ in sha512 = "r8+ZWDHRAnUPQMyZQa2eZzZyYE8wGia3SCL9ZtVjl6S2MLA5l6NVg3z8Atz4nDQ9JPih858bj0vnthGsjhNLjg=="; }; dependencies = [ - sources."@vscode/l10n-0.0.10" - sources."core-js-3.27.1" + sources."@vscode/l10n-0.0.11" + sources."core-js-3.27.2" sources."jsonc-parser-3.2.0" sources."picomatch-2.3.1" sources."regenerator-runtime-0.13.11" sources."request-light-0.5.8" sources."typescript-4.9.4" - sources."vscode-css-languageservice-6.2.1" - sources."vscode-html-languageservice-5.0.3" - sources."vscode-json-languageservice-5.1.3" + sources."vscode-css-languageservice-6.2.3" + sources."vscode-html-languageservice-5.0.4" + sources."vscode-json-languageservice-5.1.4" sources."vscode-jsonrpc-8.1.0-next.7" sources."vscode-languageserver-8.1.0-next.6" (sources."vscode-languageserver-protocol-3.17.3-next.6" // { @@ -146360,7 +146145,7 @@ in sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" sources."psl-1.9.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.5.3" sources."read-metadata-1.0.0" (sources."readable-stream-2.3.7" // { @@ -146460,7 +146245,7 @@ in sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; }; dependencies = [ - sources."@adobe/css-tools-4.0.2" + sources."@adobe/css-tools-4.1.0" sources."@babel/code-frame-7.18.6" sources."@babel/helper-validator-identifier-7.19.1" sources."@babel/highlight-7.18.6" @@ -146814,7 +146599,7 @@ in sources."hosted-git-info-2.8.9" sources."html-void-elements-1.0.5" sources."html-whitespace-sensitive-tag-names-1.0.3" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" (sources."import-fresh-3.3.0" // { @@ -147065,7 +146850,7 @@ in sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."quick-lru-1.1.0" sources."rc-1.2.8" sources."read-pkg-3.0.0" @@ -147319,7 +147104,7 @@ in sources."unist-util-inspect-4.1.4" sources."unist-util-is-2.1.3" sources."unist-util-modify-children-1.1.6" - sources."unist-util-stringify-position-3.0.2" + sources."unist-util-stringify-position-3.0.3" sources."unist-util-visit-1.4.1" (sources."unist-util-visit-parents-2.1.2" // { dependencies = [ @@ -147429,207 +147214,130 @@ in wavedrom-cli = nodeEnv.buildNodePackage { name = "wavedrom-cli"; packageName = "wavedrom-cli"; - version = "2.8.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/wavedrom-cli/-/wavedrom-cli-2.8.1.tgz"; - sha512 = "slGcIXCA/j5d2uzQ7flA4/veF0P0eE+Om/Bw7uEO2LC9a3mVNdB+2bSR1CILMjvgyFy9Q9D6eseomQgp7UW5Dg=="; + url = "https://registry.npmjs.org/wavedrom-cli/-/wavedrom-cli-3.1.1.tgz"; + sha512 = "EwAUg6706mBujMLbb4Czhe9Ax5Dw3x64t/X2hn+vIVvVexAANSifVg3yB7ILZmeRSGmv9uYo6kL5J1c/DiGdaw=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.20.7" - sources."@mapbox/node-pre-gyp-1.0.10" - sources."@tootallnate/once-1.1.2" - sources."@types/raf-3.4.0" - sources."abab-2.0.6" - sources."abbrev-1.1.1" - sources."acorn-8.8.1" - (sources."acorn-globals-6.0.0" // { - dependencies = [ - sources."acorn-7.4.1" - ]; - }) - sources."acorn-walk-7.2.0" - sources."agent-base-6.0.2" + sources."@babel/runtime-7.20.13" + sources."@jimp/bmp-0.16.2" + sources."@jimp/core-0.16.2" + sources."@jimp/custom-0.16.2" + sources."@jimp/gif-0.16.2" + sources."@jimp/jpeg-0.16.2" + sources."@jimp/plugin-blit-0.16.2" + sources."@jimp/plugin-blur-0.16.2" + sources."@jimp/plugin-circle-0.16.2" + sources."@jimp/plugin-color-0.16.2" + sources."@jimp/plugin-contain-0.16.2" + sources."@jimp/plugin-cover-0.16.2" + sources."@jimp/plugin-crop-0.16.2" + sources."@jimp/plugin-displace-0.16.2" + sources."@jimp/plugin-dither-0.16.2" + sources."@jimp/plugin-fisheye-0.16.2" + sources."@jimp/plugin-flip-0.16.2" + sources."@jimp/plugin-gaussian-0.16.2" + sources."@jimp/plugin-invert-0.16.2" + sources."@jimp/plugin-mask-0.16.2" + sources."@jimp/plugin-normalize-0.16.2" + sources."@jimp/plugin-print-0.16.2" + sources."@jimp/plugin-resize-0.16.2" + sources."@jimp/plugin-rotate-0.16.2" + sources."@jimp/plugin-scale-0.16.2" + sources."@jimp/plugin-shadow-0.16.2" + sources."@jimp/plugin-threshold-0.16.2" + sources."@jimp/plugins-0.16.2" + sources."@jimp/png-0.16.2" + sources."@jimp/tiff-0.16.2" + sources."@jimp/types-0.16.2" + sources."@jimp/utils-0.16.2" + sources."@resvg/resvg-js-2.2.0" + sources."@resvg/resvg-js-android-arm-eabi-2.2.0" + sources."@resvg/resvg-js-android-arm64-2.2.0" + sources."@resvg/resvg-js-darwin-arm64-2.2.0" + sources."@resvg/resvg-js-darwin-x64-2.2.0" + sources."@resvg/resvg-js-linux-arm-gnueabihf-2.2.0" + sources."@resvg/resvg-js-linux-arm64-gnu-2.2.0" + sources."@resvg/resvg-js-linux-arm64-musl-2.2.0" + sources."@resvg/resvg-js-linux-x64-gnu-2.2.0" + sources."@resvg/resvg-js-linux-x64-musl-2.2.0" + sources."@resvg/resvg-js-win32-arm64-msvc-2.2.0" + sources."@resvg/resvg-js-win32-ia32-msvc-2.2.0" + sources."@resvg/resvg-js-win32-x64-msvc-2.2.0" + sources."@types/node-16.9.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."aproba-2.0.0" - sources."are-we-there-yet-2.0.0" - sources."asynckit-0.4.0" + sources."any-base-1.1.0" sources."atob-2.1.2" - sources."balanced-match-1.0.2" - sources."bit-field-1.7.0" - sources."brace-expansion-1.1.11" - sources."browser-process-hrtime-1.0.0" + sources."base64-js-1.5.1" + (sources."bit-field-1.7.0" // { + dependencies = [ + sources."fs-extra-10.1.0" + ]; + }) + sources."bmp-js-0.1.0" sources."btoa-1.2.1" - sources."bufferutil-4.0.7" - sources."canvas-2.11.0" - sources."canvg-3.0.7" - sources."chownr-2.0.0" + sources."buffer-5.7.1" + sources."buffer-equal-0.0.1" sources."cliui-8.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."color-support-1.1.3" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."console-control-strings-1.1.0" - sources."core-js-pure-3.27.1" - sources."cssom-0.4.4" - (sources."cssstyle-2.3.0" // { - dependencies = [ - sources."cssom-0.3.8" - ]; - }) - (sources."data-urls-2.0.0" // { - dependencies = [ - sources."tr46-2.1.0" - sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.7.0" - ]; - }) - sources."debug-4.3.4" - sources."decimal.js-10.4.3" - sources."decompress-response-4.2.1" - sources."deep-is-0.1.4" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."detect-libc-2.0.1" - (sources."domexception-2.0.1" // { - dependencies = [ - sources."webidl-conversions-5.0.0" - ]; - }) + sources."dom-walk-0.1.2" sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" sources."escalade-3.1.1" - sources."escodegen-2.0.0" - sources."esprima-4.0.1" sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."fast-levenshtein-2.0.6" - sources."form-data-3.0.1" - sources."fs-extra-10.1.0" - (sources."fs-minipass-2.1.0" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."fs.realpath-1.0.0" - sources."gauge-3.0.2" + sources."exif-parser-0.1.12" + sources."file-type-9.0.0" + sources."fs-extra-11.1.0" sources."get-caller-file-2.0.5" - sources."glob-7.2.3" + sources."gifwrap-0.9.4" + sources."global-4.4.0" sources."graceful-fs-4.2.10" - sources."has-unicode-2.0.1" - sources."html-encoding-sniffer-2.0.1" - sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.6.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" + sources."ieee754-1.2.1" + sources."image-q-4.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."is-potential-custom-element-name-1.0.1" - (sources."jsdom-16.7.0" // { - dependencies = [ - sources."tr46-2.1.0" - sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.7.0" - ]; - }) + sources."is-function-1.0.2" + sources."jimp-0.16.2" + sources."jpeg-js-0.4.4" sources."json5-2.2.3" sources."jsonfile-6.1.0" - sources."levn-0.3.0" - sources."lodash-4.17.21" + sources."load-bmfont-1.4.1" sources."logidrom-0.3.1" - sources."lru-cache-6.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-response-2.1.0" - sources."minimatch-3.1.2" - sources."minipass-4.0.0" - (sources."minizlib-2.1.2" // { - dependencies = [ - sources."minipass-3.3.6" - ]; - }) - sources."mkdirp-1.0.4" - sources."ms-2.1.2" - sources."nan-2.17.0" - sources."node-fetch-2.6.8" - sources."node-gyp-build-4.6.0" - sources."nopt-5.0.0" - sources."npmlog-5.0.1" - sources."nwsapi-2.2.2" - sources."object-assign-4.1.1" - sources."once-1.4.0" + sources."mime-1.6.0" + sources."min-document-2.19.0" + sources."minimist-1.2.7" + sources."mkdirp-0.5.6" + sources."omggif-1.0.10" sources."onml-2.1.0" - sources."optionator-0.8.3" - sources."parse5-6.0.1" - sources."path-is-absolute-1.0.1" - sources."performance-now-2.1.0" - sources."prelude-ls-1.1.2" - sources."psl-1.9.0" - sources."punycode-2.2.0" - sources."querystringify-2.2.0" - sources."raf-3.4.1" - sources."readable-stream-3.6.0" + sources."pako-1.0.11" + sources."parse-bmfont-ascii-1.0.6" + sources."parse-bmfont-binary-1.0.6" + sources."parse-bmfont-xml-1.1.4" + sources."parse-headers-2.0.5" + sources."phin-2.9.3" + sources."pixelmatch-4.0.2" + sources."pngjs-3.4.0" + sources."process-0.11.10" sources."regenerator-runtime-0.13.11" sources."require-directory-2.1.1" - sources."requires-port-1.0.0" - sources."rgbcolor-1.0.1" - sources."rimraf-3.0.2" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."saxes-5.0.1" - sources."semver-7.3.8" - sources."set-blocking-2.0.0" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-3.1.1" - sources."source-map-0.6.1" - sources."stackblur-canvas-2.5.0" sources."string-width-4.2.3" - sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" - sources."svg-pathdata-5.0.5" - sources."svg2img-0.9.4" - sources."symbol-tree-3.2.4" - sources."tar-6.1.13" - (sources."tough-cookie-4.1.2" // { - dependencies = [ - sources."universalify-0.2.0" - ]; - }) - sources."tr46-0.0.3" + sources."svg2img-1.0.0-beta.2" + sources."timm-1.7.1" + sources."tinycolor2-1.5.2" sources."tspan-0.4.0" - sources."type-check-0.3.2" sources."universalify-2.0.0" - sources."url-parse-1.5.10" - sources."utf-8-validate-5.0.10" - sources."util-deprecate-1.0.2" - sources."w3c-hr-time-1.0.2" - sources."w3c-xmlserializer-2.0.0" - sources."wavedrom-2.9.1" - sources."webidl-conversions-3.0.1" - (sources."whatwg-encoding-1.0.5" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-5.0.0" - sources."wide-align-1.1.5" - sources."word-wrap-1.2.3" + sources."utif-2.0.1" + sources."wavedrom-3.1.1" sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."ws-7.5.9" - sources."xml-name-validator-3.0.0" - sources."xmlchars-2.2.0" + sources."xhr-2.6.0" + sources."xml-parse-from-string-1.0.1" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" + sources."xtend-4.0.2" sources."y18n-5.0.8" - sources."yallist-4.0.0" sources."yargs-17.6.2" sources."yargs-parser-21.1.1" ]; @@ -147646,10 +147354,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "7.4.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-7.4.0.tgz"; - sha512 = "dT2HJaGNXxRNuOtzaVBtEULccL0kM2SN1ark1NnN/ZSlbucobBxCDj6119iki72YyuXpaXZCJGqfZtVf1Znocg=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-7.5.0.tgz"; + sha512 = "Ymflj7Aq/LOD+zGoyvwRbAPx/yMJeig2OEb/rRXYrWl6NWRI5E0c2iWGqlBcnL45iKrOzz70H438dVeJk0w2ug=="; }; dependencies = [ sources."@babel/code-frame-7.18.6" @@ -147665,7 +147373,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/runtime-7.20.1" + sources."@babel/runtime-7.20.13" sources."@devicefarmer/adbkit-3.2.3" sources."@devicefarmer/adbkit-logcat-2.1.2" sources."@devicefarmer/adbkit-monkey-1.2.1" @@ -147679,7 +147387,7 @@ in sources."@humanwhocodes/config-array-0.11.8" sources."@humanwhocodes/module-importer-1.0.1" sources."@humanwhocodes/object-schema-1.2.1" - sources."@mdn/browser-compat-data-5.2.17" + sources."@mdn/browser-compat-data-5.2.29" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -147693,18 +147401,17 @@ in sources."@types/yauzl-2.10.0" sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" - sources."addons-linter-5.23.0" + sources."addons-linter-5.27.0" sources."addons-moz-compare-1.3.0" - (sources."addons-scanner-utils-8.1.0" // { + (sources."addons-scanner-utils-8.3.0" // { dependencies = [ sources."node-fetch-2.6.7" ]; }) sources."adm-zip-0.5.10" - sources."ajv-8.11.2" - sources."ajv-merge-patch-5.0.1" + sources."ajv-8.12.0" (sources."ansi-align-3.0.1" // { dependencies = [ sources."string-width-4.2.3" @@ -147761,7 +147468,7 @@ in }) sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."camelcase-7.0.0" + sources."camelcase-7.0.1" sources."caseless-0.12.0" sources."chalk-4.1.2" sources."cheerio-1.0.0-rc.12" @@ -147799,7 +147506,7 @@ in sources."content-type-1.0.4" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.25.3" + sources."core-js-3.27.1" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" (sources."crypto-random-string-4.0.0" // { @@ -147856,14 +147563,14 @@ in sources."escape-goat-4.0.0" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.28.0" // { + (sources."eslint-8.32.0" // { dependencies = [ sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" sources."strip-json-comments-3.1.1" ]; }) - sources."eslint-plugin-no-unsanitized-4.0.1" + sources."eslint-plugin-no-unsanitized-4.0.2" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -147890,11 +147597,7 @@ in sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - (sources."fast-json-patch-2.2.1" // { - dependencies = [ - sources."fast-deep-equal-2.0.1" - ]; - }) + sources."fast-json-patch-3.1.1" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-redact-3.1.2" @@ -147917,14 +147620,14 @@ in sources."first-chunk-stream-3.0.0" sources."flat-cache-3.0.4" sources."flatted-3.2.7" - sources."fluent-syntax-0.13.0" + sources."fluent-syntax-0.14.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."form-data-encoder-2.1.4" sources."formdata-polyfill-4.0.10" sources."forwarded-0.2.0" sources."fresh-0.5.2" - (sources."fs-extra-10.1.0" // { + (sources."fs-extra-11.1.0" // { dependencies = [ sources."universalify-2.0.0" ]; @@ -147939,10 +147642,10 @@ in ]; }) sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-5.2.0" sources."getpass-0.1.7" - (sources."glob-8.0.3" // { + (sources."glob-8.1.0" // { dependencies = [ sources."brace-expansion-2.0.1" sources."minimatch-5.1.6" @@ -147951,7 +147654,7 @@ in sources."glob-parent-6.0.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-3.0.1" - sources."globals-13.19.0" + sources."globals-13.20.0" (sources."got-12.5.3" // { dependencies = [ sources."get-stream-6.0.1" @@ -147973,7 +147676,7 @@ in sources."has-symbols-1.0.3" sources."has-yarn-3.0.0" sources."htmlparser2-8.0.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http-signature-1.2.0" sources."http2-wrapper-2.2.0" @@ -148013,8 +147716,8 @@ in sources."isexe-2.0.0" sources."isstream-0.1.2" sources."jed-1.1.1" - sources."jose-4.11.1" - sources."js-sdsl-4.2.0" + sources."jose-4.11.2" + sources."js-sdsl-4.3.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" @@ -148030,11 +147733,7 @@ in sources."universalify-2.0.0" ]; }) - (sources."jsonwebtoken-8.5.1" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."jsonwebtoken-9.0.0" sources."jsprim-1.4.2" (sources."jszip-3.10.1" // { dependencies = [ @@ -148057,14 +147756,8 @@ in }) sources."lines-and-columns-2.0.3" sources."locate-path-6.0.0" - sources."lodash.includes-4.3.0" - sources."lodash.isboolean-3.0.3" - sources."lodash.isinteger-4.0.4" - sources."lodash.isnumber-3.0.3" - sources."lodash.isplainobject-4.0.6" - sources."lodash.isstring-4.0.1" + sources."lodash-4.17.21" sources."lodash.merge-4.6.2" - sources."lodash.once-4.1.1" sources."lowercase-keys-3.0.0" sources."lru-cache-6.0.0" sources."make-error-1.3.6" @@ -148137,10 +147830,10 @@ in sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picocolors-1.0.0" - sources."pino-8.7.0" + sources."pino-8.8.0" sources."pino-abstract-transport-1.0.0" sources."pino-std-serializers-6.1.0" - sources."postcss-8.4.19" + sources."postcss-8.4.21" sources."prelude-ls-1.2.1" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -148150,7 +147843,7 @@ in sources."proxy-addr-2.0.7" sources."psl-1.9.0" sources."pump-3.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."pupa-3.1.0" sources."qs-6.11.0" sources."queue-6.0.2" @@ -148228,7 +147921,7 @@ in sources."shell-quote-1.7.3" sources."shellwords-0.1.1" sources."side-channel-1.0.4" - sources."sign-addon-5.1.0" + sources."sign-addon-5.2.0" sources."signal-exit-3.0.7" sources."sonic-boom-3.2.1" sources."source-map-0.6.1" @@ -148288,7 +147981,7 @@ in ]; }) sources."uri-js-4.4.1" - sources."utf-8-validate-5.0.10" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" @@ -148308,7 +148001,7 @@ in sources."widest-line-4.0.1" sources."winreg-0.0.12" sources."word-wrap-1.2.3" - (sources."wrap-ansi-8.0.1" // { + (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" sources."ansi-styles-6.2.1" @@ -148317,7 +148010,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-8.11.0" + sources."ws-8.12.0" sources."xdg-basedir-5.1.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -148380,13 +148073,13 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.21.4" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."electron-to-chromium-1.4.284" @@ -148416,7 +148109,7 @@ in sources."neo-async-2.6.2" sources."node-releases-2.0.8" sources."picocolors-1.0.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."randombytes-2.1.0" sources."safe-buffer-5.2.1" sources."schema-utils-3.1.1" @@ -148484,13 +148177,13 @@ in sources."@webpack-cli/serve-2.0.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."browserslist-4.21.4" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chrome-trace-event-1.0.3" sources."clone-deep-4.0.1" sources."colorette-2.0.19" @@ -148543,7 +148236,7 @@ in sources."path-parse-1.0.7" sources."picocolors-1.0.0" sources."pkg-dir-4.2.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."randombytes-2.1.0" sources."rechoir-0.8.0" sources."resolve-1.22.1" @@ -148609,8 +148302,8 @@ in sources."@types/eslint-8.4.10" sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" - sources."@types/express-4.17.15" - sources."@types/express-serve-static-core-4.17.32" + sources."@types/express-4.17.16" + sources."@types/express-serve-static-core-4.17.33" sources."@types/http-proxy-1.17.9" sources."@types/json-schema-7.0.11" sources."@types/mime-3.0.1" @@ -148640,7 +148333,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."accepts-1.3.8" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" @@ -148664,7 +148357,7 @@ in sources."bufferutil-4.0.7" sources."bytes-3.0.0" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."colorette-2.0.19" @@ -148727,7 +148420,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stream-6.0.1" sources."glob-7.2.3" sources."glob-parent-5.1.2" @@ -148808,7 +148501,7 @@ in sources."ipaddr.js-1.9.1" ]; }) - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."qs-6.11.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" @@ -148885,7 +148578,7 @@ in sources."unpipe-1.0.0" sources."update-browserslist-db-1.0.10" sources."uri-js-4.4.1" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" @@ -148958,7 +148651,7 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-import-assertions-1.8.0" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" @@ -148966,7 +148659,7 @@ in sources."braces-3.0.2" sources."browserslist-4.21.4" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001445" + sources."caniuse-lite-1.0.30001449" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" sources."dir-glob-3.0.1" @@ -149015,7 +148708,7 @@ in sources."path-type-4.0.0" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."randombytes-2.1.0" sources."require-from-string-2.0.2" @@ -149410,7 +149103,7 @@ in ]; }) sources."torrent-piece-2.0.1" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."type-fest-0.21.3" sources."typedarray-0.0.6" sources."uint64be-2.0.2" @@ -149469,10 +149162,10 @@ in "@withgraphite/graphite-cli" = nodeEnv.buildNodePackage { name = "_at_withgraphite_slash_graphite-cli"; packageName = "@withgraphite/graphite-cli"; - version = "0.20.12"; + version = "0.20.13"; src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-0.20.12.tgz"; - sha512 = "Dki/T3/T3Anl9swh2AbQz2M9ne3jK6kTuInhd5ZIUY9CdXJd1olK1w7o6TWcN6Ez2qT0SQbt9lsjZQEH2vMxxQ=="; + url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-0.20.13.tgz"; + sha512 = "7no/PSf+6WElM1fSgihirkMB6Kz9sLO852q/o/mrzBZuGcHjQeN8bLp1AuK5eKzUo8yohJaVgYqDWtKiLWmU7Q=="; }; dependencies = [ sources."@withgraphite/graphite-cli-routes-0.23.0" @@ -149548,10 +149241,10 @@ in wrangler = nodeEnv.buildNodePackage { name = "wrangler"; packageName = "wrangler"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-2.8.0.tgz"; - sha512 = "CAhjoeTnVFB65HPmOSquXbQ37lc2X77iOirX4tRMuRNKQng2NztHOfo++6BZdlV29E4IPD9boTRXck3R+O8mrg=="; + url = "https://registry.npmjs.org/wrangler/-/wrangler-2.8.1.tgz"; + sha512 = "O4wUr6/FUpk9KVstOUVYbiiZcWc1jKo7q0FfdwEjnMB3oN7Ofs6cIiX++Lzj1ldFSCOw2/aW3UYgixch6B2WCA=="; }; dependencies = [ sources."@cloudflare/kv-asset-handler-0.2.0" @@ -149625,7 +149318,7 @@ in sources."get-stream-6.0.1" sources."glob-parent-5.1.2" sources."html-rewriter-wasm-0.4.1" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."human-signals-3.0.1" sources."ioredis-4.28.5" sources."is-binary-path-2.1.0" @@ -149690,7 +149383,7 @@ in sources."to-regex-range-5.0.1" sources."undici-5.9.1" sources."urlpattern-polyfill-4.0.3" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."validate-npm-package-name-4.0.0" sources."which-2.0.2" sources."ws-8.12.0" @@ -149735,7 +149428,7 @@ in sha512 = "P1Ct7+DNrOcr2JAxDZ3Q5i5sx2LSveu7iLaoUL0A+YiG0GKf0l5+9j3rwMeyh6JeTL1+HfQV1rnwEvzhNIvpFw=="; }; dependencies = [ - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" (sources."@eslint/eslintrc-1.4.1" // { dependencies = [ sources."debug-4.3.4" @@ -149754,7 +149447,7 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@types/json5-0.0.29" - sources."acorn-8.8.1" + sources."acorn-8.8.2" sources."acorn-jsx-5.3.2" sources."adverb-where-0.2.5" sources."ajv-6.12.6" @@ -149768,7 +149461,7 @@ in sources."array.prototype.tosorted-1.1.1" sources."ast-types-flow-0.0.7" sources."available-typed-arrays-1.0.5" - sources."axe-core-4.6.2" + sources."axe-core-4.6.3" sources."axobject-query-3.1.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" @@ -149836,11 +149529,11 @@ in sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-symbol-description-1.0.0" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.19.0" + sources."globals-13.20.0" sources."globalthis-1.0.3" sources."gopd-1.0.1" sources."grapheme-splitter-1.0.4" @@ -149881,7 +149574,7 @@ in sources."is-weakset-2.0.2" sources."isarray-2.0.5" sources."isexe-2.0.0" - sources."js-sdsl-4.2.0" + sources."js-sdsl-4.3.0" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."json-schema-traverse-0.4.1" @@ -149920,7 +149613,7 @@ in sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" sources."prop-types-15.8.1" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."queue-microtask-1.2.3" sources."react-is-16.13.1" sources."regenerator-runtime-0.13.11" @@ -150003,7 +149696,7 @@ in sources."fast-deep-equal-3.1.3" sources."json-schema-traverse-1.0.0" sources."jsonc-parser-3.2.0" - sources."punycode-2.2.0" + sources."punycode-2.3.0" sources."request-light-0.5.8" sources."require-from-string-2.0.2" sources."uri-js-4.4.1" @@ -150129,7 +149822,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/runtime-7.20.7" + sources."@babel/runtime-7.20.13" sources."@gar/promisify-1.1.3" sources."@isaacs/string-locale-compare-1.1.0" sources."@nodelib/fs.scandir-2.1.5" @@ -150301,7 +149994,7 @@ in sources."config-chain-1.1.13" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" - sources."core-js-3.27.1" + sources."core-js-3.27.2" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -150387,7 +150080,7 @@ in sources."fullname-4.0.1" sources."function-bind-1.1.1" sources."gauge-1.2.7" - sources."get-intrinsic-1.1.3" + sources."get-intrinsic-1.2.0" sources."get-stdin-4.0.1" sources."get-stream-4.1.0" (sources."glob-8.1.0" // { @@ -150520,7 +150213,7 @@ in sources."cacheable-request-6.1.0" sources."get-stream-5.2.0" sources."got-9.6.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."lowercase-keys-2.0.0" sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" @@ -150552,7 +150245,7 @@ in sources."make-dir-3.1.0" (sources."make-fetch-happen-9.1.0" // { dependencies = [ - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" ]; }) sources."map-age-cleaner-0.1.3" @@ -150564,7 +150257,7 @@ in }) sources."mem-5.1.1" sources."mem-fs-2.2.1" - sources."mem-fs-editor-9.5.0" + sources."mem-fs-editor-9.6.0" (sources."meow-5.0.0" // { dependencies = [ sources."read-pkg-up-3.0.0" @@ -150636,7 +150329,7 @@ in sources."cacheable-request-6.1.0" sources."get-stream-5.2.0" sources."got-9.6.0" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."lowercase-keys-2.0.0" sources."normalize-url-4.5.1" sources."p-cancelable-1.1.0" @@ -150666,7 +150359,7 @@ in sources."@tootallnate/once-2.0.0" sources."cacache-16.1.3" sources."debug-4.3.4" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http-proxy-agent-5.0.0" sources."lru-cache-7.14.1" (sources."make-fetch-happen-10.2.1" // { @@ -150734,7 +150427,7 @@ in sources."defer-to-connect-2.0.1" sources."get-stream-5.2.0" sources."got-11.8.6" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."json-buffer-3.0.1" sources."keyv-4.5.2" sources."lowercase-keys-2.0.0" @@ -150959,7 +150652,7 @@ in sources."to-regex-range-5.0.1" sources."treeverse-1.0.4" sources."trim-newlines-2.0.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."tunnel-0.0.6" (sources."twig-1.15.4" // { dependencies = [ @@ -151110,10 +150803,10 @@ in "@zwave-js/server" = nodeEnv.buildNodePackage { name = "_at_zwave-js_slash_server"; packageName = "@zwave-js/server"; - version = "1.24.1"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/@zwave-js/server/-/server-1.24.1.tgz"; - sha512 = "QRBETwKH0V8jTyRXyvko/gdhGck8cXEK/8rnoGAtWjpch/tr83HXNJMdZZhD6KLO9iDl5avWeA+w1m226lwTGg=="; + url = "https://registry.npmjs.org/@zwave-js/server/-/server-1.25.0.tgz"; + sha512 = "+2WlJQ7M9D0mNrE1ovEFNqmDyhewY0kIMtddbbZVGtV2YYRzdBTZfqqwfzFhUAFdeEMyOn6gSIHDmw66t8FbSQ=="; }; dependencies = [ sources."@alcalzone/jsonl-db-2.5.3" @@ -151135,23 +150828,23 @@ in sources."@esm2cjs/p-timeout-5.1.0" sources."@esm2cjs/responselike-3.0.0" sources."@homebridge/ciao-1.1.5" - (sources."@sentry/core-7.31.1" // { + (sources."@sentry/core-7.34.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/integrations-7.31.1" // { + (sources."@sentry/integrations-7.34.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - (sources."@sentry/node-7.31.1" // { + (sources."@sentry/node-7.34.0" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@sentry/types-7.31.1" - (sources."@sentry/utils-7.31.1" // { + sources."@sentry/types-7.34.0" + (sources."@sentry/utils-7.34.0" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -151171,14 +150864,14 @@ in sources."@serialport/parser-spacepacket-10.5.0" sources."@serialport/stream-10.5.0" sources."@types/http-cache-semantics-4.0.1" - sources."@zwave-js/cc-10.4.0" - sources."@zwave-js/config-10.4.0" - sources."@zwave-js/core-10.4.0" - sources."@zwave-js/host-10.4.0" - sources."@zwave-js/nvmedit-10.4.0" - sources."@zwave-js/serial-10.4.0" + sources."@zwave-js/cc-10.5.2" + sources."@zwave-js/config-10.5.2" + sources."@zwave-js/core-10.5.0" + sources."@zwave-js/host-10.5.2" + sources."@zwave-js/nvmedit-10.5.0" + sources."@zwave-js/serial-10.5.2" sources."@zwave-js/shared-10.4.0" - sources."@zwave-js/testing-10.4.0" + sources."@zwave-js/testing-10.5.2" sources."agent-base-6.0.2" sources."alcalzone-shared-4.0.8" sources."ansi-colors-4.1.3" @@ -151219,7 +150912,7 @@ in sources."get-caller-file-2.0.5" sources."get-stream-6.0.1" sources."graceful-fs-4.2.10" - sources."http-cache-semantics-4.1.0" + sources."http-cache-semantics-4.1.1" sources."http2-wrapper-2.2.0" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" @@ -151280,9 +150973,9 @@ in sources."strip-final-newline-2.0.0" sources."text-hex-1.0.0" sources."triple-beam-1.3.0" - sources."tslib-2.4.1" + sources."tslib-2.5.0" sources."universalify-2.0.0" - sources."utf-8-validate-6.0.0" + sources."utf-8-validate-6.0.2" sources."util-deprecate-1.0.2" sources."which-2.0.2" sources."winston-3.8.2" @@ -151295,7 +150988,7 @@ in sources."yallist-4.0.0" sources."yargs-17.6.2" sources."yargs-parser-21.1.1" - sources."zwave-js-10.4.0" + sources."zwave-js-10.5.4" ]; buildInputs = globalBuildInputs; meta = { diff --git a/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix b/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix index e11e15f67e..1ecf716329 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix @@ -406,7 +406,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-DWIhxvxt8f4h6MDd35mz7BJff+fu7HItW3WPDIEpCR3RzcOWyiHBbLQW5/DOgmf+pRLTjwXQob7kuTZVYUAw5w=="; + sha512 = "sha512-bS96oZ5oDFXYgoF2l7PJ3Mp1wWWfLOo8B/jAfbA2Pn0Wm5Z/owBHzaMQKS3i1CzVBDWWPVnOohmbJmjvkcHS5w=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/lwt.nix index c52079f5cc..dae42e2b97 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/alcotest/lwt.nix @@ -10,7 +10,7 @@ buildDunePackage { propagatedBuildInputs = [ alcotest logs lwt fmt ]; doCheck = true; - checkInputs = [ re cmdliner ]; + nativeCheckInputs = [ re cmdliner ]; meta = alcotest.meta // { description = "Lwt-based helpers for Alcotest"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix index 502bd2ad44..52b65817c6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh"; }; - checkInputs = [ alcotest ppx_let ]; + nativeCheckInputs = [ alcotest ppx_let ]; buildInputs = [ ocaml-syntax-shims ]; propagatedBuildInputs = [ bigstringaf result ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix index 997e46e274..cdf657ea72 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/arp/default.nix @@ -15,8 +15,8 @@ buildDunePackage rec { sha256 = "1x3l8v96ywc3wrcwbf0j04b8agap4fif0fz6ki2ndzx57yqcjszn"; }; - minimumOCamlVersion = "4.06"; - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; nativeBuildInputs = [ bisect_ppx @@ -36,7 +36,7 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ alcotest mirage-clock-unix mirage-profile diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 8447c25cd7..720294e65e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ]; doCheck = true; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; meta = with lib; { homepage = "https://github.com/mirleft/ocaml-asn1-combinators"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix index 0658130f9e..a8d2ef0ace 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/atdgen/default.nix @@ -11,7 +11,7 @@ buildDunePackage { propagatedBuildInputs = [ atdgen-runtime ]; doCheck = true; - checkInputs = [ alcotest atdgen-codec-runtime + nativeCheckInputs = [ alcotest atdgen-codec-runtime (python3.withPackages (ps: [ ps.jsonschema ])) ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix index 4ba54c48d2..362edaa95b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/default.nix @@ -8,13 +8,14 @@ buildDunePackage rec { pname = "awa"; - version = "0.1.0"; + version = "0.1.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/awa-ssh/releases/download/v${version}/awa-${version}.tbz"; - sha256 = "sha256-aPnFDp52oYVHr/56lFw0gtVJ0KvHawyM5FGtpHPOVY8="; + hash = "sha256-ae1gTx3Emmkof/2Gnhq0d5RyfkFx21hHkVEVgyPdXuo="; }; nativeBuildInputs = [ ppx_cstruct ]; @@ -27,7 +28,7 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ cstruct-unix cmdliner fmt ]; + nativeCheckInputs = [ cstruct-unix cmdliner fmt ]; meta = with lib; { description = "SSH implementation in OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/lwt.nix index 57f4d5a23a..b155c1b669 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/lwt.nix @@ -7,12 +7,14 @@ buildDunePackage { inherit (awa) version src; + duneVersion = "3"; + propagatedBuildInputs = [ awa cstruct mtime lwt mirage-crypto-rng ]; doCheck = true; - checkInputs = [ cstruct-unix ]; + nativeCheckInputs = [ cstruct-unix ]; meta = awa.meta // { mainProgram = "awa_lwt_server"; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/mirage.nix index 8513e57410..ebf3ad23fc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/mirage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/awa/mirage.nix @@ -8,6 +8,8 @@ buildDunePackage { inherit (awa) version src; + duneVersion = "3"; + propagatedBuildInputs = [ awa cstruct mtime lwt mirage-flow mirage-clock logs duration mirage-time diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix index 26230287dd..9420d3c419 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { # otherwise fmt breaks evaluation doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ alcotest bos rresult ]; + nativeCheckInputs = [ alcotest bos rresult ]; meta = { homepage = "https://github.com/mirage/ocaml-base64"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix index f9cb31e9ca..38a28eafae 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - checkInputs = [ qtest qcheck ]; + nativeCheckInputs = [ qtest ]; + checkInputs = [ qcheck ]; propagatedBuildInputs = [ camlp-streams num ]; - strictDeps = !doCheck; + strictDeps = true; inherit doCheck; checkTarget = "test"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bheap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bheap/default.nix index 49e5c336d9..7b23e23fdc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bheap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bheap/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { useDune2 = true; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ stdlib-shims ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix index c702faee8f..7d6bb8806d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigarray-overlap/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { propagatedBuildInputs = [ bigarray-compat ]; nativeBuildInputs = [ findlib pkg-config ]; - checkInputs = [ alcotest astring fpath bos ]; + nativeCheckInputs = [ alcotest astring fpath bos ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix index 8ef32fd33e..bd5d470e03 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { strictDeps = false; nativeBuildInputs = [ pkg-config ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bindlib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bindlib/default.nix index c0d8dd54a3..9f4cc91e22 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bindlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bindlib/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { hash = "sha256-058yMbz9ExvgNG/kY9tPk70XSeVRSSKVg4n4F4fmPu4="; }; - checkInputs = [ earley timed ]; + nativeCheckInputs = [ earley timed ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix index f60a2c24ef..35b36bc944 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix @@ -21,7 +21,7 @@ buildDunePackage rec { }; buildInputs = [ ppx_jane ppx_sexp_conv ]; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; propagatedBuildInputs = [ async base64 camlzip cfstream core rresult uri xmlm ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix index 9eb4c74f57..2b9cbca208 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bitstring/ppx.nix @@ -14,7 +14,7 @@ buildDunePackage rec { buildInputs = [ bitstring ppxlib ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; meta = bitstring.meta // { description = "Bitstrings and bitstring matching for OCaml - PPX extension"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bjack/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bjack/default.nix index a102d27c28..197d31638d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bjack/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bjack/default.nix @@ -4,13 +4,11 @@ buildDunePackage rec { pname = "bjack"; version = "0.1.6"; - useDune2 = true; - src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-bjack"; rev = "v${version}"; - sha256 = "1gf31a8i9byp6npn0x6gydcickn6sf5dnzmqr2c1b9jn2nl7334c"; + hash = "sha256-jIxxqBVWphWYyLh+24rTxk4WWfPPdGCvNdevFJEKw70="; }; buildInputs = [ dune-configurator ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreAudio ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381-signature/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381-signature/default.nix index e8e43c31a2..378af4109c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381-signature/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381-signature/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { propagatedBuildInputs = [ bls12-381 ]; - checkInputs = [alcotest bisect_ppx integers_stubs_js]; + nativeCheckInputs = [alcotest bisect_ppx integers_stubs_js]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix index ed2fbeb315..b30c1333df 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { hex ]; - checkInputs = [ alcotest ff-pbt ]; + nativeCheckInputs = [ alcotest ff-pbt ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/legacy.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/legacy.nix index c72157c677..1ae2add216 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/legacy.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bls12-381/legacy.nix @@ -26,7 +26,7 @@ buildDunePackage rec { zarith ]; - checkInputs = [ + nativeCheckInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix index aa762502a5..0c5509e08d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bwd/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { }; doCheck = true; - checkInputs = [ qcheck-core ]; + nativeCheckInputs = [ qcheck-core ]; meta = { description = "Backward Lists"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix index c7712a14b9..73f6838501 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs-nss/default.nix @@ -14,17 +14,16 @@ buildDunePackage rec { pname = "ca-certs-nss"; - version = "3.77"; + version = "3.86"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz"; - sha256 = "sha256-Ezos9A2AQOo43R9akVbJ5l+euTDtguzMfH63YXo9hvc="; + hash = "sha256-3b20vYBP9T2uR17Vxyilfs/9C72WVUrgR7T582V++lQ="; }; - useDune2 = true; - propagatedBuildInputs = [ mirage-crypto mirage-clock @@ -40,7 +39,7 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; meta = with lib; { description = "X.509 trust anchors extracted from Mozilla's NSS"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix index 0805edbafe..963989cb22 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -5,22 +5,21 @@ buildDunePackage rec { pname = "ca-certs"; - version = "0.2.2"; + version = "0.2.3"; - minimumOCamlVersion = "4.07"; + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz"; - sha256 = "sha256-Tx53zBJemZh3ODh/8izahxDoJvXvNFLyAA8LMM1mhlI="; + url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-${version}.tbz"; + hash = "sha256-0tjWRX2RXvbXg974Lzvl7C9W+S4gIU9Y7dY8nC/GDpw="; }; - useDune2 = true; + duneVersion = "3"; propagatedBuildInputs = [ bos fpath ptime mirage-crypto x509 astring logs ]; - # Assumes nss-cacert < 3.74 https://github.com/mirage/ca-certs/issues/21 - doCheck = false; - checkInputs = [ + doCheck = true; + nativeCheckInputs = [ cacert # for /etc/ssl/certs/ca-bundle.crt alcotest fmt diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix index 1801a0679b..0b560f2004 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cairo2/default.nix @@ -3,11 +3,11 @@ buildDunePackage rec { pname = "cairo2"; - version = "0.6.2"; + version = "0.6.4"; src = fetchurl { url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz"; - sha256 = "sha256-a7P1kiVmIwT6Fhtwxs29ffgO4iexsulxUoc9cnJmEK4="; + sha256 = "sha256-QDVzUtcgXTpXNYVWQ4MMs0Xy24OP+dGaUyAYdg1GigU="; }; minimalOCamlVersion = "4.02"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix index 2004f8868c..145bcedacb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix @@ -25,7 +25,7 @@ buildDunePackage rec { # alcotest isn't available for OCaml < 4.08 due to fmt doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; meta = { homepage = "https://github.com/oklm-wsh/Callipyge"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix index 5edb68d30c..0f37575d86 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/caqti/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ logs ptime uri bigstringaf ]; - checkInputs = [ re cmdliner alcotest ]; + nativeCheckInputs = [ re cmdliner alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/carton-find-getconf.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/carton-find-getconf.patch new file mode 100644 index 0000000000..8c7176ee16 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/carton-find-getconf.patch @@ -0,0 +1,13 @@ +diff --git a/bin/fiber/fiber.ml b/bin/fiber/fiber.ml +index 188a92cc9..6087a8687 100644 +--- a/bin/fiber/fiber.ml ++++ b/bin/fiber/fiber.ml +@@ -129,7 +129,7 @@ let worker pool = + + let get_concurrency () = + try +- let ic = Unix.open_process_in "getconf _NPROCESSORS_ONLN" in ++ let ic = Unix.open_process_in "@getconf@/bin/getconf _NPROCESSORS_ONLN" in + let close () = ignore (Unix.close_process_in ic) in + let sc = Scanf.Scanning.from_channel ic in + try diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix index 1e81f7dce2..c3d7204f36 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix @@ -3,6 +3,7 @@ , checkseum, logs, psq, fmt , result, rresult, fpath, base64, bos, digestif, alcotest , crowbar, alcotest-lwt, lwt, findlib, mirage-flow, cmdliner, hxd +, getconf, substituteAll }: buildDunePackage rec { @@ -10,12 +11,20 @@ buildDunePackage rec { version = "0.6.0"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz"; - sha256 = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; + hash = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; }; + patches = [ + (substituteAll { + src = ./carton-find-getconf.patch; + getconf = "${getconf}"; + }) + ]; + # remove changelogs for mimic and the git* packages postPatch = '' rm CHANGES.md @@ -47,7 +56,7 @@ buildDunePackage rec { nativeBuildInputs = [ findlib ]; - checkInputs = [ + nativeCheckInputs = [ base64 alcotest alcotest-lwt diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/git.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/git.nix index 7e08e69543..b361ee1447 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/git.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/git.nix @@ -9,6 +9,7 @@ buildDunePackage { pname = "carton-git"; inherit (carton) version src postPatch; + duneVersion = "3"; propagatedBuildInputs = [ carton diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/lwt.nix index 33ee70ef34..60e45823eb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/carton/lwt.nix @@ -11,6 +11,7 @@ buildDunePackage { pname = "carton-lwt"; inherit (carton) version src postPatch; + duneVersion = "3"; propagatedBuildInputs = [ carton @@ -21,7 +22,7 @@ buildDunePackage { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ git-binary alcotest alcotest-lwt diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix index 62a29a5d41..aeedb414a3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/default.nix @@ -21,7 +21,7 @@ buildDunePackage rec { strictDeps = false; nativeBuildInputs = [ m4 ]; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; propagatedBuildInputs = [ core_kernel ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix index ebd73b519f..bad57cb9e9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix @@ -32,7 +32,7 @@ buildDunePackage rec { # alcotest isn't available for OCaml < 4.05 due to fmt doCheck = lib.versionAtLeast ocaml.version "4.05"; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; meta = { homepage = "https://github.com/abeaumont/ocaml-chacha"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix index 0b14aa57c7..faeb905e6a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix @@ -24,7 +24,7 @@ buildDunePackage rec { ocaml-freestanding ]; - checkInputs = [ + nativeCheckInputs = [ alcotest bos astring diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/class_group_vdf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/class_group_vdf/default.nix index cbfaeaf3c4..1290abaa23 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/class_group_vdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/class_group_vdf/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { integers ]; - checkInputs = [ + nativeCheckInputs = [ alcotest bisect_ppx ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix index 3e6ac4ae2d..bcc1c11459 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix @@ -51,7 +51,7 @@ buildDunePackage { # Examples don't compile with core 0.15. See https://github.com/mirage/ocaml-cohttp/pull/864. doCheck = false; - checkInputs = [ + nativeCheckInputs = [ ounit mirage-crypto core diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix index fcbed191ad..0cb9813687 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix @@ -21,7 +21,7 @@ buildDunePackage rec { propagatedBuildInputs = [ base64 re stringext uri-sexp ]; doCheck = true; - checkInputs = [ fmt alcotest crowbar ]; + nativeCheckInputs = [ fmt alcotest crowbar ]; meta = { description = "HTTP(S) library for Lwt, Async and Mirage"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 3a5d5ff529..0ff6fb6920 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -20,7 +20,7 @@ buildDunePackage { # TODO(@sternenseemann): fail for unknown reason # https://github.com/mirage/ocaml-cohttp/issues/675#issuecomment-830692742 doCheck = false; - checkInputs = [ ounit cacert ]; + nativeCheckInputs = [ ounit cacert ]; meta = cohttp-lwt.meta // { description = "CoHTTP implementation for Unix and Windows using Lwt"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix index cb86ea5f4f..3f91d9b753 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt-unix.nix @@ -23,7 +23,7 @@ buildDunePackage { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ lwt_log ssl ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix index 980984c6ec..48478c963e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix @@ -9,7 +9,7 @@ buildDunePackage { inherit (containers) src version doCheck; buildInputs = [ dune-configurator ]; - checkInputs = [ gen iter qcheck-core ]; + nativeCheckInputs = [ gen iter qcheck-core ]; propagatedBuildInputs = [ containers ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix index 4cd6413293..2503ffbf08 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ either seq ]; - checkInputs = [ gen iter qcheck-core uutf yojson ]; + nativeCheckInputs = [ gen iter qcheck-core uutf yojson ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix index 7a1afda074..1c898f8e75 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { }; propagatedBuildInputs = [ xmlm uri ezjsonm omd ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix index d321abfe9d..da55cb1d78 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/crowbar/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { postPatch = "rm -rf examples/xmldiff"; propagatedBuildInputs = [ ocplib-endian cmdliner afl-persistent ]; - checkInputs = [ calendar fpath pprint uutf uunf uucp ]; + nativeCheckInputs = [ calendar fpath pprint uutf uunf uucp ]; # uunf is broken on aarch64 doCheck = !stdenv.isAarch64; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix index 9efe75af70..5ef3540a9a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { buildInputs = [ fmt ]; doCheck = true; - checkInputs = [ alcotest crowbar ]; + nativeCheckInputs = [ alcotest crowbar ]; meta = { description = "Access C-like structures directly from OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix index a808a01153..c4518de9f9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -15,5 +15,5 @@ buildDunePackage { propagatedBuildInputs = [ cstruct ppxlib sexplib stdlib-shims ]; doCheck = true; - checkInputs = [ ounit cppo ppx_sexp_conv cstruct-sexp cstruct-unix ]; + nativeCheckInputs = [ ounit cppo ppx_sexp_conv cstruct-sexp cstruct-unix ]; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix index a20911cbb2..091a6ab4de 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -11,7 +11,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; doCheck = true; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; propagatedBuildInputs = [ cstruct sexplib ]; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix index 6e9aa98e1c..e1bfab4d16 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix @@ -6,13 +6,13 @@ else stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ctypes"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "ocamllabs"; repo = "ocaml-ctypes"; rev = version; - sha256 = "sha256-fr60H/hiSVjEg11qM8LF1Y5CotS3FEyFdCcIh0A0uI4="; + sha256 = "sha256-H1QR0MJCqRdXxRufCA663wzTNWQ8MYYAy2nz/XHCn0Y="; }; nativeBuildInputs = [ pkg-config ocaml findlib ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix index f7e50ddca7..6eb814ef7d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { }; propagatedBuildInputs = [ integers_stubs_js ]; - checkInputs = [ + nativeCheckInputs = [ ctypes js_of_ocaml-compiler ppx_expect diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cudf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cudf/default.nix index c3b0a3c29c..48a776669d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cudf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cudf/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { "all" "test" ]; - checkInputs = [ + nativeCheckInputs = [ ounit ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix index 35e275f52f..f82a6c237d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { }; propagatedBuildInputs = [ result ]; - checkInputs = [ alcotest cohttp-lwt-unix cacert ]; + nativeCheckInputs = [ alcotest cohttp-lwt-unix cacert ]; # test dependencies are only available for >= 4.08 # https://github.com/mirage/ca-certs/issues/16 doCheck = lib.versionAtLeast ocaml.version "4.08" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix index 7bd01ff831..b5878a51ef 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/data-encoding/default.nix @@ -36,7 +36,7 @@ buildDunePackage { json-data-encoding-bson ]; - checkInputs = [ + nativeCheckInputs = [ alcotest crowbar ppx_expect diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix index 30e7391f8c..c67cfac541 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix @@ -1,22 +1,24 @@ { lib, fetchurl, buildDunePackage , checkseum, optint, cmdliner , bigstringaf, alcotest, camlzip, base64, ctypes, fmt, crowbar, rresult +, astring, bos }: buildDunePackage rec { pname = "decompress"; - version = "1.5.1"; + version = "1.5.2"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-${version}.tbz"; - sha256 = "sha256-y/OVojFxhksJQQvvtS38SF7ZnMEQhAtwDey0ISwypP4="; + hash = "sha256-qMmmuhMlFNVq02JvvV55EkhEg2AQNQ7hYdQ7spv1di4="; }; buildInputs = [ cmdliner ]; propagatedBuildInputs = [ optint checkseum ]; - checkInputs = [ alcotest bigstringaf ctypes fmt camlzip base64 crowbar rresult ]; + nativeCheckInputs = [ alcotest astring bigstringaf bos ctypes fmt camlzip base64 crowbar rresult ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix index cd14d2a06a..dc4f521420 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/diet/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ stdlib-shims ]; doCheck = true; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; meta = with lib; { homepage = "https://github.com/mirage/ocaml-diet"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix index 2e2e3a7b23..cca890e997 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { propagatedBuildInputs = [ eqaf ]; - checkInputs = [ alcotest astring bos fpath ]; + nativeCheckInputs = [ alcotest astring bos fpath ]; doCheck = true; postCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dispatch/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dispatch/default.nix index 587f5a792d..e6f6ffc864 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dispatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dispatch/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { propagatedBuildInputs = [ result ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/cli.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/cli.nix index 6e23eeecba..dd2a844586 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/cli.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/cli.nix @@ -39,7 +39,7 @@ buildDunePackage { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix index bfcde93bbf..087c0a1efa 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/client.nix @@ -16,7 +16,7 @@ buildDunePackage { lwt mirage-random mirage-time mirage-clock ca-certs ca-certs-nss happy-eyeballs tcpip tls tls-mirage mtime mirage-crypto-rng ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = true; meta = dns.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix index 70e3b44353..e9ae3184b5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt logs ptime domain-name gmap cstruct ipaddr lru duration metrics base64 ]; doCheck = true; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; meta = { description = "An Domain Name System (DNS) library"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/dnssec.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/dnssec.nix index 3e6acc474b..3b2b0e2374 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/dnssec.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/dnssec.nix @@ -20,7 +20,7 @@ buildDunePackage { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ alcotest base64 ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/resolver.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/resolver.nix index 0ee3083558..fb598746bb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/resolver.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/resolver.nix @@ -28,7 +28,7 @@ buildDunePackage { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/server.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/server.nix index 794aea363b..e10ec38300 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/server.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/server.nix @@ -21,7 +21,7 @@ buildDunePackage { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ alcotest mirage-crypto-rng dns-tsig diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/tsig.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/tsig.nix index 3ecc90d398..d544e51f36 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/tsig.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dns/tsig.nix @@ -13,7 +13,7 @@ buildDunePackage { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/domain-name/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/domain-name/default.nix index afbfbb6639..f14172fcb5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/domain-name/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/domain-name/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.04"; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix index 6db57f81c4..8da2ed538f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/domainslib/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ lockfree ]; doCheck = true; - checkInputs = [ mirage-clock-unix ]; + nativeCheckInputs = [ mirage-clock-unix ]; meta = { homepage = "https://github.com/ocaml-multicore/domainslib"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix index 5f71375dc4..a593959715 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/dose3/default.nix @@ -33,7 +33,7 @@ buildDunePackage rec { stdlib-shims ]; - checkInputs = [ + nativeCheckInputs = [ dpkg # Replaces: conf-dpkg git ounit diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix index 27fb981de4..2564d2ed07 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ + nativeCheckInputs = [ alcotest crowbar hxd diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/duration/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/duration/default.nix index 1a1f9b0776..eeb974b135 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/duration/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/duration/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { }; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; meta = { homepage = "https://github.com/hannesm/duration"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix index 428e426823..cc53f25b57 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix @@ -11,7 +11,7 @@ , version ? if lib.versionAtLeast ocaml.version "4.08" then "1.16.5" else if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1" }: -with lib; + let fetched = coqPackages.metaFetch ({ release."1.16.5".sha256 = "sha256-tKX5/cVPoBeHiUe+qn7c5FIRYCwY0AAukN7vSd/Nz9A="; release."1.15.2".sha256 = "sha256-XgopNP83POFbMNyl2D+gY1rmqGg03o++Ngv3zJfCn2s="; @@ -31,17 +31,17 @@ buildDunePackage rec { pname = "elpi"; inherit (fetched) version src; - patches = lib.optional (versionAtLeast version "1.16" || version == "dev") + patches = lib.optional (lib.versionAtLeast version "1.16" || version == "dev") ./atd_2_10.patch; minimalOCamlVersion = "4.04"; buildInputs = [ perl ncurses ] - ++ optional (versionAtLeast version "1.15" || version == "dev") menhir - ++ optional (versionAtLeast version "1.16" || version == "dev") atdgen; + ++ lib.optional (lib.versionAtLeast version "1.15" || version == "dev") menhir + ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen; propagatedBuildInputs = [ re stdlib-shims ] - ++ (if versionAtLeast version "1.15" || version == "dev" + ++ (if lib.versionAtLeast version "1.15" || version == "dev" then [ menhirLib ] else [ camlp5 ] ) @@ -50,7 +50,7 @@ buildDunePackage rec { else [ ppxlib_0_15 ppx_deriving_0_15 ] ); - meta = { + meta = with lib; { description = "Embeddable λProlog Interpreter"; license = licenses.lgpl21Plus; maintainers = [ maintainers.vbgl ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/emile/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/emile/default.nix index e2572ba6ae..c76d79d5f8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/emile/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/emile/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { # and angstrom (fmt) are only available for >= 4.08. Disabling # tests for < 4.08 at least improves the error message doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; meta = with lib; { description = "Parser of email address according RFC822"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix index 5924845c4f..317446fc5b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/encore/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { useDune2 = true; propagatedBuildInputs = [ angstrom fmt bigstringaf ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix index 0dcfd5ec02..ff5ed12a99 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "sha256-wR4kDocR1t3OLRuudXH8IccYde552O6Gvo5BHNxRbAI="; }; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; propagatedBuildInputs = [ bigstringaf ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix index d794e4acce..f31a94e2c7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/fdkaac/default.nix @@ -4,16 +4,14 @@ buildDunePackage rec { pname = "fdkaac"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-fdkaac"; - rev = version; - sha256 = "10i6hsjkrpw7zgx99zvvka3sapd7zy53k7z4b6khj9rdrbrgznv8"; + rev = "v${version}"; + hash = "sha256-cTPPQKBq0EFo35eK7TXlszbodHYIg1g7v+yQ/rG7Y9I="; }; - useDune2 = true; - buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ fdk_aac ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/default.nix index 5681b33cb7..4d9c69ace6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { zarith ]; - checkInputs = [ + nativeCheckInputs = [ alcotest ff-pbt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/pbt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/pbt.nix index ffd7838112..6c929e11b1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/pbt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ff/pbt.nix @@ -6,7 +6,7 @@ buildDunePackage { minimalOCamlVersion = "4.08"; - checkInputs = [ + nativeCheckInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix index 0431c733cb..e2f5fdab4f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/fileutils/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { stdlib-shims ]; - checkInputs = [ + nativeCheckInputs = [ ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 837a481cf1..2fae764f5d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ]; doCheck = true; - checkInputs = [ ounit2 ]; + nativeCheckInputs = [ ounit2 ]; meta = { description = "OCaml client for google services"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gd4o/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gd4o/default.nix index 19a1b42f06..cd20696485 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gd4o/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gd4o/default.nix @@ -12,6 +12,9 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib libjpeg libpng ]; propagatedBuildInputs = [ gd zlib freetype ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; preInstall = '' mkdir -p $OCAMLFIND_DESTDIR/stublibs diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix index ee932bffd5..9242133ec2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ seq ]; - checkInputs = [ qcheck ounit2 ]; + nativeCheckInputs = [ qcheck ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gen_js_api/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gen_js_api/default.nix index 39f325b5fe..36a8d8060a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gen_js_api/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gen_js_api/default.nix @@ -22,7 +22,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.11"; propagatedBuildInputs = [ ojs ppxlib ]; - checkInputs = [ js_of_ocaml-compiler nodejs ]; + nativeCheckInputs = [ js_of_ocaml-compiler nodejs ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix index 1d0c10df50..b078ad973f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/default.nix @@ -31,7 +31,7 @@ buildDunePackage rec { ke logs lwt ocamlgraph uri rresult result bigstringaf optint mirage-flow domain-name emile mimic carton carton-lwt carton-git ipaddr psq hxd ]; - checkInputs = [ + nativeCheckInputs = [ alcotest alcotest-lwt mirage-crypto-rng git-binary crowbar cmdliner ]; doCheck = !stdenv.isAarch64; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/mirage.nix index eb3c799ed5..b1e38c2ebf 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/mirage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/mirage.nix @@ -82,7 +82,7 @@ buildDunePackage { result ]; - checkInputs = [ + nativeCheckInputs = [ alcotest alcotest-lwt bigstringaf diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix index 9fdca9fef1..65a4619ac5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/git/unix.nix @@ -30,7 +30,7 @@ buildDunePackage { tls tls-mirage git happy-eyeballs-lwt git-mirage mirage-clock-unix ]; - checkInputs = [ + nativeCheckInputs = [ alcotest alcotest-lwt base64 ke mirage-crypto-rng git-binary uri mtime diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gluten/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gluten/default.nix index fb6f85b104..d0f41d2026 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gluten/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gluten/default.nix @@ -3,24 +3,25 @@ , faraday , fetchurl , lib +, ke }: buildDunePackage rec { pname = "gluten"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz"; - sha256 = "1pl0mpcprz8hmaiv28p7w51qfcx7s76zdkak0vm5cazbjl38nc46"; + hash = "sha256-9jctX3G/nQJTGJ7ClSBEiXwxeu0GcT9N+EmPfLuSFOU="; }; - minimalOCamlVersion = "4.06"; - - useDune2 = true; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; propagatedBuildInputs = [ bigstringaf faraday + ke ]; doCheck = false; # No tests diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt-unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt-unix.nix index f3986b0513..cec427c3ad 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt-unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt-unix.nix @@ -7,7 +7,9 @@ buildDunePackage rec { pname = "gluten-lwt-unix"; - inherit (gluten) doCheck meta src useDune2 version; + inherit (gluten) doCheck meta src version; + + duneVersion = "3"; propagatedBuildInputs = [ faraday-lwt-unix diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt.nix index e2643d6189..cfa736c4bc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gluten/lwt.nix @@ -5,7 +5,9 @@ buildDunePackage rec { pname = "gluten-lwt"; - inherit (gluten) doCheck meta src useDune2 version; + inherit (gluten) doCheck meta src version; + + duneVersion = "3"; propagatedBuildInputs = [ gluten diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gmap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gmap/default.nix index 6c412ecfa4..7cdddfe101 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gmap/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix index fe4f85a002..4985459248 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { strictDeps = true; meta = { - homepage = "http://gmetadom.sourceforge.net/"; + homepage = "https://gmetadom.sourceforge.net/"; description = "A collection of librares, each library providing a DOM implementation"; license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.roconnor ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/cohttp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/cohttp.nix index c96b762189..b4f836215d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/cohttp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/cohttp.nix @@ -13,7 +13,7 @@ buildDunePackage rec { nativeBuildInputs = [ ocaml-crunch ]; propagatedBuildInputs = [ astring cohttp digestif graphql ocplib-endian ]; - checkInputs = lib.optionals doCheck [ alcotest cohttp-lwt-unix graphql-lwt ]; + nativeCheckInputs = lib.optionals doCheck [ alcotest cohttp-lwt-unix graphql-lwt ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/default.nix index 679d89f44b..b0426500b3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { propagatedBuildInputs = [ graphql_parser rresult yojson ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/lwt.nix index cbdcba64ab..396de94bc2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/lwt.nix @@ -9,7 +9,7 @@ buildDunePackage rec { propagatedBuildInputs = [ graphql ocaml_lwt ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/parser.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/parser.nix index 4042e65772..25432d9ad8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/parser.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql/parser.nix @@ -15,7 +15,7 @@ buildDunePackage rec { nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ fmt re ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql_ppx/default.nix index 020108a903..1c3351f791 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql_ppx/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/graphql_ppx/default.nix @@ -26,7 +26,7 @@ buildDunePackage rec { yojson ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix index 95272890e1..6f60330e40 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/h2/default.nix @@ -46,7 +46,7 @@ buildDunePackage rec { preCheck = '' ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case ''; - checkInputs = [ + nativeCheckInputs = [ alcotest yojson hex diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix index 07e4d99344..3ec895c8e8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ctypes ]; - checkInputs = [ + nativeCheckInputs = [ cppo ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hkdf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hkdf/default.nix index 9832a5f4c4..5921c6c9d3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hkdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hkdf/default.nix @@ -4,17 +4,16 @@ buildDunePackage rec { pname = "hkdf"; version = "1.0.4"; - minimumOCamlVersion = "4.07"; + minimalOCamlVersion = "4.08"; + duneVersion = "3"; src = fetchurl { url = "https://github.com/hannesm/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "0nzx6vzbc1hh6vx1ly8df4b16lgps6zjpp9mjycsnnn49bddc9mr"; + hash = "sha256-uSbW2krEWquZlzXdK7/R91ETFnENeRr6NhAGtv42/Vs="; }; - useDune2 = true; - propagatedBuildInputs = [ cstruct mirage-crypto ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix index 508b2e4b7f..691e09a410 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { sha256 = "0zk78af3qyvf6w66mg8sxygr6ndayzqw5s3zfxibvn121xwni26z"; }; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; propagatedBuildInputs = [ angstrom faraday ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix index 2733ef4cee..27ad2b5f00 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ decompress stdlib-shims ]; doCheck = true; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; meta = { description = "Image formats such as PNG and PPM in OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix index 04373cbcce..f38d1f495f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/index/default.nix @@ -31,7 +31,7 @@ buildDunePackage rec { lru ]; - checkInputs = [ + nativeCheckInputs = [ alcotest crowbar re diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix index 85afd33457..026985efcb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/inotify/default.nix @@ -15,9 +15,9 @@ buildDunePackage rec { }; buildInputs = [ lwt ]; - checkInputs = [ ounit2 fileutils ]; + nativeCheckInputs = [ ounit2 fileutils ]; - # Otherwise checkInputs can't be found + # Otherwise nativeCheckInputs can't be found strictDeps = false; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix index eeb92c3eb2..915bea6ff0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { }; propagatedBuildInputs = [ cstruct bigarray-compat ]; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix index c4eefb637f..5055aa7bbb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -10,7 +10,7 @@ buildDunePackage rec { propagatedBuildInputs = [ macaddr domain-name stdlib-shims ]; - checkInputs = [ ppx_sexp_conv ounit ]; + nativeCheckInputs = [ ppx_sexp_conv ounit ]; doCheck = true; meta = macaddr.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix index 373b5a87e4..6f94382cf3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix @@ -9,7 +9,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ipaddr ]; - checkInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ]; + nativeCheckInputs = [ ipaddr-cstruct ounit ppx_sexp_conv ]; doCheck = true; meta = ipaddr.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix index 59bd815449..39ef6b0006 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/chunk.nix @@ -8,7 +8,7 @@ buildDunePackage rec { propagatedBuildInputs = [ irmin fmt logs lwt ]; doCheck = true; - checkInputs = [ alcotest irmin-test ]; + nativeCheckInputs = [ alcotest irmin-test ]; meta = irmin.meta // { description = "Irmin backend which allow to store values into chunks"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix index 547ec41052..fe7eb3ffc5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/containers.nix @@ -17,7 +17,7 @@ buildDunePackage { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ alcotest alcotest-lwt cacert ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix index 66b572f576..13ae4109de 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/default.nix @@ -28,7 +28,7 @@ buildDunePackage { uutf ]; - checkInputs = [ + nativeCheckInputs = [ vector hex alcotest diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix index 54483d39b7..196f75ff26 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/fs.nix @@ -9,7 +9,7 @@ buildDunePackage rec { propagatedBuildInputs = [ irmin astring logs lwt ]; - checkInputs = [ alcotest irmin-test irmin-watcher ]; + nativeCheckInputs = [ alcotest irmin-test irmin-watcher ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix index c489281591..b325937286 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/git.nix @@ -30,7 +30,7 @@ buildDunePackage { cohttp-lwt-unix ]; - checkInputs = [ mtime alcotest irmin-test cacert ]; + nativeCheckInputs = [ mtime alcotest irmin-test cacert ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix index 005bf25eb2..21fe590c05 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/graphql.nix @@ -13,7 +13,7 @@ buildDunePackage rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ alcotest alcotest-lwt logs diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix index 9a466928c6..5cf57fe047 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/http.nix @@ -14,7 +14,7 @@ buildDunePackage rec { propagatedBuildInputs = [ astring cohttp-lwt cohttp-lwt-unix fmt jsonm logs lwt uri irmin webmachine ]; - checkInputs = [ + nativeCheckInputs = [ digestif git-unix irmin-git irmin-test irmin-fs cacert ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix index a1a2974a4d..7056a2f63e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/pack.nix @@ -14,7 +14,7 @@ buildDunePackage rec { propagatedBuildInputs = [ index irmin optint fmt logs lwt mtime cmdliner ]; - checkInputs = [ astring alcotest alcotest-lwt irmin-test ]; + nativeCheckInputs = [ astring alcotest alcotest-lwt irmin-test ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix index 8749aef143..2e21331c22 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -11,7 +11,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.10"; - strictDeps = false; # We must provide checkInputs as buildInputs because dune builds tests at build time + strictDeps = false; # We must provide nativeCheckInputs as buildInputs because dune builds tests at build time propagatedBuildInputs = [ ppx_repr diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix index 942200bf42..ee13bf4267 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/test.nix @@ -27,7 +27,7 @@ buildDunePackage { metrics ]; - checkInputs = [ hex vector ]; + nativeCheckInputs = [ hex vector ]; meta = irmin.meta // { description = "Irmin test suite"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/tezos.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/tezos.nix index 8426316ed3..2549a783bd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/tezos.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/irmin/tezos.nix @@ -22,7 +22,7 @@ buildDunePackage rec { yojson ]; - checkInputs = [ alcotest hex irmin-test fpath ]; + nativeCheckInputs = [ alcotest hex irmin-test fpath ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix index 3faa8244b6..62ea8f78b4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ result seq ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ mdx.bin ounit2 qcheck-core ]; + nativeCheckInputs = [ mdx.bin ounit2 qcheck-core ]; meta = { homepage = "https://github.com/c-cube/sequence"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix index 0a93fc6f12..d32c2027df 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -155,7 +155,7 @@ with self; meta.description = "Full standard library replacement for OCaml"; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ sexplib0 ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; }; base_bigstring = janePackage { @@ -205,7 +205,7 @@ with self; minimumOCamlVersion = "4.07"; meta.description = "Trivial metaprogramming tool"; propagatedBuildInputs = [ re ]; - checkInputs = [ ppx_jane ]; + nativeCheckInputs = [ ppx_jane ]; # This currently fails with dune strictDeps = false; }; @@ -782,7 +782,7 @@ with self; meta.description = "Yet another implementation of fork&exec and related functionality"; buildInputs = [ jst-config ]; propagatedBuildInputs = [ textutils ]; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; # This currently fails with dune strictDeps = false; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix index 7a463c0a59..af040a7394 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -177,7 +177,7 @@ with self; meta.description = "Full standard library replacement for OCaml"; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ sexplib0 ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; }; base_bigstring = janePackage { @@ -958,7 +958,7 @@ with self; meta.description = "Yet another implementation of fork&exec and related functionality"; buildInputs = [ jst-config ]; propagatedBuildInputs = [ textutils ]; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; # This currently fails with dune strictDeps = false; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix index a12ade51c2..5675e10dba 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix @@ -8,19 +8,18 @@ , extlib }: -if lib.versionOlder ocaml.version "4.04" -then throw "javalib is not available for OCaml ${ocaml.version}" -else +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "javalib is not available for OCaml ${ocaml.version}" stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-javalib"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "javalib-team"; repo = "javalib"; - rev = "v${version}"; - sha256 = "sha256-du1h+S+A7CetMXofsYxdGeSsobCgspDB9oUE9WNUbbo="; + rev = version; + hash = "sha256-XaI7GTU/O5UEWuYX4yqaIRmEoH7FuvCg/+gtKbE/P1s="; }; nativeBuildInputs = [ which ocaml findlib ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix index 36aa09455c..3029f4084c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/jingoo/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ menhir ]; propagatedBuildInputs = [ ppxlib ppx_deriving re uutf uucp ]; - checkInputs = [ ounit2 ]; + nativeCheckInputs = [ ounit2 ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/bson.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/bson.nix index 46810ab156..a92c4839ab 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/bson.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/bson.nix @@ -10,7 +10,7 @@ buildDunePackage { ocplib-endian ]; - checkInputs = [ + nativeCheckInputs = [ crowbar alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/default.nix index 13b81d9c52..ff3667bd79 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/json-data-encoding/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { uri ]; - checkInputs = [ + nativeCheckInputs = [ crowbar alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix index 745f86dff5..f8ba36d969 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix @@ -22,7 +22,7 @@ buildDunePackage rec { propagatedBuildInputs = [ digestif fmt yojson base64 re ppx_deriving ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ke/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ke/default.nix index 2438249479..519b0c1725 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ke/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ke/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt ]; - checkInputs = [ alcotest bigstringaf ]; + nativeCheckInputs = [ alcotest bigstringaf ]; doCheck = true; minimalOCamlVersion = "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdapi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdapi/default.nix index 42238edcb3..f0509c243e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdapi/default.nix @@ -33,7 +33,7 @@ buildDunePackage rec { bindlib camlp-streams cmdliner pratter sedlex stdlib-shims timed why3 yojson ]; - checkInputs = [ alcotest dedukti ]; + nativeCheckInputs = [ alcotest dedukti ]; doCheck = false; # anomaly: Sys_error("/homeless-shelter/.why3.conf: No such file or directory") meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix index d7d0028b2c..ee3876d5da 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ markup ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; - checkInputs = [ ounit2 ]; + nativeCheckInputs = [ ounit2 ]; meta = { description = "Functional HTML scraping and rewriting with CSS in OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix index c9cd5572bc..efebb5309e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lens/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { buildInputs = [ ppx_deriving ppxlib ]; doCheck = true; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; meta = with lib; { homepage = "https://github.com/pdonadeo/ocaml-lens"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix index 13875147a4..6f14af03e5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -52,7 +52,7 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; meta = { description = "ACME implementation in OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix index c3400d4583..6a8e871bda 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ dscheck ]; doCheck = true; - checkInputs = [ qcheck qcheck-alcotest ]; + nativeCheckInputs = [ qcheck qcheck-alcotest ]; meta = { description = "Lock-free data structures for multicore OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lru/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lru/default.nix index 678023bb8f..dfa765d564 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lru/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lru/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { propagatedBuildInputs = [ psq ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ qcheck-alcotest ]; + nativeCheckInputs = [ qcheck-alcotest ]; meta = { homepage = "https://github.com/pqwy/lru"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lustre-v6/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lustre-v6/default.nix index 4eb1e55a5a..17d2187934 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lustre-v6/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lustre-v6/default.nix @@ -8,7 +8,7 @@ buildDunePackage rec { src = fetchurl { url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz"; - hash = "sha256-+OqDwUIiPrtJy1C3DmDNTrtsT8clKKcNWCev4TEMRBc="; + hash = "sha256-EQ+KjDn+UsyHFRh0RWe9toqdjiNcacQUMNRQCLuaw5I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lutils/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lutils/default.nix index c462eb9fe1..38bd10077c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lutils/default.nix @@ -1,25 +1,24 @@ -{ lib, buildDunePackage, fetchurl, num }: +{ lib, buildDunePackage, fetchurl, camlp-streams, num }: buildDunePackage rec { pname = "lutils"; - version = "1.51.2"; - - useDune2 = true; + version = "1.54.1"; minimalOCamlVersion = "4.02"; src = fetchurl { - url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lutils.1.51.2.tgz"; - sha512 = "f94696be379c62e888410ec3d940c888ca4b607cf59c2e364e93a2a694da65ebe6d531107198b795e80eecc3c6865eedb02659c7e7c4e15c9b28d74aa35d09f8"; + url = "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lutils.v${version}.tgz"; + hash = "sha512:d3c3b80286b1aa236ba922d9e18a133721fc80126c8b89520fb811dce9400e217aaa75b5d49e03988be7f6bf5f2e1a391d02ceeaa5ec0a0cd5ce218083a29514"; }; propagatedBuildInputs = [ - num + camlp-streams num ]; meta = with lib; { homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/"; description = "Tools and libs shared by Verimag/synchronous tools (lustre, lutin, rdbg)"; + changelog = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/-/releases/v${version}"; license = lib.licenses.cecill21; mainProgram = "gnuplot-rif"; }; 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 da7f9ba180..e2df6f321f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/luv/default.nix @@ -22,7 +22,7 @@ buildDunePackage rec { nativeBuildInputs = [ file ]; propagatedBuildInputs = [ ctypes result ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix index b28981b1b7..12675eda9a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/lwt-dllist/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "e86ce75e40f00d51514cf8b2e71e5184c4cb5dae96136be24613406cfc0dba6e"; }; - checkInputs = [ + nativeCheckInputs = [ lwt ]; doCheck = lib.versionAtLeast ocaml.version "4.03"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix index 7eb74ff064..18bc15673b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "0mdp38mkvk2f5h2q7nb9fc70a8hyssblnl7kam0d8r5lckgrx5rn"; }; - checkInputs = [ ppx_sexp_conv ounit ]; + nativeCheckInputs = [ ppx_sexp_conv ounit ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix index 1f03c1326a..15d5602e7e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix @@ -9,7 +9,7 @@ buildDunePackage { propagatedBuildInputs = [ ppx_sexp_conv ]; - checkInputs = [ macaddr-cstruct ounit ]; + nativeCheckInputs = [ macaddr-cstruct ounit ]; doCheck = true; meta = macaddr.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/markup/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/markup/default.nix index 535557c0e8..1782326335 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/markup/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/markup/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { propagatedBuildInputs = [ uchar uutf ]; - checkInputs = [ ounit2 ]; + nativeCheckInputs = [ ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix index dc8e2312e7..4affea9951 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,30 +1,26 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage, ocaml , alcotest -, astring, cmdliner, cppo, fmt, logs, ocaml-version, odoc-parser, ocaml_lwt, re, result, csexp -, pandoc +, astring, cppo, fmt, logs, ocaml-version, odoc-parser, lwt, re, csexp , gitUpdater }: buildDunePackage rec { pname = "mdx"; - version = "2.1.0"; + version = "2.2.1"; minimalOCamlVersion = "4.08"; + duneVersion = "3"; - src = fetchFromGitHub { - owner = "realworldocaml"; - repo = pname; - rev = version; - hash = "sha256-p7jmksltgfLFTSkPxMuJWJexLq2VvPWT/DJtDveOL/A="; + src = fetchurl { + url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; + hash = "sha256-8J7XM/5EYWBfApdzdIpjU9Ablb5l65hrzOF9bdr1Cdg="; }; nativeBuildInputs = [ cppo ]; - buildInputs = [ cmdliner ]; - propagatedBuildInputs = [ astring fmt logs result csexp ocaml-version odoc-parser re ]; - checkInputs = [ alcotest ocaml_lwt pandoc ]; + propagatedBuildInputs = [ astring fmt logs csexp ocaml-version odoc-parser re ]; + nativeCheckInputs = [ alcotest lwt ]; - # Check fails with cmdliner ≥ 1.1 - doCheck = false; + doCheck = true; outputs = [ "bin" "lib" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mec/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mec/default.nix index 9811c50259..312169acb6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mec/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mec/default.nix @@ -27,7 +27,7 @@ buildDunePackage rec { zarith ]; - checkInputs = [ + nativeCheckInputs = [ alcotest bisect_ppx ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix index 5fcf7cf511..837bf6c2dc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix index e2dd095422..ef32ed3159 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix @@ -13,7 +13,7 @@ buildDunePackage rec { propagatedBuildInputs = [ gnuplot lwt metrics mtime uuidm ]; - checkInputs = [ metrics-lwt ]; + nativeCheckInputs = [ metrics-lwt ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix index 097ecb3135..1522b2def3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mimic/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ alcotest alcotest-lwt bigstringaf diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-unix/default.nix index 1a56ed7040..940e9a7791 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-unix/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-block-unix/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct-lwt logs mirage-block rresult uri ]; doCheck = true; - checkInputs = [ diet ounit2 ]; + nativeCheckInputs = [ diet ounit2 ]; meta = with lib; { description = "MirageOS disk block driver for Unix"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix index bdafeb4305..7461ef91da 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct logs lwt mirage-flow ]; doCheck = true; - checkInputs = [ alcotest mirage-flow-combinators ]; + nativeCheckInputs = [ alcotest mirage-flow-combinators ]; meta = { description = "Buffered channels for MirageOS FLOW types"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 5b67c9ac43..5bbf5d0fcb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { }; doCheck = true; - checkInputs = [ ounit2 ]; + nativeCheckInputs = [ ounit2 ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix index 098b587f3d..5a9de788a5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/ec.nix @@ -40,7 +40,7 @@ buildDunePackage rec { strictDeps = !doCheck; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ hex alcotest asn1-combinators diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index 0793bf5c4f..d10e51ea0e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -13,7 +13,7 @@ buildDunePackage rec { strictDeps = !doCheck; doCheck = true; - checkInputs = [ ounit2 randomconv ]; + nativeCheckInputs = [ ounit2 randomconv ]; meta = mirage-crypto.meta // { description = "Simple public-key cryptography for the modern age"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index bf940c3eb7..f9a244de36 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -9,7 +9,7 @@ buildDunePackage rec { inherit (mirage-crypto-rng) version src; doCheck = true; - checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; + nativeCheckInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime mirage-time mirage-clock logs lwt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix index 8900dd611d..eb7e0cf0e4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/rng.nix @@ -7,7 +7,7 @@ buildDunePackage rec { inherit (mirage-crypto) version src; doCheck = true; - checkInputs = [ ounit2 randomconv ]; + nativeCheckInputs = [ ounit2 randomconv ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ cstruct mirage-crypto duration logs mtime ocaml_lwt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix index 0bd3e42ad3..6a317ca34c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix @@ -14,7 +14,7 @@ buildDunePackage { propagatedBuildInputs = [ fmt logs mirage-flow ocaml_lwt cstruct ]; doCheck = true; - checkInputs = [ alcotest mirage-flow-combinators ]; + nativeCheckInputs = [ alcotest mirage-flow-combinators ]; meta = mirage-flow.meta // { description = "Flow implementations and combinators for MirageOS on Unix"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix index 20d83e1664..771efcef2b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt mirage-device ]; doCheck = true; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; meta = { description = "MirageOS signatures for key/value devices"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix index 7aabd51b81..133d49ddf9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime stdlib-shims ]; doCheck = true; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; meta = { description = "A reporter for the Logs library that writes log messages to stderr, using a Mirage `CLOCK` to add timestamps"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix index 9d4bbc88c2..0fdc6d4fa9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-nat/default.nix @@ -1,42 +1,33 @@ { lib, buildDunePackage, fetchurl -, ipaddr, cstruct, lwt, logs, lru -, tcpip, ethernet, stdlib-shims +, ipaddr, cstruct, logs, lru +, tcpip, ethernet , alcotest, mirage-clock-unix -, ppxlib, ppx_deriving }: buildDunePackage rec { pname = "mirage-nat"; - version = "2.2.5"; + version = "3.0.1"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; - # due to cstruct - useDune2 = true; + duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "01xp0z4mywhawz7rxizi9ph342mqqwyfa5hqgvs8lhqzcym5d104"; + url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + hash = "sha256-wReySOMulGkrPD60XxpgMrUoHzY9hQ7TZzYQyJ3eiik="; }; - buildInputs = [ - ppxlib - ]; - propagatedBuildInputs = [ ipaddr cstruct - lwt logs lru tcpip ethernet - stdlib-shims - ppx_deriving ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ alcotest mirage-clock-unix ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix index 410475b6b5..76f11cfd90 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { # Tests need opam-monorepo doCheck = false; - checkInputs = [ + nativeCheckInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix index 8182b7b5ef..25062bcb0d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -10,7 +10,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs lwt ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mrmime/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mrmime/default.nix index a2d1187656..54f137aecd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mrmime/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mrmime/default.nix @@ -62,7 +62,7 @@ buildDunePackage rec { mirage-crypto-rng ]; - checkInputs = [ + nativeCheckInputs = [ alcotest jsonm ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix index 12853232a9..3ca6e4ac97 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix @@ -1,8 +1,6 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: -with lib; - -throwIfNot (versionAtLeast ocaml.version "4.08") +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") "mtime is not available for OCaml ${ocaml.version}" stdenv.mkDerivation rec { @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; - meta = { + meta = with lib; { description = "Monotonic wall-clock time for OCaml"; homepage = "https://erratique.ch/software/mtime"; inherit (ocaml.meta) platforms; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/multipart-form-data/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/multipart-form-data/default.nix index 126e77f6f2..8c9149c4af 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/multipart-form-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/multipart-form-data/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { duneVersion = "3"; doCheck = true; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; meta = { description = "Parser for multipart/form-data (RFC2388)"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mustache/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mustache/default.nix index b16dfd4848..6fcf7757f2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mustache/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mustache/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { propagatedBuildInputs = [ menhirLib ]; doCheck = true; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; meta = { description = "Mustache logic-less templates in OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/note/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/note/default.nix index 5f84296ede..5bb0da7dd1 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/note/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/note/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; meta = { - homepage = "http://erratique.ch/software/note"; + homepage = "https://erratique.ch/software/note"; description = "An OCaml module for functional reactive programming"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/npy/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/npy/default.nix index 5ba6cb08cc..9375029f5f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/npy/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/npy/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { }; propagatedBuildInputs = [ camlzip ]; - checkInputs = [ numpy ]; + nativeCheckInputs = [ numpy ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix index 4466234fdb..f99a84cf61 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix @@ -7,7 +7,7 @@ buildDunePackage { propagatedBuildInputs = [ camomile ocaml_gettext ]; doCheck = true; - checkInputs = [ ounit fileutils ]; + nativeCheckInputs = [ ounit fileutils ]; meta = (builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // { description = "Internationalization library using camomile (i18n)"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index 481619ebd0..bd887b4b9f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { # Tests for version 0.4.2 are not compatible with OUnit 2.2.6 doCheck = false; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix index 75e739959c..d8999dcbae 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -12,7 +12,7 @@ buildDunePackage rec { doCheck = true; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; meta = builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix index ed22177bfa..8de5abf7e4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -1,34 +1,29 @@ -{ lib, fetchFromGitHub, buildDunePackage, pkg-config, dune-configurator, stdio, R +{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, dune-configurator, stdio, R , alcotest }: buildDunePackage rec { pname = "ocaml-r"; - version = "0.4.0"; + version = "0.6.0"; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "pveber"; repo = pname; rev = "v${version}"; - sha256 = "10is2s148kfh3g0pwniyzp5mh48k57ldvn8gm86469zvgxyij1ri"; + sha256 = "sha256-jPyVMxjeh9+xu0dD1gelAxcOhxouKczyvzVoKZ5oSrs="; }; - # Without the following patch, stub generation fails with: - # > Fatal error: exception (Failure "not supported: osVersion") - preConfigure = '' - substituteInPlace stubgen/stubgen.ml --replace \ - 'failwithf "not supported: %s" name ()' \ - 'sprintf "(* not supported: %s *)" name' - substituteInPlace lib/config/discover.ml --replace \ - ' libRmath"' '"' - ''; - - # This currently fails with dune - strictDeps = false; + # Finds R and Rmathlib separatley + patches = [ + (fetchpatch { + url = "https://github.com/pveber/ocaml-r/commit/aa96dc5.patch"; + sha256 = "sha256-xW33W2ciesyUkDKEH08yfOXv0wP0V6X80or2/n2Nrb4="; + }) + ]; nativeBuildInputs = [ pkg-config R ]; buildInputs = [ dune-configurator stdio R ]; @@ -37,8 +32,6 @@ buildDunePackage rec { checkInputs = [ alcotest ]; meta = { - # This has been broken by the update to R 4.2.0 (#171597) - broken = true; description = "OCaml bindings for the R interpreter"; inherit (src.meta) homepage; license = lib.licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix index 7bd875e475..34f3e84304 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ astring cmdliner cppo fpath result tyxml odoc-parser fmt ]; - checkInputs = [ markup yojson sexplib0 jq ppx_expect bash ]; + nativeCheckInputs = [ markup yojson sexplib0 jq ppx_expect bash ]; doCheck = lib.versionAtLeast ocaml.version "4.08" && lib.versionOlder yojson.version "2.0"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix index b98d892696..26632f37d2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opium/default.nix @@ -49,7 +49,7 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ alcotest-lwt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix index 06729bb879..d98f6cf5ee 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/optint/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { minimalOCamlVersion = "4.07"; - version = "0.2.0"; + version = "0.3.0"; pname = "optint"; src = fetchurl { url = "https://github.com/mirage/optint/releases/download/v${version}/optint-${version}.tbz"; - sha256 = "sha256-HcvgtrYDH3fbMwKMhxOP2zv5D5KRXjtmKd3rMKDTAAs="; + sha256 = "sha256-KVz/LBNLA4WxO6gdUAXZ+EG6QNSlAq7RDJl/I57xFHs="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/opus/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opus/default.nix index ecaf2090ca..104846b87f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/opus/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/opus/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "opus"; version = "0.2.2"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-opus"; rev = "v${version}"; - sha256 = "sha256-Ghfqw/J1oLbTJpYJaiB5M79jaA6DACvyxBVE+NjnPkg="; + hash = "sha256-Ghfqw/J1oLbTJpYJaiB5M79jaA6DACvyxBVE+NjnPkg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/oseq/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/oseq/default.nix index cbe02de2ef..f680c3794c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/oseq/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/oseq/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { duneVersion = "3"; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ containers qcheck ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix index f135876069..7872edca59 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ounit2/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ seq stdlib-shims ]; doCheck = true; - checkInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses; + nativeCheckInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses; meta = with lib; { homepage = "https://github.com/gildor478/ounit"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix index 980efd3bf5..b5f707446a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { inherit (owl-base) version src meta useDune2; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; buildInputs = [ dune-configurator stdio ]; propagatedBuildInputs = [ eigen openblasCompat owl-base npy diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix index cfe20c4ae3..97396769fd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/cohttp.nix @@ -35,7 +35,7 @@ buildDunePackage { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ alcotest-lwt fmt logs @@ -47,6 +47,8 @@ buildDunePackage { astring ]; + __darwinAllowLocalNetworking = true; + meta = paf.meta // { description = "A CoHTTP client with its HTTP/AF implementation"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix index 9885d6c7a6..d172e73e13 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/paf/default.nix @@ -50,7 +50,7 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ lwt logs fmt @@ -61,6 +61,8 @@ buildDunePackage rec { alcotest-lwt ]; + __darwinAllowLocalNetworking = true; + meta = { description = "HTTP/AF and MirageOS"; license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix index 4bc409245e..79a6a541a5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { propagatedBuildInputs = [ astring ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; meta = { description = "Process strings into sets of command-line arguments"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pbkdf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pbkdf/default.nix index e9cd39827b..5dedd200a8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pbkdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pbkdf/default.nix @@ -10,14 +10,16 @@ buildDunePackage rec { pname = "pbkdf"; version = "1.2.0"; + duneVersion = "3"; + src = fetchzip { url = "https://github.com/abeaumont/ocaml-pbkdf/archive/${version}.tar.gz"; sha256 = "sha256-dGi4Vw+7VBpK/NpJ6zdpogm+E6G/oJovXCksJBSmqjI="; }; - minimalOCamlVersion = "4.07"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ cstruct mirage-crypto ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pcap-format/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pcap-format/default.nix index ae093cc781..aa65deff74 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pcap-format/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pcap-format/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ ounit mmap ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix index 22c1913635..cc2827ad53 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pecu/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { # crowbar availability doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ fmt alcotest crowbar astring ]; + nativeCheckInputs = [ fmt alcotest crowbar astring ]; meta = with lib; { description = "Encoder/Decoder of Quoted-Printable (RFC2045 & RFC2047)"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix index f3df658b6d..c8fbeb103a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -27,7 +27,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; - checkInputs = [ alcotest bppsuite ]; + nativeCheckInputs = [ alcotest bppsuite ]; buildInputs = [ menhir ]; propagatedBuildInputs = [ angstrom-unix diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/piaf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/piaf/default.nix index 7239a70a0b..cf2dd146cc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/piaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/piaf/default.nix @@ -2,7 +2,7 @@ , buildDunePackage , ocaml , dune-site -, fetchzip +, fetchurl , gluten-lwt-unix , lib , logs @@ -22,9 +22,11 @@ buildDunePackage rec { pname = "piaf"; version = "0.1.0"; - src = fetchzip { + duneVersion = "3"; + + src = fetchurl { url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz"; - sha256 = "0d431kz3bkwlgdamvsv94mzd9631ppcjpv516ii91glzlfdzh5hz"; + hash = "sha256-AMO+ptGox33Bi7u/H0SaeCU88XORrRU3UbLof3EwcmU="; }; postPatch = '' @@ -40,7 +42,7 @@ buildDunePackage rec { gluten-lwt-unix ]; - checkInputs = [ + nativeCheckInputs = [ alcotest-lwt dune-site ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 09f2bd3518..653f86c03a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ocaml findlib ]; buildInputs = [ piqi stdlib-shims ]; - checkInputs = [ num ]; + nativeCheckInputs = [ num ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix index 7602d70245..c53b594655 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { useDune2 = true; minimalOCamlVersion = "4.08"; - checkInputs = [ ppx_expect ]; + nativeCheckInputs = [ ppx_expect ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_blob/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_blob/default.nix index 6248e4e6a9..9bf509801b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "00haz1cmplk3j9ysh6j656zrldy60585fmlndmfhpd5332mxrfdw"; }; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; propagatedBuildInputs = [ ppxlib ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 176e8ff8ab..dba8ffc743 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -53,7 +53,7 @@ buildDunePackage rec { ]; doCheck = lib.versionOlder ocaml.version "5.0"; - checkInputs = [ + nativeCheckInputs = [ (if lib.versionAtLeast version "5.2" then ounit2 else ounit) ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix index 5bf70a0565..1b48c90e1d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix @@ -38,7 +38,7 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix index b7d1986c30..ff7fc30e98 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix @@ -9,7 +9,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ppxlib rpclib ppx_deriving ]; - checkInputs = [ alcotest yojson ]; + nativeCheckInputs = [ alcotest yojson ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix index c6a0f6d0af..98872feb14 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ppxlib ppx_deriving yaml ]; doCheck = true; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; meta = { description = "A YAML codec generator for OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 4fef3c0619..87784177ed 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ppxlib ppx_deriving yojson ]; doCheck = true; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; meta = { description = "A Yojson codec generator for OCaml >= 4.04"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix index 3a59b217e8..dca50972e3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -38,7 +38,7 @@ buildDunePackage rec { ppxlib ]; - checkInputs = [ + nativeCheckInputs = [ ounit ppx_deriving ppx_sexp_conv diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pratter/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pratter/default.nix index a44e815092..339eac87be 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pratter/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pratter/default.nix @@ -22,7 +22,7 @@ buildDunePackage rec { propagatedBuildInputs = [ camlp-streams ]; - checkInputs = [ alcotest qcheck qcheck-alcotest ]; + nativeCheckInputs = [ alcotest qcheck qcheck-alcotest ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/prettym/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/prettym/default.nix index d19233cf13..7cdbc7b05b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/prettym/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/prettym/default.nix @@ -31,7 +31,7 @@ buildDunePackage rec { ke ]; - checkInputs = [ + nativeCheckInputs = [ ptime alcotest jsonm diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix index 8dd4bbedd4..13fad457e2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { sha256 = "sha256-7u2ThRhM3vW4ItcFsK4ycgcaW0JcQOFoZZRq2kqbl+k="; }; - checkInputs = [ mdx.bin ]; + nativeCheckInputs = [ mdx.bin ]; # mdx is not available for OCaml < 4.08 doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/text.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/text.nix index cc0aa5691d..43e7e18566 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/text.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/printbox/text.nix @@ -6,7 +6,7 @@ buildDunePackage { propagatedBuildInputs = [ printbox uucp uutf ]; - checkInputs = [ mdx.bin ]; + nativeCheckInputs = [ mdx.bin ]; meta = printbox.meta // { description = "Text renderer for printbox, using unicode edges"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix index 4c00ff9846..35c7ee9eb4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/progress/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { propagatedBuildInputs = [ fmt logs mtime optint terminal vector ]; doCheck = true; - checkInputs = [ alcotest astring ]; + nativeCheckInputs = [ alcotest astring ]; meta = with lib; { description = "Progress bar library for OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index 41e13f21a4..1cb14f75fa 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -8,12 +8,10 @@ buildDunePackage rec { owner = "ACoquereau"; repo = pname; rev = version; - sha256 = "sha256-cYY9x7QZjH7pdJyHMqfMXgHZ3/zJLp/6ntY6OSIo6Vs="; + hash = "sha256-cYY9x7QZjH7pdJyHMqfMXgHZ3/zJLp/6ntY6OSIo6Vs="; }; - useDune2 = true; - - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/psq/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/psq/default.nix index ea9a0615b4..75b2344728 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/psq/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/psq/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { propagatedBuildInputs = [ seq ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ qcheck-alcotest ]; + nativeCheckInputs = [ qcheck-alcotest ]; meta = { description = "Functional Priority Search Queues for OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix index 9eba3ab318..8358be5003 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pyml/default.nix @@ -28,6 +28,10 @@ buildDunePackage rec { "CHANGES.md" ]; }) + (fetchpatch { + url = "https://github.com/thierry-martinez/pyml/commit/97407473800b3f6215190643c1e6b9bd25d5caeb.patch"; + hash = "sha256-7CrVuV4JT7fyi/ktWz4nNOG/BbqsQVCoJwCAhE2y4YU="; + }) ]; buildInputs = [ @@ -39,8 +43,8 @@ buildDunePackage rec { stdcompat ]; - checkInputs = [ - python3.pkgs.numpy + nativeCheckInputs = [ + python3.pkgs.numpy python3.pkgs.ipython ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix index 1eb7625636..eb96298f16 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/repr/ppx.nix @@ -12,7 +12,7 @@ buildDunePackage { ]; doCheck = false; # tests fail with ppxlib >= 0.23.0 - checkInputs = [ + nativeCheckInputs = [ alcotest hex ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix index 40356ec9aa..432636bcbb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix @@ -26,7 +26,7 @@ buildDunePackage rec { # the tests fail for 4.05 doCheck = lib.versionAtLeast ocaml.version "4.06"; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; meta = { homepage = "https://github.com/burgerdev/ocaml-rfc7748"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix index 73d899eafa..34f62852a8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { buildInputs = [ cmdliner yojson ]; propagatedBuildInputs = [ base64 rresult xmlm ]; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/lwt.nix index 49f7184749..69b2bf7499 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rpclib/lwt.nix @@ -9,7 +9,7 @@ buildDunePackage { propagatedBuildInputs = [ lwt rpclib ]; - checkInputs = [ alcotest-lwt ppx_deriving_rpc yojson ]; + nativeCheckInputs = [ alcotest-lwt ppx_deriving_rpc yojson ]; doCheck = true; meta = rpclib.meta // { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix index cdc3a1dba6..3184e460a9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-rresult"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz"; - sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86"; + sha256 = "sha256-Eap/W4NGDmBDHjFU4+MsBx1G4VHqV2DPJDd4Bb+XVUA="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix index 78d2827003..a5d042fc19 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix @@ -2,12 +2,11 @@ let pname = "sawja"; - version = "1.5.11"; + version = "1.5.12"; in -if lib.versionOlder ocaml.version "4.07" -then throw "${pname} is not available for OCaml ${ocaml.version}" -else +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") + "${pname} is not available for OCaml ${ocaml.version}" stdenv.mkDerivation { @@ -19,7 +18,7 @@ stdenv.mkDerivation { owner = "javalib-team"; repo = pname; rev = version; - sha256 = "sha256-1aKkRZDuLJLmDhUC1FXnn4QrgXaTyAbnXfTOAdnKgs8="; + hash = "sha256-G1W8/G0TEcldnFnH/NAb9a6ZSGGP2fWTM47lI8bBHnw="; }; nativeBuildInputs = [ which ocaml findlib ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/secp256k1-internal/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/secp256k1-internal/default.nix index 4a9a761ab3..f08f77c528 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/secp256k1-internal/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/secp256k1-internal/default.nix @@ -31,7 +31,7 @@ buildDunePackage rec { dune-configurator ]; - checkInputs = [ + nativeCheckInputs = [ alcotest hex ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix index 7ad18fba81..00233beefd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/secp256k1/default.nix @@ -2,15 +2,13 @@ buildDunePackage rec { pname = "secp256k1"; - version = "0.4.1"; - - useDune2 = true; + version = "0.4.4"; src = fetchFromGitHub { owner = "dakk"; repo = "secp256k1-ml"; rev = version; - sha256 = "0jkd7mc5kynhg0b76dfk70pww97qsq2jbd991634i16xf8qja9fj"; + hash = "sha256-22+dZb3MC1W5Qvsz3+IHV1/XiGCRmJHTH+6IW2QX2hU="; }; buildInputs = [ base stdio dune-configurator secp256k1 ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix index 4d400d3284..d809678838 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sha/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ ounit2 ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/default.nix index baeda2d1b1..2e4b656e63 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ ounit ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix index e3ae1ef2e3..75d62dd15a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix @@ -27,7 +27,7 @@ buildDunePackage { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ ounit ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix index 90b469288c..f20a6cff0a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "sqlite3"; - version = "5.0.2"; + version = "5.1.0"; useDune2 = true; minimumOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/${version}/sqlite3-${version}.tbz"; - sha256 = "0sba74n0jvzxibrclhbpqscil36yfw7i9jj9q562yhza6rax9p82"; + sha256 = "sha256-uw23EWkajfok/insTstpEkRK2Q4PTER6+Jgx5tHf/qU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix index 4159cee607..7730a5a62b 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix @@ -10,13 +10,13 @@ buildDunePackage rec { pname = "ssl"; - version = "0.5.12"; + version = "0.5.13"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ssl"; rev = version; - sha256 = "sha256-cQUJ7t7C9R74lDy1/lt+up4E5CogiPbeZpaDveDzJ7c="; + sha256 = "sha256-Ws7QZOvZVy0QixMiBFJZEOnYzYlCWrZ1d95gOp/a5a0="; }; nativeBuildInputs = [ pkg-config ]; @@ -24,7 +24,7 @@ buildDunePackage rec { propagatedBuildInputs = [ openssl ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; preCheck = '' mkdir -p _build/default/tests/ cp tests/digicert_certificate.pem _build/default/tests/ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix index cec0ec8183..5abcdc3dcf 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/stdint/default.nix @@ -26,7 +26,7 @@ buildDunePackage rec { ''; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ qcheck ]; + nativeCheckInputs = [ qcheck ]; meta = { description = "Various signed and unsigned integers for OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix index 3d440cf489..95b01e5d8f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/stringext/default.nix @@ -14,7 +14,7 @@ buildDunePackage { sha256 = "1sh6nafi3i9773j5mlwwz3kxfzdjzsfqj2qibxhigawy5vazahfv"; }; - checkInputs = [ ounit qtest ]; + nativeCheckInputs = [ ounit qtest ]; inherit doCheck; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/syslog-message/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/syslog-message/default.nix index 2c12415cdb..4e5ab303f5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/syslog-message/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/syslog-message/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ + nativeCheckInputs = [ qcheck ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix index 696ffe517e..a388bea4e8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tcpip/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { pname = "tcpip"; version = "7.1.2"; - useDune2 = true; + duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/mirage-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; @@ -58,7 +58,7 @@ buildDunePackage rec { ]; doCheck = false; - checkInputs = [ + nativeCheckInputs = [ alcotest mirage-flow mirage-vnetif diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal/default.nix index e97fb223e4..fa18ce2271 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ stdlib-shims uutf uucp ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ alcotest fmt ]; + nativeCheckInputs = [ alcotest fmt ]; meta = with lib; { description = "Basic utilities for interacting with terminals"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal_size/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal_size/default.nix index fa6bd003ea..564b69505d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal_size/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/terminal_size/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "fdca1fee7d872c4a8e5ab003d9915b6782b272e2a3661ca877f2d78dd25371a7"; }; - checkInputs = [ alcotest ]; + nativeCheckInputs = [ alcotest ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix index 9723127a1d..03c2ecca40 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/default.nix @@ -24,7 +24,7 @@ buildDunePackage rec { propagatedBuildInputs = [bls12-381 data-encoding bigstringaf]; - checkInputs = [alcotest alcotest-lwt bisect_ppx qcheck-alcotest]; + nativeCheckInputs = [alcotest alcotest-lwt bisect_ppx qcheck-alcotest]; doCheck = false; # circular dependencies diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix index 0f618f0d1e..3eed3652e5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plompiler.nix @@ -30,7 +30,7 @@ buildDunePackage rec { mec ]; - checkInputs = [ alcotest qcheck-alcotest bisect_ppx ]; + nativeCheckInputs = [ alcotest qcheck-alcotest bisect_ppx ]; doCheck = false; # circular deps diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix index 7eba7fd255..c602e8a3b0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tezos-bls12-381-polynomial/plonk.nix @@ -25,7 +25,7 @@ buildDunePackage rec { tezos-plompiler ]; - checkInputs = [ alcotest qcheck-alcotest bisect_ppx ]; + nativeCheckInputs = [ alcotest qcheck-alcotest bisect_ppx ]; doCheck = false; # broken diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/theora/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/theora/default.nix index 0f7b4aca1c..6849056d2d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/theora/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/theora/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "theora"; version = "0.4.0"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-theora"; rev = "v${version}"; - sha256 = "1sggjmlrx4idkih1ddfk98cgpasq60haj4ykyqbfs22cmii5gpal"; + hash = "sha256-VN1XYqxMCO0W9tMTqSAwWKv7GErTtRZgnC2SnmmV7+k="; }; buildInputs = [ dune-configurator ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix index b68edba272..a0c22b5026 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix @@ -38,7 +38,7 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ alcotest cstruct-unix ounit2 diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix index 10104228c8..a62cd9152a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix @@ -9,7 +9,10 @@ build system is required, the attribute `run` can be used. let param = - if lib.versionAtLeast ocaml.version "4.03" then { + if lib.versionAtLeast ocaml.version "4.05" then { + version = "1.0.5"; + sha256 = "sha256-RSCCYm5lGsSxYzwrSuTK16vrH7ahMEbmmfle7Fi10cc="; + } else if lib.versionAtLeast ocaml.version "4.03" then { version = "1.0.3"; sha256 = "0b77gsz9bqby8v77kfi4lans47x9p2lmzanzwins5r29maphb8y6"; } else { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix index db107003df..a7d1f573c6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config, ocb-stubblr }: +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config +, AudioToolbox, Cocoa, CoreAudio, CoreVideo, ForceFeedback }: if lib.versionOlder ocaml.version "4.03" then throw "tsdl is not available for OCaml ${ocaml.version}" @@ -20,7 +21,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; - propagatedBuildInputs = [ SDL2 ctypes ]; + propagatedBuildInputs = [ SDL2 ctypes ] + ++ lib.optionals stdenv.isDarwin [ AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback ]; preConfigure = '' # The following is done to avoid an additional dependency (ncurses) diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uecc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uecc/default.nix index efb86d8624..11ee8eb6b5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uecc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uecc/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { bigstring ]; - checkInputs = [ + nativeCheckInputs = [ alcotest cstruct hex diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix index 104cabfd0f..b3cb4933b9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { uutf ]; - checkInputs = [ + nativeCheckInputs = [ alcotest bigstringaf crowbar diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix index f669a98c4d..fa659699cb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { sha256 = "0szifda6yism5vn5jdizkha3ad0xk6zw4xgfl8g77dnv83ci7h65"; }; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; propagatedBuildInputs = [ angstrom stringext ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/sexp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/sexp.nix index ba970b1d6c..9cb66139fb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/sexp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uri/sexp.nix @@ -8,7 +8,7 @@ buildDunePackage { pname = "uri-sexp"; inherit (uri) version useDune2 src meta; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix index 476a4529f3..cfadc9e5fb 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uucp/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ${topkg.run} test runHook postCheck ''; - checkInputs = [ uucd ]; + nativeCheckInputs = [ uucd ]; meta = with lib; { description = "An OCaml library providing efficient access to a selection of character properties of the Unicode character database"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix index 59dd7d5689..8f4b4eadae 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/uuuu/default.nix @@ -27,7 +27,7 @@ buildDunePackage rec { strictDeps = !doCheck; - checkInputs = [ re ]; + nativeCheckInputs = [ re ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix index e88a863442..7037432508 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/vchan/default.nix @@ -31,7 +31,7 @@ buildDunePackage rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ cmdliner ounit ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix index 94ebc1b8d8..410e356be7 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/vg/default.nix @@ -5,8 +5,6 @@ htmlcBackend ? true # depends on js_of_ocaml }: -with lib; - let inherit (lib) optionals versionOlder; @@ -38,14 +36,14 @@ stdenv.mkDerivation { strictDeps = true; buildPhase = topkg.buildPhase - + " --with-uutf ${boolToString pdfBackend}" - + " --with-otfm ${boolToString pdfBackend}" - + " --with-js_of_ocaml ${boolToString htmlcBackend}" + + " --with-uutf ${lib.boolToString pdfBackend}" + + " --with-otfm ${lib.boolToString pdfBackend}" + + " --with-js_of_ocaml ${lib.boolToString htmlcBackend}" + " --with-cairo2 false"; inherit (topkg) installPhase; - meta = { + meta = with lib; { description = "Declarative 2D vector graphics for OCaml"; longDescription = '' Vg is an OCaml module for declarative 2D vector graphics. In Vg, images diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/vorbis/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/vorbis/default.nix index f33182e5fc..5bfb230e6c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/vorbis/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/vorbis/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "vorbis"; version = "0.8.0"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-vorbis"; rev = "v${version}"; - sha256 = "1acy7yvf2y5dggzxw4vmrpdipakr98si3pw5kxw0mh7livn08al8"; + hash = "sha256-iCoE7I70wAp4n4XfETVKeaob2811E97/e6144bY/nqk="; }; buildInputs = [ dune-configurator ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix index f7ade2ec80..95c0c4a9dc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/wayland/default.nix @@ -33,7 +33,7 @@ buildDunePackage rec { xmlm ]; - checkInputs = [ + nativeCheckInputs = [ alcotest-lwt ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix index 9f8749cac9..c6335ba8a9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cohttp dispatch ptime ]; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix index cea9d79333..9bfe948944 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/x509/default.nix @@ -10,12 +10,14 @@ buildDunePackage rec { pname = "x509"; version = "0.16.2"; + duneVersion = "3"; + src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-${version}.tbz"; - sha256 = "sha256-Zf/ZZjUAkeWe04XLmqMKgbxN/qe/Z1mpKM82veXVf2I="; + hash = "sha256-Zf/ZZjUAkeWe04XLmqMKgbxN/qe/Z1mpKM82veXVf2I="; }; - checkInputs = [ alcotest cstruct-unix ]; + nativeCheckInputs = [ alcotest cstruct-unix ]; propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk mirage-crypto-ec pbkdf logs base64 ipaddr ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix index 7457529472..a60341f569 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/xenstore/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct lwt ]; doCheck = true; - checkInputs = [ ounit2 ]; + nativeCheckInputs = [ ounit2 ]; meta = with lib; { description = "Xenstore protocol in pure OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix index 62c8a565c8..401b7ce1dc 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { propagatedBuildInputs = [ bos ctypes ]; doCheck = true; - checkInputs = [ fmt logs mdx.bin alcotest crowbar junit_alcotest ezjsonm ]; + nativeCheckInputs = [ fmt logs mdx.bin alcotest crowbar junit_alcotest ezjsonm ]; meta = { description = "Parse and generate YAML 1.1 files"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/yuscii/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yuscii/default.nix index 02de0220fc..44f6436154 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yuscii/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/yuscii/default.nix @@ -21,7 +21,7 @@ buildDunePackage rec { useDune2 = true; - checkInputs = [ + nativeCheckInputs = [ gcc alcotest fmt diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix index 5a78809d90..e156e8cbb3 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { }; doCheck = true; - checkInputs = [ qcheck-alcotest ]; + nativeCheckInputs = [ qcheck-alcotest ]; meta = { description = "Name pattern combinators"; diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix index d2b28afd61..d33362d4a1 100644 --- a/third_party/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix +++ b/third_party/nixpkgs/pkgs/development/perl-modules/strip-nondeterminism/default.nix @@ -30,7 +30,7 @@ buildPerlPackage rec { ArchiveCpio ]; - checkInputs = [ SubOverride ]; + nativeCheckInputs = [ SubOverride ]; postPatch = '' substituteInPlace lib/File/StripNondeterminism.pm \ diff --git a/third_party/nixpkgs/pkgs/development/php-packages/gnupg/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/gnupg/default.nix index 249dac0550..1341ca2d16 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/gnupg/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/gnupg/default.nix @@ -15,7 +15,7 @@ in buildPecl { }; buildInputs = [ gpgme ]; - checkInputs = [ gnupg ]; + nativeCheckInputs = [ gnupg ]; postPhpize = '' substituteInPlace configure \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/3to2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/3to2/default.nix index ff64a6d1a4..18e93a1ff7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/3to2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/3to2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test lib3to2/tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix index d9a222182a..2359eea7a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { tzlocal ]; - checkInputs = [ + nativeCheckInputs = [ gevent pytest-asyncio pytest-tornado diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix index 3065e822f6..00aef53cc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Cython/default.nix @@ -36,7 +36,7 @@ in buildPythonPackage rec { pkg-config ]; - checkInputs = [ + nativeCheckInputs = [ gdb numpy ncurses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix index bafaee5d02..9b44b55264 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ invoke paramiko cryptography ]; - checkInputs = [ pytestCheckHook pytest-relaxed mock ]; + nativeCheckInputs = [ pytestCheckHook pytest-relaxed mock ]; # ==================================== ERRORS ==================================== # ________________________ ERROR collecting test session _________________________ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Flask-PyMongo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Flask-PyMongo/default.nix index 3a01c9ba98..bbbdc29d45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Flask-PyMongo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Flask-PyMongo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "051kwdk07y4xm4yawcjhn6bz8swxp9nanv7jj35mz2l0r0nv03k2"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix index 4244d358c8..307ad10b30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/FormEncode/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ + nativeCheckInputs = [ dnspython pycountry pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/GeoIP/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/GeoIP/default.nix index 0e4b66fe96..95423a858d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/GeoIP/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/GeoIP/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "GeoIP"; version = "1.3.2"; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; propagatedBuildInputs = [ geoip ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/IPy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/IPy/default.nix index 05587ef074..5f370e7888 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/IPy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/IPy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "edeca741dea2d54aca568fa23740288c3fe86c0f3ea700344571e9ef14a7cc1a"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests -e fuzz diff --git a/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix index 3664d83bfb..f26473f0a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Logbook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Logbook/default.nix index fa05a7a6df..da1f178729 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Logbook/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Logbook/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1s1gyfw621vid7qqvhddq6c3z2895ci4lq3g0r1swvpml2nm9x36"; }; - checkInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ]; + nativeCheckInputs = [ pytest ] ++ lib.optionals (!isPy3k) [ mock ]; propagatedBuildInputs = [ brotli ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix index eeae0d7f33..7b8f9b7a8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ chameleon lingua mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix index 83d2fb6388..4a549cee2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Nikola/default.nix @@ -83,7 +83,7 @@ buildPythonPackage rec { Yapsy ]; - checkInputs = [ + nativeCheckInputs = [ freezegun mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Pmw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Pmw/default.nix index 27c62ea663..f88346d664 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Pmw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Pmw/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = { description = "A toolkit for building high-level compound widgets in Python using the Tkinter module"; - homepage = "http://pmw.sourceforge.net/"; + homepage = "https://pmw.sourceforge.net/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mounium ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix index d6e3dab16c..4ee9b26c5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Rtree/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { buildInputs = [ libspatialindex ]; - checkInputs = [ + nativeCheckInputs = [ numpy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Theano/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Theano/default.nix index f596a6d804..e931875605 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Theano/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Theano/default.nix @@ -82,7 +82,7 @@ in buildPythonPackage rec { # the fix for which hasn't been merged yet. # keep Nose around since running the tests by hand is possible from Python or bash - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # setuptools needed for cuda support propagatedBuildInputs = [ libgpuarray_ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix index 624bb4388a..a88b843a61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/WSME/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { webob ]; - checkInputs = [ + nativeCheckInputs = [ nose cherrypy flask diff --git a/third_party/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix index 747887f2ea..4cf7842464 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/XlsxWriter/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-9fIxNkOdM+Bz1F9AWq02H3LLQnefxGSAtp9kM2OtJ9M="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aadict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aadict/default.nix index de3ec6fa7f..c124cb7695 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aadict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aadict/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six ]; - checkInputs = [ nose coverage ]; + nativeCheckInputs = [ nose coverage ]; meta = with lib; { homepage = "https://github.com/metagriffin/aadict"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/abodepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/abodepy/default.nix deleted file mode 100644 index 47fc6148ed..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/abodepy/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, colorlog, lomond -, requests, isPy3k, requests-mock }: - -buildPythonPackage rec { - pname = "abodepy"; - version = "1.2.2"; - - disabled = !isPy3k; - - src = fetchFromGitHub { - owner = "MisterWil"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-GrvNCgWGGBbUUONwS18csh4/A0MMkSk5Z6LlDhlQqok="; - }; - - propagatedBuildInputs = [ colorlog lomond requests ]; - checkInputs = [ pytestCheckHook requests-mock ]; - - meta = with lib; { - homepage = "https://github.com/MisterWil/abodepy"; - description = "An Abode alarm Python library running on Python 3"; - license = licenses.mit; - maintainers = with maintainers; [ jamiemagee ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix index fff517c84f..dfe47d3068 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accupy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pyfma ] ++ lib.optional (pythonOlder "3.8") importlib-metadata; - checkInputs = [ + nativeCheckInputs = [ perfplot pytestCheckHook matplotlib diff --git a/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix index 4e86352346..e6f2274667 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/accuweather/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { orjson ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-error-for-skips diff --git a/third_party/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix index 79c1ecffb0..0ecae898a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ setuptools-scm ]; - checkInputs = [ fusepy fuse ]; + nativeCheckInputs = [ fusepy fuse ]; doCheck = false; # seems to hang, not sure diff --git a/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix index 7de65d83fb..e0354b58de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { tabulate ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix index 9b247091bc..b1b13bf581 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/acquire/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ] ++ dissect-target.optional-dependencies.full; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix index dd0a1c20cc..60131fcb9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-io/default.nix index bd44626f8b..382fea4601 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-io/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix index 532fd301a1..ec61902034 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ecdsa ]; - checkInputs = [ + nativeCheckInputs = [ behave nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 01eeba71fa..6218842917 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,17 +7,19 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.39.0"; - format = "setuptools"; + version = "3.40.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-l5upg3Jux+HHtiYM95+5qL05kzmVHrzPYrqIejbaVZY="; + hash = "sha256-NLbKvC/7N10Y7l94sfiWCmBz92qlgufb1S62Adod4WA="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix index e944248db1..cbce5d2af1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ httpretty pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adb-homeassistant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adb-homeassistant/default.nix index ff49aec1fb..72e6d6acd4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adb-homeassistant/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adb-homeassistant/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { pycryptodome ]; - checkInputs = [ pytest mock ]; + nativeCheckInputs = [ pytest mock ]; checkPhase = '' py.test test ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix index 383a3fe782..cdd8ff94b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ mock pycryptodome pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adblock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adblock/default.nix index 3106cf0400..02ca5197c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adblock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adblock/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { PSL_PATH = "${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat"; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook toml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix index f371ffd794..3fb15671ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/add-trailing-comma/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { "add_trailing_comma" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/addict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/addict/default.nix index 2bb531cff9..235c34af26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/addict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/addict/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "b3b2210e0e067a281f5646c8c5db92e99b7231ea8b0eb5f74dbdf9e259d4e494"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "addict" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adext/default.nix index 7b10b0de1b..649ab4b732 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adext/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { alarmdecoder ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix index 500fb1fb9b..28af1269c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adguardhome/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix index 9c344f720a..8789bd0fa1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aemet-opendata/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "aemet-opendata"; - version = "0.2.1"; + version = "0.2.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Noltari"; repo = "AEMET-OpenData"; - rev = version; - sha256 = "0jl1897m3qmr48n469mq7d66k1j0rn7hlbcahm0ylf5i3ma03aiw"; + rev = "refs/tags/${version}"; + sha256 = "sha256-3f3hvui00oItu6t9rKecoCquqsD1Eeqz+SEsLBqGt48="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix index 8ebed55e1b..bc3bdc2fd5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix @@ -1,9 +1,9 @@ { lib , buildPythonPackage , fetchPypi -, isPy3k , pyparsing -, python +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -11,28 +11,33 @@ buildPythonPackage rec { version = "3.1.11"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-rtLCc1R65yoNXuhpcZwCpkPaFr9QfICVj6rcfgOOP3M="; + hash = "sha256-rtLCc1R65yoNXuhpcZwCpkPaFr9QfICVj6rcfgOOP3M="; }; - checkInputs = [ + nativeCheckInputs = [ pyparsing + pytestCheckHook ]; - # py2 likes to reorder tests - doCheck = isPy3k; - - checkPhase = '' - runHook preCheck - ${python.interpreter} aenum/test.py - runHook postCheck - ''; - pythonImportsCheck = [ "aenum" ]; + disabledTests = [ + # https://github.com/ethanfurman/aenum/issues/27 + "test_class_nested_enum_and_pickle_protocol_four" + "test_pickle_enum_function_with_qualname" + "test_stdlib_inheritence" + "test_subclasses_with_getnewargs_ex" + "test_arduino_headers" + "test_c_header_scanner" + "test_extend_flag_backwards_stdlib" + ]; + meta = with lib; { description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants"; homepage = "https://github.com/ethanfurman/aenum"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aeppl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aeppl/default.nix index c8fe640760..039abb2fb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aeppl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aeppl/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ numdifftools pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix index 17d0ff4133..a739ce0d52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ jax jaxlib numba diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix index bba034b383..397ad4e17b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { # Use system libxml2 FORCE_SYSTEM_LIBXML2 = true; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export PATH=$PATH:$out/bin diff --git a/third_party/nixpkgs/pkgs/development/python-modules/affine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/affine/default.nix index 4b7696223a..85991ac755 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/affine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/affine/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "sha256-1nbeZhV61q+Z/9lOD1Tonfw1sPtyUurS7QrS3KQxvdA="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = "py.test"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix index ab9d8f1abe..8d40361c6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix index d02d71d866..a3e962ea6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ agate openpyxl xlrd olefile ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "agate" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix index 827f73f27e..5c6cf00cd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix @@ -11,18 +11,18 @@ buildPythonPackage rec { pname = "agate-sql"; - version = "0.5.8"; + version = "0.5.9"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "581e062ae878cc087d3d0948670d46b16589df0790bf814524b0587a359f2ada"; + sha256 = "sha256-MLZCoypbZxFhq++ejsNjUvLniiTOhJBU7axpRti53cY="; }; propagatedBuildInputs = [ agate sqlalchemy ]; - checkInputs = [ crate geojson pytestCheckHook ]; + nativeCheckInputs = [ crate geojson pytestCheckHook ]; pythonImportsCheck = [ "agatesql" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/agate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate/default.nix index e2b45293da..4b5ac20113 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/agate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/agate/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ cssselect glibcLocales lxml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix index 7c4326db64..89b998bee6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aggdraw/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-w3HlnsHYB0R+HZOXtzygC2RST3gllPI7SYtwSCVXhTU="; }; - checkInputs = [ + nativeCheckInputs = [ numpy pillow pytest 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 47fe8d1bad..2e878b014c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.34"; + version = "9.2.36"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-qFnr+HzDqzhub9MKHjmpbEI3CGMuUkpwX763ykoP9No="; + hash = "sha256-PEX2SanglMqjtJHuH+gA5dnikh7qqLFiXbmrcIzs1+A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-client/default.nix index b0629483d0..ad0a641c35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-client/default.nix @@ -1,11 +1,11 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , geojson , haversine +, mock , pytest-asyncio , pytestCheckHook , pythonOlder @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-client"; - version = "0.17"; + version = "0.18"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-client"; - rev = "v${version}"; - hash = "sha256-5GiQgtbvYeleovFbXO2vlr2XPsDIWZiElM64O+urMcY="; + rev = "refs/tags/v${version}"; + hash = "sha256-nvfy1XLiMjyCiQo/YuzRbDtxGmAUAiq8UJwS/SkN3oM="; }; propagatedBuildInputs = [ @@ -31,9 +31,9 @@ buildPythonPackage rec { haversine ]; - checkInputs = [ + nativeCheckInputs = [ aresponses - asynctest + mock pytest-asyncio pytestCheckHook ]; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-client"; + changelog = "https://github.com/exxamalte/python-aio-geojson-client/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-generic-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-generic-client/default.nix index df13e8d751..9a302f5af0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-generic-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-generic-client/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-generic-client"; - version = "0.1"; + version = "0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-generic-client"; - rev = "v${version}"; - hash = "sha256-6Gc3SRRQiISBZnCg7a+rCQHR4NQipBHmG5gWZZXIsxY="; + rev = "refs/tags/v${version}"; + hash = "sha256-toDvliFMxicaEhlxb7wCadDJErpsIPcZbJz7TpO83GE="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-asyncio @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-generic-client"; + changelog = "https://github.com/exxamalte/python-aio-geojson-generic-client/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix index f3076160f9..90645327c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-quakes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aio-geojson-geonetnz-quakes"; - version = "0.14"; + version = "0.15"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-quakes"; - rev = "v${version}"; - hash = "sha256-T3vQodb0/3YEjsyHLSI8DBKK75J8hvsaBqyQI7GkT3U="; + rev = "refs/tags/v${version}"; + hash = "sha256-/EPPEGLtiZBorZMnVg0NqwnHCbCXyZzz4449MzAYQx8="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook @@ -42,7 +42,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the GeoNet NZ Quakes GeoJSON feeds"; - homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-quakes"; + homepage = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes"; + changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix index 3ba2b43080..3b61a49a4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -2,7 +2,7 @@ , aio-geojson-client , aiohttp , aresponses -, asynctest +, mock , buildPythonPackage , fetchFromGitHub , pytest-asyncio @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-geonetnz-volcano"; - version = "0.7"; + version = "0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-volcano"; - rev = "v${version}"; - sha256 = "sha256-2iVUHMk4ydmGmmGS6lJV5pvxJHyP9bRSeh/dOXbquE0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-wJVFjy6QgYb6GX9pZTylYFvCRWmD2lAFZKnodsa8Yqo="; }; propagatedBuildInputs = [ @@ -31,9 +31,9 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses - asynctest + mock pytest-asyncio pytestCheckHook ]; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds"; homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-volcano"; + changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix index c790188ea2..b7c205179f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-nsw-rfs-incidents/default.nix @@ -2,7 +2,6 @@ , aio-geojson-client , aiohttp , aresponses -, asynctest , buildPythonPackage , fetchFromGitHub , pytest-asyncio @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "aio-geojson-nsw-rfs-incidents"; - version = "0.5"; + version = "0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-nsw-rfs-incidents"; - rev = "v${version}"; - sha256 = "sha256-rWlt4MYnuY+CzszFVDniWBnqpQW3WldSEl00ns3ko3U="; + rev = "refs/tags/v${version}"; + hash = "sha256-pn0r5iLpNnK3xmAhq/oX90hdiHgFDuwDQqfAzkp5jmw="; }; propagatedBuildInputs = [ @@ -31,9 +30,8 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses - asynctest pytest-asyncio pytestCheckHook ]; @@ -45,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the NSW Rural Fire Service incidents feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-nsw-rfs-incidents"; + changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-quakes/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix index 0fde289104..728a666447 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aio-geojson-usgs-earthquakes"; - version = "0.1"; + version = "0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-geojson-usgs-earthquakes"; - rev = "v${version}"; - hash = "sha256-Hb0/BdK/jjxlPl9WJJpFdOCzZpZDCguXoGreGIyN8oo="; + rev = "refs/tags/v${version}"; + hash = "sha256-ET8wcOep4tSZJXyL+XvfW2j9eKp6LrBk/g18ZlgLIzc="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-asyncio @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the U.S. Geological Survey Earthquake Hazards Program feeds"; homepage = "https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes"; + changelog = "https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aio-georss-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aio-georss-client/default.nix index f62c8b1bcf..6fb1ec4263 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aio-georss-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aio-georss-client/default.nix @@ -1,11 +1,11 @@ { lib , aiohttp , aresponses -, asynctest , buildPythonPackage , dateparser , fetchFromGitHub , haversine +, mock , pytest-asyncio , pytestCheckHook , pythonOlder @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aio-georss-client"; - version = "0.10"; + version = "0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-client"; - rev = "v${version}"; - sha256 = "sha256-g/BlRRBImJihVlAfSMsPIPV0GJns0/pStF8TKSxpDI4="; + rev = "refs/tags/v${version}"; + hash = "sha256-Voc1ME0iGQCMaDfBXDSVnRp8olvId+fLhH8sqHwB2Ak="; }; propagatedBuildInputs = [ @@ -35,9 +35,9 @@ buildPythonPackage rec { dateparser ]; - checkInputs = [ + nativeCheckInputs = [ aresponses - asynctest + mock pytest-asyncio pytestCheckHook ]; @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing GeoRSS feeds"; homepage = "https://github.com/exxamalte/python-aio-georss-client"; + changelog = "https://github.com/exxamalte/python-aio-georss-client/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aio-georss-gdacs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aio-georss-gdacs/default.nix index 96e105fab2..3816b59154 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aio-georss-gdacs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aio-georss-gdacs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aio-georss-gdacs"; - version = "0.7"; + version = "0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-gdacs"; - rev = "v${version}"; - sha256 = "sha256-6z0l0PcFTQgOBj8cBgBMPJIqWG53u7h4WbYkBqU4FNE="; + rev = "refs/tags/v${version}"; + hash = "sha256-1mpOWd4Z2gTQtRewWfZsfEtmS6i5uMPAMTlC8UpawxM="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { dateparser ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing GeoRSS feeds"; homepage = "https://github.com/exxamalte/python-aio-georss-gdacs"; + changelog = "https://github.com/exxamalte/python-aio-georss-gdacs/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix index 56b1678c03..550c6d675e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioaladdinconnect"; - version = "0.1.53"; + version = "0.1.55"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "AIOAladdinConnect"; inherit version; - hash = "sha256-aU15T3H98un+ImE0KYbJpYop7mvBtBPSFAEqiTZzigQ="; + hash = "sha256-Lyhv6JF+KuCiGz05EbXMEeXzVCI7ACsJmnEuAtDghYo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioambient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioambient/default.nix index 6a9ade641d..4d5c652db9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioambient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioambient/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-aiohttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix index c2a8bded2b..00d451a2b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioasuswrt/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { asyncssh ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix index 5ad3566c74..f1196c0ce8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pyjwt ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioblescan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioblescan/default.nix index 62cec7b2d0..312dcd20ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioblescan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioblescan/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-JeA9jX566OSRiejdnlifbcNGm0J0C+xzA6zXDUyZ6jc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix index adf53a17b8..42c366278f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ + nativeCheckInputs = [ dill moto pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocoap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocoap/default.nix index 55d973506b..bf6070ad1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiocoap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiocoap/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 d32a37c6a7..23fab5398d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioconsole/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { sha256 = "sha256-PSXYXIWb2zTVC6kwMgkDovF+BVtEnqQh8NFPb96tFRY="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix index f673e86bba..256a69338e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiocontextvars/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sqlalchemy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocron/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocron/default.nix index 56f3561d84..d7fee0d0a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiocron/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiocron/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { tzlocal ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook tzlocal ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix index 5479d94f03..50002735d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiocsv/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { cython ]; - checkInputs = [ + nativeCheckInputs = [ aiofiles pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiocurrencylayer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiocurrencylayer/default.nix index 4c853d7d3a..80144877e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiocurrencylayer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiocurrencylayer/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { httpx ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpx pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix index 6160119259..b5b46190fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiodiscover/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { --replace "pyroute2>=0.5.18,!=0.6.1" "pyroute2" ''; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioeafm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioeafm/default.nix index 6200c60d46..f1535eb07d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioeafm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioeafm/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytest-asyncio pytest-cov diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioecowitt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioecowitt/default.nix index 7d0c92f709..4a5abb7fe9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioecowitt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioecowitt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioecowitt"; - version = "2022.11.0"; + version = "2023.01.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-v+O4J3GZZelF3H3BbL7LVRZEIH01WrDNnmOOWG4rVT0="; + hash = "sha256-xOoKrGBkMEdpeiU1r27xlZp5s5sGJzvD7Ats+w6KR/o="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { meteocalc ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioemonitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioemonitor/default.nix index e78cb83b3f..88ae374e5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioemonitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioemonitor/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-raises diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index 33247ba3fe..82cdb3733b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "13.0.4"; + version = "13.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pqCg4LAFIr5BEDqRWMaNc3M36bUmou5cZdarQ/0W77Y="; + hash = "sha256-slPYf7H8vwgSlqm7H7JnJnU17nL2Hwg9hHO0le33IqU="; }; postPatch = '' @@ -35,7 +35,7 @@ buildPythonPackage rec { zeroconf ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioextensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioextensions/default.nix index cc1ebe3f61..b5508d8d74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioextensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioextensions/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ uvloop ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' cd test/ pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiofile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiofile/default.nix index 74336a22e0..a2c4eaf5ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiofile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiofile/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { caio ]; - checkInputs = [ + nativeCheckInputs = [ aiomisc asynctest pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix index ef59dd6fa5..4b805b5b1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioflo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioflo/default.nix index 70b41a0af3..52649e9603 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioflo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioflo/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-aiohttp pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix index 37f8d9fa33..224877efb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { siosocks ]; - checkInputs = [ + nativeCheckInputs = [ async-timeout pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix index 283fd87c55..099ea8664d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { backoff ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix index aa5b319722..fcbe12a11d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ asyncio-dgram asynctest pytest-aiohttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index c521920d47..e29f22ba3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-apispec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-apispec/default.nix index df8c1fffdb..ea908ff544 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-apispec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-apispec/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { webargs ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; 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 3e3148fce7..8e062db87e 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 @@ -25,7 +25,7 @@ buildPythonPackage rec { jinja2 ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix index 4b150b9ede..ae0cbf9984 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-retry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-retry/default.nix index 0cf747e70b..bf3c251b4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-retry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-retry/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-swagger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-swagger/default.nix index a8e3499ee5..19c822acf1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-swagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-swagger/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-aiohttp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-wsgi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-wsgi/default.nix index 1f01a7b57e..a3b8334b99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-wsgi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-wsgi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix index 087e87ded2..2b912f9622 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { idna-ssl ]; - checkInputs = [ + nativeCheckInputs = [ async_generator freezegun gunicorn diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix index 657ebc1aa9..f4248a27dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aiohue"; - version = "4.5.0"; + version = "4.6.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; - rev = version; - hash = "sha256-Lcs+Ieh5TEUE+sHqFAZr9rsAZMsI9t2/w87r36IUa1A="; + rev = "refs/tags/${version}"; + hash = "sha256-ATM4s2W1Gw98TysfqHVA/McerZStHaUK5eMrSU9+uOI="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { asyncio-throttle ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to talk to Philips Hue"; homepage = "https://github.com/home-assistant-libs/aiohue"; + changelog = "https://github.com/home-assistant-libs/aiohue/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix index 6936ac4ac4..b577abf37c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioimaplib/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { hash = "sha256-7Ta0BhtQSm228vvUa5z+pzM3UC7+BskgBNjxsbEb9P0="; }; - checkInputs = [ + nativeCheckInputs = [ asynctest docutils imaplib2 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 e5544df68e..6fdc7dfd4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioitertools/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiojobs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiojobs/default.nix index 937ff406ed..320593f793 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiojobs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiojobs/default.nix @@ -1,36 +1,43 @@ { lib +, aiohttp +, async-timeout , buildPythonPackage , fetchFromGitHub -, pythonOlder -, aiohttp -, pytestCheckHook , pytest-aiohttp -, pygments +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aiojobs"; version = "1.1.0"; - format = "flit"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-FHdEVt/XXmuTrPAETyod3fHJIK1wg957/+QMAhZG1xk="; + hash = "sha256-FHdEVt/XXmuTrPAETyod3fHJIK1wg957/+QMAhZG1xk="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=aiojobs/ --cov=tests/" "" + ''; + nativeBuildInputs = [ - pygments + setuptools ]; propagatedBuildInputs = [ aiohttp + async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-aiohttp ]; @@ -42,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jobs scheduler for managing background task (asyncio)"; homepage = "https://github.com/aio-libs/aiojobs"; + changelog = "https://github.com/aio-libs/aiojobs/blob/v${version}/CHANGES.rst"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiokef/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiokef/default.nix index c153ff37d8..b2858b5b83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiokef/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiokef/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { tenacity ]; - checkInputs = [ + nativeCheckInputs = [ pytest-cov pytest-mypy pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix index 8a987027a0..5f6612e409 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { aiolifx ]; - checkInputs = [ + nativeCheckInputs = [ async-timeout pytestCheckHook pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolimiter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolimiter/default.nix index 9f8f81e2fc..04a2c6c46b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiolimiter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolimiter/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook toml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolip/default.nix index 80e110cbd8..a3d773cf04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiolip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1bgmcl8q1p6f2xm3w2qylvla6vf6bd1p2hfwj4l8w6w0w04vr02g"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolivisi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolivisi/default.nix index dff6c28e53..05404b9ac7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiolivisi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolivisi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aiolivisi"; - version = "0.0.14"; + version = "0.0.15"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-n7EQCOItr6MZRnTCfkJrq39bDbw09XyIRzSuZR2TsNg="; + hash = "sha256-qRIdIptvlSyxFYfi7ZFeoZKjnVPzdDW9rBr+DjUsDXc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolookin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolookin/default.nix index 3bd5d6ecf5..75a6b0715d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiolookin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolookin/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ faker pytest-aiohttp pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix index a48ae33964..ba0b17a5eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolyric/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix index d3c386eef7..b3a65926d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomisc/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { logging-journald ]; - checkInputs = [ + nativeCheckInputs = [ aiocontextvars async-timeout fastapi diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomodernforms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomodernforms/default.nix index ef3f86ad33..bbf3190e57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomodernforms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomodernforms/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix index 6403f396ea..4fc0f7781f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomultiprocess/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "aiomultiprocess/tests/*.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix index c44fb3ef78..51c43d5cf9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomusiccast/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.14.6"; + version = "0.14.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = "refs/tags/${version}"; - hash = "sha256-eQBVenB/WIqksohWtCU/3o3TGWMavPjJahlg0yus4aE="; + hash = "sha256-6fHTZ5zFiXuyFtZj9cNH5ejLbzx/1cEBUy+fs+Q6O4Y="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix index 3110707ad7..14c061a2fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pyserial-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aionotify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aionotify/default.nix index 13ae51d252..0483793c7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aionotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aionotify/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { --replace "asyncio.wait_for(task, timeout, loop=self.loop)" "asyncio.wait_for(task, timeout)" ''; - checkInputs = [ + nativeCheckInputs = [ asynctest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aionotion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aionotion/default.nix index 71fc39dead..1de22b698c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aionotion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aionotion/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-aiohttp pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix index 18b6ae78b6..740cb29ebc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-aiohttp pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiopurpleair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiopurpleair/default.nix index fce3b9f4d0..5f74bc55cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiopurpleair/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopurpleair/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-aiohttp pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiopvapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiopvapi/default.nix index cfd3e709cb..055239052d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiopvapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopvapi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix index 032bf995a7..0f44a49a39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopvpc/default.nix @@ -4,18 +4,17 @@ , backports-zoneinfo , buildPythonPackage , fetchFromGitHub -, holidays , poetry-core , pytest-asyncio , pytest-timeout , pytestCheckHook , pythonOlder -, tzdata +, python-dotenv }: buildPythonPackage rec { pname = "aiopvpc"; - version = "3.0.0"; + version = "4.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,39 +22,33 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "azogue"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-eTCQddoZIaCs7iKGNBC8aSq6ek4vwYXgIXx35UlME/k="; + rev = "refs/tags/v${version}"; + hash = "sha256-E5z74/5VuFuOyAfeT4PQlHUNOiVT4sPgOdxoAIIymxU="; }; + postPatch = '' + substituteInPlace pyproject.toml --replace \ + " --cov --cov-report term --cov-report html" "" + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ aiohttp - holidays - tzdata async-timeout ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-timeout pytestCheckHook + python-dotenv ]; - disabledTests = [ - # Failures seem related to changes in holidays-0.13, https://github.com/azogue/aiopvpc/issues/44 - "test_number_of_national_holidays" - ]; - - postPatch = '' - substituteInPlace pyproject.toml --replace \ - " --cov --cov-report term --cov-report html" "" - ''; - pythonImportsCheck = [ "aiopvpc" ]; @@ -63,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to download Spanish electricity hourly prices (PVPC)"; homepage = "https://github.com/azogue/aiopvpc"; + changelog = "https://github.com/azogue/aiopvpc/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiopyarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiopyarr/default.nix index 139f947fa1..c728da8b55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiopyarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiopyarr/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { orjson ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioquic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioquic/default.nix index 7b6c8890f8..1b8dbb995e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioquic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioquic/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { buildInputs = [ openssl ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "aioquic" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix index 71a2f8d6f1..7da03f051f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorecollect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses freezegun pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix index 2828703982..a5936a6a9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ asynctest ddt pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix index b63c59728c..47d66af0b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioridwell/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { titlecase ]; - checkInputs = [ + nativeCheckInputs = [ aresponses freezegun pytest-aiohttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix index 538f02c3b2..1d55a3381c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytestCheckHook ]; 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 d40c8de96a..82c6df7413 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook uvloop ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioruuvigateway/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioruuvigateway/default.nix new file mode 100644 index 0000000000..36f08874e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioruuvigateway/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, bluetooth-data-tools +, httpx +, pytest-asyncio +, pytest-httpx +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aioruuvigateway"; + version = "0.0.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "akx"; + repo = "aioruuvigateway"; + rev = "refs/tags/v${version}"; + hash = "sha256-oT5Tlmi9bevOkcVZqg/xvCckIpN7TjbPVQefo9z1RDM="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + bluetooth-data-tools + httpx + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-httpx + pytestCheckHook + ]; + + meta = with lib; { + description = "An asyncio-native library for requesting data from a Ruuvi Gateway"; + homepage = "https://github.com/akx/aioruuvigateway"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} + + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix index 9ee21f2a7c..cffaed5655 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-g/Eth99LlyiguP2hdWWFqw1lKxB7q1nGCE4bGtaSq0U="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix index 511b1c5f84..01be603f21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "5.2.1"; + version = "5.3.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rz8r+FieBQAZKxZR741CffuEyGcLe6ghdEKFGfeD6vg="; + hash = "sha256-a8zU3xHnYRmoiNiXlCUgrqgVINbhUWkPKGGsHkgHo4w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioshutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioshutil/default.nix index fab58b9d9c..6a68e3e21c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioshutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioshutil/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix index b7a3bc9d9d..2b3addc359 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosignal/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { frozenlist ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioskybell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioskybell/default.nix index 0f3e8c041e..30f5740fbe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioskybell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioskybell/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { aiofiles ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix index 7d5dfa0ba5..59dca9a346 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioslimproto/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-Er7UsJDBDXD8CQSkUIOeO78HQaCsrRycU18LOjBpv/w="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix index b283267fae..8f16230b2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosmtpd/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosmtplib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosmtplib/default.nix index 44873b0844..7bce233a89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosmtplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosmtplib/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ aiosmtpd hypothesis pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix new file mode 100644 index 0000000000..104d404a60 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosomecomfort/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, prettytable +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aiosomecomfort"; + version = "0.0.3"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mkmer"; + repo = "AIOSomecomfort"; + rev = "refs/tags/${version}"; + hash = "sha256-Qw0KR934GS7AuT3nRYaunypt091fZLRioVbNOp9JesY="; + }; + + postPatch = '' + # https://github.com/mkmer/AIOSomecomfort/issues/1 + mv aiosomecomfort AIOSomecomfort + ''; + + propagatedBuildInputs = [ + aiohttp + prettytable + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + # SyntaxError in test.py + doCheck = false; + + meta = { + description = "AsyicIO client for US models of Honeywell Thermostats"; + homepage = "https://github.com/mkmer/AIOSomecomfort"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix index eb85dccf50..02f0a42585 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ aiounittest pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix index 7b7ff75614..27588320fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-WOtscg02Dq5YNSAfq4pIyH3oUP/5G+cjBwKB6c+SUVA="; }; - checkInputs = [ pytestCheckHook pytest-cov pytest-asyncio ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov pytest-asyncio ]; meta = with lib; { description = "Generator-based operators for asynchronous iteration"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix index 4106049be0..0bd275f294 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { export TZ=Asia/Jerusalem ''; - checkInputs = [ + nativeCheckInputs = [ assertpy pytest-asyncio pytest-mockservers diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix index cefdf75a28..73c512cb65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses expects pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix index 96a8ab9d8e..82fbb5a40a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "43"; + version = "44"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qpFQdNlw6voqccoJwPsnmbU5DtAC6zwtouUeysZ8/0M="; + hash = "sha256-SRI7c0cmrNSTOEyRbs6JGEg5O9tws+Dwn0G8HUqWEqc="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { orjson ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-aiohttp pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix index d2f9ad9169..bdbdbb41c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ + nativeCheckInputs = [ nose coverage ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiovlc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiovlc/default.nix index bb15b10aa7..64ece4bed8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiovlc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiovlc/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-timeout pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix index 42ede58440..54279db457 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-aiohttp pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioweenect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioweenect/default.nix index 8b63e0ef71..a55c1ad650 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioweenect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioweenect/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/airly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/airly/default.nix index 40cb085a17..95c7aba8e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/airly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/airly/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses aiounittest pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix index 2dc6dcd538..6351fea9bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/airthings-ble/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "airthings-ble"; - version = "0.5.4"; + version = "0.5.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vincegio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eN0JSbzsB/KOkPTbjmc0X5IWf2yg004fNqGhdC2siFQ="; + hash = "sha256-A1YsYOquDUDGeEI4xzQSjEk1H92Jjlhsb5IPRt0lM2c="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/airtouch4pyapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/airtouch4pyapi/default.nix index 1c567181f9..de19c59653 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/airtouch4pyapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/airtouch4pyapi/default.nix @@ -1,14 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , numpy , pythonOlder }: buildPythonPackage rec { pname = "airtouch4pyapi"; - version = "1.0.5"; + version = "1.0.8"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,19 +15,10 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "LonePurpleWolf"; repo = pname; - # https://github.com/LonePurpleWolf/airtouch4pyapi/issues/5 - rev = "34783888846783c058fe79cec16feda45504f701"; - sha256 = "17c7fm72p085pg9msvsfdggbskvm12a6jlb5bw1cndrqsqcrxywx"; + rev = "refs/tags/v${version}"; + hash = "sha256-RiRwebumidn0nijL/e9J74ZYx0DASi1up5BTNxYoGEA="; }; - patches = [ - # https://github.com/LonePurpleWolf/airtouch4pyapi/pull/10 - (fetchpatch { - url = "https://github.com/LonePurpleWolf/airtouch4pyapi/commit/5b5d91fad63495c83422e7a850897946ac95b25d.patch"; - hash = "sha256-tVlCLXuOJSqjbs0jj0iHCIXWZE8wmMV3ChzmE6uq3SM="; - }) - ]; - propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ajsonrpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ajsonrpc/default.nix index b3482cd746..0dd07c0f4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ajsonrpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ajsonrpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "791bac18f0bf0dee109194644f151cf8b7ff529c4b8d6239ac48104a3251a19f"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ajsonrpc" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aladdin-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aladdin-connect/default.nix index ca6c6cca96..3ca8016cd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aladdin-connect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aladdin-connect/default.nix @@ -2,17 +2,21 @@ , requests , buildPythonPackage , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "aladdin-connect"; version = "0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "shoejosh"; repo = pname; - rev = version; - sha256 = "sha256-kLvMpSGa5WyDOH3ejAJyFGsB9IiMXp+nvVxM/ZkxyFw="; + rev = "refs/tags/${version}"; + hash = "sha256-kLvMpSGa5WyDOH3ejAJyFGsB9IiMXp+nvVxM/ZkxyFw="; }; propagatedBuildInputs = [ @@ -22,11 +26,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "aladdin_connect" ]; + pythonImportsCheck = [ + "aladdin_connect" + ]; meta = with lib; { description = "Python library for interacting with Genie Aladdin Connect devices"; homepage = "https://github.com/shoejosh/aladdin-connect"; + changelog = "https://github.com/shoejosh/aladdin-connect/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix index 23b4173f8d..f06fc819bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alarmdecoder/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pyusb ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ale-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ale-py/default.nix index 5a2893349e..3a256e6746 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ale-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ale-py/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook gym ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix index 3b13476f31..a759dc226f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { "alembic" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/algebraic-data-types/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/algebraic-data-types/default.nix index 7c4f9a4f60..9c19470fbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/algebraic-data-types/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/algebraic-data-types/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-RHLI5rmFxklzG9dyYgYfSS/srCjcxNpzNcK/RPNJBPE="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis mypy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix index 9ea861aa68..6d0a9d5eb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-cdn"; - version = "3.8.0"; + version = "3.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UOakkvWyWT50lVazEivF5TtAR/E3JpKdT6KNb7YJDBs="; + hash = "sha256-bcAaFwAS9xAbCLtqYtSiALHtlGklHFgGXpgiZZpR6no="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix index bd693ead16..0635b941c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-dbfs"; - version = "2.0.5"; + version = "2.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WQyYgjEe2oxNXBcHMhFXJ++XlIWf/rtJylvb6exwg7k="; + hash = "sha256-R3ov7EssN9kcf8SA8juPu9+TEptzo9Vkb8YwzwFlMQ4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix index 9e1aac84f3..b029296fd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allpairspy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix index 3df8d19dee..d19805366f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/allure-pytest/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pyhamcrest mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alpha-vantage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alpha-vantage/default.nix index 7a67f9d6b0..23ffd7d8b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alpha-vantage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alpha-vantage/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses requests-mock pandas diff --git a/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix index e4bec8fafa..63ee77d221 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/altair/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "altair"; - version = "4.2.0"; + version = "4.2.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d87d9372e63b48cd96b2a6415f0cf9457f50162ab79dc7a31cd7e024dd840026"; + sha256 = "sha256-OTmaJnxJsw0QLBBBHmerJjdBVqhLGuufzRUUBCm6ScU="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { jinja2 ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales ipython pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix index 5a3f7e449e..3e7aae7f3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amaranth/default.nix @@ -47,6 +47,11 @@ buildPythonPackage rec { url = "https://github.com/amaranth-lang/amaranth/pull/722/commits/e5a56b07c568e5f4cc2603eefebd14c5cc4e13d8.patch"; hash = "sha256-C8FyMSKHA7XsEMpO9eYNZx/X5rGaK7p3eXP+jSb6wVg="; }) + (fetchpatch { + name = "add-python-3.11-support.patch"; + url = "https://github.com/amaranth-lang/amaranth/commit/851546bf2d16db62663d7002bece51f07078d0a5.patch"; + hash = "sha256-eetlFCLqmpCfTKViD16OScJbkql1yhdi5uJGnfnpcCE="; + }) ]; SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"; @@ -64,7 +69,7 @@ buildPythonPackage rec { lib.optional (pythonOlder "3.9") importlib-resources ++ lib.optional (pythonOlder "3.8") importlib-metadata; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook symbiyosys yices diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amarna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amarna/default.nix index fb6ef78738..778a585a69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amarna/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amarna/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pydot ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amazon-ion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amazon-ion/default.nix index 365e4cc14a..21db575097 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amazon-ion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amazon-ion/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix index 06f6198156..7394606965 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mock boto ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' ${python.interpreter} -m pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ambee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ambee/default.nix index 2032547179..ccc05d2ab3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ambee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ambee/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amberelectric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amberelectric/default.nix index 667e5fff5e..ae02eaec0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amberelectric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amberelectric/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amcrest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amcrest/default.nix index dcdf918344..30808ee3f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amcrest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amcrest/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amply/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amply/default.nix index 5a26e34195..2298b57cb1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amply/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amply/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { docutils pyparsing ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "amply" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix index ec4dd4dfcb..bd834b9e14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amqp/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { vine ]; - checkInputs = [ + nativeCheckInputs = [ case pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix index 6f4a5007e7..9da8d6f204 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest-logdog pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix index 5584f2bd67..ee808f973b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { pyperclip ]; - checkInputs = [ + nativeCheckInputs = [ codecov coverage mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix index 73a2c92c75..856869445d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/androidtv/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { inherit (adb-shell.optional-dependencies) usb; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ] 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 64da0be72e..4abcad0e7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.34"; + version = "9.2.36"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-Ar74eYEUinHmAosec7r5C9Rg6iqYl2uLZo87UdOquJY="; + hash = "sha256-KVIrhzd3EoDIVImshfjZrBAiNkCtlFAd6Ox9ATsvPTY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angrcli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angrcli/default.nix index 2f5ecae9db..a43b39a4e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angrcli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angrcli/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ coreutils pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix index 62db58d611..b78ff31f82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aniso8601/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.optional (!isPy3k) mock; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/annexremote/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/annexremote/default.nix index c9ed6bd90e..c38a32c81d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/annexremote/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/annexremote/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "08myswj1vqkl4s1glykq6xn76a070nv5mxj0z8ibl6axz89bvypi"; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/annoy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/annoy/default.nix index 97841a6a62..da4becc24f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/annoy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/annoy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { h5py ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anonip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anonip/default.nix index 96115aaee4..264acc7813 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anonip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anonip/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0cssdcridadjzichz1vv1ng7jwphqkn8ihh83hpz9mcjmxyb94qc"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansi/default.nix index e2e4e7c93f..287bf13a5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix index 6489832c43..a1aceb5372 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six setuptools ]; preCheck = "export PATH=$PATH:$out/bin"; - checkInputs = [ mock pytestCheckHook ]; + nativeCheckInputs = [ mock pytestCheckHook ]; pythonImportsCheck = [ "ansi2html" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix index e1d69c6f9f..6eeb158a6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { export PATH=$PATH:$out/bin ''; - checkInputs = [ + nativeCheckInputs = [ ansible-core flaky pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-later/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-later/default.nix index ace3d711b9..37a97121b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-later/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-later/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { yamllint ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix index a4bf438f5a..12c353d105 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "ansible-lint"; - version = "6.10.2"; + version = "6.11.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-4ihEmsLxDRwW3zXEdpKCtSmsH+K1B2czP60chaYt9nE="; + hash = "sha256-NIrDVsOBem25j7aZPsF7WyNsFjEiOHWfCj8U81Q6nlA="; }; postPatch = '' @@ -60,7 +60,7 @@ buildPythonPackage rec { # tests can't be easily run without installing things from ansible-galaxy doCheck = false; - checkInputs = [ + nativeCheckInputs = [ flaky pytest-xdist pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix index 44e5a519a7..dd136f0d7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ ansible-core # required to place ansible CLI onto the PATH in tests glibcLocales pytestCheckHook 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 b4d09d38f8..8f8e98ca64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.14.0"; + version = "2.14.2"; src = fetchPypi { inherit pname version; - hash = "sha256-+ki0gctiO/ebuQPyIwl2gaDBPhtOx+eOfdfYWNNqNLI="; + hash = "sha256-R/DUtBJbWO26ZDWkfzfL5qGNpUWU0Y+BKVi7DLWNTmU="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansicolors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansicolors/default.nix index fab91690ab..3f2d549694 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansicolors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansicolors/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "99f94f5e3348a0bcd43c82e5fc4414013ccc19d70bd939ad71e0133ce9c372e0"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix index ba0c06f536..b0676258e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansiconv/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0ljfpl8x069arzginvpi1v6hlaq4x2qpjqj01qds2ylz33scq8r4"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "A module for converting ANSI coded text and converts it to either plain text or HTML"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansimarkup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansimarkup/default.nix index b74c7e3217..9de4e19d47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansimarkup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansimarkup/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ colorama ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ansimarkup" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix index 1d0aef1ee5..3dc3a8df13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix @@ -1,16 +1,18 @@ { lib , ansicolors , buildPythonPackage -, coverage , fetchPypi -, pytest-cov , pytestCheckHook +, pythonOlder , textwrap3 }: buildPythonPackage rec { pname = "ansiwrap"; version = "0.8.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -18,21 +20,31 @@ buildPythonPackage rec { sha256 = "ca0c740734cde59bf919f8ff2c386f74f9a369818cdc60efe94893d01ea8d9b7"; }; + postPatch = '' + # https://github.com/jonathaneunice/ansiwrap/issues/18 + substituteInPlace test/test_ansiwrap.py \ + --replace "set(range(20, 120)).difference(LINE_LENGTHS)" "sorted(set(range(20, 120)).difference(LINE_LENGTHS))" \ + --replace "set(range(120, 400)).difference(LINE_LENGTHS)" "sorted(set(range(120, 400)).difference(LINE_LENGTHS))" + ''; + checkInputs = [ ansicolors - coverage - pytest-cov pytestCheckHook ]; - propagatedBuildInputs = [ textwrap3 ]; + propagatedBuildInputs = [ + textwrap3 + ]; - pythonImportsCheck = [ "ansiwrap" ]; + pythonImportsCheck = [ + "ansiwrap" + ]; meta = with lib; { description = "Textwrap, but savvy to ANSI colors and styles"; homepage = "https://github.com/jonathaneunice/ansiwrap"; + changelog = "https://github.com/jonathaneunice/ansiwrap/blob/master/CHANGES.yml"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anyascii/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anyascii/default.nix index b34a711f6a..4af2a68ccb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anyascii/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anyascii/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-3t9XcoIG4obJHu18dZUFpeRcjNATZ91Awvcki7FcEfY="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anybadge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anybadge/default.nix index 3fc3ae316e..0418de37a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anybadge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anybadge/default.nix @@ -1,7 +1,10 @@ { lib -, fetchFromGitHub , buildPythonPackage +, fetchFromGitHub +, packaging , pytestCheckHook +, pythonOlder +, requests }: buildPythonPackage rec { @@ -9,18 +12,35 @@ buildPythonPackage rec { version = "1.14.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "jongracecox"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-+CkkFCShCYtxKiCWRQcgTFcekc/g7ujQj9MdnG1+a0A="; + hash = "sha256-+CkkFCShCYtxKiCWRQcgTFcekc/g7ujQj9MdnG1+a0A="; }; # setup.py reads its version from the TRAVIS_TAG environment variable TRAVIS_TAG = "v${version}"; - checkInputs = [ + propagatedBuildInputs = [ + packaging + ]; + + nativeCheckInputs = [ pytestCheckHook + requests + ]; + + disabledTests = [ + # Comparison of CLI output fails + "test_module_same_output_as_main_cli" + ]; + + disabledTestPaths = [ + # No anybadge-server + "tests/test_server.py" ]; pythonImportsCheck = [ @@ -30,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool for generating badges for your projects"; homepage = "https://github.com/jongracecox/anybadge"; + changelog = "https://github.com/jongracecox/anybadge/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fabiangd ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anyconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anyconfig/default.nix index 17794d5c8c..0b6d0280d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anyconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anyconfig/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix index 927956a49f..83b5d27655 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anyio/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { # trustme uses pyopenssl doCheck = !(stdenv.isDarwin && stdenv.isAarch64); - checkInputs = [ + nativeCheckInputs = [ curio hypothesis pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anytree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anytree/default.nix index fa92bc4489..d49b223496 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anytree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anytree/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { # circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree doCheck = withGraphviz; - checkInputs = [ pytestCheckHook nose ]; + nativeCheckInputs = [ pytestCheckHook nose ]; pytestFlagsArray = lib.optionals (pythonOlder "3.4") [ # Use enums, which aren't available pre-python3.4 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aocd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aocd/default.nix index 00c8450ba0..b58c31ea73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aocd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aocd/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { "test_load_input_from_file" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock pytest-freezegun diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix index 496e5f9f71..49cb938005 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix @@ -210,7 +210,7 @@ buildPythonPackage rec { airflow-frontend ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix index f9da719794..08d69424e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix @@ -121,7 +121,7 @@ buildPythonPackage rec { "apache_beam" ]; - checkInputs = [ + nativeCheckInputs = [ freezegun mock pandas diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apcaccess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apcaccess/default.nix index 4b1401d61e..75cde6f4bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apcaccess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apcaccess/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { "apcaccess" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix index 3179f9be6f..efea1e3302 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { hatchling ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix index b204e97af2..1a85922e5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { prance ]; - checkInputs = [ + nativeCheckInputs = [ openapi-spec-validator marshmallow mock @@ -39,6 +39,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/marshmallow-code/apispec/blob/${version}/CHANGELOG.rst"; description = "A pluggable API specification generator with support for the OpenAPI Specification"; homepage = "https://github.com/marshmallow-code/apispec"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aplpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aplpy/default.nix index 47a1de3c0d..6254a902ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aplpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aplpy/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { shapely ]; - checkInputs = [ + nativeCheckInputs = [ pytest-astropy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix index 7358573dc0..671f4714ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ babel gntp paho-mqtt diff --git a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix index 3ad36749e0..e9df0a2248 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ numpy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 47ec470dfd..3fbd115edd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "4.3.0"; + version = "4.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-1WBaNTARe0ULWHf0g/6Jljo1yCffnJAS9ycbhGqzOUk="; + hash = "sha256-HZHHSY8a7xyJZAQLFeZ+5+CKixcquJcUkkjJTllFiyk="; }; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { tabulate ] ++ httpx.optional-dependencies.http2; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix index c2c14fba37..d7b2db71c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ tables pandas pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aprslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aprslib/default.nix index 789b506e7f..ce73dadd8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aprslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aprslib/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ + nativeCheckInputs = [ mox3 pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix index 4347fd925d..894a30c7c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apycula/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "apycula"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Apycula"; - hash = "sha256-/XQ/Q4/LzCBDaTindbBENOh5OSIH2JPLyiYFWT9DcP4="; + hash = "sha256-WnxH/AKi7j2u1SWVtyggUD09OqXfOST1Ayr9DrbYMcQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aqipy-atmotech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aqipy-atmotech/default.nix index fdecad826c..a9b82ca6ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aqipy-atmotech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aqipy-atmotech/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-tqHhfJmtVFUSO57Cid9y3LK4pOoG7ROtwDT2hY5IE1Y="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix index 255248e8d9..a1b302dd9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aqualogic/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arabic-reshaper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arabic-reshaper/default.nix index d92f549b35..f9c82cd0a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arabic-reshaper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arabic-reshaper/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aranet4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aranet4/default.nix index 09781342b2..6ea81a8347 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aranet4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aranet4/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arc4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arc4/default.nix index 9621877003..17f3a0f54f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arc4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arc4/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-z8zj46/xX/gXtWzlmnHuAsnK3xYCL4NM5/xpYcH+Qlo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 961e5fd130..c441265377 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 = "1.0.1"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "arcam_fmj"; rev = "refs/tags/${version}"; - hash = "sha256-Lmz701qdqFlXro279AdNx+P1o3Q/Om63jKvy854ogto="; + hash = "sha256-oXMoDpb4tg4iYAanTfPzeFp/IQl4bIELCTdM24hM84A="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { defusedxml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytest-mock pytestCheckHook 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 edb5b10c7c..22a460cc27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.34"; + version = "9.2.36"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,14 +17,14 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-RsIknVuhDzPbVJudjilNnMjBTH6cxPROQEXxRiAbDEs="; + hash = "sha256-anZsvDIH1AWaFUG5UTuyQiOKeoUB/+MSbu5pjPZJxag="; }; nativeBuildInputs = [ setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archspec/default.nix index 54c5d323ca..85772c41cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archspec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archspec/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook jsonschema ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix index 7bb54f33d5..06c7b1a9da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pytest-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix index 0aa3e8c1b9..5bf20d82b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argcomplete/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; # meant to be ran with interactive interpreter # re-enable if we are able to make testing work - # checkInputs = [ bashInteractive coverage flake8 ]; + # nativeCheckInputs = [ bashInteractive coverage flake8 ]; propagatedBuildInputs = [ dicttoxml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix index fd9ff18400..bdc2a078a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argh/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ + nativeCheckInputs = [ iocapture mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi/default.nix index ed79243a6b..24e3252668 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ARGON2_CFFI_USE_SSE2 = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) "0"; - checkInputs = [ hypothesis pytest wheel ]; + nativeCheckInputs = [ hypothesis pytest wheel ]; checkPhase = '' pytest tests ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aria2p/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aria2p/default.nix index 2663f0c9d5..e505ac015b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aria2p/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aria2p/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ + nativeCheckInputs = [ aria2 fastapi pytest-xdist diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ariadne/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ariadne/default.nix index 008527ef91..d88b199600 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ariadne/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ariadne/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ freezegun opentracing pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arnparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arnparse/default.nix index c2bd8bfa47..96f2fb3f6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arnparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arnparse/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-2+wxzYoS/KJXjYM6lZguxbr2Oxobo0eFNnzWZHLi0WM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix index d3d3207852..7add80472c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arpeggio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { --replace "pytest-runner" "" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "arpeggio" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arris-tg2492lg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arris-tg2492lg/default.nix index 9a883b2f68..9f6d8f6db1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arris-tg2492lg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arris-tg2492lg/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix index ff626a5b48..71ce479f2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-dateutil ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock pytz diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arviz/default.nix index e8d1582c44..12b09b3bfc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arviz/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { xarray-einstats ]; - checkInputs = [ + nativeCheckInputs = [ cloudpickle emcee ffmpeg diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arxiv2bib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arxiv2bib/default.nix index 54a6280017..bcffe0c3bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arxiv2bib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arxiv2bib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1kp2iyx20lpc9dv4qg5fgwf83a1wx6f7hj1ldqyncg0kn9xcrhbg"; }; - checkInputs = [ unittestCheckHook mock ]; + nativeCheckInputs = [ unittestCheckHook mock ]; unittestFlagsArray = [ "-s" "tests" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix index acb82fa8d6..5f27e8c131 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix index 3854abed09..ea6c513e18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asciimatics/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ + nativeCheckInputs = [ mock nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asciitree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asciitree/default.nix index 814cf1a3d4..9e0ac79eef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asciitree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asciitree/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "071wlpyi8pa262sj9xdy0zbj163z84dasxad363z3sfndqxw78h1"; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix index e12f3702a9..4ce55b4d48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ astropy lz4 pytest-astropy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix index d7b15f939b..b0d2b1f723 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { wktutils ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix index a11d1c7030..506fbc46f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asgi-csrf/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { python-multipart ]; - checkInputs = [ + nativeCheckInputs = [ httpx pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asgineer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asgineer/default.nix index 3a1861bbd1..2559cda2a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asgineer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asgineer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0hd1i9pc8m7sc8bkn31q4ygkmnl5vklrcziq9zkdiqaqm8clyhcx"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix index 4ccbe3175c..72d9a97073 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asks/default.nix index c67841c034..088e946c93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asks/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { h11 ]; - checkInputs = [ + nativeCheckInputs = [ curio overly pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asn1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asn1/default.nix index 0d950092f9..4e62df50af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asn1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asn1/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix index 0c071c4206..8e649ed7cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asn1crypto/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-M8vASxhaJPgkiTrAckxz7gk/QHkrFlNz7fFbnLEBT+M="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix index 7c5c113dbd..49cf9e21a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { aspell ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aspy-refactor-imports/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aspy-refactor-imports/default.nix index a19002449d..8eff00db43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aspy-refactor-imports/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aspy-refactor-imports/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { "aspy.refactor_imports" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/assertpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/assertpy/default.nix index 5280808fb3..1800a14d50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/assertpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/assertpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0hnfh45cmqyp7zasrllwf8gbq3mazqlhhk0sq1iqlh6fig0yfq2f"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix index bb1f7a7c5c..ed434bcb6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asteval/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astor/default.nix index fec7e2aa3b..f69afaf552 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astor/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astral/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astral/default.nix index 62d3cc94cb..40f66dc26a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astral/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astral/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { backports-zoneinfo ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix index 313c3d5de9..21b4948fb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { typed-ast ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astropy-extension-helpers/default.nix index cb15acf883..08a5139e59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astropy-extension-helpers/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { patches = [ ./permissions.patch ]; - checkInputs = [ + nativeCheckInputs = [ findutils pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix index a690e45f0b..2eb0e4986f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astropy-healpix/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { astropy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-doctestplus hypothesis diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix index 4dfcde70c5..418b9e1cb1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astroquery/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace "auto_use = True" "auto_use = False" ''; - checkInputs = [ + nativeCheckInputs = [ matplotlib pillow pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix index 51e8805465..89c959293d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asttokens/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ astroid pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-lru/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-lru/default.nix index b656b19478..73ccaa62c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async-lru/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-lru/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sed -i -e '/^addopts/d' -e '/^filterwarnings/,+2d' setup.cfg ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-modbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-modbus/default.nix index afeb78d413..05d9267443 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async-modbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-modbus/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { umodbus ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; 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 5299ad46e5..112bd15d2a 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 @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.33.0"; + version = "0.33.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-I7C2ho+pmowerJFK82wYcqEOhRV3KZ5j5IBVCKjhllM="; + hash = "sha256-gXDuStgCBH6YW3SsAjEvQq7l+Vf8+Z8sle1TnLRtNwo="; }; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async_generator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async_generator/default.nix index 277616849e..e80fd914c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async_generator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async_generator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async_stagger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async_stagger/default.nix index 3dafd2b219..eb403ff71a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async_stagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async_stagger/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1mj3daaqxjdavbxcjrdwx5ky9maa2blbv53aa6d7w9zxkrz3b7xa"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncclick/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncclick/default.nix index 3d16f7bfa4..716dd2ffca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncclick/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncclick/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { anyio ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook trio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix index a01e9389f4..baf4702126 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-throttle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-throttle/default.nix index 38f3389aa6..052cfc01f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncio-throttle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncio-throttle/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1hsjcymdcm0hf4l68scf9n8j7ba89azgh96xhxrnyvwxfs5acnmv"; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix index 05225ef6ec..448ec3eca2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ anyio pytestCheckHook ]; @@ -49,17 +49,17 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access "test_client_filtered_messages" - "test_client_unfiltered_messages" - "test_client_unsubscribe" - "test_client_will" - "test_client_tls_context" - "test_client_tls_params" - "test_client_username_password " "test_client_logger" "test_client_max_concurrent_outgoing_calls" - "test_client_websockets" - "test_client_pending_calls_threshold" "test_client_no_pending_calls_warnings_with_max_concurrent_outgoing_calls" + "test_client_pending_calls_threshold" + "test_client_tls_context" + "test_client_tls_params" + "test_client_unfiltered_messages" + "test_client_unsubscribe" + "test_client_username_password " + "test_client_websockets" + "test_client_will" "test_multiple_messages_generators" ]; @@ -67,7 +67,7 @@ buildPythonPackage rec { description = "Idomatic asyncio wrapper around paho-mqtt"; homepage = "https://github.com/sbtinstruments/asyncio-mqtt"; license = licenses.bsd3; - changelog = "https://github.com/sbtinstruments/asyncio-mqtt/blob/master/CHANGELOG.md"; + changelog = "https://github.com/sbtinstruments/asyncio-mqtt/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ hexa ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncmy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncmy/default.nix index b81c4d2c69..7e3129b726 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncmy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncmy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncmy"; - version = "0.2.5"; + version = "0.2.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "long2ice"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-yLAse8p+2RYHJmDwD5vrHlf29URB+kdupjD1DwTcRAc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-UWwqQ0ZYGoOsgRC7ROV9DDBQ/l/vXWB6uHpQ/WaFRAw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix index b9e6b051fd..f996182f84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { # sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495 doCheck = postgresql.doCheck; - checkInputs = [ + nativeCheckInputs = [ uvloop postgresql ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix index e54210dfc6..4165db53b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ openssh openssl pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix index 6a9d911f66..608af2ac90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix index f474a8f6a5..253640b50b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncua/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { "asyncua" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix index 4e91aafde6..3ec2635af7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { whodap ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atc-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atc-ble/default.nix index fd4aad6d40..947f5db4b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atc-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atc-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix index fae7f65670..2c9c653dd1 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.32.0"; + version = "3.32.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Jh3JdrA/ahge/tJipeMGag2CUk4uuGzMXC9I7UWha9E="; + sha256 = "sha256-fI+c2JiChDZhZPdoy3PaRtUwgWMRJnZieHcF4OR6nZE="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix index 3b5b212b7e..c1fce70c7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { rm -rf atom ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites-homeassistant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites-homeassistant/default.nix index d905e590af..b340c0f9e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites-homeassistant/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites-homeassistant/default.nix @@ -22,7 +22,7 @@ buildPythonPackage { "atomicwrites" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix index dbf094d54b..7aa6d889ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { # Tests depend on pytest but atomicwrites is a dependency of pytest doCheck = false; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "Atomic file writes on POSIX"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix index f7255f5483..1b71b66a63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { rm -r atomman ''; - checkInputs = [ + nativeCheckInputs = [ ase phonopy pymatgen diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix index 286b79bcb6..952892f78f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atpublic/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook sybil ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix index 9b6f9cf26a..71423d907d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atsim_potentials/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ + nativeCheckInputs = [ deepdiff pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/attrdict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/attrdict/default.nix index 3a9834ec86..4054fbd78b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/attrdict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/attrdict/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ coverage nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/attrs/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/attrs/tests.nix index fddf467665..2614716d71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/attrs/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/attrs/tests.nix @@ -14,7 +14,7 @@ buildPythonPackage { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ attrs hypothesis pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix index ad78b6c63f..9b8eccabb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix index fc3adf2534..d1d6de0bcb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/audio-metadata/default.nix @@ -1,25 +1,50 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib , attrs , bidict , bitstruct +, buildPythonPackage +, fetchFromGitHub +, fetchpatch , more-itertools +, poetry-core , pprintpp +, pythonOlder +, pythonRelaxDepsHook , tbm-utils }: buildPythonPackage rec { pname = "audio-metadata"; version = "0.11.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "9e7ba79d49cf048a911d5f7d55bb2715c10be5c127fe5db0987c5fe1aa7335eb"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "thebigmunch"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-5ZX4HwbuB9ZmFfHuxaMCrn3R7/znuDsoyqqLql2Nizg="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'attrs>=18.2,<19.4'" "'attrs'" - ''; + patches = [ + # Switch to poetry-core, https://github.com/thebigmunch/audio-metadata/pull/41 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/thebigmunch/audio-metadata/commit/dfe91a69ee37e9dcefb692165eb0f9cd36a7e5b8.patch"; + hash = "sha256-ut3mqgZQu0YFbsTEA13Ch0+aSNl17ndMV0fuIu3n5tc="; + }) + ]; + + pythonRelaxDeps = [ + "attrs" + "more-itertools" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ attrs @@ -30,12 +55,17 @@ buildPythonPackage rec { tbm-utils ]; - # No tests + # Tests require ward which is not ready to be used doCheck = false; + pythonImportsCheck = [ + "audio_metadata" + ]; + meta = with lib; { homepage = "https://github.com/thebigmunch/audio-metadata"; description = "A library for reading and, in the future, writing metadata from audio files"; + changelog = "https://github.com/thebigmunch/audio-metadata/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix index d008498117..74b03a413c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utilities and Python modules for handling audio"; - homepage = "http://audiotools.sourceforge.net/"; + homepage = "https://audiotools.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix index cda3ff5fbc..48eb38cad3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/augmax/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { # augmax does not have any tests at the time of writing (2022-02-19), but # jaxlib is necessary for the pythonImportsCheckPhase. - checkInputs = [ jaxlib ]; + nativeCheckInputs = [ jaxlib ]; pythonImportsCheck = [ "augmax" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aurorapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aurorapy/default.nix index 8bbce350ad..6ee2be80d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aurorapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aurorapy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyserial ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autarco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autarco/default.nix index 82e69fc210..37625fdb1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autarco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autarco/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix index df5af6ef91..3486e78711 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ] ++ pyjwt.optional-dependencies.crypto; - checkInputs = [ + nativeCheckInputs = [ aiohttp aioresponses callee diff --git a/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix index 63bc42c5c4..fde3d34880 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix index 8dd16f3260..eb65881afb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ cachelib flask flask-sqlalchemy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix index 11bcb603f9..9a464955aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { txaio ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix index 0c8dfc5403..7e4893e98a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # fails with: SyntaxError: invalid syntax doCheck = false; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "autocommand" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autofaiss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autofaiss/default.nix index 6b8e29a98e..46f360cfef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autofaiss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autofaiss/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { pyarrow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autoflake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autoflake/default.nix index 2eebefa5c1..2280c33f80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autoflake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autoflake/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pyflakes ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix index ba055025d6..5abb1a384d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix @@ -27,7 +27,7 @@ let automat = buildPythonPackage rec { attrs ]; - checkInputs = [ + nativeCheckInputs = [ pytest-benchmark pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/automate-home/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/automate-home/default.nix index bd2816f6d3..c51283f4b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/automate-home/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/automate-home/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix index cc0423397d..f22d92d7bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autopep8/default.nix @@ -1,17 +1,20 @@ { lib +, buildPythonPackage , fetchFromGitHub , fetchpatch -, buildPythonPackage -, pythonOlder -, pycodestyle , glibcLocales -, tomli +, pycodestyle , pytestCheckHook +, pythonOlder +, tomli }: buildPythonPackage rec { pname = "autopep8"; version = "2.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hhatto"; @@ -20,13 +23,22 @@ buildPythonPackage rec { hash = "sha256-YEPSsUzJG4MPiiloVAf9m/UiChkhkN0+lK6spycpSvo="; }; + patches = [ + # Ignore DeprecationWarnings to fix tests on Python 3.11, https://github.com/hhatto/autopep8/pull/665 + (fetchpatch { + name = "ignore-deprecation-warnings.patch"; + url = "https://github.com/hhatto/autopep8/commit/75b444d7cf510307ef67dc2b757d384b8a241348.patch"; + hash = "sha256-5hcJ2yAuscvGyI7zyo4Cl3NEFG/fZItQ8URstxhzwzE="; + }) + ]; + propagatedBuildInputs = [ pycodestyle ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix index 3457d2d37b..91b50e798c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { rm -r av ''; - checkInputs = [ + nativeCheckInputs = [ numpy pillow pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix index fd24227e03..81ea5127ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix index 884dcd4bc6..2ddccf85f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awesome-slugify/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ unidecode regex ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { homepage = "https://github.com/dimka665/awesome-slugify"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix index d4c9082ced..3f842173bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix index 5ef4f69597..a577e6c8a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook numba ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix index 7f79f99e3a..85a4f6bbe6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-adfs/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { --replace 'botocore = ">=1.12.6"' 'botocore = "*"' ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook toml ]; 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 1b147b1c95..b4daad5c24 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,7 +12,7 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.24.0"; + version = "1.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,14 +21,14 @@ buildPythonPackage rec { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "refs/tags/v${version}"; - hash = "sha256-Qr1E6MNBAKyNr0XbCIP0yJUFRvBpLhTZzTG06tdg31I="; + hash = "sha256-XdWrEJL/u+B15jAzxS7UZBhFBCVfSlnBtUcKcA0iUOw="; }; propagatedBuildInputs = [ six ]; - checkInputs = [ + nativeCheckInputs = [ mock parameterized pyelftools 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 215ce6152e..5a8191f293 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 @@ -43,7 +43,7 @@ buildPythonPackage rec { --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" ''; - checkInputs = [ + nativeCheckInputs = [ mock parameterized pytest-env diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix index 7d6c0457c0..954e3df963 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.16.3"; + version = "0.16.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w39Qt046dWDzbt41t9LVMCJNM2uGOv9VTZf3yfWUlNM="; + hash = "sha256-26JjUlFLyNtm93/UkvEO+eV22ZHI1gxWecf2cuBifgE="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix index bc6bbcd30d..d79b3448f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Test fails with: Assertion error diff --git a/third_party/nixpkgs/pkgs/development/python-modules/axis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/axis/default.nix index b926a1abc2..e09a1fa7d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/axis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/axis/default.nix @@ -1,26 +1,31 @@ { lib +, async-timeout , attrs , buildPythonPackage , fetchFromGitHub , httpx +, orjson , packaging , xmltodict }: buildPythonPackage rec { pname = "axis"; - version = "44"; + version = "46"; + format = "setuptools"; src = fetchFromGitHub { owner = "Kane610"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GC8GiDP/QHU+8swe60VFPRx8kSMMHuXjIPEKCja8HPE="; + hash = "sha256-alhezwRPag+6JoC4zbusWdxFyZQ2dZl04Uj1PkiN4qo="; }; propagatedBuildInputs = [ + async-timeout attrs httpx + orjson packaging xmltodict ]; @@ -32,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for communicating with devices from Axis Communications"; homepage = "https://github.com/Kane610/axis"; + changelog = "https://github.com/Kane610/axis/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index f80ca9f17b..68a0409d9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ aiodns aiohttp flask @@ -78,7 +78,7 @@ buildPythonPackage rec { "tests/testserver_tests/" # requires missing pytest plugin "tests/async_tests/test_rest_asyncio_transport.py" - # needs msrest, which cannot be included in checkInputs due to circular dependency new in msrest 0.7.1 + # needs msrest, which cannot be included in nativeCheckInputs due to circular dependency new in msrest 0.7.1 # azure-core needs msrest which needs azure-core "tests/test_polling.py" "tests/async_tests/test_base_polling_async.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix index e6d36a87c9..6e8dbf6aad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-eventhub/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.10.1"; + version = "5.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-LV+o7dMVCFIQfq9d2wYY34LghIP5FN06zDpUPtkELFQ="; + sha256 = "sha256-Z1tekAHjO2kVe5g/MpB1U9m38pBQ8J03+pDZdJgzcgE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix index 346a8f8a08..25b68bf52a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index d5fe92f320..6334df6637 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "5.0.0"; + version = "5.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-BciA3sFyja5xo9yS3WVglC73y8gTfw8UejdEzbD4HYE="; + hash = "sha256-xl+KbNGceJWFvJKH8Aw02Ho+wMAxvxPZ4T09Qimn7OU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix index 5994f1413d..c5188188c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-lazy-fixture pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/babel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/babel/default.nix index eee9f58cc3..e9f9f7bdfc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/babel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/babel/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz ]; - checkInputs = [ pytestCheckHook freezegun ]; + nativeCheckInputs = [ pytestCheckHook freezegun ]; meta = with lib; { homepage = "https://babel.pocoo.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backcall/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backcall/default.nix index b5a53b6213..acc1899044 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backcall/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backcall/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix index fb71d65d5b..71c39395a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports-cached-property/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-cached-property/default.nix index 7bb8c4e812..a4a9f30719 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports-cached-property/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports-cached-property/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { wheel ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock pytest-sugar diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix index 40014adb90..bfec97496a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-aHF3E/fLN+j/T4W9lvuVSMy6iRSEn+ARWmL01rY+ixs="; }; - checkInputs = [ + nativeCheckInputs = [ pytz unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix index 52163abe8b..95b47bb602 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "fe39f567cbe4fad89e8ac4dbeb23f87ef80f7fe8e829669d0221ecdb0437c133"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix index 5fa4c63231..b7337d8e15 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "backports.zoneinfo" ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 680d23782f..0045a79503 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # Test fail on Python 2 doCheck = isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix index c6e92630e0..aec6077dd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix @@ -22,7 +22,7 @@ if !(pythonOlder "3.3") then null else buildPythonPackage { sha256 = "17sgv8vg0xxfdnca45l1mmwwvj29gich5c8kqznnj51kfccch7sg"; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports_tempfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports_tempfile/default.nix index ef4f64def3..0e0f3ac033 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports_tempfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports_tempfile/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # requires https://pypi.org/project/backports.test.support doCheck = false; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix index a0cbe6d4b8..2a0ef0b432 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backports_weakref/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { }; buildInputs = [ setuptools-scm ]; -# checkInputs = [ backports ]; +# nativeCheckInputs = [ backports ]; # Requires backports package doCheck = false; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix index 40d06f7da8..20c1288ba4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bacpypes/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wheel ]; # Using pytes instead of setuptools check hook allows disabling specific tests - checkInputs = [ pytestCheckHook pytest-runner ]; + nativeCheckInputs = [ pytestCheckHook pytest-runner ]; dontUseSetuptoolsCheck = true; disabledTests = [ # Test fails with a an error: AssertionError: assert 30 == 31 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bagit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bagit/default.nix index 67aed7c186..5f15060c4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bagit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bagit/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/baron/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/baron/default.nix index e5a752dd5d..af8c1a1d36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/baron/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/baron/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ rply ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/base36/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/base36/default.nix index 348422e31f..92b4faf7d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/base36/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/base36/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { --replace "--pep8 --cov" "" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "test_base36.py" ]; pythonImportsCheck = [ "base36" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/base58/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/base58/default.nix index 416eba18de..c08ba1ccf5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/base58/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/base58/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "c5d0cb3f5b6e81e8e35da5754388ddcc6d0d14b6c6a132cb93d69ed580a7278c"; }; - checkInputs = [ + nativeCheckInputs = [ py pyhamcrest pytest-benchmark diff --git a/third_party/nixpkgs/pkgs/development/python-modules/base58check/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/base58check/default.nix index e81eca6e13..7b635abd0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/base58check/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/base58check/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-Tig6beLRDsXC//x4+t/z2BGaJQWzcP0J+QEKx3D0rhs="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/baseline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/baseline/default.nix index 0bee2295ed..947ab4b6c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/baseline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/baseline/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0qjg46ipyfjflvjqzqr5p7iylwwqn2mhhrq952d01vi8wvfds10d"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Easy String Baseline"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/baselines/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/baselines/default.nix index 66972dc8b2..dd51399901 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/baselines/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/baselines/default.nix @@ -51,7 +51,7 @@ buildPythonPackage { # fails to create a daemon, probably because of sandboxing doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bashlex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bashlex/default.nix index f850c5640c..cb02db36ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bashlex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bashlex/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ${python.interpreter} -c 'import bashlex' ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix index 4fda2f331f..9e0c815704 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/batchgenerators/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { --replace '"unittest2",' "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix index 03ac94ad60..3ca0d9f450 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # New sklearn broke one test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix index 4f67537901..d3954e52bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook nose glibcLocales ]; + nativeCheckInputs = [ pytestCheckHook nose glibcLocales ]; propagatedBuildInputs = [ numpy scipy matplotlib h5py ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix index 7da5841f60..9a02610c02 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bc-python-hcl2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-Fb/suuiC6tmY3ZMAc3I3oU5A39jJc+XH3ntMkgQKAQ8="; }; - # Nose is required during build process, so can not use `checkInputs`. + # Nose is required during build process, so can not use `nativeCheckInputs`. buildInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/3.nix index 2f242faac8..fec467f983 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/3.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix index a4848c676a..adde33b70f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beaker/default.nix index 9b692ef92f..58f7515c10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beaker/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pycryptopp ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales python-memcached mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix index 81bc8bc058..eb082f5b95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beancount-black/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beancount-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beancount-parser/default.nix index f437c4f1d9..9af5fcd28f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beancount-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beancount-parser/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { lark ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beancount_docverif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beancount_docverif/default.nix index 761da80b3b..3ca6542f8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beancount_docverif/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beancount_docverif/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { beancount ]; - checkInputs = [ + nativeCheckInputs = [ pytest sh ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix index 1a238a3937..bd64e9acd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beartype/default.nix @@ -7,17 +7,17 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.11.0"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-OFS1Dqqpi7iUkL5X5zxpx3eg8wRXTnBDrH2pisanNaY="; + hash = "sha256-O3VFs/MzprBwQraLECFBVUya3S6Xnat7D47WN49699c="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix index ee11ead039..53d869db45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { soupsieve ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/beautifultable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/beautifultable/default.nix index e222a8cdd9..97b13414f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/beautifultable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/beautifultable/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { wcwidth ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix index 1030e589a2..f90b664ee7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/behave/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-B8PUN1Q4UAsDWrHjPZDlpaPjCKjI/pAogCSI+BQnaWs="; }; - checkInputs = [ pytestCheckHook mock path pyhamcrest pytest-html ]; + nativeCheckInputs = [ pytestCheckHook mock path pyhamcrest pytest-html ]; # upstream tests are failing, so instead we only check if we can import it doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix index a7121a2a18..6ac6521530 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.34.6"; + version = "0.34.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-J6PUVdIs9adRdFbw9yzu1Y9jU9Ge0hGxueXbE1b03og="; + hash = "sha256-+4OWiIRbCLvZWt5zn2djW20PrZJK4c5KOcz4Owbkozg="; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { zigpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio pytest-timeout diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bencoder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bencoder/default.nix new file mode 100644 index 0000000000..2fa730630c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bencoder/default.nix @@ -0,0 +1,27 @@ +{ lib +, fetchPypi +, buildPythonPackage +, setuptools +}: +buildPythonPackage rec { + pname = "bencoder"; + version = "0.2.0"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-rENvM/3X51stkFdJHSq+77VjHvsTyBNAPbCtsRq1L8I="; + }; + + pythonImportsCheck = [ "bencoder" ]; + + # There are no tests. + doCheck = false; + + meta = with lib; { + description = "A simple bencode decoder/encoder library in pure Python"; + homepage = "https://github.com/utdemir/bencoder"; + license = licenses.gpl2; + maintainers = with maintainers; [ somasis ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/betterproto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/betterproto/default.nix index e8b49dd839..7b3d3bc098 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/betterproto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/betterproto/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "betterproto" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix index 4545eaeaef..065af5879a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix index f59e6418fe..45ba90794d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bidict/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sphinx ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis py pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/biliass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/biliass/default.nix index a14f973fcc..a6ce06c8a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/biliass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/biliass/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { doCheck = false; # test artifacts missing - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix index 511fbc5318..ddf1db4a6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-GtLuro4oBT1ym6M3PTTZ1uIQ9uTYvwqcZPkr0FPx7fU="; }; - checkInputs = [ + nativeCheckInputs = [ case psutil pytestCheckHook 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 7435eb6cfc..91d663c6a2 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 @@ -39,7 +39,7 @@ buildPythonPackage rec { pyjwt ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook respx time-machine diff --git a/third_party/nixpkgs/pkgs/development/python-modules/binaryornot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/binaryornot/default.nix index 103bd79294..b7ca1223cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/binaryornot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/binaryornot/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ chardet ]; - checkInputs = [ hypothesis ]; + nativeCheckInputs = [ hypothesis ]; meta = with lib; { homepage = "https://github.com/audreyr/binaryornot"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix index a63df0d7d3..c3a0b8feed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/binwalk/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { HOME=$(mktemp -d) ''; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; pythonImportsCheck = [ "binwalk" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix index ec351457a2..16786b2e01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , pythonOlder , ecdsa -, pysha3 , coincurve , pynacl , crcmod @@ -14,21 +13,26 @@ }: buildPythonPackage rec { - pname = "bip_utils"; + pname = "bip-utils"; version = "2.7.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ebellocchia"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-m7/CC5/T6qR2Ot4y5WQlzOAR0czz6XHCjJskES+2nns="; + repo = "bip_utils"; + rev = "refs/tags/v${version}"; + hash = "sha256-m7/CC5/T6qR2Ot4y5WQlzOAR0czz6XHCjJskES+2nns="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "coincurve>=15.0.1,<18.0.0" "coincurve" + ''; + propagatedBuildInputs = [ ecdsa - pysha3 cbor2 pynacl coincurve @@ -42,10 +46,11 @@ buildPythonPackage rec { "bip_utils" ]; - meta = { + meta = with lib; { description = "Implementation of BIP39, BIP32, BIP44, BIP49 and BIP84 for wallet seeds, keys and addresses generation"; homepage = "https://github.com/ebellocchia/bip_utils"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ prusnak stargate01 ]; + changelog = "https://github.com/ebellocchia/bip_utils/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ prusnak stargate01 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/biplist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/biplist/default.nix index c6714c3d4c..605500c674 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/biplist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/biplist/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1im45a9z7ryrfyp1v6i39qia5qagw6i1mhif0hl0praz9iv4j1ac"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix index f91ade7d10..e1cd7bd66a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitcoinlib/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "bitcoinlib"; - version = "0.11.2"; + version = "0.12.0"; disabled = !isPy3k; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "petertodd"; repo = "python-bitcoinlib"; rev = "refs/tags/python-bitcoinlib-v${version}"; - sha256 = "sha256-/VgCTN010W/Svdrs0mGA8W1YZnyTHhcaWJKgP/c8CN8="; + sha256 = "sha256-jguybrH86z6NWLaucQEYjvH2Gkoh3Aqh/PLZ6l8Qel4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitcoinrpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitcoinrpc/default.nix index 200f3edf03..65c05c0199 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitcoinrpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitcoinrpc/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bite-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bite-parser/default.nix index 66cafb2434..9d5ba8eaa8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bite-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bite-parser/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook typing-extensions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitlist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitlist/default.nix index 5d5a84da8b..26ca48fb49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitlist/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { parts ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitmath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitmath/default.nix index 66a4285865..661b477e65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitmath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitmath/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "293325f01e65defe966853111df11d39215eb705a967cb115851da8c4cfa3eb8"; }; - checkInputs = [ (if isPy3k then progressbar33 else progressbar231) mock ]; + nativeCheckInputs = [ (if isPy3k then progressbar33 else progressbar231) mock ]; meta = with lib; { description = "Module for representing and manipulating file sizes with different prefix"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitstring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitstring/default.nix index a5d96508aa..478faf1017 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitstring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitstring/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "bitstring" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix index 80aed4e6fe..5a7c20e3c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/black-macchiato/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ black ]; - checkInputs = [ pytestCheckHook black ]; + nativeCheckInputs = [ pytestCheckHook black ]; pythonImportsCheck = [ "black" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix index 1eda802075..33509352b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/black/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { # Black starts a local server and needs to bind a local address. __darwinAllowLocalNetworking = true; - checkInputs = [ pytestCheckHook parameterized aiohttp ]; + nativeCheckInputs = [ pytestCheckHook parameterized aiohttp ]; preCheck = '' export PATH="$PATH:$out/bin" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix index de3caef7b0..1c6bd8896c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix index 516c045d77..54f0e009b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { dbus-fast ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix index 27ee78ba31..3dc133fefc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix index aac60e31bb..82bdbe2fdd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { semver ]; - checkInputs = [ + nativeCheckInputs = [ asynctest deepmerge pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bless/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bless/default.nix index e5b03c84bb..dbe92d76c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bless/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bless/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { dbus-next ]; - checkInputs = [ + nativeCheckInputs = [ aioconsole numpy pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blessed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blessed/default.nix index 592c36692d..984ffbb33f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blessed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blessed/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-mg0JlpW/Yh1GgN1sc/atVH9qNEL72+gMSx2qHtvEkvw="; }; - checkInputs = [ pytest mock glibcLocales ]; + nativeCheckInputs = [ pytest mock glibcLocales ]; # Default tox.ini parameters not needed checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blessings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blessings/default.nix index 00b7fd9a63..31275a9f07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blessings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blessings/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; propagatedBuildInputs = [ six ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix index ceb6413da3..8f53ff5c05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-kj5eL2nBVfLMQtr7vXDhbj/eJNLUqiq3L744YjiJJGI="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "blinker" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix index 236f481df2..8b28cfacf1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix @@ -1,35 +1,37 @@ { lib , buildPythonPackage , fetchFromGitHub +, pytestCheckHook , python-dateutil , python-slugify -, requests -, pytestCheckHook , pythonAtLeast , pythonOlder +, requests +, sortedcontainers }: buildPythonPackage rec { pname = "blinkpy"; - version = "0.19.2"; + version = "0.20.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-depaXtbXo5F1JC3M24i6ynWhpm9x9O7UCjkoSzFaSZI="; + hash = "sha256-6la8rCmMtH2N4/P5OVGht1wgSuiW16MmF5a422LADV4="; }; propagatedBuildInputs = [ python-dateutil python-slugify requests + sortedcontainers ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -52,6 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for the Blink Camera system"; homepage = "https://github.com/fronzbot/blinkpy"; + changelog = "https://github.com/fronzbot/blinkpy/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix index 68351bd829..9e5b4d0fbc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix index 34245d9356..206a3f81a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { docutils ]; - checkInputs = [ + nativeCheckInputs = [ ephem nose pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix index d26bdfa085..a5df0642d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blocksat-cli/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { zfec ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # disable tests which require being connected to the satellite diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluemaestro-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluemaestro-ble/default.nix index f5342678a8..11edb88848 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluemaestro-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluemaestro-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix index 15487e607c..bb3519eeab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { "bluetooth_adapters" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index 38a577cf12..a539c3fd9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { usb-devices ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 460f143d87..c843016e4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix index a511e23cd9..21bdad355c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blurhash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blurhash/default.nix index 665f08f798..d0cf2135f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blurhash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blurhash/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sed -i '/^addopts/d' setup.cfg ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pillow numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bme680/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bme680/default.nix index 9797a7ab0d..05431afa41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bme680/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bme680/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { cd library ''; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix index c323713c7d..1a4648d413 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { "bokeh" ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest pillow diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix index 348919554e..19d69546ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-8HO7X2PQEbQIQsCa2cMHQI3rlofVT22GYrWNXY34MLk="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 1a07de6dcc..e326688501 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 @@ -26,7 +26,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bond-async/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bond-async/default.nix index 9b64d1e0a9..17b479cbeb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bond-async/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bond-async/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bonsai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bonsai/default.nix index b50293d0b8..3e9f553d9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bonsai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bonsai/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { trio = [ trio ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boolean-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boolean-py/default.nix index 3ac516e5e1..47afe1ef02 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boolean-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boolean-py/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-i6aNzGDhZip9YHXLiuh9crGm2qT2toBU2xze4PDLleg="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/booleanoperations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/booleanoperations/default.nix index f5f3dda77a..af718d99ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/booleanoperations/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/booleanoperations/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { fontpens ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "Boolean operations on paths"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boost-histogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boost-histogram/default.nix index eb11f2f0b3..6e461e15b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boost-histogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boost-histogram/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-benchmark ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix index 3a4c59a448..2115eb273d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boschshcpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.38"; + version = "0.2.53"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = pname; rev = version; - sha256 = "sha256-PDS68JJsnKO2MVlNxvhlDEGuK7zlsGhCRVOLZ/TSlTM="; + sha256 = "sha256-V7FNuVXKJqIOsDqwg6Bn2Vb9QnuQ1XYzE4m0x2ipXW8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix index 9d02480037..8d4d8255b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ${python.interpreter} tests/test.py default ''; - checkInputs = [ nose mock ]; + nativeCheckInputs = [ nose mock ]; propagatedBuildInputs = [ requests httpretty ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index b9aafb7621..094ce40ce0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index 3a8d90de84..0c93fbf1b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook jsonschema ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bottle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bottle/default.nix index ebcf036526..ac2f96455e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bottle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bottle/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-aD3jqjmfsm6HsnTbz3CxplE4XUWRMXFjh6vcN5LgQWc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix index 5774397e24..b3431b834a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bottleneck"; - version = "1.3.5"; + version = "1.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,14 +17,14 @@ buildPythonPackage rec { src = fetchPypi { pname = "Bottleneck"; inherit version; - hash = "sha256-LA0nr+RTUfb0IYkzYmIYBPp96hT+KaeOqlLUMj9kbec="; + hash = "sha256-vBXiVF1CgtbyUpWX3xvW5MXwxEKWs/hCW8g1MFvZQ8k="; }; propagatedBuildInputs = [ numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boxx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boxx/default.nix index 43fea29cc2..cb1ef6a35e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boxx/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { seaborn ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run torch torchvision diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix index 7a88a4078f..5052cf2eb1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ''; # pythonImportsCheck = [ "bpycv" ]; # this import depends on bpy that is only available inside blender - checkInputs = [ blender ]; + nativeCheckInputs = [ blender ]; checkPhase = let bpycv_example_data = fetchFromGitHub { owner = "DIYer22"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix index bf883b6e57..beb3d86cb7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { --replace "Exec=/usr/bin/bpython" "Exec=$out/bin/bpython" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/braceexpand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/braceexpand/default.nix index c5e711bb80..40977d139c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/braceexpand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/braceexpand/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "01gpcnksnqv6np28i4x8s3wkngawzgs99zvjfia57spa42ykkrg6"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "braceexpand" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix index d5f080d8d4..3971c49639 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hatchling ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "bracex" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix index c88f6712f7..40715bcdac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/braintree/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix index bb5b595098..65b80267c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix @@ -1,31 +1,66 @@ { lib , buildPythonPackage -, fetchPypi -, pytest +, fetchFromGitHub , jinja2 +, pytestCheckHook +, pythonOlder +, setuptools-scm , selenium -, six -, setuptools }: buildPythonPackage rec { pname = "branca"; version = "0.6.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-VZSYVSFFBMdYO3G5oDqE3OLpaoQCdhO7U7QtBIRM4k4="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-visualization"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-bcqr+vGKBga4rR4XFRWbjtw5xL+pWkIt+ihtKlKF6Y8="; }; - checkInputs = [ pytest selenium ]; - propagatedBuildInputs = [ jinja2 six setuptools ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - # Seems to require a browser - doCheck = false; + postPatch = '' + # We don't want flake8 + rm setup.cfg + ''; - meta = { + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + jinja2 + ]; + + nativeCheckInputs = [ + pytestCheckHook + selenium + ]; + + pythonImportsCheck = [ + "branca" + ]; + + disabledTestPaths = [ + # Some tests require a browser + "tests/test_utilities.py" + ]; + + disabledTests = [ + "test_rendering_utf8_iframe" + "test_rendering_figure_notebook" + ]; + + meta = with lib; { description = "Generate complex HTML+JS pages with Python"; homepage = "https://github.com/python-visualization/branca"; - license = with lib.licenses; [ mit ]; + changelog = "https://github.com/python-visualization/branca/blob/v${version}/CHANGES.txt"; + license = with licenses; [ mit ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix index eb0e03653e..7f34a3c48b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bravado-core/default.nix @@ -2,34 +2,26 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, fqdn -, idna -, isoduration -, jsonpointer +, pythonOlder + # build inputs , jsonref , jsonschema -, mock -, msgpack -, mypy-extensions -, pytest-benchmark -, pytestCheckHook , python-dateutil -, pythonOlder -, pytz , pyyaml -, rfc3987 -, rfc3339-validator +, requests , simplejson , six -, strict-rfc3339 , swagger-spec-validator -, uri-template -, webcolors +, pytz +, msgpack + # check inputs +, pytestCheckHook +, mock }: buildPythonPackage rec { pname = "bravado-core"; - version = "5.17.0"; + version = "5.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,76 +30,46 @@ buildPythonPackage rec { owner = "Yelp"; repo = pname; rev = "v${version}"; - hash = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE="; + hash = "sha256-7LnKNR1/YIzw2iIPYXAuoC6G7fdm4D3frkSl/wJhYG4="; }; propagatedBuildInputs = [ jsonref - jsonschema - msgpack + jsonschema # with optional dependencies for format python-dateutil - pytz pyyaml + requests simplejson six swagger-spec-validator + pytz + msgpack + ] ++ jsonschema.optional-dependencies.format; - # the following packages are included when jsonschema (3.2) is installed - # as jsonschema[format], which reflects what happens in setup.py - fqdn - idna - isoduration - jsonpointer - rfc3987 - rfc3339-validator - strict-rfc3339 - uri-template - webcolors + nativeCheckInputs = [ + pytestCheckHook ]; checkInputs = [ - mypy-extensions - pytestCheckHook mock - pytest-benchmark ]; pythonImportsCheck = [ "bravado_core" ]; - pytestFlagsArray = [ - "--benchmark-skip" - ]; - disabledTestPaths = [ - # Tests are out-dated (not supporting later modules releases, e.g., jsonschema) - "tests/_decorators_test.py" - "tests/formatter" - "tests/marshal" - "tests/model" - "tests/operation" - "tests/param" - "tests/request" - "tests/resource" - "tests/response" - "tests/schema" - "tests/security_test.py" - "tests/spec" - "tests/swagger20_validator" - "tests/unmarshal" - "tests/validate" - ]; - - disabledTests = [ - "test_petstore_spec" + # skip benchmarks + "tests/profiling" + # take too long to run + "tests/spec/Spec" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Library for adding Swagger support to clients and servers"; homepage = "https://github.com/Yelp/bravado-core"; + changelog = "https://github.com/Yelp/bravado-core/blob/v${version}/CHANGELOG.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ vanschelven ]; + maintainers = with maintainers; [ vanschelven nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix index 9c763e22c6..cfb919682e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { sphinx ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix index 64774a7086..c8104f1b23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breezy/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { launchpadlib ]; - checkInputs = [ testtools ]; + nativeCheckInputs = [ testtools ]; # There is a conflict with their `lazy_import` and plugin tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix index 75ea728a0e..55dc7fd220 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brother/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pysnmplib ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-error-for-skips pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix index ad247be161..23727f2137 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # only returns information how to really build dontConfigure = true; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brotlipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brotlipy/default.nix index 2cc918b288..57310eb6a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brotlipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brotlipy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; - checkInputs = [ pytest hypothesis ]; + nativeCheckInputs = [ pytest hypothesis ]; checkPhase = '' py.test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brottsplatskartan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brottsplatskartan/default.nix index 8daf79f208..52c092c74b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brottsplatskartan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brottsplatskartan/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-cov pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brunt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brunt/default.nix index 1c11e92b23..40b0f665cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/brunt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/brunt/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix index 955cd4951d..9ed9fce3ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix @@ -51,7 +51,7 @@ let bsuite = buildPythonPackage rec { termcolor ]; - checkInputs = [ + nativeCheckInputs = [ distrax dm-haiku dm-sonnet diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix index 10acc1eae8..9baacd74d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "2.5.0"; + version = "2.5.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nNvPSp1Ij7JPXVFt8ediNtJaiuIDxRQFl3gySivJdqs="; + hash = "sha256-xxdCuTSpGe89TjF0YPmD4i1Fx1WfaQTTataFRnbcaos="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { pycryptodomex ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/btrees/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btrees/default.nix index 46adf39b50..69c663f9ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/btrees/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/btrees/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { zope_interface ]; - checkInputs = [ + nativeCheckInputs = [ transaction zope_testrunner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/btsmarthub_devicelist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btsmarthub_devicelist/default.nix index 540155c07c..59fb071c74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/btsmarthub_devicelist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/btsmarthub_devicelist/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ responses requests pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/btsocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btsocket/default.nix index 560707ce1c..e1c1f8a328 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/btsocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/btsocket/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-IqlbFYbEyJPlcmT3DIQIwsjQEAGeIGRtFNx4jWwNtjE="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bucketstore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bucketstore/default.nix index a0aa523f0c..d580b20248 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bucketstore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bucketstore/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ boto3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook moto ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix index 3f201b876d..74d86b7fc4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bugzilla/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buienradar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/buienradar/default.nix index ba288f59b2..7612c62211 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buienradar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buienradar/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix index efc1f2f45a..44d6e6f978 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/build/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ filelock toml pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index c30e54aca9..c1a0de7182 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -90,7 +90,7 @@ let # tls ++ twisted.optional-dependencies.tls; - checkInputs = [ + nativeCheckInputs = [ treq txrequests pypugjs @@ -118,6 +118,9 @@ let substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" ''; + # Silence the depreciation warning from SqlAlchemy + SQLALCHEMY_SILENCE_UBER_WARNING = 1; + # TimeoutErrors on slow machines -> aarch64 doCheck = !stdenv.isAarch64; @@ -127,6 +130,8 @@ let # remove testfile which is missing configuration file from sdist rm buildbot/test/integration/test_graphql.py + # tests in this file are flaky, see https://github.com/buildbot/buildbot/issues/6776 + rm buildbot/test/integration/test_try_client.py ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix index 9099af82f3..f8ab7941dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix @@ -47,7 +47,7 @@ buildPythonPackage (rec { twisted ]; - checkInputs = [ + nativeCheckInputs = [ mock parameterized psutil diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildcatrust/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildcatrust/default.nix index 9fc0330ad0..b875185ed2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildcatrust/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildcatrust/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256:0s0m0fy943dakw9cbd40h46qmrhhgrcp292kppyb34m6y27sbagy"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bunch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bunch/default.nix index 2758ff5b41..39c858ebb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bunch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bunch/default.nix @@ -1,17 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: buildPythonPackage rec { pname = "bunch"; - version = "1.0.1"; + version = "unstable-2017-11-21"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "1akalx2pd1fjlvrq69plvcx783ppslvikqdm93z2sdybq07pmish"; + disabled = pythonOlder "3.7"; + + # Use a fork as upstream is dead + src = fetchFromGitHub { + owner = "olivecoder"; + repo = pname; + rev = "71ac9d5c712becd4c502ab3099203731a0f1122e"; + hash = "sha256-XOgzJkcIqkAJFsKAyt2jSEIxcc0h2gFC15xy5kAs+7s="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "rU" "r" + ''; + + # No real tests available doCheck = false; + pythonImportsCheck = [ + "bunch" + ]; + meta = with lib; { + description = "Python dictionary that provides attribute-style access"; + homepage = "https://github.com/dsc/bunch"; + license = licenses.mit; maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix index 75e3cd4f4b..8c5be6384f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "bundlewrap" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ # only unit tests as integration tests need a OpenSSH client/server setup diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bx-py-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bx-py-utils/default.nix new file mode 100644 index 0000000000..c3072f9143 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bx-py-utils/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, beautifulsoup4 +, boto3 +, lxml +, pdoc +, pytestCheckHook +, requests-mock +}: + +buildPythonPackage rec { + pname = "bx-py-utils"; + version = "75"; + + disabled = pythonOlder "3.9"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "boxine"; + repo = "bx_py_utils"; + rev = "refs/tags/v${version}"; + hash = "sha256-+RHt5QTXxuaY1tDe1M66TrQfT9I7X56oVQAW36mzSwM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + pythonImportsCheck = [ + "bx_py_utils.anonymize" + "bx_py_utils.auto_doc" + "bx_py_utils.compat" + "bx_py_utils.dict_utils" + "bx_py_utils.environ" + "bx_py_utils.error_handling" + "bx_py_utils.file_utils" + "bx_py_utils.graphql_introspection" + "bx_py_utils.hash_utils" + "bx_py_utils.html_utils" + "bx_py_utils.iteration" + "bx_py_utils.path" + "bx_py_utils.processify" + "bx_py_utils.rison" + "bx_py_utils.stack_info" + "bx_py_utils.string_utils" + "bx_py_utils.test_utils" + "bx_py_utils.text_tools" + ]; + + nativeCheckInputs = [ + beautifulsoup4 + boto3 + lxml + pdoc + pytestCheckHook + requests-mock + ]; + + disabledTestPaths = [ + "bx_py_utils_tests/tests/test_project_setup.py" + ]; + + meta = { + description = "Various Python utility functions"; + homepage = "https://github.com/boxine/bx_py_utils"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix index 179ac7356a..0606ccb859 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bx-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; buildInputs = [ zlib ]; propagatedBuildInputs = [ numpy six python-lzo ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; postInstall = '' cp -r scripts/* $out/bin diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bytecode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bytecode/default.nix index a9cf3049d7..ac50b980ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bytecode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bytecode/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix index c5c7128f72..bbe5310157 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachecontrol/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ cherrypy mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cached-property/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cached-property/default.nix index 72bf870c37..555b1ce006 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cached-property/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cached-property/default.nix @@ -1,31 +1,55 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, fetchpatch , pytestCheckHook , freezegun +, pythonOlder }: buildPythonPackage rec { pname = "cached-property"; version = "1.5.2"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pydanny"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-DGI8FaEjFd2bDeBDKcA0zDCE+5I6meapVNZgycE1gzs="; }; - checkInputs = [ pytestCheckHook freezegun ]; + patches = [ + # Don't use asyncio.coroutine if it's not available, https://github.com/pydanny/cached-property/pull/267 + (fetchpatch { + name = "asyncio-coroutine.patch"; + url = "https://github.com/pydanny/cached-property/commit/297031687679762849dedeaf24aa3a19116f095b.patch"; + hash = "sha256-qolrUdaX7db4hE125Lt9ICmPNYsD/uBmQrdO4q5NG3c="; + }) + ]; + + checkInputs = [ + pytestCheckHook + freezegun + ]; disabledTests = [ # https://github.com/pydanny/cached-property/issues/131 "test_threads_ttl_expiry" ]; - meta = { + pythonImportsCheck = [ + "cached_property" + ]; + + meta = with lib; { description = "A decorator for caching properties in classes"; homepage = "https://github.com/pydanny/cached-property"; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ericsagnes ]; + changelog = "https://github.com/pydanny/cached-property/releases/tag/${version}"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ ericsagnes ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix index 9a873d24f5..f23a0ada1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachelib/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-LO1VdirKWXIAy3U8oRtnFI58qO+yn6Vm5bZdCjdgKwo="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-xprocess pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix index 9de26ad533..08e0b559b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachetools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "cachetools"; - version = "5.2.0"; + version = "5.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tkem"; repo = pname; - rev = "v${version}"; - hash = "sha256-DheHTD62f1ZxoiS0y0/CzDMHvKGmEiEUAX6oaqTpB78="; + rev = "refs/tags/v${version}"; + hash = "sha256-1B/vAfGroGABijMWuiKmIkMyjNSp2B3VkH7s1NMlbw0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extensible memoizing collections and decorators"; homepage = "https://github.com/tkem/cachetools"; + changelog = "https://github.com/tkem/cachetools/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cachey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cachey/default.nix index aff819adca..c5e21598e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cachey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cachey/default.nix @@ -17,7 +17,7 @@ sha256 = "sha256-5USmuufrrWtmgibpfkjo9NtgN30hdl8plJfythmxM4s="; }; propagatedBuildInputs = [ typing-extensions heapdict ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "cachey" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix index f7e436a416..385a36d46f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cadquery/default.nix @@ -88,7 +88,7 @@ in fontDirectories = [ freefont_ttf ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/caio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/caio/default.nix index e140cf2292..a7dcab5cac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/caio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/caio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-BFlpjbC2yxwGtCAMfn1VM5zmioyN5fFNMJDDWceB+LE="; }; - checkInputs = [ + nativeCheckInputs = [ aiomisc pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix index ec11772fb5..f1da79151f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { pyyaml ] ++ eth-hash.optional-dependencies.pycryptodome; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix index 87c56b40e9..13a9363d41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { ++ lib.optional withXcffib xcffib; # pytestCheckHook does not work - checkInputs = [ numpy pikepdf pytest glibcLocales ]; + nativeCheckInputs = [ numpy pikepdf pytest glibcLocales ]; checkPhase = '' py.test $out/${python.sitePackages} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix index f5680247f9..98e0235a9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cairocffi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' substituteInPlace setup.cfg \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix index f531cb4f0e..d6b8112c7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { recurring-ical-events ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook tzlocal pytz diff --git a/third_party/nixpkgs/pkgs/development/python-modules/callee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/callee/default.nix index 1cf63455c2..d7fb37706a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/callee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/callee/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; # missing dependency - checkInputs = [ + nativeCheckInputs = [ # taipan missing, unmaintained, not python3.10 compatible pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/calver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/calver/default.nix index dcc692ce7b..398e07b39d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/calver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/calver/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { --replace "version=calver_version(True)" 'version="${version}"' ''; - checkInputs = [ + nativeCheckInputs = [ pretend pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/camel-converter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/camel-converter/default.nix index c586041ae3..3d2f9e7b40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/camel-converter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/camel-converter/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pydantic; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/can/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/can/default.nix index c3d3629016..d96f588a0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/can/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/can/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ future hypothesis parameterized diff --git a/third_party/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix index d131e4001c..79dbbf9d44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/canmatrix/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { --replace "version = versioneer.get_version()" "version = \"${version}\"" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # long_envvar_name_imports requires stable key value pair ordering pytestFlagsArray = [ "-s src/canmatrix" ]; disabledTests = [ "long_envvar_name_imports" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix index 3e88db6c91..46ceee80c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix index 8793a19193..072b22a895 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/canopen/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { canmatrix ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix index 2495040887..082c765b39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/capturer/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # hangs on darwin doCheck = !stdenv.isDarwin; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Easily capture stdout/stderr of the current process and subprocesses"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cart/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cart/default.nix index c4d4e88920..c4ef216487 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cart/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cart/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pycryptodome ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix index 62b5f5a42b..68e2eaaf2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { plotting = [ gdal pillow scipy ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-mpl pytestCheckHook ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix index ccd1df2d93..6cd182e181 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { wcmatch ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 1243aad64c..0ea28830af 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 @@ -58,7 +58,7 @@ buildPythonPackage rec { unset NIX_REDIRECTS LD_PRELOAD ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook eventlet mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix index 993684bd5a..765bb71643 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/castepxbin/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pymatgen ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix index 43e4d0029a..553907bf7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { zipp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 8514190202..ddca9628f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cattrs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cattrs/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis immutables motor diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix index 19bc40a1e4..fe32006336 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cccolutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cccolutils/default.nix index 2e3e1778d1..86aa9f6c85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cccolutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cccolutils/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { mock ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cchardet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cchardet/default.nix index 1ec1ee57c1..dbb8394634 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cchardet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cchardet/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { "cchardet" ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # on non x86-64 some charsets are identified as their superset, so we skip these tests (last checked with version 2.1.7) preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cdcs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cdcs/default.nix index 2c608c0625..45b4807a5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cdcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cdcs/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/celery-redbeat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/celery-redbeat/default.nix index a1be0b9582..c3c4aa69df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/celery-redbeat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/celery-redbeat/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { tenacity ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook fakeredis mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix index 80b58dc69b..52fcaad47a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { vine ]; - checkInputs = [ + nativeCheckInputs = [ boto3 case dnspython diff --git a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix index 6b0ebf9268..63787b87f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ parameterized pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix index a278d446fc..95f59ab613 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cepa/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sed -i '/MOCK_VERSION/d' run_tests.py ''; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; checkPhase = '' touch .gitignore diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cerberus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cerberus/default.nix index be597277b6..aa8c9b2f04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cerberus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cerberus/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cert-chain-resolver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cert-chain-resolver/default.nix index 6491749498..cdd26163d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cert-chain-resolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cert-chain-resolver/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock six diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certauth/default.nix index 782ad96081..71bd644846 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certauth/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { tldextract ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix index abdd6d2d8f..fc6a645ade 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-cloudflare/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { cloudflare ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-google/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-google/default.nix index 182ff720e1..6a320209ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-google/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-google/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { oauth2client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix index f3da841667..18765f12d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-rfc2136/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { dnspython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix index 7052107418..20df82303a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot-dns-route53/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { certbot ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix index e66435d8cc..10c21a5cad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { buildInputs = [ dialog gnureadline ]; - checkInputs = [ + nativeCheckInputs = [ python-dateutil pytestCheckHook pytest-xdist diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix index c80ba08503..93c3ac801a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certifi/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { cacert ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certomancer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certomancer/default.nix index 3d863165f2..4fbe2ecd37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certomancer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certomancer/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { --replace "pyhanko-certvalidator==0.19.2" "pyhanko-certvalidator==0.19.5" ''; - checkInputs = [ + nativeCheckInputs = [ freezegun jinja2 pyhanko-certvalidator diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certvalidator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certvalidator/default.nix index 8f53bd9805..ee24de068f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certvalidator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certvalidator/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ asn1crypto oscrypto ]; - checkInputs = [ cacert ]; + nativeCheckInputs = [ cacert ]; checkPhase = '' # Tests are run with a custom executor/loader # The regex to skip specific tests relies on negative lookahead of regular expressions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cexprtk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cexprtk/default.nix index e75efe1c63..e8a8a5a360 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cexprtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cexprtk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-c7QXB+oXzkRveiPpNrW/HY8pMtpZx/RtDpJMVE7fY/A="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "cexprtk" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix index 07c76f81a4..87c8f89889 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix @@ -80,7 +80,7 @@ if isPyPy then null else buildPythonPackage rec { doCheck = !stdenv.hostPlatform.isMusl; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = lib.optionals stdenv.isDarwin [ # AssertionError: cannot seem to get an int[10] not completely cleared diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix index 4341efb05c..124c61b1a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { fonttools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix index f19a6aba26..d1fa5de479 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cfn-flip/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 e9aafacec9..c6c24b51b7 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 @@ -45,7 +45,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pydot pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix index c925381d00..b827c48531 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cgen/default.nix index 06beebc2f3..fd0dbe4ba9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cgen/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "4ec99d0c832d9f95f5e51dd18a629ad50df0b5464ce557ef42c6e0cd9478bfcf"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ pytools numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix index 8f9408ec2f..f3558c80ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chacha20poly1305-reuseable/default.nix @@ -48,7 +48,7 @@ buildPythonPackage { --replace "--cov=chacha20poly1305_reuseable --cov-report=term-missing:skip-covered" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix index 9de7f2ad5e..c6793137ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { cupy ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; 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 735337e43d..94145c938c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { watchdog ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/channels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/channels/default.nix index 2d6f0d0091..3b800877be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/channels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/channels/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-django pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/characteristic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/characteristic/default.nix index 2e12077bd5..ae86e18865 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/characteristic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/characteristic/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; postPatch = '' substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chardet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chardet/default.nix index 07a0cbccf2..e750bbece8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chardet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chardet/default.nix @@ -22,8 +22,9 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ - hypothesis + nativeCheckInputs = [ + # "hypothesis" indirectly depends on chardet to build its documentation. + (hypothesis.override { enableDocumentation = false; }) pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix index df34e4ca15..d567c41dbe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { hash = "sha256-2kXs6ZdemA6taV4aa9xBKLmhbSgpybjg3Z61EUFabrk="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix index a191435331..966daaf1ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ mock nose pytest ]; + nativeCheckInputs = [ mock nose pytest ]; # most tests talk to a service checkPhase = '' HOME=$TMPDIR pytest chart_studio/tests/test_core chart_studio/tests/test_plot_ly/test_api diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix index 741ed37913..9303030057 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { # Tests try to access the network. doCheck = false; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "chat_downloader" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix index 4b62451ebd..8a3e328313 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ breezy git mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix index 3e80423c42..cd6cabbe57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ jaraco_text portend pypytools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix index c438e9e12c..578fdaff2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { jaraco_collections ]; - checkInputs = [ + nativeCheckInputs = [ objgraph path pytest-forked diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix index cad84146c4..9fa7a378b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { "chex" ]; - checkInputs = [ + nativeCheckInputs = [ jaxlib pytestCheckHook ]; @@ -42,6 +42,12 @@ buildPythonPackage rec { disabledTests = [ # See https://github.com/deepmind/chex/issues/204. "test_uninspected_checks" + + # These tests started failing at some point after upgrading to 0.1.5 + "test_useful_failure" + "TreeAssertionsTest" + "PmapFakeTest" + "WithDeviceTest" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix index 36c62153b8..649edb7b41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { touch wheel/Cargo.lock ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chiabip158/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chiabip158/default.nix index b9615fec7b..508f32cd46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chiabip158/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chiabip158/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { buildInputs = [ pybind11 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix index f8f19e142f..120be8e920 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { buildInputs = [ pybind11 ]; - checkInputs = [ + nativeCheckInputs = [ psutil pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix index 4f6c43a923..80e39ccc90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chiavdf/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { buildInputs = [ boost gmp pybind11 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ci-info/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ci-info/default.nix index 275f4cd5c8..24fd2a613f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ci-info/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ci-info/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-H9UMvUAfKa3/7rGLBIniMtFqwadFisa8MW3qtq5TX7A="; }; - checkInputs = [ pytest pytestCheckHook ]; + nativeCheckInputs = [ pytest pytestCheckHook ]; doCheck = false; # both tests access network diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ci-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ci-py/default.nix index 61e1760f37..0327835663 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ci-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ci-py/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytest-runner ]; # pytest-runner included in setup-requires - checkInputs = [ pytest pytestCheckHook ]; + nativeCheckInputs = [ pytest pytestCheckHook ]; pythonImportsCheck = [ "ci" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/circuitbreaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/circuitbreaker/default.nix index d6c6832deb..35f844d56e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/circuitbreaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/circuitbreaker/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-l0ASt9CQmgJmWpRrghElbff/gaNOmxNh+Wj0C0p4jE0="; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix index 4357abe0ac..ae53a5eef6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-aqt/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix index 34604cc495..c37e60c9ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-core/default.nix @@ -73,7 +73,7 @@ buildPythonPackage rec { quimb ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio freezegun diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix index eeba8feebe..4eb4750700 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix index 78f52de89a..0804974418 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-ionq/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix index 3fe2e52f7d..5066455e29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-pasqal/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix index 2345c7ce4d..b3bd2d3a05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-rigetti/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix index 5531716fc6..3488ab5658 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-web/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { cirq-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix index 0531020a21..f777410524 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ]; # pythonImportsCheck = [ "cirq" "cirq.Circuit" ]; # cirq's importlib hook doesn't work here - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix index b5e40423bd..40018a49c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ciscoconfparse/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ciso8601/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ciso8601/default.nix index 315fe69b69..52b87941b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ciso8601/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ciso8601/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/citeproc-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/citeproc-py/default.nix index b404fa4a5c..d0294a28ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/citeproc-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/citeproc-py/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lxml ]; - checkInputs = [ nose git ]; + nativeCheckInputs = [ nose git ]; checkPhase = "nosetests tests"; doCheck = false; # seems to want a Git repository, but fetchgit with leaveDotGit also fails pythonImportsCheck = [ "citeproc" ]; 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 7d67d603ab..a8811d7f37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.34"; + version = "9.2.36"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2oUUIPHBT/pAAWUy+8fuEqZv0pG1OHDn6eaphOsrevE="; + hash = "sha256-gF8T1ZTvTjyt+kEOxI3ryDJOZv4go54VTxSGEdUyGt4="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { z3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/classify-imports/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/classify-imports/default.nix index 16a7f361be..694d4da421 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/classify-imports/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/classify-imports/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { "classify_imports" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cld2-cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cld2-cffi/default.nix index fc5a6b0e54..c2087409b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cld2-cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cld2-cffi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six cffi ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # gcc doesn't approve of this code, so disable -Werror NIX_CFLAGS_COMPILE = "-w" + lib.optionalString stdenv.cc.isClang " -Wno-error=c++11-narrowing"; 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 beb97d2a61..e1f022c1a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.34"; + version = "9.2.36"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-mbYitM0ibUSxBRhbF1ecB1MOryhWRPZZ1ujRFD8iiWs="; + hash = "sha256-XqoBFV87m/uz0proGDtbaewsoY8vsA6ToGwdv7xvO9Y="; }; nativeBuildInputs = [ @@ -55,7 +55,7 @@ buildPythonPackage rec { sortedcontainers ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cleo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cleo/default.nix index 216065472b..ce4b923774 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cleo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cleo/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { "cleo.helpers" ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix index 823ecb87c3..d657e55b71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clevercsv/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { tabview ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix index 7d7930b4f8..a6b2ba5e9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { styles = [ pygments ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-command-tree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-command-tree/default.nix index 1490385364..1f836a64e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-command-tree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-command-tree/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-configfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-configfile/default.nix index 62e0ed2d3b..5ddf2891f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-configfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-configfile/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-default-group/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-default-group/default.nix index 3ed81e598d..8e5668f2b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-default-group/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-default-group/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "click_default_group" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix index b63788c606..22561f4849 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "click_help_colors" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-option-group/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-option-group/default.nix index 828b6a83be..47b476c6eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-option-group/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-option-group/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-plugins/default.nix index 31ae00a348..a03456b17d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-plugins/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-repl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-repl/default.nix index 5934adab7a..fd2a20867b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-repl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-repl/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-shell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-shell/default.nix index 68d65069ae..1b9a5ecf62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-shell/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytest-click pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-spinner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-spinner/default.nix index e0d862ab13..7d28cfb281 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-spinner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-spinner/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "h+rPnXKYlzol12Fe9X1Hgq6/kTpTK7pLKKN+Nm6XXa8="; }; - checkInputs = [ + nativeCheckInputs = [ click six pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-threading/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-threading/default.nix index 529ee08e4f..77ea7712d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-threading/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-threading/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-rc/mI8AqWVwQfDFAcvZ6Inj+TrQLcsDRoskDzHivNDk="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ click ] ++ lib.optional (!isPy3k) futures; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix index c93e5d2182..988027f953 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickclick/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickclick/default.nix index 00bf8aba47..4bb7603b9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clickclick/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clickclick/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1rij9ws9nhsmagiy1vclzliiqfkxi006rf65qvrw1k3sm2s8p5g0"; }; - checkInputs = [ pytestCheckHook pytest-cov ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov ]; propagatedBuildInputs = [ flake8 click pyyaml six ]; # test_cli asserts on exact quoting style of output diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix index 5b8d7728c8..759d52bcd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clickgen/default.nix @@ -4,9 +4,8 @@ , pythonOlder , fetchFromGitHub , pillow -, libX11 -, libXcursor -, libpng +, toml +, numpy , python , pytestCheckHook }: @@ -25,21 +24,11 @@ buildPythonPackage rec { sha256 = "sha256-qDaSfIeKCbyl3C2iKz9DYQc1oNwTe5xDlGg/yYhakSw="; }; - buildInputs = [ libXcursor libX11 libpng ]; + propagatedBuildInputs = [ pillow toml numpy ]; - propagatedBuildInputs = [ pillow ]; - - checkInputs = [ pytestCheckHook ]; - - postBuild = '' - # Needs to build xcursorgen.so - cd src/xcursorgen - make - cd ../.. - ''; + nativeCheckInputs = [ pytestCheckHook ]; postInstall = '' - install -m644 src/xcursorgen/xcursorgen.so $out/${python.sitePackages}/clickgen/xcursorgen.so # Copying scripts directory needed by clickgen script at $out/bin/ cp -R src/clickgen/scripts $out/${python.sitePackages}/clickgen/scripts ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix index 826ce08c1e..375fee8748 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clickhouse-driver/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "clickhouse-driver"; - version = "0.2.2"; + version = "0.2.5"; # pypi source doesn't contain tests src = fetchFromGitHub { owner = "mymarilyn"; repo = "clickhouse-driver"; rev = version; - sha256 = "0sx4jbadx9frzhqnj8b9w9l508x1r7j7b9883h7xq93lf00rxkfz"; + hash = "sha256-o5v37jPKmvUW4GFVD742nHSdO0g0z2FA4FkacbaRfNA="; }; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { lz4 ]; - checkInputs = [ + nativeCheckInputs = [ freezegun mock nose diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cliff/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/cliff/tests.nix index b981e78be0..56a29a6ef6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cliff/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cliff/tests.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ cliff docutils stestr diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix index 9a7be23938..85a6330e0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { sparse ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ipython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cligj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cligj/default.nix index 7806da7fb1..411e6d622d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cligj/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cligj/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ pytest glibcLocales ]; + nativeCheckInputs = [ pytest glibcLocales ]; checkPhase = '' LC_ALL=en_US.utf-8 pytest tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clikit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clikit/default.nix index af366cdbec..48ed42ffb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clikit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clikit/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ++ lib.optionals (pythonAtLeast "3.6") [ crashtest ] ++ lib.optionals isPy27 [ typing enum34 ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clint/default.nix index 45733c4ae7..7e826194de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clint/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # no longer compatible as behavior demand 2to3, which was removed # in setuptools>=58 doCheck = false; - checkInputs = [ mock nose nose_progressive pkgs.glibcLocales ]; + nativeCheckInputs = [ mock nose nose_progressive pkgs.glibcLocales ]; checkPhase = '' ${python.interpreter} test_clint.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix index a848125a55..91c362237f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook python-dateutil pygments diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix index 697296d9a2..cbd1e4615c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clldutils/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { csvw ]; - checkInputs = [ + nativeCheckInputs = [ mock postgresql pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix index 13f99462da..37678b93d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-P0IZRpxVRTz+RzflZLZ8KhSRCdq/fyQkeJSLiV9hEG8="; }; - checkInputs = [ + nativeCheckInputs = [ psutil pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix index e83e3464ad..285e90c225 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -1,28 +1,30 @@ { lib , buildPythonPackage -, fetchPypi , certifi -, six +, fetchPypi , python-dateutil +, pythonOlder +, six , urllib3 }: buildPythonPackage rec { pname = "cloudsmith-api"; - version = "2.0.0"; - + version = "2.0.1"; format = "wheel"; + disabled = pythonOlder "3.7"; + src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "sha256-Mcdpmrjg5hX4BTlBgt2+jQaoCqWjNIqkBykl1iT7McA="; + hash = "sha256-wFSHlUdZTARsAV3igVXThrXoGsPUaZyzXBJCSJFZYYQ="; }; propagatedBuildInputs = [ certifi - six python-dateutil + six urllib3 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix index 20d822d8ee..bf7db4a9b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudsplaining/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { schema ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloup/default.nix index 702a990686..77a1835f3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloup/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix index 760971957e..b38d61f6fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ bc hostname nose diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix index 4d4f363159..394c105d19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { clvm-tools-rs ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clvm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clvm/default.nix index 2853bfe531..f3a7cae8ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clvm/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { blspy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix index 5f1121c8e9..ee3a552b94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cma"; - version = "3.2.2"; + version = "3.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CMA-ES"; repo = "pycma"; rev = "refs/tags/r${version}"; - hash = "sha256-STF7jtLqI2KiWvvI9/reRjP1XyW8l4/qy9uAPpE9mTs="; + hash = "sha256-+UJI3hDVbDMfRF4bkwHED3eJCHzxS2hO4YPUzJqcoQI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix index 3d88048ebd..3b1be81391 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmarkgfm/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 ada33a8594..ac560205be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook glibcLocales pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmigemo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmigemo/default.nix index 7c88449b6c..fb381ec185 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmigemo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmigemo/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sed -i 's~dict_path_base = "/usr/share/cmigemo"~dict_path_base = "/${cmigemo}/share/migemo"~g' test/test_cmigemo.py ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "test/" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmsis-pack-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmsis-pack-manager/default.nix index 76d7249ca8..e3ca8380c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmsis-pack-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmsis-pack-manager/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ appdirs milksnake pyyaml ]; - checkInputs = [ hypothesis jinja2 mock pytestCheckHook ]; + nativeCheckInputs = [ hypothesis jinja2 mock pytestCheckHook ]; preBuild = '' mkdir -p rust/target/release/deps diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix index 36e4bcf276..4efa160d27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cnvkit/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { rPackages.DNAcopy ]; - checkInputs = [ R ]; + nativeCheckInputs = [ R ]; checkPhase = '' pushd test/ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coconut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coconut/default.nix index 2628c19cb4..c51dd9ecc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coconut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coconut/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cpyparsing ipykernel mypy pygments prompt-toolkit watchdog ]; - checkInputs = [ pexpect pytestCheckHook tkinter ]; + nativeCheckInputs = [ pexpect pytestCheckHook tkinter ]; # Currently most tests have performance issues pytestFlagsArray = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix index 9c06cd2f8b..d9eedb626c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ./0001-Patch-LDCXXSHARED-for-macOS-along-with-LDSHARED.patch ]; - checkInputs = [ cocotb-bus pytestCheckHook swig verilog ]; + nativeCheckInputs = [ cocotb-bus pytestCheckHook swig verilog ]; preCheck = '' export PATH=$out/bin:$PATH mv cocotb cocotb.hidden diff --git a/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix index 20c80872fd..d63de1631a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { coverage ]; - checkInputs = [ + nativeCheckInputs = [ ddt mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix index 9ffe55d15f..f30cda165a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { rm tests/test_bench.py ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix index ca6d28f83d..0826ad13b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { websocket-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ] ++ passthru.optional-dependencies.pandas; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/collections-extended/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/collections-extended/default.nix index 867226c327..c4d20c23d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/collections-extended/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/collections-extended/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorama/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorama/default.nix index 1ae46cb2be..747823f2dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colorama/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colorama/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "colorama" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix index dd675373ef..8e77075f79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pyct ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mpl pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix index 9a3352ca14..dacb30a8e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-BP9NTdUUJ0/juZohu1L7lvJojAHpP7p77zciHny1bOA="; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix index 3ffdc6ffdd..44c47f569e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { humanfriendly ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock util-linux diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorful/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorful/default.nix index 061d01114e..d57be5da2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colorful/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colorful/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-fgxbj1WE9JcGt+oEcBguL0wQEWIn5toRTLWsvCFO3k8="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorlog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorlog/default.nix index 9c1be8c683..3a2e4ffa64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colorlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colorlog/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-vZS9IcHhP6x70xU/S8On3A6wl0uLwv3xqYnkdPblguU="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "colorlog" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colormath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colormath/default.nix index 7f9f9f1a9c..fb4ddfd9a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colormath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colormath/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ networkx numpy ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = "nosetests"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorzero/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorzero/default.nix index 4e74d9592a..01936cefd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colorzero/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colorzero/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { "colorzero" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cometblue-lite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cometblue-lite/default.nix index eea0b8dac0..89af6333ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cometblue-lite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cometblue-lite/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cometblue-lite"; - version = "0.5.3"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "neffs"; repo = "python-cometblue_lite"; - rev = version; - hash = "sha256-KRWS2nqMFlF+IcBSmnQH3ptp6yxRQjAFY6aY0D7eZBs="; + rev = "refs/tags/${version}"; + hash = "sha256-Cjd7PdZ2/neRr1jStDY5iJaGMJ/srnFmCea8aLNan6g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/comm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/comm/default.nix index e047717c8d..4cf5dcdf41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/comm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/comm/default.nix @@ -29,7 +29,7 @@ buildPythonPackage { traitlets ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix index c1d3b8916d..9f4dbe1b28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lark six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "commentjson" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix index 6b1d873069..064dfc770a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { typing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/commonmark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/commonmark/default.nix index 56ddf76630..1efefa4bf0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/commonmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/commonmark/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # UnicodeEncodeError on Python 2 doCheck = isPy3k; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; propagatedBuildInputs = [ future ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/compiledb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/compiledb/default.nix index 1892337dc2..35a78b7704 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/compiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/compiledb/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { --replace /bin/echo ${coreutils}/bin/echo ''; - checkInputs = [ pytest gcc coreutils ]; + nativeCheckInputs = [ pytest gcc coreutils ]; propagatedBuildInputs = [ click bashlex shutilwhich ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix index 0c1f376aea..cad402dc89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { fonttools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/confection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/confection/default.nix index 141b781069..08dccaafcf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/confection/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/confection/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { srsly ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configargparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configargparse/default.nix index 4479d1f248..7d4728374f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/configargparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/configargparse/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "1dsai4bilkp2biy9swfdx2z0k4akw4lpvx12flmk00r80hzgbglz"; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configclass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configclass/default.nix index 9856be48ac..8acf5aaad5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/configclass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/configclass/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mergedict ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "configclass" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configobj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configobj/default.nix index 3ea89db527..df12b6a98a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/configobj/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/configobj/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix index 3c130acdc2..908680c9e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preConfigure = '' export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/configupdater/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configupdater/default.nix index 8dae9c0f8c..b8fa44ca08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/configupdater/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/configupdater/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "configupdater" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/confuse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/confuse/default.nix index e28621f26a..25f9f3ef56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/confuse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/confuse/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix index 2db1e11b27..d4eb668d73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/connexion/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "connexion"; - version = "2.14.1"; + version = "2.14.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "spec-first"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8nWNFYW4DWAzIAsxgWPXOodlc2tuuGOktNo4N1G1oOc="; + hash = "sha256-1v1xCHY3ZnZG/Vu9wN/it7rLKC/StoDefoMNs+hMjIs="; }; propagatedBuildInputs = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { swagger-ui-bundle ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp-remotes decorator pytest-aiohttp @@ -70,6 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask"; homepage = "https://github.com/spec-first/connexion"; + changelog = "https://github.com/spec-first/connexion/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cons/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cons/default.nix index 03017a5361..3712a0c46d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cons/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cons/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { logical-unification ]; - checkInputs = [ + nativeCheckInputs = [ py pytestCheckHook pytest-html diff --git a/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix index a31930bd0c..b14d965e56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { protobuf ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/construct-classes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/construct-classes/default.nix index 479f070311..43c6f87391 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/construct-classes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/construct-classes/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { construct ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "construct_classes" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/construct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/construct/default.nix index ce6e0a65b3..676f39df6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/construct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/construct/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { lz4 ]; - checkInputs = [ pytestCheckHook numpy arrow ruamel-yaml cloudpickle ]; + nativeCheckInputs = [ pytestCheckHook numpy arrow ruamel-yaml cloudpickle ]; disabledTests = [ "test_benchmarks" ] ++ lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/container-inspector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/container-inspector/default.nix index 1dcf4e9b7a..8afbdc229b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/container-inspector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/container-inspector/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { commoncode ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix index 456999679f..b5ea34675f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-qx4r/h0B2Wjht+jZAjvFHvNQm7ohe7cwzuOCfh7oKGk="; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "contextlib2" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/contexttimer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/contexttimer/default.nix index 7cf41e9fcb..e7526ff7ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/contexttimer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/contexttimer/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "contexttimer" ]; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; checkPhase = '' ${python.interpreter} -m unittest tests/test_timer.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix index f80f16c519..96405864d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix @@ -50,7 +50,7 @@ let countourpy = buildPythonPackage rec { doCheck = false; # infinite recursion with matplotlib, tests in passthru - checkInputs = [ + nativeCheckInputs = [ matplotlib pillow pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix index b20066c51d..601799ba24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix index ce6912f34a..e4cf1138f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cookiecutter/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-85gr6NnFPawSYYZAE/3sf4Ov0uQu3m9t0GnF4UnFQNU="; }; - checkInputs = [ pytest pytest-cov pytest-mock freezegun ]; + nativeCheckInputs = [ pytest pytest-cov pytest-mock freezegun ]; propagatedBuildInputs = [ binaryornot jinja2 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coordinates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coordinates/default.nix index c7a24a0c3e..5c5e53e989 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coordinates/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coordinates/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1zha594rshjg3qjq9mrai2hfldya282ihasp2i3km7b2j4gjdw2b"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coqpit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coqpit/default.nix index aee115f5e0..ad1fdb35ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coqpit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coqpit/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-FY3PYd8dY5HFKkhD6kBzPt0k1eFugdqsO3yIN4oDk3E="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coreapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coreapi/default.nix index ad9fd3d7ef..3e8a540904 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coreapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coreapi/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' cd ./tests pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coreschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coreschema/default.nix index d22e7f4ecd..a36a6838c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coreschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coreschema/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' cd ./tests pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/corsair-scan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/corsair-scan/default.nix index e7c016be06..ecebf7f92c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/corsair-scan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/corsair-scan/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix index 20ccfd6e0a..9b7914e5b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix index 7c4b4525c8..2a30bed993 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; meta = { description = "Code coverage measurement for python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix index 72e8f6d45a..7c68a33483 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "b32a8bb5d2df585207c119d6c01567b81fba690c9c10a753bfe27a335bfc43ea"; }; - checkInputs = [ + nativeCheckInputs = [ mock sh pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cppe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cppe/default.nix index 52031bab74..9fa87ab806 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cppe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cppe/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; - checkInputs = [ + nativeCheckInputs = [ pytest h5py numba diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cppy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cppy/default.nix index 5b7e092c42..5b982d6128 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cppy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cppy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "cppy" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix index b41ddf71da..97423234f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cpyparsing/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; - checkInputs = [ pexpect ]; + nativeCheckInputs = [ pexpect ]; checkPhase = '' ${python.interpreter} tests/cPyparsing_test.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cram/default.nix index ff156187a3..c451288f00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cram/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { version = "0.7"; pname = "cram"; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix index b132a0d02a..b0ca3c0ac0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cramjam/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { buildInputs = lib.optional stdenv.isDarwin libiconv; - checkInputs = [ + nativeCheckInputs = [ brotli hypothesis lz4 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix index c81f2c733a..5ba9a0f769 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { geojson ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix index 0b2f51c551..0a9302b884 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix @@ -21,7 +21,7 @@ in buildPythonPackage { hash = "sha256-nujt3RWupvCtk7gORejtSwqqVjW9VwztOVGXBHW9T+k="; }; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crcmod/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crcmod/default.nix index 082369baf7..70053eb167 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crcmod/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crcmod/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)"; - homepage = "http://crcmod.sourceforge.net/"; + homepage = "https://crcmod.sourceforge.net/"; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix index 6b38e0c02d..fcd9247ae1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytz tzlocal diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cronsim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cronsim/default.nix index dc9caf3f53..ef4e533a97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cronsim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cronsim/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-ebFYIOANXZLmM6cbovwBCJH8Wr/HlJbOR9YGp8Jw7pc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crossplane/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crossplane/default.nix index 195e733ee8..20b4d4204f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crossplane/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crossplane/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-DfIF+JvjIREi7zd5ZQ7Co/CIKC5iUeOgR/VLDPmrtTQ="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-cloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-cloud/default.nix index 8b02eaa589..632f0812f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-cloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-cloud/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { certifi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-core/default.nix index 0f793480eb..544eb25ada 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crownstone-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crownstone-core/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pyaes ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix index 7f746655c7..b8cf310a06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix @@ -60,9 +60,10 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ cryptography-vectors - hypothesis + # "hypothesis" indirectly depends on cryptography to build its documentation + (hypothesis.override { enableDocumentation = false; }) iso8601 pretend py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crysp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crysp/default.nix index 34f5d2c2f3..dd8d43eac8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crysp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crysp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { matplotlib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssselect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssselect/default.nix index 3ca8f8d204..0accd8c6cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cssselect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cssselect/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook lxml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix index bb9c16ae74..16a1a16095 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tinycss2 ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "cssselect2" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix index 4bac08d665..0f37366ed7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ cssselect jaraco-test lxml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix index 7ae79f4ec5..3a973db3ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { uritemplate ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cu2qu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cu2qu/default.nix index b62b4cb11a..ddad0b741b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cu2qu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cu2qu/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { fonttools ] ++ fonttools.optional-dependencies.ufo; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix index b2494e9c17..b0cdc10735 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "e314d5fed6eebb2f90380271f562248fb15e18636764faf40f4dde4b28b1f960"; }; - checkInputs = [ + nativeCheckInputs = [ py pytestCheckHook pytest-html diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix index 42f1d77b12..53d0d78cc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { statsmodels ]; - checkInputs = [ pytest nose ]; + nativeCheckInputs = [ pytest nose ]; # ignore tests which are incompatible with pandas>=1.0 # https://github.com/santosjorge/cufflinks/issues/236 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix index 5af0f08130..33758514a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix @@ -1,20 +1,29 @@ -{ lib, buildPythonPackage -, fetchPypi, isPy3k, cython -, fastrlock, numpy, six, wheel, pytestCheckHook, mock, setuptools +{ lib +, buildPythonPackage +, fetchPypi +, cython +, fastrlock +, numpy +, wheel +, pytestCheckHook +, mock +, setuptools , cudaPackages , addOpenGLRunpath +, pythonOlder }: let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "11.4.0"; - disabled = !isPy3k; + version = "11.5.0"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-A9UrJibgKjorRtcUwc0D5wLI/jORX8ym7Y3lxTmWT0k="; + hash = "sha256-S8hWW97SLMibIQ/Z+0il1TFvMHAeErsjhSpgMU4fn24="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both @@ -42,12 +51,11 @@ in buildPythonPackage rec { nccl fastrlock numpy - six setuptools wheel ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; @@ -67,6 +75,7 @@ in buildPythonPackage rec { meta = with lib; { description = "A NumPy-compatible matrix library accelerated by CUDA"; homepage = "https://cupy.chainer.org/"; + changelog = "https://github.com/cupy/cupy/releases/tag/v${version}"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ hyphon81 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix index 931da001fe..19a09d100e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/curio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-VipYbbICFrp9K+gmPeuesHnlYEj5uJBtEdX0WqgcUkc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix index 2c63de46fd..ac36041deb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/curtsies/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { backports-cached-property ]; - checkInputs = [ + nativeCheckInputs = [ pyte pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvelib/default.nix index 2534f96bab..6d9efc36e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cvelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cvelib/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvss/default.nix index d48d6be586..9f4979c532 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cvss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cvss/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "cvss"; - version = "2.5"; + version = "2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,10 +17,10 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-6S646cvm+UwdpRGOtCuNijWcUxhZD6IG407hNBz+NA4="; + sha256 = "sha256-gD9MreJQPaxziy02Wt3BGFiIoQ/+pW3KqiNfNlTijJY="; }; - checkInputs = [ + nativeCheckInputs = [ jsonschema pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix index 31772c2693..c546d11ec3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix @@ -1,8 +1,10 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchPypi , isPyPy , python +, openblas , blas , lapack # build segfaults with 64-bit blas , suitesparse @@ -28,13 +30,23 @@ buildPythonPackage rec { sha256 = "sha256-ALGyMvnR+QLVeKnXWBS2f6AgdY1a5CLijKjO9iafpcY="; }; - buildInputs = [ blas lapack ]; + buildInputs = (if stdenv.isDarwin then [ openblas ] else [ blas lapack ]); + doCheck = !stdenv.isDarwin; # similar to Gsl, glpk, fftw there is also a dsdp interface # but dsdp is not yet packaged in nixpkgs - preConfigure = '' + preConfigure = (if stdenv.isDarwin then + '' + export CVXOPT_BLAS_LIB=openblas + export CVXOPT_LAPACK_LIB=openblas + '' + else + '' export CVXOPT_BLAS_LIB=blas export CVXOPT_LAPACK_LIB=lapack + '') + + '' + export CVXOPT_BUILD_DSDP=0 export CVXOPT_SUITESPARSE_LIB_DIR=${lib.getLib suitesparse}/lib export CVXOPT_SUITESPARSE_INC_DIR=${lib.getDev suitesparse}/include '' + lib.optionalString withGsl '' @@ -51,7 +63,7 @@ buildPythonPackage rec { export CVXOPT_FFTW_INC_DIR=${fftw.dev}/include ''; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; 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 89b6612763..3fd18bd030 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cvxpy/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { export LDFLAGS="-lgomp" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "./cvxpy" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix index 99be1ee674..03b7d84224 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython setuptools ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' # Hack needed to make pytest + cython work # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix index 1c63c6605d..9190cf882d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cwl-upgrader/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { schema-salad ]; - checkInputs = [ + nativeCheckInputs = [ pytest-xdist pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cwl-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cwl-utils/default.nix index b0459f3961..2f605950bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cwl-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cwl-utils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cwl-utils"; - version = "0.21"; + version = "0.22"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "common-workflow-language"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-y1zuYaxoE0XUk8UpCLsg4ty0sn+5Uu4ztRnUoJezO/o="; + hash = "sha256-vOIheOcDG8qdPtcN0kkBN3URodknDLTC7BzYGIiD2RA="; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { schema-salad ]; - checkInputs = [ + nativeCheckInputs = [ cwlformat pytest-mock pytest-xdist diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cwlformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cwlformat/default.nix index 201155eac5..28da8e50be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cwlformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cwlformat/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ruamel-yaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cycler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cycler/default.nix index b9bd167c6a..9df0592512 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cycler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cycler/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "9c87405839a19696e837b3b818fed3f5f69f16f1eec1a1ad77e043dcea9c772f"; }; - checkInputs = [ coverage nose ]; + nativeCheckInputs = [ coverage nose ]; propagatedBuildInputs = [ six ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 7b9ff4c894..c2340dbced 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { types-toml ]; - checkInputs = [ + nativeCheckInputs = [ ddt jsonschema lxml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cymem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cymem/default.nix index 6292bf259e..bb78eb5eb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cymem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cymem/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { cython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix index db95ee9e62..77b7031db3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { yoyo-migrations ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov webtest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix index 85b8c7a11e..314f27f17d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { homepage = "https://github.com/pytoolz/cytoolz/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/d2to1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/d2to1/default.nix index 8a48ddcb13..eaad9fc909 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/d2to1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/d2to1/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "d2to1"; version = "0.2.12.post1"; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; src = fetchFromGitHub { owner = "embray"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dacite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dacite/default.nix index 12b14b226d..a33a26d522 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dacite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dacite/default.nix @@ -2,13 +2,12 @@ , fetchFromGitHub , buildPythonPackage , pythonOlder -, pythonAtLeast , pytestCheckHook }: buildPythonPackage rec { pname = "dacite"; - version = "1.7.0"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,10 +16,15 @@ buildPythonPackage rec { owner = "konradhalas"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+yWvlJcOmqDkHl3JZfPnIV3C4ieSo4FiBvoUZ0+J4N0="; + hash = "sha256-aQwQHFWaXwTaA6GQgDcWT6ivE9YtWtHCTOtxDi503+M="; }; - checkInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--benchmark-autosave --benchmark-json=benchmark.json" "" + ''; + + nativeCheckInputs = [ pytestCheckHook ]; @@ -28,6 +32,10 @@ buildPythonPackage rec { "dacite" ]; + disabledTestPaths = [ + "tests/performance" + ]; + meta = with lib; { description = "Python helper to create data classes from dictionaries"; homepage = "https://github.com/konradhalas/dacite"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/daemonocle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/daemonocle/default.nix index 0bdc795159..e673dd1adf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/daemonocle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/daemonocle/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook lsof ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix index e4bbb16abb..70150799f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { twisted ] ++ twisted.optional-dependencies.tls; - checkInputs = [ + nativeCheckInputs = [ django hypothesis pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dasbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dasbus/default.nix index 14c2ef9223..a7e0b75427 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dasbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dasbus/default.nix @@ -1,16 +1,20 @@ -{ lib, buildPythonPackage, fetchPypi, pygobject3, dbus }: +{ lib, buildPythonPackage, fetchFromGitHub, pygobject3, dbus, hatchling, pytestCheckHook }: buildPythonPackage rec { pname = "dasbus"; - version = "1.7"; + version = "unstable-11-10-2022"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-qIUNhBrf6O5fe7n4LPRJq5tJUNwGM4lwcXGODQA2tvY="; + src = fetchFromGitHub { + owner = "rhinstaller"; + repo = pname; + rev = "64b6b4d9e37cd7e0cbf4a7bf75faa7cdbd01086d"; + hash = "sha256-TmhhDrfpP+nUErAd7dUb+RtGBRtWwn3bYOoIqa0VRoc="; }; + nativeBuildInputs = [ hatchling ]; propagatedBuildInputs = [ pygobject3 ]; - checkInputs = [ dbus ]; + nativeCheckInputs = [ dbus pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/rhinstaller/dasbus"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix index 6933af850a..5140a0a6cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix index d0c7b128bc..28bcc8fbb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { sparse ] ++ dask.optional-dependencies.array; - checkInputs = [ + nativeCheckInputs = [ sparse pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix index 7f278b50a5..b658a6e8db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-image/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pims ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook scikitimage ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix index c014f0f3c2..6061b29473 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { docrep ]; - checkInputs = [ + nativeCheckInputs = [ cryptography pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-yarn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-yarn/default.nix index 23f3d54a79..b9204f0eb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-yarn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-yarn/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { skein ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix index e64d98fd4f..f859a43bd1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ fastparquet pyarrow pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix index 78311fb6e3..b01564c7ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix index a4923a0d9a..75f6130f7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { tabulate ]; - checkInputs = [ + nativeCheckInputs = [ decorator mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix index d5a765da18..e698d53f43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pyarrow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix index 9f32be70a5..12dfea0650 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { marshmallow-enum ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis mypy pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-serialization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-serialization/default.nix index 72ef9877d1..a52135ddaf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-serialization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-serialization/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { toposort ]; - checkInputs = [ + nativeCheckInputs = [ bson pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix index 7d32650302..6a258cf730 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ++ lib.optional (pythonOlder "3.5") typing ++ lib.optional (pythonOlder "3.0") configparser; - checkInputs = [ + nativeCheckInputs = [ click freezegun mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix index 4b36df22d1..fb991dabf3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datafusion/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { pyarrow ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; pythonImportsCheck = [ "datafusion" ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datapoint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datapoint/default.nix index b5d86acf2a..4b68fe24b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datapoint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datapoint/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasette-publish-fly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasette-publish-fly/default.nix index 9248588df2..521b408b52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datasette-publish-fly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasette-publish-fly/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "datasette-publish-fly"; - version = "1.2"; + version = "1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,15 +18,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "simonw"; repo = pname; - rev = version; - hash = "sha256-0frP/RkpZX6LCR8cOlzcBG3pbcOh0KPuELlYUXS3dRE="; + rev = "refs/tags/${version}"; + hash = "sha256-L94QYcrTWjuoz0aEFTxPi8Xg0xERP1zCs7+vzhoJagc="; }; propagatedBuildInputs = [ datasette ]; - checkInputs = [ + nativeCheckInputs = [ cogapp pytest-mock pytestCheckHook @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Datasette plugin for publishing data using Fly"; homepage = "https://datasette.io/plugins/datasette-publish-fly"; + changelog = "https://github.com/simonw/datasette-publish-fly/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix index c0833f34a0..6781f82135 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix @@ -67,7 +67,7 @@ buildPythonPackage rec { uvicorn ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp beautifulsoup4 pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix index a72bc5b22b..f526438afa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { scipy ] ++ dask.optional-dependencies.complete; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist nbsmoke diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashape/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashape/default.nix index 50bde25cf4..a7964914d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datashape/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datashape/default.nix @@ -28,7 +28,7 @@ in buildPythonPackage rec { sha256 = "0rhlj2kjj1vx5m73wnc5518rd6cs1zsbgpsvzk893n516k69shcf"; }; - checkInputs = [ pytest mock ]; + nativeCheckInputs = [ pytest mock ]; propagatedBuildInputs = [ numpy multipledispatch python-dateutil ]; # Disable several tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix index a2fb8aba71..222399fdfd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ typesentry blessed ]; buildInputs = [ llvm pipInstallHook ]; - checkInputs = [ docutils pytestCheckHook ]; + nativeCheckInputs = [ docutils pytestCheckHook ]; LLVM = llvm; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-isystem ${lib.getDev libcxx}/include/c++/v1"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix index da6ffe3bd2..ec2643eaa5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { "datauri" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix index 54d33dd90b..2b5223c044 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dateparser/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { langdetect = [ langdetect ]; }; - checkInputs = [ + nativeCheckInputs = [ parameterized pytestCheckHook gitpython diff --git a/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix index db9d6bde16..01d4cbe8f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pyarrow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix index 5bb53995c0..b8f2fffe0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.83.1"; + version = "1.84.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hfO4dbMA6efQPwP0Bp/5IDb7mLHf1NuTuiJjhHivG6I="; + hash = "sha256-AdfrzN7ufvy77tKjnHPNo+jHoHRw9fXtdUdYvdnMAjs="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix index f53b94efda..c8f8714e56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-next/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-EKEQZFRUe+E65Z6DNCJFL5uCI5kbXrN7Tzd4O0X5Cqo="; }; - checkInputs = [ + nativeCheckInputs = [ dbus pytest pytest-cov diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-python-client-gen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-python-client-gen/default.nix index 02b973d145..ee4a467b57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-python-client-gen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-python-client-gen/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { dbus-python ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix index 8b0eb3f3cf..026f69d9f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis hs-dbus-signature diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus/default.nix index 81052c62ca..5e1053fc1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ++ lib.optional (! python ? modules) ncurses; doCheck = isPy3k; - checkInputs = [ dbus.out pygobject3 ]; + nativeCheckInputs = [ dbus.out pygobject3 ]; postInstall = '' cp -r dbus_python.egg-info $out/${python.sitePackages}/ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix index 8994e1d28c..e070e617e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbutils/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-+t65eeFAbcEj4tuZVfMU4NU2DzBOC9bPBHqqX8P99bM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dcmstack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dcmstack/default.nix index ee554a6e2b..08dcbb796a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dcmstack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dcmstack/default.nix @@ -1,34 +1,32 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonAtLeast -, nose +, pythonOlder +, pytestCheckHook , nibabel , pydicom +, pylibjpeg-libjpeg }: buildPythonPackage rec { pname = "dcmstack"; - version = "0.8"; - - disabled = pythonAtLeast "3.8"; - # https://github.com/moloney/dcmstack/issues/67 + version = "0.9"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "moloney"; repo = pname; - rev = "v${version}"; - sha256 = "1n24pp3rqz7ss1z6276fxynnppraxadbl3b9p8ijrcqnpzbzih7p"; + rev = "refs/tags/v${version}"; + hash = "sha256-GVzih9H2m2ZGSuZMRuaDG78b95PI3j0WQw5M3l4KNCs="; }; - propagatedBuildInputs = [ nibabel pydicom ]; + propagatedBuildInputs = [ + nibabel + pydicom + pylibjpeg-libjpeg + ]; - checkInputs = [ nose ]; - checkPhase = '' - runHook preCheck - nosetests - runHook postCheck - ''; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/moloney/dcmstack"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix index 1cb769d415..f92e0c331b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { enum34 ]; - checkInputs = [ six pyyaml mock pytestCheckHook ]; + nativeCheckInputs = [ six pyyaml mock pytestCheckHook ]; preCheck = '' # pytest can't import one file even with PYTHONPATH set diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deal-solver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deal-solver/default.nix index c7241d5014..dc66675dc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deal-solver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deal-solver/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { astroid ] ++ z3.requiredPythonModules; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deal/default.nix index 3a91e8afeb..98981a65ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deal/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { typeguard ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook docstring-parser diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix index 56b630fda6..defe0b6907 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy matplotlib ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests --verbosity=3 ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debian-inspector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debian-inspector/default.nix index 3888020ccd..7568f9af91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debian-inspector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debian-inspector/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { commoncode ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debtcollector/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/debtcollector/tests.nix index 21d49ac983..5c10dc9090 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debtcollector/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debtcollector/tests.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ debtcollector stestr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debts/default.nix index cc571f0563..7055a3736b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debts/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # for some reason tests only work if the module is properly installed checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debuglater/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debuglater/default.nix index 4c598e8794..8eabbacf7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debuglater/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debuglater/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ numpy pandas pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix index d5f500cb40..c45d662139 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "debugpy"; - version = "1.6.5"; + version = "1.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "Microsoft"; - repo = pname; + owner = "microsoft"; + repo = "debugpy"; rev = "refs/tags/v${version}"; - sha256 = "sha256-98hyNer2Xtx6D2R3pFhLC3tb/2DFTawXO36xfwhIfEg="; + sha256 = "sha256-GanRWzGyg0Efa+kuU7Q0IOmO0ohXZIjuz8RZYERTpzo="; }; patches = [ @@ -69,7 +69,7 @@ buildPythonPackage rec { }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")} )''; - checkInputs = [ + nativeCheckInputs = [ django flask gevent diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deep_merge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deep_merge/default.nix index 2c59d4ab69..ad87934736 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deep_merge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deep_merge/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "tUQV+Qk0xC4zQRTihky01OczWzStOW41rYYQyWBlpH4="; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix index bf296db381..b4921b2d1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deepdiff/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ jsonpickle numpy pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deepdish/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deepdish/default.nix index 6ae9316a0f..0b04c2cc44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepdish/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deepdish/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { "deepdish" ]; - # checkInputs = [ + # nativeCheckInputs = [ # pandas # ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix index 2c685abf80..d35395881c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deepmerge/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deeptoolsintervals/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deeptoolsintervals/default.nix index 0dde3c51c3..89cebb91ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deeptoolsintervals/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deeptoolsintervals/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ zlib xz ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { homepage = "https://deeptools.readthedocs.io/en/develop"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deepwave/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deepwave/default.nix index 37cb3968da..986a0ca8d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepwave/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deepwave/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ torch pybind11 ]; - checkInputs = [ + nativeCheckInputs = [ which scipy pytest-xdist diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix index 01223be0b6..e1e8d056cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ environs pytest-mock pytest-vcr 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 1cfa630337..4bb079e9be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { fonttools ]; - checkInputs = [ + nativeCheckInputs = [ fontpens fs lxml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deform/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deform/default.nix index 5698dcbe49..42c1602a39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deform/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deform/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { zope_deprecation ]; - checkInputs = [ + nativeCheckInputs = [ nose coverage beautifulsoup4 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deltachat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deltachat/default.nix index 9a4d924b71..d0bdc0cd71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deltachat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deltachat/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/demetriek/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/demetriek/default.nix index 99b889eae2..8330ec6ec7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/demetriek/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/demetriek/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dendropy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dendropy/default.nix index 08c7946827..d37d188a25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dendropy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dendropy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-FP0+fJkkFtSysPxoHXjyMgF8pPin7aRyzmHe9bH8LlM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/denonavr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/denonavr/default.nix index 5a48fc35f4..14fe85c6af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/denonavr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/denonavr/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.10.12"; + version = "0.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "scarface-4711"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QNiDoPjOuwwAgUqDzXHzn0BE9bwXQrQKAIFlHCywl88="; + hash = "sha256-0zclIoEGKjA8Ro8k+HYX/d77U+ntQZv0vq6gC4Sa7zE="; }; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { netifaces ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook pytest-httpx @@ -49,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automation Library for Denon AVR receivers"; homepage = "https://github.com/scarface-4711/denonavr"; + changelog = "https://github.com/ol-iver/denonavr/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ colemickens ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix index a4dfd60c92..ff00a9fd20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dependency-injector/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ fastapi httpx mypy-boto3-s3 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deploykit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deploykit/default.nix index 87f734169a..e89eab8c0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deploykit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deploykit/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ bash openssh pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix index 40c20a40c2..933e55e184 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deprecated/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deprecation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deprecation/default.nix index e32e8cc5df..5e3ddf7b07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deprecation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deprecation/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "A library to handle automated deprecations"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix index 85ee0e51bf..d14b3d523b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix index 3560cee180..c437a1b565 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { llvmPackages.openmp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist matplotlib diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix index 5485372a1e..737ec13ad6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { websocket-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devolo-plc-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devolo-plc-api/default.nix index 4b7e1c21e4..e8bccf2928 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "devolo-plc-api"; - version = "0.9.0"; - format = "setuptools"; + version = "1.1.0"; + format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "2Fake"; repo = "devolo_plc_api"; - rev = "v${version}"; - sha256 = "sha256-FBcDEEWgfV+OgHriSOZKWZPt0O89nDe2CsY3oqX/6zo="; + rev = "refs/tags/v${version}"; + hash = "sha256-xM7g6q18A+qmOhQeey4uxs6ow6Hf5YKDdbpXwYr2RXo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -39,22 +39,21 @@ buildPythonPackage rec { zeroconf ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpx pytest-mock pytestCheckHook ]; - - pythonImportsCheck = [ "devolo_plc_api" ]; meta = with lib; { - description = "Python module to interact with Devolo PLC devices"; + description = "Module to interact with Devolo PLC devices"; homepage = "https://github.com/2Fake/devolo_plc_api"; + changelog = "https://github.com/2Fake/devolo_plc_api/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix index 4f3cc587fd..6d41bc86ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devpi-common/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "devpi-common"; - version = "3.7.1"; + version = "3.7.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Y4LSWo6sbHn239qSdQjwfZO4cyNyoGFQVVGvZbRgYfQ="; + sha256 = "sha256-kHiYknmteenBgce63EpzhGBEUYcQHrDLreZ1k01eRkQ="; }; postPatch = '' @@ -25,7 +25,7 @@ buildPythonPackage rec { lazy ]; - checkInputs = [ + nativeCheckInputs = [ py pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix index f8aa63d7a2..6f3f9b7479 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/devtools/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; 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 46c4a8928a..f7dda6214a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diagrams/default.nix @@ -9,19 +9,21 @@ , inkscape , imagemagick , pytestCheckHook +, typed-ast }: buildPythonPackage rec { pname = "diagrams"; - version = "0.23.1"; + version = "0.23.3"; format = "pyproject"; - disabled = pythonOlder "3.6"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mingrammer"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-gVUlP3offTgHUBTTIzTBf7b2NpBjGlAHYQQxe6ks0v8="; + hash = "sha256-4b+jmR56y2VV0XxD6FCmNpDB0UKH9+FqcTQuU2jRCXo="; }; postPatch = '' @@ -40,20 +42,33 @@ buildPythonPackage rec { ./remove-black-requirement.patch ]; - checkInputs = [ pytestCheckHook ]; - # Despite living in 'tool.poetry.dependencies', # these are only used at build time to process the image resource files - nativeBuildInputs = [ inkscape imagemagick jinja2 poetry-core round ]; + nativeBuildInputs = [ + inkscape imagemagick + jinja2 + poetry-core + round + ]; - propagatedBuildInputs = [ graphviz ]; + propagatedBuildInputs = [ + graphviz + typed-ast + ]; - pythonImportsCheck = [ "diagrams" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "diagrams" + ]; meta = with lib; { description = "Diagram as Code"; - homepage = "https://diagrams.mingrammer.com/"; - license = licenses.mit; - maintainers = with maintainers; [ addict3d ]; + homepage = "https://diagrams.mingrammer.com/"; + changelog = "https://github.com/mingrammer/diagrams/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ addict3d ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diagrams/remove-black-requirement.patch b/third_party/nixpkgs/pkgs/development/python-modules/diagrams/remove-black-requirement.patch index dcf9b4d2ad..d6c9b42270 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diagrams/remove-black-requirement.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/diagrams/remove-black-requirement.patch @@ -1,8 +1,17 @@ +From bf081e60a7f604d2e71cf5c315dd90c48dd96808 Mon Sep 17 00:00:00 2001 +From: Fabian Affolter +Date: Thu, 26 Jan 2023 15:35:47 +0100 +Subject: [PATCH] Update autogen.sh + +--- + autogen.sh | 9 --------- + 1 file changed, 9 deletions(-) + diff --git a/autogen.sh b/autogen.sh -index acbcacb..1f60b83 100755 +index f5e065b35..b6cef5bf9 100755 --- a/autogen.sh +++ b/autogen.sh -@@ -21,11 +21,6 @@ +@@ -37,11 +37,6 @@ if ! [ -x "$(command -v convert)" ]; then exit 1 fi @@ -14,10 +23,10 @@ index acbcacb..1f60b83 100755 # preprocess the resources for pvd in "${providers[@]}"; do # convert the svg to png for azure provider -@@ -55,7 +50,3 @@ - # Generate doc for custom module - echo "generating the docs for custom" - python -m scripts.generate "custom" +@@ -75,7 +70,3 @@ python -m scripts.generate "custom" + # copy icons across to website + echo "copying icons to website static folder" + cp -r resources website/static/img/ - -# run black -echo "linting the all the diagram modules" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix index 5655e18bae..cadc22fcbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diceware/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ coverage pytest ]; + nativeCheckInputs = [ coverage pytest ]; # see https://github.com/ulif/diceware/commit/a7d844df76cd4b95a717f21ef5aa6167477b6733 checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dicom-numpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dicom-numpy/default.nix new file mode 100644 index 0000000000..c1248ad214 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dicom-numpy/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, numpy +, pydicom +}: + +buildPythonPackage rec { + pname = "dicom-numpy"; + version = "0.6.3"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "innolitics"; + repo = pname; + rev = "v${version}"; + hash = "sha256-QIPuSFaWgHmcTddZ8H9kgzLYuwGUzy/FVsi/ttSUskA="; + }; + + propagatedBuildInputs = [ + numpy + pydicom + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dicom_numpy" + ]; + + meta = with lib; { + description = "Read DICOM files into Numpy arrays"; + homepage = "https://github.com/innolitics/dicom-numpy"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix index 0a93443133..22e7f70b9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dicom2nifti/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { substituteInPlace tests/test_generic.py --replace "from common" "from dicom2nifti.common" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "dicom2nifti" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dictdiffer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dictdiffer/default.nix index 5e043e55f8..2bb16eb097 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dictdiffer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dictdiffer/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dictpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dictpath/default.nix deleted file mode 100644 index d6effb6291..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/dictpath/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, six -}: - -buildPythonPackage rec { - pname = "dictpath"; - version = "0.4.3"; - - src = fetchFromGitHub { - owner = "p1c2u"; - repo = "dictpath"; - rev = "refs/tags/${version}"; - sha256 = "sha256-4QRFjbeaggoEPVGAmSY+qVMNW0DKqarNfRXaH6B58ew="; - }; - - postPatch = '' - sed -i "/^addopts/d" setup.cfg - ''; - - checkInputs = [ - pytestCheckHook - six - ]; - - pythonImportsCheck = [ "dictpath" ]; - - meta = with lib; { - description = "Object-oriented dictionary paths"; - homepage = "https://github.com/p1c2u/dictpath"; - license = licenses.asl20; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix index 6fa5e5774d..3f650e6075 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diff-cover/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { tomli ]; - checkInputs = [ + nativeCheckInputs = [ pycodestyle pyflakes pylint diff --git a/third_party/nixpkgs/pkgs/development/python-modules/digitalocean/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/digitalocean/default.nix index 5e45a1785a..09ff7c52bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/digitalocean/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/digitalocean/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; - checkInputs = [ + nativeCheckInputs = [ pytest pytestCheckHook responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dinghy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dinghy/default.nix index 3dbb5cd029..fa62731071 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dinghy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dinghy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dinghy"; - version = "1.0.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "nedbat"; repo = pname; rev = version; - hash = "sha256-hrRs4hBRckUMsDGix+6GMr5VwyhXl/ib3jon7VNca1Y="; + hash = "sha256-xtcNcykfgcWvifso0xaeMT31+G5x4HCp+tLAIEEq4cw="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dipy/default.nix index 3712dfbaee..8a69a5f7de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dipy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , packaging , pytest , cython @@ -14,15 +14,15 @@ buildPythonPackage rec { pname = "dipy"; - version = "1.4.1"; + version = "1.5.0"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { - owner = "dipy"; - repo = pname; - rev = version; - sha256 = "0zaqsiq73vprbqbzvzswjfmqgappl5vhpl2fwjrrda33c27klpzj"; + owner = "dipy"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-kJ8JbnNpjTqGJXwwMTqZdgeN8fOEuxarycunDCRLB74="; }; nativeBuildInputs = [ cython packaging ]; @@ -34,7 +34,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # disable tests for now due to: # - some tests require data download (see dipy/dipy/issues/2092); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/directv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/directv/default.nix index 5f8c40c075..34202a4b1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/directv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/directv/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix index b33591e8d0..50f4b03123 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dirty-equals/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix index c8be2979b3..49a563fcba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/discogs-client/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix index 6b69ecfc98..fb3904046b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix index 6a8d1e59ce..30eb172513 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-c/k8mx/T4RkseDobJ2gtcuom0A6Ewyw4aP2Bk9pxV+o="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytest-xdist pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix index b0d62d08e7..e13da65aee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cim/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix index 515b8c29af..3e807d3bd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-clfs/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { dissect-cstruct ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix index 5954ee42a4..722e1a75f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-cstruct/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix index 14934219d5..74c8bdf9ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-esedb/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix index 57b3acabb9..ffde954907 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-etl/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix index 32615feaba..7fa3e68cab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-eventlog/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix index edcf50d024..f6608aac9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-evidence/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix index 1c0dd08a63..45aea2685d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-extfs/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix index 12fe8b3cdc..fd4d4372e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-ffs/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix index cebcb58d3f..92c885907f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-hypervisor/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix index e8dd533353..1b27129e9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-ntfs/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix index 3401d077a8..d731aeb68a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-regf/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix index c66db48eba..4a4b380212 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix index 26fc171193..55e52c9c91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-sql/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix index 6e661c70f0..0c69d93ef3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-target/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.full; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix index 9187fd0fe2..ca48d44d34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-thumbcache/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix index db19e65a91..cac7233b9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-util/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix index eb7b552a63..a520ce8c05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-vmfs/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix index 42ff049b9d..cff900efbe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-volume/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix index 782f80b549..60a7ee1abb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissect-xfs/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dissect-util ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dissononce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dissononce/default.nix index 80655e6aa0..f3d903f91c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dissononce/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dissononce/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0hn64qfr0d5npmza6rjyxwwp12k2z2y1ma40zpl104ghac6g3mbs"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' HOME=$(mktemp -d) py.test tests/ ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distorm3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distorm3/default.nix index 715e8c3571..5748effd39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distorm3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distorm3/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "012bh1l2w7i9q8rcnznj3x0lra09d5yxd3r42cbrqdwl1mmg26qn"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook yasm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix index 6ca29f81c6..cd9ab15d1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { tensorflow-probability ]; - checkInputs = [ + nativeCheckInputs = [ dm-haiku pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix index be31d9cd47..2ed3df7798 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { djangorestframework ]; - checkInputs = [ + nativeCheckInputs = [ django-allauth djangorestframework-simplejwt responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-annoying/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-annoying/default.nix index 3e062f29a0..5d4afc37b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-annoying/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-annoying/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { DJANGO_SETTINGS_MODULE = "tests.settings"; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix index aca3c6735c..ed44bc75f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-anymail/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { boto3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-django mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix index 26138a4ab4..faa37e0cfa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-autocomplete-light/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { # Too many un-packaged dependencies doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook django-debug-toolbar django-extensions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix index dee64ebd6e..d70abd2d64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-cache-url/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sed -i '/--cov/d' setup.cfg ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/epicserve/django-cache-url"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix index b8d76ebe7b..0280f693e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-celery-beat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-beat/default.nix index b933a1f89c..53a3ca85da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-celery-beat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-beat/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { tzdata ]; - checkInputs = [ + nativeCheckInputs = [ ephem pytest-timeout pytest-django diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-celery-email/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-email/default.nix index 950fb4f75e..73f81e88be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-celery-email/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-email/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { DJANGO_SETTINGS_MODULE = "tests.settings"; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix index 9a399ed6ed..4351f371af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-cleanup/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "922e06ef8839c92bd3ab37a84db6058b8764f3fe44dbb4487bbca941d288280a"; }; - checkInputs = [ django ]; + nativeCheckInputs = [ django ]; meta = with lib; { description = "Automatically deletes old file for FileField and ImageField. It also deletes files on models instance deletion"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix index 05c525c0cc..6cea823956 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { doCheck = false; # missing package django-sekizai - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 brotli pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix index f6a9544051..237e4548d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ mock dj-database-url dj-email-url diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix index 452c00b6e3..5174f44cca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { django ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-forms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-forms/default.nix index 2677d8ec52..535eddb3b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-forms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-crispy-forms/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # FIXME: RuntimeError: Model class source.crispy_forms.tests.forms.CrispyTestModel doesn't declare an explicit app_label and isn't in an application in INSTALLED_APPS. doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-debug-toolbar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-debug-toolbar/default.nix index 22b7c8caf7..9f54b9b9ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { TEST_ARGS = "tests"; DJANGO_SETTINGS_MODULE = "tests.settings"; - checkInputs = [ + nativeCheckInputs = [ html5lib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix index 4253d69fea..462c4674c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - checkInputs = [ + nativeCheckInputs = [ factory_boy mock pygments # not explicitly declared in setup.py, but some tests require it diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-filter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-filter/default.nix index bf4e342cc2..24c2c6d15b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-filter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-filter/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { # Tests fail (needs the 'crispy_forms' module not packaged on nixos) doCheck = false; - checkInputs = [ + nativeCheckInputs = [ djangorestframework django mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix index c6636ee5ea..2842a085d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - checkInputs = [ + nativeCheckInputs = [ django-environ mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix index b391fcac49..f953de0770 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { django ]; - checkInputs = [ + nativeCheckInputs = [ geopy nose pysolr diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-health-check/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-health-check/default.nix index 65fea17869..f4bb2db23c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-health-check/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-health-check/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { gitMinimal ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix index ccd285757c..624c5ba258 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0m98lchp2y43886n67j4s7miyd50pg2r5r966vjnxmd7nx7qkihf"; }; - checkInputs = [ django_nose ]; + nativeCheckInputs = [ django_nose ]; propagatedBuildInputs = [ django_hijack ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix index ece85f9a45..cefcf75f6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { django_compat ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix index 8c0fbf647b..49f68462d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { tablib ] ++ (with tablib.optional-dependencies; html ++ ods ++ xls ++ xlsx ++ yaml); - checkInputs = [ + nativeCheckInputs = [ chardet pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-js-reverse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-js-reverse/default.nix index 9757d9aa27..a63ef50a80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-js-reverse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-js-reverse/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { django ]; - checkInputs = [ + nativeCheckInputs = [ nodejs js2py six diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix index 1a3998dc8c..b3287b6f52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-logentry-admin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1bndxgvisw8kk52zfdifvly6dl4833wqilxf77pg473172yaf5gq"; }; - checkInputs = [ pytest pytest-django ]; + nativeCheckInputs = [ pytest pytest-django ]; checkPhase = '' rm -r logentry_admin __init__.py pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-login-required-middleware/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-login-required-middleware/default.nix new file mode 100644 index 0000000000..6c69ef7ef2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-login-required-middleware/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, django +, djangorestframework +, fetchFromGitHub +, python +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "django-login-required-middleware"; + version = "0.9.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "CleitonDeLima"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-WFQ/JvKh6gkUxPV27QBd2TzwFS8hfQGmcTInTnmh6iA="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + django + ]; + + checkInputs = [ + djangorestframework + ]; + + pythonImportsCheck = [ + "login_required" + ]; + + checkPhase = '' + ${python.interpreter} -m django test --settings tests.settings + ''; + + meta = with lib; { + description = "Requires login to all requests through middleware in Django"; + homepage = "https://github.com/CleitonDeLima/django-login-required-middleware"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix index 081b6bbbcb..ea1be64768 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django-gravatar2 django-compressor django-allauth mailmanclient ]; - checkInputs = [ django mock ]; + nativeCheckInputs = [ django mock ]; checkPhase = '' cd $NIX_BUILD_TOP/$sourceRoot diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix index 558f0c1033..36b72c586d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { python-fsutil ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix index dc2bd2fbc3..2a1778708a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { # requires postgres database doCheck = false; - checkInputs = [ + nativeCheckInputs = [ freezegun psycopg2 pytest-django diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix index e98ff368a5..d3628d66e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { DJANGO_SETTINGS_MODULE = "tests.settings"; - checkInputs = [ + nativeCheckInputs = [ djangorestframework pytest-django pytest-xdist diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix index 30c361723e..d3fd24281a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { qrcode ]; - checkInputs = [ + nativeCheckInputs = [ freezegun ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-phonenumber-field/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-phonenumber-field/default.nix index a185a94aff..084bf31736 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-phonenumber-field/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-phonenumber-field/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { babel ]; - checkInputs = [ + nativeCheckInputs = [ djangorestframework ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix index daebb7f7e0..0d4e950287 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; - checkInputs = [ dj-database-url ]; + nativeCheckInputs = [ dj-database-url ]; checkPhase = '' ${python.interpreter} runtests.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-prometheus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-prometheus/default.nix index 209395ef64..aa135d17de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-prometheus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-prometheus/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { "django_prometheus" ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix index a6ebb5714d..bcbb09fa43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { kill $REDIS_PID ''; - checkInputs = [ + nativeCheckInputs = [ croniter django-redis pytest-django diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-redis/default.nix index 1ad52e22d0..11033b3e0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-redis/default.nix @@ -60,7 +60,7 @@ buildPythonPackage { kill $REDIS_PID ''; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix index ac7fc4813e..77e532ed7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ django-allauth drf-jwt responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix index 20a4f85a95..7715900c60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-registration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-registration/default.nix index bfce8141f4..a3da3d81a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-registration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-registration/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { djangorestframework ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-scim2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-scim2/default.nix index 585ea9aced..90db4fe633 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-scim2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-scim2/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { "django_scim" ]; - checkInputs = [ + nativeCheckInputs = [ mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-scopes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-scopes/default.nix index 26810445fa..9b11393d3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-scopes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-scopes/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { django ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-sesame/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-sesame/default.nix index e24fff1efe..eadc07519a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-sesame/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-sesame/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0k8s44zn2jmasp0w064vrx685fn4pbmdfx8qmhkab1hd5ys6pi44"; }; - checkInputs = [ django ]; + nativeCheckInputs = [ django ]; checkPhase = '' make test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix index 2a7f1e1da2..86b81a6257 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { extension = "zip"; }; - checkInputs = [ testfixtures ]; + nativeCheckInputs = [ testfixtures ]; checkPhase = '' cd testproject ${python.interpreter} manage.py test captcha diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-sites/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-sites/default.nix index 08641aa935..9e6bdc2fdb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-sites/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-sites/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { django ]; - checkInputs = [ + nativeCheckInputs = [ django-jinja ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-statici18n/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-statici18n/default.nix index 8fcfa070d2..9fc04339c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-statici18n/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-statici18n/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { DJANGO_SETTINGS_MODULE = "tests.test_project.project.settings"; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix index b49e983c1a..5b638aa05b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { --replace 'test_modified_time' 'dont_test_modified_time' ''; - checkInputs = [ + nativeCheckInputs = [ azure-storage-blob boto3 dropbox diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-taggit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-taggit/default.nix index dd5e025edd..a5e93201bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-taggit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-taggit/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { "taggit" ]; - checkInputs = [ + nativeCheckInputs = [ djangorestframework ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix index a6c184e2d6..8056aca710 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-tastypie/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "django-tastypie"; - version = "0.14.4"; + version = "0.14.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django-tastypie"; repo = pname; - rev = "v${version}"; - hash = "sha256-O/aVi8BshOZmg9WQxrFlBEOXfgyqJKVK/QlEFG3Edqs="; + rev = "refs/tags/v${version}"; + hash = "sha256-RgYinpo8eVzRaSkcnFkSq+IqpcFt6LCCHkpHyB/7u5M="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utilities and helpers for writing Pylint plugins"; homepage = "https://github.com/django-tastypie/django-tastypie"; + changelog = "https://github.com/django-tastypie/django-tastypie/releases/tag/v${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix index f8f85adf0d..123d44a78a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { DJANGO_SETTINGS_MODULE = "tests.settings"; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-lazy-fixture ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix index 01c1b8353b..9ff9a5bec5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pillow python-magic ]; - checkInputs = [ django ]; + nativeCheckInputs = [ django ]; # tests not included with pypi release doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix index b4df7caed3..91c83942be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.1.5"; + version = "4.1.6"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-/1br1+rQ/V2+Bv4VewAkp6rqLgWTuzeF+1lM+U2tWO8="; + hash = "sha256-vOsP4aOGeBrweIyuQQhiJ1bNBed3VEje7ASnHd+HaF0="; }; patches = [ @@ -82,7 +82,7 @@ buildPythonPackage rec { # ModuleNotFoundError: No module named 'asgiref' doCheck = false; - checkInputs = [ + nativeCheckInputs = [ aiosmtpd argon2-cffi asgiref diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix index d59682de2f..b7fbc9f2b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { django-taggit ]; - checkInputs = passthru.optional-dependencies.taggit; + nativeCheckInputs = passthru.optional-dependencies.taggit; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_silk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_silk/default.nix index 0dedc4d3bb..8a53a9d1d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_silk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_silk/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "django-silk"; - version = "5.0.2"; + version = "5.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-silk"; rev = "refs/tags/${version}"; - hash = "sha256-LzcbRZ9NLTkDTZ2eW+uXYqPbWDSdLZAJcYdD8JLuiDc="; + hash = "sha256-91FcOqAYZK7/RCKgXjbQEPUQ2cZRFi7NzVLQF+MMDRI="; }; # "test_time_taken" tests aren't suitable for reproducible execution, but Django's @@ -70,7 +70,7 @@ buildPythonPackage rec { sqlparse ]; - checkInputs = [ + nativeCheckInputs = [ freezegun contextlib2 networkx @@ -95,6 +95,7 @@ buildPythonPackage rec { meta = with lib; { description = "Silky smooth profiling for the Django Framework"; homepage = "https://github.com/jazzband/django-silk"; + changelog = "https://github.com/jazzband/django-silk/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix index d334705784..2728d77d3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_treebeard/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { django ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix index 0e38c82cab..cc0c4f5b4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ply ]; - checkInputs = [ django ]; + nativeCheckInputs = [ django ]; checkPhase = '' export PYTHONPATH=test_project:$PYTHONPATH diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix index 1a2cde8881..c4d1d300cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { djangorestframework ]; - checkInputs = [ + nativeCheckInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix index 1fb8fd9f4b..067502961f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix index aaaf5708a5..dbe8912153 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dkimpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "9a2420bf09af686736773153fca32a02ae11ecbe24b540c26104628959f91121"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ openssl dnspython pynacl authres ]; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix index 601c5ca507..f75767811c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dlib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage { patches = [ ./build-cores.patch ]; - checkInputs = [ pytest more-itertools ]; + nativeCheckInputs = [ pytest more-itertools ]; postPatch = '' substituteInPlace setup.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dlinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dlinfo/default.nix index a1f3ace782..b51c71913f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dlinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dlinfo/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dlms-cosem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dlms-cosem/default.nix index e6040fb786..d9356e1492 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dlms-cosem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dlms-cosem/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-env/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-env/default.nix index a26480c226..a11d354955 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dm-env/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-env/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/tests.nix index 93a4f3cd47..a951323e5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/tests.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ bsuite chex cloudpickle diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix index e089b91eb0..0f1518d6e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ docutils tensorflow-datasets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/default.nix index 837895dcd8..de1a5f6646 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pybind11 ]; - checkInputs = [ + nativeCheckInputs = [ absl-py attrs numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix index 777b12b79c..7ef6a44ba9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnachisel/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { python-codon-tables ]; - checkInputs = [ + nativeCheckInputs = [ primer3 genome-collector matplotlib diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnfile/default.nix index 7bcfdf34c2..0f589b7d95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnfile/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pefile ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix index 4b71485964..fa77bc0d0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnspython/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0gk00m8zxjghxnzafhars51k5ahd6wfhf123nrc1j5gzlsj6jx8g"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals stdenv.isDarwin [ cacert diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix index 337debd6f8..5abb1f6d2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/doc8/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docformatter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docformatter/default.nix index 0523678bb0..f7be25f615 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docformatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docformatter/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { untokenize ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix index 4610331170..f4c5951531 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { paramiko ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix index 846e85fed3..8cf15e9fda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-If59UQZC8rYamZ1Fw9l0X5UOEf5rokl1Vbj2N4K3jkU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix index 3a7c5f74a4..1d3c53c95d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.24.232"; + version = "2.25.236"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "sha256-Mo4Ih/2ltIonP37BDyCi0fY2bkPt2ij1F0A1Ws1sF1g="; + sha256 = "sha256-JWkUtMAROk4cePMuogx9dtyO/ihv6JAnDnXPrVD+UQ8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix index 3e5d9f21a2..37785f1e29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "ed8a17e201abd829ef8da78a0b6f4d51fb99a4cbd0554adbed3309297f964314"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ six ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docstring-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docstring-parser/default.nix index 53a59f10ff..4f8bfa60e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docstring-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docstring-parser/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docstring-to-markdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docstring-to-markdown/default.nix index 9a17d19a9d..d287dcf293 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docstring-to-markdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docstring-to-markdown/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ./remove-coverage-tests.patch ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docx2python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docx2python/default.nix index b6a63d48b3..13b41949eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docx2python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docx2python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; preCheck = "cd test"; # Tests require the `test/resources` folder to be accessible - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # asserts related to file deletions fail "test_docx2python.py" "test_docx_context.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dodgy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dodgy/default.nix index ecd3cc6ce7..4437beb760 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dodgy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dodgy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "0ywwjpz0p6ls3hp1lndjr9ql6s5lkj7dgpll1h87w04kwan70j0x"; }; - checkInputs = [ + nativeCheckInputs = [ mock nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix index c367556b4e..a47dc6246a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; - checkInputs = [ pytestCheckHook mock Mako ]; + nativeCheckInputs = [ pytestCheckHook mock Mako ]; propagatedBuildInputs = [ decorator stevedore ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doit-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doit-py/default.nix index 33d128c3d7..2ad323f167 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/doit-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/doit-py/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { mergedict ]; - checkInputs = [ + nativeCheckInputs = [ hunspell hunspellDicts.en_US pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix index cfb36b7daf..40a94c6aeb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix @@ -34,7 +34,7 @@ let doit = buildPythonPackage rec { ] ++ lib.optional stdenv.isLinux pyinotify ++ lib.optional stdenv.isDarwin macfsevents; - checkInputs = [ + nativeCheckInputs = [ configclass doit-py mergedict diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix index aa840dc9ff..142f1e32ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-UgEBNgiS6/nQVT9n0341n/kkA9ih4zgUAwUDCIoF2kk="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doorbirdpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doorbirdpy/default.nix index 34157b6393..54750b63a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/doorbirdpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/doorbirdpy/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "doorbirdpy"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "DoorBirdPy"; inherit version; - hash = "sha256-ZGIIko5Ac0Q4Jhz+z7FREJ4MhPF9ADDWgQFRtcZ+dWY="; + hash = "sha256-o6d8xXF5OuiF0B/wwYhDAZr05D84MuxHBY96G2XHILU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix index 2154f33bb8..955d57ffd5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dot2tex/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ (texlive.combine { inherit (texlive) scheme-small preview pstricks; }) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dotmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dotmap/default.nix index 5c4cfbf952..2300ac013a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dotmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dotmap/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-WCGnkz8HX7R1Y0F8DpLgt8AxFYtMmmp+VhY0ebZYs2g="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix index d91bdb507a..72c372e5aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dparse2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dparse2/default.nix index 2fbb2e1f3f..9d6cb9b085 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dparse2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dparse2/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { packvers ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dpath/default.nix index acc8d75e00..97d7396078 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dpath/default.nix @@ -10,17 +10,17 @@ buildPythonPackage rec { pname = "dpath"; - version = "2.1.3"; + version = "2.1.4"; disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; - sha256 = "sha256-0aeg5kJ9CkFWx5LILK8fAQlgP2is55LjbKRZb9LLjZ0="; + sha256 = "sha256-M4CnfQ20q/EEElhg/260vQfJfGW4Gq1CpglxcImhvtA="; }; # use pytest as nosetests hangs - checkInputs = [ + nativeCheckInputs = [ hypothesis mock nose2 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drawille/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drawille/default.nix new file mode 100644 index 0000000000..a00b0b1689 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/drawille/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "drawille"; + version = "0.1.0"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-t4nS8TWbEGKHibIbLfZZycPQxTiEzuJ7DYsa6Twi+8s="; + }; + + doCheck = false; # pypi package has no tests, git has no tags + + pythonImportsCheck = [ + "drawille" + ]; + + meta = with lib; { + description = "Drawing in terminal with unicode braille characters"; + homepage = "https://github.com/asciimoo/drawille"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ nobbz ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drawilleplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drawilleplot/default.nix new file mode 100644 index 0000000000..1ed452c1d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/drawilleplot/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, drawille +, matplotlib +}: + +buildPythonPackage rec { + pname = "drawilleplot"; + version = "0.1.0"; + + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ZEDroo7KkI2VxdESb2QDX+dPY4UahuuK9L0EddrxJjQ="; + }; + + doCheck = false; # does not have any tests at all + + propagatedBuildInputs = [ + drawille + matplotlib + ]; + + pythonImportsCheck = [ + "drawilleplot" + ]; + + meta = with lib; { + description = "matplotlib backend for graph output in unicode terminals using drawille"; + homepage = "https://github.com/gooofy/drawilleplot"; + license = licenses.asl20; + maintainers = with maintainers; [ nobbz ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix index db0212e456..8e5236389d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-nested-routers/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ django djangorestframework setuptools ]; - checkInputs = [ pytest pytest-cov pytest-django ipdb ]; + nativeCheckInputs = [ pytest pytest-cov pytest-django ipdb ]; checkPhase = '' ${python.interpreter} runtests.py --nolint diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix index 0941c2ab30..0b0a256c1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { uritemplate ]; - checkInputs = [ + nativeCheckInputs = [ dj-rest-auth django-allauth django-filter diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-writable-nested/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-writable-nested/default.nix index eaf5aa1b9e..339677d387 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-writable-nested/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-writable-nested/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { djangorestframework ]; - checkInputs = [ + nativeCheckInputs = [ pytest-django pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix index bdfb88402c..eca45373fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { djangorestframework ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-django datadiff diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix index 8595c8c1ca..6e5b4dc2b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ astropy pytestCheckHook pytest-doctestplus diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix index 6355ed16b9..68eeb2aeb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { stone ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ds-store/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ds-store/default.nix index 00d10e7494..5afa341942 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ds-store/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ds-store/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mac_alias ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ds_store" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dsinternals/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dsinternals/default.nix index 53d5e5acc9..93b600c044 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dsinternals/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dsinternals/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pycryptodomex ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 16d85a93b0..7b5a8aa1f6 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 @@ -32,7 +32,7 @@ buildPythonPackage rec { tailer ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix index 31bdf6d150..0ad328bfd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ducc0/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "ducc0"; - version = "0.27.0"; + version = "0.28.0"; disabled = pythonOlder "3.7"; @@ -11,13 +11,13 @@ buildPythonPackage rec { owner = "mtr"; repo = "ducc"; rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-Z3eWuLuuA264z1ccdVp1YwAjDrLIXFxvTt/gC/zBE6o="; + sha256 = "sha256-yh7L87s3STL2usGBXgIhCS7GKQuau/PV6US3T06bb0M="; }; buildInputs = [ pybind11 ]; propagatedBuildInputs = [ numpy ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "python/test" ]; pythonImportsCheck = [ "ducc0" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix index 1eb8e73e61..ea812cb9d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { "test_preload_extension" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ipython-sql diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix index b41bc431f1..6547e0d294 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckdb/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pandas ]; - checkInputs = [ + nativeCheckInputs = [ google-cloud-storage mypy psutil diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix index 249f71c67d..b9c9e65a4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # bin/duecredit requires setuptools at runtime propagatedBuildInputs = [ citeproc-py requests setuptools six ]; - checkInputs = [ contextlib2 pytest pytestCheckHook vcrpy ]; + nativeCheckInputs = [ contextlib2 pytest pytestCheckHook vcrpy ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duet/default.nix index ce95291b9e..f2ca9f5410 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duet/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ typing-extensions ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "A simple future-based async library for python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dufte/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dufte/default.nix index dac0eddf75..b112e481a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dufte/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dufte/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ln -s $HOME/.config/matplotlib $HOME/.matplotlib ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dugong/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dugong/default.nix index 190411b533..6c87d50ccf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dugong/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dugong/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1063c1779idc5nrjzfv5w1xqvyy3crapb2a2xll9y6xphxclnkjc"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix index c3bab1180c..ec4a1a93ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "0.20.50"; + version = "0.21.0"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-UKlBeWssZ1vjm+co1UDBa1t853654bP4VWUOzmgy0r4="; + hash = "sha256-wizAXwIKlq012U1lIPgHAnC+4KN7V1aG0JwCeYsl7YY="; }; LC_ALL = "en_US.UTF-8"; @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ gevent geventhttpclient git diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dunamai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dunamai/default.nix index e8866b7a1d..60e42f5b2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dunamai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dunamai/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { git config --global user.name "Nobody" ''; - checkInputs = [ + nativeCheckInputs = [ git pytestCheckHook setuptools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix index 3a0cbd8a36..fc25a2b592 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ freezegun mock nose2 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix index db7a8fe62f..56a27acb60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix @@ -8,13 +8,14 @@ , nanotime , pygtrie , pythonOlder -, shortuuid , setuptools-scm +, shortuuid +, sqltrie }: buildPythonPackage rec { pname = "dvc-data"; - version = "0.28.4"; + version = "0.36.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ocwOIhguH460+HJ0sE5Wj+KOiyG4NprJ+QaO+YtfTGU="; + hash = "sha256-HKNltc5pWc0mU+yCj/PV9E6GYQ+3fbcacRRXtquGM4w="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -40,6 +41,7 @@ buildPythonPackage rec { nanotime pygtrie shortuuid + sqltrie ]; # Tests depend on upath which is unmaintained and only available as wheel @@ -57,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "DVC's data management subsystem"; homepage = "https://github.com/iterative/dvc-data"; + changelog = "https://github.com/iterative/dvc-data/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix index ec02d79b3a..c20540b8ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.14.0"; + version = "0.19.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Refpekyr114mIGvbaAynxldA+s83EtALeLoTQO73b/M="; + hash = "sha256-jwjhRY1SMqiTZ5UJmoZb4odg3g8uC9ehPmxRU2VsH8U="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -44,7 +44,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; @@ -56,6 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for DVC objects"; homepage = "https://github.com/iterative/dvc-objects"; + changelog = "https://github.com/iterative/dvc-objects/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix index d8996ef8a4..2ccc61cf97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ funcy pytestCheckHook pytest-mock @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for rendering DVC plots"; homepage = "https://github.com/iterative/dvc-render"; + changelog = "https://github.com/iterative/dvc-render/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix index 18cf6e572f..52d7e4706e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { funcy ]; - checkInputs = [ + nativeCheckInputs = [ pytest-celery pytest-mock pytest-test-utils diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix index ffa8d68e0b..a62c459ef3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, ruamel-yaml , setuptools , tabulate }: @@ -28,8 +29,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ dvc-render - tabulate # will be available as dvc-render.optional-dependencies.table - ]; + ruamel-yaml + ] ++ dvc-render.optional-dependencies.table; # Circular dependency with dvc doCheck = false; @@ -41,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for logging machine learning metrics and other metadata in simple file formats"; homepage = "https://github.com/iterative/dvclive"; + changelog = "https://github.com/iterative/dvclive/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix index 8db7f6c916..e8859128b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ glibcLocales ]; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-cov mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix index ed3f3ffb82..7827c46d43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sed -i '/^addopts/d' setup.cfg ''; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix index d92bf15f88..9c55897188 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/easyocr/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { shapely ]; - checkInputs = [ onnx ]; + nativeCheckInputs = [ onnx ]; pythonImportsCheck = [ "easyocr" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix index ce3d5bd4ce..66831b0513 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; # Only needed for tests - checkInputs = [ pkgs.openssl ]; + nativeCheckInputs = [ pkgs.openssl ]; meta = with lib; { description = "ECDSA cryptographic signature library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ecos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ecos/default.nix index 0f5ef9c2e1..d5ef0867c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ecos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ecos/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/edalize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/edalize/default.nix index 7962136932..8f103df269 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/edalize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/edalize/default.nix @@ -6,7 +6,6 @@ , pandas , pytestCheckHook , which -, verilog , yosys }: @@ -29,17 +28,18 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pandas which yosys - verilog ]; pythonImportsCheck = [ "edalize" ]; disabledTestPaths = [ + "tests/test_questa_formal.py" + "tests/test_slang.py" "tests/test_apicula.py" "tests/test_ascentlint.py" "tests/test_diamond.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix index e5deb02af5..9090e98f40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-FnUk43c1jtHxN05hwmjw16S/fb0EbGVve0EM3hYWGxo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/editdistance-s/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/editdistance-s/default.nix index 548da09b99..6dd3773930 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/editdistance-s/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/editdistance-s/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "editdistance_s" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/editdistance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/editdistance/default.nix index a01a505dde..822eacc084 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/editdistance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/editdistance/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { cythonize --inplace editdistance/bycython.pyx ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix index e90a6efdc6..2918733e96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/editorconfig/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { chmod +w -R source/tests ''; - checkInputs = [ + nativeCheckInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/edlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/edlib/default.nix new file mode 100644 index 0000000000..30c3f8fb3b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/edlib/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, edlib +, cython +, python +}: + +buildPythonPackage { + inherit (edlib) pname src meta; + version = "1.3.9"; + + disabled = pythonOlder "3.6"; + + sourceRoot = "source/bindings/python"; + + preBuild = '' + ln -s ${edlib.src}/edlib . + ''; + + EDLIB_OMIT_README_RST = 1; + EDLIB_USE_CYTHON = 1; + + nativeBuildInputs = [ cython ]; + buildInputs = [ edlib ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} test.py + runHook postCheck + ''; + + pythonImportsCheck = [ "edlib" ]; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/effect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/effect/default.nix index 67537dd1f4..739ace442b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/effect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/effect/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "7affb603707c648b07b11781ebb793a4b9aee8acf1ac5764c3ed2112adf0c9ea"; }; - checkInputs = [ + nativeCheckInputs = [ pytest testtools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix index 4f070068a1..19f265a7c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eigenpy/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "eigenpy"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-gYGJutTnvq5ERv6tDff6b+t7Kitnx9QAD/6hauHxOt4="; + hash = "sha256-h088il9gih1rJJKOI09qq2180DxbxCAVZcgBXWh8aVk="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/einops/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/einops/default.nix index 03a0723b79..f4364aac83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/einops/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/einops/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ hatchling ]; - checkInputs = [ + nativeCheckInputs = [ chainer jupyter keras diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eiswarnung/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eiswarnung/default.nix index a13a45b66c..a0ebc71507 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eiswarnung/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eiswarnung/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix index 0d914ce678..0f44f7b8fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix @@ -15,6 +15,7 @@ , pytest-bdd , pytest-localserver , pytest-mock +, pytest-random-order , pytestCheckHook , pythonOlder , sanic @@ -29,7 +30,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.13.2"; + version = "6.14.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -38,7 +39,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "refs/tags/v${version}"; - hash = "sha256-HbIra8Cxgn/2xOVEvtcc7rMtSLBmWMxxHlIM44Oy+8U="; + hash = "sha256-T1TWILlJZffTISVt8YSi8ZYSXOHieh6SV55j8W333LQ="; }; propagatedBuildInputs = [ @@ -52,6 +53,10 @@ buildPythonPackage rec { wrapt ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + checkInputs = [ asynctest ecs-logging @@ -64,8 +69,8 @@ buildPythonPackage rec { pytest-bdd pytest-mock pytest-localserver + pytest-random-order sanic-testing - pytestCheckHook structlog webob ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elegy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elegy/default.nix index 290442d515..14b8797053 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elegy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elegy/default.nix @@ -80,7 +80,7 @@ buildPythonPackage rec { "elegy" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook sh tensorflow diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix index 2a6c10da35..2fbaa7f66a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elgato/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eliot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eliot/default.nix index b8f7577621..4797c1cb03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eliot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eliot/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "c2f099a3e8d5ecfc22745766e7cc664a48db64b6b89d986dff270491d8683149"; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis testtools pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix index 6722608ee7..a418e3006d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pyserial-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix index 77bbd480e9..7202f0efbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elmax/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpx pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix index 1307f4039e..bf106a26da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { idna ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix index 3daaf1577e..8af7fc18e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-7BhYS1DQCW9QpG31asPCq5qPyJy+WW2onZpvEHhwQCs="; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; PKGVER = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/embedding-reader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/embedding-reader/default.nix index 2d4af5ca1f..8265ff1a6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/embedding-reader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/embedding-reader/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fsspec numpy pandas pyarrow ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "embedding_reader" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emborg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emborg/default.nix index d2e69f06c6..a788a34098 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/emborg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/emborg/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ nestedtext parametrize-from-file pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/embrace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/embrace/default.nix index 31593bef24..ea2ffaa99b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/embrace/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/embrace/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emcee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emcee/default.nix index 80e0e7daf8..3dbf9c9b65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/emcee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/emcee/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "emcee"; - version = "3.1.3"; + version = "3.1.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "dfm"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HAuwWFNL63BlvHomQx+hWw4et7kRYd3zhH2FAj632Lg="; + hash = "sha256-K2cPSbR7jnl9Vzf2sEiPZqk2vTwgChNWAf6CAerhZCg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -31,7 +31,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Kick ass affine-invariant ensemble MCMC sampling"; homepage = "https://emcee.readthedocs.io/"; + changelog = "https://github.com/dfm/emcee/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix index 0d42528d2a..65cae10f0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-3mCzbFuBIMdF6tbKLxqNKAO50vaRWeOxpydJ4ZeE+Vc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emv/default.nix index a4834a8465..a06cb2b3f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/emv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/emv/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { terminaltables ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/energyflip-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/energyflip-client/default.nix index 73d0f5adfa..b0f13eafc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/energyflip-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/energyflip-client/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/energyflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/energyflow/default.nix index 44342d732e..5f89337f0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/energyflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/energyflow/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { wasserstein ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enhancements/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enhancements/default.nix index 18fdfd29ce..c9042e3d08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enhancements/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enhancements/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { typeguard ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix index b808801928..f6568e691f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enlighten/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "enlighten"; - version = "1.11.1"; + version = "1.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-V6vZij0/g0hO+fkfklX00jyLMJfs22R8e5sASdYAt/g="; + hash = "sha256-koSGHe5aJy4OGjdYzT87cYCxvRdUh12naHbyp/Rsy2E="; }; propagatedBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { prefixed ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -47,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Enlighten Progress Bar for Python Console Apps"; homepage = "https://github.com/Rockhopper-Technologies/enlighten"; + changelog = "https://github.com/Rockhopper-Technologies/enlighten/releases/tag/${version}"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enocean/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enocean/default.nix index 365d6c94ef..162e39aebf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enocean/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enocean/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pyserial ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix index d4b08af212..d823f3c4c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ rich ]; - checkInputs = [ pytestCheckHook pytest-mock ]; + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; disabledTests = [ # console output order is racy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/entry-points-txt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/entry-points-txt/default.nix index f6ec759b0a..cac8c41f16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/entry-points-txt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/entry-points-txt/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix index e2146f3a5a..812749b3be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/entrypoint2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-/At/57IazatHpYWrlAfKflxPlstoiFddtrDOuR8OEFo="; }; - checkInputs = [ + nativeCheckInputs = [ EasyProcess path pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix index 1223f3f911..916b499a98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enum34/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enum34/default.nix index 746e4dd314..8ec22fc1cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enum34/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enum34/default.nix @@ -14,7 +14,7 @@ if pythonAtLeast "3.4" then null else buildPythonPackage rec { sha256 = "cce6a7477ed816bd2542d03d53db9f0db935dd013b70f336a95c73979289f248"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { homepage = "https://pypi.python.org/pypi/enum34"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix index 74b0fa28b6..d444c06901 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/env-canada/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.5.25"; + version = "0.5.27"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - sha256 = "sha256-UF04TAhgeb76bYisNYOAraw59K54WkX9a8QOtHywMTQ="; + hash = "sha256-tZp3r0LALo32vmbeBOjHHg6sexpP+iq9WGRSob13mmE="; }; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to get Environment Canada weather data"; homepage = "https://github.com/michaeldavie/env_canada"; + changelog = "https://github.com/michaeldavie/env_canada/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/environs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/environs/default.nix index 4a8987b163..464b0685be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/environs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/environs/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { python-dotenv ]; - checkInputs = [ + nativeCheckInputs = [ dj-database-url dj-email-url django-cache-url diff --git a/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix index cf7ab6cbab..6a7dde6f4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { export HOME=$PWD/HOME ''; - checkInputs = [ + nativeCheckInputs = [ ipython pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix index 497d46f2d8..1a60d40c70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/envoy-reader/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pyjwt ]; - checkInputs = [ + nativeCheckInputs = [ pytest-raises pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/envs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/envs/default.nix index 3f09545964..307c7dfaa6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/envs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/envs/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { terminaltables ]; - checkInputs = [ + nativeCheckInputs = [ mock nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix index d5eac46926..6ed71e7e43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ephem/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-c6WfDSFi0WJFNcPDt1+VZVa9uyBV6vVUp77xR9P5x2A="; }; - checkInputs = [ + nativeCheckInputs = [ glibcLocales pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ephemeral-port-reserve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ephemeral-port-reserve/default.nix index 0af5794507..dc3148f362 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ephemeral-port-reserve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ephemeral-port-reserve/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { hash = "sha256-R6NRpfaT05PO/cTWgCakiGfCuCyucjVOXbAezn5x1cU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/espeak-phonemizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/espeak-phonemizer/default.nix index 4efb200001..d8c5ba1bb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/espeak-phonemizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/espeak-phonemizer/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/esphome-dashboard-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/esphome-dashboard-api/default.nix new file mode 100644 index 0000000000..24abd9d47a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/esphome-dashboard-api/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, aiohttp +}: + +buildPythonPackage rec { + pname = "esphome-dashboard-api"; + version = "1.2.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "esphome"; + repo = "dashboard-api"; + rev = "refs/tags/${version}"; + hash = "sha256-RFfS0xzRXoM6ETXmviiMPxffPzspjTqpkvHOlTJXN9g="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "esphome_dashboard_api" + ]; + + meta = with lib; { + description = "API to interact with ESPHome Dashboard"; + homepage = "https://github.com/esphome/dashboard-api"; + changelog = "https://github.com/esphome/dashboard-api/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/esprima/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/esprima/default.nix index b32a098c12..9f03e8a1e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/esprima/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/esprima/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "WtkPCReXhxyr6pOzE9gsdIeBlLk+nSnbxkS3OowEaHo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix index 58d9c543aa..538ed10cde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/et_xmlfile/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256="0nrkhcb6jdrlb6pwkvd4rycw34y3s931hjf409ij9xkjsli9fkb1"; }; - checkInputs = [ lxml pytest ]; + nativeCheckInputs = [ lxml pytest ]; checkPhase = '' py.test $out ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix index bc99c09b40..f12fd2b5ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "etebase"; - version = "0.31.5"; + version = "0.31.6"; src = fetchFromGitHub { owner = "etesync"; repo = "etebase-py"; rev = "v${version}"; - hash = "sha256-87t3toMaApnOSPBKfTGGLo2VRLqU8irFac9lg3kA1eE="; + hash = "sha256-T61nPW3wjBRjmJ81w59T1b/Kxrwwqvyj3gILE9OF/5Q="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Qg0aJ6CZaPxGneIs4o402A+fhI/nlJ9X/XdMFqkD/YY="; + hash = "sha256-wrMNtcaLAsWBVeJbYbYo+Xmobl01lnUbR9NUqqUzUgU="; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etesync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etesync/default.nix index ee81ead97c..a50f8e7c09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/etesync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/etesync/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { vobject ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix index dc9b2f7895..01177a703f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { # lots of: TypeError: isinstance() arg 2 must be a type or tuple of types doCheck = false; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ] ++ eth-hash.optional-dependencies.pycryptodome; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix index 1c60a2d594..7f5b436a14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix @@ -4,6 +4,7 @@ , pythonOlder , pytest , pysha3 +, safe-pysha3 , pycryptodome }: @@ -19,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-LMDtFUrsPYgj/Fl9aBW1todlj1D3LlFxAkzNFAzCGLQ="; }; - checkInputs = [ + nativeCheckInputs = [ pytest ] ++ passthru.optional-dependencies.pycryptodome ++ passthru.optional-dependencies.pysha3; @@ -31,7 +32,7 @@ buildPythonPackage rec { passthru.optional-dependencies = { pycryptodome = [ pycryptodome ]; - pysha3 = [ pysha3 ]; + pysha3 = if pythonOlder "3.9" then [ pysha3 ] else [ safe-pysha3 ]; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix index fd62501b81..54b76e2360 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pycryptodome ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix index dac43e527c..2b5a64527e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { eth-utils ]; - checkInputs = [ + nativeCheckInputs = [ asn1tools factory_boy hypothesis diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix index 72cd3c1e84..e97926b3d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { rlp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ eth-hash.optional-dependencies.pycryptodome; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix index 6c8bc6cb57..8ed085ad0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix @@ -7,26 +7,31 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "3.1.0"; + version = "3.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-typing"; - rev = "v${version}"; - sha256 = "sha256-Xk/IfW1zuNbGdYAxXTNL9kL+ZW1bWruZ21KFV9+lv/E="; + rev = "refs/tags/v${version}"; + hash = "sha256-klN38pIQ9ZOFV7dzXNvylPGfifR8pXRLTJ3VE579AY0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "eth_typing" ]; + pythonImportsCheck = [ + "eth_typing" + ]; - meta = { + meta = with lib; { description = "Common type annotations for Ethereum Python packages"; homepage = "https://github.com/ethereum/eth-typing"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ SuperSandro2000 ]; + changelog = "https://github.com/ethereum/eth-typing/blob/v${version}/docs/release_notes.rst"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix index a5b19123c1..7297471ff7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ++ lib.optional isPyPy toolz; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ] ++ eth-hash.optional-dependencies.pycryptodome; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix index 10f9b35172..b3ff9c680f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { "etils" ]; - checkInputs = [ + nativeCheckInputs = [ chex jaxlib pytest-subtests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etuples/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etuples/default.nix index d2785519bf..7ea15ebb8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/etuples/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/etuples/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { multipledispatch ]; - checkInputs = [ + nativeCheckInputs = [ py pytestCheckHook pytest-html diff --git a/third_party/nixpkgs/pkgs/development/python-modules/evdev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/evdev/default.nix index 354b107499..659a2314d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/evdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/evdev/default.nix @@ -1,25 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi, linuxHeaders }: +{ lib +, buildPythonPackage +, fetchPypi +, linuxHeaders +, pythonOlder +}: buildPythonPackage rec { pname = "evdev"; - version = "1.6.0"; + version = "1.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7PoBtchPfoxs7TNnrJUoj0PNhO+/1919DNv8DRjIemo="; + hash = "sha256-KZ24YozHOyN/wcxX08KUj6oHVuKli2GUtb+B3CCB8eM="; }; - buildInputs = [ linuxHeaders ]; + buildInputs = [ + linuxHeaders + ]; patchPhase = '' - substituteInPlace setup.py --replace /usr/include/linux ${linuxHeaders}/include/linux + substituteInPlace setup.py \ + --replace /usr/include/linux ${linuxHeaders}/include/linux ''; doCheck = false; + pythonImportsCheck = [ + "evdev" + ]; + meta = with lib; { description = "Provides bindings to the generic input event interface in Linux"; - homepage = "https://pythonhosted.org/evdev"; + homepage = "https://python-evdev.readthedocs.io/"; + changelog = "https://github.com/gvalkov/python-evdev/blob/v${version}/docs/changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix index 977f5e236a..e653bda8ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { monotonic ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/evtx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/evtx/default.nix index c6550f37aa..7f15ee79a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/evtx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/evtx/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { maturinBuildHook ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exceptiongroup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exceptiongroup/default.nix index 54139f48a6..5e7930bbc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exceptiongroup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exceptiongroup/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "exceptiongroup"; - version = "1.0.4"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = "exceptiongroup"; rev = version; - hash = "sha256-csyDWVvcsAMzgomb0xq0NbVP7qYQpDv9obBGANlwiVI="; + hash = "sha256-XQcYYz4MOxWj9QlgM6KuwBaCHjYzGRkQw3cN5WBSnAo="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = pythonAtLeast "3.11"; # infinite recursion with pytest - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix index 4befeed658..b9e8313263 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exchangelib/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { backports-zoneinfo ]; - checkInputs = [ + nativeCheckInputs = [ flake8 psutil python-dateutil diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix index f7b4a38ee4..ba581cdef3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix index db6e948968..a7ad4cf4ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/execnet/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { apipkg ]; - checkInputs = [ + nativeCheckInputs = [ py pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix index 1201ffaff1..484f569005 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/executing/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ asttokens littleutils pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/executor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/executor/default.nix index b54860cc86..c9500d6f27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/executor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/executor/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock virtualenv diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exif/default.nix index da4ba40a92..6ecad38e2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exif/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exif/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ plum-py ]; - checkInputs = [ pytestCheckHook baseline ]; + nativeCheckInputs = [ pytestCheckHook baseline ]; pythonImportsCheck = [ "exif" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/expecttest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/expecttest/default.nix index 82128d8b0b..5c1a27751e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/expecttest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/expecttest/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - checkInputs = [ hypothesis pytestCheckHook ]; + nativeCheckInputs = [ hypothesis pytestCheckHook ]; pythonImportsCheck = [ "expecttest" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/expiringdict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/expiringdict/default.nix index 9dfe60aca7..e97f823377 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/expiringdict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/expiringdict/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "sha256-vRhJSHIqc51I+s/wndtfANM44CKW3QS1iajqyoSBf0I="; }; - checkInputs = [ + nativeCheckInputs = [ dill coverage coveralls diff --git a/third_party/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix index 4a79dc31c1..cd31e6ff01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/explorerscript/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pygments; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix index 2134c10f61..2c592e081d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { extractcode-7z ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/extruct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/extruct/default.nix index 39591ac55f..5dd294c547 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/extruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/extruct/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { w3lib ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix index c04017b4e4..94e9c37c02 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ezdxf/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix index 21741fac03..0297ede47b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ezyrb/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { torch ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/face-recognition/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/face-recognition/default.nix index 150429acf8..8b06c83cf5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/face-recognition/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/face-recognition/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pillow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/face/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/face/default.nix index 50db0ce949..cd024c1fb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/face/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/face/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { boltons ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix index e3168c863b..a5b0130911 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { faker ]; - checkInputs = [ + nativeCheckInputs = [ django flask flask-sqlalchemy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix index 5c3db0e4d1..1869ea45fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fake-useragent/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix index 16ce62cde8..75263084f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { text-unidecode ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pillow pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix index a0f68ea0da..d4a878b6a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.4.0"; + version = "2.6.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-LKUDwx3EEcOQFhUjTe5xm3AQRuwTGsYY27Vmg2R9ofc="; + hash = "sha256-COGzi/zK6ss47Qi2ll2e92V5WzzxdM5Z5cNmX3b1EH0="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { sortedcontainers ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest-asyncio pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/falcon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/falcon/default.nix index 0ade6a2718..341d3c6615 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/falcon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/falcon/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { popd ''; - checkInputs = [ + nativeCheckInputs = [ # https://github.com/falconry/falcon/blob/master/requirements/tests pytestCheckHook pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index bc9a9d5194..7753384417 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix index 554a37058a..4bc9d1b239 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.9.1"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/${version}"; - hash = "sha256-qtHa2JQ9dl9NzhNZ9l6vRe9wR9rCx7+WwDBhRG+Btj4="; + hash = "sha256-bVuysEr8VVFgA4OZ7N7UlL2FigbyLVyPr1HHwkshSMU="; }; postPatch = '' @@ -47,7 +47,7 @@ buildPythonPackage rec { tabulate ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix index 73b6185224..92c52fe5e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastapi-mail/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { python-multipart ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix index ed9e9c5aa2..37671597fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastapi/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ aiosqlite databases flask diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix index fc6ede97dd..c4070226ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.7.0"; + version = "1.7.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-vzaaX3wj1UkFGCohxYlPw6NA0b+oV/2JtpYXC4zncjk="; + sha256 = "sha256-oFBOHcrtJe9u/hdW4p8GgIJ2g4oiSNa+qbDFBuMB/HQ="; }; preBuild = '' @@ -31,7 +31,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; - checkInputs = [ + nativeCheckInputs = [ lz4 numpy pandas diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastcache/default.nix index 100af5244b..37a8b1f1a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastcache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastcache/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0avqpswfmw5b08xx3ib6zchc5bis390fn1v74vg7nnrkf1pb3qbd"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "C implementation of Python3 lru_cache for Python 2 and 3"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix index 9ad4c82963..bc8eaa3588 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { wasmer-compiler-cranelift ]; - checkInputs = [ + nativeCheckInputs = [ py pytestCheckHook pytest-benchmark diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastdtw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastdtw/default.nix index cb75a599d0..1ceaf3b875 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastdtw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastdtw/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "fastdtw.fastdtw" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; # looks for pytest-runner preCheck = '' echo "Temporarily moving tests to $OUT to find cython modules" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastecdsa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastecdsa/default.nix index aaca3df71a..bd1a8c673e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastecdsa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastecdsa/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { gmp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fasteners/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fasteners/default.nix index 2b376777f0..38d09c4770 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fasteners/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fasteners/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ diskcache eventlet more-itertools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastimport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastimport/default.nix index d05037ca9e..9f7219925a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastimport/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastimport/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "6ac99dda4e7b0b3ae831507b6d0094802e6dd95891feafde8cc5c405b6c149ca"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "fastimport" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix index cbb12c054e..449e0a3fdd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastjsonschema/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "sha256-Gojayel/xQ5gRI0nbwsroeSMdRndjb+8EniX1Qs4nbg="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix index 5fd8115152..f0fe2e7b91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { # See https://github.com/SethMMorton/fastnumbers/issues/28 doCheck = !stdenv.hostPlatform.isAarch; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix index 45d9976896..4cdf1115e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastpair/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { nativeBuildInputs = [ pytest-runner ]; - checkInputs = [ pytest pytestCheckHook ]; + nativeCheckInputs = [ pytest pytestCheckHook ]; propagatedBuildInputs = [ scipy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix index 8b99b8747b..16e3bd7ed2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "2022.12.0"; + version = "2023.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - hash = "sha256-/DSe2vZwrHHTuAXWJh9M1wCes5c4/QAVUnJVEI4Evyw="; + hash = "sha256-p8JydnrDEl9W4clrOkd+np0NYGP3hVnq+lyyF/zaVk8="; }; nativeBuildInputs = [ @@ -65,7 +65,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix index 51669f9034..ef6e0462c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastpbkdf2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; buildInputs = [ openssl ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ cffi six ]; propagatedNativeBuildInputs = [ cffi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix index b66ccd155c..98a36d2953 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastrlock/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { # Todo: Check why the tests have an import error doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/favicon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/favicon/default.nix index 1a3917fbdb..929a67557f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/favicon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/favicon/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest-runner ]; - checkInputs = [ pytest requests-mock ]; + nativeCheckInputs = [ pytest requests-mock ]; propagatedBuildInputs = [ requests beautifulsoup4 ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fe25519/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fe25519/default.nix index 9e32640b84..e85b23a4a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fe25519/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fe25519/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { parts ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix index 53f2c15401..d47e15ecc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fenics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fenics/default.nix index f1ccc5efc8..277d28997e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fenics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fenics/default.nix @@ -40,7 +40,7 @@ let sha256 = "1ncgbr0bn5cvv16f13g722a0ipw6p9y6p4iasxjziwsp8kn5x97a"; }; propagatedBuildInputs = [ numpy six ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; preCheck = '' export HOME=$PWD ''; @@ -65,7 +65,7 @@ let sha256 = "1sbi0fbr7w9g9ajr565g3njxrc3qydqjy3334vmz5xg0rd3106il"; }; propagatedBuildInputs = [ numpy six sympy ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; preCheck = '' # Workaround pytest 4.6.3 issue. @@ -95,7 +95,7 @@ let sha256 = "04daxwg4y9c51sdgvwgmlc82nn0fjw7i2vzs15ckdc7dlazmcfi1"; }; propagatedBuildInputs = [ numpy six ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' runHook preCheck py.test test/ @@ -128,7 +128,7 @@ let ufl setuptools ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; preCheck = '' export HOME=$PWD rm test/unit/ufc/finite_element/test_evaluate.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 13e2055cd7..ec2e0ee13b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -10,17 +10,17 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.6.1"; + version = "0.7.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-JLwvJcYcSe5Z7In34pQqHptd8TCrXJeJ6zPiGGv4T14="; + hash = "sha256-rt+Qg1H9t5PC4cyis9xuyf8myfxWLkTq3aD83+O4qmA="; }; propagatedBuildInputs = [ colorama tqdm ]; - checkInputs = [ pytestCheckHook ffmpeg procps ]; + nativeCheckInputs = [ pytestCheckHook ffmpeg procps ]; disabledTests = [ "test_quit" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix index f514cf3253..6f54fb1606 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix index e2c53c3e41..eeab77847c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ fixtures pytestCheckHook requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix index b769d897d0..5f079f7086 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fido2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six cryptography ]; - checkInputs = [ unittestCheckHook mock pyfakefs ]; + nativeCheckInputs = [ unittestCheckHook mock pyfakefs ]; unittestFlagsArray = [ "-v" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/file-read-backwards/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/file-read-backwards/default.nix index 80150a60de..6b39bda1e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/file-read-backwards/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/file-read-backwards/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "fd50d9089b412147ea3c6027e2ad905f977002db2918cf315d64eed23d6d6eb8"; }; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; pythonImportsCheck = [ "file_read_backwards" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/filecheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/filecheck/default.nix index 9cbd8bde21..d0945961ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/filecheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/filecheck/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix index 5aee39a459..4b25ff52aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/filelock/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { hatchling ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/filetype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/filetype/default.nix index e5e594fc5c..f0d1caa25d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/filetype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/filetype/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-ZrVs1kdL9B2MVGYDR9N6/MP30ZcGSN42XBAu93VIqts="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/filterpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/filterpy/default.nix index 9740117b9b..877bd02ed3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/filterpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/filterpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "4f2a4d39e4ea601b9ab42b2db08b5918a9538c168cff1c6895ae26646f3d73b1"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ numpy scipy matplotlib ]; # single test fails (even on master branch of repository) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/finalfusion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/finalfusion/default.nix index 379ed954da..18a8e5e565 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/finalfusion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/finalfusion/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix index 0e5892f586..fe1ef2b672 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix @@ -15,7 +15,7 @@ let pname = "findpython"; - version = "0.2.2"; + version = "0.2.4"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-gFV5YcBM8cjEukyjrHz3bsJ/qSeIpq9Cy3AeNFDElDA="; + hash = "sha256-YfF2jN2EPcL4pFlxJyxYwlZBpQsZ2pEwLiSS4ypmc2I="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -47,6 +47,7 @@ buildPythonPackage { meta = with lib; { description = "A utility to find python versions on your system"; homepage = "https://github.com/frostming/findpython"; + changelog = "https://github.com/frostming/findpython/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix index ea68c6fa8d..eda0bfe215 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { normality ]; - checkInputs = [ + nativeCheckInputs = [ mypy coverage nose diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fints/default.nix index 13f20fbd49..ad71294119 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fints/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fints/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests mt-940 sepaxml bleach ]; - checkInputs = [ pytestCheckHook pytest-mock ]; + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; meta = with lib; { homepage = "https://github.com/raphaelm/python-fints/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix index 57e28cb373..fec7fac990 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -1,31 +1,23 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder +{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder, cython , attrs, click, cligj, click-plugins, six, munch, enum34 , pytestCheckHook, boto3, mock, giflib, pytz , gdal, certifi -, fetchpatch }: buildPythonPackage rec { pname = "fiona"; - version = "1.8.22"; + version = "1.9.0"; src = fetchPypi { pname = "Fiona"; inherit version; - sha256 = "sha256-qCqZzps+eCV0AVfEXJ+yJZ1OkvCohqqsJfDbQP/h7qM="; + hash = "sha256-bkh8v7pahJ+98G5FFp/X4fFmL0Tz1xerS5RgRrJFfq4="; }; - patches = [ - # https://github.com/Toblerity/Fiona/pull/1122 - (fetchpatch { - url = "https://github.com/Toblerity/Fiona/commit/fa632130dcd9dfbb982ecaa4911b3fab3459168f.patch"; - hash = "sha256-IuNHr3yBqS1jY9Swvcq8XPv6BpVlInDx0FVuzEMaYTY="; - }) - ]; - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; nativeBuildInputs = [ + cython gdal # for gdal-config ]; @@ -44,7 +36,7 @@ buildPythonPackage rec { pytz ] ++ lib.optional (!isPy3k) enum34; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook boto3 ] ++ lib.optional (pythonOlder "3.4") mock; @@ -62,6 +54,8 @@ buildPythonPackage rec { "test_no_append_driver_cannot_append" ]; + pythonImportsCheck = [ "fiona" ]; + meta = with lib; { description = "OGR's neat, nimble, no-nonsense API for Python"; homepage = "https://fiona.readthedocs.io/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix index 7e08fa87fd..07d11670ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fipy/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { openssh ] ++ lib.optionals (!stdenv.isDarwin) [ gmsh ]; - checkInputs = lib.optionals (!stdenv.isDarwin) [ gmsh ]; + nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ gmsh ]; checkPhase = '' export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fire/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fire/default.nix index b85f82d611..f17bc7923f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fire/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fire/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { termcolor ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis mock levenshtein diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fireflyalgorithm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fireflyalgorithm/default.nix index 86e5f9b79f..cabee97bed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fireflyalgorithm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fireflyalgorithm/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fitbit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fitbit/default.nix index 3a1c767767..df89eef07b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fitbit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fitbit/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ freezegun mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fixerio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fixerio/default.nix index 8605d0f65d..eacd4f472a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fixerio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fixerio/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ httpretty pytestCheckHook responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fixtures/default.nix index 2bc6612ba7..ff246c4a0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fixtures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fixtures/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { six # not in install_requires, but used in fixture.py ]; - checkInputs = [ + nativeCheckInputs = [ mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fjaraskupan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fjaraskupan/default.nix index bad4d7f14e..3068d6542e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fjaraskupan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fjaraskupan/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { bleak ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix index 0f6e27e637..71b457b527 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8-bugbear/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "flake8-bugbear"; - version = "23.1.17"; + version = "23.1.20"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XfHBQWtx8Chf23U6oxOl9yUsoenxWE3EYV0/edJobAM="; + hash = "sha256-JO6S9LjCEZKeUKxUpkqEw+RJ47HLbwQOOOKhHwnmWVI="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { flake8 ]; - checkInputs = [ + nativeCheckInputs = [ flake8 pytestCheckHook hypothesis diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8-debugger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8-debugger/default.nix index 55858a9eaf..32885570ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8-debugger/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pycodestyle ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8-future-import/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8-future-import/default.nix index 91bab29974..1c99267153 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8-future-import/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flake8 ]; - checkInputs = [ six ]; + nativeCheckInputs = [ six ]; checkPhase = '' ${python.interpreter} -m test_flake8_future_import diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8-import-order/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8-import-order/default.nix index 53c3886901..51c9b9eb56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8-import-order/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pycodestyle ]; - checkInputs = [ + nativeCheckInputs = [ flake8 pycodestyle pylama diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8-length/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8-length/default.nix index ab8b5e77fa..d81a9765bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8-length/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8-length/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { "flake8_length" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8-polyfill/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8-polyfill/default.nix index 60ee3558d1..1db1438827 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8-polyfill/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8-polyfill/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { flake8 ]; - checkInputs = [ + nativeCheckInputs = [ mock pep8 pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix index 1ce4b7f310..d56d42abf2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { # Tests fail on Python 3.7 due to importlib using a deprecated interface doCheck = pythonAtLeast "3.7"; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flaky/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flaky/default.nix index fe068211df..65efea30db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flaky/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flaky/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "3ad100780721a1911f57a165809b7ea265a7863305acb66708220820caf8aa0d"; }; - checkInputs = [ mock nose pytest ]; + nativeCheckInputs = [ mock nose pytest ]; checkPhase = '' # based on tox.ini diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flametree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flametree/default.nix index 047f2849d0..46157dac93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flametree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flametree/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-oyiuhsYouGDKRssKc0aYIoG32H7GS6Bn4RtI7/9N158="; }; - checkInputs = [ + nativeCheckInputs = [ matplotlib pandas pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix index eabfd1ad6f..08bfbaed96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flammkuchen/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-KtMGQftoYVNNMtfYeYiaQyMLAySpf9YXLMxj+e/CV5I="; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix index eae3bd65bc..075cc2f7ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ arrow colour email-validator diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix index 4a7294540e..7f48b68b0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-babelex/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { jinja2 ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix index fc80c50190..3a95dcd2aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-bcrypt/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { bcrypt ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "flask_bcrypt" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix index 48ab187089..0f4b8a1433 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { flask ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-xprocess pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix index 2622f2ab73..654919256d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { brotli ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix index 25c054b231..4ea6857cbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-cors/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de"; }; - checkInputs = [ nose packaging ]; + nativeCheckInputs = [ nose packaging ]; propagatedBuildInputs = [ flask six ]; # Exclude test_acl_uncaught_exception_500 test case because is not compatible diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-gravatar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-gravatar/default.nix index c0bbf7d014..f96390211c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-gravatar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-gravatar/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { flask ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix index 9c57881f4b..d3057e13ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-httpauth/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "sha256-9xmee60g1baLPwtivd/KdjfFUIfp0C9gWuJuDeR5/ZQ="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ flask ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix index 464894e9cf..44c95940d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix index f2288c883b..d0971ee26d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ asgiref pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-login/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-login/default.nix index faf93f4eee..0d59651fa1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-login/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-login/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { werkzeug ]; - checkInputs = [ + nativeCheckInputs = [ blinker pytestCheckHook semantic-version diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-mailman/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-mailman/default.nix index aa8ffae243..8dee11fe7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-mailman/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-mailman/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { mkdocs-material-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix index 63047c98fd..470639835a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix @@ -1,25 +1,25 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , alembic , flask , flask_script , flask-sqlalchemy -, unittestCheckHook +, pytestCheckHook }: buildPythonPackage rec { pname = "Flask-Migrate"; - version = "3.1.0"; + version = "4.0.2"; format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = pname; rev = "v${version}"; - sha256 = "0zj7qpknvlhrh4fsp5sx4fwyx3sp41ynclka992zympm3xym9zyq"; + hash = "sha256-6P5oIH/mVuMy4J71VIRD1p+qbvPUlq3COpytEgKz1qo="; }; propagatedBuildInputs = [ @@ -32,8 +32,8 @@ buildPythonPackage rec { "flask_migrate" ]; - checkInputs = [ - unittestCheckHook + nativeCheckInputs = [ + pytestCheckHook flask_script ]; @@ -41,6 +41,6 @@ buildPythonPackage rec { description = "SQLAlchemy database migrations for Flask applications using Alembic"; homepage = "https://github.com/miguelgrinberg/Flask-Migrate"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ gador ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-paranoid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-paranoid/default.nix index 8de346593e..d20f5c4663 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-paranoid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-paranoid/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { flask ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-principal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-principal/default.nix index f3164aa1f0..1c185ce747 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-principal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-principal/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask blinker ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { homepage = "http://packages.python.org/Flask-Principal/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix index c53d72d100..cecdb76fc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ blinker mock nose diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-restplus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-restplus/default.nix index 3de74531c2..4673daa746 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-restplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-restplus/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "0p4zz8b5bwbw7w0vhbyihl99d2gw13cb81rxzj4z626a1cnl8vm6"; }; - checkInputs = [ nose blinker tzlocal mock rednose ]; + nativeCheckInputs = [ nose blinker tzlocal mock rednose ]; propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ] ++ lib.optional isPy27 enum34; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix index f68b41e45b..961e1a644b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "1.0.3"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-restx"; repo = pname; - rev = version; - sha256 = "sha256-fodoGeVSNw4XZrVt907H20OJQIR8FlfINvEPWOkZQqI="; + rev = "refs/tags/${version}"; + sha256 = "sha256-9CIAPsV0SJaBlNZZtWkqhhCJ/a1QEgbTkrCEBnuDVDo="; }; propagatedBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { werkzeug ]; - checkInputs = [ + nativeCheckInputs = [ blinker faker mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-script/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-script/default.nix index 9acc55166a..3c130890e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-script/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-script/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ flask ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # No tests in archive doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix index cebc4bfa89..55c96f4ea6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-seasurf/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix index bdefbc3db2..1af60bcc6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder # extras: babel , babel @@ -45,12 +46,15 @@ buildPythonPackage rec { pname = "flask-security-too"; - version = "5.0.2"; + version = "5.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Flask-Security-Too"; inherit version; - sha256 = "sha256-Nv7g2l0bPSEcrydFU7d1NHjCCJl8Ykq7hOu6QmHeZcI="; + hash = "sha256-nSo7fdY9tiE7PnhosXh1eBfVa5l6a43XNvp6vKvrq5Y="; }; propagatedBuildInputs = [ @@ -86,7 +90,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ argon2-cffi flask-mongoengine mongoengine @@ -103,10 +107,13 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.mfa; - pythonImportsCheck = [ "flask_security" ]; + pythonImportsCheck = [ + "flask_security" + ]; meta = with lib; { - homepage = "https://pypi.org/project/Flask-Security-Too/"; + changelog = "https://github.com/Flask-Middleware/flask-security/blob/${version}/CHANGES.rst"; + homepage = "https://github.com/Flask-Middleware/flask-security"; description = "Simple security for Flask apps (fork)"; license = licenses.mit; maintainers = with maintainers; [ gador ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-session/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-session/default.nix index a9433fe0b8..b6b65228d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-session/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-session/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask cachelib ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # The rest of the tests require database servers and optional db connector dependencies pytestFlagsArray = [ "-k" "'null_session or filesystem_session'" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix index a429e81ce0..3c02d57108 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-socketio/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { python-socketio ]; - checkInputs = [ + nativeCheckInputs = [ coverage pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix index fac30ca415..d5bd81ab90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { sqlalchemy ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix index c66fe9bbfd..cb1c3cf79b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-testing/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { flask ]; - checkInputs = [ + nativeCheckInputs = [ blinker pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix index 4c2e485c4b..8b68eb9d55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-wtf/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { email = [ email-validator ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix index bc380cd8db..3f0415d86d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { werkzeug ] ++ lib.optional (pythonOlder "3.10") importlib-metadata; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flatten-dict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flatten-dict/default.nix index e7bda9378b..41929f9f67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flatten-dict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flatten-dict/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix index 450f806678..f190307828 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { "flax" ]; - checkInputs = [ + nativeCheckInputs = [ keras pytest-xdist pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix index 434f9409db..437868b70c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-sf419qXzJUe1zTGhXAYNmrhj3Aiv8BjNc9x40bZR7dQ="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook teamcity-messages testtools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flickrapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flickrapi/default.nix index c13541acd8..ca04c9110e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flickrapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flickrapi/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix index 8140d46286..3e1f5be4d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ requests-mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flit-core/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/flit-core/tests.nix index 0fd13e80cb..dd05212407 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flit-core/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flit-core/tests.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ flit pytestCheckHook testpath diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix index 436b65c633..b28f4f6d5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flit/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { tomli-w ]; - checkInputs = [ pytestCheckHook testpath responses ]; + nativeCheckInputs = [ pytestCheckHook testpath responses ]; disabledTests = [ # needs some ini file. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix index a2a82db660..b46b1df541 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flow-record/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix index 5d3e7d4482..1664b7214c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { tornado ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix index 7045841245..50bcdc78e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flowlogs-reader"; - version = "3.2.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { owner = "obsrvbl"; repo = pname; # https://github.com/obsrvbl/flowlogs-reader/issues/57 - rev = "fac4c6c63348ff67fd0a8f51d391ba7c9f59e5ed"; - hash = "sha256-bGb2CLp33aIr0R/lBPWAF3CbtVTWpqmcvYgZ6bcARTc="; + rev = "refs/tags/v${version}"; + hash = "sha256-XHRibTSzFzWPz50elz+KdbCwTrd1DKfVMSg6UamNbzc="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix b/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix index 1cca2219a7..bd9fddf340 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flufl/lock.nix @@ -5,17 +5,17 @@ buildPythonPackage rec { pname = "flufl.lock"; - version = "7.1"; + version = "7.1.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Qxt/6PZhKZIA/2elOLrJNxchgcHtOm76bSiTS0i4oSw="; + sha256 = "sha256-rxQXKzW7xYaHvQa3DRaT/Y1Iy/D/3n5RphjBSK4kBC0="; }; nativeBuildInputs = [ pdm-pep517 ]; propagatedBuildInputs = [ atpublic psutil ]; - checkInputs = [ pytestCheckHook pytest-cov sybil ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov sybil ]; # disable code coverage checks for all OS. Upstream does not enforce these # checks on Darwin, and code coverage cannot be improved downstream nor is it diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix index 21d1a51f8c..f8a5a0826c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flux-led/default.nix @@ -1,4 +1,5 @@ { lib +, async-timeout , buildPythonPackage , fetchFromGitHub , webcolors @@ -8,7 +9,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "0.28.34"; + version = "0.28.35"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,14 +18,15 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = "refs/tags/${version}"; - hash = "sha256-bIL9ivjCLKeTLK3n0ytgGkXQggsuDiMCY7kAtE81qfY="; + hash = "sha256-+MbcI/gcoQOpfL77AyA0rZBP5OgP87gSDt4e5pjriqY="; }; propagatedBuildInputs = [ + async-timeout webcolors ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flynt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flynt/default.nix index 3c09106c94..75465b4a92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flynt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flynt/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ astor ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "command line tool to automatically convert a project's Python code from old format style strings into Python 3.6+'s f-strings"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fnvhash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fnvhash/default.nix index d506b51a92..e54b49ddc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fnvhash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fnvhash/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "00h8i70qd3dpsyf2dp7fkcb9m2prd6m3l33qv3wf6idpnqgjz6fq"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "fnvhash" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix index 5ad86c3ef8..09c2137872 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/folium/default.nix @@ -1,42 +1,36 @@ { lib +, branca , buildPythonPackage , fetchFromGitHub -, fetchpatch -, pythonOlder -, pytestCheckHook -, branca +, geopandas , jinja2 , nbconvert , numpy , pandas , pillow +, pytestCheckHook +, pythonOlder , requests , selenium , setuptools-scm +, xyzservices }: buildPythonPackage rec { pname = "folium"; version = "0.14.0"; + format = "setuptools"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-visualization"; repo = "folium"; rev = "refs/tags/v${version}"; - sha256 = "sha256-zxLFj5AeTVAxE0En7ZlbBdJEm3WrcPv23MgOhyfNi14="; + hash = "sha256-zxLFj5AeTVAxE0En7ZlbBdJEm3WrcPv23MgOhyfNi14="; }; - patches = [ - # Fix test failures with latest branca - (fetchpatch { - url = "https://github.com/python-visualization/folium/commit/b410ab21cc46ec6756c2f755e5e81dcdca029c53.patch"; - hash = "sha256-SVN4wKEep+VnAKnkJTf59rhnzHnbk6dV9XL5ntv4bog="; - }) - ]; - - SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}"; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ setuptools-scm @@ -49,25 +43,35 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ + geopandas nbconvert - pytestCheckHook pandas pillow + pytestCheckHook selenium + xyzservices ]; disabledTests = [ - # requires internet connection + # Tests require internet connection + "test__repr_png_is_bytes" "test_geojson" "test_heat_map_with_weights" "test_json_request" "test_notebook" + "test_valid_png_size" + "test_valid_png" + ]; + + pythonImportsCheck = [ + "folium" ]; meta = { description = "Make beautiful maps with Leaflet.js & Python"; homepage = "https://github.com/python-visualization/folium"; + changelog = "https://github.com/python-visualization/folium/blob/v${version}/CHANGES.txt"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix index 869248ff63..63659bd083 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontmath/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ fonttools ]; - checkInputs = [ pytest pytest-runner ]; + nativeCheckInputs = [ pytest pytest-runner ]; meta = with lib; { description = "A collection of objects that implement fast font, glyph, etc. math"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix index 403039b5f6..2bf5db3483 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ${python.interpreter} Lib/fontParts/fontshell/test.py runHook postCheck ''; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "An API for interacting with the parts of fonts during the font development process."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix index f67f7e2f32..11db4867eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { all = lib.concatLists (lib.attrValues extras); }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.concatLists (lib.attrVals ([ "woff" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/foobot-async/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/foobot-async/default.nix index cd5be4ab0c..bf011e0ccf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/foobot-async/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/foobot-async/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix index 09b85c1275..771feb3215 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { service-identity ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix index 13c46ba1e8..519d5a1402 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/forbiddenfruit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "16chhrxbbmg6lfbzm532fq0v00z8qihcsj0kg2b5jlgnb6qijwn8"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; preBuild = '' export FFRUIT_EXTENSION="true"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix index 04a9586b40..fb2d0b1668 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fpylll/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pkgconfig ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fpyutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fpyutils/default.nix index 21ddae351f..3ad71f9a26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fpyutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fpyutils/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fqdn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fqdn/default.nix index cff62be2af..def6532348 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fqdn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fqdn/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-T0CdWWr8p3JVhp3nol5hyxsrD3951JE2EDpFt+m+3bE="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/freebox-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/freebox-api/default.nix index 76fd69bd02..a896a6c72e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/freebox-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/freebox-api/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/freetype-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/freetype-py/default.nix index 13e033e8bc..ccc048c1fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/freetype-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/freetype-py/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { cd tests ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/freezegun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/freezegun/default.nix index b1300b4e11..112b521017 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/freezegun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/freezegun/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/frilouz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/frilouz/default.nix index 320912c7dd..b19687f5fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/frilouz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/frilouz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0w2qzi4zb10r9iw64151ay01vf0yzyhh0bsjkx1apxp8fs15cdiw"; }; - checkInputs = [ astunparse ]; + nativeCheckInputs = [ astunparse ]; preCheck = "cd test"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix index ae2f69a8a7..79301cf600 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fritzconnection/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.10.3"; + version = "1.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,15 +16,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "kbr"; repo = pname; - rev = version; - sha256 = "sha256-eRvo40VXgo+SQGeh88vRfHPnbrsVDyz03ToIgwRc43Q="; + rev = "refs/tags/${version}"; + hash = "sha256-BHlOX5STnKaIOM5tiBZ9JHNQIYVZfIPDMuSw6DAJliA="; }; propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix index 6b47dc77c1..8c6c79c3ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage -, fetchPypi -, isPy3k +, fetchFromGitHub , pytestCheckHook +, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { @@ -10,32 +11,43 @@ buildPythonPackage rec { version = "2.3.4"; format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "15b4b18346259392b0d27598f240e9390fafbff882137a9c48a1e0104fb17f78"; + src = fetchFromGitHub { + owner = "Marco-Sulla"; + repo = "python-frozendict"; + rev = "refs/tags/v${version}"; + hash = "sha256-rDorFoVHiwbkRsIIA2MLKPHJ9HWJw2FKZ5iFHEiqzhg="; }; + postPatch = '' + # https://github.com/Marco-Sulla/python-frozendict/pull/69 + substituteInPlace setup.py \ + --replace 'if impl == "PyPy":' 'if impl == "PyPy" or not src_path.exists():' + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "frozendict" ]; - checkInputs = [ - pytestCheckHook - ]; - preCheck = '' pushd test ''; - postCheck = '' - popd - ''; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/Marco-Sulla/python-frozendict/issues/68 + "test_c_extension" + ]; meta = with lib; { + description = "Module for immutable dictionary"; homepage = "https://github.com/Marco-Sulla/python-frozendict"; - description = "A simple immutable dictionary"; + changelog = "https://github.com/Marco-Sulla/python-frozendict/releases/tag/v${version}"; license = licenses.lgpl3Only; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/frozenlist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/frozenlist/default.nix index 531ee2b925..957e9f5d05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/frozenlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/frozenlist/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { cython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix index 1d4326f74e..e27216d551 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fs/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { # strong cycle with paramaterized doCheck = false; - checkInputs = [ pyftpdlib mock psutil pytestCheckHook ]; + nativeCheckInputs = [ pyftpdlib mock psutil pytestCheckHook ]; propagatedBuildInputs = [ six appdirs pytz setuptools ] ++ lib.optionals (!isPy3k) [ backports_os ] ++ lib.optionals (!pythonAtLeast "3.6") [ typing ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix index 4eebfdf5d0..37adb4c8b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix @@ -120,7 +120,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ numpy pytest-asyncio pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix index d214cb4f0a..d7e6c75656 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { wcwidth ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix index 4cb2fe442d..186cb45c94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-aInbhkndINm21ApsXw+EzPNAp9rB4L/A8AJAkPwq+zM="; }; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "High-level FTP client library (virtual file system and more)"; - homepage = "http://ftputil.sschwarzer.net/"; + homepage = "https://ftputil.sschwarzer.net/"; license = licenses.bsd2; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix index f20f5dde8b..f8b0f78299 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "74cd3c428ec94f4edfba81f9b2f14904846d5ffccc27c92433b8b5939b5575dd"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix index 0eab273848..ae2ad068e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix index 2a41d9955f..5abacb6a79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "funcy"; - version = "1.17"; + version = "1.18"; src = fetchPypi { inherit pname version; - sha256 = "40b9b9a88141ae6a174df1a95861f2b82f2fdc17669080788b73a3ed9370e968"; + sha256 = "sha256-FUSNGajrzHpYWv56OEoZGG0L1ny/VvtCzR/Q92MT+bI="; }; # No tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/furl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/furl/default.nix index 5872ab8b78..0f561573d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/furl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/furl/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ flake8 pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/future/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/future/default.nix index a24ea8ab97..7c4a5507b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/future/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/future/default.nix @@ -5,16 +5,27 @@ buildPythonPackage rec { pname = "future"; - version = "0.18.2"; + version = "0.18.3"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"; + hash = "sha256-NKF0Nu0elml6hvnePRWjsL4B2LyN6cHf/Vn7gjTtUwc="; }; + pythonImportsCheck = [ + "future.builtins" + "future.moves" + "future.standard_library" + "past.builtins" + "past.translation" + ]; + doCheck = false; meta = { + changelog = "https://github.com/PythonCharmers/python-future/blob/v${version}/docs/whatsnew.rst"; description = "Clean single-source support for Python 3 and 2"; longDescription = '' python-future is the missing compatibility layer between Python 2 and @@ -29,7 +40,7 @@ buildPythonPackage rec { ''; homepage = "https://python-future.org"; downloadPage = "https://github.com/PythonCharmers/python-future/releases"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ prikhi ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fuzzyfinder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fuzzyfinder/default.nix index a422e5606b..2107dd7b2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fuzzyfinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fuzzyfinder/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "c56d86f110866becad6690c7518f7036c20831c0f82fc87eba8fdb943132f04b"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix index 81d6b0ade1..fd0473b998 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ levenshtein ]; - checkInputs = [ pycodestyle hypothesis pytest ]; + nativeCheckInputs = [ pycodestyle hypothesis pytest ]; meta = with lib; { description = "Fuzzy string matching for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix index f617078833..1ed186126d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gamble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gamble/default.nix index 3b62893e14..6cdfc4410b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gamble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gamble/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-zsEBqhKidgO1e0lpKhw+LY75I2Df+IefNLaSkBBFKFU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix index 6d9db5a901..adadfc030b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/garminconnect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.1.50"; + version = "0.1.53"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-M9FH8xbNo5NF2PktiG4SpZl4tjH7H937Rbqhe6VV+Bk="; + hash = "sha256-bUOdurCuAxpVag+mv3brxYIyNu9KhoDauL+lcrcob/k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gassist-text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gassist-text/default.nix new file mode 100644 index 0000000000..b413c19d40 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gassist-text/default.nix @@ -0,0 +1,55 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, google-auth +, grpcio +, protobuf +, pytestCheckHook +, pythonOlder +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "gassist-text"; + version = "0.0.10"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tronikos"; + repo = "gassist_text"; + rev = "refs/tags/${version}"; + hash = "sha256-BSMflCSYNAaQVTOqKWyr9U9Q70ley1jjF6ndOVum+GA="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + google-auth + grpcio + protobuf + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gassist_text" + ]; + + meta = with lib; { + description = "Module for interacting with Google Assistant API via text"; + homepage = "https://github.com/tronikos/gassist_text"; + changelog = "https://github.com/tronikos/gassist_text/releases/tag/${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix index 110363b383..69e757df9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gast/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-0y2bHT7YEfTvDxTm6yLl3GmnPUYEieoGEnwkzfA6mOg="; }; - checkInputs = [ + nativeCheckInputs = [ astunparse pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix index fe719bedb8..e1fa9a5734 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gb-io/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { rust.rustc ]); - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "gb_io" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix index cb6acd3165..c6306da0ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gbulb/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { gtk3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix index c1f15d6953..e06cf326d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcal-sync/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytest-aiohttp pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix index 321a6a1de6..b3a38afafd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 76847827bd..3c0ad627b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { ujson ]; - checkInputs = [ + nativeCheckInputs = [ pytest-vcr pytestCheckHook vcrpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ge25519/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ge25519/default.nix index 647235c341..1850f49a66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ge25519/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ge25519/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { fountains ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix index d1a9f146db..7c83f06230 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gehomesdk/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "gehomesdk"; - version = "0.5.7"; + version = "0.5.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FmCoryNX1DnqMlGalad5iWO2ZRZwXgWgARQMYlJ6yVo="; + hash = "sha256-x83CmOAZFaIDv4bzO01YZxVPVM/cwUpJtKdCWOxH/O4="; }; propagatedBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for GE smart appliances"; homepage = "https://github.com/simbaja/gehome"; + changelog = "https://github.com/simbaja/gehome/blob/master/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gekitchen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gekitchen/default.nix index 8dc5bbdb3a..4c9e1d7b96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gekitchen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gekitchen/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix index 8aa4b81923..b9bcacf02a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "839592e49ea3fd985cec003ef58f8e77009a69ed7644a0c0acc94cf6dd9b8d6e"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser2/default.nix new file mode 100644 index 0000000000..f6a2c0877b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser2/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "gemfileparser2"; + version = "0.9.3"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-BFKJZOf0W2b0YNbKIwnrmoKGvtP8A6R9PrUt7kYC/Dk="; + }; + + dontConfigure = true; + + nativeBuildInputs = [ + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gemfileparser2" + ]; + + meta = with lib; { + description = "Library to parse Rubygem gemspec and Gemfile files"; + homepage = "https://github.com/nexB/gemfileparser2"; + changelog = "https://github.com/nexB/gemfileparser2/blob/v${version}/CHANGELOG.rst"; + license = with licenses; [ mit /* or */ gpl3Plus ]; + maintainers = with maintainers; [ harvidsen ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geniushub-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geniushub-client/default.nix index da0e7e2c33..7ba15e9234 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geniushub-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geniushub-client/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix index ca594e747f..406beae748 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ mock pyemd pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gentools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gentools/default.nix index 14e1fc1c60..d3f45cdea7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gentools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gentools/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { lib.optionals (pythonOlder "3.5") [ typing ] ++ lib.optionals (pythonOlder "3.4") [ funcsigs ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = "pytest"; meta = with lib; { 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 92bdb1a657..0e18c64f44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.12.5"; + version = "0.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "GeoAlchemy2"; inherit version; - hash = "sha256-McJQLc4xe1ezNeTrh1YtUB+jnkbHKL5RTZuGCR4I3Wc="; + hash = "sha256-VyRtRK6pC0xS+EwAb2dY0OGVHrkBjxBAmocUHwIVmxM="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { sqlalchemy ]; - checkInputs = [ + nativeCheckInputs = [ alembic psycopg2 pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix index 12a542af50..281e1bb620 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-9/Qchdw+HC09k17IZmDcOyyEjIPhf5qeUbqdUUahWFk="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix index 65f938fd6a..0563b8ae99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp maxminddb requests urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ mocket requests-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix index c67f40e799..f315d99d8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geojson-client/default.nix @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "exxamalte"; repo = "python-geojson-client"; - rev = "v${version}"; - sha256 = "sha256-nzM5P1ww6yWM3e2v3hRw0ECoYmRPhTs0Q7Wwicl+IpU="; + rev = "refs/tags/v${version}"; + hash = "sha256-nzM5P1ww6yWM3e2v3hRw0ECoYmRPhTs0Q7Wwicl+IpU="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -41,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for convenient access to GeoJSON feeds"; homepage = "https://github.com/exxamalte/python-geojson-client"; + changelog = "https://github.com/exxamalte/python-geojson-client/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geojson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geojson/default.nix index b762434fb6..4a733fe350 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geojson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geojson/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; LC_ALL = "en_US.UTF-8"; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; meta = { homepage = "https://github.com/frewsxcv/python-geojson"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geometric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geometric/default.nix index 775ace5f6b..984eded795 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geometric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geometric/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { export OMP_NUM_THREADS=2 ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Geometry optimization code for molecular structures"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix index 9fbedd76a6..47d2376b41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geopandas/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { shapely ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook Rtree ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geopy/default.nix index 965411fe4a..4094bacb82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geopy/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { geographiclib ]; - checkInputs = [ + nativeCheckInputs = [ async_generator docutils pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/georss-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/georss-client/default.nix index 09365ff585..97acd538d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/georss-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/georss-client/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { dateparser ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix index 4345505f31..d346a2afdc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/georss-generic-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { georss-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix index f40f13ad58..15002c77f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { georss-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix index 512db4d8de..db9d23c690 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/georss-ingv-centro-nazionale-terremoti-client/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { georss-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix index 344c74b057..ef8ea220e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/georss-nrcan-earthquakes-client/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { georss-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix index fb4b0e753a..a85302544d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { georss-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix index fc19ea105c..adb89685d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/georss-tfs-incidents-client/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { georss-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/georss-wa-dfes-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/georss-wa-dfes-client/default.nix index 74c1a99949..170bae6356 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/georss-wa-dfes-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/georss-wa-dfes-client/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { georss-client ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/getkey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/getkey/default.nix index c0cbec2914..563ee64644 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/getkey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/getkey/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { rm setup.cfg ''; - checkInputs = [ + nativeCheckInputs = [ flake8 pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix index 730d9cc3eb..05b638559a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/getmac/default.nix @@ -5,21 +5,24 @@ , pytest-benchmark , pytest-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "getmac"; - version = "0.8.3"; + version = "0.9.1"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "GhostofGoes"; repo = pname; - rev = version; - sha256 = "sha256-X4uuYisyobCxhoywaSXBZjVxrPAbBiZrWUJAi2/P5mw="; + rev = "refs/tags/${version}"; + hash = "sha256-U04mtg7DCC78X5Fd0wGaHrf8XkUpDLi4+ctKCyR4dKg="; }; - checkInputs = [ + nativeCheckInputs = [ py pytestCheckHook pytest-benchmark @@ -43,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to get the MAC address of network interfaces and hosts on the local network"; homepage = "https://github.com/GhostofGoes/getmac"; + changelog = "https://github.com/GhostofGoes/getmac/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ colemickens ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix index 62568eb6f3..21638ce803 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ dpkt pytestCheckHook urllib3 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gflags/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gflags/default.nix index 9b3b92784d..2cef0c11a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gflags/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gflags/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "40ae131e899ef68e9e14aa53ca063839c34f6a168afe622217b5b875492a1ee2"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ghdiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ghdiff/default.nix index efbdc2f59f..213f7fdd30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ghdiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ghdiff/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "17mdhi2sq9017nq8rkjhhc87djpi5z99xiil0xz17dyplr7nmkqk"; }; - checkInputs = [ zope_testrunner ]; + nativeCheckInputs = [ zope_testrunner ]; propagatedBuildInputs = [ six chardet ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ghrepo-stats/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ghrepo-stats/default.nix index 71e640cce7..b7f65f9e78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ghrepo-stats/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ghrepo-stats/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ghrepo-stats"; - version = "0.5.0"; + version = "0.5.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mrbean-bremen"; repo = pname; - rev = "v${version}"; - hash = "sha256-rTW6wADpkP9GglNmQNVecHfA2yJZuzYhJfsLfucbcgY="; + rev = "refs/tags/v${version}"; + hash = "sha256-QHFwIfX0rSVnWgxe82zQXMwIS99CiPgprfoMbuXvXH0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gibberish-detector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gibberish-detector/default.nix index df3b70c000..274e8f9355 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gibberish-detector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gibberish-detector/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1si0fkpnk9vjkwl31sq5jkyv3rz8a5f2nh3xq7591j9wv2b6dn0b"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix index dfe1c186f4..50b8a0e709 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gidgethub/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ] ++ pyjwt.optional-dependencies.crypto; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook aiohttp httpx diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix index 674af37074..5953e206b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gios/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { dacite ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-error-for-skips diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix index 84743d8606..297b6c9865 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { gevent ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix index 7b3a29eba6..649c2aa2bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ + nativeCheckInputs = [ gitMinimal util-linux # `rev` is needed in tests/test_process.py ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/git-revise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/git-revise/default.nix index b4a771a4c3..4f5efc2719 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/git-revise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/git-revise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - checkInputs = [ git gnupg pytestCheckHook ]; + nativeCheckInputs = [ git gnupg pytestCheckHook ]; meta = with lib; { description = "Efficiently update, split, and rearrange git commits"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/github-to-sqlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/github-to-sqlite/default.nix index dbdc4be459..2d02a2a732 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/github-to-sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/github-to-sqlite/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/github3_py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/github3_py/default.nix index a5c930ba9e..ba83ca1847 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/github3_py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/github3_py/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ] ++ pyjwt.optional-dependencies.crypto; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook betamax betamax-matchers diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glances-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glances-api/default.nix index dd241d5ff8..9aab37ade7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glances-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glances-api/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { httpx ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpx pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glasgow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glasgow/default.nix index a8f658ac83..c1de69ff1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glasgow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glasgow/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { crcmod ]; - checkInputs = [ yosys icestorm nextpnr ]; + nativeCheckInputs = [ yosys icestorm nextpnr ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix index 706ce1523f..7506c5295b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "6.4.0"; + version = "7.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-9+U9kRMkcQY0tjao6Pmi0STqh0xw0pFU0/xZXlawkKM="; + hash = "sha256-xIlg3W/A3FBvVOEin/ku0QdmzGXlmOm5yLeYvoGkzNU="; }; postPatch = '' @@ -46,7 +46,7 @@ buildPythonPackage rec { yamllint ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix index 68d50c435f..7834688e15 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix @@ -17,19 +17,19 @@ buildPythonPackage rec { pname = "glean-sdk"; - version = "51.2.0"; + version = "52.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-4EXCYthMabdmxWYltcnO0UTNeAYXwXQeRfwxt1WD3Ug="; + hash = "sha256-iW432YtZtRGUWia33Lsnu+aQuedhBJdh8dZ30FPg6Vk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-qOGoonutuIY+0UVaVSVVt0NbqEICdNs3qHWG0Epmkl0="; + hash = "sha256-/7qKIQglNKGveKFtPeqd35Mq2hH/20BGTgDBgip4PnI="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { semver ]; - checkInputs = [ + nativeCheckInputs = [ pytest-localserver pytestCheckHook ]; @@ -56,11 +56,6 @@ buildPythonPackage rec { "test_client_activity_api" ]; - postPatch = '' - substituteInPlace glean-core/python/setup.py \ - --replace "glean_parser==5.0.1" "glean_parser>=5.0.1" - ''; - pythonImportsCheck = [ "glean" ]; @@ -70,6 +65,6 @@ buildPythonPackage rec { description = "Telemetry client libraries and are a part of the Glean project"; homepage = "https://mozilla.github.io/glean/book/index.html"; license = licenses.mpl20; - maintainers = []; + maintainers = with maintainers; [ melling ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix index b288468600..f90a24f090 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitHub { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - sha256 = "sha256-puaKveByAEkgME81uePTMSglvMgyqornW1sNAbJXNuc="; + sha256 = "sha256-zusVOhZfJyUpftvrUSLZJl7mG5AEGMLGXMOojFnEsH0="; }; # Patch path to GLFW shared object diff --git a/third_party/nixpkgs/pkgs/development/python-modules/globre/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/globre/default.nix index 5debd1d0ab..c7c77b35c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/globre/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/globre/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1qhjpg0722871dm5m7mmldf6c7mx58fbdvk1ix5i3s9py82448gf"; }; - checkInputs = [ nose coverage ]; + nativeCheckInputs = [ nose coverage ]; meta = with lib; { homepage = "https://github.com/metagriffin/globre"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix index 3c2c01f9dc..57f869842c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/globus-sdk/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ mypy pytestCheckHook responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glom/default.nix index 5f8ab55e90..38f17c9ed8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glom/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { face ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix index 9c652994a8..31434342be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glymur/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { numpy ] ++ lib.optionals isPy27 [ contextlib2 mock importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ scikitimage procps pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix index 6e960f9b62..8b6e68de4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { skia-pathops ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "glyphsLib" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix index e10ae6927f..c9615f1ca3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.20"; + version = "0.2.22"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-RDd0KR7NjBTlgeQ/E4mnLnB2n4NCPoAt2a62NGdzCZE="; + sha256 = "sha256-mRI+SalWNGLEwL8UcQIrsEKOpzgat9VdmdV1E5H48aY="; }; postPatch = '' @@ -34,7 +34,7 @@ buildPythonPackage rec { "goodwe" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -42,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for connecting to GoodWe inverter"; homepage = "https://github.com/marcelblijleven/goodwe"; + changelog = "https://github.com/marcelblijleven/goodwe/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix index 9dfc1950fd..c3839dc667 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index ba4388c256..5e83c98599 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.70.0"; + version = "2.75.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Ji3glNWjDTN/WeZlgQGf7UW2mMB4OXrEjdMjwJaCNuc="; + sha256 = "sha256-DxCaK3HxTJp7SCMf7PzdOrlYYeqav1TwYKxFwgT63D0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-apitools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-apitools/default.nix index 24b37fd722..550051c1d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-apitools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-apitools/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix index ee67860201..40af6ed4a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { httplib2 ]; - checkInputs = [ + nativeCheckInputs = [ flask mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 725d955dcc..a197a12441 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ click mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix index 65f2bf1516..0f6600d159 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ aioresponses asynctest flask diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 18ab0a7078..b0aca65e5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-asyncio 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 9692740231..e32bcf9702 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 @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.16.0"; + version = "3.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-hkuW9c5ORUuN0kbQJ2MG/GezORvqL0w51a7Ca9AdHkU="; + hash = "sha256-EFMiiPlHwKkc7tjOcbqiAlnb+3oBsTBlg6Ey0vvs+Mc="; }; propagatedBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix index 51fb6d04dc..dddde1a309 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.9.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8E+RvHHs4IK1RrbTtY8wwuBLNQKcDnb058vN6hKfy6Q="; + hash = "sha256-pS/fm9837vmdvh6msk69nTeo/gj1StxsfFf6DsmOQE4="; }; propagatedBuildInputs = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ google-cloud-storage google-cloud-testutils mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index abe6c484ec..2c5d0a9a54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.10.0"; + version = "3.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-R6CIL1CA3UR81kUeIlFGJaxDGO33GBKOzT4Qo2LWlQk="; + hash = "sha256-GcgJhFT3L5TlVZYXjQQ9eENRcv/V176hF86BSsN7K/A="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { pytz ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 0a226c1cd3..2c2e5fe676 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix index 34ab7b07c2..7aaa53d39c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-storage"; - version = "2.18.0"; + version = "2.18.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RncpEPcNeCZdpeevSEeTmu1L6m4qZO/huZPAxoazrxY="; + hash = "sha256-XNPeWe8nYGmJr/MVxt0uBZMf0N2QEp5hYge0RJRWUqA="; }; propagatedBuildInputs = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ google-auth google-cloud-bigquery pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index bc80fc531f..41a9238d7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.4.1"; + version = "3.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iEaJcU2YojZN3px8Nn6CKMcRYQi7rXpjZd/eORY4mFs="; + hash = "sha256-Ik3DKbxa0J1hTbdlyV8LuLJPCIGz0qSFQGLKNG+IlvA="; }; propagatedBuildInputs = [ @@ -69,7 +69,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ freezegun google-cloud-testutils mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix index ecf9162ce8..f92580db80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.14.1"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-A40lbmMijD0d1B81n2bcJ43gGaRYkVfmquOO8usRXew="; + hash = "sha256-idnWz7o7RuOAZbY+H5STVAVa1rexThDY3Zb5eaI10Ao="; }; propagatedBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ grpcio mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix index e1041f2811..19910f1167 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 65c7692013..6c022b84ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.16.0"; + version = "2.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-T8rAle7q1/uiGkrLbCWtR8iiAPpW/QKJLppity8oWiY="; + hash = "sha256-PXDUjipUG7cYqeO2ivqrqLybHzDIssvBtdZixEMqXOA="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix index 910528bbca..8d54e68bab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ] ++ passthru.optional-dependencies.grpc; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index ffc27705d3..f2d8b6ec50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.11.0"; + version = "3.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wu53nKA4nmXHuJ+dr9r/A9xDYec1bkW4S8gfgiLBctw="; + hash = "sha256-X4h6hrEfjiroAgtG26bz70P2PsEileHmZ5Jq6iPHqCs="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 1f4b114369..289fef97b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.2.0"; + version = "5.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-44HADoHz0ITGolvZtB1wlFDEMWBwyOZ2HazJMl/SXn0="; + hash = "sha256-iuhXfFp6cfDNDtk3JS+U8YbQAOII0khY2bmvP75QAP4="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix index af1f15ffd0..553b7a7dd1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.11.0"; + version = "2.13.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PSk6IYBfGL7g0FBCqUgT4T8k1IYprtLGQQQEybEO99o="; + hash = "sha256-ikstW53KrRr4vnmtbr0AOG8/kHaF8excJFbwclhCA7A="; }; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytestCheckHook @@ -52,6 +52,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Requires credentials + "tests/system/test_aggregation_query.py" "tests/system/test_allocate_reserve_ids.py" "tests/system/test_query.py" "tests/system/test_put.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix index 513d034b53..86888e3fb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.10.1"; + version = "3.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-M7JhzttLvWMPC9AEJN/X9ofIFBtNzWGgXjnun8k1CwA="; + hash = "sha256-TwVY6/4TSY8cPj3y/A7+cxpyVJ9+lPg+vAKNhfBNfqI="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix index f95995aec5..b61f1b7317 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { google-cloud-core ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index f03f4c9683..5a062f4a85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.8.0"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XFOgoe6xphHyp/zbd+RR+9dXebMcU7/c2ETFGy+lg3U="; + hash = "sha256-Xl+Jc05daQZPh4xggf/JYYlJ5Lx6LafqWhMcVdk/r6o="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index aa7b9e262a..360c4c9a4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.9.0"; + version = "2.9.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gEgTYUsaac9dJIxCZJU/axjwiNqttUQiL6UskhzjsJg="; + hash = "sha256-WxUiufi+rXBPuSBcC/Ktp0tEkcaA457o0WexweS9MMI="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ aiounittest google-cloud-testutils mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index 03ba6c4b1e..9a1518b3cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix index b415a5015e..b06a5d3499 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { proto-plus ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix index b973d1a95d..f3fdc38124 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.8.0"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YckGLp3A4rngs/KXOg3/AE4RyboUIoy0NGf44unn/ns="; + hash = "sha256-Rh23HbHv1FVmiZtyofv0bktv7tZWN3IS5jQawzbFfRk="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix index 0f99cf3433..27a2e9e067 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix index 7eb1896703..5430c4f7ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.8.0"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LEExcED6vlv2Lhto+KyLiz8uyDTa+rHLySUNDZpHGe4="; + hash = "sha256-o4o9x7r7HpwzByUijDegzos35FILro0Esr2ugN2nyws="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix index 7a6e2cfcaf..d167a07fa6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.4.0"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zeD1n625F0aHRiUrr0sR6gD21obvAhORg+r5IfOu5rQ="; + hash = "sha256-8RVEoh6jVW9w66x7wzj/qKGXkTg07N2IU9F2uHCCOqo="; }; propagatedBuildInputs = [ @@ -41,7 +41,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ django flask google-cloud-testutils diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 0254ca5328..2dabd36a2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.14.0"; + version = "2.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Fn21kQVBPjZk9pvsLO2W0vLalbXk3mSOKKn/uieudaY="; + hash = "sha256-FKg2nEmc5mYKSWJwV0wG09kK4ZQl+Tan+9BqbwJ/8eA="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 8f708fc652..43b5b09810 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.5.0"; + version = "1.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fA8O/pdUNgY3dwj17D7aoHUjzaXpMmL3w0TU6A6gqHo="; + hash = "sha256-ivlerguhDb7zhRfizIPGQWwwLOUhyoj2xWAy9inSklQ="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix index 84bbf21609..9948b7243c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.14.0"; + version = "1.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CLZC9Iub3LWvDPhetxlHorccRUritd+YzTI/MF1hHrY="; + hash = "sha256-wDb1vy1rj0yBOk7Q1pMzNw3foOXHk18YwIbY4ZcYCxM="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; 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 26f228ca2a..26446cc412 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 @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.13.12"; + version = "2.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/qa/3RKWC0SDgDeax/CwiZtSc9Nxm1cHJAKT6si2ecw="; + hash = "sha256-4nFPB7dQRYvq9bB7Zw6ntgWO4VXAIcmH0LjmpAvzRG8="; }; propagatedBuildInputs = [ @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils pytestCheckHook pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix index 1fe98e0de2..248fcb7140 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.11.0"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dWpsiitG58iCw8z8Hd10eAXXfRRBlq90m0cs1YjeMqE="; + hash = "sha256-dRavwtaU+dpRZkO49Q0Btmh2Mi/zUWbvZbImrfUkrAM="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; 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 76e2e43c61..b2aa7804b6 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 @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.8.0"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-O1g8NcpvQn+3eyD1yqZ43aM6+eubVQGzLAt9DuI2Aqc="; + hash = "sha256-npTv+f533JK/J2ceJ6Na7mS90HfKaHORmGnFz1LBzLQ="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 15e80892d9..a9eb5f2ba7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { google-cloud-core ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index efd89375b0..169e3496e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.15.0"; + version = "2.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KYKs/yUUKmgWxNp+EhD1Wcim/9dajatdl0QW0bZKByg="; + hash = "sha256-0ubTvpHT6HfCg5lfdbzAnP77oWPZw2N78qZs6tGim6M="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 737cd8a37a..28bf273bd5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.18.0"; + version = "1.18.2"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gtzSB70x7oN6EiTP1U5P1dV4a4eWZNGtRFInYz7AyCA="; + hash = "sha256-O1jSSozVmeDRoTCtRhsBDlZ/o8g/8ccGkJCg6hp7ob8="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index ae702859c0..1c05367490 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 0bc05828dd..7c57cc560e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.16.2"; + version = "2.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aegM+pgdKsM7qC8sfPMxV74gwPYasArFWzkJ/p9ESzU="; + hash = "sha256-gWcYMY9Ztm5d9CkQXPtAZaDgrKwU90EZBdznuWWDp9o="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { setuptools ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix index 541997fb72..abd321fd81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ google-cloud-iam google-cloud-kms google-cloud-testutils diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index 574f71e872..8751b58372 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.12.0"; + version = "2.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8dhYoj3/EXwMZLRduwskoAn7NSjA4N8xhIw8UbAAhnY="; + hash = "sha256-2kRj5zlAPVO2U3EzN+opz5OBtwEru5RqGOXGqLUPaUA="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 6d674aeee8..3b67f04f67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.14.0"; + version = "2.14.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-q4OD37ryZqg40L89BNZdLCNeC1QPwVhUaT4S5tO88Jk="; + hash = "sha256-3XFvKnaK1nUCz9mbmSXFH/1uFr6TtBCr7v/arBkL/oE="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix index fcad05e79d..a753acdcc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.9.0"; + version = "1.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zqd9uiSpp6z5LyGG42axl6pGcYKmSrbku+UcLGtoUbI="; + hash = "sha256-aU6XD+uj/X9Gs8z2vP0rhTlaqkg7u4H9CV/CJl2b7ak="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix index 2d13bdcc21..6ae9ff0ea9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.10.0"; + version = "3.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SdhAsksalGug0eW9rVlAGpEGIUjreKkFIj3v9x54G6I="; + hash = "sha256-++1k8lhJfJ7e/oK//IyYx9W/RacQa/1RwdrhyvCYWEM="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 3236ba1675..b8019c03cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.10.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SzCzTYyvf85E7BDBV0lX4g0hiNyZ5Ebo1m+WR4AjoBk="; + hash = "sha256-HlmuzMOaCl7z9NBVI5HoCH1vltQCeel30B5roX/+2HE="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix index d683feca31..af99aa9bd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.3.0"; + version = "3.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Rj6yR/8V65wOILVSlLEi6+IRgNk3t/t7grVaHc8sRJY="; + hash = "sha256-G7v09CA1pJ2OSL7gBzYvfRGrjPjQElxnyeUvP2vpFJQ="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index ed566191ca..91b7920f58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.11.0"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1XuY1Xf4QwJqEWCv0m2seSpoteDJxWep38lyP2Okk1Q="; + hash = "sha256-nVzFxoEIk01fPnybPQ7elFSff9ofSI9Ik6B+P4o41N8="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { protobuf ] ++ google-api-core.optional-dependencies.grpc; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix index 2fd5dc315e..d02dd0dda4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { LDFLAGS = "-L${crc32c}/lib"; CFLAGS = "-I${crc32c}/include"; - checkInputs = [ pytestCheckHook crc32c ]; + nativeCheckInputs = [ pytestCheckHook crc32c ]; pythonImportsCheck = [ "google_crc32c" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix index 828d9ff5eb..600703130e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "i18naddress" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix index f4e5f498ca..d8fe3ca62f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "2.2.2"; + version = "2.2.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-QeT4S8UlJQ0rCYG8+hc4cP1mM3KZlu/afFqz+LPIuVA="; + hash = "sha256-HQzU6no/DV2QOC+LV7kUSrygTwgAvfMSmYIKaBd/PCE="; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ asynctest coreutils pytest-aiohttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-reauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-reauth/default.nix index bdb7d78d7d..5a4524926d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-reauth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-reauth/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pyu2f ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix index b5e4de424b..3dda409f15 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ google-cloud-testutils mock pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix index 64a08ecfc7..d2e67e4676 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/googlemaps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "googlemaps"; - version = "4.7.3"; + version = "4.10.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,14 +19,14 @@ buildPythonPackage rec { owner = "googlemaps"; repo = "google-maps-services-python"; rev = "refs/tags/v${version}"; - hash = "sha256-SwNUoC4x1Z+cqBvuBtDZNZMDcs4XwLj7LWntZ4gZ+vo="; + hash = "sha256-8oGZEMKUGaDHKq4qIZy10cbLNMmVclJnQE/dx877pNQ="; }; propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-cov pytestCheckHook responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix index 4eacb83f4d..233d0bbbce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.21.1"; + version = "0.22.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-F5BUt+A5IF010PT/OvkINrMyK8tZ+uqml3CqNWpaM0c="; + hash = "sha256-HAUHNxO7dfocazGhcvvcqbZot/RkAP50DrsEkocOugI="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Govee BLE devices"; homepage = "https://github.com/Bluetooth-Devices/govee-ble"; + changelog = "https://github.com/bluetooth-devices/govee-ble/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpiozero/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpiozero/default.nix index e75938a897..a9546df9c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpiozero/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpiozero/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { "gpiozero.tools" ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gprof2dot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gprof2dot/default.nix index 1536c5fcbd..45f9915c06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gprof2dot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gprof2dot/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ]; # Needed so dot is on path of the test script - checkInputs = [ graphviz ]; + nativeCheckInputs = [ graphviz ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpustat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpustat/default.nix index fbfa2faf59..f7df51d616 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpustat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpustat/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ mockito pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpy/default.nix index 217039277b..b6e4b4910e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { buildInputs = [ cython ]; propagatedBuildInputs = [ numpy scipy six paramz matplotlib ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # $ nosetests GPy/testing/*.py # => Ran 483 tests in 112.146s (on 8 cores) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpyopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpyopt/default.nix index 8852c56967..c430e29a3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gpyopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpyopt/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; # requires several packages not available in Nix - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = "nosetests -v GPyOpt/testing"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gql/default.nix index 6ce977d559..4d4146968c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gql/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aiofiles mock parse diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix index a0637e7d9e..3d3cd47cf4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ mock requests pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grandalf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grandalf/default.nix index c4e7eb4d74..1852364fbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grandalf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grandalf/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphene-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphene-django/default.nix index 728d64ed1f..3e8625ca6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphene-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphene-django/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , pythonOlder , fetchFromGitHub @@ -22,6 +23,7 @@ buildPythonPackage rec { pname = "graphene-django"; version = "3.0.0"; format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -49,7 +51,7 @@ buildPythonPackage rec { export DJANGO_SETTINGS_MODULE=examples.django_test_settings ''; - checkInputs = [ + nativeCheckInputs = [ django-filter mock py @@ -58,9 +60,18 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # Pèython 3.11 support, https://github.com/graphql-python/graphene-django/pull/1365 + "test_django_objecttype_convert_choices_enum_naming_collisions" + "test_django_objecttype_choices_custom_enum_name" + "test_django_objecttype_convert_choices_enum_list" + "test_schema_representation" + ]; + meta = with lib; { description = "Integrate GraphQL into your Django project"; homepage = "https://github.com/graphql-python/graphene-django"; + changelog = "https://github.com/graphql-python/graphene-django/releases/tag/v{version}"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix index 8e556fdd7c..190d3e7082 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { graphql-relay ]; - checkInputs = [ + nativeCheckInputs = [ promise py pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix index 91def6f288..221b1cfbfa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphite-web/default.nix @@ -1,11 +1,14 @@ { lib , stdenv , buildPythonPackage +, python , cairocffi , django , django_tagging -, fetchPypi +, fetchFromGitHub +, fetchpatch , gunicorn +, mock , pyparsing , python-memcached , pythonOlder @@ -14,7 +17,6 @@ , txamqp , urllib3 , whisper -, whitenoise }: buildPythonPackage rec { @@ -24,11 +26,26 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Pxho1QWo2jJZYAMJx999bbELDVMr7Wp7wsssYPkc01o="; + src = fetchFromGitHub { + owner = "graphite-project"; + repo = pname; + rev = version; + hash = "sha256-2HgCBKwLfxJLKMopoIdsEW5k/j3kNAiifWDnJ98a7Qo="; }; + patches = [ + (fetchpatch { + name = "CVE-2022-4730.CVE-2022-4729.CVE-2022-4728.part-1.patch"; + url = "https://github.com/graphite-project/graphite-web/commit/9c626006eea36a9fd785e8f811359aebc9774970.patch"; + sha256 = "sha256-JMmdhLqsaRhUG2FsH+yPNl+cR7O2YLfKFliL2GU0aAk="; + }) + (fetchpatch { + name = "CVE-2022-4730.CVE-2022-4729.CVE-2022-4728.part-2.patch"; + url = "https://github.com/graphite-project/graphite-web/commit/2f178f490e10efc03cd1d27c72f64ecab224eb23.patch"; + sha256 = "sha256-NL7K5uekf3NlLa58aFFRPJT9ktjqBeNlWC4Htd0fRQ0="; + }) + ]; + propagatedBuildInputs = [ cairocffi django @@ -41,7 +58,6 @@ buildPythonPackage rec { txamqp urllib3 whisper - whitenoise ]; postPatch = '' @@ -59,12 +75,28 @@ buildPythonPackage rec { --replace "join(WEBAPP_DIR, 'content')" "join('$out', 'webapp', 'content')" ''; + checkInputs = [ mock ]; + checkPhase = '' + runHook preCheck + + pushd webapp/ + # avoid confusion with installed module + rm -r graphite + # redis not practical in test environment + substituteInPlace tests/test_tags.py \ + --replace test_redis_tagdb _dont_test_redis_tagdb + + DJANGO_SETTINGS_MODULE=tests.settings ${python.interpreter} manage.py test + popd + + runHook postCheck + ''; + pythonImportsCheck = [ "graphite" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Enterprise scalable realtime graphing"; homepage = "http://graphiteapp.org/"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix index e4a2d5e937..0d866a29bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-LtBbHA5r6/YNh2gKX0+NqQjrpKuMioyOYWT0R59SIL4="; }; - checkInputs = [ + nativeCheckInputs = [ py pytest-asyncio pytest-benchmark diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix index 435f1f5d8d..401214bc1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-describe pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphql-server-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-server-core/default.nix index 2ba45e0996..37c2893908 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-server-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphql-server-core/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { # fail with: cannot import name 'format_error' from 'graphql' doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphtage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphtage/default.nix index 063cece8a3..53418f486d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphtage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphtage/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix index 1fd0db3a5f..e83a90729f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphviz/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { fontDirectories = [ freefont_ttf ]; }; - checkInputs = [ + nativeCheckInputs = [ mock pytest pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix index c1dde12b3e..7c9eb5ae4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graspologic/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { seaborn ]; - checkInputs = [ pytestCheckHook pytest-cov ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov ]; pytestFlagsArray = [ "tests" "--ignore=docs" "--ignore=tests/test_sklearn.py" ]; disabledTests = [ "gridplot_outputs" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix index 2059d7c092..0cdf472be0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pycryptodome ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greeneye-monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greeneye-monitor/default.nix index 76da49a9ee..40b1b68fef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greeneye-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greeneye-monitor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { siobrultech-protocols ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greenlet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greenlet/default.nix index 129243b791..bd33f3c096 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greenlet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greenlet/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-QuYCVkRg2g6O5ny21yNjY+5eExqhWUO2Zw5E5cLtD2c="; }; - checkInputs = [ + nativeCheckInputs = [ objgraph psutil pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix index b62b732830..efa1021323 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gremlinpython/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { nest-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock pyhamcrest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix index 5c55b8c6c5..2d4fbf5064 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix index f95d130d3a..692b2fe6d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.25.3"; + version = "0.25.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-t36uWIREn01/+dIYP5HYlkSPPjgoZoYbJYnFo3Y6qSw="; + hash = "sha256-AZZhwHtVhdHkztzr/Hdi63VC5CjK2Vz8h8zizmSUdNY="; }; postPatch = '' @@ -41,7 +41,7 @@ buildPythonPackage rec { cached-property ]; - checkInputs = [ + nativeCheckInputs = [ git pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grip/default.nix index eab4b45547..fd22e420fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grip/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "sha256-CHL2dy0H/i0pLo653F7aUHFvZHTeZA6jC/rwn1KrEW4="; }; - checkInputs = [ pytest responses ]; + nativeCheckInputs = [ pytest responses ]; propagatedBuildInputs = [ docopt flask markdown path-and-address pygments requests tabulate ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpclib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpclib/default.nix index 1eb93ece6d..d6c1a6f50a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpclib/default.nix @@ -31,7 +31,7 @@ buildPythonPackage { multidict ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio async-timeout diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix index 2b8ed6709a..18a1a2c952 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gruut-ipa/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "gruut_ipa" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gruut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gruut/default.nix index f9c0425823..0038a85a3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gruut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gruut/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { inherit lang version format src; }) langPkgs); - checkInputs = [ glibcLocales pytestCheckHook ]; + nativeCheckInputs = [ glibcLocales pytestCheckHook ]; disabledTests = [ # https://github.com/rhasspy/gruut/issues/25 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix index a2543ae227..076f08dc7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix index eab119f39a..8bc82046f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { GSS ]; - checkInputs = [ + nativeCheckInputs = [ k5test nose parameterized diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gtts-token/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gtts-token/default.nix index f3325aab8e..7785a449d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gtts-token/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gtts-token/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # requires internet access disabledTests = [ "test_real" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix index 158da1c5b9..09c317d6a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gtts/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { twine ]; - checkInputs = [ pytest mock testfixtures ]; + nativeCheckInputs = [ pytest mock testfixtures ]; # majority of tests just try to call out to Google's Translate API endpoint doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gudhi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gudhi/default.nix index 03b26927cf..392d6f9e8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gudhi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gudhi/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { buildInputs = [ boost eigen gmp cgal_5 mpfr ] ++ lib.optionals enableTBB [ tbb ]; propagatedBuildInputs = [ numpy scipy ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/guessit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/guessit/default.nix index eff3d54d72..824cb8f1ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/guessit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/guessit/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { python-dateutil ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - checkInputs = [ py pytestCheckHook pytest-mock pytest-benchmark pyyaml ]; + nativeCheckInputs = [ py pytestCheckHook pytest-mock pytest-benchmark pyyaml ]; pytestFlagsArray = [ "--benchmark-disable" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gumath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gumath/default.nix index 601aecdf33..41c0d2352c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gumath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gumath/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { disabled = isPy27; inherit (libgumath) src version meta; - checkInputs = [ numba ]; + nativeCheckInputs = [ numba ]; propagatedBuildInputs = [ ndtypes xnd ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix index 72852ae1f1..d41b45a479 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gunicorn/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ eventlet gevent pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix index 7760346f9d..9245b89512 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gvm-tools/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { python-gvm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix index 4f34ca2daa..e82ca2baaf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-jxn7vpnnJCD/NcALJ6NMuZN+kCqLgQ4siDAMbwo7aZ0="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix index 4e6c830c25..c69fec2564 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { hyperframe ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix index 4d979d0e08..0296046a52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h3/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { dontConfigure = true; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; nativeBuildInputs = [ scikit-build cmake cython diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix index 539fb6dddd..55fb49b1cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { h5py ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook netcdf4 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix index 8decbab42f..c956d13994 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix @@ -63,7 +63,7 @@ in buildPythonPackage rec { # tests now require pytest-mpi, which isn't available and difficult to package doCheck = false; - checkInputs = [ pytestCheckHook openssh ]; + nativeCheckInputs = [ pytestCheckHook openssh ]; pythonImportsCheck = [ "h5py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix index f8aecee9a6..3d8ff39af1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ha-philipsjs"; - version = "2.9.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "danielperna84"; repo = pname; - rev = version; - sha256 = "sha256-B2AQoVyoG6wyE9pTWf/ASQd8iZfIrjUr078rSkoARf0="; + rev = "refs/tags/${version}"; + hash = "sha256-iJxu+TdgDHMnLuNTFj0UC8V76x3nAgGqswMLDSgmDmQ="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { httpx ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytest-mock pytestCheckHook @@ -43,6 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to interact with Philips TVs with jointSPACE API"; homepage = "https://github.com/danielperna84/ha-philipsjs"; + changelog = "https://github.com/danielperna84/ha-philipsjs/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/habanero/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/habanero/default.nix index 0c8c724426..8bdfe84d9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/habanero/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/habanero/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook vcrpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/habitipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/habitipy/default.nix index d20c89e82e..db4e84d136 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/habitipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/habitipy/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis nose responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hachoir/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hachoir/default.nix index 3a1a34f834..0de262ab7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hachoir/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hachoir/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { urwid ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hacking/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hacking/default.nix index 050795185c..5f516175ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hacking/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hacking/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { flake8 ]; - checkInputs = [ + nativeCheckInputs = [ ddt stestr testscenarios diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index 4dffddf573..6b93a99a3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2023.1.4"; + version = "2023.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-2xXdM4iAkr/0lAZqTSjz30/WQ+dvot7gbWfOc/wjO/4="; + sha256 = "sha256-kTWUwHgcq+J3ok43gpXmsxmKTnrjPMzmowSkm404j4Q="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ pydevccu pytest-aiohttp pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hangups/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hangups/default.nix index 9782a89114..aa61baa1b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hangups/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hangups/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { mechanicalsoup ]; - checkInputs = [ + nativeCheckInputs = [ httpretty pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix index a6b033a7e3..c198103f63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pyqrcode ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-timeout pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix index 375e975d96..b3fe9e7cb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-aiohttp pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hassil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hassil/default.nix index 6d5929c8c1..c894996853 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hassil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hassil/default.nix @@ -16,7 +16,7 @@ let pname = "hassil"; - version = "0.2.3"; + version = "0.2.6"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-YT8FgvM0mlB8ri9WHLau+e4m+wyEI4mHWxXbhiI60h0="; + hash = "sha256-KbzGZLW+HrG4meOa0mVTh3jmt43gRxl9yN9asWMDxiY="; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix index 4d1ba69c93..16bbe3092d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatch-fancy-pypi-readme/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ build pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix index de962e6b95..d49c2aedb4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { hatchling ]; - checkInputs = [ + nativeCheckInputs = [ hatch pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatch-nodejs-version/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-nodejs-version/default.nix index 5c471111ab..da991314ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-nodejs-version/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatch-nodejs-version/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { hatchling ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix index b7ba944657..b68506ecd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { doCheck = false; # missing coincidence dependency - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatch-vcs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-vcs/default.nix index a8aaa70d63..6ccdfccfe0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-vcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatch-vcs/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ git pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix index 6d94888934..09b7e4f8b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix @@ -52,7 +52,7 @@ buildPythonPackage { doCheck = false; # listed in /backend/tests/downstream/requirements.txt - checkInputs = [ + nativeCheckInputs = [ build packaging requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/haversine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/haversine/default.nix index 690f5eb788..38bd8f54be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/haversine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/haversine/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-iAGG1mjrt6oJ0IkmlJwrvb2Bpk4dNxV7ee9LYov03UY="; }; - checkInputs = [ + nativeCheckInputs = [ numpy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix index e8bcfe0ec7..e7d1f93a05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix index 5dd94e5de2..4e6931f0e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hcs_utils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; buildInputs = [ six glibcLocales ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; disabled = pythonOlder "3.4"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdate/default.nix index 42736d0a04..3c45b7ff08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hdate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hdate/default.nix @@ -11,16 +11,23 @@ buildPythonPackage rec { pname = "hdate"; version = "0.10.4"; - disabled = pythonOlder "3.6"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "py-libhdate"; repo = "py-libhdate"; - rev = "v${version}"; - sha256 = "sha256-NF2ZA9ruW7sL2tLY11VAtyPRxGg2o5/mpv3ZsH/Zxb8="; + rev = "refs/tags/v${version}"; + hash = "sha256-NF2ZA9ruW7sL2tLY11VAtyPRxGg2o5/mpv3ZsH/Zxb8="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'pytz = ">= 2020.0"' 'pytz = "*"' \ + --replace 'astral = {version = "^2.2", python = "^3.6"}' 'astral = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; @@ -30,23 +37,22 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml --replace "^2020.5" ">=2020.5" - ''; - pytestFlagsArray = [ "tests" ]; - pythonImportsCheck = [ "hdate" ]; + pythonImportsCheck = [ + "hdate" + ]; meta = with lib; { description = "Python module for Jewish/Hebrew date and Zmanim"; homepage = "https://github.com/py-libhdate/py-libhdate"; + changelog = "https://github.com/py-libhdate/py-libhdate/releases/tag/v${version}"; license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix index ecea57b8b6..5de14ba8d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { cd hdbscan/tests rm __init__.py ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # known flaky tests: https://github.com/scikit-learn-contrib/hdbscan/issues/420 "test_mem_vec_diff_clusters" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix new file mode 100644 index 0000000000..0716c65f2f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hdf5plugin/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, h5py +}: + +buildPythonPackage rec { + pname = "hdf5plugin"; + version = "4.1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "silx-kit"; + repo = "hdf5plugin"; + rev = "refs/tags/v${version}"; + hash = "sha256-fFR5t8jHOQc6eDNDhDcntibaveGAmI+j/dVte1tdcyk="; + }; + + propagatedBuildInputs = [ + h5py + ]; + + checkPhase = '' + python test/test.py + ''; + pythonImportsCheck = [ + "hdf5plugin" + ]; + + preBuild = '' + mkdir src/hdf5plugin/plugins + ''; + + meta = with lib; { + description = "Additional compression filters for h5py"; + longDescription = '' + hdf5plugin provides HDF5 compression filters and makes them usable from h5py. + Supported encodings: Blosc, Blosc2, BitShuffle, BZip2, FciDecomp, LZ4, SZ, SZ3, Zfp, ZStd + ''; + homepage = "http://www.silx.org/doc/hdf5plugin/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdfs/default.nix index 05faf08bc5..c00bd18640 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hdfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hdfs/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ docopt requests six ]; - checkInputs = [ fastavro nose pytestCheckHook ]; + nativeCheckInputs = [ fastavro nose pytestCheckHook ]; pythonImportsCheck = [ "hdfs" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/headerparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/headerparser/default.nix index 3c1fd4fff9..550e5e9a46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/headerparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/headerparser/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/helper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/helper/default.nix index 1697c72703..d1e38dfbab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/helper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/helper/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hepunits/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hepunits/default.nix index 5224c84ab5..5f5c984394 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hepunits/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hepunits/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hatchling ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/here-routing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/here-routing/default.nix index 47fb3416c8..26ed821d85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/here-routing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/here-routing/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/here-transit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/here-transit/default.nix index cd44182633..638f46af43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/here-transit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/here-transit/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/herepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/herepy/default.nix index 045910d8a1..c0c5fb0742 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/herepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/herepy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix index 4e65f5b917..8a860daeb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/heudiconv/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { dcm2niix nibabel pydicom nipype dcmstack etelemetry filelock ]; - checkInputs = [ dcm2niix pytest mock ]; + nativeCheckInputs = [ dcm2niix pytest mock ]; # test_monitor and test_dlad require 'inotify' and 'datalad' respectively, # and these aren't in Nixpkgs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix index 563035f50d..913bc34b06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-EDFE5MUc+XMwe8BaXkz/DRchAZbS86X+AcShi5rx83M="; }; - checkInputs = [ + nativeCheckInputs = [ eth-utils hypothesis pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix index 507fc80352..accbda978f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hg-evolve/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-0frkG8HqzC1ZftGDMv4vk47vc9tQWGBQbL4bzFdaCL4="; }; - checkInputs = [ + nativeCheckInputs = [ mercurial ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hglib/default.nix index a6ed6b935a..9d6a4cece1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hglib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' ${python.interpreter} test.py --with-hg "${mercurial}/bin/hg" -v diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix index 8d442544fa..5374a9b6b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hickle/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ h5py numpy dill ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook scipy pandas astropy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hid/default.nix index 5546b71fea..32987c877a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hid/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hidapi ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; postPatch = '' hidapi=${hidapi}/lib/ 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 ae657fcd06..481e90bcbc 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 @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-nh2fpMIg9oZ9oquxqWJAZ1rpdKu6lRxoangfTvasIY8="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hikvision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hikvision/default.nix index 274157c961..07224c6274 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hikvision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hikvision/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hkdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hkdf/default.nix index 43e7a8f4ce..c972104f2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hkdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hkdf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hledger-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hledger-utils/default.nix new file mode 100644 index 0000000000..58fe5f3e87 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/hledger-utils/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, setuptools +, setuptools-scm +, unittestCheckHook +, hledger +, perl +, rich +, pandas +, scipy +, psutil +, matplotlib +, drawilleplot +, asteval +}: + +buildPythonPackage rec { + pname = "hledger-utils"; + version = "1.12.1"; + + format = "pyproject"; + + src = fetchFromGitLab { + owner = "nobodyinperson"; + repo = "hledger-utils"; + rev = "refs/tags/v${version}"; + hash = "sha256-uAFqBNRET3RaWDTyV53onrBs1fjPR4b5rAvg5lweUN0="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + rich + pandas + scipy + psutil + matplotlib + drawilleplot + asteval + ]; + + checkInputs = [ + unittestCheckHook + ]; + + nativeCheckInputs = [ + hledger + perl + ]; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + + meta = with lib; { + description = "Utilities extending hledger"; + homepage = "https://gitlab.com/nobodyinperson/hledger-utils"; + license = with licenses; [cc0 cc-by-40 gpl3]; + maintainers = with maintainers; [ nobbz ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix index ea39c43245..8097cc3b46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { scikit-learn ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix index b9ac7ea4db..6d98f876bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holidays/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { korean-lunar-calendar ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix index 4f94ff7713..8f109053b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python data analysis and visualization seamless and simple"; - homepage = "http://www.holoviews.org/"; + homepage = "https://www.holoviews.org/"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 69ef1c96a9..30e1471727 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { "home_assistant_bluetooth" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 0cf52ad3d0..8807d0877b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2022.12.0"; + version = "2023.1.0"; format = "wheel"; src = fetchPypi { @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-zo54lRNyKXCCUUoYIiZmHZMqISim9QKEOnFbM/iBRqE="; + hash = "sha256-2UcDu2b3DtijAOUt+eazleoKxEhAgsU3MY/OoEBpLNg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix index 1394eef5cb..c5c199f505 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2022.12.0"; + version = "2023.1.0"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -33,11 +33,11 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-oNqrvbzXeXpMG3v9RK6kppONH4n7xLVaJCEFXxVj2jE="; + hash = "sha256-hNaGE2s/oFFAVCWu50IeeaFTlOSByJJAKvBgX1iDrVE="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-S5n1MUig8ZDSLgWeVmu+5qLZ4kfHQUC9qZcVfM8rPvw="; + hash = "sha256-zXxbDGfyFUXuEnaH4a8R4LXH0gfbMCkKPBJJGp77xHM="; }; }.${stdenv.system} or (throw "Unsupported system"); in fetchPypi { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix index 3f98368131..c929aa1976 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp-wsgi pytest-aiohttp pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/homepluscontrol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/homepluscontrol/default.nix index bc4ddc0e0b..9d32704815 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/homepluscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/homepluscontrol/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix index 7b5c63c95b..7a4d32374b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix index 842c6d5f8b..6dd6863d3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-2CehGy3K5fKbkB1J8+8x1D4XvnBn1Mbapx+p8rdXDYc="; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hpccm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hpccm/default.nix index 05a1085a8e..6c2adca0fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hpccm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hpccm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six archspec ]; - checkInputs = [ pytestCheckHook pytest-xdist ]; + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; disabledTests = [ # tests require git diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hs-dbus-signature/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hs-dbus-signature/default.nix index 657a1d8b24..ebf8de2f56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hs-dbus-signature/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hs-dbus-signature/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { hash = "sha256-NNnTcSX+K8zU+sj1QBd13h7aEXN9VqltJMNWCuhgZ6I="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hsluv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hsluv/default.nix index 00e50e8259..385d4718e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hsluv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hsluv/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-p3KD+zhHCOs/rLUVf1IkW/isfpUPQstB2VHGmZ/aEPU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix index 09539b590c..4c75a2cbb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/html-sanitizer/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { beautifulsoup4 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/html-text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html-text/default.nix index 997cf053a5..1368f286cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/html-text/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/html-text/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix index 51b92c8a4f..95698872a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1y924clp2hiqg3a9437z808p29mqcx537j5fmz71plx8qrcm5jf9"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "html2text" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix index 58da63d02e..c6ca6dda22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/html5lib/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { # latest release not compatible with pytest 6 doCheck = false; - checkInputs = [ + nativeCheckInputs = [ mock pytest-expect pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httmock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httmock/default.nix index 7928189c7c..22e9b333cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httmock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httmock/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-yid4vh1do0zqVzd1VV7gc+Du4VPrkeGFsDHqNbHL28I="; }; - checkInputs = [ + nativeCheckInputs = [ requests pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/http-ece/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/http-ece/default.nix index 638191ee7f..16f8fa23c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/http-ece/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/http-ece/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - checkInputs = [ coverage flake8 mock nose ]; + nativeCheckInputs = [ coverage flake8 mock nose ]; meta = with lib; { description = "Encipher HTTP Messages"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/http-message-signatures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/http-message-signatures/default.nix index d3e8c70a9b..d88832f81a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/http-message-signatures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/http-message-signatures/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { http-sfv ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/http-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/http-parser/default.nix index 1ca7c73ef2..8f21bc75da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/http-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/http-parser/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { "http_parser" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix index 98c50fd152..570b75eddc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { werkzeug ] ++ raven.optional-dependencies.flask; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix index 408bb83765..171acd803c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpcore/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pproxy pytest-asyncio pytest-httpbin diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix index 8cf09df8ba..b226ee1690 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ] ++ requests.optional-dependencies.socks; - checkInputs = [ + nativeCheckInputs = [ pytest-httpbin pytest-lazy-fixture pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix index f817d8dff2..95acab6579 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ cryptography mock pytest-forked diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix index a47d531e33..aeab2d9e00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ + nativeCheckInputs = [ sure freezegun pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix index 6a79d7bf0e..ae55a10212 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ flask hypercorn pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix index 104fabd2c5..8384470ef1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx/default.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { # trustme uses pyopenssl doCheck = !(stdenv.isDarwin && stdenv.isAarch64); - checkInputs = [ + nativeCheckInputs = [ chardet multipart pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/huawei-lte-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/huawei-lte-api/default.nix index f55c3e88ab..237878d240 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/huawei-lte-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/huawei-lte-api/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hug/default.nix index f19c7a9dd3..afeb128e20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hug/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ falcon requests ]; - checkInputs = [ mock marshmallow pytestCheckHook numpy ]; + nativeCheckInputs = [ mock marshmallow pytestCheckHook numpy ]; postPatch = '' substituteInPlace setup.py --replace '"pytest-runner"' "" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/huisbaasje-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/huisbaasje-client/default.nix index a8db5e2abc..56e4420967 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/huisbaasje-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/huisbaasje-client/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix index f9fccbde09..33348ff252 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/humanize/default.nix @@ -11,8 +11,8 @@ }: buildPythonPackage rec { - version = "4.4.0"; pname = "humanize"; + version = "4.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-humanize"; repo = pname; - rev = version; - hash = "sha256-XxlmOs3sfHOLTkrKGsHRiBWpuCIPJua2VkKxDmjOeWE="; + rev = "refs/tags/${version}"; + hash = "sha256-vTfK45sZ9m7TUQJwZpQWhOXgZzO46CwCsnNP+PI1YfA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -45,7 +45,7 @@ buildPythonPackage rec { cp -r 'src/humanize/locale' "$out/lib/"*'/site-packages/humanize/' ''; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python humanize utilities"; homepage = "https://github.com/python-humanize/humanize"; + changelog = "https://github.com/python-humanize/humanize/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ rmcgibbo Luflosi ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix index a9e8bd1121..0144040f1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent # segfaults in the testsuite that end up failing the tests in a background thread (in myapp) - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (!stdenv.isDarwin) [ watchdog diff --git a/third_party/nixpkgs/pkgs/development/python-modules/huum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/huum/default.nix index 0df01749e9..68cba094ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/huum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/huum/default.nix @@ -1,22 +1,26 @@ { lib , aiohttp , buildPythonPackage -, fetchPypi +, fetchFromGitHub , poetry-core , pydantic +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "huum"; - version = "0.6.0"; + version = "0.7.1"; format = "pyproject"; disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-PYOjfLPa/vZZP0IZuUZnQ74IrTRvizgYhKOmhd83aMQ="; + src = fetchFromGitHub { + owner = "frwickst"; + repo = "pyhuum"; + rev = "refs/tags/${version}"; + hash = "sha256-vYHwcEOzxYEBav5YbmWpm+izFlivzu2UIR6hmAXXi0U="; }; nativeBuildInputs = [ @@ -28,17 +32,19 @@ buildPythonPackage rec { pydantic ]; - # Tests are not shipped and source not tagged - # https://github.com/frwickst/pyhuum/issues/2 - doCheck = false; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; pythonImportsCheck = [ "huum" ]; meta = with lib; { - description = "Library for for Huum saunas"; + description = "Library for Huum saunas"; homepage = "https://github.com/frwickst/pyhuum"; + changelog = "https://github.com/frwickst/pyhuum/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hy/default.nix index eab7e4d063..7a1bd2356d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hy/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { astor ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix index d16b113731..4cb6f264fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hydra-core/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hydrawiser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hydrawiser/default.nix index 3dfeff7260..76239f7876 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hydrawiser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hydrawiser/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-cov pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix index 940c31e318..d8e6936e8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wsproto toml h2 priority ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-trio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix index e22dc0761a..3673b50bb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "hyperframe" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix index ed57ad767b..50def57aeb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-aiohttp pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix index dd6784335f..61b4f87a67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix @@ -9,11 +9,18 @@ , pytest-xdist , sortedcontainers , pythonOlder +, sphinxHook +, sphinx-rtd-theme +, sphinx-hoverxref +, sphinx-codeautolink +# Used to break internal dependency loop. +, enableDocumentation ? true }: buildPythonPackage rec { pname = "hypothesis"; version = "6.61.0"; + outputs = [ "out" ] ++ lib.optional enableDocumentation "doc"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +32,28 @@ buildPythonPackage rec { hash = "sha256-gTcdJaOgP8Nc4fN8UH6+sLedivq5ZNxMRULajFOVnSo="; }; + # I tried to package sphinx-selective-exclude, but it throws + # error about "module 'sphinx' has no attribute 'directives'". + # + # It probably has to do with monkey-patching internals of Sphinx. + # On bright side, this extension does not introduces new commands, + # only changes "::only" command, so we probably okay with stock + # implementation. + # + # I wonder how upstream of "hypothesis" builds documentation. + postPatch = '' + sed -i -e '/sphinx_selective_exclude.eager_only/ d' docs/conf.py + ''; + postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; + nativeBuildInputs = lib.optionals enableDocumentation [ + sphinxHook + sphinx-rtd-theme + sphinx-hoverxref + sphinx-codeautolink + ]; + propagatedBuildInputs = [ attrs sortedcontainers @@ -34,7 +61,7 @@ buildPythonPackage rec { exceptiongroup ]; - checkInputs = [ + nativeCheckInputs = [ pexpect pytest-xdist pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix index 76977b7700..eac1d6b4d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hypothesis lark libcst ]; - checkInputs = [ parso pytestCheckHook pytest-xdist ]; + nativeCheckInputs = [ parso pytestCheckHook pytest-xdist ]; pytestFlagsArray = [ "-v" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix index de089ba39d..3c88fa2709 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyppo/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ pytestCheckHook matplotlib seaborn ]; + nativeCheckInputs = [ pytestCheckHook matplotlib seaborn ]; disabledTestPaths = [ "docs" "benchmarks" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyrule/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyrule/default.nix index 8db2e54edc..a02a110bb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hyrule/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyrule/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { hy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/i-pi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/i-pi/default.nix index 340e3618be..6c6e7983b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/i-pi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/i-pi/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytest mock pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix index 3805d50130..ee3b425229 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/i3ipc/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { fontDirectories = [ ]; }; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file - checkInputs = [ pytest xdpyinfo pytest-xvfb xorgserver i3 ]; + nativeCheckInputs = [ pytest xdpyinfo pytest-xvfb xorgserver i3 ]; postPatch = '' substituteInPlace test/i3.config \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iaqualink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iaqualink/default.nix index 3838c494cc..6e72b5a851 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iaqualink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iaqualink/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { httpx ] ++ httpx.optional-dependencies.http2; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook respx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibeacon-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibeacon-ble/default.nix index ba4c156f3a..7b9910559b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibeacon-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibeacon-ble/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { mac-vendor-lookup ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix index 84c1a7e930..a49f7c684a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibis-framework/default.nix @@ -91,7 +91,7 @@ buildPythonPackage rec { toolz ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook click filelock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index f7bccb3b84..6eb64f79ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix index 0de9070fca..421167f239 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ibm-cloud-sdk-core ]; - checkInputs = [ + nativeCheckInputs = [ responses pytestCheckHook python-dotenv diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix index 75b7366b33..1c4d884ee0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ical/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ freezegun py pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix index cbf3b09a8c..9e99b42eab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { backports-zoneinfo ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icontract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icontract/default.nix index 192a6db039..0a20003803 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icontract/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icontract/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ astor asyncstdlib deal diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix index c62b738b28..c50e2caa97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { tatsu ]; - checkInputs = [ + nativeCheckInputs = [ pytest-flakes pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix index a315642d32..0d653ed1e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index ceb9be227b..2d705352d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.13"; + version = "2.5.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,10 +18,10 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8QkDAVHjVEqicntSMb98JitmR5toOTGhgEk7cH3xSFI="; + sha256 = "sha256-urviMomTJdbublr2nCj25R/xbs/pEsRKWxmklneTjOQ="; }; - checkInputs = [ + nativeCheckInputs = [ editdistance-s pytestCheckHook ukkonen diff --git a/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix index bf321edb38..99b40c25a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/idna/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix index 319b080c34..ab7080ed27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-zAy/yqv3ZdRFlYJfuWqZuxLHlxa3O0QzDqOO4rDErtQ="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix index 439d57ff79..541ddad92e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "sha256-mMiEVenDBNmeXMrDSZamUpnSm+4BQEgfK89zxIaFMio="; }; - checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; + nativeCheckInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; propagatedBuildInputs = [ packaging torch scikit-learn tqdm ]; # runs successfully in 3.9, however, async isn't correctly closed so it will fail after test suite. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix index 109e67fd5b..b8f02166f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/igraph/default.nix @@ -10,15 +10,17 @@ buildPythonPackage rec { pname = "igraph"; - version = "0.10.3"; + version = "0.10.4"; disabled = pythonOlder "3.7"; + format = "setuptools"; + src = fetchFromGitHub { owner = "igraph"; repo = "python-igraph"; - rev = version; - hash = "sha256-j7c1CtZ796EYMsS11kd8YED7pPolskgT+611uvePTsA="; + rev = "refs/tags/${version}"; + hash = "sha256-DR4D12J/BKFpF4hMHfitNmwDZ7UEo+pI0tvEa1T5GTY="; }; postPatch = '' @@ -42,7 +44,7 @@ buildPythonPackage rec { # told to do it. ~ C. setupPyGlobalFlags = [ "--use-pkg-config" ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix index d6933c25ac..bd7d404fe2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { --replace "WTForms>=2.3.1,<3.1" "WTForms" ''; - checkInputs = [ + nativeCheckInputs = [ flask-testing pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix index 6d32ee9660..78a5d59e9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/image-go-nord/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/image-go-nord/default.nix index a8fb5df943..7b97e7763e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/image-go-nord/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/image-go-nord/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "A tool that can convert rgb images to nordtheme palette"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imagecodecs-lite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imagecodecs-lite/default.nix index f711279716..a9cec8bb50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imagecodecs-lite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imagecodecs-lite/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { cython ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imagehash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imagehash/default.nix index adc13af421..b65053c56e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imagehash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imagehash/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pywavelets ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "A Python Perceptual Image Hashing Module"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix index efad94b13d..45eb10658b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.24.0"; + version = "2.25.0"; disabled = pythonOlder "3.7"; src = fetchPypi { - sha256 = "sha256-8kD4Ip9PMpoVRigRlLUtpdZpQUGlJGaP7T+BsNB3gvo="; + sha256 = "sha256-uAeWofjDjGl6lAoq1zl+4okA1cTlEGG5pn0WrKhn8z4="; inherit pname version; }; @@ -37,7 +37,7 @@ buildPythonPackage rec { pillow ]; - checkInputs = [ + nativeCheckInputs = [ fsspec psutil pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix index 281fdaff08..e302731825 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-JAMEJv0Vc5iunuKusyD+rxLiubEIDgHsr7FrMZgLy9Q="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imapclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imapclient/default.nix index 2ef4045251..d943fbba0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imapclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imapclient/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "imapclient" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imaplib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imaplib2/default.nix index c58b698a4a..e6379c0af1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imaplib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imaplib2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "14asi3xnvf4bb394k5j8c3by6svvmrr75pawzy6kaax5jx0h793m"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix index f43908a61e..9e156f01e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ scikit-learn ]; - checkInputs = [ pytestCheckHook pandas ]; + nativeCheckInputs = [ pytestCheckHook pandas ]; preCheck = '' export HOME=$TMPDIR ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix index c749071bab..93cc6453f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/img2pdf/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { # https://gitlab.mister-muffin.de/josch/img2pdf/issues/128 doCheck = !stdenv.isAarch64; - checkInputs = [ + nativeCheckInputs = [ exiftool ghostscript imagemagick diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imgaug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imgaug/default.nix index 2c84f5c00c..1f91e41345 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imgaug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imgaug/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ opencv3 pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix index 5817b38ca0..eebeb17bb7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix index 8a438bf3f0..8fef0641b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { "immutabledict" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/immutables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/immutables/default.nix index 30646e28ca..a490d7ac8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/immutables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/immutables/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ mypy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importlab/default.nix index 03b402c8dc..9b9c6ffa0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/importlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/importlab/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { propagatedBuildInputs = [ networkx ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ "tests/test_parsepy.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix index e8b6e0857e..ddd3949dd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { typing ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importmagic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importmagic/default.nix index 8302478684..6e4c00c286 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/importmagic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/importmagic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "importmagic" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/in-place/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/in-place/default.nix index 7114fae94e..0acfbac481 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/in-place/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/in-place/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "in_place" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix index cf22ae79d8..5f1f0beb25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix @@ -21,7 +21,7 @@ let incremental = buildPythonPackage rec { # escape infinite recursion with twisted doCheck = false; - checkInputs = [ + nativeCheckInputs = [ twisted ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/infinity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/infinity/default.nix index 1fe406e62e..366572ceda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/infinity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/infinity/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1npcc4adcc3c9diw4kgmd5c0ikym1iz364p2zp6gs011rqaprald"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix index ec8179ae6a..7a77373264 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pydantic ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "inflect" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inflection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inflection/default.nix index f6d327d229..01dd785e41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inflection/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inflection/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1a29730d366e996aaacffb2f1f1cb9593dc38e2ddd30c91250c6dde09ea9b417"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # Suppress overly verbose output if tests run successfully checkPhase = "pytest >/dev/null || pytest"; 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 b707887bc3..0ada1ee5d8 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 @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.35.0"; + version = "1.36.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-kewhNnbCmciywTkk/NTBqO02jN8IAW/MriH/DkhQkFU="; + hash = "sha256-RHcUkIYzshJr6r76Kq4FsjDl9YXZJOaCeijBwMTvPfw="; }; propagatedBuildInputs = [ @@ -60,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "InfluxDB client library"; homepage = "https://github.com/influxdata/influxdb-client-python"; + changelog = "https://github.com/influxdata/influxdb-client-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix index ec81f631ac..a44a2e3004 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { msgpack ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix index e9d6c3f1a9..7dd4a5675c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix index 6fb3ddb8c1..2172a88411 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inotify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inotify/default.nix index 3590f53e1e..6473703519 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inotify/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { fetchSubmodules = false; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix index 8efdb1ab03..a0a37ce92f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inquirer/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { readchar ]; - checkInputs = [ + nativeCheckInputs = [ pexpect pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix index 42de39b4ef..a36a11ac60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/installer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/installer/default.nix index e442e0d48d..836cfa0687 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/installer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/installer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index 584aa0050e..8d6677b046 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -1,26 +1,37 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "insteon-frontend-home-assistant"; - version = "0.2.0"; + version = "0.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AP8yf2eEBT8LWs03hKihCgbBkS9sEUg5NkYdagFiqwA="; + hash = "sha256-QaWRafp0901vQFMtlmFzkugNsM4PHRll+FUZlEz6E5g="; }; + nativeBuildInputs = [ + setuptools + ]; + # upstream has no tests doCheck = false; - pythonImportsCheck = [ "insteon_frontend" ]; + pythonImportsCheck = [ + "insteon_frontend" + ]; - meta = { + meta = with lib; { description = "The Insteon frontend for Home Assistant"; homepage = "https://github.com/teharris1/insteon-panel"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix index 6f895b45ed..687fe8e58e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "intake"; - version = "0.6.5"; + version = "0.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,8 +34,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - hash = "sha256-ABMXWUVptpOSPB1jQ57iXk/UG92puNCICzXo3ZMG2Pk="; + rev = "refs/tags/${version}"; + hash = "sha256-/VQKLmEpIOULTPpJKuVLyqqQVLKVhwVBoos9Q/upwQM="; }; propagatedBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ intake-parquet pytestCheckHook ] ++ passthru.optional-dependencies.server; @@ -98,6 +98,7 @@ buildPythonPackage rec { "test_read_pattern" "test_remote_arr" "test_remote_cat" + "test_remote_env" # ValueError "test_mlist_parameter" # ImportError @@ -118,6 +119,7 @@ buildPythonPackage rec { meta = with lib; { description = "Data load and catalog system"; homepage = "https://github.com/ContinuumIO/intake"; + changelog = "https://github.com/intake/intake/blob/${version}/docs/source/changelog.rst"; license = licenses.bsd2; maintainers = with maintainers; [ costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intbitset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intbitset/default.nix index f6459c13e7..aa2fc70eb0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intbitset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intbitset/default.nix @@ -7,17 +7,17 @@ buildPythonPackage rec { pname = "intbitset"; - version = "3.0.1"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8ebQPGcpkioiPFGEnfZbnpFuYlrvuRF4Tn+azUwgfVM="; + hash = "sha256-owCy1aSYmFf/HQw5cWJHZqiadR4xWqCAwHhlAxrmN6c="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -28,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "C-based extension implementing fast integer bit sets"; homepage = "https://github.com/inveniosoftware/intbitset"; + changelog = "https://github.com/inveniosoftware-contrib/intbitset/blob/v${version}/CHANGELOG.rst"; license = licenses.lgpl3Plus; maintainers = teams.determinatesystems.members; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intelhex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intelhex/default.nix index e5b0cc6fbc..fdeeae5007 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intelhex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intelhex/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-iStzYacZ9JRSN9qMz3VOlRPbMvViiFJ4WuoQjc0lAJM="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "intelhex/test.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix index f17af2b24f..6266e60f72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intellifire4py/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix index 94d6252e3c..339332452e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { statsmodels ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix index 6aef124fc7..e0021cbc39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/internetarchive/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "3.2.0"; + version = "3.3.0"; format = "setuptools"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-cB7nRDmO2NNaHjNkHCuXH0+15WZfxseS8DBdIqefSzk="; + sha256 = "sha256-PLf+PMIXlaoL974e7coQCQKH6cVBYODPhkDxa2vhTB0="; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ pytest responses glibcLocales ]; + nativeCheckInputs = [ pytest responses glibcLocales ]; # tests depend on network doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/into-dbus-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/into-dbus-python/default.nix index 5ef92cf216..d295743dbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/into-dbus-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/into-dbus-python/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { dbus-python ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis hs-dbus-signature diff --git a/third_party/nixpkgs/pkgs/development/python-modules/intreehooks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intreehooks/default.nix index e76a6997cb..cec0f2a712 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/intreehooks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/intreehooks/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytoml ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = { description = "Load a PEP 517 backend from inside the source tree"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iocapture/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iocapture/default.nix index cc56f8d0bd..e3bee127b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iocapture/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iocapture/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "86670e1808bcdcd4f70112f43da72ae766f04cd8311d1071ce6e0e0a72e37ee8"; }; - checkInputs = [ + nativeCheckInputs = [ flexmock pytest pytest-cov diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ionhash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ionhash/default.nix index 4d90d57287..901cf602dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ionhash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ionhash/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ amazon-ion six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "ionhash" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix index a3ec10d4b2..0677e51ff4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipdb/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { tomli ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix index 71e0194a6b..965bb5625d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov pytest-dependency diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix index ef25868ea6..edfbc49d77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { traittypes ]; - checkInputs = [ pytest pytest-cov nbval ]; + nativeCheckInputs = [ pytest pytest-cov nbval ]; checkPhase = "pytest ipydatawidgets/tests"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix index 384391138d..b5afa47275 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = { description = "IPython Kernel for Jupyter"; - homepage = "http://ipython.org/"; + homepage = "https://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix index 9375dbc2bf..49208b30fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ flaky ipykernel ipyparallel diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython-sql/default.nix index 1a86ae238b..8853b066ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython-sql/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { sqlparse ]; - checkInputs = [ ipython pandas pytest ]; + nativeCheckInputs = [ ipython pandas pytest ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix index b6c193d05f..094b3370c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { --replace "--ipdoctest-modules" "--ipdoctest-modules --ignore=IPython/core/display.py" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook testpath ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipython_genutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipython_genutils/default.nix index 51cf698634..2283444c23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipython_genutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipython_genutils/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8"; }; - checkInputs = [ nose glibcLocales ]; + nativeCheckInputs = [ nose glibcLocales ]; checkPhase = '' LC_ALL="en_US.UTF-8" nosetests -v ipython_genutils/tests @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Vestigial utilities from IPython"; - homepage = "http://ipython.org/"; + homepage = "https://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix index c3fc013903..5d8a6f87c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix @@ -31,11 +31,11 @@ buildPythonPackage rec { widgetsnbextension ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "IPython HTML widgets for Jupyter"; - homepage = "http://ipython.org/"; + homepage = "https://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/irctokens/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/irctokens/default.nix index 3cd86abb0b..e0863e43fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/irctokens/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/irctokens/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-FgcLngS11U9eBNV/8jllwdrm89tCmthA1sUaFDovk6U="; }; - checkInputs = [ pyyaml ]; + nativeCheckInputs = [ pyyaml ]; checkPhase = '' ${python.interpreter} -m unittest test ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix index edbb42b74d..cfef001013 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-FOZNsZK8PTPJhK0BvGQiPqCr8au3rwHsjE3dCKWGtDM="; }; - checkInputs = [ + nativeCheckInputs = [ nose coverage ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix index aa084783fa..aa8b997d57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; preCheck = "mv islpy islpy.hidden"; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "islpy" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ismartgate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ismartgate/default.nix index 943036ecbd..7998b03a37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ismartgate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ismartgate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ismartgate"; - version = "4.0.4"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = pname; - rev = "v${version}"; - hash = "sha256-yh7gPyy3VMdyINBCZo5K2wA0BY7yYgHrKGZRB/pm77U="; + rev = "refs/tags/v${version}"; + hash = "sha256-o2yzMxrF0WB6MbeL1Tuf0Sq4wS4FDIWZZx1x2rvwLmY="; }; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytest-raises @@ -55,12 +55,6 @@ buildPythonPackage rec { "ismartgate" ]; - disabledTestPaths = [ - # Tests are out-dated - "ismartgate/tests/test_init.py" - ]; - - meta = with lib; { description = "Python module to work with the ismartgate and gogogate2 API"; homepage = "https://github.com/bdraco/ismartgate"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iso3166/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iso3166/default.nix index 2820ff7dd6..9291912ecf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iso3166/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iso3166/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-/y7c2qSA6+WKUP9YTSaMBjBxtqAuF4nB3MKvL5P6vL0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iso4217/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iso4217/default.nix index 5832b6e4a7..50268536bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iso4217/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iso4217/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix index e189e3778b..af90e73916 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iso8601/default.nix @@ -24,8 +24,9 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ - hypothesis + nativeCheckInputs = [ + # "hypothesis" indirectly depends on iso8601 to build its documentation + (hypothesis.override { enableDocumentation = false; }) pytestCheckHook pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/isodate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isodate/default.nix index ba507f168d..81f030e483 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/isodate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/isodate/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "src/isodate/tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/isoduration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isoduration/default.nix index 16bb9b13bf..e0383b9883 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/isoduration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/isoduration/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { arrow ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis isodate pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/isort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isort/default.nix index b4f1606a02..d51e414485 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/isort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/isort/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ colorama hypothesis pylama diff --git a/third_party/nixpkgs/pkgs/development/python-modules/itanium-demangler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itanium-demangler/default.nix index 6ec44062d8..d1251449af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/itanium-demangler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/itanium-demangler/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-I6NUfckt2cocQt5dZSFadpshTCuA/6bVNauNXypWh+A="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix index 8fa13fcc0c..86320ed693 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { itemadapter ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix new file mode 100644 index 0000000000..fd17b76103 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix @@ -0,0 +1,28 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "iteration-utilities"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "MSeifert04"; + repo = "iteration_utilities"; + rev = "v${version}"; + sha256 = "sha256-Q/ZuwAf+NPikN8/eltwaUilnLw4DKFm864tUe6GLDak="; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "iteration_utilities" ]; + + meta = with lib; { + description = "Utilities based on Pythons iterators and generators"; + homepage = "https://github.com/MSeifert04/iteration_utilities"; + license = licenses.asl20; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix index 99bdb96523..e4a22a268d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/itsdangerous/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-XbvGizF+XkLzJ/kCF2NUXcP8O/4i5t65aq8fw4h0FWo="; }; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/itypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itypes/default.nix index 36581bf2db..14f0214397 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/itypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/itypes/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1ljhjp9pacbrv2phs58vppz1dlxix01p98kfhyclvbml6dgjcr52"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' mv itypes.py itypes.py.hidden pytest tests.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaconv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaconv/default.nix index 868d5b7c35..d65aca6931 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaconv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaconv/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-uzGHvklFHVoNloZauczgITeHQIgYQAfI9cjLWgG/vyI="; }; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jamo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jamo/default.nix index e7bebd52db..058df62cb0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jamo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jamo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { "jamo" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/janus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/janus/default.nix index f4c52db722..a31d17b1fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/janus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/janus/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ pytest-asyncio pytestCheckHook ]; + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; # also fails upstream: https://github.com/aio-libs/janus/pull/258 disabledTests = [ "test_format" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix new file mode 100644 index 0000000000..0f56965ebd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-abode/default.nix @@ -0,0 +1,99 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchPypi +, fetchpatch +, setuptools +, setuptools-scm +, requests +, lomond +, colorlog +, keyring +, requests-toolbelt +, jaraco_collections +, jaraco-context +, jaraco_classes +, jaraco-net +, more-itertools +, importlib-resources +, bx-py-utils +, platformdirs +, jaraco_itertools +, pytestCheckHook +, requests-mock +}: + +buildPythonPackage rec { + pname = "jaraco-abode"; + version = "3.2.1"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.abode"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZDdZba1oTOPaUm+r4fWC5E3ni/k8kXo6t5AWQTvfd5E="; + }; + + patches = [ + # https://github.com/jaraco/jaraco.abode/issues/19 + (fetchpatch { + name = "specify-options-package-data.patch"; + url = "https://github.com/jaraco/jaraco.abode/commit/8deebf57162fa097243d2b280942b6b7f95174c8.patch"; + hash = "sha256-Iu2uw9D+nMdVJZyoecEkwQaJH1oSzFN/ZLXKPZPGuPk="; + }) + ]; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ + requests + lomond + colorlog + keyring + requests-toolbelt + jaraco_collections + jaraco-context + jaraco_classes + jaraco-net + more-itertools + importlib-resources + bx-py-utils + platformdirs + jaraco_itertools + ]; + + pythonImportsCheck = [ "jaraco.abode" ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + preCheck = '' + export HOME=$TEMP + ''; + + disabledTests = [ + "_cookie_string" + "test_cookies" + "test_empty_cookies" + "test_invalid_cookies" + ]; + + meta = with lib; { + homepage = "https://github.com/jaraco/jaraco.abode"; + description = "Library interfacing to the Abode home security system"; + license = licenses.mit; + maintainers = with maintainers; [ jamiemagee dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-context/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-context/default.nix index 6a8c0fd1ea..7a882c8019 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-context/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-context/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "jaraco-context"; - version = "4.2.0"; + version = "4.3.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.context"; rev = "refs/tags/v${version}"; - sha256 = "sha256-J7vL+pvwXcKEkqZn44/U01HmP1CI5kIGsJ1aJevp0I4="; + hash = "sha256-YdbkpKv7k62uyhmjKoxeA9uf5BWnRD/rK+z46FJN4xk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -32,11 +32,14 @@ buildPythonPackage rec { # Module has no tests doCheck = false; - pythonImportsCheck = [ "jaraco.context" ]; + pythonImportsCheck = [ + "jaraco.context" + ]; meta = with lib; { description = "Python module for context management"; homepage = "https://github.com/jaraco/jaraco.context"; + changelog = "https://github.com/jaraco/jaraco.context/blob/v${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-email/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-email/default.nix new file mode 100644 index 0000000000..b99eff746f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-email/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, setuptools-scm +, jaraco_text +, jaraco_collections +, keyring +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "jaraco-email"; + version = "3.1.0"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.email"; + rev = "refs/tags/v${version}"; + hash = "sha256-MR/SX5jmZvEMULgvQbh0JBZjIosNCPWl1wvEoJbdw4Y="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ + jaraco_text + jaraco_collections + keyring + ]; + + pythonImportsCheck = [ "jaraco.email" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/jaraco/jaraco.email/blob/${src.rev}/CHANGES.rst"; + description = "E-mail facilities by jaraco"; + homepage = "https://github.com/jaraco/jaraco.email"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix new file mode 100644 index 0000000000..d4ff9e9294 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-net/default.nix @@ -0,0 +1,97 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, setuptools-scm +, more-itertools +, beautifulsoup4 +, mechanize +, keyring +, requests +, feedparser +, jaraco_text +, jaraco_logging +, jaraco-email +, jaraco_functools +, jaraco_collections +, path +, python-dateutil +, pathvalidate +, jsonpickle +, ifconfig-parser +, pytestCheckHook +, cherrypy +, importlib-resources +, requests-mock +}: + +buildPythonPackage rec { + pname = "jaraco-net"; + version = "9.3.0"; + + disabled = pythonOlder "3.7"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jaraco"; + repo = "jaraco.net"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ks8e3xPjIWgSO0PSpjMYftxAuDt3ilogoDFuJqfN74o="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + propagatedBuildInputs = [ + more-itertools + beautifulsoup4 + mechanize + keyring + requests + feedparser + jaraco_text + jaraco_logging + jaraco-email + jaraco_functools + jaraco_collections + path + python-dateutil + pathvalidate + jsonpickle + ] ++ lib.optionals stdenv.isDarwin [ + ifconfig-parser + ]; + + pythonImportsCheck = [ "jaraco.net" ]; + + nativeCheckInputs = [ + pytestCheckHook + cherrypy + importlib-resources + requests-mock + ]; + + disabledTestPaths = [ + # doesn't actually contain tests + "fabfile.py" + # require networking + "jaraco/net/ntp.py" + "jaraco/net/scanner.py" + "tests/test_cookies.py" + ]; + + meta = { + changelog = "https://github.com/jaraco/jaraco.net/blob/${src.rev}/CHANGES.rst"; + description = "Networking tools by jaraco"; + homepage = "https://github.com/jaraco/jaraco.net"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix index 5a6807e80d..fa4efeb53a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-test/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { jaraco_collections ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix index aadb9f9028..5fd16f1f50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ more-itertools ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Utility functions for Python class constructs"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix index 95d20fd7e6..8950d1aff3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ inflect more-itertools six ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # tests no longer available through pypi doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix index 91183d4f40..21f0317cea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (pythonOlder "3.10") [ pathlib2 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix index b71187c9fe..9748c4121f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix index 3132c87324..28ab53ce98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ python-dateutil pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix index cb963a0d6e..816f6fe1c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { typing-extensions ] ++ etils.optional-dependencies.epath; - checkInputs = [ + nativeCheckInputs = [ jaxlib matplotlib pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix index 4a5c68188f..4cbba4d11a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "jc" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jdcal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jdcal/default.nix index c2dd66ac66..abf5880e80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jdcal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jdcal/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix index c32b84b75f..35749407a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix @@ -1,15 +1,17 @@ { lib , buildPythonPackage -, fetchPypi -, fetchFromGitHub -, poetry-core -, pythonRelaxDepsHook , docstring-to-markdown +, fetchFromGitHub , jedi +, lsprotocol +, poetry-core , pygls -, pytestCheckHook +, pydantic , pyhamcrest +, pytestCheckHook , python-jsonrpc-server +, pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -17,11 +19,13 @@ buildPythonPackage rec { version = "0.40.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "pappasam"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-+3VgONZzlobgs4wujCaGTTYpIgYrWgWwYgKQqirS7t8="; + hash = "sha256-+3VgONZzlobgs4wujCaGTTYpIgYrWgWwYgKQqirS7t8="; }; pythonRelaxDeps = [ @@ -36,10 +40,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ docstring-to-markdown jedi + lsprotocol + pydantic pygls ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pyhamcrest python-jsonrpc-server @@ -54,9 +60,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/pappasam/jedi-language-server"; - changelog = "https://github.com/pappasam/jedi-language-server/blob/${src.rev}/CHANGELOG.md"; description = "A Language Server for the latest version(s) of Jedi"; + homepage = "https://github.com/pappasam/jedi-language-server"; + changelog = "https://github.com/pappasam/jedi-language-server/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix index e9a5faccd3..83efa565dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ parso ]; - checkInputs = [ + nativeCheckInputs = [ attrs django pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jeepney/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jeepney/default.nix index 6ec1fb811c..3ba062e1ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jeepney/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jeepney/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ async-timeout dbus pytest 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 a275b97310..65f385db92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jellyfish/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "40c9a2ffd8bd3016f7611d424120442f627f56d518a106847dc93f0ead6ad79a"; }; - checkInputs = [ pytest unicodecsv ]; + nativeCheckInputs = [ pytest unicodecsv ]; meta = { homepage = "https://github.com/sunlightlabs/jellyfish"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix index 39ad443f18..58fbd305e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jenkinsapi/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pytz requests ]; - checkInputs = [ mock pytest pytest-mock requests-kerberos toml ]; + nativeCheckInputs = [ mock pytest pytest-mock requests-kerberos toml ]; # TODO requests-kerberos is broken on darwin, weeding out the broken tests without # access to macOS is not an adventure I am ready to embark on - @rski doCheck = !stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jieba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jieba/default.nix index 8b7146ebef..a0fd5acf44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jieba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jieba/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "028vmd6sj6wn9l1ilw7qfmlpyiysnlzdgdlhwxs6j4fvq0gyrwxk"; }; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; # UnicodeEncodeError doCheck = isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2-ansible-filters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-ansible-filters/default.nix new file mode 100644 index 0000000000..33975ee204 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-ansible-filters/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, jinja2 +, pyyaml +}: + +buildPythonPackage rec { + pname = "jinja2-ansible-filters"; + version = "1.3.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-B8EM9E1wc/TwEQLKEtmi3DG0HUfkxh7ZLvam0mabNWs="; + }; + + propagatedBuildInputs = [ + jinja2 + pyyaml + ]; + + # no tests include in sdist, and source not available + doCheck = false; + + pythonImportsCheck = [ "jinja2_ansible_filters" ]; + + meta = with lib; { + description = "Jinja2 Ansible Filters"; + homepage = "https://pypi.org/project/jinja2-ansible-filters/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2-time/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-time/default.nix index ac0d76c54c..ecd42a1c54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2-time/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-time/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ arrow jinja2 ]; - checkInputs = [ freezegun pytestCheckHook ]; + nativeCheckInputs = [ freezegun pytestCheckHook ]; pythonImportsCheck = [ "jinja2_time" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix index ee478fa152..048890d18c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jinja2/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # See https://github.com/pallets/jinja/issues/1158 doCheck = !stdenv.is32bit; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix index f823cb9c03..1002ae15dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { requests-toolbelt ]; - checkInputs = [ + nativeCheckInputs = [ flaky pytestCheckHook requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix index ca365b79b3..92005868a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-kCYbIG1t79WP3V6F9Hi/YzopAXmJBr4q04kVDFxg7b4="; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jmp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jmp/default.nix index 647cec6871..66eece32c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jmp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jmp/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { "jmp" ]; - checkInputs = [ + nativeCheckInputs = [ jaxlib pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix index caa306be7d..98ec450671 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "sha256-4c7kp55K8iiBFk8hjUMR9gB0GX+3B+CC6AO2H20TcBg="; }; - checkInputs = [ sphinx numpydoc pytestCheckHook psutil ]; + nativeCheckInputs = [ sphinx numpydoc pytestCheckHook psutil ]; propagatedBuildInputs = [ lz4 setuptools ]; pytestFlagsArray = [ "joblib/test" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix index dee38f2e14..d7c179c804 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/johnnycanencrypt/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { libiconv ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook vcrpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix index 100228bf4f..4dfe43e5ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/josepy/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jproperties/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jproperties/default.nix index 0089e153f4..35c762988b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jproperties/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jproperties/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytest-datadir pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix index e161b3ffc5..9e31735242 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jpylyzer/default.nix @@ -5,6 +5,10 @@ , six , lxml , pytestCheckHook +, doFullCheck ? false # weird filenames cause issues on some filesystems + +# for passthru.tests +, jpylyzer }: let @@ -31,14 +35,14 @@ in buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook lxml ]; + nativeCheckInputs = [ pytestCheckHook lxml ]; - # don't depend on testFiles on darwin as it may not be extractable due to - # weird filenames - preCheck = lib.optionalString (!stdenv.isDarwin) '' + # don't depend on testFiles unless doFullCheck as it may not be extractable + # on some filesystems due to weird filenames + preCheck = lib.optionalString doFullCheck '' sed -i '/^testFilesDir = /ctestFilesDir = "${testFiles}"' tests/unit/test_testfiles.py ''; - disabledTestPaths = lib.optionals stdenv.isDarwin [ + disabledTestPaths = lib.optionals (!doFullCheck) [ "tests/unit/test_testfiles.py" ]; @@ -46,6 +50,10 @@ in buildPythonPackage rec { disallowedReferences = [ testFiles ]; + passthru.tests = { + withFullCheck = jpylyzer.override { doFullCheck = true; }; + }; + meta = with lib; { description = "JP2 (JPEG 2000 Part 1) image validator and properties extractor"; homepage = "https://jpylyzer.openpreservation.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix index b5ec357177..e948c9f306 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { cython jq.pyx ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/js2py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/js2py/default.nix index c47e6aee0b..9bbfe091c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/js2py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/js2py/default.nix @@ -1,5 +1,5 @@ { lib -, fetchFromGitHub +, fetchPypi , buildPythonPackage , tzlocal , six @@ -8,13 +8,12 @@ buildPythonPackage rec { pname = "js2py"; - version = "0.71"; + version = "0.74"; - src = fetchFromGitHub { - owner = "PiotrDabkowski"; - repo = "Js2Py"; - rev = "5f665f60083a9796ec33861240ce31d6d2b844b6"; - sha256 = "sha256-1omTV7zkYSQfxhkNgI4gtXTenWt9J1r3VARRHoRsSfc="; + src = fetchPypi { + pname = "Js2Py"; + inherit version; + hash = "sha256-OfOmqoRpGA77o8hncnHfJ8MTMv0bRx3xryr1i4e4ly8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix index d67939bc8a..76ea0fe9a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix index 5b25b5c18a..e217592e99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pbr ]; - checkInputs =[ + nativeCheckInputs =[ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsmin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsmin/default.nix index 58759393bb..a36c350264 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsmin/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "c0959a121ef94542e807a674142606f7e90214a2b3d1eb17300244bbb5cc2bfc"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-logging/default.nix index 35959520b3..5a56ea4fbc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-logging/default.nix @@ -3,6 +3,7 @@ , fastapi , fetchFromGitHub , flask +, httpx , pytestCheckHook , pythonOlder , requests @@ -25,9 +26,10 @@ buildPythonPackage rec { hash = "sha256-WOAEY1pONH+Gx1b8zHZDMNgJJSn7jvMO60LYTA8z/dE="; }; - checkInputs = [ + nativeCheckInputs = [ fastapi flask + httpx pytestCheckHook # quart requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix index fe15a5383d..58e4b52964 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-rpc/default.nix @@ -11,7 +11,7 @@ in buildPythonPackage rec { sha256 = "sha256-/13xx/2G4dvQJZ8GWZdRzpGnx5DykEFHk6Vlq1ht3FI="; }; - checkInputs = pythonEnv ++ [ pytestCheckHook ]; + nativeCheckInputs = pythonEnv ++ [ pytestCheckHook ]; nativeBuildInputs = pythonEnv; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix index 47cd5fed60..88039e138e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix index bcfbe82ac9..de3d7b65c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-tricks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-tricks/default.nix index 9995e537c5..65ed7e7220 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-tricks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-tricks/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "wdpqCqMO0EzKyqE4ishL3CTsSw3sZPGvJ0HEktKFgZU="; }; - checkInputs = [ numpy pandas pytz pytestCheckHook ]; + nativeCheckInputs = [ numpy pandas pytz pytestCheckHook ]; pythonImportsCheck = [ "json_tricks" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json5/default.nix index 683811e0df..d1c3ccb9ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json5/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json5/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-0ommoTv5q7YuLNF+ZPWW/Xg/8CwnPrF7rXJ+eS0joUs="; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonconversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonconversion/default.nix index 22f7fe4625..dda1d48a69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonconversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonconversion/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "'pytest-runner'" "" ''; - checkInputs = [ pytestCheckHook numpy ]; + nativeCheckInputs = [ pytestCheckHook numpy ]; pythonImportsCheck = [ "jsonconversion" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonfield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonfield/default.nix index 6b7faf9a31..37e280b2a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonfield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonfield/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0yl828cd0m8jsyr4di6hcjdqmi31ijh5vk57mbpfl7p2gmcq8kky"; }; - checkInputs = [ pytestCheckHook pytest-django ]; + nativeCheckInputs = [ pytestCheckHook pytest-django ]; preCheck = "export DJANGO_SETTINGS_MODULE=tests.settings"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix index a111d3ef6d..6eb818013e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { attrs ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix index de9656d01c..69a76db190 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jsonschema ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Fails with "Unresolvable JSON pointer" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix index 03060f4e86..0f117cb0d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { jsonpointer ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix index fce18a6da2..86d39b5944 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpath-ng/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # Exclude tests that require oslotest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix index 75ee64dc46..8289bf0e95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-AyU4gEeV5zuU6tQQgArDh/223pj4iCrJV/zSR+OoUgA="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; nativeBuildInputs = [ setuptools-scm diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonref/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonref/default.nix index 12de6527c8..abd3fad2fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonref/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonref/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix index 2c66779e01..b34bb4435d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { jsonrpc-base ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix index f10fc3f123..42aa426380 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-C03m/zeLIFqsmEMSzt84LMOWAHUcpdEHhaa5hx2NsoQ="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix index 9da8d8cf8a..fb70cdf695 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { jsonrpc-base ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsons/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsons/default.nix index 9d1083bb47..457bcf4f65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsons/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsons/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { typish ]; - checkInputs = [ + nativeCheckInputs = [ attrs pytestCheckHook tzdata diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-spec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-spec/default.nix index 4e11bd4a27..28e93508ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-spec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-spec/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/3_x.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/3_x.nix index b78165fc4f..b86c5abda6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/3_x.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/3_x.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs importlib-metadata functools32 pyrsistent ]; - checkInputs = [ nose mock pyperf twisted vcversioner ]; + nativeCheckInputs = [ nose mock pyperf twisted vcversioner ]; # zope namespace collides on py27 doCheck = !isPy27; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix index 7ac7a40d32..71a7bc3632 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ twisted ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonstreams/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonstreams/default.nix index 9b7816e8b1..197e372edf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonstreams/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonstreams/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests --doctest-modules jsonstreams" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jstyleson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jstyleson/default.nix index be6eff6755..d5b7b0a76b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jstyleson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jstyleson/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-s/0DDfy+07TuUNjHPqKRT3xMMQl6spZCacB7Dweof7A="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix index 3de77e1709..a26e98a7b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { bottle ]; - checkInputs = [ + nativeCheckInputs = [ numpy pytestCheckHook pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/junit-xml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/junit-xml/default.nix index c7133c206d..a647518840 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/junit-xml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/junit-xml/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Creates JUnit XML test result documents that can be read by tools such as Jenkins"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/junitparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/junitparser/default.nix index 67d7ed15d5..2dbd902efe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/junitparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/junitparser/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future ]; - checkInputs = [ unittestCheckHook lxml glibcLocales ]; + nativeCheckInputs = [ unittestCheckHook lxml glibcLocales ]; unittestFlagsArray = [ "-v" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix index 157184fec1..c7c9997cf8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { yamlordereddictloader ]; - checkInputs = [ + nativeCheckInputs = [ mock nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix index 761db23a5e..4a64530d1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-core/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { traitlets ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix index 0bdf4dbf5f..26b3328538 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-console-scripts pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix index 1ee870bfd5..62dfc6ded9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { tomlkit ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-timeout ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index b6201769f8..21eb1f9eb7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { jupyter-server ]; - checkInputs = [ + nativeCheckInputs = [ pytest-tornasync pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix index dfd6dc3164..507df9b224 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix @@ -36,7 +36,7 @@ let self = buildPythonPackage rec { doCheck = false; # infinite recursion - checkInputs = [ + nativeCheckInputs = [ pytest-jupyter pytest-timeout pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix index 5af8bbe7e2..b8ecde78ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { requests-unixsocket ]; - checkInputs = [ + nativeCheckInputs = [ ipykernel pandoc pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix index 8943ba8adc..f5d4f12e30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { prompt-toolkit pygments ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; postPatch = '' substituteInPlace setup.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix index 04db4d4d0c..ffa6a33669 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix @@ -133,7 +133,7 @@ buildPythonPackage rec { "'jupyterhub-singleuser'" "'$out/bin/jupyterhub-singleuser'" ''; - checkInputs = [ + nativeCheckInputs = [ # https://github.com/jupyterhub/jupyterhub/blob/master/dev-requirements.txt beautifulsoup4 cryptography diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix index 6fac2db61b..8d7d78ce70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pexpect ]; - checkInputs = [ + nativeCheckInputs = [ jupyterlab pytest-asyncio pytest-tornasync diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index 37f46414b9..8ac600083f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.5.2"; + version = "3.5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EKwJQhX/uHLd/74pgr8cA5p5/swybhkefMXv2E8zHa0="; + hash = "sha256-UeiJRIrhlO7vjlD2P1xPSH9yj0d77+Q26XSWcvdRHb4="; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/jupyterlab/jupyterlab/releases/tag/v${version}"; description = "Jupyter lab environment notebook server extension"; license = with licenses; [ bsd3 ]; homepage = "https://jupyter.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix index 1aeeef1572..35abc73f5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ openapi-core pytestCheckHook pytest-timeout diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix index dc5b56c3c0..872d99c821 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ gitpython isort jupyter-client diff --git a/third_party/nixpkgs/pkgs/development/python-modules/justbackoff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/justbackoff/default.nix index 814d1d3e53..f07af6df2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/justbackoff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/justbackoff/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "097j6jxgl4b3z46x9y9z10643vnr9v831vhagrxzrq6nviil2z6l"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/justbases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/justbases/default.nix index 90f59b6cfc..1ea6140147 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/justbases/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/justbases/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-vQEfC8Z7xMM/fhBG6jSuhLEP/Iece5Rje1yqbpjVuPg="; }; - checkInputs = [ hypothesis ]; + nativeCheckInputs = [ hypothesis ]; meta = with lib; { description = "conversion of ints and rationals to any base"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/justbytes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/justbytes/default.nix index 31afb7540b..dde6c5d4bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/justbytes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/justbytes/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ justbases ]; - checkInputs = [ hypothesis ]; + nativeCheckInputs = [ hypothesis ]; meta = with lib; { description = "computing with and displaying bytes"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jxmlease/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jxmlease/default.nix index 19b29bf763..a9782ef2d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jxmlease/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jxmlease/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # https://github.com/Juniper/jxmlease/issues/26 doCheck = false; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-v" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix index d8f37f563d..089c4a8ffc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "04dfe7fea2b63726cd6f3e79a2d86e709d608d74406638c5da33a01d45a9d7e3"; }; - checkInputs = [ pytest six mock ]; + nativeCheckInputs = [ pytest six mock ]; checkPhase = '' py.test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kajiki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kajiki/default.nix index 95a47baaeb..759adc82ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kajiki/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kajiki/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ babel pytz nine ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Kajiki provides fast well-formed XML templates"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kanidm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kanidm/default.nix index 57ae3c59b5..eb60f61d5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kanidm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kanidm/default.nix @@ -43,7 +43,7 @@ buildPythonPackage { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaptan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaptan/default.nix index 309ecda49c..270b202e0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kaptan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaptan/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "Configuration manager for python applications"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix index 74cfa7f8b5..465b865d66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { karton-core ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "karton.asciimagic" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix index bcf4b075df..6578dc70a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { python-magic ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix index 9a25f3cf12..65c56cbae1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { redis ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "karton.core" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix index 67f99af39d..ac9c93ee1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { yara-python ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "karton.yaramatcher" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix index d84ee1994b..057f5f76a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { # ValueError: Root URL is required. doCheck = false; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix index a29ce93680..ca4f3c863e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keepkey/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ecdsa hidapi libusb1 mnemonic protobuf ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # tests requires hardware doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kegtron-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kegtron-ble/default.nix index 4af4817d7f..315054b10d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kegtron-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kegtron-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keras-preprocessing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keras-preprocessing/default.nix index a0d9d4bb15..49bc63a5db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { scipy pillow ]; - checkInputs = [ + nativeCheckInputs = [ pytest keras ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix index 788308c92d..37b7de10f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-OMb/8OqaiwaicXc2VlySpzyM2bHCOecSXMsYi3hI9l4="; }; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-cov pytest-xdist diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix index 3815610dad..3e3cf64ce1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { "keyring.backend" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix index 7b46634d9f..b556718a8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook keyring ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix index 23b8b66ea9..87cda53512 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { "keyrings.cryptfile" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-passwordstore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-passwordstore/default.nix index 1fee44c15a..11f632d7bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-passwordstore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-passwordstore/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ keyring ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix index 5f2a3323ba..b13e862cde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { stevedore ]; - checkInputs = [ + nativeCheckInputs = [ hacking oslo-config oslo-utils diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyutils/default.nix index 21eeb11d13..031ae5a65c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyutils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; buildInputs = [ keyutils ]; - checkInputs = [ pytest pytest-runner ]; + nativeCheckInputs = [ pytest pytest-runner ]; meta = { description = "A set of python bindings for keyutils"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kinparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kinparse/default.nix index 7d6437f41a..95632f9ce9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kinparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kinparse/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { doCheck = true; pythonImportsCheck = [ "kinparse" ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix index 43d1f784fa..f89c7983de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kiss-headers/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' substituteInPlace setup.cfg \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kitchen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kitchen/default.nix index 0b6f41d2c1..e606505948 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kitchen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kitchen/default.nix @@ -1,16 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + buildPythonPackage rec { pname = "kitchen"; version = "1.2.6"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0g5hq2icnng9vy4www5hnr3r5srisfwp0wxw1sv5c5dxy61gak5q"; + hash = "sha256-uEz1gvG9FVa2DrxzcLnTMeuSR7awcM6J3+lZy6LAsDw="; }; + # Waiting for upstream's clean-up + doCheck = false; + + pythonImportsCheck = [ + "kitchen" + ]; + meta = with lib; { description = "Kitchen contains a cornucopia of useful code"; - license = licenses.lgpl2; + homepage = "https://github.com/fedora-infra/kitchen"; + changelog = "https://github.com/fedora-infra/kitchen/blob/${version}/NEWS.rst"; + license = licenses.lgpl2Only; maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/klaus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/klaus/default.nix index e20c832654..aaea3c9b6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/klaus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/klaus/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { flask pygments dulwich httpauth humanize ]; - checkInputs = [ + nativeCheckInputs = [ pytest requests python-ctags3 ] ++ lib.optional (!isPy3k) mock; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/klein/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/klein/default.nix index d40005ef56..0fda816533 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/klein/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/klein/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis treq ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kmapper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kmapper/default.nix index c3418b2c5c..a3788cb123 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kmapper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kmapper/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { jinja2 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook networkx matplotlib diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kml2geojson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kml2geojson/default.nix index 6ceb71a9e5..489e80f94f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kml2geojson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kml2geojson/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix index c858dcde66..0c2dae23b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { tabulate ]; - checkInputs = [ + nativeCheckInputs = [ mock vcrpy pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix index be4f4aad56..28fe591d80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kombu/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ azure-servicebus case Pyro4 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix index 731aba7460..03c858dd92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { "kubernetes" ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix index 3e5efd48e9..641a4accc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-cases pytestCheckHook ] ++ passthru.optional-dependencies.data; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix index 2032eb33d6..bcae9b8839 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/labgrid/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" ''; - checkInputs = [ + nativeCheckInputs = [ mock psutil pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix index 72a80298c5..eb99c9b2b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langcodes/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools # pkg_resources import in language_data/util.py ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langdetect/default.nix index 4eab3bd06e..5d3dae1580 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/langdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/langdetect/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/language-tags/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/language-tags/default.nix index ea3be88335..fb40b1fbc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/language-tags/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/language-tags/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-4Ira3EMS64AM8I3SLmUm+m6V5vwtDYf8WDmVDvI+ZOw="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix index ebf8aea203..7707693f2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lark/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { "lark.grammars" ]; - checkInputs = [ + nativeCheckInputs = [ js2py pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/latexcodec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/latexcodec/default.nix index 37ffe23b80..be38086592 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/latexcodec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/latexcodec/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/latexify-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/latexify-py/default.nix index 9356a5f319..f0da746107 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/latexify-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/latexify-py/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { cd src ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "latexify" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix index f6e0ba20be..2ac1ca14eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { wadllib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix index 9db7239f44..9a4cfbaa75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { # E ModuleNotFoundError: No module named 'lazr.uri' doCheck = false; - checkInputs = [ fixtures lazr-uri pytestCheckHook wsgi-intercept ]; + nativeCheckInputs = [ fixtures lazr-uri pytestCheckHook wsgi-intercept ]; pythonImportsCheck = [ "lazr.restfulclient" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix index aec83e4bce..475c6e86d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace ",<6.0" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix index 8cfd377a4e..00766ffc1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lazy_import/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0gca9xj60qr3aprj9qdc66crr4r7hl8wzv6gc9y40nclazwawj91"; }; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-xdist ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ld2410-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ld2410-ble/default.nix index 0e1ba94a84..30af931ef3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ld2410-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ld2410-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { bleak-retry-connector ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ldappool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldappool/default.nix index 4697c80680..14d23a96d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ldappool/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ldappool/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-ldap prettytable ]; - checkInputs = [ fixtures testresources testtools ]; + nativeCheckInputs = [ fixtures testresources testtools ]; meta = with lib; { description = "A simple connector pool for python-ldap"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix index f7b5e7cf96..caf4f3ef33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { zope_interface ] ++ twisted.optional-dependencies.tls; - checkInputs = [ + nativeCheckInputs = [ twisted ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/leather/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/leather/default.nix index af2cb219cd..99977e7c6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/leather/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/leather/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ + nativeCheckInputs = [ cssselect lxml nose diff --git a/third_party/nixpkgs/pkgs/development/python-modules/leb128/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/leb128/default.nix index fa71abd735..6ba2330eb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/leb128/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/leb128/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "040l6fxyzqal841kirf783kk1840gcy1gjd374jfr46v96qc8scm"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "leb128" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/led-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/led-ble/default.nix index 810a9d59c0..53ae154857 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/led-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/led-ble/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { flux-led ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix index 7480045f70..be5b871469 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.43"; + version = "0.1.44"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t0mdw8cBGUZ33BWOSeEHyFAGga/Tf1F/gATFSfCpAJQ="; + hash = "sha256-pOLpeej10G7Br8juTuQOSuCbhMjAP4aY0/JwnmJRblk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix index 74fecc7f0e..d3c717a7e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytest-click pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix index c79aee3bd3..6faaae0794 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { rapidfuzz ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lexid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lexid/default.nix index 0e9cf69ea8..5ab5953aef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lexid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lexid/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "micro library to increment lexically ordered numerical ids"; 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 1aa0346795..3bb8962e5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ mock pytest ]; + nativeCheckInputs = [ mock pytest ]; checkPhase = '' py.test libagent/tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libais/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libais/default.nix index 8985e8fbcf..fbf0224204 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libais/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libais/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # data files missing doCheck = false; - checkInputs = [ pytest pytest-runner pytest-cov coverage ]; + nativeCheckInputs = [ pytest pytest-runner pytest-cov coverage ]; propagatedBuildInputs = [ six ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix index aafe92e730..943ed138f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { "libarchive" ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix index 7ebfe30ac9..817afce5cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apache-libcloud"; - version = "3.6.1"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-D6zzIGVoQwyZjaQOm7rG06DE/IDdUWdNnnlLOBRQEgw="; + sha256 = "sha256-FIqeUAaWVEMqfTSZeVTpFDTdOOv2iDLrnHXUQrPmL60="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix index d24093c12c..8fef5c7151 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix index 2807804b77..0f4e1a8e05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python wrapper around the libevdev C library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix index 3700ebb85d..6035260a9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "sha256-A2qChe2z6rAhjRVX5VoHQitebf/nMATdVZQgtlquuYg="; }; - checkInputs = [ + nativeCheckInputs = [ gobject-introspection # for setup hook gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix index 7ced26888b..cefa9b8188 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libnacl/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium${soext}')" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "libnacl" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libpyvivotek/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libpyvivotek/default.nix index db9f14a5a8..9a4cda0ae6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libpyvivotek/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libpyvivotek/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook vcrpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/librouteros/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/librouteros/default.nix index 6994c8abca..03f5e9b072 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/librouteros/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/librouteros/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-VwpZ1RY6Sul7xvWY7ZoOxZ7KgbRmKRwcVdF9e2b3f6Q="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-xdist pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix index 704262bfec..61c3cb845b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libsass/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { export SYSTEM_SASS=true; ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook werkzeug ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix index edee7a6253..2abd187d04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libsoundtouch/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { zeroconf ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index 804f4bce0e..cf9e72c110 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ procps tmux pytest-rerunfailures diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix index da84d890ec..80ad5590d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libusb1/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ libusb1 ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "usb1/testUSB1.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix index 5fb33fa547..e3b48b4120 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libversion/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { libversion ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix index f3dd61f849..36d45c5ac6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libvirt/default.nix @@ -2,19 +2,19 @@ buildPythonPackage rec { pname = "libvirt"; - version = "8.10.0"; + version = "9.0.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-python"; rev = "v${version}"; - sha256 = "sha256-f2ZWBNCgylKQCmbLCaJsIb5alvZDRZUWQAMOMsxwGbk="; + sha256 = "sha256-/u6sctXn4Jmn2bUl1FjjrKpHReaTg+O9LprKXx3OAyU="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvirt lxml ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/license-expression/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/license-expression/default.nix index e1f77e45dc..cbff592882 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/license-expression/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/license-expression/default.nix @@ -9,15 +9,16 @@ buildPythonPackage rec { pname = "license-expression"; - version = "30.0.0"; + version = "30.1.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nexB"; repo = "license-expression"; - rev = "v${version}"; - hash = "sha256-tGXNZm9xH8sXa7dtBFsTzGgT+hfbmkwps7breR7KUWU="; + rev = "refs/tags/v${version}"; + hash = "sha256-QPjVSSndgKlAdGY6nZjjOrnyyVfOVu8ggfBwGWi+RyE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -32,7 +33,7 @@ buildPythonPackage rec { boolean-py ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -43,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utility library to parse, normalize and compare License expressions"; homepage = "https://github.com/nexB/license-expression"; + changelog = "https://github.com/nexB/license-expression/blob/v${version}/CHANGELOG.rst"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix index c59f28d693..01be9fb865 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage , fetchPypi , cmake @@ -6,15 +7,19 @@ , scipy , scikit-learn , llvmPackages ? null +, pythonOlder }: buildPythonPackage rec { pname = "lightgbm"; - version = "3.3.3"; + version = "3.3.5"; + format = "other"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hX5VmuhKIpY84rYhaCkpadIa3TC8kkaoTU5+7a5nlm0="; + hash = "sha256-ELj73PhR5PaKHwLzjZm9xEx8f7mxpi3PkkoNKf9zOVw="; }; nativeBuildInputs = [ @@ -23,7 +28,10 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; + buildInputs = lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp + ]; + propagatedBuildInputs = [ numpy scipy @@ -38,11 +46,15 @@ buildPythonPackage rec { # repository. It contains c++ tests which don't seem to wired up to # `make check`. doCheck = false; - pythonImportsCheck = [ "lightgbm" ]; + + pythonImportsCheck = [ + "lightgbm" + ]; meta = with lib; { description = "A fast, distributed, high performance gradient boosting (GBDT, GBRT, GBM or MART) framework"; homepage = "https://github.com/Microsoft/LightGBM"; + changelog = "https://github.com/microsoft/LightGBM/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ teh costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix index caeab60c1a..c080bbac92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lightning-utilities/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { "lightning_utilities" ]; - checkInputs = [ + nativeCheckInputs = [ pytest-timeout pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lima/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lima/default.nix index 16a5f01ed7..6174a4d764 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lima/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lima/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0qqj0053r77ppkcyyk2fhpaxjzsl1h98nf9clpny6cs66sdl241v"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Lightweight Marshalling of Python 3 Objects."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix index 31b4aa02ae..39c46e2840 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ hiro pymemcache pymongo diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix index 496f55b400..428b199294 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.11.10"; + version = "2023.1.12"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IvnA9y/pkRrkEabUX05wcAg+8To0OLbt55olQfRUAQc="; + hash = "sha256-V3DkIsnVv/HekWuOnIKnMHhccDGWun7mF7AcBSEsy6o="; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix index cf7f909873..d929b5e214 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ipython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/linkify-it-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/linkify-it-py/default.nix index 54f71fe2ec..21c99442f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/linkify-it-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/linkify-it-py/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ uc-micro-py ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "linkify_it" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/linode-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/linode-api/default.nix index 48d5a1e808..906f5eb40a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/linode-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/linode-api/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix index 68e6e4cf63..6739d2ed13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { cp extra/linux/71-liquidctl.rules $out/lib/udev/rules.d/. ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix index 467d239857..74047e657d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/livelossplot/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ bokeh ipython matplotlib numpy ]; - checkInputs = [ nbconvert nbformat pytestCheckHook ]; + nativeCheckInputs = [ nbconvert nbformat pytestCheckHook ]; meta = with lib; { description = "Live training loss plot in Jupyter for Keras, PyTorch, and others"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/livereload/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/livereload/default.nix index 958236606c..de20645380 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/livereload/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/livereload/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tornado six ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # TODO: retry running all tests after v2.6.1 checkPhase = "NOSE_EXCLUDE=test_watch_multiple_dirs nosetests -s"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lizard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lizard/default.nix index 801b77c0fc..dec52c8021 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lizard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lizard/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix index 497e1e279e..c1039db882 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llfuse/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { # On Darwin, the test requires macFUSE to be installed outside of Nix. doCheck = !stdenv.isDarwin; - checkInputs = [ pytestCheckHook which ]; + nativeCheckInputs = [ pytestCheckHook which ]; disabledTests = [ "test_listdir" # accesses /usr/bin diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lmdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lmdb/default.nix index eb74bbb11d..955b2d846e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lmdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lmdb/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { lmdb ]; - checkInputs = [ + nativeCheckInputs = [ cffi pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix index f426d3dd7b..878edcf6bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "57a085a29bb7991d70d41c6c3144c560a8e35b4c1030ffb36d85fa058773bcc5"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix index 97cbd9968a..a5a5b0576a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { # All commands test `localstack` which is a downstream dependency doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix index bb9c100890..b0da4fba29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix @@ -11,6 +11,7 @@ , psutil , python-dotenv , pyyaml +, packaging , requests , rich , semver @@ -31,7 +32,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ --replace "requests>=2.20.0,<2.26" "requests~=2.20" \ - --replace "cachetools~=5.0.0" "cachetools~=5.0" + --replace "cachetools~=5.0.0" "cachetools~=5.0" \ + --replace "boto3>=1.20,<1.25.0" "boto3~=1.20" ''; propagatedBuildInputs = [ @@ -45,6 +47,7 @@ buildPythonPackage rec { psutil python-dotenv pyyaml + packaging requests rich semver diff --git a/third_party/nixpkgs/pkgs/development/python-modules/localzone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localzone/default.nix index 0fcf15fe94..c84cd1c893 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/localzone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/localzone/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ dnspython sphinx ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix index 2004f96209..01c07c6fec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/locationsharinglib/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ betamax emoji nose diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix index 295c8eaf97..2368c4415b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ pbr ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logfury/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/logfury/default.nix index d25278a4e5..9909ab4106 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logfury/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logfury/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook testfixtures ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logi-circle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/logi-circle/default.nix index 4894bfe262..51d66dd406 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logi-circle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logi-circle/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix index 0762d3986c..c6abe32723 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logical-unification/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { multipledispatch ]; - checkInputs = [ + nativeCheckInputs = [ py pytestCheckHook pytest-html diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix b/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix index df6a8b659a..eef74d0695 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix index 9c0d88df64..f89741e527 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/loguru/default.nix @@ -4,51 +4,45 @@ , buildPythonPackage , colorama , fetchpatch -, fetchPypi +, fetchFromGitHub +, freezegun +, mypy , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "loguru"; - version = "0.6.0"; + # No release since Jan 2022, only master is compatible with Python 3.11 + # https://github.com/Delgan/loguru/issues/740 + version = "unstable-2023-01-20"; format = "setuptools"; disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-BmvQZ1jQpRPpg2/ZxrWnW/s/02hB9LmWvGC1R6MJ1Bw="; + src = fetchFromGitHub { + owner = "Delgan"; + repo = pname; + rev = "07f94f3c8373733119f85aa8b9ca05ace3325a4b"; + hash = "sha256-lMGyQbBX3z6186ojs/iew7JMrG91ivPA679T9r+7xYw="; }; - patches = [ - (fetchpatch { - name = "fix-test-repr-infinite-recursion.patch"; - url = "https://github.com/Delgan/loguru/commit/4fe21f66991abeb1905e24c3bc3c634543d959a2.patch"; - hash = "sha256-NUOkgUS28TOazO0txMinFtaKwsi/J1Y7kqjjvMRCnR8="; - }) - ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ aiocontextvars ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook colorama + freezegun + mypy ]; disabledTestPaths = lib.optionals stdenv.isDarwin [ "tests/test_multiprocessing.py" ]; - disabledTests = [ - "test_time_rotation_reopening" - "test_file_buffering" - # Tests are failing with Python 3.10 - "test_exception_others" - "" - ] ++ lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix index dbc52c48a4..7f35845785 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "bc058a25d5c209461f134e1f03cab637d66a7a5ccc12e593db56fbb279899a82"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook redis redis-server diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logzero/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/logzero/default.nix index 4e3ffd255e..5e6b45fa7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logzero/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logzero/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "7f73ddd3ae393457236f081ffebd044a3aa2e423a47ae6ddb5179ab90d0ad082"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lomond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lomond/default.nix index f5bfef6a0a..4fbdf5a2f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lomond/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lomond/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix index f69c45cace..8effe91bc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/losant-rest/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix index 36b8c89789..75921e8a85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { hash = "sha256-h4vI70Bz5c+5U9/Bz0WF20HouBTAEGq9400A7g0LMRU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix new file mode 100644 index 0000000000..e2dcd7bb9a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/lsprotocol/default.nix @@ -0,0 +1,66 @@ +{ lib +, attrs +, buildPythonPackage +, cattrs +, fetchFromGitHub +, flit-core +, jsonschema +, nox +, pyhamcrest +, pytest +, pythonOlder +}: + +buildPythonPackage rec { + pname = "lsprotocol"; + version = "2022.0.0a9"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-6XecPKuBhwtkmZrGozzO+VEryI5wwy9hlvWE1oV6ajk="; + }; + + nativeBuildInputs = [ + flit-core + nox + ]; + + propagatedBuildInputs = [ + attrs + cattrs + ]; + + nativeCheckInputs = [ + pytest + ]; + + checkInputs = [ + jsonschema + pyhamcrest + ]; + + checkPhase = '' + runHook preCheck + + sed -i "/^ _install_requirements/d" noxfile.py + nox --session tests + + runHook postCheck + ''; + + pythonImportsCheck = [ + "lsprotocol" + ]; + + meta = with lib; { + description = "Python implementation of the Language Server Protocol"; + homepage = "https://github.com/microsoft/lsprotocol"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/luddite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/luddite/default.nix index 46a5f29529..26570a1540 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/luddite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/luddite/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytestCheckHook pytest-socket pytest-mock ]; + nativeCheckInputs = [ pytestCheckHook pytest-socket pytest-mock ]; pythonImportsCheck = [ "luddite" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/luftdaten/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/luftdaten/default.nix index ccfe6bcf3f..343460325c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/luftdaten/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/luftdaten/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { httpx ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpx pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/luhn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/luhn/default.nix index 09ab90a3b1..b5622a23d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/luhn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/luhn/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-ZifaCjOVhWdXuzi5n6V+6eVN5vrEHKgUdpSOXoMyR18="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix index ef17ba8f40..9f2e31fbc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lupupy/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "lupupy"; - version = "0.2.4"; + version = "0.2.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-11BdMhUhxbzkSrBEFdqpjkgcOcCZG498ylEHIMbomW4="; + hash = "sha256-SxhGUwcZjaRNCS5dB2hh5uctFGHWuKnM48CcIz6VMh8="; }; propagatedBuildInputs = [ @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to control Lupusec alarm control panels"; homepage = "https://github.com/majuss/lupupy"; + changelog = "https://github.com/majuss/lupupy/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/luxor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/luxor/default.nix index ebebdd0d9b..1bd7a7bbc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/luxor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/luxor/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix index 229d3dfdaa..ab0edb676f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lxmf/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.2.8"; + version = "0.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-JSr9qLyRg0pMZHuvfo/ZO9/Hwl7ZHTrMGkrcejVRweY="; + hash = "sha256-9dvWm5FnqNkcILeY7qkRESk/iLlNEChs24RniRXtsNM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix index c7efc7af57..863ed3ccc2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { "lz4.stream" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook psutil ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix index 8e214540b1..8f75d74f95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix @@ -1,41 +1,43 @@ { lib -, fetchpatch , buildPythonPackage , fetchPypi -, pythonOlder +, fetchpatch , swig2 , openssl , typing +, parameterized }: buildPythonPackage rec { - version = "0.36.0"; + version = "0.38.0"; pname = "M2Crypto"; src = fetchPypi { inherit pname version; - sha256 = "1hadbdckmjzfb8qzbkafypin6sakfx35j2qx0fsivh757s7c2hhm"; + sha256 = "sha256-mfImCjCQHJSajcbV+CzVMS/7iryS52YzuvIxu7yy3ss="; }; patches = [ + # Use OpenSSL_version_num() instead of unrealiable parsing of .h file. (fetchpatch { - url = "https://github.com/void-linux/void-packages/raw/7946d12eb3d815e5ecd4578f1a6133d948694370/srcpkgs/python-M2Crypto/patches/libressl.patch"; - sha256 = "0z5qnkndg6ma5f5qqrid5m95i9kybsr000v3fdy1ab562kf65a27"; + url = "https://src.fedoraproject.org/rpms/m2crypto/raw/42951285c800f72e0f0511cec39a7f49e970a05c/f/m2crypto-MR271-opensslversion.patch"; + hash = "sha256-e1/NHgWza+kum76MUFSofq9Ko3pML67PUfqWjcwIl+A="; + }) + # Changed required to pass tests on OpenSSL 3.0 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/m2crypto/raw/42951285c800f72e0f0511cec39a7f49e970a05c/f/m2crypto-0.38-ossl3-tests.patch"; + hash = "sha256-B6JKoPh76+CIna6zmrvFj50DIp3pzg8aKyzz+Q5hqQ0="; + }) + # Allow EVP tests fail on non-FIPS algorithms + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/m2crypto/raw/42951285c800f72e0f0511cec39a7f49e970a05c/f/m2crypto-0.38-ossl3-tests-evp.patch"; + hash = "sha256-jMUAphVBQMFaOJSeYUCQMV3WSe9VDQqG6GY5fDQXZnA="; }) ]; - patchFlags = [ "-p0" ]; - nativeBuildInputs = [ swig2 ]; - buildInputs = [ swig2 openssl ]; - - propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing; - - preConfigure = '' - substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${openssl.dev}'" - ''; - - doCheck = false; # another test that depends on the network. + nativeBuildInputs = [ swig2 openssl ]; + buildInputs = [ openssl parameterized ]; meta = with lib; { description = "A Python crypto and SSL toolkit"; @@ -43,5 +45,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ andrew-d ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix index d85c2196e8..0019a1c5a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ mistune docutils ]; - checkInputs = [ pygments ]; + nativeCheckInputs = [ pygments ]; meta = with lib; { homepage = "https://github.com/miyakogi/m2r"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/m3u8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/m3u8/default.nix index e69bf61657..cc5dfc7ba2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/m3u8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/m3u8/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests iso8601 ]; - checkInputs = [ bottle pytestCheckHook ]; + nativeCheckInputs = [ bottle pytestCheckHook ]; pytestFlagsArray = [ "tests/test_parser.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix index 3effa92825..5798f7c95d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { "--prefix PYTHONPATH : $out/lib/${python.libPrefix}/site-packages" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix index 4d000c7a16..0a9e26771c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , six , attrs , twisted @@ -9,17 +10,30 @@ , autobahn , treq , mock +, pythonOlder }: buildPythonPackage rec { - version = "0.4.1"; pname = "magic-wormhole-mailbox-server"; + version = "0.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; sha256 = "1af10592909caaf519c00e706eac842c5e77f8d4356215fe9c61c7b2258a88fb"; }; + patches = [ + (fetchpatch { + # Remove the 'U' open mode removed, https://github.com/magic-wormhole/magic-wormhole-mailbox-server/pull/34 + name = "fix-for-python-3.11.patch"; + url = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/commit/4b358859ba80de37c3dc0a5f67ec36909fd48234.patch"; + hash = "sha256-RzZ5kD+xhmFYusVzAbGE+CODXtJVR1zN2rZ+VGApXiQ="; + }) + ]; + propagatedBuildInputs = [ attrs six @@ -28,11 +42,12 @@ buildPythonPackage rec { ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; - checkInputs = [ + nativeCheckInputs = [ treq mock twisted ]; + checkPhase = '' trial -j$NIX_BUILD_CORES wormhole_mailbox_server ''; @@ -40,6 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Securely transfer data between computers"; homepage = "https://github.com/warner/magic-wormhole-mailbox-server"; + changelog = "https://github.com/magic-wormhole/magic-wormhole-mailbox-server/blob/${version}/NEWS.md"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index a618be999c..a47322fdc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ autobahn twisted ]; - checkInputs = [ mock twisted ]; + nativeCheckInputs = [ mock twisted ]; checkPhase = '' trial -j$NIX_BUILD_CORES wormhole_transit_relay diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix index 12374ed193..0773277489 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magic-wormhole/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ] ++ autobahn.optional-dependencies.twisted ++ twisted.optional-dependencies.tls; - checkInputs = [ + nativeCheckInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix index d6c6108d52..6cf78d1298 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix @@ -27,7 +27,7 @@ nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions qtpy pyside2 psygnal docstring-parser ]; - checkInputs = [ pytestCheckHook pytest-mypy-plugins ]; + nativeCheckInputs = [ pytestCheckHook pytest-mypy-plugins ]; doCheck = false; # Reports "Fatal Python error" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix index a7ca6a708d..e644f1c29e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mahotas/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' substituteInPlace mahotas/io/freeimage.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix index 3a58e64bea..24ed5999a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "5.0.6"; + version = "5.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-g70FjY0tc4KjgdVweuBBkFrByt8xlGPJEPz/OvTtjZk="; + hash = "sha256-u5htHCI10mn6AQDlAShMpbyI4PcqiRgpRvsy5Q3km+0="; }; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maison/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maison/default.nix new file mode 100644 index 0000000000..8fa3393d1e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/maison/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, poetry-core +, pydantic +, pytestCheckHook +, pythonOlder +, toml +}: + +buildPythonPackage rec { + pname = "maison"; + version = "1.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "dbatten5"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Ny/n1vDWS6eA9zLIB0os5zrbwvutb+7sQ6iPXeid1M0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + click + pydantic + toml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "maison" + ]; + + meta = with lib; { + description = "Library to read settings from config files"; + homepage = "https://github.com/dbatten5/maison"; + changelog = "https://github.com/dbatten5/maison/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/makefun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/makefun/default.nix index 8060e63122..20b1b951ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/makefun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/makefun/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/malduck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/malduck/default.nix index d984328ac6..ee73eb9405 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/malduck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/malduck/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { --replace "dnfile==0.11.0" "dnfile" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/managesieve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/managesieve/default.nix index fd2eac2b2c..9e2515b0e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/managesieve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/managesieve/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "44930a3b48332d23b35a5305ae7ba47904d4485ed1b7a22208b7d5ad9d60427a"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "ManageSieve client library for remotely managing Sieve scripts"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manhole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manhole/default.nix index 34be99bc8d..1480a002d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/manhole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/manhole/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # https://github.com/ionelmc/python-manhole/issues/54 is fixed doCheck = false; - checkInputs = [ pytest requests process-tests ]; + nativeCheckInputs = [ pytest requests process-tests ]; checkPhase = '' # Based on its tox.ini export PYTHONUNBUFFERED=yes diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix index 6a56682605..9b03caa6b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/manimpango/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { cython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manticore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manticore/default.nix index c645a070e4..8bc54fabf1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/manticore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/manticore/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { --replace "crytic-compile==0.2.2" "crytic-compile>=0.2.2" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manuel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manuel/default.nix index 7bf02f0389..6f1829c7ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/manuel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/manuel/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six ]; - checkInputs = [ zope_testing ]; + nativeCheckInputs = [ zope_testing ]; meta = with lib; { description = "A documentation builder"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mapbox-earcut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mapbox-earcut/default.nix index c7dba7a80d..fa4659ae40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mapbox-earcut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mapbox-earcut/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mapbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mapbox/default.nix index 84ca6199e2..721a2ece39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mapbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mapbox/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ boto3 cachecontrol iso3166 python-dateutil requests polyline uritemplate ]; - checkInputs = [ pytestCheckHook responses ]; + nativeCheckInputs = [ pytestCheckHook responses ]; meta = with lib; { homepage = "https://github.com/mapbox/mapbox-sdk-py"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix index 647c8f34df..1a791cd0fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { cython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook readme_renderer hypothesis diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix index afbe7b18d8..c1c5da228f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix @@ -12,6 +12,9 @@ , pytestCheckHook , pythonOlder , typing-extensions +# allow disabling tests for the nixos manual build. +# the test suite closure is just too large. +, disableTests ? false }: buildPythonPackage rec { @@ -40,9 +43,10 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ psutil py + ] ++ lib.optionals (! disableTests) [ pytest-benchmark pytest-regressions pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix index da3a8af520..b9e8f8df51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ unittestCheckHook pyyaml ]; + nativeCheckInputs = [ unittestCheckHook pyyaml ]; pythonImportsCheck = [ "markdown" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown2/default.nix index 385fa8f89a..45fc711b1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pygments ]; + nativeCheckInputs = [ pygments ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdownify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdownify/default.nix index cc5f3a36e8..fab9f11eae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdownify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdownify/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ beautifulsoup4 six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "HTML to Markdown converter"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix index 04e59287a8..59f4eaf83b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sed 's/=.*//' -i requirements/*.txt ''; - checkInputs = [ pytest pytest-runner pytest-cov coverage ]; + nativeCheckInputs = [ pytest pytest-runner pytest-cov coverage ]; meta = with lib; { description = "An extension to the Python Markdown package enabling superscript text"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markerlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markerlib/default.nix index 7762a970fb..99358e4f95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markerlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markerlib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markups/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markups/default.nix index 2a0db14d96..024097634a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markups/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markups/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix index 0c36299b1f..d164813f8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markupsafe/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-f5EZfMnkj5idEuTm+8RklcRGY238gbnM9Quw7HS5HUs="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 830556e4d7..ba13fae46e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { typing-inspect ]; - checkInputs = [ + nativeCheckInputs = [ marshmallow-enum pytestCheckHook typeguard diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix index a7852afb70..b2559c6c3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-enum/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { marshmallow ] ++ lib.optionals isPy27 [ enum34 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-oneofschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-oneofschema/default.nix index 8fc946305b..3e4faf8c60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-oneofschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-oneofschema/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "marshmallow-oneofschema"; - version = "3.0.1"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = pname; rev = version; - hash = "sha256-x0v8WkfjGkP2668QIQiewQViYFDIS2zBWMULcDThWas="; + hash = "sha256-Em2jQmvI5IiWREeOX/JAcdOQlpwP7k+cbCirkh82sf0="; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -35,6 +35,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/marshmallow-code/marshmallow-oneofschema/blob/${src.rev}/CHANGELOG.rst"; description = "Marshmallow library extension that allows schema (de)multiplexing"; homepage = "https://github.com/marshmallow-code/marshmallow-oneofschema"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix index 6b5394ac27..57da08b09c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { marshmallow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix index 0d8ffb125f..100298e0fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { "marshmallow_sqlalchemy" ]; - checkInputs = [ + nativeCheckInputs = [ pytest-lazy-fixture pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix index 5f41a04876..5fcaf478f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.16.0"; + version = "3.19.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,14 +19,14 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = pname; rev = version; - hash = "sha256-bR10hYViK7OrAaBpKaeM7S5XyHQZhlGUQTwH/EJ0kME="; + hash = "sha256-b1brLHM48t45bwUXk7QreLLmvTzU0sX7Uoc1ZAgGkrE="; }; propagatedBuildInputs = [ packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytz simplejson @@ -37,6 +37,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/marshmallow-code/marshmallow/blob/${src.rev}/CHANGELOG.rst"; description = "Library for converting complex objects to and from simple Python datatypes"; homepage = "https://github.com/marshmallow-code/marshmallow"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mastodon-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mastodon-py/default.nix index a31f3a07b3..2bac23d060 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mastodon-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mastodon-py/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock pytest-vcr diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix index be6c2912df..e467023a87 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.13.1"; + version = "0.13.2"; disabled = pythonOlder "3.5"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "jvoisin"; repo = "mat2"; rev = version; - hash = "sha256-/HcWVXguZf9cCGY0xlC7uMnLkSAqZ0DIAC6JUw2KKDs="; + hash = "sha256-gZl2VH7qCmjrM/UrXPief8hCQKkBHdjG8w0MQvkZ7wk="; }; patches = [ @@ -85,7 +85,7 @@ buildPythonPackage rec { install -Dm 444 dolphin/mat2.desktop -t "$out/share/kservices5/ServiceMenus" ''; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-v" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix index efcf1741ab..cd11d89c7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { multiset ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix index a2a5a155b5..9816f9470c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matrix-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix index 4abec9e315..90289f79cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matrix-common/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { attrs ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix index a364b032ed..73171dbdbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "matrix-nio"; - version = "0.20.0"; + version = "0.20.1"; format = "pyproject"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - hash = "sha256-7bYGMbNLAN48kfckCcNtnymvQHm9CSNsgy/soe14SII="; + hash = "sha256-6oMOfyl8yR8FMprPYD831eiXh9g/bqslvxDmVcrNK80="; }; postPatch = '' @@ -70,7 +70,7 @@ buildPythonPackage rec { unpaddedbase64 ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses faker hypothesis 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 ff92d814a0..dd35534197 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -1,40 +1,67 @@ { lib , buildPythonPackage -, fetchPypi -, aiohttp +, fetchFromGitHub , pythonOlder -, sqlalchemy -, ruamel-yaml -, CommonMark -, lxml + # deps +, aiohttp +, attrs +, yarl + # optional deps +, python-magic +, python-olm +, unpaddedbase64 +, pycryptodome + # check deps +, pytestCheckHook +, pytest-asyncio , aiosqlite +, sqlalchemy +, asyncpg }: buildPythonPackage rec { pname = "mautrix"; - version = "0.18.9"; + version = "0.19.3"; format = "setuptools"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-Ihaz/izB9L6osu3CPwBWOwLZ2JOLKhsDuqOUf/B02qI="; + src = fetchFromGitHub { + owner = "mautrix"; + repo = "python"; + rev = "v${version}"; + hash = "sha256-7nvy2/DUS2BkcyQUUG8+aT/JHcPu141e5YWOiccS6cU="; }; propagatedBuildInputs = [ aiohttp - - # defined in optional-requirements.txt - sqlalchemy - aiosqlite - ruamel-yaml - CommonMark - lxml + attrs + yarl ]; - # no tests available - doCheck = false; + passthru.optional-dependencies = { + detect_mimetype = [ + python-magic + ]; + encryption = [ + python-olm + unpaddedbase64 + pycryptodome + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + pytest-asyncio + aiosqlite + sqlalchemy + asyncpg + ] ++ passthru.optional-dependencies.encryption; + + SQLALCHEMY_SILENCE_UBER_WARNING = 1; pythonImportsCheck = [ "mautrix" @@ -45,6 +72,6 @@ buildPythonPackage rec { homepage = "https://github.com/tulir/mautrix-python"; changelog = "https://github.com/mautrix/python/releases/tag/v${version}"; license = licenses.mpl20; - maintainers = with maintainers; [ nyanloutre ma27 sumnerevans ]; + maintainers = with maintainers; [ nyanloutre ma27 sumnerevans nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maxcube-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maxcube-api/default.nix index 0627667a4e..86fb5fe574 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maxcube-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maxcube-api/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "license=license" "license='MIT'" ''; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "maxcube" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix index 09997b5e60..cf803de336 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { buildInputs = [ libmaxminddb ]; - checkInputs = [ nose mock ]; + nativeCheckInputs = [ nose mock ]; # Tests are broken for macOS on python38 doCheck = !(stdenv.isDarwin && pythonAtLeast "3.8"); 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 6ba2b4874a..8cd113972a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { dnspython ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook 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 079d731235..a8d1c18c47 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 @@ -25,7 +25,7 @@ buildPythonPackage rec { fpyutils ]; - checkInputs = [ + nativeCheckInputs = [ pyfakefs pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix index bc4e4fc4b2..c48dc0d26b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/md2gemini/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { version = "1.9.0"; propagatedBuildInputs = [ mistune cjkwrap wcwidth ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "md2gemini" ]; src = fetchPypi { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix index 114685e2f4..0f06e44f90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix index 4b780c40df..f93751ca71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdit-py-plugins/default.nix @@ -6,6 +6,9 @@ , markdown-it-py , pytest-regressions , pytestCheckHook +# allow disabling tests for the nixos manual build. +# the test suite closure is just too large. +, disableTests ? false }: buildPythonPackage rec { @@ -30,7 +33,7 @@ buildPythonPackage rec { markdown-it-py ]; - checkInputs = [ + nativeCheckInputs = lib.optionals (!disableTests) [ pytestCheckHook pytest-regressions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdp/default.nix index dc73daa449..75dfc5dabc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future numpy ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdurl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdurl/default.nix index fb846dffd1..f245deeb70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdurl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdurl/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdutils/default.nix index f2b1425893..b24f24ab91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdutils/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-regIrMWbGmW574dfojxZFJoivpaqOpN1I6YsqLEp8BM="; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Set of basic tools that can help to create Markdown files"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/measurement/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/measurement/default.nix index 3096950121..250fabe4fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/measurement/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/measurement/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sed -i 's|use_scm_version=True|version="${version}"|' setup.py ''; - checkInputs = [ pytest pytest-runner ]; + nativeCheckInputs = [ pytest pytest-runner ]; nativeBuildInputs = [ sphinx setuptools-scm ]; propagatedBuildInputs = [ sympy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mechanicalsoup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mechanicalsoup/default.nix index 3dcfee1557..4d68f71d2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mechanicalsoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mechanicalsoup/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-httpbin pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mediafile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mediafile/default.nix index 1e09a5e489..a3c2ad7794 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mediafile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mediafile/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mercantile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mercantile/default.nix index e7f307361e..cc38298241 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mercantile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mercantile/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - checkInputs = [ pytestCheckHook hypothesis ]; + nativeCheckInputs = [ pytestCheckHook hypothesis ]; meta = with lib; { description = "Spherical mercator tile and coordinate utilities"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mergedb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mergedb/default.nix index b31d4ddf19..3c78026632 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mergedb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mergedb/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix index 46de340502..8b348120c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mergedeep/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1msvvdzk33sxzgyvs4fs8dlsrsi7fjj038z83s0yw5h8m8d78469"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = "pytest"; pythonImportsCheck = [ "mergedeep" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mergedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mergedict/default.nix index b1ed82f534..6023a6ca23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mergedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mergedict/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-4ZkrNqVCKQFPvLx6nIwo0fSuEx6h2NNFyTlz+fDcb9w="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "mergedict" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/merkletools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/merkletools/default.nix index a57f926a61..b5dc5adf3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/merkletools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/merkletools/default.nix @@ -1,19 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi, pysha3 }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "merkletools"; version = "1.0.3"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "0pdik5sil0xcrwdcgdfy86c5qcfrz24r0gfc8m8bxa0i7h7x2v9l"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Tierion"; + repo = "pymerkletools"; + rev = "refs/tags/${version}"; + hash = "sha256-pd7Wxi7Sk95RcrFOTOtl725nIXidva3ftdKSGxHYPTA="; }; - propagatedBuildInputs = [ pysha3 ]; + postPatch = '' + # pysha3 is deprecated and not needed for Python > 3.6 + substituteInPlace setup.py \ + --replace "install_requires=install_requires" "install_requires=[]," + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "merkletools" + ]; meta = with lib; { description = "Python tools for creating Merkle trees, generating Merkle proofs, and verification of Merkle proofs"; homepage = "https://github.com/Tierion/pymerkletools"; + changelog = "https://github.com/Tierion/pymerkletools/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ Madouura ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mesa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mesa/default.nix index 2398551b0d..9310637b7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mesa/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshio/default.nix index 2e8d4044ce..3dae72e39b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meshio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshio/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { rich ]; - checkInputs = [ + nativeCheckInputs = [ exdown pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix index 2c1d7766b2..a76d3ff3ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.9"; + version = "2.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-3OA61cuj9u6ejkQJgCjnu8ERjACKXz2hUekbvZqiPJ8="; + hash = "sha256-XIYzlGtj+S28N7RLvA38WSLv7LNZqKs8aJUaEG1CslI="; }; propagatedBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytap2 pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/messagebird/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/messagebird/default.nix index 2b42896465..4365e44623 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/messagebird/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/messagebird/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix index 5fb1804dc6..9e630c1fe9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "metar" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meteocalc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meteocalc/default.nix index 6b18bba979..886b77de08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meteocalc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meteocalc/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-WuIW6hROQkjMfbCLUouECIrp4s6oCd2/N79hsrTbVTk="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meteofrance-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meteofrance-api/default.nix index a49426bb64..9183bc8170 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meteofrance-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meteofrance-api/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mf2py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mf2py/default.nix index 110da8e60f..0b8ae34043 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mf2py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mf2py/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ lxml mock nose diff --git a/third_party/nixpkgs/pkgs/development/python-modules/microdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/microdata/default.nix index 39ed19395c..8502d85d84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/microdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/microdata/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { html5lib ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix index 25d8d492dd..9b9b25ee37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { python-rtmidi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/milc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/milc/default.nix index ebf4d1d2d2..0931bfbad3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/milc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/milc/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { halo ]; - checkInputs = [ + nativeCheckInputs = [ nose2 semver ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minexr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minexr/default.nix index 0417fe7594..7cb8632ea5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minexr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minexr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; pythonImportsCheck = [ "minexr" ]; - checkInputs = [ pytestCheckHook pillow ]; + nativeCheckInputs = [ pytestCheckHook pillow ]; meta = with lib; { description = "Minimal, standalone OpenEXR reader for single-part, uncompressed scan line files."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix index 92c94b574b..7c681d849b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/miniaudio/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; propagatedBuildInputs = [ cffi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minidb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minidb/default.nix index 5723138ecc..8bd0aea36c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minidb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minidb/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "minidb"; - version = "2.0.6"; + version = "2.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,11 +15,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thp"; repo = "minidb"; - rev = version; - hash = "sha256-H7W+GBapT9uJgbPlARp4ZLKTN7hZlF/FbNo7rObqDM4="; + rev = "refs/tags/${version}"; + hash = "sha256-0f2usKoHs4NO/Ir8MhyiAVZFYnUkVH5avdh3QdHzY6s="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minikanren/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minikanren/default.nix index 929a9be81a..1b25a84377 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minikanren/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minikanren/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { logical-unification ]; - checkInputs = [ + nativeCheckInputs = [ py pytestCheckHook pytest-html diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix index 8fb2c749ac..b93cf7dee8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ faker mock nose diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mip/default.nix index 1b86734624..1011677338 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mip/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sha256 = "sha256-wr4gXSh456heG5nsaEi2yo7LMre2Nd6QbTm0dcDCX1k="; }; - checkInputs = [ matplotlib networkx numpy pytestCheckHook ]; + nativeCheckInputs = [ matplotlib networkx numpy pytestCheckHook ]; nativeBuildInputs = [ dos2unix ]; propagatedBuildInputs = [ cffi @@ -68,7 +68,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = "http://python-mip.com/"; + homepage = "https://python-mip.com/"; description = "A collection of Python tools for the modeling and solution of Mixed-Integer Linear programs (MIPs)"; downloadPage = "https://github.com/coin-or/python-mip/releases"; changelog = "https://github.com/coin-or/python-mip/releases/tag/${version}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/misoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/misoc/default.nix index 447bde58c3..785043f1ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/misoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/misoc/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { migen ]; - checkInputs = [ + nativeCheckInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mistune/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mistune/default.nix index 883bbb5135..600c77e8e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mistune/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mistune/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix index 688065712c..0d38d3259d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { zstandard ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis parver pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mixpanel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mixpanel/default.nix index 692333e4da..4735201771 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mixpanel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mixpanel/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix index 5777f31bcc..a013934a01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mizani/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-autorefs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-autorefs/default.nix index dd88bd332e..39f1a00043 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-autorefs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-autorefs/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { mkdocs ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-jupyter/default.nix index 846d40a25f..e285ed0083 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-jupyter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "mkdocs_jupyter" ]; - checkInputs = [ + nativeCheckInputs = [ pytest-cov pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix new file mode 100644 index 0000000000..57f900c6ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix @@ -0,0 +1,43 @@ +{ lib, buildPythonPackage, fetchFromGitHub +, beautifulsoup4 +, jsbeautifier +, mkdocs +, mkdocs-material +, pymdown-extensions +, pyyaml +, requests +}: + +buildPythonPackage rec { + pname = "mkdocs-mermaid2-plugin"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "fralau"; + repo = "mkdocs-mermaid2-plugin"; + rev = "v${version}"; + sha256 = "sha256-Oe6wkVrsB0NWF+HHeifrEogjxdGPINRDJGkh9p+GoHs="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + jsbeautifier + mkdocs + mkdocs-material + pymdown-extensions + pyyaml + requests + ]; + + # non-traditional python tests (e.g. nodejs based tests) + doCheck = false; + + pythonImportsCheck = [ "mermaid2" ]; + + meta = with lib; { + description = "A MkDocs plugin for including mermaid graphs in markdown sources"; + homepage = "https://github.com/fralau/mkdocs-mermaid2-plugin"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix index 3c952fb066..7c04933fb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-minify/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { mkdocs ]; - checkInputs = [ + nativeCheckInputs = [ mkdocs pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix index 9394692fc5..d50ee643f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { mkdocs ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs/default.nix index 347f7452d7..ac3c2c851c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook babel mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix index 6b5f957485..92673a752f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { mkdocstrings ]; - checkInputs = [ + nativeCheckInputs = [ mkdocs-material pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix index 9bd577c7fa..4d367c809d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocstrings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.19.1"; + version = "0.20.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,10 +22,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mkdocstrings"; repo = pname; - rev = version; - sha256 = "sha256-VCWUV+3vXmKbAXImAqY/K4vsA64gHBg83VkxbJua/ao="; + rev = "refs/tags/${version}"; + hash = "sha256-eFHcwbYEIwVWvDJWlmeUvEdqp3NYAF8SgdHJGw6bEMc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'dynamic = ["version"]' 'version = "${version}"' \ + --replace 'license = "ISC"' 'license = {text = "ISC"}' + ''; + nativeBuildInputs = [ pdm-pep517 ]; @@ -39,16 +45,10 @@ buildPythonPackage rec { pymdown-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'dynamic = ["version"]' 'version = "${version}"' \ - --replace 'license = "ISC"' 'license = {text = "ISC"}' - ''; - pythonImportsCheck = [ "mkdocstrings" ]; @@ -58,6 +58,11 @@ buildPythonPackage rec { "tests/test_extension.py" ]; + disabledTests = [ + # Not all requirements are available + "test_disabling_plugin" + ]; + meta = with lib; { description = "Automatic documentation from sources for MkDocs"; homepage = "https://github.com/mkdocstrings/mkdocstrings"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix index be0ac454ee..ef62dc1398 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { MKLROOT = mkl; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; nativeBuildInputs = [ cython ]; propagatedBuildInputs = [ mkl six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlrose/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlrose/default.nix index 2187f27268..72e2bf969c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlrose/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlrose/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ scikit-learn ]; - checkInputs = [ pytest-randomly pytestCheckHook ]; + nativeCheckInputs = [ pytest-randomly pytestCheckHook ]; postPatch = '' substituteInPlace setup.py --replace sklearn scikit-learn diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix index a3747545b4..d8b2a5212e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "sha256-7G4tIoQGS7/YPpAhUn0CRf8fl/DdjdqySPWgJEL0trA="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # image tests download files over the network pytestFlagsArray = [ "-sv" "--ignore=mlxtend/image" ]; # Fixed in master, but failing in release version diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix index 702521de97..f79fb2f368 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ h5py nibabel pandas diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix index 86590c1d7b..0bba28020a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mnemonic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-YYgWlYfVd1iALOziaUI8uVYjJDCIVk/dXcUmJd2jcvQ="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "mnemonic" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mnist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mnist/default.nix index 022cd3a2e0..2d0b158534 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mnist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mnist/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ] ++ lib.optional isPy27 mock; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moat-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moat-ble/default.nix index 33a59c72f8..5131fd0486 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moat-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moat-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mobly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mobly/default.nix index 76f4e4fd9f..c91cf2697f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mobly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mobly/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "mobly"; - version = "1.12"; + version = "1.12.1"; format = "setuptools"; src = fetchFromGitHub { owner = "google"; repo = "mobly"; rev = "refs/tags/${version}"; - hash = "sha256-HAXm0/h5jbgVuIwP7IZ1ffUs92gcpOPiM2VgT38r8Go="; + hash = "sha256-8ZcjxxAv+x8vTsgVKLFb55M02gElkZcZo/nrLwG7k6k="; }; propagatedBuildInputs = [ @@ -35,14 +35,14 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ procps pytestCheckHook pytz ]; meta = with lib; { - changelog = "https://github.com/google/mobly/blob/"; + changelog = "https://github.com/google/mobly/blob/${src.rev}/CHANGELOG.md"; description = "Automation framework for special end-to-end test cases"; homepage = "https://github.com/google/mobly"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mock-services/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mock-services/default.nix index 2917b21dcf..51f07960bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mock-services/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mock-services/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { requests-mock ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mock/default.nix index d23ae8d30c..f8684475de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mock/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix index 799c670892..c36747d3dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock aiohttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix index 494386212d..658dd02e3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ]; - checkInputs = [ pytest numpy ]; + nativeCheckInputs = [ pytest numpy ]; # tests are no longer packaged in pypi tarball doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mockupdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mockupdb/default.nix index ddd72e7e7c..e06b1637b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mockupdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mockupdb/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pymongo ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix index dc50ea3141..b9f0174bb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/modeled/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six moretools path ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "modeled" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix index 6888356ec4..8bb104da18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moderngl_window/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "moderngl_window"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "moderngl"; repo = pname; - rev = version; - sha256 = "12a5nl01c9b1ww7sj7i02xa7zmlrgg8jvi8cz004hw98kjcs9li8"; + rev = "refs/tags/${version}"; + sha256 = "sha256-jsASGYrsH9UNanswX2bZyWS3co/2Y1joaQ98virWcBE="; }; propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr glcontext ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mohawk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mohawk/default.nix index 6616ba7d53..ae57d8fbf8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mohawk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mohawk/default.nix @@ -1,6 +1,5 @@ { lib, buildPythonPackage, fetchPypi, mock, nose, pytest, six }: -with lib; buildPythonPackage rec { pname = "mohawk"; version = "1.1.0"; @@ -12,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ mock nose pytest ]; + nativeCheckInputs = [ mock nose pytest ]; checkPhase = '' pytest mohawk/tests.py @@ -21,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Python library for Hawk HTTP authorization."; homepage = "https://github.com/kumar303/mohawk"; - license = licenses.mpl20; + license = lib.licenses.mpl20; maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moku/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moku/default.nix index e93f1a054f..3aba750f22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moku/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moku/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "moku"; - version = "2.5.1"; + version = "2.6.0"; /* @@ -22,7 +22,7 @@ buildPythonPackage rec { */ src = fetchPypi { inherit pname version; - hash = "sha256-oFRwJ6i4wfjA3E2QMqE4ybutT7OZiFZ3LYXoplY3D/I="; + hash = "sha256-tG54V26H7viu5DPs3EWTg7ouCsdC3EXoeb8iexO6YBw="; }; /* diff --git a/third_party/nixpkgs/pkgs/development/python-modules/monero/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/monero/default.nix index 82e04542b6..2147e56139 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/monero/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/monero/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { varint ]; - checkInputs = [ pytestCheckHook pytest-cov responses ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov responses ]; meta = with lib; { description = "Comprehensive Python module for handling Monero"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix index 3ba9c9dea3..e5a8ccd467 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ nose pillow coverage diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mongomock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mongomock/default.nix index e3dc90ef80..5e66ad4219 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mongomock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mongomock/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sentinels ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix index b4b8292ea0..d6d67cd763 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/monty/default.nix @@ -1,13 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder , msgpack -, pytestCheckHook , numpy , pandas , pydantic , pymongo +, pytestCheckHook +, pythonOlder , ruamel-yaml , tqdm }: @@ -15,13 +15,15 @@ buildPythonPackage rec { pname = "monty"; version = "2022.9.9"; - disabled = pythonOlder "3.5"; # uses type annotations + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-7ToNiRSWxe9nNcaWWmS6bhVqWMEwXN4uiwtjAmuK5qw="; + hash = "sha256-7ToNiRSWxe9nNcaWWmS6bhVqWMEwXN4uiwtjAmuK5qw="; }; postPatch = '' @@ -30,17 +32,29 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + msgpack ruamel-yaml tqdm - msgpack ]; - checkInputs = [ - pytestCheckHook + nativeCheckInputs = [ numpy pandas pydantic pymongo + pytestCheckHook + ]; + + pythonImportsCheck = [ + "monty" + ]; + + disabledTests = [ + # Test file was removed and re-added after 2022.9.9 + "test_reverse_readfile_gz" + "test_Path_objects" + "test_zopen" + "test_zpath" ]; meta = with lib; { @@ -51,6 +65,7 @@ buildPythonPackage rec { patterns such as singleton and cached_class, and many more. "; homepage = "https://github.com/materialsvirtuallab/monty"; + changelog = "https://github.com/materialsvirtuallab/monty/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moonraker-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moonraker-api/default.nix index 50ba81d6d5..e425cef6e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moonraker-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moonraker-api/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix index 4f8b9884d4..3719544927 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/more-properties/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/more-properties/default.nix index e878c8e722..05c75b8f21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/more-properties/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/more-properties/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { --replace dataclasses "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moretools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moretools/default.nix index 01f6b58a94..75e92bb32b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moretools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moretools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ zetup ]; - checkInputs = [ six path pytest ]; + nativeCheckInputs = [ six path pytest ]; propagatedBuildInputs = [ decorator ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mortgage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mortgage/default.nix index dc395a87a5..9cd4fe920c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mortgage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mortgage/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "18fcb356c631e9cc27fa7019f6ff6021707e34b9ce3a3b7dc815661288709921"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/motioneye-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/motioneye-client/default.nix index ba635c62f7..4f2afc6e41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/motioneye-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/motioneye-client/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytest-timeout pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix index 6de0725797..3860a22e20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook sure diff --git a/third_party/nixpkgs/pkgs/development/python-modules/motor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/motor/default.nix index cd819a14a8..704c8697ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/motor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/motor/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pymongo ]; - checkInputs = [ + nativeCheckInputs = [ mockupdb ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mox/default.nix index bd7fc589a7..3513ac2b2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mox/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix index d6c5fac485..ce073ed27c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { nativeBuildInputs = [ mpi ]; - checkInputs = [ openssh ]; + nativeCheckInputs = [ openssh ]; meta = with lib; { description = "Python bindings for the Message Passing Interface standard"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mpmath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpmath/default.nix index e3b3223966..412965ab11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mpmath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpmath/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mrjob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mrjob/default.nix index f8029f9db6..97cd5fd78e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mrjob/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mrjob/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { doCheck = false; # failing tests - checkInputs = [ + nativeCheckInputs = [ pyspark unittestCheckHook warcio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ms-cv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ms-cv/default.nix index aa8e361338..07af4ecb51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ms-cv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ms-cv/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { --replace "pytest-runner" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msgpack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msgpack/default.nix index aa413190d4..7832a46d36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msgpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msgpack/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msgraph-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msgraph-core/default.nix index 22e18e5975..a1df35addf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msgraph-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msgraph-core/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix index a1d8349290..2d1ab99020 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msoffcrypto-tool/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix index c22dad7130..3463931a1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msrest/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ httpretty pytest-aiohttp pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix index 96c546e5d3..716667e870 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msrestazure/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ adal msrest ]; - checkInputs = [ httpretty mock pytest ] + nativeCheckInputs = [ httpretty mock pytest ] ++ lib.optionals isPy3k [ pytest-asyncio ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix index b2e5f53119..b99954e554 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix @@ -3,17 +3,17 @@ }: buildPythonPackage rec { - version = "4.27.0"; + version = "4.28.0"; pname = "mt-940"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LL4CRioio63gpXrsurVucrkFgQrEh0gZPZ79Y2tk/90="; + sha256 = "sha256-ydTOaijDmA2ogIONzRMMoz+5jr99qxWM1zzGGzg7f2Q="; }; propagatedBuildInputs = lib.optional (!isPy3k) enum34; - checkInputs = [ pyyaml pytest ]; + nativeCheckInputs = [ pyyaml pytest ]; # requires tests files that are not present doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multidict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multidict/default.nix index 0a32937f13..863e005d4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/multidict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/multidict/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sed -i '/^addopts/d' setup.cfg ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "multidict" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multimethod/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multimethod/default.nix index ef8004d208..3523563693 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/multimethod/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/multimethod/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multipart/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multipart/default.nix index 6d44184316..84daaac277 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/multipart/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/multipart/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix index e511ab1004..bebd6a73e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/multiset/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools-scm pytest-runner ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "An implementation of a multiset"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/munkres/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/munkres/default.nix index ffb4f87749..a047db7ffd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/munkres/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/munkres/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "http://bmc.github.com/munkres/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix index 78dbb73a00..0fc32322c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ${python.pythonForBuild.interpreter} setup.py build_sphinx --build-dir=$doc ''; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mutatormath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mutatormath/default.nix index 9336dbf354..1fdb937e33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mutatormath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mutatormath/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ fontmath unicodedata2 defcon ]; - checkInputs = [ unicodedata2 fs ]; + nativeCheckInputs = [ unicodedata2 fs ]; meta = with lib; { description = "Piecewise linear interpolation in multiple dimensions with multiple, arbitrarily placed, masters"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mutf8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mutf8/default.nix index 954cc663c2..dd6f554a66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mutf8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mutf8/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-4Ojn3t0EbOVdrYEiY8JegJuvW9sz8jt9tKFwOluiGQo="; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix index da260251e9..048364d5bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix index faccc18a07..4d5387abd4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mwdblib/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "mwdblib" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix index b8399bebef..a2a49021c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mwparserfromhell/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-kr7JUorjTScok8yvK1J9+FwxT/KM+7MFY0BGewldg0w="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-runner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix index d940062c4d..0c64f0549e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myfitnesspal/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ mock nose pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix index c6956b828d..d23116c5b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0aa28wc55x3rxa7clwfv5v5500ffyaq0vkxaa3v01y1r93dxkdvp"; }; - checkInputs = [ nose minimock ]; + nativeCheckInputs = [ nose minimock ]; checkPhase = '' nosetests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myhdl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myhdl/default.nix index 77e793266e..e5b5bbf97a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myhdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myhdl/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-Tgoem88Y6AhlCKVhMm0Khg6GPcrEktYOqV8xcMaNkl4="; }; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-xdist verilog @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "A free, open-source package for using Python as a hardware description and verification language."; - homepage = "http://www.myhdl.org/"; + homepage = "https://www.myhdl.org/"; license = licenses.lgpl21; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myhome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myhome/default.nix index de729243f0..dfdf81a08a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myhome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myhome/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix index 3c21c2c810..807e205eb0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myjwt/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 92ca2f5293..d6ada06ef9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index 6825978f19..2dac4243fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.26.0.post1"; + version = "1.26.58"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bXB5+Mc53Jk8vtrQc2KZxBOyl4FLc3laOFWnkWnsyTg="; + hash = "sha256-AqqVFIdxR9qZbqYunT0ybWsz9GycILJvHkX9ElugNRg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix index b8b3de2408..2bd02f1ff7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { doCheck = false; # ModuleNotFoundError: No module named 'testproto' - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix index ba0a079fee..7f167c3f71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy/extensions.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional (pythonOlder "3.5") typing; # make the testsuite run with pytest, so we can disable individual tests - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix index f3efa9f85b..4437c9edcb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "myst_parser" ]; - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 pytest-param-files pytest-regressions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nad-receiver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nad-receiver/default.nix index 60006c7afc..3d21379c24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nad-receiver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nad-receiver/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pyserial ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nagiosplugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nagiosplugin/default.nix index fab05cd4ac..a7e7b01657 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nagiosplugin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nagiosplugin/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { twine ]; - checkInputs = [ + nativeCheckInputs = [ numpy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/namedlist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/namedlist/default.nix index d9b2db64f4..0bba6233f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/namedlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/namedlist/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-NPifyZJZLICzmnCeE27c9B6hfyS6Mer4SjFKAsi5vO8="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/names/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/names/default.nix index b65bb46347..b2d6a25bb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/names/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/names/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0jfn11bl05k3qkqw0f4vi2i2lhllxdrbb1732qiisdy9fbvv8611"; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nampa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nampa/default.nix index 9f572d141c..133fd4932b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nampa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nampa/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nanoid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nanoid/default.nix index 495e7337f8..5054756a30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nanoid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nanoid/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; # tests not in sdist, git not tagged - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nanotime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nanotime/default.nix index fc9306eb57..e7802871b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nanotime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nanotime/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "c7cc231fc5f6db401b448d7ab51c96d0a4733f4b69fabe569a576f89ffdf966b"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix index 9625c8b556..1c000f1676 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { ncclient ]; - checkInputs = [ pytestCheckHook mock ddt ]; + nativeCheckInputs = [ pytestCheckHook mock ddt ]; meta = with lib; { description = diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix b/third_party/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix index f6ebfa980e..c0a326b0ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { preCheck = '' rm setup.cfg ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # AssertionError: Some methods vary. "test_method_signatures" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napari-plugin-engine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napari-plugin-engine/default.nix index 802b25e8df..969351a41a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/napari-plugin-engine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/napari-plugin-engine/default.nix @@ -13,7 +13,7 @@ sha256 = "sha256-cKpCAEYYRq3UPje7REjzhEe1J9mmrtXs8TBnxWukcNE="; }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = false; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napari-svg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napari-svg/default.nix index 89101e8244..1a5eb1ee4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/napari-svg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/napari-svg/default.nix @@ -17,7 +17,7 @@ }; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ vispy napari-plugin-engine imageio ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = false; # Circular dependency: napari SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nasdaq-data-link/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nasdaq-data-link/default.nix index ac1141af34..17e2b22924 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nasdaq-data-link/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nasdaq-data-link/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ factory_boy httpretty jsondate diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix index c65ef0c35c..9a3ed28481 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nats-py/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ed25519 ]; - checkInputs = [ + nativeCheckInputs = [ nats-server pytestCheckHook uvloop diff --git a/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix index c6e6a27953..4a01afaaf7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pyicu ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales hypothesis pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix index 04644f2c75..2735efd4ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { traitlets ]; - checkInputs = [ + nativeCheckInputs = [ pytest-jupyter pytest-tornasync pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix index 937ade7303..605ecf1d60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix @@ -46,7 +46,7 @@ let nbclient = buildPythonPackage rec { # circular dependencies if enabled by default doCheck = false; - checkInputs = [ + nativeCheckInputs = [ ipykernel ipywidgets nbconvert diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix index 42d9ae3cf3..2de84cf20e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbconflux/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nbconvert requests ]; - checkInputs = [ pytestCheckHook responses ]; + nativeCheckInputs = [ pytestCheckHook responses ]; JUPYTER_PATH="${nbconvert}/share/jupyter"; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix index 79386e0274..54632a5025 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix @@ -84,7 +84,7 @@ in buildPythonPackage rec { export HOME=$(mktemp -d) ''; - checkInputs = [ + nativeCheckInputs = [ ipywidgets pyppeteer pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix index 78cb915b29..40a0d63d48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { jinja2 ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest-timeout pytest-tornado diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix index a9dae6b063..ab2520279a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { traitlets ]; - checkInputs = [ + nativeCheckInputs = [ pep440 pytestCheckHook testpath diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbmerge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbmerge/default.nix index 7990019713..5919f7e18b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbmerge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbmerge/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ nbformat ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' patchShebangs . diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix index ac562279a1..3a93825f8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.8.11"; + version = "0.8.12"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-q+GMBLM9m837PWbxGV9rDVHuykY+ywf2Bh3kl+QzFuQ="; + hash = "sha256-dlcEFs3svrIdv1w9aqIEztbB3X6+9Ad7XCG4xuzpUz8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix index 3db0846652..1e135a80d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook matplotlib sympy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix index 3c09458e87..68d3ca6034 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pyopenssl ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ncclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ncclient/default.nix index 3457c71af4..385899ba84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ncclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ncclient/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ndjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ndjson/default.nix index cd70025d61..9f2cf3fb2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ndjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ndjson/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "v5dGy2uxy1PRcs2n8VTAfHhtZl/yg0Hk5om3lrIp5dY="; }; - checkInputs = [ pytest pytest-runner flake8 twine sphinx coverage watchdog ]; + nativeCheckInputs = [ pytest pytest-runner flake8 twine sphinx coverage watchdog ]; meta = with lib; { homepage = "https://github.com/rhgrant10/ndjson"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ndms2-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ndms2-client/default.nix index d29946a568..feeb36737a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ndms2-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ndms2-client/default.nix @@ -6,16 +6,18 @@ buildPythonPackage rec { pname = "ndms2-client"; - version = "0.1.1"; + version = "0.1.2"; + + format = "setuptools"; src = fetchFromGitHub { owner = "foxel"; repo = "python_ndms2_client"; rev = version; - sha256 = "1sc39d10hm1y8xf3gdqzq1akrx94k590l106242j9bvfqyr8lrk9"; + hash = "sha256-cM36xNLymg5Xph3bvbUGdAEmMABJ9y3/w/U8re6ZfB4="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ndspy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ndspy/default.nix index 7408949649..1fb3302138 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ndspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ndspy/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { crcmod ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/neo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/neo/default.nix index 14e33064fe..0bb1f33c98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/neo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/neo/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { quantities ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix index ea3558ab0b..5f7e3430cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.4.0"; + version = "5.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-emUz6DHnrDBOu9Wlhum7ntK3JIt94/05tuBAT2x4Bjs="; + hash = "sha256-K3ggXXDDdyPIcWL4eLo1HrpZB05tA9oYWpbOohcCF/w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nessclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nessclient/default.nix index 591d74a95a..c48fe4a746 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nessclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nessclient/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nested-lookup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nested-lookup/default.nix index dc186606f4..c8c00c3366 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nested-lookup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nested-lookup/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix index 1fbfde7b26..c8b0c77b7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nestedtext/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ inform ]; - checkInputs = [ pytestCheckHook docopt natsort voluptuous ]; + nativeCheckInputs = [ pytestCheckHook docopt natsort voluptuous ]; pytestFlagsArray = [ "--ignore=build" ]; # Avoids an ImportMismatchError. meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netaddr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netaddr/default.nix index 3f7f78a374..2a9f4b78b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netaddr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ importlib-resources ]; - checkInputs = [ glibcLocales pytestCheckHook ]; + nativeCheckInputs = [ glibcLocales pytestCheckHook ]; meta = with lib; { homepage = "https://netaddr.readthedocs.io/en/latest/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netdata/default.nix index 660f2bd19f..18942bb014 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netdata/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpx pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix index 0017483eca..ef1ebbf68f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netdisco/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests zeroconf ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # Broken due to removed discoverables in https://github.com/home-assistant-libs/netdisco/commit/477db5a1dc93919a6c5bd61b4b1d3c80e75785bd diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 35a6b1a613..71cd3b9a26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { orjson ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-error-for-skips diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix index 25e2258150..9bf6f3c781 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ jinja2 pytestCheckHook pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix index 65a722b850..01e21ae877 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ decorator setuptools ]; - checkInputs = [ nose pytestCheckHook ]; + nativeCheckInputs = [ nose pytestCheckHook ]; meta = { homepage = "https://networkx.github.io/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nevow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nevow/default.nix index 37586ccfcb..808427e241 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nevow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nevow/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ twisted ]; - checkInputs = [ twisted ]; + nativeCheckInputs = [ twisted ]; checkPhase = '' trial formless nevow diff --git a/third_party/nixpkgs/pkgs/development/python-modules/newversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/newversion/default.nix index f340dc3a1b..f1643b9f21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/newversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/newversion/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix index 90e6a1a020..3e68892c8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses requests-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix index 41b22ee217..18eae73ca0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { orjson ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-error-for-skips diff --git a/third_party/nixpkgs/pkgs/development/python-modules/niaaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/niaaml/default.nix index 39a4c48520..6385b07898 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/niaaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/niaaml/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { toml-adapt -path pyproject.toml -a change -dep scikit-learn -ver X ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/niaarm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/niaarm/default.nix index 7a3eed63bf..eed07e4a38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/niaarm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/niaarm/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { "test_text_mining" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/niapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/niapy/default.nix index bad77441d0..59f8a881a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/niapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/niapy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pandas ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nibabel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nibabel/default.nix index f30f3f56f2..54b92a1787 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nibabel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nibabel/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix index 329aa4d2d0..825f89354e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { tenacity ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix index 60c9f27101..785b881851 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nidaqmx/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { enum34 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pykka ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix index 576724c9c2..f0cbc4398a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "sha256-jajTg12SzXuKbMkkVaSJ1+f1mUz2T8cbzmU+NidzueQ="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "test_clean_confounds" ]; # https://github.com/nilearn/nilearn/issues/2608 # do subset of tests which don't fetch resources pytestFlagsArray = [ "nilearn/connectome/tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nimfa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nimfa/default.nix index eb04e0c4d8..3f6e521047 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nimfa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nimfa/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy scipy ]; - checkInputs = [ matplotlib pytest ]; + nativeCheckInputs = [ matplotlib pytest ]; doCheck = !isPy3k; # https://github.com/marinkaz/nimfa/issues/42 meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix index 1e95b77c18..125667cd04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix @@ -86,7 +86,7 @@ buildPythonPackage rec { xvfbwrapper ] ++ [ (if useNeurdflib then neurdflib else rdflib) ]; - checkInputs = [ + nativeCheckInputs = [ pybids codecov glibcLocales diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nipype/neurdflib.nix b/third_party/nixpkgs/pkgs/development/python-modules/nipype/neurdflib.nix index 8095b0fb04..6fb1ee0456 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nipype/neurdflib.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nipype/neurdflib.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ isodate html5lib sparqlwrapper ]; - checkInputs = [ networkx nose ]; + nativeCheckInputs = [ networkx nose ]; # Python 2 syntax # Failing doctest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix index 183e003d28..183e2dfcfb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nitime/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "sha256-bn2QrbsfqUJim84vH5tt5T6h3YsGAlgu9GCMiNQ0OHQ="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; buildInputs = [ cython ]; propagatedBuildInputs = [ numpy scipy matplotlib networkx nibabel ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix index bfeb3a58ef..25ec70ca9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "YobBihNPbqYYWhe3x0p+BIlEK8R62s/dDFWUzP7fCTI="; }; - checkInputs = [ unittestCheckHook git which ]; + nativeCheckInputs = [ unittestCheckHook git which ]; # ignore tests which are impure DISABLED_TESTS = "network requires_nix_build"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nmapthon2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nmapthon2/default.nix index a19dd946b8..4c8a66c91a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nmapthon2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nmapthon2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-4Na75TdKDywUomJF4tDWUWwCCtcOSxBUMOF7+FDhbpY="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix index bea2d9c2c2..42067f594e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix @@ -7,18 +7,18 @@ buildPythonPackage rec { pname = "nocasedict"; - version = "1.0.4"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fBEdpM79JEQzy2M3ev8IGkD4S92unm83bGfwhsD4Bto="; + sha256 = "sha256-rFUd5pK+aupbQ6w/LDN4DflAATrG3QcY+1Usi1YLpmE="; }; propagatedBuildInputs = [ six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix index 083174c824..3a11c78f34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-SPBn+MuEEkXzTQMSC8G6mQDxOxnLUbzGx77gF/fIdNo="; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/node-semver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/node-semver/default.nix index 276011e65e..6549697f1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/node-semver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/node-semver/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { version = "0.8.1"; pname = "node-semver"; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix index d08fcf4699..ae0259788f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix index 76ed1b1fc2..b1135eba7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "noise" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix index 120aa896aa..4f1389a04a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nomadnet/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.3.1"; + version = "0.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-bpMv7dFX6hQoR8uG8IRy8JaDGLlU50hOPAI6jWmlMWI="; + hash = "sha256-QIme76Y7rhPCooazX+pr5ETbAmShVHZ9polJ964NLFg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/normality/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/normality/default.nix index 2b3f5fd402..208898731b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/normality/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/normality/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pyicu ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose-randomly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose-randomly/default.nix index 94f64028d6..da294bf882 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nose-randomly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nose-randomly/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "7e483a3d79e13ae760d6ade57ae07ae45bb4b223b61a805e958b4c077116c67c"; }; - checkInputs = [ numpy nose ]; + nativeCheckInputs = [ numpy nose ]; checkPhase = if stdenv.isDarwin then '' # Work around "OSError: AF_UNIX path too long" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose-timer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose-timer/default.nix index bbc164c85e..de3bbdc9a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nose-timer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nose-timer/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose ]; - checkInputs = [ + nativeCheckInputs = [ mock nose parameterized diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose_warnings_filters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose_warnings_filters/default.nix index 81e7de8815..6617c85d16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nose_warnings_filters/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nose_warnings_filters/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests -v ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nosejs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nosejs/default.nix index f80953bd2d..7a63713d2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nosejs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nosejs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "0qrhkd3sga56qf6k0sqyhwfcladwi05gl6aqmr0xriiq1sgva5dy"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests -v diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix index 16729ab1ef..94d4f9fc75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { # have been comitted with msgs "wip" though. doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-tornasync ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix index 1415fad396..e1c0210bec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { LC_ALL = "en_US.utf8"; - checkInputs = [ pytestCheckHook glibcLocales ]; + nativeCheckInputs = [ pytestCheckHook glibcLocales ]; propagatedBuildInputs = [ jinja2 tornado ipython_genutils traitlets jupyter-core send2trash diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix index 3ed0d05e93..e98620dd91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notifications-python-client/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ freezegun mock pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notify-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notify-py/default.nix index 971a8cd5cc..61c1c9026e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notify-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notify-py/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "notify-py"; - version = "0.3.39"; + version = "0.3.42"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "ms7m"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-QIK5MCCOsD8SStoh7TRw+l9k28SjChwV2J/T7gMKnAs="; + hash = "sha256-XtjJImH9UwPPZS/Yqs8S5xGXOLBRmJRawzxWXoPWvrM="; }; patches = lib.optionals stdenv.isLinux [ @@ -60,7 +60,7 @@ buildPythonPackage rec { jeepney ]; - checkInputs = [ + nativeCheckInputs = [ pytest ] ++ lib.optionals stdenv.isLinux [ dbus diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notion-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notion-client/default.nix index 839dde55c4..16405ff27e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notion-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notion-client/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { sed -i '/addopts/d' ./setup.cfg ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook anyio pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix index dbf01f3698..d038504205 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nox/default.nix new file mode 100644 index 0000000000..bc84559345 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nox/default.nix @@ -0,0 +1,78 @@ +{ lib +, argcomplete +, buildPythonPackage +, colorlog +, fetchFromGitHub +, fetchpatch +, setuptools +, importlib-metadata +, jinja2 +, packaging +, pytestCheckHook +, pythonOlder +, tox +, typing-extensions +, virtualenv +}: + +buildPythonPackage rec { + pname = "nox"; + version = "2022.11.21"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "wntrblm"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-N70yBZyrtdQvgaJzkskG3goHit8eH0di9jHycuAwzfU="; + }; + + patches = [ + # Remove rogue mocking of py._path, https://github.com/wntrblm/nox/pull/677 + (fetchpatch { + name = "remove-py-pyth.patch"; + url = "https://github.com/wntrblm/nox/commit/44d06b679761e21d76bb96b2b8ffe0ffbe3d4fd0.patch"; + hash = "sha256-KRDVwbBMBd4GdiAcGJyS7DTNUw3Pumt0JO1igx6npnc="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + argcomplete + colorlog + packaging + virtualenv + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + importlib-metadata + ]; + + + checkInputs = [ + jinja2 + tox + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nox" + ]; + + disabledTestPaths = [ + # AttributeError: module 'tox.config' has... + "tests/test_tox_to_nox.py" + ]; + + meta = with lib; { + description = "Flexible test automation for Python"; + homepage = "https://nox.thea.codes/"; + changelog = "https://github.com/wntrblm/nox/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ doronbehar fab ]; + }; +} 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 13e0d28a30..ecf2255b35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nplusone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nplusone/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ flake8 flask-sqlalchemy mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nptyping/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nptyping/default.nix index 78e417c43e..517512f6b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nptyping/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nptyping/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ beartype feedparser invoke 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 f0b6c0dedc..f161cfd154 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 @@ -31,7 +31,7 @@ buildPythonPackage rec { textfsm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ruamel-yaml yamllint diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix index 9809d97f0e..d3d64bcbe2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ntlm-auth/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix index b81ba43c83..4e52fc4dcd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "0wgcl860acbxnq8q9hck147yhxz8pcbqhv9glracfnrsd2qkpgpp"; }; - checkInputs = [ vmprof pyqt4 ]; + nativeCheckInputs = [ vmprof pyqt4 ]; nativeBuildInputs = [ scons ]; propagatedBuildInputs = [ chrpath ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nulltype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nulltype/default.nix index 1f354e4224..f04f9df780 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nulltype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nulltype/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0wpjbsmm0c9ifg9y6cnfz49qq9pa5f99nnqp6wdlv42ymfr3rak4"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix index 9e8c096168..438ee8afba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ docopt ]; - checkInputs = [ delegator-py pytest ]; + nativeCheckInputs = [ delegator-py pytest ]; checkPhase = '' pytest -k 'not cli_with_lang' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix index f67d0be922..07e82c0ca6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { --replace "scipy>=0.16,<=1.7.3" "scipy>=0.16" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 e6b4e591e9..9a9b51aa70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { msgpack ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix index 1b28ac339f..585e539bd6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { python-utils ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix index 3a73b1bf3d..5640c01d64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -75,9 +75,10 @@ in buildPythonPackage rec { enableParallelBuilding = true; - checkInputs = [ + nativeCheckInputs = [ pytest - hypothesis + # "hypothesis" indirectly depends on numpy to build its documentation. + (hypothesis.override { enableDocumentation = false; }) typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix index 6be8e93f54..0ac923f486 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { sphinx ]; - checkInputs = [ + nativeCheckInputs = [ matplotlib pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix index 2ecb598ab5..5870d47ab5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpyro/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nutils/default.nix index 4d85e9bab8..9a3cfb2b48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nutils/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { stringly ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix index 4938f2339e..c6ab97d9c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { tornado ]; - checkInputs = [ + nativeCheckInputs = [ flaky pytest-asyncio pytest-httpbin diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix index 4579be5c3c..d64eed0e20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oath/default.nix index a8740f6857..fed667302f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oath/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "sha256-vWsg0g8sTj9TUj7pACEdynWu7KcvT1qf2NyswXX+HAs="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 4e1b032de0..33d04b78a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { jupyterhub ]; - checkInputs = [ + nativeCheckInputs = [ google-api-python-client google-auth-oauthlib mwoauth diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oauthlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oauthlib/default.nix index 01538f6969..e1d6bbc130 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oauthlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oauthlib/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pyjwt ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/objgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/objgraph/default.nix index 0d2da52f01..ec75d9c452 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/objgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/objgraph/default.nix @@ -1,25 +1,26 @@ { lib , buildPythonPackage , fetchPypi -, isPyPy -, substituteAll -, graphvizPkgs , graphviz -, mock +, graphvizPkgs +, isPyPy +, pytestCheckHook +, pythonOlder +, substituteAll }: buildPythonPackage rec { pname = "objgraph"; version = "3.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.5" || isPyPy; src = fetchPypi { inherit pname version; - sha256 = "4752ca5bcc0e0512e41b8cc4d2780ac2fd3b3eabd03b7e950a5594c06203dfc4"; + hash = "sha256-R1LKW8wOBRLkG4zE0ngKwv07PqvQO36VClWUwGID38Q="; }; - # Tests fail with PyPy. - disabled = isPyPy; - patches = [ (substituteAll { src = ./hardcode-graphviz-path.patch; @@ -27,14 +28,27 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ graphviz ]; + propagatedBuildInputs = [ + graphviz + ]; - checkInputs = [ mock ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "objgraph" + ]; + + pytestFlagsArray = [ + "tests.py" + ]; meta = with lib; { description = "Draws Python object reference graphs with graphviz"; homepage = "https://mg.pov.lt/objgraph/"; + changelog = "https://github.com/mgedmin/objgraph/blob/${version}/CHANGES.rst"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/objsize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/objsize/default.nix new file mode 100644 index 0000000000..18efa2b349 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/objsize/default.nix @@ -0,0 +1,24 @@ +{ lib +, python +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "objsize"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "liran-funaro"; + repo = pname; + rev = version; + hash = "sha256-FgRB7EENwNOlC7ynIRxcwucoywNjko494s75kOp5O+w="; + }; + + meta = with lib; { + description = "Traversal over objects subtree and calculate the total size"; + homepage = "https://github.com/liran-funaro/objsize"; + license = licenses.bsd3; + maintainers = with maintainers; [ ocfox ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix index 361eefdfd7..5d6b1511f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.90.0"; + version = "2.90.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-pDLG8w5YfjmiP5JYDWoSLC0NGTfJ2Zmkz4Ed8zAB1pY="; + hash = "sha256-mh4wLRNZzLU7sWvaVQWF6fexNrXIo8FMJ1u2RtMpE/E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix index 54643bc7f0..51c756db19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-xdist pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix index 805aec6c1e..510d042e72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-uGkj2Z8mLg51IV+FOqwZl1hT7zVyjmD1CcY/VbH4tKk="; }; - checkInputs = [ + nativeCheckInputs = [ repeated-test ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/odfpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/odfpy/default.nix index 531a80759a..ff874ac6fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/odfpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/odfpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ defusedxml ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/odp-amsterdam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/odp-amsterdam/default.nix index 30c9814490..3021333091 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "odp-amsterdam"; - version = "5.0.0"; + version = "5.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-odp-amsterdam"; rev = "refs/tags/v${version}"; - hash = "sha256-zVnM4KYH4R6n2y9IAaYGOZVPnc8RuT/S2bseKJBO9bg="; + hash = "sha256-gRfOZwUguQgoROnqQuQWKOgubR3wjcf7Yfje2+4+CB0="; }; postPatch = '' @@ -38,7 +38,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook @@ -50,7 +50,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python client for getting garage occupancy in Amsterdam"; - homepage = "https://github.com/klaasnicolaas/python-garages-amsterdam"; + homepage = "https://github.com/klaasnicolaas/python-odp-amsterdam"; + changelog = "https://github.com/klaasnicolaas/python-odp-amsterdam/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oemthermostat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oemthermostat/default.nix index 7a2ecfc26c..b97ddf64eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oemthermostat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oemthermostat/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix index f16924b5ac..d07bf32831 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ofxtools/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-NsImnD+erhpakQnl1neuHfSKiV6ipNBMPGKMDM0gwWc="; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # override $HOME directory: # error: [Errno 13] Permission denied: '/homeless-shelter' checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/olefile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/olefile/default.nix index ff0dc7c1c9..6bf379aacd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/olefile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/olefile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "133b031eaf8fd2c9399b78b8bc5b8fcbe4c31e85295749bb17a87cba8f3c3964"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oletools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oletools/default.nix index 3ba66ac38e..d7df0523ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oletools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oletools/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix index 7046e6ab17..245c60fc7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pydevd pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omnikinverter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/omnikinverter/default.nix index 914267ea86..7bc4f64086 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/omnikinverter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/omnikinverter/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onetimepass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onetimepass/default.nix index 220265fbc0..6b339294a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onetimepass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onetimepass/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ timecop ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix index a266fb4e6b..a6f290633e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ nbval pytestCheckHook pytest-runner diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix index 89fefb38de..d19702f214 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnxconverter-common/default.nix @@ -29,7 +29,7 @@ buildPythonPackage { onnx ]; - checkInputs = [ + nativeCheckInputs = [ onnxruntime unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/open-meteo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/open-meteo/default.nix index 520af3062e..4aec00f312 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/open-meteo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/open-meteo/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai-whisper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openai-whisper/default.nix index 73327d314a..b30f218193 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai-whisper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai-whisper/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "whisper"; - version = "unstable-2022-09-30"; + version = "20230124"; format = "setuptools"; src = fetchFromGitHub { owner = "openai"; repo = pname; - rev = "60132ade70e00b843d93542fcb37b58c0d8bf9e7"; - hash = "sha256-4mhlCvewA0bVo5bq2sbSEKHq99TQ6jUauiCUkdRSdas="; + rev = "refs/tags/v${version}"; + hash = "sha256-+3fs/EXK5NGlISuMTk7r2ZZ4tNFKbNFNkVS2LmHBvwk="; }; patches = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix index 9a5e34d5dc..d4cedc80be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -1,12 +1,14 @@ { lib , buildPythonPackage , fetchFromGitHub +, aiohttp , matplotlib , numpy , openpyxl , pandas , pandas-stubs , plotly +, pytest-asyncio , pytest-mock , pytestCheckHook , pythonOlder @@ -16,11 +18,12 @@ , tqdm , typing-extensions , wandb +, withOptionalDependencies ? false }: buildPythonPackage rec { pname = "openai"; - version = "0.25.0"; + version = "0.26.4"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -29,37 +32,44 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - hash = "sha256-bwv7lpdDYlk+y3KBjv7cSvaGr3v02riNCUfPFh6yv1I="; + hash = "sha256-WcUH6zbb5kIH0qk67M+lUx9CbMEbYDXQm6IVzzuQo9w="; }; propagatedBuildInputs = [ - numpy - openpyxl - pandas - pandas-stubs + aiohttp requests tqdm + ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions - ]; + ] ++ lib.optionals withOptionalDependencies (builtins.attrValues { + inherit (passthru.optional-dependencies) embeddings wandb; + }); passthru.optional-dependencies = { - wandb = [ - wandb + datalib = [ + numpy + openpyxl + pandas + pandas-stubs ]; embeddings = [ matplotlib plotly scikit-learn tenacity - ]; + ] ++ passthru.optional-dependencies.datalib; + wandb = [ + wandb + ] ++ passthru.optional-dependencies.datalib; }; pythonImportsCheck = [ "openai" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook + pytest-asyncio pytest-mock ]; @@ -72,6 +82,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Requires a real API key "openai/tests/test_endpoints.py" + "openai/tests/asyncio/test_endpoints.py" # openai: command not found "openai/tests/test_file_cli.py" "openai/tests/test_long_examples_validator.py" 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 8a2bcc444d..496dceeaab 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 @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.16.4"; + version = "0.16.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-16DM9HrptQmj95OOM5XSGIEKzxrCkN3sU/7o8Yh0l6s="; + hash = "sha256-xXSZ9qxjmeIyYIWQubJbJxkXUdOu/WSSBddIWsVaH8k="; }; postPatch = '' @@ -79,7 +79,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix index 2060b2cf47..d3c121ed94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; - checkInputs = [ pytestCheckHook pytest-cov ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov ]; pythonImportsCheck = [ "openapi_schema_validator" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix index 7ca4be89a3..371661e2fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { sed -i '/--cov/d' pyproject.toml ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openerz-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openerz-api/default.nix index 9cbe89e26a..7fe8de134b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openerz-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openerz-api/default.nix @@ -9,30 +9,40 @@ buildPythonPackage rec { pname = "openerz-api"; - version = "0.1.0"; + version = "0.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "misialq"; repo = pname; - rev = "v${version}"; - sha256 = "10kxsmaz2rn26jijaxmdmhx8vjdz8hrhlrvd39gc8yvqbjwhi3nw"; + rev = "refs/tags/v${version}"; + hash = "sha256-6q0mKWyTTlNJ/DCeAsck1meM5dQovYBcV2EqmjlABvc="; }; propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook testfixtures ]; - pythonImportsCheck = [ "openerz_api" ]; + pythonImportsCheck = [ + "openerz_api" + ]; + + disabledTests = [ + # Assertion issue + "test_sensor_make_api_request" + ]; meta = with lib; { description = "Python module to interact with the OpenERZ API"; homepage = "https://github.com/misialq/openerz-api"; + changelog = "https://github.com/misialq/openerz-api/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openevsewifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openevsewifi/default.nix index 4241927c51..98beb5ea18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openevsewifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openevsewifi/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ requests-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix index 8afc16f86d..a8239d1d4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-5HgFYnrrz4YO207feYexMJwbNjLzdQU47ZYrvMO9dEk="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ jdcal et_xmlfile lxml ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix index f5e1ab81fb..9f93d566b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openrouteservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1d5qbygb81fhpwfdm1a118r3xv45xz9n9avfkgxkvw1n8y6ywz2q"; }; - checkInputs = [ pytestCheckHook responses ]; + nativeCheckInputs = [ pytestCheckHook responses ]; disabledTests = [ # touches network diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opensearch-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opensearch-py/default.nix new file mode 100644 index 0000000000..7f9fd5c85b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/opensearch-py/default.nix @@ -0,0 +1,59 @@ +{ aiohttp +, botocore +, buildPythonPackage +, certifi +, fetchFromGitHub +, lib +, mock +, pytest-asyncio +, pytestCheckHook +, pyyaml +, requests +, urllib3 +}: + +buildPythonPackage rec { + pname = "opensearch-py"; + version = "2.1.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "opensearch-project"; + repo = "opensearch-py"; + rev = "refs/tags/v${version}"; + hash = "sha256-uJ6fdRPDK76qKHE4E6dI01vKgvfqbc6A1RCwnOtuOTY="; + }; + + propagatedBuildInputs = [ + botocore + certifi + requests + urllib3 + ]; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + pyyaml + ] ++ passthru.optional-dependencies.async; + + disabledTestPaths = [ + # require network + "test_opensearchpy/test_async/test_connection.py" + "test_opensearchpy/test_async/test_server" + "test_opensearchpy/test_connection.py" + "test_opensearchpy/test_server" + "test_opensearchpy/test_server_secured" + ]; + + passthru.optional-dependencies.async = [ aiohttp ]; + + meta = { + description = "Python low-level client for OpenSearch"; + homepage = "https://github.com/opensearch-project/opensearch-py"; + changelog = "https://github.com/opensearch-project/opensearch-py/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mcwitt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opensfm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opensfm/default.nix index 9e20d45097..65931f770a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opensfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opensfm/default.nix @@ -99,7 +99,7 @@ buildPythonPackage rec { xmltodict cloudpickle ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; dontUseCmakeBuildDir = true; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openshift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openshift/default.nix index 497af2e735..6a58985845 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openshift/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openshift/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pythonImportsCheck = ["openshift"]; - checkInputs = [ + nativeCheckInputs = [ pytest-bdd pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opensimplex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opensimplex/default.nix index a30933e806..bcbbd28178 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opensimplex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opensimplex/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/test_opensimplex.py" ]; pythonImportsCheck = [ "opensimplex" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix index 986fa493bf..f514791fd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "0.103.0"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-T58RiYZgOWdDXzl2s+BZlQpxvY5BqDFsyK+y2WaKB0E="; + hash = "sha256-z2vVGeMB94S/51bB+Tf47ByvP9BWQ1TzQHpFGS8FR8w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix index 31a4299087..aa96ed5ae8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix @@ -23,7 +23,7 @@ buildPythonPackage { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ ddt hacking jsonschema diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openstep-plist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openstep-plist/default.nix index 8fb7d76764..a85be4dc2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openstep-plist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openstep-plist/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm cython ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "openstep_plist" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix index e5d37fcfba..fbd3b2852e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "opentimestamps"; - version = "0.4.3"; + version = "0.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "opentimestamps"; repo = "python-opentimestamps"; rev = "python-opentimestamps-v${version}"; - hash = "sha256-ZTZ7D3NGhO18IxKqTMFBe6pDvqtGR+9w0cgs6VAHtwg="; + hash = "sha256-clG/5NAPmmmoj4b3LdVwl58DHg1EFMIMu+erx+GT+NE="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { pycryptodomex ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opentracing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentracing/default.nix index bf7ec6a938..f21bf4aa78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opentracing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opentracing/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional isPy27 futures; - checkInputs = [ + nativeCheckInputs = [ gevent mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix index 37f389e76f..086649173f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openwrt-luci-rpc/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opt-einsum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opt-einsum/default.nix index 6e4eabeb68..fd51ead5a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opt-einsum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opt-einsum/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optax/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/optax/tests.nix index fedff61302..59fed40bdf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/optax/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/optax/tests.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ dm-haiku pytest-xdist pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix index f4dfcf4f58..c921feadd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { sha256 = "sha256-TfAWL81a7GIePkPm+2uXinBP5jwnhWCZPp5GJjXOC6g="; }; - checkInputs = [ + nativeCheckInputs = [ pytest mock bokeh diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opuslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opuslib/default.nix index a9c33f5aba..4ea7c8e7ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opuslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opuslib/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { description = "Python bindings to the libopus, IETF low-delay audio codec"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opytimark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opytimark/default.nix index 059c5555b9..69eb61f795 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opytimark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opytimark/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - pname = "opytimizer"; + pname = "opytimark"; version = "1.0.8"; format = "setuptools"; @@ -32,7 +32,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oralb-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oralb-ble/default.nix index 394eb8c9a4..e373034c2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oralb-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oralb-ble/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { home-assistant-bluetooth ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ordered-set/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ordered-set/default.nix index 8ea71fd2d9..9859e10651 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ordered-set/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ordered-set/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orderedmultidict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orderedmultidict/default.nix index 7c37cc7aa5..f2688d46b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orderedmultidict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orderedmultidict/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1bc2v0yflsxjyyjx4q9wqx0j3bvzcw9z87d5pz4iqac7bsxhn1q4"; }; - checkInputs = [ flake8 ]; + nativeCheckInputs = [ flake8 ]; propagatedBuildInputs = [ six ] ++ lib.optionals (pythonOlder "3.8") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix index 2e3faed87f..4890614ed5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix @@ -16,20 +16,20 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.8.2"; + version = "3.8.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; repo = pname; rev = version; - hash = "sha256-jiyYCjZ6c62zmm4Ge9KbEI8/PtPunu79HVODyoHFdSg="; + hash = "sha256-XQBiE8hmLC/AIRt0eJri/ilPHUEYiOxd0onRBQsx+pM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-z1B0oSp37OGJ21Q57UUfmSRfUWLftiiBayN9y6yKNyg="; + hash = "sha256-O2W9zO7qHWG+78T+uECICAmecaSIbTTJPktJIPZYElE="; }; format = "pyproject"; @@ -43,7 +43,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - checkInputs = [ + nativeCheckInputs = [ numpy psutil pytestCheckHook @@ -57,6 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"; homepage = "https://github.com/ijl/orjson"; + changelog = "https://github.com/ijl/orjson/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; platforms = platforms.unix; maintainers = with maintainers; [ misuzu ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ormar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ormar/default.nix index 873fe5b072..90b56b3cd4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ormar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ormar/default.nix @@ -8,8 +8,10 @@ , databases , fastapi , fetchFromGitHub +, httpx , importlib-metadata , mysqlclient +, nest-asyncio , orjson , poetry-core , psycopg2 @@ -18,13 +20,14 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , sqlalchemy , typing-extensions }: buildPythonPackage rec { pname = "ormar"; - version = "0.12.0"; + version = "0.12.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -33,50 +36,84 @@ buildPythonPackage rec { owner = "collerek"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-B6dC9+t/pe7vsPb7rkGAbJWLfCAF7lIElFvt1pUu5yA="; + hash = "sha256-7d0vmYDN1EjzNWmylb/As4ywo8YYzQ88UwigIsVnwMM="; }; + pythonRelaxDeps = [ + "databases" + "pydantic" + "SQLAlchemy" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ - aiomysql - aiosqlite - asyncpg - cryptography databases - orjson psycopg2 pydantic sqlalchemy + psycopg2 ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions importlib-metadata ]; - checkInputs = [ - aiomysql - aiopg - aiosqlite - asyncpg - fastapi - mysqlclient - psycopg2 - pymysql - pytest-asyncio + passthru.optional-dependencies = { + postgresql = [ + asyncpg + ]; + postgres = [ + asyncpg + ]; + aiopg = [ + aiopg + ]; + mysql = [ + aiomysql + ]; + sqlite = [ + aiosqlite + ]; + orjson = [ + orjson + ]; + crypto = [ + cryptography + ]; + all = [ + aiomysql + aiopg + aiosqlite + asyncpg + cryptography + mysqlclient + orjson + pymysql + ]; + }; + + nativeCheckInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'SQLAlchemy = ">=1.3.18,<1.4.42"' 'SQLAlchemy = ">=1.3.18"' \ - --replace 'databases = ">=0.3.2,!=0.5.0,!=0.5.1,!=0.5.2,!=0.5.3,<0.6.2"' 'databases = ">=0.5.5"' - ''; + checkInputs = [ + fastapi + httpx + nest-asyncio + pytest-asyncio + ] ++ passthru.optional-dependencies.all; + + disabledTestPaths = [ + "benchmarks/test_benchmark_*.py" + ]; disabledTests = [ # TypeError: Object of type bytes is not JSON serializable "test_bulk_operations_with_json" + "test_all_endpoints" # Tests require a database "test_model_multiple_instances_of_same_table_in_schema" "test_load_all_multiple_instances_of_same_table_in_schema" @@ -124,6 +161,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async ORM with fastapi in mind and pydantic validation"; homepage = "https://github.com/collerek/ormar"; + changelog = "https://github.com/collerek/ormar/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ andreasfelix ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/os-service-types/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/os-service-types/tests.nix index 4cb93d7974..5958d824d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/os-service-types/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/os-service-types/tests.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ os-service-types keystoneauth1 oslotest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix index 1e86f11e41..f2b789f26d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { simplejson ]; - checkInputs = [ + nativeCheckInputs = [ requests-mock stestr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osc/default.nix index 8a5812bcf2..07157162f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/osc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; buildInputs = [ bashInteractive ]; # needed for bash-completion helper - checkInputs = [ rpm diffstat ]; + nativeCheckInputs = [ rpm diffstat ]; propagatedBuildInputs = [ urllib3 cryptography ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oscpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oscpy/default.nix index 7b2be6ab77..894e884a4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oscpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oscpy/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "oscpy" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix index e4735aa433..3f368ba7f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { asn1crypto ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix index 8a4d592682..a714cd3a22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { # tests hang for unknown reason and time the build out doCheck = false; - checkInputs = [ + nativeCheckInputs = [ eventlet fixtures oslotest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/tests.nix index c94eb2941b..b2a730928b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/tests.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ oslo-config docutils oslo-log diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-context/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-context/default.nix index e558749b84..fe4e7363cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-context/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-context/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pbr ]; - checkInputs = [ + nativeCheckInputs = [ oslotest stestr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix index f9f0883b81..e1a4a368a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "12.3.0"; + version = "12.3.1"; src = fetchPypi { pname = "oslo.db"; inherit version; - sha256 = "sha256-egL5k/Y99DLYhGsvC3t0dluwFJRe21sBWI5qG5Gzuck="; + sha256 = "sha256-Gd7FAkDwj7q1rnZzVOtZF1oUdz8CcdeDpX/KxJ5KbaE="; }; nativeBuildInputs = [ pbr ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { testscenarios ]; - checkInputs = [ + nativeCheckInputs = [ oslotest stestr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix index cdb6767c7a..7a5aee1e16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-i18n/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pbr ]; - checkInputs = [ + nativeCheckInputs = [ oslotest stestr testscenarios diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix index 87e2b969f7..d981114b73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-log/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pyinotify ]; - checkInputs = [ + nativeCheckInputs = [ eventlet oslotest pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix index 4b33bb06dc..a94c79e9ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ msgpack oslo-utils pytz ]; - checkInputs = [ oslotest stestr ]; + nativeCheckInputs = [ oslotest stestr ]; checkPhase = '' stestr run diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix index 4d2c1e5754..91a71620bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ ddt eventlet fixtures diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslotest/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslotest/tests.nix index 542e9467d1..fb18e64bb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslotest/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslotest/tests.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ oslotest oslo-config stestr diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix index 9f26c06eaf..330385625d 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osmnx/default.nix @@ -1,27 +1,63 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, geopandas, matplotlib, networkx, numpy -, pandas, requests, Rtree, shapely, folium, scikit-learn, scipy, gdal, rasterio}: +{ lib +, buildPythonPackage +, fetchFromGitHub +, folium +, gdal +, geopandas +, matplotlib +, networkx +, numpy +, pandas +, pythonOlder +, rasterio +, requests +, Rtree +, scikit-learn +, scipy +, shapely +}: buildPythonPackage rec { pname = "osmnx"; - version = "1.2.2"; + version = "1.3.0"; + format = "setuptools"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = "gboeing"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-+dUv1QrUmCIOCyUyjYX1kJtZrPuSp3t9xz/sRV7ppgA="; + owner = "gboeing"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-17duWrg48Qb4ojYYFX4HBpPLeVgHn1WV84KVATvBnzY="; }; - propagatedBuildInputs = [ geopandas matplotlib networkx numpy pandas requests Rtree shapely folium scikit-learn scipy gdal rasterio ]; + propagatedBuildInputs = [ + geopandas + matplotlib + networkx + numpy + pandas + requests + Rtree + shapely + folium + scikit-learn + scipy + gdal + rasterio + ]; - # requires network + # Tests require network doCheck = false; - pythonImportsCheck = [ "osmnx" ]; + + pythonImportsCheck = [ + "osmnx" + ]; meta = with lib; { description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX."; homepage = "https://github.com/gboeing/osmnx"; + changelog = "https://github.com/gboeing/osmnx/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ospd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ospd/default.nix index c4fe8be0b7..4525d45575 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ospd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ospd/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/osqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/osqp/default.nix index fc001c52a5..7f15cc1898 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/osqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/osqp/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ cvxopt pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oss2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oss2/default.nix index 0ed3a0a3bd..e7f2856771 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oss2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oss2/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ aliyun-python-sdk-sts mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/outcome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/outcome/default.nix index 0150f1f5a2..474b0ab1bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/outcome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/outcome/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-b4K9PeRdowPPH3ceyvoWM3UKNYQ2qLtg4Goc63RdJnI="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ attrs ]; # Has a test dependency on trio, which depends on outcome. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/overpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/overpy/default.nix index bd50ddb502..37abe95511 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/overpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/overpy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ovh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ovh/default.nix index b9ab287260..9b07161238 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ovh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ovh/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - checkInputs = [ + nativeCheckInputs = [ mock nose yanc diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix index 005557a2a6..1aaf947103 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ovoenergy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ovoenergy"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "timmo001"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZbLs8w0qeaV2qWP08FKnlZ3fefj15Bw2A2bGpL6/d0I="; + hash = "sha256-oeNwBmzlkE8JewSwuFG8OYigyispP4xdwO3s2CAcfW4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oyaml/default.nix index e2519c0b97..6e43b4c0e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oyaml/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix index bb3f750b2c..219bb1f291 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "p1monitor"; - version = "2.2.0"; + version = "2.2.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-p1monitor"; - rev = "refs/tags/${version}"; - hash = "sha256-HaTwqTKqTuXZVt2fhKXyXEEYZCSau/YY6DRg6YHIhOI="; + rev = "refs/tags/v${version}"; + hash = "sha256-jmSSejflez3AmIp7PY6m0+vW8YZuNgUj8lwyu0roLYc="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for interacting with the P1 Monitor"; homepage = "https://github.com/klaasnicolaas/python-p1monitor"; - changelog = "https://github.com/klaasnicolaas/python-p1monitor/releases/tag/${version}"; + changelog = "https://github.com/klaasnicolaas/python-p1monitor/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix index 135ab6fdbc..a1764765ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-XJEzT5Qs1V1F6wxn3TOaU175DiXwW57AFq0YjtDvkEg="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix index c7587cb5c5..237f43bc7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packaging/default.nix @@ -27,7 +27,7 @@ let propagatedBuildInputs = [ pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pretend ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix index f27b0130a7..4ae637f5bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-runner requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packvers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packvers/default.nix index aae2c02463..5ec3bd628c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packvers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packvers/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ pretend pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pafy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pafy/default.nix deleted file mode 100644 index c657a2fa1b..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pafy/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, buildPythonPackage, youtube-dl, fetchPypi }: -buildPythonPackage rec { - pname = "pafy"; - version = "0.5.5"; - - src = fetchPypi { - inherit pname version; - sha256 = "364f1d1312c89582d97dc7225cf6858cde27cb11dfd64a9c2bab1a2f32133b1e"; - }; - - # No tests included in archive - doCheck = false; - - propagatedBuildInputs = [ youtube-dl ]; - - meta = with lib; { - description = "A library to download YouTube content and retrieve metadata"; - homepage = "https://github.com/mps-youtube/pafy"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ odi ]; - }; -} - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix index e25f547486..b94428ebbe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paho-mqtt/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ] ++ lib.optionals (!isPy3k) [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/palettable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/palettable/default.nix index dce72bb74b..a613701449 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/palettable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/palettable/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "72feca71cf7d79830cd6d9181b02edf227b867d503bec953cf9fa91bf44896bd"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pamqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pamqp/default.nix index 64b331db99..62c568e648 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pamqp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pamqp/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-zvvRoGMNP4NMy3Etjif5MYUPdRqmQXATbFgxaPp1TaM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix index 9719b918b6..b45689afb1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas-stubs/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { types-pytz ]; - checkInputs = [ + nativeCheckInputs = [ jinja2 matplotlib openpyxl diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix index a48d6b82d1..6c6fb3b29c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales hypothesis jinja2 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/panflute/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/panflute/default.nix index a0c4930ab0..981e52a07c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/panflute/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/panflute/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec{ pname = "panflute"; - version = "2.2.3"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AJMz+gt8Wa45aFZSLm15RjiiJlJnkWC4Lobk8o8Pu8Y="; + hash = "sha256-zv2d/EjM2XMqU9tXYQcB0igG2jl6ipflzI3AcLVYZco="; }; propagatedBuildInputs = [ @@ -30,6 +30,7 @@ buildPythonPackage rec{ meta = with lib; { description = "Pythonic alternative to John MacFarlane's pandocfilters, with extra helper functions"; homepage = "http://scorreia.com/software/panflute"; + changelog = "https://github.com/sergiocorreia/panflute/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ synthetica ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix index d9de15ad76..9afafa5c66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix index b33f65bad5..8e84896079 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix @@ -27,7 +27,6 @@ , tqdm , typing-extensions , whoosh -, xdg-utils }: buildPythonPackage rec { @@ -70,19 +69,15 @@ buildPythonPackage rec { ]; postPatch = '' + # Remove when https://github.com/papis/papis/pull/478 lands in upstream substituteInPlace setup.py \ - --replace "isbnlib>=3.9.1,<3.10" "isbnlib>=3.9" + --replace "etc/bash_completion.d/" "share/bash-completion/completions/" substituteInPlace setup.cfg \ --replace "--cov=papis" "" ''; - # Tests are failing on Python > 3.9 - doCheck = !stdenv.isDarwin && !(pythonAtLeast "3.10"); - - checkInputs = ([ + checkInputs = [ pytestCheckHook - ]) ++ [ - xdg-utils ]; preCheck = '' @@ -106,6 +101,8 @@ buildPythonPackage rec { "test_get_data" "test_validate_arxivid" "test_yaml" + ] ++ lib.optionals stdenv.isDarwin [ + "test_default_opener" ]; pythonImportsCheck = [ @@ -115,7 +112,8 @@ buildPythonPackage rec { meta = with lib; { description = "Powerful command-line document and bibliography manager"; homepage = "https://papis.readthedocs.io/"; + changelog = "https://github.com/papis/papis/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with maintainers; [ nico202 teto ]; + maintainers = with maintainers; [ nico202 teto marsam ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix index 76095f62e8..6338c46399 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-XVHYx0M/BLjNNneObxygPHtid65ti7nctKsUMF21fmw="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parameter-expansion-patched/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parameter-expansion-patched/default.nix index 4f2c5eaf60..19149d8db2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parameter-expansion-patched/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parameter-expansion-patched/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix index 5ec4421ec8..a608383671 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix @@ -1,39 +1,50 @@ { lib , buildPythonPackage , fetchPypi -, glibcLocales -, isPy3k , mock , nose +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "parameterized"; version = "0.8.1"; - disable = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Qbv/N9YYZDD3f5ANd35btqJJKKHEb7HeaS+LUriDO1w="; + hash = "sha256-Qbv/N9YYZDD3f5ANd35btqJJKKHEb7HeaS+LUriDO1w="; }; checkInputs = [ - nose mock - glibcLocales + nose + pytestCheckHook ]; - checkPhase = '' - runHook preCheck - LC_ALL="en_US.UTF-8" nosetests -v - runHook postCheck - ''; + pytestFlagsArray = [ + "parameterized/test.py" + ]; - pythonImportsCheck = [ "parameterized" ]; + disabledTests = [ + # Tests seem outdated + "test_method" + "test_with_docstring_0_value1" + "test_with_docstring_1_v_l_" + "testCamelCaseMethodC" + ]; + + pythonImportsCheck = [ + "parameterized" + ]; meta = with lib; { description = "Parameterized testing with any Python test framework"; homepage = "https://github.com/wolever/parameterized"; + changelog = "https://github.com/wolever/parameterized/blob/v${version}/CHANGELOG.txt"; license = licenses.bsd2; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix index bcdca9cf64..e2d94ac025 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { --replace "more_itertools~=8.10" "more_itertools" ''; - checkInputs = [ + nativeCheckInputs = [ numpy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix index 616dad5e8c..a578566019 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { invoke = [ invoke ]; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paramz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paramz/default.nix index 99065aa199..5fe452d204 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paramz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paramz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy scipy six decorator ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # Ran 113 tests in 3.082s checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paranoid-crypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paranoid-crypto/default.nix index e7bd9c5848..f4ee6d2fe0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paranoid-crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paranoid-crypto/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { protobuf ]; - checkInputs = [ + nativeCheckInputs = [ fpylll pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix index 28f69b4320..6e33c6f520 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ aiofiles pytest-asyncio pytest-localserver diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parquet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parquet/default.nix index 3be0cce9fa..8950352665 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parquet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parquet/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { thriftpy2 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix index 3356853e8a..8dc5ded974 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix index 4b42071f01..fab03550fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/Test*.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsel/default.nix index 9c70561cd3..ff90cfa74a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsel/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { w3lib ]; - checkInputs = [ + nativeCheckInputs = [ psutil pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix index f22b1b605e..5a51270e20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { regex ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix index 16313ab16e..bd2e3ad90a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parso/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-jAe+KQu1nwNYiRWSHinopQACrK8s3F+g4BFPkXCfr6A="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = lib.optionals (pythonAtLeast "3.10") [ # python changed exception message format in 3.10, 3.10 not yet supported diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix index 9083953009..74e62d1ce0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-FislrLb+u4T5m/eEER7kazZHJKEwPHe+Vg/YDJp4PyM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/partd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/partd/default.nix index 7f6fa7b510..2e62b2ee59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/partd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/partd/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-zpGrzcYXjWaLyqQxeRpakX2QI0HLGT9UP+RF1JRmBIU="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ locket numpy pandas pyzmq toolz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix index a804ed19df..aaa62ada8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix @@ -1,56 +1,66 @@ { lib +, attrs , buildPythonPackage , fetchFromGitHub , fetchPypi -, setuptools-scm -, attrs -, deprecated +, hatch-vcs +, hatchling , hepunits -, pytestCheckHook -, tabulate , pandas +, pytestCheckHook +, pythonOlder +, setuptools-scm +, tabulate }: buildPythonPackage rec { pname = "particle"; - version = "0.21.0"; + version = "0.21.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SDdIg05+gfLNaQ+glitTf3Z/6K9HBci62mjIu9rIoX0="; + hash = "sha256-Mw9IVQoXZU8ByU6OI2Wtmo3PJuVz6KzzH7I+pPYkssQ="; }; + + postPatch = '' + # Disable benchmark tests, so we won't need pytest-benchmark and pytest-cov + # as dependencies + substituteInPlace pyproject.toml \ + --replace '"--benchmark-disable",' "" + ''; + nativeBuildInputs = [ - setuptools-scm + hatch-vcs + hatchling ]; propagatedBuildInputs = [ attrs - deprecated hepunits ]; + nativeCheckInputs = [ + pytestCheckHook + tabulate + pandas + ]; + pythonImportsCheck = [ "particle" ]; - preCheck = '' - # Disable benchmark tests, so we won't need pytest-benchmark and pytest-cov - # as dependencies - substituteInPlace pyproject.toml \ - --replace '"--benchmark-disable", ' "" - rm tests/particle/test_performance.py - ''; - - checkInputs = [ - pytestCheckHook - tabulate - pandas + disabledTestPaths = [ + "tests/particle/test_performance.py" ]; - meta = { - description = "Package to deal with particles, the PDG particle data table, PDGIDs, etc."; + meta = with lib; { + description = "Package to deal with particles, the PDG particle data table and others"; homepage = "https://github.com/scikit-hep/particle"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ doronbehar ]; + changelog = "https://github.com/scikit-hep/particle/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ doronbehar ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parver/default.nix index 7ce7a7a388..925fa6febf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parver/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis pretend diff --git a/third_party/nixpkgs/pkgs/development/python-modules/passlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/passlib/default.nix index 2f9e2d0c4b..f18307c50b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/passlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/passlib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { totp = [ cryptography ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.argon2 ++ passthru.optional-dependencies.bcrypt diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix index 9186cef3ef..e388adfb1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # broken test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix index 07705d62b3..03b7657190 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pastedeploy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-9/8aM/G/EdapCZJlx0ZPzNbmw2uYjA1zGbNWJAWoeCU="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Load, configure, and compose WSGI applications and servers"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pastel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pastel/default.nix index 39953306fb..ed91aaf400 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pastel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pastel/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "e6581ac04e973cac858828c6202c1e1e81fee1dc7de7683f3e1ffe0bfd8a573d"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pastescript/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pastescript/default.nix index ab99f7e585..27933066c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pastescript/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pastescript/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { # test suite seems to unset PYTHONPATH doCheck = false; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/path-and-address/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/path-and-address/default.nix index bd71ffad0f..a01c798615 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/path-and-address/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/path-and-address/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0b0afpsaim06mv3lhbpm8fmawcraggc11jhzr6h72kdj1cqjk5h6"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix index 0f8a96be94..93f1fbcabe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathable/default.nix index 0f81f87aa6..789162b1fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathable/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -39,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for object-oriented paths"; homepage = "https://github.com/p1c2u/pathable"; + changelog = "https://github.com/p1c2u/pathable/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathlib/default.nix index b29a5bae8e..4ec9da43a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathlib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = { description = "Object-oriented filesystem paths"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix index f0f0163652..f4b7c6e05d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ] ++ lib.optionals (pythonOlder "3.5") [ scandir typing ]; - checkInputs = [ glibcLocales ] + nativeCheckInputs = [ glibcLocales ] ++ lib.optional (pythonOlder "3.3") mock; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathy/default.nix index d937c0a431..feb347b797 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathy/default.nix @@ -12,36 +12,27 @@ buildPythonPackage rec { pname = "pathy"; - version = "0.6.1"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "838624441f799a06b446a657e4ecc9ebc3fdd05234397e044a7c87e8f6e76b1c"; + hash = "sha256-TNbnG0zV/4dc+7lJrZ+lUZ2NHb5p1fwdGyOqPLBJYYs="; }; propagatedBuildInputs = [ + google-cloud-storage smart-open typer - google-cloud-storage ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; - patches = [ - # Support for smart-open >= 6.0.0, https://github.com/justindujardin/pathy/pull/71 - (fetchpatch { - name = "support-later-smart-open.patch"; - url = "https://github.com/justindujardin/pathy/commit/ba1c23df6ee5d1e57bdfe845ff6a9315cba3df6a.patch"; - sha256 = "sha256-V1i4tx73Xkdqb/wZhQIv4p6FVpF9SEfDhlBkwaaRE3w="; - }) - ]; - disabledTestPaths = [ # Exclude tests that require provider credentials "pathy/_tests/test_clients.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/patiencediff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/patiencediff/default.nix index 70a856170c..4c5c0744b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/patiencediff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/patiencediff/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix index cbc3a05044..f23521ea21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { --replace "path = None" 'path = os.environ["PATH"] + ":${lib.makeBinPath compression-utilities}"' ''; - checkInputs = [ pytestCheckHook ] ++ compression-utilities; + nativeCheckInputs = [ pytestCheckHook ] ++ compression-utilities; disabledTests = [ "test_unzip" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/patsy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/patsy/default.nix index 0f607df1de..e4d389022d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/patsy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/patsy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paver/default.nix index 8721ef3dd6..d46d6eaa29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/paver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/paver/default.nix @@ -1,33 +1,53 @@ { lib , buildPythonPackage -, fetchPypi -, nose , cogapp +, fetchPypi , mock +, nose +, pytestCheckHook +, pythonOlder +, six , virtualenv }: buildPythonPackage rec { + pname = "paver"; version = "1.3.4"; - pname = "Paver"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "d3e6498881485ab750efe40c5278982a9343bc627e137b11adced627719308c7"; + pname = "Paver"; + inherit version; + hash = "sha256-0+ZJiIFIWrdQ7+QMUniYKpNDvGJ+E3sRrc7WJ3GTCMc="; }; - buildInputs = [ cogapp mock virtualenv ]; + propagatedBuildInputs = [ + six + ]; - propagatedBuildInputs = [ nose ]; + checkInputs = [ + cogapp + mock + nose + pytestCheckHook + virtualenv + ]; - # the tests do not pass - doCheck = false; + pythonImportsCheck = [ + "paver" + ]; + + disabledTestPaths = [ + # Test depends on distutils + "paver/tests/test_setuputils.py" + ]; meta = with lib; { description = "A Python-based build/distribution/deployment scripting tool"; - homepage = "https://github.com/paver/paver"; + homepage = "https://github.com/paver/paver"; + license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pbr/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/pbr/tests.nix index b047512318..47be8ef19f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pbr/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pbr/tests.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pythonOutputDistPhase() { touch $dist; } ''; - checkInputs = [ + nativeCheckInputs = [ pbr build git diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pcapy-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pcapy-ng/default.nix index 7fec65bfb5..da490bd304 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pcapy-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pcapy-ng/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { libpcap ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdfminer-six/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdfminer-six/default.nix index ec434b3dfb..a0b7d76564 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdfminer-six/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdfminer-six/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { "pdfminer.high_level" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix index aaffa0f938..b61a22cb51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pdfminer-six chardet ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { inherit (src.meta) homepage; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix index 94af38104c..50f6be3be6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { git config --global user.email nobody@example.com ''; - checkInputs = [ + nativeCheckInputs = [ setuptools pytestCheckHook git diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix index 2572b8c046..c8813208d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { markupsafe ] ++ lib.optional (pythonOlder "3.9") astunparse; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index 94479a1214..38e06d362d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "10.2.6"; + version = "11.0.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uQPz7IB14dFrupZIA87jG5P7USaGKs0WWlgbaLAEPp4="; + hash = "sha256-SU8vsKwZio/5UD2SMhLenfkBjXRuMZCPo2k6+1hx8Y4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pebble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pebble/default.nix index ae25055741..deeec443b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pebble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pebble/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-vc/Z6n4K7biVsgQXfBnm1lQ9mWL040AuurIXUASGPag="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix index c35b53cd25..63bae07aec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pecan/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook genshi gunicorn diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix index 8351b05c39..3f139410e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { mysql-connector ]; - checkInputs = [ + nativeCheckInputs = [ flask ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix index f6268953fd..8fedf5c694 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { unidecode ]; - checkInputs = [ + nativeCheckInputs = [ pytest-xdist pytestCheckHook pandoc @@ -107,7 +107,7 @@ buildPythonPackage rec { meta = with lib; { description = "Static site generator that requires no database or server-side logic"; - homepage = "http://getpelican.com/"; + homepage = "https://getpelican.com/"; license = licenses.agpl3; maintainers = with maintainers; [ offline prikhi ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pep440/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pep440/default.nix index ebaade39ce..c9753a47d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pep440/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pep440/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix index 9848e27801..fe40559493 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pep517/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { importlib-metadata zipp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook setuptools testpath diff --git a/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix index 1c8cdf4421..63b00e896f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/periodictable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/periodictable/default.nix index 89a293b75f..6f0a8245ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/periodictable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/periodictable/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix index 3b2331871f..5c517231ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix index 17d210f400..eb9b8cbdd6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-D4QPoiJHvKpRQJTafzsmxgI1lCmrEtLNiL4GtJozYpA="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix index 4bf4f395a9..415fcd5a09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix index 0e193d4c5c..ac291d7af7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { sshtunnel ]; - checkInputs = [ pytestCheckHook mock ]; + nativeCheckInputs = [ pytestCheckHook mock ]; disabledTests = lib.optionals stdenv.isDarwin [ "test_application_name_db_uri" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix index 0ef677155b..8c146474d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { --replace "--cov=pglast --cov-report term-missing" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgpy/default.nix index 2b548e7f47..fc9c0c6569 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgpy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix index 82d636979e..4660461e91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "de0bbd6fe4f98bf5139cb5f466eac2e2abaf5a7b050b9e4867b87bf360873173"; }; - checkInputs = [ unittestCheckHook postgresql ]; + nativeCheckInputs = [ unittestCheckHook postgresql ]; propagatedBuildInputs = [ postgresql ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix index b2f28a189e..1bb3413240 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { psycopg ]; - checkInputs = [ + nativeCheckInputs = [ configobj pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phik/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phik/default.nix index 9f2e895ce6..adf507cb04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phik/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phik/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { hash = "sha256-9o3EDhgmne2J1QfzjjNQc1mUcyCzoVrCnWXqjWkiZU0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook nbconvert jupyter diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix index 38e5f8533e..d743dd24bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index ce5c8a2e36..3d216dfd97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-fQxFwVQBOXC3i4b0GI4OAKjnfWvr73yB79wDjbh27ro="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix index fdfd05a8e4..6345c3848f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { spglib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix index 0cb94be921..742648026a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phx-class-registry/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0gpvq4a6qrr2iki6b4vxarjr1jrsw560m2qzm5bb43ix8c8b7y3q"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pi1wire/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pi1wire/default.nix index faaaec0caa..6d3debdcaa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pi1wire/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pi1wire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-l/5w71QsAW4BvILOaLdUVvQ8xxUm1ZTzUESRFzUgtic="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/piano-transcription-inference/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/piano-transcription-inference/default.nix new file mode 100644 index 0000000000..272f3f6810 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/piano-transcription-inference/default.nix @@ -0,0 +1,75 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, fetchurl +, librosa +, matplotlib +, mido +, torch +, torchlibrosa +}: + +buildPythonPackage rec { + pname = "piano-transcription-inference"; + version = "0.0.5"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-nbhuSkXuWrekFxwdNHaspuag+3K1cKwq90IpATBpWPY="; + }; + + checkpoint = fetchurl { + name = "piano-transcription-inference.pth"; + # The download url can be found in + # https://github.com/qiuqiangkong/piano_transcription_inference/blob/master/piano_transcription_inference/inference.py + url = "https://zenodo.org/record/4034264/files/CRNN_note_F1%3D0.9677_pedal_F1%3D0.9186.pth?download=1"; + hash = "sha256-w/qXMHJb9Kdi8cFLyAzVmG6s2gGwJvWkolJc1geHYUE="; + }; + + propagatedBuildInputs = [ + librosa + matplotlib + mido + torch + torchlibrosa + ]; + + patches = [ + # Fix run against librosa 0.9.0 + # https://github.com/qiuqiangkong/piano_transcription_inference/pull/10 + (fetchpatch { + url = "https://github.com/qiuqiangkong/piano_transcription_inference/commit/b2d448916be771cd228f709c23c474942008e3e8.patch"; + hash = "sha256-8O4VtFij//k3fhcbMRz4J8Iz4AdOPLkuk3UTxuCSy8U="; + }) + ]; + + postPatch = '' + substituteInPlace piano_transcription_inference/inference.py --replace \ + "checkpoint_path='{}/piano_transcription_inference_data/note_F1=0.9677_pedal_F1=0.9186.pth'.format(str(Path.home()))" \ + "checkpoint_path='$out/share/checkpoint.pth'" + ''; + + postInstall = '' + mkdir "$out/share" + ln -s "${checkpoint}" "$out/share/checkpoint.pth" + ''; + + # Project has no tests. + # In order to make pythonImportsCheck work, NUMBA_CACHE_DIR env var need to + # be set to a writable dir (https://github.com/numba/numba/issues/4032#issuecomment-488102702). + # pythonImportsCheck has no pre* hook, use checkPhase to wordaround that. + checkPhase = '' + export NUMBA_CACHE_DIR="$(mktemp -d)" + ''; + pythonImportsCheck = [ "piano_transcription_inference" ]; + + meta = with lib; { + description = "A piano transcription inference package"; + homepage = "https://github.com/qiuqiangkong/piano_transcription_inference"; + license = licenses.mit; + maintainers = with maintainers; [ azuwis ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/piccata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/piccata/default.nix index d041ecc3ec..f9a68d98dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/piccata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/piccata/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0pn842jcf2czjks5dphivgp1s7wiifqiv93s0a89h0wxafd6pbsr"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix index f9b41012d5..9292ffd76f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/picobox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/picobox/default.nix index 6094b65efa..de0bdb1472 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/picobox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/picobox/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ flask pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/picos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/picos/default.nix index a6f1aa1a14..a5af53c1b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/picos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/picos/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; # Needed only for the tests - checkInputs = [ + nativeCheckInputs = [ networkx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix index 8db4f09a92..196619f525 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/piep/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pygments ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { description = "Bringing the power of python to stream editing"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/piexif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/piexif/default.nix index 440df36384..329989232f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/piexif/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/piexif/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ]; # Pillow needed for unit tests - checkInputs = [ pillow ]; + nativeCheckInputs = [ pillow ]; meta = with lib; { description = "Simplify Exif manipulations with Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix index 1d4f489131..3ac0b61fc3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ gevent tornado twisted ]; - checkInputs = [ nose2 mock ]; + nativeCheckInputs = [ nose2 mock ]; postPatch = '' # don't stop at first test failure diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index f1cd028c52..c4c6edffc2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ attrs hypothesis pytest-xdist diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pilkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pilkit/default.nix index 49a0700066..edf2d7eac2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pilkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pilkit/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pillow ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix index adad603896..95ecce0522 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow/generic.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ olefile ] ++ lib.optionals (lib.versionAtLeast version "8.2.0") [ defusedxml ]; - checkInputs = [ pytestCheckHook pyroma numpy ]; + nativeCheckInputs = [ pytestCheckHook pyroma numpy ]; buildInputs = [ freetype libjpeg openjpeg libimagequant zlib libtiff libwebp libxcrypt tcl lcms2 ] ++ lib.optionals (lib.versionAtLeast version "7.1.0") [ libxcb ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix index 879e25f774..19052eb493 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook scikitimage ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix index fafe0b1117..d2f5f66c0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pint-pandas/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pandas ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix index 0dd3650810..67f4dd004a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-subtests numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip-api/default.nix index fe7cc3ef71..48edbf2480 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-api/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pip ]; - checkInputs = [ + nativeCheckInputs = [ pretend pytestCheckHook virtualenv diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-requirements-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip-requirements-parser/default.nix index fd1b95c482..51af23fdc5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip-requirements-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-requirements-parser/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 78e2952cea..406378addd 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 @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pip-tools"; version = "6.12.1"; - format = "setuptools"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { wheel ]; - checkInputs = [ + nativeCheckInputs = [ pytest-xdist pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix index 09787ab32b..0c24448700 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { # to force it a little. pipInstallFlags = [ "--ignore-installed" ]; - checkInputs = [ mock scripttest virtualenv pretend pytest ]; + nativeCheckInputs = [ mock scripttest virtualenv pretend pytest ]; # Pip wants pytest, but tests are not distributed doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix index 0132ff4db3..186e468e04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipdeptree/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ diff-cover pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 9345ba537b..7e6998175a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { - version = "0.3.0"; + version = "0.3.1"; pname = "pipenv-poetry-migrate"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-j6YAHMjgaQgHpKBH67PFEUHhLi+kg3L966GbEyMPphM="; + hash = "sha256-HYzKp7ZYvJZX2CiHmR8wIeuL2a1xdk0Y87HLs9EP2tM="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { substituteInPlace pyproject.toml --replace 'typer = "^0.4.0"' 'typer = ">=0.4"' ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix index 955b2d8a7d..cf0af0d1de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix index e09f0b32ff..c0187f4838 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pillow pytest-benchmark pytest-mypy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkce/default.nix index 5dc77a2661..38a0058be4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pkce/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pkce/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-dOHCu0pDXk9LM4Yobaz8GAfVpBd8rXlty+Wfhx+WPME="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pkce" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix index 6721390d7a..91f8db998a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pkgconfig" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix index 5dd176c7ed..e095248ac0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-rAPjfk1gGq7kD4CH9j/EoqbJgU3aLI+mqrGxgpZTvfo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkginfo2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkginfo2/default.nix index 25b9b05374..08eee37498 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pkginfo2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pkginfo2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-E9EyaN3ncf/34vvvhRe0rwV28VrjqJo79YFgXq2lKWU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkutils/default.nix index c4baa649cf..6ca68dbe62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pkutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pkutils/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { semver ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index 2c14b258a1..51f96c24ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "11.3.0"; + version = "11.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-zZGnKFLsT29IX8EK1Tv5I1Ser+9tREzkJcYY6+Fid6o="; + hash = "sha256-5IHFChiIm/6x3xr+F+RIAZ3kDYQsXs+baFqUasjI8qs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix index 84a85de820..ad1fa2d68f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ plaster pastedeploy ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "PasteDeploy binding to the plaster configuration loader"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plaster/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaster/default.nix index ad2e4545cb..40362c65db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plaster/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plaster/default.nix @@ -15,5 +15,5 @@ buildPythonPackage rec { py.test ''; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix index b21e65479b..db4810513d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { hatch-vcs ]; - checkInputs = [ + nativeCheckInputs = [ appdirs pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pleroma-bot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pleroma-bot/default.nix index ed586a4474..65dd403c21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pleroma-bot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pleroma-bot/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix index e6cb98a305..717f530ef1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace " --cov=plotnine --cov-report=xml" "" ''; - buildInputs = [ + propagatedBuildInputs = [ matplotlib mizani pandas @@ -45,7 +45,7 @@ buildPythonPackage rec { statsmodels ]; - checkInputs = [ + nativeCheckInputs = [ adjusttext geopandas pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix index b8df04a1b3..f90b4b4153 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pluginbase/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "ff6c33a98fce232e9c73841d787a643de574937069f0d18147028d70d7dee287"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' cd tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugincode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugincode/default.nix index e3265ec5b3..831109f8e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plugincode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plugincode/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pluggy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index d3039381aa..338c189678 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.27.3"; + version = "0.27.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-JO9Gc7ZhWeQIheAwanzCBQFum1BUoh7K/exAEkWp/1U="; + hash = "sha256-qEAXyWa5OjTpF4foi0ljHKbemIEHORPGE6vIVL57BOU="; }; propagatedBuildInputs = [ @@ -45,7 +45,7 @@ buildPythonPackage rec { semver ]; - checkInputs = [ + nativeCheckInputs = [ freezegun jsonpickle mypy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plum-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plum-py/default.nix index 5b963cbfef..d1ef4c9caa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plum-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plum-py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "plum" ]; - checkInputs = [ pytest baseline ]; + nativeCheckInputs = [ pytest baseline ]; checkPhase = "pytest tests"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix index d9410f246b..2fe218080c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ openssh ps psutil diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix index 70ba8d6b28..ec235c7b99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { stevedore ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix index c39595c5bd..3bf0739eba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plyer/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ keyring ]; - checkInputs = [ mock pytestCheckHook ]; + nativeCheckInputs = [ mock pytestCheckHook ]; pytestFlagsArray = [ "plyer/tests" ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/podcastparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/podcastparser/default.nix index c65a37a99b..31472409ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/podcastparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/podcastparser/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1s83iq0mxcikxv6gi003iyavl1ai3siw1d7arijh0g28l0fff23a"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests test_*.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix index c669de8b03..82438a6954 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ build git pep517 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index 05a464d149..7692ab2fce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -5,6 +5,7 @@ , jinja2 , markupsafe , poetry-core +, poetry , pytestCheckHook , pythonOlder , tomlkit @@ -35,10 +36,14 @@ buildPythonPackage rec { tomlkit ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook + poetry ]; + # virtualenv: error: argument dest: the destination . is not write-able at / + doCheck = false; + disabledTests = [ # these require .git, but leaveDotGit = true doesn't help "test__get_version__defaults" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poetry-semver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry-semver/default.nix index 2318a2cf60..1e144bf36c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/poetry-semver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/poetry-semver/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-2Am2Eqons5vy0PydMbT0gJsOlyZGxfGc+kbHJbdjiBA="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "A semantic versioning library for Python."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polarizationsolver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polarizationsolver/default.nix index c4710f6901..c8f47db632 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polarizationsolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/polarizationsolver/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ fields ]; + nativeCheckInputs = [ fields ]; pythonImportsCheck = [ "polarizationsolver" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix index 583ce81fa4..f265e24fe4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix @@ -49,7 +49,7 @@ buildPythonPackage { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; pythonImportsCheck = [ "polars" ]; - # checkInputs = [ + # nativeCheckInputs = [ # pytestCheckHook # fixtures # graphviz 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 index b1aac2f1e1..ea98a66792 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { schema ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polyline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polyline/default.nix index f1dcd69952..249512cedb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polyline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/polyline/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six ]; - checkInputs = [ flake8 nose ]; + nativeCheckInputs = [ flake8 nose ]; checkPhase = '' nosetests ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix index 6d89ac0db6..8c94f8bd1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pomegranate/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy scipy cython networkx joblib pyyaml ]; - checkInputs = [ pandas nose ]; # as of 0.13.5, it depends explicitly on nose, rather than pytest. + nativeCheckInputs = [ pandas nose ]; # as of 0.13.5, it depends explicitly on nose, rather than pytest. meta = with lib; { broken = stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix index 5c7e6eaa03..b53d9108ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pontos/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { typing-extensions ] ++ httpx.optional-dependencies.http2; - checkInputs = [ + nativeCheckInputs = [ git pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix index 4cea071d27..704e8f7d26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pony/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-yATIsX2nKsW5DBwg9/LznQqf+XPY3q46WZut18Sr0v0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix index 238e6ad622..3c6f4ff900 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pooch/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging appdirs requests ]; preCheck = "HOME=$TMPDIR"; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # tries to touch network disabledTests = [ "pooch_custom_url" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pook/default.nix index af61434abd..79d3eebf93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pook/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pook/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pook"; - version = "1.1.0"; + version = "1.1.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "h2non"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5hVRyZCA5VzufiYh1l9ezob1iuT8/VXhuFjC0OjGsbQ="; + hash = "sha256-nLeJAAsJUKFAetZSAQmOtXP+3ZRHvCTFAzycSkK+kiI="; }; propagatedBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix index 1c425f3711..4133cb0239 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { redis ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mypy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix index bf84e41610..4dfd663ac8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/portend/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tempora ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix index 2cc9e3368c..adbbd3bf52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pot/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pymanopt ]; - checkInputs = [ + nativeCheckInputs = [ cvxopt matplotlib numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pprintpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pprintpp/default.nix index 5b07613f09..b72eeeebce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pprintpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pprintpp/default.nix @@ -1,29 +1,56 @@ -{ lib, fetchpatch, buildPythonPackage, fetchPypi, python, nose, parameterized }: +{ lib +, buildPythonPackage +, fetchpatch +, fetchPypi +, nose +, parameterized +, python +, pythonOlder +}: buildPythonPackage rec { pname = "pprintpp"; version = "0.4.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "00v4pkyiqc0y9qjnp3br58a4k5zwqdrjjxbcsv39vx67w84630pa"; + hash = "sha256-6oJhCOLH9J3G1mx1KXPD/JdJFCp5jWslTh4wHP28ZAM="; }; patches = [ + # Replace nose-parameterized with parameterized, https://github.com/wolever/pprintpp/pull/21 (fetchpatch { url = "https://github.com/wolever/pprintpp/commit/873217674cc824b4c1cfdad4867c560c60e8d806.patch"; - sha256 = "0rqxzxawr83215s84mfzh1gnjwjm2xv399ywwcl4q7h395av5vb3"; + hash = "sha256-Y+2yVUkDHkwo49ynNHYXVXJpX4DfVYJ0CWKgzFX/HWc="; + }) + # Remove "U" move from open(), https://github.com/wolever/pprintpp/pull/31 + (fetchpatch { + name = "remove-u.patch"; + url = "https://github.com/wolever/pprintpp/commit/deec5e5efad562fc2f9084abfe249ed0c7dd65fa.patch"; + hash = "sha256-I84pnY/KyCIPPI9q0uvj64t8oPeMkgVTPEBRANkZNa4="; }) ]; - checkInputs = [ nose parameterized ]; + nativeCheckInputs = [ + nose + parameterized + ]; + checkPhase = '' ${python.interpreter} test.py ''; + pythonImportsCheck = [ + "pprintpp" + ]; + meta = with lib; { - homepage = "https://github.com/wolever/pprintpp"; description = "A drop-in replacement for pprint that's actually pretty"; + homepage = "https://github.com/wolever/pprintpp"; + changelog = "https://github.com/wolever/pprintpp/blob/${version}/CHANGELOG.txt"; license = licenses.bsd2; maintainers = with maintainers; [ jakewaksbaum ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix index 57d8048f0d..c817fc390e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ppscore/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { scikit-learn ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix index 1065781cde..9f730b2f39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { semver ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook openapi-spec-validator ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix index f5e2f72060..767dc5c55c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/praw/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { websocket-client ]; - checkInputs = [ + nativeCheckInputs = [ betamax betamax-serializers betamax-matchers diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix index a115d42472..3591476927 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prawcore/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ testfixtures mock betamax diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix index d686ac3bd0..7e96bf4196 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix @@ -7,14 +7,16 @@ buildPythonPackage rec { pname = "prayer-times-calculator"; - version = "0.0.7"; + version = "0.0.8"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "uchagani"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-fIfv10oi5Lv1dj5Y5CYI94/UdWG3bAY/ENCiMTkO0RE="; + hash = "sha256-Zk7lzZUfojJrsrLRS9cf9AhEfGGsxZJo2MnIIOv6Ezk="; }; propagatedBuildInputs = [ @@ -24,11 +26,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "prayer_times_calculator" ]; + pythonImportsCheck = [ + "prayer_times_calculator" + ]; meta = with lib; { description = "Python client for the Prayer Times API"; homepage = "https://github.com/uchagani/prayer-times-calculator"; + changelog = "https://github.com/uchagani/prayer-times-calculator/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix index 23d4c3f7f5..b795be68e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { tomli ]; - checkInputs = [ + nativeCheckInputs = [ git pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prefixed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prefixed/default.nix index 71b457dcd2..9b0efcad46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prefixed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prefixed/default.nix @@ -7,17 +7,17 @@ buildPythonPackage rec { pname = "prefixed"; - version = "0.6.0"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s5+/rHJhj6HutbP9ntE0HxDdkN91SZy0w4psPvR83ZQ="; + hash = "sha256-C1TRXmAuuK9Kwxsdsho36pXOWJDgdBuw3Z3tSTzvu+k="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/preggy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/preggy/default.nix index 44be123335..cddca33b84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/preggy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/preggy/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { version = "1.4.4"; propagatedBuildInputs = [ six unidecode ]; - checkInputs = [ nose yanc ]; + nativeCheckInputs = [ nose yanc ]; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/preprocess-cancellation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/preprocess-cancellation/default.nix index 5d2b722e64..dc571f076f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/preprocess-cancellation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/preprocess-cancellation/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { shapely ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix index e20d3d78a1..b253525aac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { murmurhash ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pretend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pretend/default.nix index 0134b0dc36..231b953923 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pretend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pretend/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-OqMfeIMFNBBLq6ejR3uOCIHZ9aA4zew7iefVlAsy1JQ="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix index 6df087e3e6..149556c125 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytest-lazy-fixture pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix index 0f1a2ac66f..14c96e5734 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/primer3/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ++ lib.optionals stdenv.isDarwin [ gcc ]; # pytestCheckHook leads to a circular import issue - checkInputs = [ click ]; + nativeCheckInputs = [ click ]; pythonImportsCheck = [ "primer3" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/priority/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/priority/default.nix index 16908e90c9..8f12f7f214 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/priority/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/priority/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { "priority" ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix index 95a79ea189..de61fbd252 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prodict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prodict/default.nix index a6fdc61658..e3cc7564ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prodict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prodict/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # make setuptools happy on case-sensitive filesystems postPatch = ''if [[ ! -f README.md ]]; then mv README.MD README.md; fi''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix index e3ee0a208a..29b361344b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { python-utils ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix index aacde11916..f9e11f0966 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-LabvQMNiRH4jclMnN0P4M3w25NQasNQEu1HWvRDQQ2o="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix index 09891d0d4b..e84e0a2026 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask prometheus-client ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/promise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/promise/default.nix index 8833689cec..a9c4c416b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/promise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/promise/default.nix @@ -1,23 +1,37 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib -, six -, pytestCheckHook +, fetchpatch , mock , pytest-asyncio +, pytestCheckHook +, pythonOlder +, six }: buildPythonPackage rec { pname = "promise"; version = "2.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "syrusakbary"; repo = "promise"; - rev = "v${version}"; - sha256 = "17mq1bm78xfl0x1g50ng502m5ldq6421rzz35hlqafsj0cq8dkp6"; + rev = "refs/tags/v${version}"; + hash = "sha256-5s6GMANSO4UpLOP/HAQxuNFSBSjPgvJCB9R1dOoKuJ4="; }; + patches = [ + # Convert @asyncio.coroutine to async def, https://github.com/syrusakbary/promise/pull/99 + (fetchpatch { + name = "use-async-def.patch"; + url = "https://github.com/syrusakbary/promise/commit/3cde549d30b38dcff81b308e18c7f61783003791.patch"; + hash = "sha256-XCbTo6RCv75nNrpbK3TFdV0h7tBJ0QK+WOAR8S8w9as="; + }) + ]; + postPatch = '' substituteInPlace tests/test_extra.py \ --replace "assert_exc.traceback[-1].path.strpath" "str(assert_exc.traceback[-1].path)" @@ -27,22 +41,25 @@ buildPythonPackage rec { six ]; - checkInputs = [ - pytestCheckHook + nativeCheckInputs = [ mock pytest-asyncio + pytestCheckHook ]; disabledTestPaths = [ "tests/test_benchmark.py" ]; + pythonImportsCheck = [ + "promise" + ]; + meta = with lib; { description = "Ultra-performant Promise implementation in Python"; homepage = "https://github.com/syrusakbary/promise"; + changelog = "https://github.com/syrusakbary/promise/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ - kamadorueda - ]; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/1.nix b/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/1.nix index e1b9695071..f92ceeb86f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/1.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/1.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ docopt six wcwidth pygments ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "test_pathcompleter_can_expanduser" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix index ad0281d7ee..afe14d81d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { wcwidth ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/property-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/property-manager/default.nix index f50f9625fd..451d6f7909 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/property-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/property-manager/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ coloredlogs humanfriendly verboselogs ]; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; meta = with lib; { description = "Useful property variants for Python programming"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix index a881292ada..12489fa64b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix index 3d3646d5c8..b4f4facda1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix @@ -10,17 +10,17 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.22.1"; + version = "1.22.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-bH39Ei3++AGf9lR0a+T1sdnIC7p4f+lhG1CN2Ivjovo="; + sha256 = "sha256-DozaPVpjTZiVt1xXPJNSwWSGy3XesOB4tf2jTbQkMWU="; }; propagatedBuildInputs = [ protobuf ]; - checkInputs = [ pytestCheckHook pytz googleapis-common-protos ]; + nativeCheckInputs = [ pytestCheckHook pytz googleapis-common-protos ]; pythonImportsCheck = [ "proto" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proton-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proton-client/default.nix index 914f12a154..fbd69dbd54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proton-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proton-client/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ #ValueError: Invalid modulus diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prov/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prov/default.nix index 101ea7e2e9..91b7e412b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prov/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prov/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { rdflib ]; - checkInputs = [ + nativeCheckInputs = [ pydot ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prox-tv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prox-tv/default.nix index 1202d45efa..869ac7457c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prox-tv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prox-tv/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { sha256 = "0mlrjbb5rw78dgijkr3bspmsskk6jqs9y7xpsgs35i46dvb327q5"; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proxmoxer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proxmoxer/default.nix index 4246cc0fed..98063a5604 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proxmoxer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proxmoxer/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-toolbelt responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix index c454e74ab3..911637bf85 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ httpx openssl gnumake diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix index b9fb5f3aa1..9bf12055df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psautohint/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fonttools lxml fs ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov pytest-xdist diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pscript/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pscript/default.nix index fae2c8a428..76af30e2c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pscript/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pscript/default.nix @@ -3,21 +3,24 @@ , fetchFromGitHub , pytestCheckHook , nodejs +, pythonOlder }: buildPythonPackage rec { pname = "pscript"; - version = "0.7.6"; + version = "0.7.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # PyPI tarball doesn't include tests directory src = fetchFromGitHub { owner = "flexxui"; repo = pname; - rev = "v${version}"; - sha256 = "169px5n4jjnpdn9y86f28qwd95bwf1q1rz0a1h3lb5nn5c6ym8c4"; + rev = "refs/tags/v${version}"; + hash = "sha256-AhVI+7FiWyH+DfAXnau4aAHJAJtsWEpmnU90ey2z35o="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook nodejs ]; @@ -27,13 +30,15 @@ buildPythonPackage rec { rm -rf pscript_legacy ''; + pythonImportsCheck = [ + "pscript" + ]; + meta = with lib; { description = "Python to JavaScript compiler"; - license = licenses.bsd2; homepage = "https://pscript.readthedocs.io"; - maintainers = [ maintainers.matthiasbeyer ]; + changelog = "https://github.com/flexxui/pscript/blob/v${version}/docs/releasenotes.rst"; + license = licenses.bsd2; + maintainers = with maintainers; [ matthiasbeyer ]; }; } - - - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix index 96be2af48b..f0baddf628 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix @@ -1,10 +1,9 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 +, pythonOlder , docopt , pillow -, enum34 , scikitimage , aggdraw , pytestCheckHook @@ -14,16 +13,21 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.23"; + version = "1.9.24"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "psd-tools"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-pJUf5rE5QMnfNytU1P0Zbj1iztrK5xrX4CJ/WvIG8mY="; + hash = "sha256-RW8v3UeO2tCjKkCqraFw2IfVt2YL3EbixfGsK7pOQYI="; }; - nativeBuildInputs = [ cython ]; + nativeBuildInputs = [ + cython + ]; propagatedBuildInputs = [ aggdraw @@ -33,13 +37,18 @@ buildPythonPackage rec { scikitimage ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "psd_tools" ]; + pythonImportsCheck = [ + "psd_tools" + ]; meta = with lib; { description = "Python package for reading Adobe Photoshop PSD files"; homepage = "https://github.com/kmike/psd-tools"; + changelog = "https://github.com/psd-tools/psd-tools/blob/v${version}/CHANGES.rst"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psrpcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psrpcore/default.nix index ec3bfb1d8d..131d49f4ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psrpcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psrpcore/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook xmldiff ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psutil-home-assistant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psutil-home-assistant/default.nix index 4e248702f5..9ea18d7853 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psutil-home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psutil-home-assistant/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix index b0be35e0c7..5532816a9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { IOKit ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix index 6d2bdc8691..1b84cc6140 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix @@ -16,6 +16,7 @@ # psycopg-c , cython_3 +, tomli # docs , furo @@ -32,13 +33,13 @@ let pname = "psycopg"; - version = "3.1.3"; + version = "3.1.8"; src = fetchFromGitHub { owner = "psycopg"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-cAfFxUDgfI3KTlBU9wV/vQkPun4cR3se8eSIHHcEr4g="; + hash = "sha256-VmuotHcLWd+k8/GLv0N2wSZR0sZjY+TmGBQjhpYE3YA="; }; patches = [ @@ -70,9 +71,10 @@ let ''; nativeBuildInputs = [ - setuptools cython_3 postgresql + setuptools + tomli ]; # tested in psycopg @@ -96,7 +98,7 @@ let cd psycopg_pool ''; - propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ + propagatedBuildInputs = [ typing-extensions ]; @@ -167,7 +169,7 @@ buildPythonPackage rec { cd .. ''; - checkInputs = [ + nativeCheckInputs = [ pproxy pytest-asyncio pytest-randomly @@ -181,10 +183,6 @@ buildPythonPackage rec { # don't depend on mypy for tests "test_version" "test_package_version" - ] ++ lib.optionals (stdenv.isDarwin) [ - # racy test - "test_sched" - "test_sched_error" ]; disabledTestPaths = [ @@ -197,7 +195,8 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "-o cache_dir=$TMPDIR" + "-o" "cache_dir=$TMPDIR" + "-m" "'not timing'" ]; postCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix index 71c9017380..a504c8484a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2cffi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ postgresql ]; propagatedBuildInputs = [ six cffi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # NB: The tests need a postgres instance running to test against, and so we # disable them. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix index 778c5516c6..586e5d8dfb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ numpy pydantic pytest-mypy-plugins diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ptable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ptable/default.nix index ae2ad58a1a..169f08fb35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ptable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ptable/default.nix @@ -12,7 +12,7 @@ buildPythonPackage { sha256 = "1cj314rp6irlvr0a2c4xffsm2idsb0hzwr38vzz6z3kbhphcb63i"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests --with-coverage --cover-package=prettytable --cover-min-percentage=75 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix index d934d688f9..a94b40de50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-vcr pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix index 96f3370365..6ba0d12588 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { urwid-readline ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; 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 60fa54438f..816af17c69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix index e895a0920e..b2c7030587 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulsectl/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { "pulsectl" ]; - checkInputs = [ unittestCheckHook pulseaudio ]; + nativeCheckInputs = [ unittestCheckHook pulseaudio ]; preCheck = '' export HOME=$TMPDIR diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix index 1a23ac33ed..e7150093bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "5.26.0"; + version = "5.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-2sx8a+ga77asp5onfjcGLm+3hCHdCXzFNmmgqzEJfJE="; + hash = "sha256-7lO3GbVPG70u+PzS/22d6i6xIRXiTMc/iUXrZurD2LU="; }; sourceRoot = "${src.name}/sdk/python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pulumi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulumi/default.nix index ad779eb2ff..b0d11e59d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pulumi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pulumi/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pulumi.pkgs.pulumi-language-python pytestCheckHook ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { "test/" ]; - sourceRoot = "source/sdk/python/lib"; + sourceRoot = "${src.name}/sdk/python/lib"; # we apply the modifications done in the pulumi/sdk/python/Makefile # but without the venv code @@ -44,7 +44,7 @@ buildPythonPackage rec { cp ../../README.md . substituteInPlace setup.py \ --replace "3.0.0" "${version}" \ - --replace "grpcio==1.47" "grpcio" + --replace "grpcio==1.50" "grpcio" ''; # Allow local networking in tests on Darwin diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pure-cdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-cdb/default.nix index 2683499dce..ea25ba2f59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pure-cdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pure-cdb/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-7zxQO+oTZJhXfM2yijGXchLixiQRuFTOSESVlEc+T0s="; }; - checkInputs = [ flake8 ]; + nativeCheckInputs = [ flake8 ]; pythonImportsCheck = [ "cdblib" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix index ba84c1db5f..f21f4d7fe4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pure-eval/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pure-python-adb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-python-adb/default.nix index 512c38b730..31ec5d5091 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pure-python-adb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pure-python-adb/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = pythonOlder "3.10"; # all tests result in RuntimeError on 3.10 - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.async; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/purepng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/purepng/default.nix index 3615935b88..29a3a2aba5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/purepng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/purepng/default.nix @@ -31,7 +31,7 @@ buildPythonPackage { nativeBuildInputs = [ cython ]; # numpy is optional - if not supplied, tests simply have less coverage - checkInputs = [ numpy ]; + nativeCheckInputs = [ numpy ]; # checkPhase begins by deleting source dir to force test execution against installed version checkPhase = '' rm -r code/png diff --git a/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix index 8c7b208df2..9519d8bf21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pushbullet-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pushbullet-py/default.nix index 3fff30cb6d..472f4dcc58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pushbullet-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pushbullet-py/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { preCheck = '' export PUSHBULLET_API_KEY="" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "test_auth_fail" "test_auth_success" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pushover-complete/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pushover-complete/default.nix index 92131b5262..33741f9f29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pushover-complete/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pushover-complete/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-toolbelt responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pvlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pvlib/default.nix index 3a93b36cb2..dcdad33afa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pvlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pvlib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ pytestCheckHook flaky mock pytest-mock ]; + nativeCheckInputs = [ pytestCheckHook flaky mock pytest-mock ]; propagatedBuildInputs = [ numpy pandas pytz six requests ]; # Skip a few tests that try to access some URLs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pvo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pvo/default.nix index 0b107f1550..cbc7a2c0b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pvo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pvo/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pxml/default.nix index efa9e81b8d..5ef283a26c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pxml/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ blessings six ]; - checkInputs = [ nose coverage ]; + nativeCheckInputs = [ nose coverage ]; # test_prefixedWhitespace fails due to a python3 StringIO issue requiring # bytes rather than str diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix index d3150b453a..446edb4221 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { py-air-control ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-bip39-bindings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-bip39-bindings/default.nix index 8385f492d8..12d70e8bee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-bip39-bindings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-bip39-bindings/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-canary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-canary/default.nix index e849e147e4..7e0200abea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-canary/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-canary/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-cid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-cid/default.nix index 86c2e80601..3f8d07adbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-cid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-cid/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { py-multihash ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix index 09f8ba4ad7..3c8b1f1e1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-Q5u0guAqDVhf6bvJTzNvCpWbIzjxxAjE7s0OuXj9T4Q="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-deprecate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-deprecate/default.nix index 86064dd093..4684b51d79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-deprecate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-deprecate/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { hash = "sha256-84RmQvLxwtLPQk3hX7Q6eeJeejhrO3t+mc95W1E85Fg="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook scikit-learn ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix index 8060ab45ca..71103c0d66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { mypy-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-multiaddr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-multiaddr/default.nix index 24fa6975cc..4bf9e79739 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-multiaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-multiaddr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { py-multicodec ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix index 87cfd6b8e4..eeb83df5a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-multibase/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { python-baseconv ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-multicodec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-multicodec/default.nix index c41da62cf4..f0c34a70ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-multicodec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-multicodec/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { morphys ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix index 73307c75b8..202d270216 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-multihash/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { varint ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-nextbusnext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-nextbusnext/default.nix index 3b6d24d616..67e934dad1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-nextbusnext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-nextbusnext/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-uUHA8v5iTISmPaTgk0RvcLLRM34f3JXUjZClKGXdMoI="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-nightscout/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-nightscout/default.nix index b98fa7b133..3330b68c94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-nightscout/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-nightscout/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytestCheckHook pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-radix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-radix/default.nix index f4b064d41a..579311776f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-radix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-radix/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { }; doCheck = true; - checkInputs = [ coverage nose ]; + nativeCheckInputs = [ coverage nose ]; meta = with lib; { description = "Python radix tree for IPv4 and IPv6 prefix matching"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock index ded748b627..0a31c382b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/Cargo.lock @@ -10,9 +10,9 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" -version = "0.5.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "autocfg" @@ -28,31 +28,13 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "block-buffer" -version = "0.7.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", - "byte-tools", - "byteorder", "generic-array", ] -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "byteorder" version = "1.4.3" @@ -66,57 +48,61 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "ctor" -version = "0.1.23" +name = "cpufeatures" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdffe87e1d521a10f9696f833fe502293ea446d7f256c06128293a4119bdf4cb" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", "syn", ] [[package]] -name = "curve25519-dalek" -version = "2.1.3" +name = "curve25519-dalek-ng" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216" +checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" dependencies = [ "byteorder", "digest", "rand_core", - "subtle", + "subtle-ng", "zeroize", ] [[package]] name = "digest" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ "generic-array", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "generic-array" -version = "0.12.4" +version = "0.14.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" dependencies = [ "typenum", + "version_check", ] [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if", "libc", @@ -125,9 +111,9 @@ dependencies = [ [[package]] name = "ghost" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb19fe8de3ea0920d282f7b77dd4227aea6b8b999b42cdf0ca41b2472b14443a" +checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3" dependencies = [ "proc-macro2", "quote", @@ -136,22 +122,9 @@ dependencies = [ [[package]] name = "hex-literal" -version = "0.2.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d70693199b3cf4552f3fa720b54163927a3ebed2aef240efaf556033ab336a11" -dependencies = [ - "hex-literal-impl", - "proc-macro-hack", -] - -[[package]] -name = "hex-literal-impl" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59448fc2f82a5fb6907f78c3d69d843e82ff5b051923313cc4438cb0c7b745a8" -dependencies = [ - "proc-macro-hack", -] +checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" [[package]] name = "indoc" @@ -209,15 +182,18 @@ dependencies = [ [[package]] name = "keccak" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" +checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768" +dependencies = [ + "cpufeatures", +] [[package]] name = "libc" -version = "0.2.134" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "lock_api" @@ -231,9 +207,9 @@ dependencies = [ [[package]] name = "merlin" -version = "2.0.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" dependencies = [ "byteorder", "keccak", @@ -243,9 +219,9 @@ dependencies = [ [[package]] name = "opaque-debug" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "parking_lot" @@ -260,9 +236,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if", "instant", @@ -291,30 +267,24 @@ dependencies = [ "proc-macro-hack", ] -[[package]] -name = "ppv-lite86" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - [[package]] name = "proc-macro-hack" -version = "0.5.19" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.46" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" dependencies = [ "unicode-ident", ] [[package]] name = "py-sr25519-bindings" -version = "0.1.5" +version = "0.2.0" dependencies = [ "hex-literal", "pyo3", @@ -361,54 +331,22 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - [[package]] name = "rand_core" -version = "0.5.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - [[package]] name = "redox_syscall" version = "0.2.16" @@ -420,19 +358,18 @@ dependencies = [ [[package]] name = "schnorrkel" -version = "0.9.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862" +checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d" dependencies = [ "arrayref", "arrayvec", - "curve25519-dalek", - "getrandom", + "curve25519-dalek-ng", "merlin", - "rand", "rand_core", + "serde_bytes", "sha2", - "subtle", + "subtle-ng", "zeroize", ] @@ -443,14 +380,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] -name = "sha2" -version = "0.8.2" +name = "serde" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" + +[[package]] +name = "serde_bytes" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819" +dependencies = [ + "serde", +] + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer", + "cfg-if", + "cpufeatures", "digest", - "fake-simd", "opaque-debug", ] @@ -461,16 +414,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] -name = "subtle" -version = "2.4.1" +name = "subtle-ng" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" [[package]] name = "syn" -version = "1.0.102" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -491,15 +444,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-ident" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "unicode-xid" @@ -509,15 +462,21 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unindent" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ee9362deb4a96cef4d437d1ad49cffc9b9e92d202b6995674e928ce684f112" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "winapi" @@ -552,9 +511,9 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" +checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c" dependencies = [ "proc-macro2", "quote", diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/default.nix index c2c8d961f6..650e259f98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-sr25519-bindings/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook py-bip39-bindings ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix index 0ebd218aa9..ed2c0022a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix @@ -1,34 +1,39 @@ { lib +, aiohttp +, async-timeout , buildPythonPackage , fetchFromGitHub , poetry-core , pytestCheckHook -, requests -, urllib3 +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "py-synologydsm-api"; - version = "1.0.8"; + version = "2.1.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "mib1185"; - repo = "synologydsm-api"; - rev = "v${version}"; - sha256 = "sha256-9bh7uLt9+uda6yFCWV6xUh//jFC4DgiS+KtRXQrU3A8="; + repo = "py-synologydsm-api"; + rev = "refs/tags/v${version}"; + hash = "sha256-bolcqPIBHglZ7Em8/66MBypivDPehdgTaPOxAjR9Bd0="; }; nativeBuildInputs = [ poetry-core + setuptools ]; propagatedBuildInputs = [ - requests - urllib3 + aiohttp + async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -38,7 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for Synology DSM"; - homepage = "https://github.com/hacf-fr/synologydsm-api"; + homepage = "https://github.com/mib1185/py-synologydsm-api"; + changelog = "https://github.com/mib1185/py-synologydsm-api/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ uvnikita ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-tes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-tes/default.nix index 633dc6fa5f..6fba131e07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-tes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-tes/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-ubjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-ubjson/default.nix index 4efa2b8b6f..5cb8cfc402 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-ubjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-ubjson/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1frn97xfa88zrfmpnvdk1pc03yihlchhph99bhjayvzlfcrhm5v3"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix index 725f9bd333..111e702455 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ flake8 mock nose diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-zabbix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-zabbix/default.nix index 410068f452..e706da6064 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-zabbix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-zabbix/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "aPQc188pszfDQvNtsGYlRLHS5CG5VyqptSoe4/GJVvE="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py17track/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py17track/default.nix index b39d50dbfc..12bd7446e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py17track/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py17track/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py3rijndael/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py3rijndael/default.nix index be098df6a6..74a91b6ee2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py3rijndael/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py3rijndael/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { hash = "sha256-tmVaPr/zoQVA6u0EnoeI7qOsk9a3GzpqwrACJLvs6ag="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 73cbce9161..ab8492beab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -1,37 +1,82 @@ { lib -, buildPythonPackage -, fetchPypi , aiohttp -, requests +, aioredis +, buildPythonPackage +, coloredlogs , fastapi +, fetchFromGitHub +, pillow +, psutil +, pytestCheckHook , pythonOlder +, redis +, requests +, ujson +, uvicorn +, watchdog }: buildPythonPackage rec { - pname = "pyTelegramBotAPI"; - version = "4.8.0"; + pname = "pytelegrambotapi"; + version = "4.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-6nfpXzq2yCVDK8pAuWzAVzr0pKn5VHqb3UH9VXhSHJ0="; + src = fetchFromGitHub { + owner = "eternnoir"; + repo = "pyTelegramBotAPI"; + rev = "refs/tags/${version}"; + hash = "sha256-OaJMNJqb3h16aZJYma8eXTEkAEbb8NgpVEEHmGvpxQg="; }; - propagatedBuildInputs = [ - aiohttp + passthru.optional-dependencies = { + json = [ + ujson + ]; + PIL = [ + pillow + ]; + redis = [ + redis + ]; + aioredis = [ + aioredis + ]; + aiohttp = [ + aiohttp + ]; + fastapi = [ + fastapi + ]; + uvicorn = [ + uvicorn + ]; + psutil = [ + psutil + ]; + coloredlogs = [ + coloredlogs + ]; + watchdog = [ + watchdog + ]; + }; + + checkInputs = [ + pytestCheckHook requests - fastapi - ]; + ] ++ passthru.optional-dependencies.watchdog + ++ passthru.optional-dependencies.aiohttp; pythonImportsCheck = [ "telebot" ]; meta = with lib; { + description = "Python implementation for the Telegram Bot API"; homepage = "https://github.com/eternnoir/pyTelegramBotAPI"; - description = "A simple, but extensible Python implementation for the Telegram Bot API"; + changelog = "https://github.com/eternnoir/pyTelegramBotAPI/releases/tag/${version}"; license = licenses.gpl2Only; maintainers = with maintainers; [ das_j ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix index 79d09daba9..a6d4bc48e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py_stringmatching/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "c87f62698fba1612a18f8f44bd57f0c4e70aac2d7ca6dfb6ed46dabd2194453c"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; propagatedBuildInputs = [ numpy six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyads/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyads/default.nix index a22e851542..6e9d738666 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyads/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyads/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { --replace "ctypes.CDLL(adslib)" "ctypes.CDLL(\"${adslib}/lib/adslib.so\")" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix index c0b941e849..7c1c76c4ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaftership/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyaftership"; - version = "21.11.0"; + version = "23.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,15 +18,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = pname; - rev = version; - sha256 = "sha256-SN7fvI/+VHYn2eYQe5wp6lEZ73YeZbsiPjDiq/Ibk3Q="; + rev = "refs/tags/${version}"; + hash = "sha256-njlDScmxIYWxB4EL9lOSGCXqZDzP999gI9EkpcZyFlE="; }; propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper package for the AfterShip API"; homepage = "https://github.com/ludeeus/pyaftership"; + changelog = "https://github.com/ludeeus/pyaftership/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ jamiemagee ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix index fd2c6de2c2..b490f883d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyahocorasick/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyahocorasick"; - version = "2.0.0b1"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,11 +16,11 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "WojciechMula"; repo = pname; - rev = version; - hash = "sha256-APpL99kOwzIQjePvRDeJ0FDm1kjBi6083JMKuBqtaRk="; + rev = "refs/tags/${version}"; + hash = "sha256-Ugl7gHyubXpxe4aots2e9stLuQAZEWsrlDuAHdSC0SA="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -36,6 +36,7 @@ buildPythonPackage rec { key strings occurrences at once in some input text. ''; homepage = "https://github.com/WojciechMula/pyahocorasick"; + changelog = "https://github.com/WojciechMula/pyahocorasick/blob/${version}/CHANGELOG.rst"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyairnow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyairnow/default.nix index da1b2223f2..04206796d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyairnow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyairnow/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-aiohttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix index fa0377372f..228844f530 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pysmb ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-aiohttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyalmond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyalmond/default.nix deleted file mode 100644 index 59a9339c26..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyalmond/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -}: - -buildPythonPackage rec { - pname = "pyalmond"; - version = "0.0.3"; - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "stanford-oval"; - repo = pname; - rev = "v${version}"; - sha256 = "0d1w83lr7k2wxcs846iz4mjyqn1ximnw6155kgl515v10fqyrhgk"; - }; - - propagatedBuildInputs = [ aiohttp ]; - - # Tests require a running Almond instance - doCheck = false; - pythonImportsCheck = [ "pyalmond" ]; - - meta = with lib; { - description = "Python client for the Almond API"; - homepage = "https://github.com/stanford-oval/pyalmond"; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix index cbab9bacfb..444b66549a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ unidecode ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix index 50edda1a7e..7dbb595efe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { mypy-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyarlo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyarlo/default.nix index 76fe9bc0a1..63c766ffb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyarlo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyarlo/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sseclient-py ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix index fc5b479df2..a862fa69a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pandas pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix index 4bb515e17a..de87a9b5ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyasn1 ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix index 0abcd60dcb..92ccf8e071 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix index eb960cc49f..046486ba89 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix @@ -73,7 +73,7 @@ buildPythonPackage rec { zeroconf ]; - checkInputs = [ + nativeCheckInputs = [ deepdiff pytest-aiohttp pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyautogui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyautogui/default.nix index a7b35bc571..d9747d4338 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyautogui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyautogui/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "sha256-R9tcTqxUaqw63FLOGFRaO/Oz6kD7V6MPHdQ8A29NdXw="; }; - checkInputs = [ xvfb-run scrot ]; + nativeCheckInputs = [ xvfb-run scrot ]; checkPhase = '' xvfb-run python -c 'import pyautogui' # The tests depend on some specific things that xvfb cant provide, like keyboard and mouse diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyavm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyavm/default.nix index c5127be1a8..9c343c53fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyavm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyavm/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { astropy-helpers ]; - checkInputs = [ + nativeCheckInputs = [ astropy pillow pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix index 12c4851e34..3ae7a77478 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ asn1crypto click lxml ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python3 Parser for Android XML file and get Application Name without using Androguard"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix index d16ff8e4ef..bd0c899ce6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-dtB035p7mJs1iZJqsZRmd7uzmez+IwcUsTFX4mM2Ee0="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pybase64" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix index 6bedbefb19..be47a00080 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { sqlalchemy ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "bids" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybigwig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybigwig/default.nix index cb1764b23b..cb23c2a573 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybigwig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybigwig/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ zlib ]; - checkInputs = [ numpy pytest ]; + nativeCheckInputs = [ numpy pytest ]; meta = with lib; { homepage = "https://github.com/deeptools/pyBigWig"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix index 7b35cbb300..a5154a3e4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.10.2"; + version = "2.10.3"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - hash = "sha256-YxAkozyWNTKMCIEk3AhHZbRHtzhRrCSB3wh/Qy9CIyU="; + hash = "sha256-Rlr6Ec6BEujTxQkQ9UP+6u0cYeFsJlj7U346MtRM6QM="; }; postPatch = '' @@ -60,7 +60,7 @@ buildPythonPackage rec { ln -sf $out/include/pybind11 $out/include/${python.libPrefix}/pybind11 ''; - checkInputs = [ + nativeCheckInputs = [ catch numpy pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybindgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybindgen/default.nix index ab18b4886b..a7a5de92e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybindgen/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pygccxml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybravia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybravia/default.nix index 6ec4cab91c..92fe348368 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybravia/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybravia/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pybravia"; - version = "0.2.5"; + version = "0.3.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Drafteed"; repo = pname; rev = "v${version}"; - hash = "sha256-QWn5VdZlbxm2/ZvsQWlKuVPPBcqFkyt75Odh9Mf9Bqk="; + hash = "sha256-aY+G4e2uq2yWUkJ9CXnOhc5S57kkMB36N/x+iQDCivo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix index 391be3c17b..23906cbd2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; meta = with lib; { description = "Python library for the BrowserID Protocol"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix index 1bffde00e8..d8f9e4616f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pybtex ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix index 5d17ecef03..23450ed37c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { libxcrypt ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycaption/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycaption/default.nix index 6a13832621..ad1c7c1cec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycaption/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycaption/default.nix @@ -5,13 +5,14 @@ , beautifulsoup4 , lxml , cssutils +, nltk , pytest-lazy-fixture , pytestCheckHook }: buildPythonPackage rec { pname = "pycaption"; - version = "2.1.0"; + version = "2.1.1"; disabled = pythonOlder "3.6"; @@ -19,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-mV//EYdP7wKYD3Vc49z6LQVQeOuhzNKFZLf28RYdABk="; + hash = "sha256-B+uIh8WTPPeNVU3yP8FEGc8OinY0MpJb9dHLC+nhi4I="; }; propagatedBuildInputs = [ @@ -28,7 +29,11 @@ buildPythonPackage rec { cssutils ]; - checkInputs = [ + passthru.optional-dependencies = { + transcript = [ nltk ]; + }; + + nativeCheckInputs = [ pytest-lazy-fixture pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycarwings2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycarwings2/default.nix index bb4c794bc8..d89035bac2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycarwings2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycarwings2/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pycryptodome ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycategories/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycategories/default.nix index ec902e0b38..8d41b7f4ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycategories/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycategories/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # and shouldn't be used in production code propagatedBuildInputs = [ (callPackage ./infix.nix { }) ]; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; meta = with lib; { homepage = "https://gitlab.com/danielhones/pycategories"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix index 640cc6b365..c33b3c1fad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycec/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { libcec ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix index aab9f05d93..5888b82fbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ assertpy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix index dde651cf78..03f8b1d699 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycfmodel/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ httpx pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyclimacell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyclimacell/default.nix index 7f5703585c..31343ce7b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyclimacell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyclimacell/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyclip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyclip/default.nix index a1a17fd8dc..cfeb3a1991 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyclip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyclip/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { --replace docs/README.md README.md ''; - checkInputs = [ + nativeCheckInputs = [ pytest ] ++ lib.optionals stdenv.isLinux [ xclip 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 2f0f500f67..1b9eba36b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyclipper/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { cython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 a2c3cb0151..ecba98c85e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { seaborn ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix index 17ed66d870..14e62474e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycmarkgfm/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # pytest in an environment that does not contain this extension, which fails. # cmarkgfm has virtually the same build setup as this package, and uses the # same trick: pkgs/development/python-modules/cmarkgfm/default.nix - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix index 6f425f10bf..2f1143b5ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ freezegun mock moto diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix index f20a971aa2..1758eac9a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycoin/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { substituteInPlace ./pycoin/cmds/tx.py --replace '"gpg"' '"${gnupg}/bin/gpg"' ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix index a0048e7e75..946f58ba05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycparser/default.nix index 47f1a20fbb..edc6744f67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycparser/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycron/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycron/default.nix index 7155ee9572..7aa8afee10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycron/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycron/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "12hkqrdfg3jbqkmck8i00ssyaw1c4hhvdhjxkmh2gm9pd99z5bpv"; }; - checkInputs = [ arrow coveralls delorean nose pendulum pytz udatetime ]; + nativeCheckInputs = [ arrow coveralls delorean nose pendulum pytz udatetime ]; checkPhase = '' nosetests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix index 1d3d3d0d9e..f2b546cac8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycryptodome/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { --replace 'load_lib("gmp"' 'load_lib("${gmp}/lib/libgmp.so.10"' ''; - checkInputs = [ + nativeCheckInputs = [ test-vectors ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix index 4538410c36..b1e5ec095f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix index ab8a5a7e01..68e710cf34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { curl ]; - checkInputs = [ + nativeCheckInputs = [ bottle pytestCheckHook flaky diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix index ba6612bbde..2d0b967cb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydaikin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.8.0"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mustang51"; repo = pname; rev = "v${version}"; - hash = "sha256-AZDwoq4lCThzwHI0WCzrV9Il2MHp0LKxWg/dscGw0q0="; + hash = "sha256-cJkrBt4HRH2SX4YWo+gK4rd7uyZRzLUvFXJ6L5nxzeM="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytest-aiohttp pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix index 4e8142b007..93af15c4e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix index 57a0c6d179..14e7ffdfcd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { hash = "sha256-VbuRzKwPMh5S4GZQYnh0sZOBi4LNFjMuol95tMC43b0="; }; - checkInputs = [ + nativeCheckInputs = [ invoke mock sphinx-rtd-theme diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix index 9ca7638538..f38723f3fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeck/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pydeck" ]; - checkInputs = [ pytestCheckHook pandas ]; + nativeCheckInputs = [ pytestCheckHook pandas ]; # tries to start a jupyter server disabledTests = [ "test_nbconvert" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix index 86265aebbc..54b4b2ef1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { orjson ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-aiohttp pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix index fa0ad7899a..ef5339086f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { stdlib-list ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix index 75643d0874..62754bdd18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydevccu/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pydevccu"; - version = "0.1.4"; + version = "0.1.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-VneuAnt9HkIRBeK2T71MIHbZbz6zY1vVy5vOYZ+82gM="; + hash = "sha256-scgWD40jjt8qPGygV11Rfd4Z1voBlErScabLLcmQqGg="; }; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix index 11ada4189d..f595eb5d0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-+yRngN10654trB09ZZa8QQsTPdM7VxVj7r6jh7OcgAA="; }; - checkInputs = [ + nativeCheckInputs = [ numpy psutil pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix index 9310d0cf55..34a802a256 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydicom/default.nix @@ -11,13 +11,13 @@ let pname = "pydicom"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "pydicom"; repo = "pydicom"; - rev = "v${version}"; - hash = "sha256-CAQWaBkzecJ1VXQ5BnAUjmBMjh0I8y+gT7I4P4o2gqI="; + rev = "refs/tags/v${version}"; + hash = "sha256-xt0aK908lLgNlpcI86OSxy96Z/PZnQh7+GXzJ0VMQGA="; }; # Pydicom needs pydicom-data to run some tests. If these files aren't downloaded @@ -42,7 +42,7 @@ buildPythonPackage { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix index 902f39e6b9..1705fe918f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydispatcher/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { hash = "sha256-PX5PQ8cAAKHcox+SaU6Z0BAZNPpuq11UVadYhY2G35U="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { - homepage = "http://pydispatcher.sourceforge.net/"; + homepage = "https://pydispatcher.sourceforge.net/"; description = "Signal-registration and routing infrastructure for use in multiple contexts"; license = licenses.bsd3; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix index fc680d193d..ab7457a130 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ezyrb ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix index 0658e18571..4a5b693ef4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydocstyle/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { snowballstemmer ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix index 8dccfbc261..ac965f8404 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pyparsing ]; - checkInputs = [ + nativeCheckInputs = [ chardet pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix index 3adf54281b..a7c21329b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { "pydub.playback" ]; - checkInputs = [ + nativeCheckInputs = [ ffmpeg-full ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyduke-energy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyduke-energy/default.nix index 9a0d329bad..08c7a6b5c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyduke-energy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyduke-energy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-timeout pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix index b342a2a99e..265493d01d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sympy ]; - checkInputs = [ + nativeCheckInputs = [ nose cython pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydyf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydyf/default.nix index 935cc044e5..402f8c6b1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydyf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydyf/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ ghostscript pillow pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix index c5d7f822d2..b33e4d7035 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyeapi/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { netaddr ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix index 7dd36c8fd6..4741f4a399 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyeclib/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { buildInputs = [ liberasurecode ]; - checkInputs = [ six ]; + nativeCheckInputs = [ six ]; pythonImportsCheck = [ "pyeclib" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix index 7a967c48a0..a009186dd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytest-trio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyevmasm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyevmasm/default.nix index d2923f1ad4..bccf243a0a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyevmasm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyevmasm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Ethereum Virtual Machine (EVM) assembler and disassembler"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix index b923932ec5..b0f9028a70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { odfpy ]; - checkInputs = [ + nativeCheckInputs = [ nose pyexcel pyexcel-xls diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix index ea520b50c6..1699757bd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { xlwt ]; - checkInputs = [ + nativeCheckInputs = [ nose pyexcel mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix index 11359954c5..4f7e62450a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales nose numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix index 67364ba58e..f833e8c24e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { --replace "test_rename_dir_to_existing_dir" "notest_rename_dir_to_existing_dir" ''); - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # https://github.com/jmcgeheeiv/pyfakefs/issues/581 (OSError: [Errno 9] Bad file descriptor) disabledTests = [ "test_open_existing_pipe" ]; pythonImportsCheck = [ "pyfakefs" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix index 9048212f3e..56e6e88645 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyflakes/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-7IsnamtgvYDe/tJa3X5DmIHBnmSFCv2bNGKD1BZf0P0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix index cb02243676..e59381a136 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ requests-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix index a481e9a97a..ea59fa0dc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyflunearyou/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ujson ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytest-aiohttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix index 103446dbe6..5c73cc84c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix index a9f8f20a76..b2baa51466 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfritzhome/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ mock nose ]; 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 8a27fb0bae..0133d409d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix index b69b7acc99..b276e80e6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ mock psutil ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix index e7b545d2a5..19e92f9d53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfuse3/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ${python.pythonForBuild.interpreter} setup.py build_cython ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-trio which diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix index 46a25e2c6b..0df1538c9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ grequests mock responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix index 86a56c11bc..29b3743be0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { png = [ cairosvg ]; }; - checkInputs = [ + nativeCheckInputs = [ pyquery pytestCheckHook ] ++ passthru.optional-dependencies.png; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix index f57004f372..80a8f4eaad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { --replace "xsel" "${pkgs.xsel}/bin/xsel" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export HOME=$TMPDIR diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygatt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygatt/default.nix index fab5c093c5..f622dccab2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygatt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygatt/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pexpect ]; - checkInputs = [ + nativeCheckInputs = [ mock nose pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygbm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygbm/default.nix index 5367f622e9..4eac823b50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygbm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygbm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { scikit-learn ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix index c1be042dc7..af32883575 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygdbmi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0a6b3zyxwdcb671c6lrwxm8fhvsbjh0m8hf1r18m9dha86laimjr"; }; - checkInputs = [ gdb ]; + nativeCheckInputs = [ gdb ]; # tests require gcc for some reason doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygeos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygeos/default.nix index 54107db9ef..67fa2e02aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygeos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygeos/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ${python.interpreter} setup.py bdist_wheel ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 35230d44a5..bf35421b6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 b8aa22e925..82ccd411e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyglet/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { # tests do run and pass in nix-shell, however. doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix index 5f83733075..199082cae1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchFromGitHub , setuptools-scm -, pydantic +, lsprotocol , toml , typeguard , mock @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pygls"; - version = "0.13.0"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "openlawlibrary"; repo = "pygls"; rev = "v${version}"; - hash = "sha256-guwOnB4EEUpucfprNLLr49Yn8EdOpRzzG+cT4NCn0rA="; + hash = "sha256-31J4+giK1RDBS52Q/Ia3Y/Zak7fp7gRVTQ7US/eFjtM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -32,11 +32,11 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - pydantic + lsprotocol typeguard ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygmars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygmars/default.nix index 2408a934b0..4b0a701c79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygmars/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygmars/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygments-style-github/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygments-style-github/default.nix new file mode 100644 index 0000000000..918456774f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygments-style-github/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, pygments }: + +buildPythonPackage rec { + pname = "pygments-style-github"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-D8q9IxR9VMhiQPYhZ4xTyZin3vqg0naRHB8t7wpF9Kc="; + }; + + # no tests exist on upstream repo + doCheck = false; + + propagatedBuildInputs = [ pygments ]; + + pythonImportsCheck = [ "pygments_style_github" ]; + + meta = with lib; { + description = "A port of the github color scheme for pygments"; + homepage = "https://github.com/hugomaiavieira/pygments-style-github"; + license = licenses.bsd3; + maintainers = with maintainers; [ drupol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygments/default.nix index e5c2ca5368..22193faab8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygments/default.nix @@ -24,7 +24,7 @@ let pygments = buildPythonPackage # circular dependencies if enabled by default doCheck = false; - checkInputs = [ + nativeCheckInputs = [ lxml pytestCheckHook wcag-contrast-ratio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix index 83c7bc5cc0..43f6b20732 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygmt/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { pname = "pygmt"; version = "0.8.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -37,7 +38,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy netcdf4 pandas packaging xarray ]; doCheck = false; # the *entire* test suite requires network access - checkInputs = [ pytestCheckHook pytest-mpl ghostscript ipython ]; + nativeCheckInputs = [ pytestCheckHook pytest-mpl ghostscript ipython ]; postBuild = '' export HOME=$TMP ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygogo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygogo/default.nix index 8cee037bb1..4a6a89844e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygogo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygogo/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pkutils ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix index 15f57612ac..80f16e760d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygraphviz/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { buildInputs = [ graphviz ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygrok/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygrok/default.nix index 56d8b05af9..f209463f99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygrok/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygrok/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ regex ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygtfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygtfs/default.nix index 6bd6fedb64..38f62d9e65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygtfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygtfs/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sqlalchemy ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix index 86467a66aa..f9111d7f74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhamcrest/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { hatchling ]; - checkInputs = [ + nativeCheckInputs = [ numpy pytest-xdist pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix index 5763a4c4be..1375b44258 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhanko-certvalidator/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { uritools ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhanko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhanko/default.nix index 2cd71ae0f3..2fd3373abd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhanko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhanko/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { --replace "pytest-aiohttp~=0.3.0" "pytest-aiohttp~=1.0.3" ''; - checkInputs = [ + nativeCheckInputs = [ aiohttp certomancer freezegun diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix index 5f279cd730..38b71b80e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhaversion/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyhaversion"; - version = "22.8.0"; + version = "23.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-30UHbxs0WZyIVyq0ai2PsoPTkvoYawS1OBhVbV0JVN8="; + sha256 = "sha256-HMJqZn0yzN2dP5WTRCbem1Xw8nyH2Hy7oVP4kEKHHAo="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { awesomeversion ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhcl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhcl/default.nix index 62d40e368e..eac566b903 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhcl/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { echo '__version__ = "${version}"' > ./src/hcl/version.py ''; - checkInputs = [ + nativeCheckInputs = [ coverage pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyheos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyheos/default.nix index 715c609875..7a05306fa8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyheos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyheos/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0rgzg7lnqzzqrjp73c1hj1hq8p0j0msyih3yr4wa2rj81s8ihmby"; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhiveapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhiveapi/default.nix index b2035077fa..ec6d511919 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhiveapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhiveapi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyhiveapi"; - version = "0.5.14"; + version = "0.5.15"; format = "pyproject"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Pyhass"; repo = "Pyhiveapi"; rev = "refs/tags/v${version}"; - hash = "sha256-YBcVoffcM3nkVmuPKE6WR/1TqAiz6ePzCxcrntqCQkY="; + hash = "sha256-tR2PCR1qGn4KnqAjEpcRTcVlMEpKCwn5RAm99AXBSnk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix index f9014f5db2..d382687e5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhocon/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhs100/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhs100/default.nix index 429f3a8ebb..fa5f73787a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhs100/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhs100/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { deprecation ]; - checkInputs = [ + nativeCheckInputs = [ pytest voluptuous ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyhumps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyhumps/default.nix index 0bdf9f7003..b7ed9548e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyhumps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyhumps/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix index 56f4e42362..dafdefb75b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyicloud/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { tzlocal ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix index 5e34624b54..f8100ad3dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyicu/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ icu ]; # for icu-config, but should be replaced with pkg-config buildInputs = [ icu ]; - checkInputs = [ pytestCheckHook six ]; + nativeCheckInputs = [ pytestCheckHook six ]; pythonImportsCheck = [ "icu" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyinfra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinfra/default.nix index 372b1cb021..899e1d1910 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyinfra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinfra/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "2.6.1"; + version = "2.6.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Fizzadar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TpO91YVWswcdpV4z9jkxBELwsIIGvlpL3URQTjAAkUs="; + hash = "sha256-8eYbsPBMcRhFk5eouSAHEr3q/Llj0RqR76iwn/TrSSg="; }; propagatedBuildInputs = [ @@ -44,7 +44,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix index 5340be273f..70f76c129f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ async_generator pytest-asyncio pytest-timeout diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyipma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyipma/default.nix index c0388f7757..9befc34acb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyipma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyipma/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { geopy ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses freezegun mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyipp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyipp/default.nix index adcc661163..d16ab81faf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyipp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyipp/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix index 7532ae45b2..81127de8c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { backoff ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-aiohttp pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyisbn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyisbn/default.nix index e14dadcfe1..eec0e4b039 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyisbn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyisbn/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { --replace "--cov pyisbn --cov-report term-missing --no-cov-on-fail" "" ''; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyisy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyisy/default.nix index d0f4437cdd..472bf727ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyisy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyisy/default.nix @@ -1,15 +1,17 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, requests -, python-dateutil , aiohttp +, buildPythonPackage +, colorlog +, fetchFromGitHub +, python-dateutil , pythonOlder +, requests +, setuptools-scm }: buildPythonPackage rec { pname = "pyisy"; - version = "3.0.12"; + version = "3.1.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,17 +20,23 @@ buildPythonPackage rec { owner = "automicus"; repo = "PyISY"; rev = "refs/tags/v${version}"; - hash = "sha256-i9xC1Vijf/pU7WmRaosdEs5tPNos2hq3cGkT8MGM1Ro="; + hash = "sha256-RYC0mfskDcCU9O2pSKRL9ulPUaJQO9UKp7WANXZWJ60="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + postPatch = '' substituteInPlace setup.py \ - --replace "setuptools-git-version" "" \ --replace 'version_format="{tag}"' 'version="${version}"' ''; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ aiohttp + colorlog python-dateutil requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix index ed23eba4c2..f7a2b7941a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyjet/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' mv pyjet _pyjet pytest tests/ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjsparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjsparser/default.nix index 0f2ddf62f1..7382f82c36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyjsparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyjsparser/default.nix @@ -16,7 +16,7 @@ let pyjsparser = buildPythonPackage rec { sha256 = "sha256-Hqay9/qsjUfe62U7Q79l0Yy01L2Bnj5xNs6427k3Br8="; }; - checkInputs = [ pytestCheckHook js2py ]; + nativeCheckInputs = [ pytestCheckHook js2py ]; # escape infinite recursion with js2py doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix index bd3b33578d..721274c236 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyjwt/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ (lib.flatten (lib.attrValues passthru.optional-dependencies)); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykakasi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykakasi/default.nix index 13f5466b8a..859564e1d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykakasi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykakasi/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytest-benchmark pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykaleidescape/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykaleidescape/default.nix index 62d65490ff..d0eccbc183 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykaleidescape/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykaleidescape/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { dnspython ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix index 642e5ba9d5..99467ae52e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { mv pykdtree tests ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "kd-tree implementation for fast nearest neighbour search in Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykeyatome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykeyatome/default.nix index bce06c017b..0f6786c4c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykeyatome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykeyatome/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { simplejson ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix index 060a738911..fac61d0b5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykulersky/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykulersky/default.nix index 83a5b58c7f..9a4318a1a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykulersky/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykulersky/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix index cf42c98457..383de0aee3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykwalify/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ruamel-yaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook testfixtures ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylacrosse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylacrosse/default.nix index 74b244f529..a3349ff2ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylacrosse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylacrosse/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyserial ]; - checkInputs = [ + nativeCheckInputs = [ mock nose pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix index 5875112c99..e62d356f70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix @@ -51,7 +51,7 @@ let pylama = buildPythonPackage rec { # escape infinite recursion pylint -> isort -> pylama doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pylint pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix index 91124c01ec..b3314165bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylast/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook flaky ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylatexenc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylatexenc/default.nix index 496e7e6af2..0080ad8293 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylatexenc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylatexenc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; pythonImportsCheck = [ "pylatexenc" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Simple LaTeX parser providing latex-to-unicode and unicode-to-latex conversion"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylaunches/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylaunches/default.nix index 8f2ed70835..80257ca7ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylaunches/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylaunches/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytestCheckHook pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylddwrap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylddwrap/default.nix index 27bac5c1e3..6c8a5159f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylddwrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylddwrap/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "lddwrap" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix new file mode 100644 index 0000000000..46dd18b109 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, cython +, numpy +}: + +buildPythonPackage rec { + pname = "pylibjpeg-libjpeg"; + version = "1.3.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = pname; + rev = "refs/tags/v.${version}"; + hash = "sha256-fv3zX+P2DWMdxPKsvSPhPCV8cDX3tAMO/h5coMHBHN8="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cython]; + + propagatedBuildInputs = [ numpy ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + doCheck = false; # tests try to import 'libjpeg.data', which errors + + pythonImportsCheck = [ + "libjpeg" + ]; + + meta = with lib; { + description = "A JPEG, JPEG-LS and JPEG XT plugin for pylibjpeg"; + homepage = "https://github.com/pydicom/pylibjpeg-libjpeg"; + license = licenses.gpl3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix index 321507c3ce..52f59cc3fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { buildInputs = [ liblo cython ]; meta = with lib; { - homepage = "http://das.nasophon.de/pyliblo/"; + homepage = "https://das.nasophon.de/pyliblo/"; description = "Python wrapper for the liblo OSC library"; license = licenses.lgpl21; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix index af522cd217..3c282f0e60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ psutil six future ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix index e6d7c6bd63..dcfc83c029 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pylint-plugin-utils ]; - checkInputs = [ + nativeCheckInputs = [ factory_boy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint-plugin-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint-plugin-utils/default.nix index 46c12f0d0d..a8cff38009 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint-plugin-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint-plugin-utils/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix index 60204d70ca..bdc49c0413 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -73,7 +73,7 @@ buildPythonPackage rec { installManPage man/*.1 ''; - checkInputs = [ + nativeCheckInputs = [ gitpython # https://github.com/PyCQA/pylint/blob/main/requirements_test_min.txt py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix index fea8da2148..8b1b41cf3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2023.1.1"; + version = "2023.1.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nWKBbb2S8V81KQihGQYg9GBK97xv5FXuem5pUPB+cew="; + hash = "sha256-PSg0u4Beg0OVUMxaBCPxJSVO/MxBvCpDu2rQhiYT9OM="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { pyjwt ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-aiohttp pytest-freezegun diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix index 128c8cbd0d..3e12fbdf97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyls-black/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { disabled = !isPy3k; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ black toml python-language-server ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix index ad387106e8..8c7db89d3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyls-mypy/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ mock pytest-cov coverage pytestCheckHook ]; + nativeCheckInputs = [ mock pytest-cov coverage pytestCheckHook ]; propagatedBuildInputs = [ mypy python-language-server configparser diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix index 61b0fa7449..63f9122acd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { python-lsp-server ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix index aef852cafc..02139d3682 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.6.4"; + version = "0.6.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Richardk2n"; repo = "pylsp-mypy"; rev = "refs/tags/${version}"; - hash = "sha256-BpYg2noReHFgJ/5iQI09XUWNAN7UdcYgqpZ/IPr17Ao="; + hash = "sha256-LQ9Kw/dG3XA67WaVObE72fxERb21eZzk+MCqIp2Qy0o="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylsqpack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylsqpack/default.nix index 0fbd7a757c..2b5e9f3757 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylsqpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylsqpack/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-tnps4/aTfYUGgYJ3FL5zCqNhwEnjd1Lj7Z3xHn8jL/s="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pylsqpack" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix index 80fa5bff32..b68695ad42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylti/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ]; - checkInputs = [ + nativeCheckInputs = [ flask httpretty oauthlib pyflakes pytest pytestcache pytest-cov covCore pytest-flakes sphinx mock chalice ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix index b81e4bf8a2..ab6e1e2c66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-sugar pytest-timeout diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix index 4bf56d5e6e..e394986163 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylutron/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pylutron"; - version = "0.2.9"; + version = "0.2.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xy5XPNOrvdPZMCfa2MYA+xtUcFdGSurW5QYL6H7n2VI="; + sha256 = "sha256-DKwjBQXC7O/8bFxq5shJJxRV3HYgBeS7tJXg4m3vQMY="; }; # Project has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylxd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylxd/default.nix index 3373daf8a7..6017d80199 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylxd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylxd/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ws4py ]; - checkInputs = [ + nativeCheckInputs = [ ddt mock-services pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix index bb9ac2f2b7..33799515c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy scipy torch ]; - checkInputs = [ nose2 autograd matplotlib tensorflow ]; + nativeCheckInputs = [ nose2 autograd matplotlib tensorflow ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymarshal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymarshal/default.nix index 7da9385264..c273b379a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymarshal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymarshal/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { bson ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook bson pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix index 87d46a35fa..b1b5cf4738 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen-lammps/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest-runner ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ pymatgen ]; pythonImportsCheck = [ "pmg_lammps" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymaven-patch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymaven-patch/default.nix index e3a70ede06..f74c959cfd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymaven-patch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymaven-patch/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix index fd26c2d391..b7f31adc8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pytools ]; - checkInputs = [ + nativeCheckInputs = [ matchpy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix index 8603eeabde..1f528d9ab7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix @@ -1,6 +1,4 @@ { lib -, aeppl -, aesara , arviz , buildPythonPackage , cachetools @@ -8,38 +6,33 @@ , fastprogress , fetchFromGitHub , numpy +, pytensor , pythonOlder -, pythonRelaxDepsHook , scipy , typing-extensions }: buildPythonPackage rec { pname = "pymc"; - version = "5.0.1"; + version = "5.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pymc-devs"; - repo = "pymc"; + repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uWvzWbZyRRE8L9X9+azmN+1JYahwwNSYCk2fQ/C8Yi0="; + hash = "sha256-ffNWSSzoRLFmYzN9sm5Z1j6WtEoFzGkCQxpBC0NlpRc="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - propagatedBuildInputs = [ - aeppl - aesara arviz cachetools cloudpickle fastprogress numpy + pytensor scipy typing-extensions ]; @@ -49,11 +42,6 @@ buildPythonPackage rec { --replace ', "pytest-cov"' "" ''; - pythonRelaxDeps = [ - "aesara" - "aeppl" - ]; - # The test suite is computationally intensive and test failures are not # indicative for package usability hence tests are disabled by default. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix index a360517eb1..69f3f62fb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ markdown pygments ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix index e8bb96a6bb..e511c24fcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymedio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymedio/default.nix new file mode 100644 index 0000000000..d7f90f9f84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymedio/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, numpy +}: + +buildPythonPackage rec { + pname = "pymedio"; + version = "0.2.13"; + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "jcreinhold"; + repo = "pymedio"; + rev = "refs/tags/v${version}"; + hash = "sha256-iHbClOrtYkHT1Nar+5j/ig4Krya8LdQdFB4Mmm5B9bg="; + }; + + # relax Python dep to work with 3.10.x + postPatch = '' + substituteInPlace setup.cfg --replace "!=3.10.*," "" + ''; + + propagatedBuildInputs = [ numpy ]; + + doCheck = false; # requires SimpleITK python package (not in Nixpkgs) + + pythonImportsCheck = [ + "pymedio" + ]; + + meta = with lib; { + description = "Read medical image files into Numpy arrays"; + homepage = "https://github.com/jcreinhold/pymedio"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix index 8cece9b0e6..9c7d2914cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymeeus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "sha256-VI9xhr2LlsvAac9kmo6ON33OSax0SGcJhJ/mOpnK1oQ="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest . diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymelcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymelcloud/default.nix index ed06b347b6..079c7e31f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymelcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymelcloud/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix index ec0c2308d8..cf69c2b0fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ faker mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymemoize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymemoize/default.nix index f66a6ef702..9fdb8bbc26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymemoize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymemoize/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0yqr60hm700zph6nv8wb6yp2s0i08mahxvw98bvkmw5ijbsviiq7"; }; - checkInputs = [ django ]; + nativeCheckInputs = [ django ]; # django.core.exceptions.ImproperlyConfigured: Requested settings, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymeteoclimatic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymeteoclimatic/default.nix index db150342a2..463acc3f9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymeteoclimatic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymeteoclimatic/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymfy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymfy/default.nix index e48966e9da..5600db81b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymfy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymfy/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ httpretty pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix index bb002a0fe8..a6e3f5eb9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix @@ -10,6 +10,8 @@ , pyserial , pyserial-asyncio , pytest-asyncio +, pytest-rerunfailures +, pytest-xdist , pytestCheckHook , redis , sqlalchemy @@ -19,13 +21,14 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.0.2"; + version = "3.1.2"; + format = "setuptools"; src = fetchFromGitHub { - owner = "riptideio"; + owner = "pymodbus-dev"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-7zuFKJuKc+J4g7qoK22xed8dmXJatQbQXz4aKAOcvN8="; + hash = "sha256-kae/TADu23NnCrXkJ/dkDBNIgBm/+BxXf+lh8uMxz/s="; }; # Twisted asynchronous version is not supported due to a missing dependency @@ -39,16 +42,22 @@ buildPythonPackage rec { tornado ]; - checkInputs = [ + nativeCheckInputs = [ asynctest mock pytest-asyncio + pytest-rerunfailures + pytest-xdist pytestCheckHook redis sqlalchemy twisted ]; + pytestFlagsArray = [ + "--reruns" "3" # Racy socket tests + ]; + pythonImportsCheck = [ "pymodbus" ]; meta = with lib; { @@ -59,7 +68,8 @@ buildPythonPackage rec { also be used without any third party dependencies if a more lightweight project is needed. ''; - homepage = "https://github.com/riptideio/pymodbus"; + homepage = "https://github.com/pymodbus-dev/pymodbus"; + changelog = "https://github.com/pymodbus-dev/pymodbus/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix index d2d0bdec81..786c9ab463 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { --replace "https://raw.githubusercontent.com/anyoptimization/pymoo-data/main/" \ "file://$pymoo_data/" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook nbformat notebook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pympler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pympler/default.nix index 6fc917981a..3763aeabbc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pympler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pympler/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "993f1a3599ca3f4fcd7160c7545ad06310c9e12f70174ae7ae8d4e25f6c5d3fa"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix index 35cbbc31bb..558d5c6bd9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymumble/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { protobuf ]; - checkInputs = [ + nativeCheckInputs = [ pycrypto pytestCheckHook ]; 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 54ab01a4e6..e75b4fa3a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ${python.interpreter} setup.py build_ext --inplace ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix index e9d6ab74ad..58bdf10ab5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-sugar pytest-timeout pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymystem3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymystem3/default.nix index 8c909b868b..b8aa6469b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymystem3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymystem3/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ requests ]; - checkInputs = [ flake8 mock pytest ]; + nativeCheckInputs = [ flake8 mock pytest ]; doCheck = isPy3k; # fails on linting postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix index f34956d728..68bd546cd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; 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 5c9cfa2a4e..bd4ab4f023 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "5.3.4"; + version = "5.3.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pynamodb"; repo = "PynamoDB"; rev = "refs/tags/${version}"; - hash = "sha256-qg/aFK7rt2a/ZcLm+VSlq8UYBh6zS0/VVLqRAN7kLus="; + hash = "sha256-cxWPnq+xGDaJ1rj/K25ELATFAW+/eteilrnqrCftW0Q="; }; propagatedBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ] ++ passthru.optional-dependencies.signal; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pync/default.nix index 43161880e2..9dd31aa725 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pync/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "38b9e61735a3161f9211a5773c5f5ea698f36af4ff7f77fa03e8d1ff0caa117f"; }; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; propagatedBuildInputs = [ python-dateutil ]; preInstall = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix index 45bc76aa71..333f88e3f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynetbox/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "7.0.0"; + version = "7.0.1"; format = "setuptools"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PFSnINbXSnEo1gvntjfH6KCVa/LeaNrsiuWM4H+fOvQ="; + hash = "sha256-RAUM79lDz7oNV7Li987Sz7JoNz/feO6BsEcWO0u/Ub8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix index 52860b0017..f6cf6e4b99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pydicom ]; - checkInputs = [ + nativeCheckInputs = [ pyfakefs pytestCheckHook sqlalchemy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix index 4a4fbfd4dc..859b126474 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynmea2/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "pynmea2"; - version = "1.18.0"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "1b94lhpbgvnknb563dlwvs5vkk7w3ma54sj614ynh2dzgqrd6h73"; + hash = "sha256-Hap5uTJ5+IfRwjXlzFx54yZEVkE4zkaYmrD0ovyXDXw="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pynmea2" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix index 18775d0fac..b7075b9619 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix index eb19d27345..15044872a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { metar ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytest-aiohttp pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynx584/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynx584/default.nix index 35c0301aeb..2ac855773e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pynx584/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pynx584/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { stevedore ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix index 52cf703a71..aebab128cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyocd/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { hidapi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pyocd" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix index 916a22a62e..2922c03b05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyocr/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { inherit (src.meta) homepage; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyoctoprintapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyoctoprintapi/default.nix index 4b75f3a5d4..4c53c37d5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyoctoprintapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyoctoprintapi/default.nix @@ -33,7 +33,7 @@ buildPythonPackage { "pyoctoprintapi" ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix index e5c20f18dc..eef2875a0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ply ]; - checkInputs = [ + nativeCheckInputs = [ parameterized pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix index e292779d7a..ad24fbcbd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix @@ -24,7 +24,7 @@ in buildPythonPackage rec { pname = "pyopencl"; version = "2022.3.1"; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix index 195ec563d5..27e329c928 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopengl-accelerate/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyopengl-accelerate"; - version = "3.1.5"; + version = "3.1.6"; disabled = pythonAtLeast "3.10"; # fails to compile src = fetchPypi { pname = "PyOpenGL-accelerate"; inherit version; - sha256 = "01iggy5jwxv7lxnj51zbmlbhag9wcb7dvrbwgi97i90n0a5m3r8j"; + sha256 = "sha256-rYowAlbsolIoJh3hb3QeUaMPNPHhsc9oNZ9cYtvNzcM="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix index 7370057ad7..5ba33acd23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopengl/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "http://pyopengl.sourceforge.net/"; + homepage = "https://pyopengl.sourceforge.net/"; description = "PyOpenGL, the Python OpenGL bindings"; longDescription = '' PyOpenGL is the cross platform Python binding to OpenGL and diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix index 082ebdfae6..048c47184d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { nativeBuildInputs = [ openssl ]; propagatedBuildInputs = [ cryptography ]; - checkInputs = [ pytestCheckHook pretend flaky ]; + nativeCheckInputs = [ pytestCheckHook pretend flaky ]; preCheck = '' export LANG="en_US.UTF-8" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix index d841db17d2..49f4b06a5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { backoff ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopnsense/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopnsense/default.nix index f4f5bf6c70..7debcd3b7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopnsense/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopnsense/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ fixtures mock pytest-cov diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix index 22473af902..289f4d1c04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix @@ -1,28 +1,59 @@ -{ lib, buildPythonPackage, fetchFromGitHub, cmake, python -, libosmium, protozero, boost, expat, bzip2, zlib, pybind11 -, shapely, pythonOlder, isPyPy, lz4, requests, pytestCheckHook +{ lib +, buildPythonPackage +, fetchFromGitHub +, cmake +, python +, libosmium +, protozero +, boost +, expat +, bzip2 +, zlib +, pybind11 +, shapely +, pythonOlder +, isPyPy +, lz4 +, requests +, pytestCheckHook }: buildPythonPackage rec { pname = "pyosmium"; - version = "3.5.0"; + version = "3.6.0"; + format = "setuptools"; - disabled = pythonOlder "3.4" || isPyPy; + disabled = pythonOlder "3.6" || isPyPy; src = fetchFromGitHub { owner = "osmcode"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-dumTyca1nLPa6B3p5fmUGWa6jReHOeFPc9heTz/2zao="; + hash = "sha256-+YJQGPQm2FGOPhNzlXX2GM+ad4QdipJhwViOKGHtqBk="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libosmium protozero boost expat bzip2 zlib pybind11 lz4 ]; - propagatedBuildInputs = [ requests ]; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + libosmium + protozero + boost + expat + bzip2 + zlib + pybind11 + lz4 + ]; + + propagatedBuildInputs = [ + requests + ]; preBuild = "cd .."; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook shapely ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix index 303e12f014..71ef391cb4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pyserial-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix index 8b7b4249f4..47ef017c7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyotp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-wvXhfZ2pLY7B995jMasIEWuRFa26vLpuII1G/EmpjFo="; }; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix index c82f5cd31d..49e6abffd5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { warrant-lite ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyowm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyowm/default.nix index b5b8a100ba..3282120a52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyowm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyowm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyp/default.nix index 1eeeb83a9d..fa7fcc6902 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyp/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook coreutils jq diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix index 87cfe2708d..a12ae560bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ./skip-tests.patch ]; - checkInputs = [ + nativeCheckInputs = [ texlive.combined.scheme-small pandocfilters ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix index 95b1b56009..fcf33dc941 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyparsing/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { # circular dependencies with pytest if enabled by default doCheck = false; - checkInputs = [ + nativeCheckInputs = [ jinja2 pytestCheckHook railroad-diagrams diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix index 1c054defbe..3c6abd0cc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pkgs.pkg-config ]; - checkInputs = [ six ]; + nativeCheckInputs = [ six ]; propagatedBuildInputs = [ pkgs.parted ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypass/default.nix index f70e400299..9c497b3e3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypass/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { pexpect ] ++ lib.optional (pythonOlder "3.4") enum34; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # Configuration so that the tests work preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypcap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypcap/default.nix index 84f94a7629..77d27bdff1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypcap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypcap/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { buildInputs = [ libpcap ]; - checkInputs = [ + nativeCheckInputs = [ dpkt pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix index 26292d3a83..1ef36070a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-OcXMVgG62JUH28BGvfO/rpnC++/klhBLJ2HafDu9R40="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-timeout pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix index 8980a9ff59..a93653e7e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "PyPDF2" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix index ac4ebc74d8..28eac119f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix index 38dea54f9b..81d4aa5b1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { sed -i '/addopts/d' pyproject.toml ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix index 4f79d50e36..327e3a92ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypinyin/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { "--cov-report term-missing" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix index 74d3c10ffe..c4a058dff1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypiserver/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ + nativeCheckInputs = [ passlib pytestCheckHook twine diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypng/default.nix index 129300b081..ce8b8deffa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypng/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "png" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Pure Python library for PNG image encoding/decoding"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix index a1857ec720..19e76acb9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyppeteer/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ syncer pytest-xdist pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyprind/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyprind/default.nix index 082ebb2a49..faf9960719 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyprind/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyprind/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ psutil ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyproj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyproj/default.nix index 65dc1c74ea..f847fedc5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyproj/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyproj/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { certifi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix index 6e719ea6f4..d0617dfced 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { tomli ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook virtualenv diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-hooks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-hooks/default.nix index dd88253110..76bf3902c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-hooks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-hooks/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { tomli ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook setuptools testpath diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix index d94db44e44..4704b4ef15 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ tomli diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypsrp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypsrp/default.nix index 7246af07e3..e474a84567 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypsrp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypsrp/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypubsub/default.nix index fd19167a3e..db473a2938 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypubsub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypubsub/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "02j74w28wzmdvxkk8i561ywjgizjifq3hgcl080yj0rvkd3wivlb"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' cd tests/suite diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix index b983bedc40..e530df116c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypugjs/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six charset-normalizer ]; - checkInputs = [ + nativeCheckInputs = [ django jinja2 Mako diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypytools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypytools/default.nix index 1828ede0a9..fdaeb031f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypytools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypytools/default.nix @@ -6,6 +6,7 @@ , numpy , py , pytestCheckHook +, pythonAtLeast , pythonOlder }: @@ -25,7 +26,7 @@ buildPythonPackage rec { py ]; - checkInputs = [ + nativeCheckInputs = [ freezegun numpy py @@ -45,6 +46,11 @@ buildPythonPackage rec { "pypytools" ]; + disabledTests = lib.optionals (pythonAtLeast "3.11") [ + # https://github.com/antocuni/pypytools/issues/4 + "test_clonefunc" + ]; + meta = with lib; { description = "Collection of tools to use PyPy-specific features"; homepage = "https://github.com/antocuni/pypytools"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqldb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqldb/default.nix index a6fd8665fd..b4ff71cb03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqldb/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ boto3 amazon-ion ionhash ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export AWS_DEFAULT_REGION=us-east-1 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix index af5567acc8..23cceed4e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtgraph/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pyopengl ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix index c86fe165d4..c11dcad4d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -1,10 +1,12 @@ -{ lib, pythonPackages, pkg-config +{ lib, stdenv, pythonPackages, pkg-config , qmake, qtbase, qtsvg, qtwebengine , wrapQtAppsHook +, darwin }: let inherit (pythonPackages) buildPythonPackage python isPy27 pyqt5 enum34 sip pyqt-builder; + inherit (darwin) autoSignDarwinBinariesHook; in buildPythonPackage rec { pname = "PyQtWebEngine"; version = "5.15.4"; @@ -33,6 +35,8 @@ in buildPythonPackage rec { qtwebengine pyqt-builder pythonPackages.setuptools + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyquaternion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyquaternion/default.nix index 48c8d99117..feee5dcc6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyquaternion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyquaternion/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; pythonImportsCheck = [ "pyquaternion" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyquery/default.nix index 40139c7956..0e1203b901 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyquery/default.nix @@ -3,18 +3,23 @@ , cssselect , fetchPypi , lxml +, pytestCheckHook , pythonOlder +, requests +, webob +, webtest }: buildPythonPackage rec { pname = "pyquery"; - version = "1.4.3"; - disabled = pythonOlder "3.5"; + version = "2.0.0"; + disabled = pythonOlder "3.7"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "00p6f1dfma65192hc72dxd506491lsq3g5wgxqafi1xpg2w1xia6"; + hash = "sha256-lj6NTpAmL/bY3sBy6pcoXcN0ovacrXd29AgqvPah2K4="; }; propagatedBuildInputs = [ @@ -22,10 +27,23 @@ buildPythonPackage rec { lxml ]; - # circular dependency on webtest - doCheck = false; pythonImportsCheck = [ "pyquery" ]; + checkInputs = [ + pytestCheckHook + requests + webob + (webtest.overridePythonAttrs (_: { + # circular dependency + doCheck = false; + })) + ]; + + pytestFlagsArray = [ + # requires network + "--deselect=tests/test_pyquery.py::TestWebScrappingEncoding::test_get" + ]; + meta = with lib; { description = "A jquery-like library for Python"; homepage = "https://github.com/gawel/pyquery"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyquil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyquil/default.nix index 7fa842230f..72ba19f8a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyquil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyquil/default.nix @@ -12,7 +12,9 @@ , pytest-httpx , pytest-mock , pytestCheckHook +, pythonAtLeast , pythonOlder +, pythonRelaxDepsHook , qcs-api-client , respx , retry @@ -24,7 +26,7 @@ buildPythonPackage rec { pname = "pyquil"; - version = "3.3.2"; + version = "3.3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -32,12 +34,17 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rigetti"; repo = pname; - rev = "v${version}"; - hash = "sha256-Ur7dRxmnaAWXHk7c6NC3lBw59RRgh9vwAHFW00fViD4="; + rev = "refs/tags/v${version}"; + hash = "sha256-jA6nYQSfdxd9FCTMQlYTe/EbV39vV0h9F9Fgf1M0+SY="; }; + pythonRelaxDeps = [ + "lark" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -54,22 +61,19 @@ buildPythonPackage rec { importlib-metadata ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + checkInputs = [ pytest-asyncio pytest-freezegun pytest-httpx pytest-mock - pytestCheckHook respx ipython ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'lark = "^0.11.1"' 'lark = "*"' \ - --replace 'qcs-api-client = ">=0.8.1,<0.21.0"' 'qcs-api-client = "*"' - ''; - disabledTestPaths = [ # Tests require network access "test/e2e/" @@ -85,6 +89,8 @@ buildPythonPackage rec { "test/unit/test_reference_wavefunction.py" # Out-dated "test/unit/test_qpu_client.py" + "test/unit/test_qvm_client.py" + "test/unit/test_reference_density.py" ]; disabledTests = [ @@ -102,6 +108,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for creating Quantum Instruction Language (Quil) programs"; homepage = "https://github.com/rigetti/pyquil"; + changelog = "https://github.com/rigetti/pyquil/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqvrpro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqvrpro/default.nix index 0e12b339c0..f170050954 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqvrpro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqvrpro/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { untangle ]; - checkInputs = [ + nativeCheckInputs = [ pytest-vcr pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix index 97c8b6895c..dfcff9feb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { --replace "def testBindv6(self):" "def dontTestBindv6(self):" ''; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix index 11e7b778a4..899e1cfd7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrainbird/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , parameterized , pycryptodome +, pydantic , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -14,16 +15,16 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "0.7.1"; + version = "1.1.1"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = "jbarrancos"; + owner = "allenporter"; repo = pname; - rev = version; - hash = "sha256-pN/QILpXJoQAccB7CSDLxCDYfijf/VJbYw+NRUI4kvs="; + rev = "refs/tags/${version}"; + hash = "sha256-e+neyzH+sGTzGwdy/N7n6GUvctHlHQgwDkRQsnzL7Jw="; }; postPatch = '' @@ -36,11 +37,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycryptodome + pydantic pyyaml requests ]; - checkInputs = [ + nativeCheckInputs = [ parameterized pytest-aiohttp pytestCheckHook @@ -54,8 +56,8 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with Rainbird controllers"; - homepage = "https://github.com/jbarrancos/pyrainbird/"; - changelog = "https://github.com/jbarrancos/pyrainbird/releases/tag/${version}"; + homepage = "https://github.com/allenporter/pyrainbird"; + changelog = "https://github.com/allenporter/pyrainbird/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix index fb1feb7673..426459a67f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid/default.nix @@ -13,28 +13,48 @@ , webob , zope_deprecation , zope_interface +, pythonOlder }: buildPythonPackage rec { pname = "pyramid"; - version = "2.0"; + version = "2.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "45431b387587ed0fac6213b54d6e9f0936f0cc85238a8f5af7852fc9484c5c77"; + hash = "sha256-+r/XRQOeJq1bCRX8OW6HJcD4o9F7lB+WEezR7XbP59o="; }; - checkInputs = [ webtest zope_component ]; + propagatedBuildInputs = [ + hupper + pastedeploy + plaster + plaster-pastedeploy + repoze_lru + translationstring + venusian + webob + zope_deprecation + zope_interface + ]; - propagatedBuildInputs = [ hupper pastedeploy plaster plaster-pastedeploy repoze_lru translationstring venusian webob zope_deprecation zope_interface ]; + nativeCheckInputs = [ + webtest + zope_component + ]; - pythonImportsCheck = [ "pyramid" ]; + pythonImportsCheck = [ + "pyramid" + ]; meta = with lib; { - description = "The Pyramid Web Framework, a Pylons project"; + description = "Python web framework"; homepage = "https://trypyramid.com/"; + changelog = "https://github.com/Pylons/pyramid/blob/${version}/CHANGES.rst"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix index 9a529214c2..494a8e0c0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_beaker/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { py.test -k 'not test_includeme' pyramid_beaker/tests.py ''; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ beaker pyramid ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix index 87ccc32a3a..715dce1fbd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { zope_interface ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix index 8543a950a8..6ec35620cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { zope_deprecation ]; - checkInputs = [ + nativeCheckInputs = [ webtest pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrect/default.nix index 1d0a0ba022..f7c4a1b565 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrect/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-9lFV9t+bkptnyv+9V8CUfFrlRJ07WA0XgHS/+0egm3g="; }; - checkInputs = [ pytestCheckHook pygame ]; + nativeCheckInputs = [ pytestCheckHook pygame ]; preCheck = '' export LC_ALL="en_US.UTF-8" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix index 11595e0181..02c69a4615 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyregion/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { nativeBuildInputs = [ astropy-helpers cython ]; - checkInputs = [ pytestCheckHook pytest-astropy ]; + nativeCheckInputs = [ pytestCheckHook pytest-astropy ]; # Disable automatic update of the astropy-helper module postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyres/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyres/default.nix index a5b618d569..4aeccc1d36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyres/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyres/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { version = "1.5"; propagatedBuildInputs = [ simplejson setproctitle redis pkgs.ps ]; - checkInputs = [ nose pkgs.redis ]; + nativeCheckInputs = [ nose pkgs.redis ]; # PyPI tarball doesn't contain tests so let's use GitHub src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrevolve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrevolve/default.nix index 74fdc68c07..3d6a5f52dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrevolve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrevolve/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ versioneer cython ]; propagatedBuildInputs = [ contexttimer numpy ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # Using approach bellow bcs the tests fail with the pytestCheckHook, throwing the following error # ImportError: cannot import name 'crevolve' from partially initialized module 'pyrevolve' # (most likely due to a circular import) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix index 3c69d56a6a..389dff30ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pyserial ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrmvtransport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrmvtransport/default.nix index 1db84979e2..42d4771c76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrmvtransport/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrmvtransport/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio pytest-httpx 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 48bc622f4a..94e06834fe 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 @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pyro-ppl"; - version = "1.8.3"; + version = "1.8.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - hash = "sha256-Pt1DgbAg0S6KtQ6+ApjHpo0VC4oCT5mK2G/ax6MI1Q4="; + hash = "sha256-dm+tYeUt9IiF3pbUEhPaH46MG3ns8witUxifzRXBy0E="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyro4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyro4/default.nix index 96b0e08a56..7b0c8229c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyro4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyro4/default.nix @@ -1,12 +1,12 @@ { lib , buildPythonPackage -, fetchPypi -, serpent -, dill , cloudpickle +, dill +, fetchPypi , msgpack -, isPy27 , pytestCheckHook +, pythonAtLeast +, serpent }: buildPythonPackage rec { @@ -14,7 +14,9 @@ buildPythonPackage rec { version = "4.82"; format = "setuptools"; - disabled = isPy27; + # No support Python >= 3.11 + # https://github.com/irmen/Pyro4/issues/246 + disabled = pythonAtLeast "3.11"; src = fetchPypi { pname = "Pyro4"; @@ -32,17 +34,18 @@ buildPythonPackage rec { msgpack ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; # add testsupport.py to PATH - preCheck = "PYTHONPATH=tests/PyroTests:$PYTHONPATH"; + preCheck = '' + PYTHONPATH=tests/PyroTests:$PYTHONPATH + ''; - - pytestFlagsArray = [ + disabledTestPaths = [ # ignore network related tests, which fail in sandbox - "--ignore=tests/PyroTests/test_naming.py" + "tests/PyroTests/test_naming.py" ]; disabledTests = [ @@ -61,6 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed object middleware for Python (RPC)"; homepage = "https://github.com/irmen/Pyro4"; + changelog = "https://github.com/irmen/Pyro4/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix index 094711199a..7c469595ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyro5/default.nix @@ -1,36 +1,52 @@ -{ buildPythonPackage -, fetchPypi -, lib +{ lib , stdenv +, buildPythonPackage +, fetchPypi , serpent , pythonOlder , pytestCheckHook }: buildPythonPackage rec { - pname = "Pyro5"; + pname = "pyro5"; version = "5.14"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-ZP3OE3sP5TLohhTSRrfJi74KT0JnhsUkU5rNxeaUCGo="; + pname = "Pyro5"; + inherit version; + hash = "sha256-ZP3OE3sP5TLohhTSRrfJi74KT0JnhsUkU5rNxeaUCGo="; }; - propagatedBuildInputs = [ serpent ]; + propagatedBuildInputs = [ + serpent + ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - # ignore network related tests, which fail in sandbox - disabledTests = [ "StartNSfunc" "Broadcast" "GetIP" "TestNameServer" "TestBCSetup" ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ + disabledTests = [ + # Ignore network related tests, which fail in sandbox + "StartNSfunc" + "Broadcast" + "GetIP" + "TestNameServer" + "TestBCSetup" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "Socket" ]; + pythonImportsCheck = [ + "Pyro5" + ]; + meta = with lib; { description = "Distributed object middleware for Python (RPC)"; homepage = "https://github.com/irmen/Pyro5"; + changelog = "https://github.com/irmen/Pyro5/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix index bd5433c7a5..0dbc1880be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrogram/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pysocks ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix index 2d9efdf39e..b232a0bd8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.7.3"; + version = "0.7.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cEEEDbHC0Yf7zNFRSFsSRMQddYvoIXhYR5RjcOtrtwY="; + hash = "sha256-d1rO/vTSrOdZHmIAAL3zg8cMi3lpgEhw9sLYIE+iF+A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix index 3575868447..97abb766fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook hypothesis ]; + nativeCheckInputs = [ pytestCheckHook hypothesis ]; postPatch = '' substituteInPlace setup.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix index 461d0c19d8..abb0d4fd8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysam/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { export HTSLIB_INCLUDE_DIR=${htslib}/include ''; - checkInputs = [ + nativeCheckInputs = [ pytest bcftools htslib 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 d5aa54a556..5f67dc1a10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix @@ -59,7 +59,7 @@ in buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ mock pyasn1 pymongo3 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysatochip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysatochip/default.nix index 8c1401c2a7..f76d889ada 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysatochip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysatochip/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography ecdsa pyaes pyopenssl pyscard ]; - checkInputs = [ certifi ]; + nativeCheckInputs = [ certifi ]; pythonImportsCheck = [ "pysatochip" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysbd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysbd/default.nix index b85d1f6cd5..684846a0ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysbd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysbd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "12p7qm237z56hw4zr03n8rycgfymhki2m9c4w3ib0mvqq122a5dp"; }; - checkInputs = [ tqdm spacy ]; + nativeCheckInputs = [ tqdm spacy ]; doCheck = false; # requires pyconll and blingfire diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscf/default.nix index 84a4b4fb5b..362cb5daba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscf/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ nose nose-exclude ]; + nativeCheckInputs = [ nose nose-exclude ]; pythonImportsCheck = [ "pyscf" ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyschemes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyschemes/default.nix index 3b7eaa0da4..f6d1a62059 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyschemes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyschemes/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { sha256 = "sha256-vDaWxMrn2aC2wmd035EWRZ3cd/XME81z/BWG0f2T9jc="; }) ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscreeze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscreeze/default.nix index ddca8e72c2..b7059eecce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscreeze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscreeze/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; pythonImportsCheck = [ "pyscreeze" ]; - checkInputs = [ scrot xlib xvfb-run ]; + nativeCheckInputs = [ scrot xlib xvfb-run ]; checkPhase = '' python -m unittest tests.test_pillow_unavailable xvfb-run python -m unittest tests.test_pyscreeze diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix index 5153663c6e..ca40ac09ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-z0y4z+/JE6rZWHAvps/taDZvutyVhxxs2gMujV5rNu4="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ six ] ++ lib.optionals (pythonOlder "3.4") [ enum34 pathlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix index ad68da4478..54ada32137 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysensibo/default.nix @@ -1,22 +1,20 @@ { lib , aiohttp , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder }: buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.24"; + version = "1.0.25"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "andrey-git"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-lLorBf4HjynkTyLfKGcxEpSzyCawjKDej/HFtHl/Ar8="; + src = fetchPypi { + inherit pname version; + hash = "sha256-AZpqV/CQ8TLKjaee9b0Zbu6WfnGNenKIvot+TTTSikg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysensors/default.nix index e7d3697da0..0c8e324402 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysensors/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { # due to sandboxing doCheck = false; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyserial/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyserial/default.nix index 7eed44d0fb..a515c5acfc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyserial/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyserial/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = !stdenv.hostPlatform.isDarwin; # broken on darwin - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "test" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix index f3d2589d62..272672c2db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - checkInputs = [ py pytestCheckHook wireshark-cli ]; + nativeCheckInputs = [ py pytestCheckHook wireshark-cli ]; pythonImportsCheck = [ "pyshark" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix index ce4d09ba17..280e4cb767 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-yfxhgk8a1rdpGVkE1sjJqT6tiFLimhu2m2SjGxLI6wo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysiaalarm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysiaalarm/default.nix index c06e1ed32a..5885491a61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysiaalarm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysiaalarm/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pycryptodome ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-cases pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix index 5a8a803400..ca99e542c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-elasticsearch/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pysigma-backend-elasticsearch"; - version = "0.1.2"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-elasticsearch"; rev = "refs/tags/v${version}"; - hash = "sha256-HzvL6b2zeUrAAJ4mmKPOacZzHVVxfs3gjzP+fZIhApI="; + hash = "sha256-EDs1ZBjwZCNrZMiH0Lcp2NyxQhGHygUMNBEU/5zuUYI="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { pysigma ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix index ed6e78447b..41c0e2723f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-insightidr/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { "pysigma" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix index 3e4dbef22a..f3a7f7d154 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-opensearch/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pysigma-backend-opensearch"; - version = "0.1.4"; + version = "0.1.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SigmaHQ"; repo = "pySigma-backend-opensearch"; rev = "refs/tags/v${version}"; - hash = "sha256-ZcX8LK/qckNEhMWljv73QHtWv4IY7Xtr4ISrlnrUaAY="; + hash = "sha256-j8BiO/7wp1TRSK+C5cPSgF72CuBpb2jLhJXRJLHgh5I="; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { pysigma-backend-elasticsearch ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix index 00b9659c28..212bb09746 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pysigma ]; - checkInputs = [ + nativeCheckInputs = [ pysigma-pipeline-sysmon pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix index 7fab211f18..3f49622ac1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-splunk/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pysigma ]; - checkInputs = [ + nativeCheckInputs = [ pysigma-pipeline-sysmon pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix index a9e3e01667..da424e133c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-crowdstrike/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pysigma ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix index dc8e21bc81..274236cb39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-sysmon/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pysigma ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix index 88e10b35b8..33f1b2ee76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-pipeline-windows/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pysigma ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix index 633f754fdf..67d037789c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmart/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmart/default.nix index afc4ae3a7f..f0ec07437b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmart/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmart/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysmart"; - version = "1.2.2"; + version = "1.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "truenas"; repo = "py-SMART"; rev = "refs/tags/v${version}"; - hash = "sha256-qZJwUxU9LSKXpftBuKFnxI4gygHIuJEwGJqFaBlCudc="; + hash = "sha256-5VoZEgHWmHUDkm2KhBP0gfmhOJUYJUqDLWBp/kU1404="; }; postPatch = '' @@ -30,7 +30,7 @@ buildPythonPackage rec { humanfriendly ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix index a4ab8e5838..b14d0bf5af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmartapp/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { httpsig ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix index 8e97570a2c..cfdc691539 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmartthings/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmf/default.nix index 3b350954ea..2fc1637d22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmf/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ libsmf glib ]; meta = with lib; { - homepage = "http://das.nasophon.de/pysmf/"; + homepage = "https://das.nasophon.de/pysmf/"; description = "Python extension module for reading and writing Standard MIDI Files, based on libsmf."; license = licenses.bsd2; maintainers = [ ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmt/default.nix index 3f003aa9fb..6a08234312 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmt/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-cE+WmKzggYof/olxQb5M7xPsBONr39KdjOTG4ofYPUM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysnmp-pyasn1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysnmp-pyasn1/default.nix index 3caccf688b..5da547e5eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysnmp-pyasn1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysnmp-pyasn1/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix index 370ed373da..e8a6727ae6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysnooper/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-0X3JHMoVk8ECMNzkXkax0/8PiRDww46UHt9roSYLOCA="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix index 31a884a69d..7cf1205ed3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysnooz/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { transitions ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytest-asyncio pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix index 36e45d9d86..d3ad4bee17 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysnow/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ httpretty pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix index 726b37946b..6309cfc034 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysolcast/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pysolcast"; - version = "1.0.13"; + version = "1.0.14"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mcaulifn"; repo = "solcast"; rev = "refs/tags/v${version}"; - hash = "sha256-peoC6NrenfQYqr1hgPth8pqyTRZb+phD6UQhjnZF92U="; + hash = "sha256-SI8lRihzJClciPLX9DXOO0K7YWgix74aM784j7fVu/g="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -36,7 +36,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysolr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysolr/default.nix index a7f34b9c13..1e2e3d5dbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysolr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysolr/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; doCheck = false; # requires network access diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix index 132c904dc3..b9c4a1e9b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysonos/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix index 7a40985457..612a22d74a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspellchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspellchecker/default.nix index 462ed0f0b1..77e3f04e6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyspellchecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspellchecker/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix index 303310a6b5..b6c9dfcd1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ruamel-yaml ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix index 36d223b768..9656afa275 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysqueezebox/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysrt/default.nix index 1099bffc40..ff48960f81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysrt/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1f5hxyzlh5mdvvi52qapys9qcinffr6ghgivb6k4jxa92cbs3mfg"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests -v ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystache/default.nix index b3270c5e73..4c408d3ad6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystache/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { # https://github.com/defunkt/pystache/issues/181 doCheck = !isPy3k; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix index 763ac34c51..0d46312152 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystemd/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config ]; - checkInputs = [ pytest mock ]; + nativeCheckInputs = [ pytest mock ]; checkPhase = "pytest tests"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix index 975f940da6..03fb3213d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = [ gobject-introspection sphinx ]; propagatedBuildInputs = [ pillow xlib six pygobject3 gtk3 libayatana-appindicator ]; - checkInputs = [ xvfb-run ]; + nativeCheckInputs = [ xvfb-run ]; checkPhase = '' rm tests/icon_tests.py # test needs user input diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix index c2df3f72ce..db7848a928 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "pysvn"; - version = "1.9.18"; + version = "1.9.20"; format = "other"; src = fetchurl { - url = "https://pysvn.barrys-emacs.org/source_kits/${pname}-${version}.tar.gz"; - hash = "sha256-lUPsNumMYwZoiR1Gt/hqdLLoHOZybRxwvu9+eU1CY78="; + url = "mirror://sourceforge/project/pysvn/pysvn/V${version}/pysvn-${version}.tar.gz"; + hash = "sha256-LbAz+KjEY3nkSJAzJNwlnSRYoWr4i1ITRUPV3ZBH7cc="; }; patches = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { --svn-bin-dir=${subversion.out}/bin ''; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; checkPhase = '' runHook preCheck @@ -62,8 +62,7 @@ buildPythonPackage rec { runHook postCheck ''; - # FIXME https://github.com/NixOS/nixpkgs/issues/175227 - # pythonImportsCheck = [ "pysvn" ]; + pythonImportsCheck = [ "pysvn" ]; installPhase = '' dest=$(toPythonPath $out)/pysvn diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbee/default.nix index 4ee6f81ac3..978fc21ac9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbee/default.nix @@ -1,4 +1,5 @@ { lib +, awesomeversion , buildPythonPackage , aiohttp , fetchFromGitHub @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "pyswitchbee"; - version = "1.7.18"; + version = "1.7.21"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "jafar-atili"; repo = "pySwitchbee"; rev = "refs/tags/${version}"; - hash = "sha256-LQjtePFSMvZdAGH6f8CveaE7ASm/x9GuFj9s3TipYHQ="; + hash = "sha256-3Ujs9GgdJm69vb8F00ZWaRgWXxkaPguX5DJ71bqOFec="; }; nativeBuildInputs = [ @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + awesomeversion packaging ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix index 6d7596e69e..801dabdf4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbot/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.36.4"; + version = "0.37.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-3n3TtyzosWsdnzT2m2s55hnY45Yjj7kJS3rv/5LTSSg="; + hash = "sha256-6td0ueo21h3B2ITV6wXehiwDPIB8+4m0K5hnMm8Mu54="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix index ae670c709a..d5623fff63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix @@ -1,26 +1,34 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder }: buildPythonPackage rec { pname = "pysyncobj"; - version = "0.3.11"; + version = "0.3.12"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bakwc"; repo = "PySyncObj"; - rev = version; - sha256 = "sha256-MsyEDRla+okamffm78hoC2OwhjHLvCDQeZCzPZPbGy4="; + rev = "refs/tags/${version}"; + hash = "sha256-ZWzvvv13g/iypm+MIl5q0Y8ekqzZEY5upSTPk3MFTPI="; }; # Tests require network features doCheck = false; - pythonImportsCheck = [ "pysyncobj" ]; + + pythonImportsCheck = [ + "pysyncobj" + ]; meta = with lib; { description = "Python library for replicating your class"; homepage = "https://github.com/bakwc/PySyncObj"; + changelog = "https://github.com/bakwc/PySyncObj/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytado/default.nix index fcff8365ff..44d38fb663 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytado/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix index cd51421fbc..909dad99fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytaglib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { taglib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytap2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytap2/default.nix index 3823f02703..7f5f656fdd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytap2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytap2/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { nettools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytautulli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytautulli/default.nix index b21b218422..5d2c51675c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytautulli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytautulli/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytautulli"; - version = "21.11.0"; + version = "23.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = pname; - rev = version; - sha256 = "sha256-zODU3aN+8Fdw/GQ/EfZhn6kOuLDARKgLULzRw2+b2BM="; + rev = "refs/tags/${version}"; + hash = "sha256-5wE8FjLFu1oQkVqnWsbp253dsQ1/QGWC6hHSIFwLajY="; }; postPatch = '' @@ -33,10 +33,13 @@ buildPythonPackage rec { aiohttp ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + checkInputs = [ aresponses pytest-asyncio - pytestCheckHook ]; pytestFlagsArray = [ @@ -50,6 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to get information from Tautulli"; homepage = "https://github.com/ludeeus/pytautulli"; + changelog = "https://github.com/ludeeus/pytautulli/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyte/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyte/default.nix index e703a93446..604df3ed09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyte/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyte/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wcwidth ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pyte" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix index f4b3e4b43e..0f3cd981ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytenable/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ responses pytest-datafiles pytest-vcr diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix new file mode 100644 index 0000000000..aed37ab142 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytensor/default.nix @@ -0,0 +1,95 @@ +{ stdenv +, lib +, buildPythonPackage +, cons +, cython +, etuples +, fetchFromGitHub +, filelock +, jax +, jaxlib +, logical-unification +, minikanren +, numba +, numba-scipy +, numpy +, pytestCheckHook +, pythonOlder +, scipy +, typing-extensions +}: + +buildPythonPackage rec { + pname = "pytensor"; + version = "2.9.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pymc-devs"; + repo = pname; + rev = "refs/tags/rel-${version}"; + hash = "sha256-vuZHiDbGg55lXr9BwPT66Hy8RUe/RfYVaV57i/YlBwg="; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + cons + etuples + filelock + logical-unification + minikanren + numpy + scipy + typing-extensions + ]; + + checkInputs = [ + jax + jaxlib + numba + numba-scipy + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--durations=50" "" + ''; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "pytensor" + ]; + + disabledTests = [ + # benchmarks (require pytest-benchmark): + "test_elemwise_speed" + "test_logsumexp_benchmark" + "test_scan_multiple_output" + ]; + + disabledTestPaths = [ + # Don't run the most compute-intense tests + "tests/scan/" + "tests/tensor/" + "tests/sandbox/" + "tests/sparse/sandbox/" + ]; + + meta = with lib; { + description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays"; + homepage = "https://github.com/pymc-devs/pytensor"; + changelog = "https://github.com/pymc-devs/pytensor/releases"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + broken = (stdenv.isLinux && stdenv.isAarch64); + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix index e38af1f893..5054e11f45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { pillow ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://pypi.org/project/pytesseract/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-aio/default.nix index 09c278a70e..a37a8cd670 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-aio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-aio/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ anyio curio hypothesis diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix index a1e43a2843..4a70b0d980 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pytest-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix index ee8d7caf77..c28d468865 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { # requires pandoc < 2.0 # buildInputs = [ setuptools-markdown ]; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; propagatedBuildInputs = [ ansible ]; # tests not included with release, even on github diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix index 4d95058b93..aa88d42813 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy-header/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/tests.nix index 17e60e4369..6a47151311 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/tests.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pytest-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ flaky hypothesis pytest-trio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-base-url/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-base-url/default.nix index d388c840a0..f34c6c8c3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-base-url/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-base-url/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-localserver ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix index 8490fba2b3..fb86c3b043 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix index b9def8d834..6fd0cefb51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-benchmark"; - version = "3.4.1"; + version = "4.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "ionelmc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qc/8Epax5bPUZvhq42xSj6NUq0T4gbO5dDDS6omWBOU="; + hash = "sha256-f9Ty4+5PycraxoLUSa9JFusV5Cot6bBWKfOGHZIRR3o="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix index bda2aec16c..9e85ceb51c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-check/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cid/default.nix index 767d300f7d..ba55304009 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cid/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { py-cid ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix index 82e6409c9b..6cf3db2bd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "pytest plugin for click"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix index b01d2d2b7d..1cf1db5fe1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-console-scripts/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cram/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cram/default.nix index 55ee719cd2..44322ef2d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cram/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cram/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { version = "0.2.2"; pname = "pytest-cram"; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ cram ]; src = fetchPypi { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix index 58ad575d63..e57292b774 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-datadir/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pytest_datadir" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix index fb960c13de..5215dad5ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix index c583288b40..91e59bf903 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-dependency/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-describe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-describe/default.nix index 52e7764ce4..b659445267 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-describe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-describe/default.nix @@ -27,7 +27,7 @@ buildPythonPackage { pytest ]; - checkInputs = [ + nativeCheckInputs = [ py pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix index c4668def27..f78a637a5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-django/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ pytest setuptools-scm ]; - checkInputs = [ pytest django-configurations pytest-xdist six ]; + nativeCheckInputs = [ pytest django-configurations pytest-xdist six ]; propagatedBuildInputs = [ django ]; # Complicated. Requires Django setup. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix index 531e21fc4b..4f520f3e8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-dotenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-dotenv/default.nix index 3ae89e6a51..05e5da7ffd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-dotenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-dotenv/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; propagatedBuildInputs = [ python-dotenv ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "A pytest plugin that parses environment files before running tests"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-env/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-env/default.nix index 6947f56b8b..3d68c2dccc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-env/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-env/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-error-for-skips/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-error-for-skips/default.nix index 60d3f16a1c..7ed7972792 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-error-for-skips/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-error-for-skips/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pytest_error_for_skips" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix index eea6c61a72..77290573dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-factoryboy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { inflection ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytestcache diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix index 9142d3d627..054170408b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { pytest-cov ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix index 2416781428..fab7bab0ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { flake8 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix index afa04dfe93..ae92c18766 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flakes/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; propagatedBuildInputs = [ pyflakes ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # no longer passes doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix index 2feb14f012..80b294445f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-forked/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { py ]; - checkInputs = [ + nativeCheckInputs = [ py pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix index 56752fe482..95ccd9b77c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezegun/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { freezegun ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezer/default.nix index 16eb2420f0..8621eeee80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-freezer/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { freezegun ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-golden/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-golden/default.nix index 9d1ba62df4..dede2e30b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-golden/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-golden/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { testfixtures ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index f7d6ce3126..7ac3fdc47f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-declarative-requirements setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pytest_helpers_namespace" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix index c83724fa80..0020076a1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { --replace "assert response.headers['Location'].startswith('https://')" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix index eebbcacb50..1c69f426b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { werkzeug ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests toml 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 45c094d9f3..f8dbcffa9d 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 @@ -30,7 +30,7 @@ buildPythonPackage rec { httpx ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-instafail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-instafail/default.nix index f9942dd5bc..35e8598e26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-instafail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-instafail/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "10lpr6mjcinabqynj6v85bvb1xmapnhqmg50nys1r6hg7zgky9qr"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pytest_instafail" ]; meta = { description = "pytest plugin that shows failures and errors instantly instead of waiting until the end of test session"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix index 234742f2e6..6298d18ed0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , importlib-metadata , isort , poetry-core @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "pytest-isort"; - version = "3.0.0"; + version = "3.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "stephrdev"; repo = pname; - rev = version; - hash = "sha256-gbEO3HBDeZ+nUACzpeV6iVuCdNHS5956wFzIYkbam+M="; + rev = "refs/tags/${version}"; + hash = "sha256-1oCVIi0sXwac4AufScJJRsfvBwaBAwlMBRNqLcUXEh4="; }; nativeBuildInputs = [ @@ -38,19 +37,10 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; - patches = [ - # Can be removed with the next release, https://github.com/stephrdev/pytest-isort/pull/44 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/stephrdev/pytest-isort/commit/f17ed2d294ae90e415d051e1c720982e3dd01bff.patch"; - sha256 = "sha256-PiOs0c61BNx/tZN11DYblOd7tNzGthNnlkmYMTI9v18="; - }) - ]; - pythonImportsCheck = [ "pytest_isort" ]; @@ -58,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to perform isort checks (import ordering)"; homepage = "https://github.com/moccu/pytest-isort/"; + changelog = "https://github.com/stephrdev/pytest-isort/blob/${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix index 95a0bcb325..335f2de30a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytest-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytest-xdist pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix index def50bf46d..f9e49cf091 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix @@ -57,7 +57,7 @@ let self = buildPythonPackage rec { doCheck = false; # infinite recursion with jupyter-server - checkInputs = [ + nativeCheckInputs = [ pytest-timeout pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-lazy-fixture/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-lazy-fixture/default.nix index 2b9c57b99d..8f41c5c55b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-lazy-fixture/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-lazy-fixture/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1b0hmnsxw4s2wf9pks8dg6dfy5cx3zcbzs8517lfccxsfizhqz8f"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-logdog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-logdog/default.nix index bba0f092fd..f9bd63d8ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-logdog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-logdog/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix index 7555ed351e..7d1ec8696c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-metadata/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix index 3e35bcba1b..7dc15e3cd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mock/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mockito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mockito/default.nix index 240cf44343..279b04b83e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mockito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mockito/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { mockito ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mockservers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mockservers/default.nix index 4022befcb1..d65b29d766 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mockservers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mockservers/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pytest-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix index e5bf251def..6f7ccd02e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mpl/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pillow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix index f2b2c5ae7c..61fa877d9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-mypy-plugins/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { regex ]; - checkInputs = [ + nativeCheckInputs = [ mypy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix index 573dbf2751..f076417fbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Pytest plugin for detecting inadvertent open file handles"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix index e40e0671bc..46ba61cef6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-order/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist pytest-dependency diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix index c5e8a786b5..5156aa35a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ordering/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "1xim0kj5g37p1skgvp8gdylpx949krmx60w3pw6j1m1h7sakmddn"; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-param-files/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-param-files/default.nix index c2ed3da536..0cbdcf92dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-param-files/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-param-files/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytest_param_files" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-plt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-plt/default.nix index 2c995aaeff..b1546e3684 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-plt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-plt/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-IkTNlierFXIG9WSVUfVoirfQ6z7JOYlCaa5NhnBSuxc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook matplotlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix index f1d8707a3a..3d7a5a86fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pyqt5 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-raises/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-raises/default.nix index 7891437909..68c23064af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-raises/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-raises/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0gbb4kml2qv7flp66i73mgb4qihdaybb6c96b5dw3mhydhymcsy2"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix index 8bb8c6d063..7e05104ff6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ factory_boy faker numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix index 08269f054a..73337221c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook matplotlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix index 46a95c725d..b07d603c1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { decorator ]; - checkInputs = [ + nativeCheckInputs = [ invocations invoke pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix index 58595980ad..1529796bab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix index 1b37212821..61d7d22b29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix index 8ea63cfa5f..a0e9bb1fb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; - checkInputs = [ mock pytest ]; + nativeCheckInputs = [ mock pytest ]; checkPhase = '' py.test test_pytest_rerunfailures.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-resource-path/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-resource-path/default.nix index 7476801794..f82e5a661e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-resource-path/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-resource-path/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { colorama ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix index 2bce8eaecb..ae907034a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ sanic pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix index 64b0ff0c1d..480c15b87c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-shutil/default.nix @@ -11,7 +11,6 @@ , mock , path , execnet -, contextlib2 , termcolor , six @@ -32,6 +31,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ + --replace "contextlib2" 'contextlib2;python_version<"3"' \ --replace "path.py" "path" ''; @@ -44,12 +44,11 @@ buildPythonPackage rec { mock path execnet - contextlib2 termcolor six ]; - checkInputs = [ + nativeCheckInputs = [ cmdline pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix index 0d24f8fa20..707c002380 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-subprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-subprocess/default.nix index 7dc1bd9d08..d3ea76b8a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-subprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-subprocess/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-subprocess"; - version = "1.4.2"; + version = "1.5.0"; disabled = pythonOlder "3.6"; @@ -21,14 +21,14 @@ buildPythonPackage rec { owner = "aklajnert"; repo = "pytest-subprocess"; rev = "refs/tags/${version}"; - hash = "sha256-8Of3/RltijfF5MXtVazGzIqpmRIhreT26kLNjzXLF1k="; + hash = "sha256-u9d9RhbikOyknMWs18j2efYJb9YdHsQrp31LfcbudoA="; }; buildInputs = [ pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook docutils pygments diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix index 8ada20dce8..60947ed117 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-subtests/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix index 4377990df3..a738aacaca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-tap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-tap/default.nix index dd545a5b6d..32b12ddcc2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-tap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-tap/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { tappy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-test-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-test-utils/default.nix index fd5022dac4..1d15abd4b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-test-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-test-utils/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 1b9ab4c833..dcdfba7285 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 @@ -1,23 +1,31 @@ { lib , buildPythonPackage , coverage -, fetchPypi +, fetchFromGitHub +, poetry-core , pytest , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.4.2"; - format = "setuptools"; + version = "1.4.5"; + format = "pyproject"; disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-3tYW0RWRbbGKbPpXWuqJ79sRWMj+vnffS0XNa7Yb0fw="; + src = fetchFromGitHub { + owner = "tarpas"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-RHzPLCC33bPEk59rin4CZD3F7fsT1qyRR2HRyDIwszo="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ pytest ]; @@ -36,7 +44,8 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plug-in which automatically selects and re-executes only tests affected by recent changes"; homepage = "https://github.com/tarpas/pytest-testmon/"; - license = licenses.mit; + changelog = "https://github.com/tarpas/pytest-testmon/releases/tag/v${version}"; + license = licenses.agpl3Only; maintainers = with maintainers; [ dmvianna ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix index e380068c59..b41c6f173f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-timeout/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pexpect pytest-cov diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornasync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornasync/default.nix index f037ab86d5..ac2cf07736 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornasync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornasync/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { tornado ]; - checkInputs = [ + nativeCheckInputs = [ pytest tornado ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix index e42ed5c683..e65e494a54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-trio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { outcome ]; - checkInputs = [ + nativeCheckInputs = [ pytest hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-unordered/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-unordered/default.nix index 5bf17834e0..b47536983e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-unordered/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-unordered/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pytest ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix index c4a66cc48e..0feb637f4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "03w2zz3crblj1p6i8nq17946hbn3zqp9z7cfnifw47hi4a4fww12"; }; - checkInputs = [ pytest pytest-cov mock cmdline ]; + nativeCheckInputs = [ pytest pytest-cov mock cmdline ]; propagatedBuildInputs = [ pytest-fixture-config pytest-shutil virtualenv ]; checkPhase = "py.test tests/unit "; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix index 9efbd95cff..8d120459f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xdist/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { execnet ]; - checkInputs = [ + nativeCheckInputs = [ filelock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest/tests.nix index 76581b1f3d..3fc078148b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest/tests.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ hypothesis pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix index c5c3a93c3b..1763ed44d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-arango/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pyjwt ]; - checkInputs = [ + nativeCheckInputs = [ arangodb mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix index 19fad9db27..a3de0366c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-awair/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook vcrpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-barcode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-barcode/default.nix index 5d64f933b6..dc54f7075f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-barcode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-barcode/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace "--no-cov-on-fail" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.images; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix index 2f01176f8c..446fbfcd9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.28.0"; + version = "0.28.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-o5WeqAVg1oGumkQbWeBNJgWgHxz5UOvYpnHt8NviTKA="; + hash = "sha256-6gzmVOuJfNpNJlea4Am20HI98mgcKkwtU/28l7qg20Y="; }; nativeBuildInputs = [ @@ -60,7 +60,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ orjson pytestCheckHook python-decouple diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix index f5cd9b29f5..3641ac73b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-binance/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix index 777c54a66e..7fabc513e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.all; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix index 6037f9802b..11d3bdc3ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-bsblan/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "0.5.8"; + version = "0.5.9"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "liudger"; repo = pname; - rev = "v${version}"; - hash = "sha256-pLqX+gbY71OsLflTyDuL4revj5dXol//eTFVy8iT9O4="; + rev = "refs/tags/v${version}"; + hash = "sha256-9WXj/zFFzPr3YabdEYN+Xn/IwKplPFdHAFDB2S2JUEI="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytest-mock @@ -58,6 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to control and monitor an BSBLan device programmatically"; homepage = "https://github.com/liudger/python-bsblan"; + changelog = "https://github.com/liudger/python-bsblan/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix index 8fd4e3d8fb..3e920ff6b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { stevedore ]; - checkInputs = [ + nativeCheckInputs = [ ddt oslo-serialization requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-constraint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-constraint/default.nix index e6fcc4f8ab..d26d7e91c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-constraint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-constraint/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "1dv11406yxmmgkkhwzqicajbg2bmla5xfad7lv57zyahxz8jzz94"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix index f4f0f107f5..f48bc9c13e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { rm -r pycrfsuite ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix index 644d00fb33..c75dc71e0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-crontab/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix index cc12b14aa1..4e67546fad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { lockfile ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook testscenarios testtools diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-datemath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-datemath/default.nix index 0dc6b60345..9da7ed1c5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-datemath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-datemath/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { arrow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix index 06bc1ff0ca..a36f367ba4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix @@ -39,7 +39,7 @@ in buildPythonPackage rec { dbus-python ]; - checkInputs = [ + nativeCheckInputs = [ dbus pygobject3 bluez diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-decouple/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-decouple/default.nix index 9c9ca292d4..5907be3a22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-decouple/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-decouple/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-sCUlE+92+nG7ZHuGKXRJVx2wokNP7/F7g8LvdRWqHCQ="; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix index f58da984f8..4ea41cf68a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-didl-lite/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { defusedxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-docx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-docx/default.nix index fd22adc377..36146bbe05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-docx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-docx/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1105d233a0956dd8dd1e710d20b159e2d72ac3c301041b95f4d4ceb3e0ebebc4"; }; - checkInputs = [ behave mock pyparsing pytest ]; + nativeCheckInputs = [ behave mock pyparsing pytest ]; propagatedBuildInputs = [ lxml ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix index 85e5034d6e..8038faf2ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; - checkInputs = [ + nativeCheckInputs = [ ipython mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index a23de9c8d7..f1a079d589 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , eventlet , fetchFromGitHub +, fetchpatch , iana-etc , libredirect , mock @@ -24,11 +25,20 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno="; }; - checkInputs = [ + patches = [ + # Address Python 3.11 mocking issue, https://github.com/miguelgrinberg/python-engineio/issues/279 + (fetchpatch { + name = "mocking-issue-py311.patch"; + url = "https://github.com/miguelgrinberg/python-engineio/commit/ac3911356fbe933afa7c11d56141f0e228c01528.patch"; + hash = "sha256-LNMhjX8kqOI3y8XugCHxCPEC6lF83NROfIczXWiLuqY="; + }) + ]; + + nativeCheckInputs = [ aiohttp eventlet mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix index 991ec3279d..4117c5adf2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-forecastio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; propagatedBuildInputs = [ requests responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix index e00ef7d9de..1019b058e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-frontmatter/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { # tries to import test.test, which conflicts with module # exported by python interpreter doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix index 0d458bd367..3787761017 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-fsutil/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 ec8d5841ba..23ad1ac8b5 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 @@ -30,7 +30,7 @@ buildPythonPackage rec { ]; # Check with the next release if tests could be run with pytest - # checkInputs = [ pytestCheckHook ]; + # nativeCheckInputs = [ pytestCheckHook ]; # Don't run tests for now doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix index 560e0db142..2c55dce69e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { pyopenssl ]; - checkInputs = [ + nativeCheckInputs = [ stestr testscenarios ddt diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix index d1ae7b80bf..1bf1431da1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix index 0a7af2f40d..5210bc79e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { paramiko ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix index df1fc0dc45..9756572223 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ stestr testscenarios requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-hglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-hglib/default.nix index aa47f9a331..41f25d8f70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-hglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-hglib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-sYvR7VPJDuV9VxTWata7crZOkw1K7KmDCJLAi7KNpgg="; }; - checkInputs = [ mercurial nose ]; + nativeCheckInputs = [ mercurial nose ]; preCheck = '' export HGTMP=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix index c5364d7a1a..b7eaa9f3e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "1.3.1"; + version = "1.8.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rj3WTDj2ey8unOxXkD4zbqwd0FDcyHPzsDrjtX7myj4="; + hash = "sha256-ab+Fa7Dc2mHGy5C5PfoBfXIb/eugCyGrWjTYlJmTQE0="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix index 4eca7cca13..1a9757dfc2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { substituteInPlace python_hosts/utils.py --replace "import win_inet_pton" "" ''; - checkInputs = [ pyyaml pytest pytest-cov ]; + nativeCheckInputs = [ pyyaml pytest pytest-cov ]; # Removing 1 test file (it requires internet connection) and keeping the other two checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix index b108de64dd..2223a5db93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-8Qs5Jw0LMV2UucLnlFKJQ2PUhYaQx6uJdIV/4gaPH3w="; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-i18n/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-i18n/default.nix index 8e7f8f880e..d12d8b8413 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-i18n/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-i18n/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "6FahoHZqaOWYGaT9RqLARCm2kLfUIlYuauB6+0eX7jA="; }; - checkInputs = [ pytestCheckHook pyyaml ]; + nativeCheckInputs = [ pytestCheckHook pyyaml ]; pytestFlagsArray = [ "i18n/tests/run_tests.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ipmi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ipmi/default.nix index 08c23dfb5d..9ee03dc891 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-ipmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ipmi/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ + nativeCheckInputs = [ mock nose pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix index bf41e95739..0214a6b0d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { stevedore ]; - checkInputs = [ + nativeCheckInputs = [ stestr requests-mock oslotest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-izone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-izone/default.nix index b4dac08811..19dbbf733d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-izone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-izone/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { netifaces ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aio pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix index dad933966a..863ab45ed5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-jenkins/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { buildInputs = [ mock ]; propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ]; - checkInputs = [ stestr testscenarios requests-mock ]; + nativeCheckInputs = [ stestr testscenarios requests-mock ]; checkPhase = '' stestr run ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix index 5ba5d9c8dd..dd3d56c6c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-jose/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { rsa ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix index 33b4140181..b49d8df61a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-dk12IXX5n8xGML1IU7CWMqy2CmIkrLJ84IzXDwsbgb0="; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { homepage = "https://github.com/madzak/python-json-logger"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix index a8cbec25a9..d60c1edcf9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sed -i "s/version=versioneer.get_version(),/version=\"$version\",/g" setup.py ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock pytest-cov coverage ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix index 7f55dd64b9..36cf7d737a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix index 55fb3fff31..f92816afc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pbr ]; - checkInputs = [ + nativeCheckInputs = [ openssl requests-mock stestr diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix index f8844c5eae..db9565607a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ldap/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pyasn1-modules ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-louvain/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-louvain/default.nix index 699fc97f58..36c973db74 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-louvain/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-louvain/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "community" ]; - checkInputs = [ pandas scipy ]; + nativeCheckInputs = [ pandas scipy ]; meta = with lib; { homepage = "https://github.com/taynaud/python-louvain"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix index ee66ea262c..86a6995f05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-black/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-qNA6Bj1VI0YEtRuvcMQZGWakQNNrJ2PqhozrLmQHPAg="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ black python-lsp-server toml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix index 6938bc282f..d45febae13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ujson ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 01dc904293..a026eb15fa 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 @@ -18,6 +18,7 @@ , pylint , pyqt5 , pytestCheckHook +, pythonRelaxDepsHook , python-lsp-jsonrpc , pythonOlder , rope @@ -32,7 +33,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.7.0"; + version = "1.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,7 +42,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s="; + hash = "sha256-Rx8mHBmJw4gh0FtQBVMmOlQklODplrhnWwzsEhQm4NE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -49,15 +50,20 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ - --replace "--cov pylsp --cov test" "" \ - --replace "autopep8>=1.6.0,<1.7.0" "autopep8" \ - --replace "flake8>=5.0.0,<7" "flake8" \ - --replace "mccabe>=0.7.0,<0.8.0" "mccabe" \ - --replace "pycodestyle>=2.9.0,<2.11.0" "pycodestyle" \ - --replace "pyflakes>=2.5.0,<3.1.0" "pyflakes" + --replace "--cov pylsp --cov test" "" ''; + pythonRelaxDeps = [ + "autopep8" + "flake8" + "mccabe" + "pycodestyle" + "pydocstyle" + "pyflakes" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools-scm ]; @@ -117,7 +123,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ flaky matplotlib numpy @@ -130,6 +136,8 @@ buildPythonPackage rec { ]; disabledTests = [ + # Don't run lint tests + "test_pydocstyle" # https://github.com/python-lsp/python-lsp-server/issues/243 "test_numpy_completions" "test_workspace_loads_pycodestyle_config" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lzo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lzo/default.nix index dcf55e8e32..38a31fbb6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lzo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lzo/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { buildInputs = [ lzo ]; propagatedBuildInputs = [ ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { homepage = "https://github.com/jd-boyd/python-lzo"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix index 3338fb6fa7..725849fee0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { export LC_ALL=en_US.UTF-8 ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/tests.nix index 6161545622..37357d779b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/tests.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ python-manilaclient stestr ddt diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix index 3e7b704632..4716177f51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix @@ -90,7 +90,7 @@ buildPythonPackage rec { export XMLPARSER=libxml2 ''; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix index 0b6d01746b..959448d2ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-markdown-math/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "8564212af679fc18d53f38681f16080fcd3d186073f23825c7ce86fadd3e3635"; }; - checkInputs = [ markdown ]; + nativeCheckInputs = [ markdown ]; meta = { description = "Math extension for Python-Markdown"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix index 06d96a6d6d..d7dfee0863 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-matter-server/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "python-matter-server"; - version = "1.0.8"; + version = "2.0.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-7w2Gg70Sl84zs55z6Hg8JPtkY9dNzyb1iBC6O4ulr1M="; + hash = "sha256-9Lb5Q54hPdyqMjrHvwBzVXPk8uKBLNRUl2Bljo64Fpo="; }; nativeBuildInputs = [ @@ -57,14 +57,14 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); preCheck = let - pythonEnv = python.withPackages (_: propagatedBuildInputs ++ checkInputs ++ [ pytest ]); + pythonEnv = python.withPackages (_: propagatedBuildInputs ++ nativeCheckInputs ++ [ pytest ]); in '' export PYTHONPATH=${pythonEnv}/${python.sitePackages} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-memcached/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-memcached/default.nix index 1f69062a64..180e70f1c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-memcached/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-memcached/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix index 7e76da69c5..1d900d3d7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-mimeparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-mimeparse/default.nix index ab91a5d5e2..e5aa879136 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-mimeparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-mimeparse/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix index 3bf07bd1d5..edf3db11d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-multipart/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { --replace "yaml.load" "yaml.safe_load" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix index 62adeb1fe7..6731aa873b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-novaclient/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { prettytable ]; - checkInputs = [ + nativeCheckInputs = [ ddt openssl requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-nvd3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-nvd3/default.nix index d4ecba5a4d..6ad6b6d56d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-nvd3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-nvd3/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ python-slugify jinja2 setuptools ]; - checkInputs = [ coverage ]; + nativeCheckInputs = [ coverage ]; checkPhase = '' coverage run --source=nvd3 setup.py test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix index 3500e88e57..6a9e24a9f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { installManPage doc/build/man/openstack.1 ''; - checkInputs = [ + nativeCheckInputs = [ ddt stestr requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-openzwave-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-openzwave-mqtt/default.nix index a2c76c7d6d..68b51fc2fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-openzwave-mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-openzwave-mqtt/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { asyncio-mqtt ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-osc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-osc/default.nix index ade67876ea..8c6fc7cc3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-osc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-osc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "python-osc"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "2f8c187c68d239960fb2eddcb5346a62a9b35e64f2de045b3e5e509f475ca73d"; + sha256 = "sha256-69a3z4rjhzgPSOnW1zabrRwXahr2YI79eIi1C08OdK0="; }; pythonImportsCheck = [ "pythonosc" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix index 6bb111a07e..ad8117b996 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-owasp-zap-v2-4/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pyhamcrest pytestCheckHook requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-pae/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-pae/default.nix index 067d2a2843..92c7bd2cfb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-pae/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-pae/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix index dc967b5430..05b73e43a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-prctl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ libcap ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Intel MPX support was removed in GCC 9.1 & Linux kernel 5.6 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-rabbitair/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-rabbitair/default.nix index 6578a07775..28c0ab9f4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-rabbitair/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-rabbitair/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix index 1d8456df5f..f2cd6d285b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix @@ -25,6 +25,8 @@ let hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; }) ]; + # valgrind_unittest failed + cmakeFlags = old.cmakeFlags ++ [ "-DCMAKE_CTEST_ARGUMENTS=-E;valgrind_unittest" ]; }); in buildPythonPackage rec { version = "1.9"; @@ -40,7 +42,7 @@ in buildPythonPackage rec { "--rj-include-dir=${lib.getDev rapidjson'}/include" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytz ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix index deb84265fd..103349f7b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-redis-lock/default.nix @@ -1,28 +1,39 @@ { lib , stdenv , buildPythonPackage +, eventlet , fetchPypi -, redis -, pytestCheckHook -, process-tests +, gevent , pkgs -, withDjango ? false, django-redis +, process-tests +, pytestCheckHook +, pythonOlder +, redis +, withDjango ? false +, django-redis }: buildPythonPackage rec { pname = "python-redis-lock"; version = "4.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Sr0Lz0kTasrWZye/VIbdJJQHjKVeSe+mk/eUB3MZCRo="; + hash = "sha256-Sr0Lz0kTasrWZye/VIbdJJQHjKVeSe+mk/eUB3MZCRo="; }; propagatedBuildInputs = [ redis - ] ++ lib.optional withDjango django-redis; + ] ++ lib.optional withDjango [ + django-redis + ]; - checkInputs = [ + nativeCheckInputs = [ + eventlet + gevent pytestCheckHook process-tests pkgs.redis @@ -37,10 +48,15 @@ buildPythonPackage rec { "test_reset_all_signalizes" ]; + pythonImportsCheck = [ + "redis_lock" + ]; + meta = with lib; { + changelog = "https://github.com/ionelmc/python-redis-lock/blob/v${version}/CHANGELOG.rst"; + description = "Lock context manager implemented via redis SETNX/BLPOP"; homepage = "https://github.com/ionelmc/python-redis-lock"; license = licenses.bsd2; - description = "Lock context manager implemented via redis SETNX/BLPOP"; maintainers = with maintainers; [ vanschelven ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-registry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-registry/default.nix index 8b24ca08ff..324afa9357 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-registry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-registry/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { unicodecsv ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix index 58d6a1e72f..fbdc6d9a9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { CoreMIDI CoreServices ]; - checkInputs = [ + nativeCheckInputs = [ tox flake8 alabaster diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix index 43b5e63529..bcffe6f865 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-sat/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six pypblib ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # https://github.com/pysathq/pysat/pull/102 postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix index 5f985f0faf..ce10278fb4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { unidecode ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix index dba19a2ee6..91a1ccb7e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix index 8322d1c4d3..069b57bd8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-snap7/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-snap7"; - version = "1.2"; + version = "1.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "gijzelaerr"; repo = "python-snap7"; rev = "refs/tags/${version}"; - hash = "sha256-xkkJE3wTqS6spwEmQ+HBY1Szao1VFoqmQ041vnAYuqQ="; + hash = "sha256-90WwgqPHsHbuQUY49cSQblN1jfoLydiG0dm1aMF/NCA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix index d75c80d5e4..28c06ea3d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional isPyPy cffi; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Python library for the snappy compression library from Google"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix index 99cbce9ae1..7dd424820c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ mock msgpack pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix index 4d8f29de08..4cb8273b78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { doCheck = false; # requires tiny_proxy module - checkInputs = [ + nativeCheckInputs = [ anyio flask pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-sql/default.nix index 91012839d0..58a5cd625f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-sql/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-b+dkCC9IiR2Ffqfm+kJfpU8TUx3fa4nyTAmOZGrRtLY="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-stdnum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-stdnum/default.nix index 3799a7fda4..19142bc13f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-stdnum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-stdnum/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pytestCheckHook , pythonOlder +, zeep }: buildPythonPackage rec { @@ -17,10 +18,21 @@ buildPythonPackage rec { hash = "sha256-vMdj2cSa4j2l0remhtX9He7J2QUTQRYKENGscjomvsA="; }; - checkInputs = [ + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=stdnum --cov-report=term-missing:skip-covered --cov-report=html" "" + ''; + + nativeCheckInputs = [ pytestCheckHook ]; + passthru.optional-dependencies = { + SOAP = [ + zeep + ]; + }; + pythonImportsCheck = [ "stdnum" ]; @@ -28,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to handle standardized numbers and codes"; homepage = "https://arthurdejong.org/python-stdnum/"; + changelog = "https://github.com/arthurdejong/python-stdnum/blob/${version}/ChangeLog"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ johbo ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix index f5a15a34f0..318b6c5f6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { python-keystoneclient ]; - checkInputs = [ + nativeCheckInputs = [ mock openstacksdk stestr diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix index 7172b0574f..4aa201469a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-tado/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ requests ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix index 11ad4e25d7..d87ba9f761 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pytz ] ++ httpx.optional-dependencies.socks; - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 flaky pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix index a310736c74..bd975092ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-toolbox/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1hpls1hwisdjx1g15cq052bdn9fvh43r120llws8bvgvj9ivnaha"; }; - checkInputs = [ + nativeCheckInputs = [ docutils pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-twitch-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-twitch-client/default.nix index 30f6ab9a0a..b069de34c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-twitch-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-twitch-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix index 79d262a8b0..646cdaa18e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-twitter/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses hypothesis diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix index a853c9341b..5a5ac9f772 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mypy pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix index c3d51ae591..58bf890921 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-vipaccess/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "python-vipaccess"; - version = "0.14"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "d5013d306e5891ecfe523c9ef52d074fe8b6ca29ee259c0deeb8a83ae9884ce0"; + sha256 = "sha256-vBFCRXwZ91C48GuOet2Obbo7gM02M2c9+7rhp0l6w54="; }; propagatedBuildInputs = [ @@ -22,7 +22,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # test_check_token_detects_valid_hotp_token, # test_check_token_detects_valid_totp_token and # test_check_token_detects_invlaid_token require network diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-whois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-whois/default.nix index dafbdfba4b..724884fe73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-whois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-whois/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook simplejson diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix index 04e89b664c..7ad125b26e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-zbar/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ zbar ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preBuild = '' cd python diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix index 1885060381..7f39eca6ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python3-saml/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { xmlsec ]; - checkInputs = [ + nativeCheckInputs = [ freezegun ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix index 6a5c6a304f..7f4e6e2a4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python_fedora/default.nix @@ -1,22 +1,55 @@ -{ lib, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver -, six, munch, urllib3, beautifulsoup4, openidc-client, lockfile }: +{ lib +, beautifulsoup4 +, buildPythonPackage +, bunch +, fetchPypi +, kitchen +, lockfile +, munch +, openidc-client +, paver +, pythonOlder +, requests +, six +, urllib3 +}: buildPythonPackage rec { pname = "python-fedora"; version = "1.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "56b9d841a39b4030e388e90c7b77dacd479f1ce5e2ff9b18c3954d97d5709a19"; + hash = "sha256-VrnYQaObQDDjiOkMe3fazUefHOXi/5sYw5VNl9Vwmhk="; }; - propagatedBuildInputs = [ kitchen requests bunch paver lockfile - six munch urllib3 beautifulsoup4 openidc-client ]; + + propagatedBuildInputs = [ + beautifulsoup4 + bunch + kitchen + lockfile + munch + openidc-client + paver + requests + six + urllib3 + ]; + doCheck = false; + pythonImportsCheck = [ + "fedora" + ]; + meta = with lib; { - description = "Python Fedora Module"; + description = "Module to interact with the infrastructure of the Fedora Project"; homepage = "https://github.com/fedora-infra/python-fedora"; - license = licenses.lgpl2; + changelog = "https://github.com/fedora-infra/python-fedora/releases/tag/1.1.1"; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix index 6d005a2229..54d7dabfe1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pythonfinder/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-cov pytest-timeout @@ -44,7 +44,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "--no-cov" ]; # these tests invoke git in a subprocess and - # for some reason git can't be found even if included in checkInputs + # for some reason git can't be found even if included in nativeCheckInputs disabledTests = [ "test_shims_are_kept" "test_shims_are_removed" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix index 5ccb664a83..1f4142b324 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pythonnet/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { mono ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook psutil # needed for memory leak tests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix index 17d547ca99..3a595a2d30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.26.9"; + version = "0.27.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = "refs/tags/${version}"; - hash = "sha256-Gq1UPiNjNT6eoOqitY+HOg56ouCzPtz+8xaXHMwuZf8="; + hash = "sha256-m4y65UiuiWRS7EBv6AFnX9Ia2eTy8H1vgfx+fQrcXz4="; }; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { python-dateutil ] ++ gql.optional-dependencies.websockets; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytidylib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytidylib/default.nix index 15280fff4b..20aa6f8171 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytidylib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytidylib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { $' @unittest.skip("")\n def test_large_document(self):' ''; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Python wrapper for HTML Tidy (tidylib) on Python 2 and 3"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix index e32a2176b1..95e8725540 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-aiohttp pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix index 3bf0ad078c..257314860d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "e86136477be924d7e670646a98561957e8ca7308d44841e21f5ddea757556a0a"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { description = "A small Python library to parse various kinds of time expressions"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytmx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytmx/default.nix index 0fa38a9a63..177d255a13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytmx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytmx/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { "pytmx.util_pysdl2" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytoml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytoml/default.nix index b13dfd07da..afa3e5244a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytoml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytoml/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "02hjq44zhh6z0fsbm3hvz34sav6fic90sjrw8g1pkdvskzzl46mz"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' ${python.interpreter} test/test.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix index 73c1987fb3..f9782758f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytomlpp/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { buildInputs = [ pybind11 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook python-dateutil diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix index 0b92b97fa5..7a6ab30127 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytoolconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytoolconfig/default.nix index 529d0d2a36..8c49cc766d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytoolconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytoolconfig/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { "pytoolconfig" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix index 229815d966..7008f72acb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix index b5957968ba..f1f4139cd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "1.8.6"; + version = "1.9.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-5AyOCeRFiV7rdmoBPx03Xju6eTR/3jiE+HQBiEmdzmo="; + hash = "sha256-zlOIZYwNoUkznRcwNn8LQIEM4UuG6mPnqQIH+O4Jun4="; }; preConfigure = '' @@ -48,7 +48,7 @@ buildPythonPackage rec { ] ++ fsspec.optional-dependencies.http; - checkInputs = [ + nativeCheckInputs = [ psutil pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 239652685e..b0bd470b32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "1.6.3"; + version = "1.7.2"; disabled = isPy27; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-7ezD3TMmNI9wRBXz5Htz10XZZaSsD0jTpEldGpIot8k="; + sha256 = "sha256-f+k7WuZRgSDGbWp/TvmDkDzT02WeycwDCd/1WhR3VD8="; }; propagatedBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; # package only requires `unittest`, but use `pytest` to exclude tests - checkInputs = [ + nativeCheckInputs = [ faiss pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix index 522366fa1d..4f61c14a59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-pfn-extras/default.nix @@ -12,18 +12,18 @@ buildPythonPackage rec { pname = "pytorch-pfn-extras"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "pfnet"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-B8B5zULIuqiojP7bmj3sABC9dqYLqOX5CfEN6slOFZ8="; + sha256 = "sha256-x1aE/55+2QwYG3Hhy35j26jLAj9O5orrU/c4KlTTOcc="; }; propagatedBuildInputs = [ numpy packaging torch typing-extensions ]; - checkInputs = [ onnx pytestCheckHook torchvision ]; + nativeCheckInputs = [ onnx pytestCheckHook torchvision ]; # ignore all pytest warnings preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix index c65fdf8b10..7b33eb0290 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytestCheckHook pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix index f5cbce6bcc..58b3ea9f2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "pytradfri"; - version = "11.0.0"; + version = "12.0.1"; format = "setuptools"; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "pytradfri"; rev = "refs/tags/${version}"; - hash = "sha256-+OOmoh2HLKiHAqOIH2aB4CZcW/ND/0bszgkcdRMYBlc="; + hash = "sha256-ov5Z9frYxdbPxqUedwXPYZEinCgQ0ge1jcX6UFdQMHw="; }; propagatedBuildInputs = [ @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.async; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to communicate with the IKEA Trådfri ZigBee Gateway"; homepage = "https://github.com/home-assistant-libs/pytradfri"; + changelog = "https://github.com/home-assistant-libs/pytradfri/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix index ecbf9c68e9..f3785f5fb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytrafikverket/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytrafikverket"; - version = "0.2.2"; + version = "0.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NWQHrdTKb3RQ7ZjXpHyQ5qPPXuZUU7G+FvBx1VQEbss="; + hash = "sha256-bbg1FzzJ3cJIbV+u3Ih70hkgu23Joxc1xeLELiRYt8g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix index d619c04d9b..a684e5ca6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytube/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-Y4mriCwFvwAZ3e8kHKo9/S2vReb4q+b8KTHxtQo8SEw="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytz-deprecation-shim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytz-deprecation-shim/default.nix index cce3c469cc..dd37c3c1af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytz-deprecation-shim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytz-deprecation-shim/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { tzdata ]); - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook pytz diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix index 374187f9b9..e162a4a6cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { hash = "sha256-fM+ue0ssBnRkpnM8YmFnP9uP0b6QVGA5a5egc+n6aDo="; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "pytz/tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix index 41fbc08b01..6538782430 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyu2f/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pyfakefs pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix index aa54e51696..b9c664de93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyudev/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { --replace "find_library(name)" "'${lib.getLib udev}/lib/libudev.so'" ''; - checkInputs = [ pytest mock hypothesis docutils ]; + nativeCheckInputs = [ pytest mock hypothesis docutils ]; propagatedBuildInputs = [ six ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix index 3f0c4e263d..e75e99ceb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.6.1"; + version = "4.6.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5xHU4WC7HPDEJsfCX4bVsK3p6SWZ/fHH7APbFtDGC40="; + hash = "sha256-sEIjR6ScJNliJJJET06e22x5GMDrmB6fZAzyHr847sk="; }; postPatch = '' @@ -77,7 +77,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ ffmpeg # Required for command ffprobe py pytest-aiohttp 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 b14fb46e98..04e21f6e52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { tokenize-rt ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyuptimerobot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyuptimerobot/default.nix index 601faccb37..8b6af6dc5d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyuptimerobot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyuptimerobot/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyuptimerobot"; - version = "22.2.0"; + version = "23.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,26 +18,26 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ludeeus"; repo = pname; - rev = version; - sha256 = "sha256-QZm8FlUm17Vv80hB3iai54QcVlhSrq2AvbdBaRWDyok="; + rev = "refs/tags/${version}"; + hash = "sha256-hy/hmXxxEb44X8JUszoA1YF/41y7GkQqC4uS+Pax6WA="; }; - propagatedBuildInputs = [ - aiohttp - ]; - - checkInputs = [ - aresponses - pytestCheckHook - pytest-asyncio - ]; - postPatch = '' # Upstream doesn't set version in the repo substituteInPlace setup.py \ --replace 'version="main",' 'version="${version}",' ''; + propagatedBuildInputs = [ + aiohttp + ]; + + nativeCheckInputs = [ + aresponses + pytestCheckHook + pytest-asyncio + ]; + pythonImportsCheck = [ "pyuptimerobot" ]; @@ -45,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API wrapper for Uptime Robot"; homepage = "https://github.com/ludeeus/pyuptimerobot"; + changelog = "https://github.com/ludeeus/pyuptimerobot/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyuseragents/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyuseragents/default.nix index 9ab48ebf59..beafd4bff2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyuseragents/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyuseragents/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "D7Qs3vsfkRH2FDkbfakrR+FfWzQFiOCQM7q9AdJavyU="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "test.py" ]; pythonImportsCheck = [ "pyuseragents" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyutil/default.nix index f559afb6a4..3a6c3871a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyutil/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ simplejson ]; - checkInputs = [ mock twisted ]; + nativeCheckInputs = [ mock twisted ]; prePatch = lib.optionalString isPyPy '' grep -rl 'utf-8-with-signature-unix' ./ | xargs sed -i -e "s|utf-8-with-signature-unix|utf-8|g" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvcd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvcd/default.nix index 464e10c331..f16a530530 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvcd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvcd/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python package for writing Value Change Dump (VCD) files"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvcf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvcf/default.nix index 919477298b..1efcdd4d22 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvcf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvcf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0qf9lwj7r2hjjp4bd4vc7nayrhblfm4qcqs4dbd43a6p4bj2jv5p"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { homepage = "https://pyvcf.readthedocs.io/en/latest/index.html"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvera/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvera/default.nix index 9a8ef3043a..b6f1f851d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvera/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvera/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-timeout pytest-cov diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyverilog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyverilog/default.nix index 115014a25b..54456cf427 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyverilog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyverilog/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace "python_paths" "pythonpath" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyversasense/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyversasense/default.nix index f462deedd4..40c2fac515 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyversasense/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyversasense/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio 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 2c69497dfb..58523a13b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.34"; + version = "9.2.36"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3IWhMhiaGm0LXxgVy1HgCxNIBYuGzCJKf3Nual13xe8="; + hash = "sha256-KV/fkgYUt8hfpGxDO3CNNrC91BaI9W8T2mr2H4eJdxo="; }; nativeBuildInputs = [ 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 de0ecec6b3..97d2b5a83b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyvicare"; - version = "2.23.0"; + version = "2.24.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "somm15"; repo = "PyViCare"; rev = version; - sha256 = "sha256-EBDk0XuE8zVFoGYbK2LIWeDfsj3iUZUUERNKARKwuKU="; + sha256 = "sha256-D0N7kRTzfKCxLNtRJML+xykvsv3Mv0WHdlA05eLHl3M="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -30,7 +30,7 @@ buildPythonPackage rec { pkce ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix index b9101e9888..b8a793d7d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' substituteInPlace pyvips/__init__.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix index f13e1bbac7..1ac752f23d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvis/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ networkx jinja2 ipython jsonpickle ]; - checkInputs = [ numpy ]; + nativeCheckInputs = [ numpy ]; pythonImportsCheck = [ "pyvis" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix index 2218f81bbd..bd5b31869c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix @@ -7,17 +7,21 @@ , pyvisa , typing-extensions , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.6.0"; + version = "0.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pyvisa"; repo = "pyvisa-py"; rev = "refs/tags/${version}"; - hash = "sha256-1EAkE2uYjo8sUbSrF6E1AGZkKPTxkSre3ov2RU8YhfM="; + hash = "sha256-cXxiT/PWDf5WV+s8GbEA2u+1dPyfUKu19IQ2+Q4GTqM="; }; nativeBuildInputs = [ @@ -31,7 +35,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -40,8 +44,9 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "PyVISA backend that implements a large part of the Virtual Instrument Software Architecture in pure Python"; + description = "Module that implements the Virtual Instrument Software Architecture"; homepage = "https://github.com/pyvisa/pyvisa-py"; + changelog = "https://github.com/pyvisa/pyvisa-py/blob/${version}/CHANGES"; license = licenses.mit; maintainers = with maintainers; [ mvnetbiz ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvisa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvisa/default.nix index a0c86f9225..850b19e5b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvisa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvisa/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix index e2ceb1d776..ce69f6c6c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvista/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { vtk ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix index 8788384e90..02550d61a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvlx/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix index 35da20d648..634db03a3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvo/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pillow pytestCheckHook pytest-astropy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix index 52ff09078e..163f93288f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywavelets/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-ZDevPd8IMRjCbY+Xq0OwckuVbJ+Vjp6niGWfaig0upM="; }; - checkInputs = [ nose pytest ]; + nativeCheckInputs = [ nose pytest ]; buildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix index 65f9982244..f5832449b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; buildInputs = [ wayland ]; propagatedBuildInputs = [ cffi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' ${python.interpreter} pywayland/ffi_build.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix index f1b2b439ab..e02d767ce9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix @@ -1,36 +1,37 @@ { lib , buildPythonPackage +, decorator , fetchPypi -, libxml2 -, m2crypto -, ply -, pyyaml -, six -, pbr -, pythonOlder -, nocasedict -, nocaselist -, yamlloader -, requests-mock +, FormEncode , httpretty +, libxml2 , lxml , mock +, nocasedict +, nocaselist +, pbr +, ply , pytest -, requests -, decorator -, FormEncode -, testfixtures +, pythonOlder , pytz +, pyyaml +, requests +, requests-mock +, six +, testfixtures +, yamlloader }: buildPythonPackage rec { pname = "pywbem"; - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-xffkWMJTDGE1j7xjM750+vNmqs546uM3QUMSZ63zJhA="; + hash = "sha256-4mqwMkR17lMp10lx+UK0sxW2rA7a8njnDha1YDJ475g="; }; propagatedBuildInputs = [ @@ -42,9 +43,9 @@ buildPythonPackage rec { pyyaml six yamlloader - ] ++ lib.optionals (pythonOlder "3.0") [ m2crypto ]; + ]; - checkInputs = [ + nativeCheckInputs = [ decorator FormEncode httpretty @@ -57,9 +58,14 @@ buildPythonPackage rec { testfixtures ]; + pythonImportsCheck = [ + "pywbem" + ]; + meta = with lib; { description = "Support for the WBEM standard for systems management"; homepage = "https://pywbem.github.io"; + changelog = "https://github.com/pywbem/pywbem/blob/${version}/docs/changes.rst"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix index c7c60d20f3..77e24c56b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywebpush/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ coverage flake8 mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix index 28c0da0e04..835ff62437 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywebview/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ pygobject3 pytest qtpy 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 fd54ccf3d9..d71d84627f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywemo/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-vcr pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywerview/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywerview/default.nix index 9dbb19738b..43543279ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywerview/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywerview/default.nix @@ -7,12 +7,13 @@ , ldap3 , lxml , pyasn1 +, pycryptodome , pythonOlder }: buildPythonPackage rec { pname = "pywerview"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "the-useless-one"; repo = pname; - rev = "v${version}"; - hash = "sha256-nrPhyBHW13dkXFC5YJfrkiztAxMw4KuEif0zCdjQEq0="; + rev = "refs/tags/v${version}"; + hash = "sha256-5/Cn70qQaUp38qko1Wq+gZMCcQtcAPtZwt7Zrx8MFc4="; }; propagatedBuildInputs = [ @@ -30,18 +31,13 @@ buildPythonPackage rec { impacket ldap3 lxml + pycryptodome pyasn1 ]; # Module has no tests doCheck = false; - postPatch = '' - # https://github.com/the-useless-one/pywerview/pull/51 - substituteInPlace setup.py \ - --replace "bs4" "beautifulsoup4" - ''; - pythonImportsCheck = [ "pywerview" ]; @@ -49,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for PowerSploit's PowerView support"; homepage = "https://github.com/the-useless-one/pywerview"; + changelog = "https://github.com/the-useless-one/pywerview/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywick/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywick/default.nix index 13a037f345..0596ce02fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywick/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywick/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook -, albumentations , dill , h5py , hickle @@ -10,7 +9,6 @@ , opencv4 , pandas , pillow -, prodict , pycm , pyyaml , scipy @@ -43,7 +41,6 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - albumentations dill h5py hickle @@ -51,7 +48,6 @@ buildPythonPackage rec { opencv4 pandas pillow - prodict pycm pyyaml scipy @@ -65,12 +61,13 @@ buildPythonPackage rec { yacs ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = { description = "High-level training framework for Pytorch"; homepage = "https://github.com/achaiah/pywick"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; + broken = true; # Nixpkgs missing `albumentations` and `prodict` }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywinrm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywinrm/default.nix index 0867cfe36f..40e8c70ba8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywinrm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywinrm/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix index 2ca664b88a..e6ce301351 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix index 0edd0b06be..2fdf0407c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; buildInputs = [ libinput libxkbcommon pixman xorg.libxcb udev wayland wlroots ]; propagatedBuildInputs = [ cffi pywayland xkbcommon ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' ${python.interpreter} wlroots/ffi_build.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyws66i/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyws66i/default.nix index 41b56150d0..6931a0531c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyws66i/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyws66i/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-NTL2+xLqSNsz4YdUTwr0nFjhm1NNgB8qDnWSoE2sizY="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyx/default.nix index 78a834fd0d..85fdafa506 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package for the generation of PostScript, PDF, and SVG files"; - homepage = "http://pyx.sourceforge.net/"; + homepage = "https://pyx.sourceforge.net/"; license = with licenses; [ gpl2 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix index 929a02ac47..8db0c5e0ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxbe/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-oOY0g1F5sxGUxXAT19Ygq5q7pnxEhIAKmyYELR1PHEA="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxl3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxl3/default.nix index e931400b38..19063414a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyxl3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxl3/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-8nKQgwLXPVgPxNRF4CryKJb7+llDsZHis5VctxqpIRo="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python 3 port of pyxl for writing structured and reusable inline HTML"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix index 1dcacf19a1..eee4bf5306 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyxnat/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { --replace "future>=0.16" "" ''; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = "nosetests pyxnat/tests"; doCheck = false; # requires a docker container running an XNAT server diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-env-tag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-env-tag/default.nix index f81bbbd7ac..208f608855 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-env-tag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-env-tag/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix new file mode 100644 index 0000000000..e6effdd727 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix @@ -0,0 +1,37 @@ +{ lib, buildPythonPackage, fetchPypi +, pytestCheckHook +, pyyaml +, setuptools-scm +, setuptools-scm-git-archive +, toml +}: + +buildPythonPackage rec { + pname = "pyyaml-include"; + version = "1.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-9/vrjnG1C+Dm4HRy98edv7GhW63pyToHg2n/SeV+Z3E="; + }; + + nativeBuildInputs = [ + pyyaml + setuptools-scm + setuptools-scm-git-archive + toml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "yamlinclude" ]; + + meta = with lib; { + description = "Extending PyYAML with a custom constructor for including YAML files within YAML files"; + homepage = "https://github.com/tanbro/pyyaml-include"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyzbar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzbar/default.nix index dd6a246127..fca8feab0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyzbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyzbar/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zbar pillow numpy ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # find_library doesn't return an absolute path # https://github.com/NixOS/nixpkgs/issues/7307 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix index bc90068e66..ff5a106c09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyzerproc/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix index af8131306f..74f5b3afc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { py ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook tornado ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix index e0434e8e4d..7ca619efa3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyzufall/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # https://github.com/nose-devs/nose/issues/1037 doCheck = false; - checkInputs = [ nose coverage ]; + nativeCheckInputs = [ nose coverage ]; propagatedBuildInputs = [ future ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix index 1665367711..7b12781ba1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcelemental/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix index e275e43031..abb84e1e73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcengine/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { qcelemental ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix index 22e29ce3a7..48b0e0ac7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix @@ -11,7 +11,9 @@ , pytest-asyncio , pytestCheckHook , python-dateutil +, pythonAtLeast , pythonOlder +, pythonRelaxDepsHook , respx , retrying , rfc3339 @@ -20,7 +22,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.21.2"; + version = "0.21.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,11 +31,26 @@ buildPythonPackage rec { owner = "rigetti"; repo = "qcs-api-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-gQow1bNRPhUm4zRu2T5FpcgOTcS2F1TQIz8WP1K0Xww="; + hash = "sha256-GEsCyqawLX6fTICjAOOREsO5FsmV6U/5+sDOW1v+VKE="; }; + patches = [ + # Switch to poetry-core, https://github.com/rigetti/qcs-api-client-python/pull/2 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/rigetti/qcs-api-client-python/commit/32f0b3c7070a65f4edf5b2552648d88435469e44.patch"; + hash = "sha256-mOc+Q/5cmwPziojtxeEMWWHSDvqvzZlNRbPtOSeTinQ="; + }) + ]; + + pythonRelaxDeps = [ + "attrs" + "httpx" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -48,38 +65,14 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook respx ]; - patches = [ - # Switch to poetry-core, https://github.com/rigetti/qcs-api-client-python/pull/2 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/rigetti/qcs-api-client-python/commit/32f0b3c7070a65f4edf5b2552648d88435469e44.patch"; - hash = "sha256-mOc+Q/5cmwPziojtxeEMWWHSDvqvzZlNRbPtOSeTinQ="; - }) - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'attrs = "^20.1.0"' 'attrs = "*"' \ - --replace 'httpx = "^0.15.0"' 'httpx = "*"' \ - --replace 'iso8601 = "^0.1.13"' 'iso8601 = "*"' \ - --replace 'pydantic = "^1.7.2"' 'pydantic = "*"' \ - --replace 'pyjwt = "^1.7.1"' 'pyjwt = "*"' - ''; - - disabledTestPaths = [ - # Test is outdated - "tests/test_client/test_additional_properties.py" - "tests/test_client/test_auth.py" - "tests/test_client/test_client.py" - "tests/test_client/test_datetime.py" - "tests/test_imports.py" - ]; + # Tests are failing on Python 3.11, Fatal Python error: Aborted + doCheck = !(pythonAtLeast "3.11"); pythonImportsCheck = [ "qcs_api_client" @@ -88,6 +81,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing the Rigetti QCS API"; homepage = "https://qcs-api-client-python.readthedocs.io/"; + changelog = "https://github.com/rigetti/qcs-api-client-python/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix index f818f49fa6..16a5622cc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; pythonImportsCheck = [ "qdldl" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "A free LDL factorization routine"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qds_sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qds_sdk/default.nix index af5df9c347..b172f0e718 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qds_sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qds_sdk/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ pytest mock ]; + nativeCheckInputs = [ pytest mock ]; checkPhase = '' py.test --disable-pytest-warnings tests ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix index 431b5c9bfa..9c54df213d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qimage2ndarray/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "qimage2ndarray"; - version = "1.9.0"; + version = "1.10.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-p5B1xtDYRDxEIu6WmlQJ5E/QJUVxYEzOqHXGyV4/Veo="; + sha256 = "sha256-NyUQJEbcimlrLsd1sdKvQ7E69qf56+6KNxFbuVQ6LFg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qingping-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qingping-ble/default.nix index fa1c4ca4cb..21053b8c75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qingping-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qingping-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix index 0941574a95..d4ba547386 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-aer/default.nix @@ -120,7 +120,7 @@ buildPythonPackage rec { "test_extended_stabilizer_sparse_output_probs" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ddt fixtures diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-finance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-finance/default.nix index f731249cee..7b62922193 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-finance/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { yfinance ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-timeout ddt diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 4cad6f0bc5..65287ce098 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { ''; # Most tests require credentials to run on IBMQ - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook nbconvert nbformat diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix index 0b40fc8fc7..2c963271a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { preCheck = '' export HOME=$TMPDIR ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ddt pyfakefs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-machine-learning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-machine-learning/default.nix index a9b46f5980..fe04e74722 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-machine-learning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-machine-learning/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ]; doCheck = false; # TODO: enable. Tests fail on unstable due to some multithreading issue? - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-timeout ddt diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix index ee869d032f..47ec6ff8fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { scipy ] ++ lib.optional withPyscf pyscf; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ddt pylatexenc diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-optimization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-optimization/default.nix index 9a98cf2957..870878be16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-optimization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ddt pylatexenc diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix index aa9ce69fa1..e46e706c86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix @@ -94,7 +94,7 @@ buildPythonPackage rec { ++ lib.optionals withCrosstalkPass crosstalkPackages; # *** Tests *** - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ddt hypothesis diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix index 02782b5939..00200525f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { qiskit-terra ] ++ lib.optionals withOptionalPackages optionalQiskitPackages; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "qiskit" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qnapstats/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qnapstats/default.nix index 1803d2ffe7..e42b0753bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qnapstats/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qnapstats/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ responses ]; 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 9b9254bdcc..f354e707af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ six pillow pymaging_png setuptools ]; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; meta = with lib; { description = "Quick Response code generation for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qreactor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qreactor/default.nix index dc2031c702..e4648919d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qreactor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qreactor/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { twisted qtpy ]; - checkInputs = [ + nativeCheckInputs = [ pyqt5 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qstylizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qstylizer/default.nix index 835437da00..ee49d37055 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qstylizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qstylizer/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { tinycss2 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qt5reactor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qt5reactor/default.nix index a85f2ad689..e479e53dec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qt5reactor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qt5reactor/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { twisted ]; - checkInputs = [ + nativeCheckInputs = [ pytest-twisted pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix index 00873503e0..234a0689cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { qtpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix index 6eb47d0fd5..519eb31a5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { traitlets ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtpy/default.nix index f1c601f768..1521f38367 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtpy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; doCheck = false; # ModuleNotFoundError: No module named 'PyQt5.QtConnectivity' - checkInputs = [ + nativeCheckInputs = [ pyside (pyqt5.override { withConnectivity = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quadprog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quadprog/default.nix index bb1112f5e8..47a3f4e1a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quadprog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quadprog/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { cython quadprog/quadprog.pyx ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qualysclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qualysclient/default.nix index 6556187c44..a613148169 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qualysclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qualysclient/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quamash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quamash/default.nix index 54df9bebb5..5d0382fda6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quamash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quamash/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyqt ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest -k 'test_qthreadexec.py' # the others cause the test execution to be aborted, I think because of asyncio ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix index e819cd24e9..b70cdf4de3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quandl/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ factory_boy faker httpretty diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quantiphy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quantiphy/default.nix index 12c54353ee..38ff4bc434 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quantiphy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quantiphy/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { rkm-codes ]; - checkInputs = [ + nativeCheckInputs = [ inform parametrize-from-file pytestCheckHook 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 23ed3bb474..419dea8540 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quantities/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quantities/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quantum-gateway/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quantum-gateway/default.nix index 272899a6bb..43c9c8dcb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/quantum-gateway/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/quantum-gateway/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ requests-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix index e0b549dd6d..b7b03c3b44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { prompt-toolkit ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix index 1a96fc947b..4a49e3d70e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qutip/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-rerunfailures ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix index 57c52ff49b..9287c72441 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rabbitpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pamqp ]; - checkInputs = [ mock nose ]; + nativeCheckInputs = [ mock nose ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rachiopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rachiopy/default.nix index 3fcf773e83..ccd1f9aef6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rachiopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rachiopy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ jsonschema pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/radio_beam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/radio_beam/default.nix index aa56e22323..1a34973678 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/radio_beam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/radio_beam/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook matplotlib pytest-astropy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/radios/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/radios/default.nix index c5b4413540..047946b251 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/radios/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/radios/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/radiotherm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/radiotherm/default.nix index 9cefe8839c..e7cd4fb1f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/radiotherm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/radiotherm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0p37pc7l2malmjfkdlh4q2cfa6dqpsk1rah2j2xil0pj57ai6bks"; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/radish-bdd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/radish-bdd/default.nix index 322db5b8f9..8e84f1e2fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/radish-bdd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/radish-bdd/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { tag-expressions ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/raincloudy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/raincloudy/default.nix index c0fb2accc5..da4a3846a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/raincloudy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/raincloudy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { html5lib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rangehttpserver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rangehttpserver/default.nix index 006dc747fe..673661b07b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rangehttpserver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rangehttpserver/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ nose requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix index 63c5e4e396..0b55d0a77b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { export RAPIDFUZZ_IMPLEMENTATION=cpp ''; - checkInputs = [ + nativeCheckInputs = [ hypothesis pandas pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix index 545782d853..6bc0c7f2a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "0gpriqkvcb6bsccvq8b099xjv5fkjs0d7g4636d5jphy417jxk5m"; }; - checkInputs = [ pytestCheckHook nose glibcLocales ]; + nativeCheckInputs = [ pytestCheckHook nose glibcLocales ]; prePatch = '' substituteInPlace rarfile.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix index 01dca1adf7..16661032ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix @@ -1,45 +1,41 @@ { lib , stdenv -, buildPythonPackage -, fetchFromGitHub -, pythonOlder - -# build time -, cython -, gdal - -# runtime , affine , attrs , boto3 +, buildPythonPackage , click , click-plugins , cligj -, matplotlib -, numpy -, snuggs -, setuptools - -# tests +, certifi +, cython +, fetchFromGitHub +, gdal , hypothesis +, matplotlib +, ipython +, numpy , packaging , pytest-randomly , pytestCheckHook +, pythonOlder +, setuptools , shapely +, snuggs }: buildPythonPackage rec { pname = "rasterio"; - version = "4"; # not x.y[ab]z, those are alpha/beta versions + version = "1.3.5"; format = "pyproject"; - disabled = pythonOlder "3.6"; - # Pypi doesn't ship the tests, so we fetch directly from GitHub + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "rasterio"; repo = "rasterio"; - rev = "refs/tags/release-test-${version}"; - hash = "sha256-YO0FnmIEt+88f6k2mdXDSQg7UKq1Swr8wqVUGdRyQR4="; + rev = "refs/tags/${version}"; + hash = "sha256-VZE58xbTTAicGqkl8ktYBhN+5tFj8FoUYxg8fi05bmo="; }; nativeBuildInputs = [ @@ -50,25 +46,32 @@ buildPythonPackage rec { propagatedBuildInputs = [ affine attrs - boto3 click click-plugins cligj - matplotlib + certifi numpy snuggs - setuptools # needs pkg_resources at runtime + setuptools ]; - preCheck = '' - rm -rf rasterio - ''; + passthru.optional-dependencies = { + ipython = [ + ipython + ]; + plot = [ + matplotlib + ]; + s3 = [ + boto3 + ]; + }; - checkInputs = [ + nativeCheckInputs = [ + hypothesis + packaging pytest-randomly pytestCheckHook - packaging - hypothesis shapely ]; @@ -85,13 +88,15 @@ buildPythonPackage rec { ]; doInstallCheck = true; + installCheckPhase = '' $out/bin/rio --version | grep ${version} > /dev/null ''; meta = with lib; { description = "Python package to read and write geospatial raster data"; - homepage = "https://rasterio.readthedocs.io/en/latest/"; + homepage = "https://rasterio.readthedocs.io/"; + changelog = "https://github.com/rasterio/rasterio/blob/${version}/CHANGES.txt"; license = licenses.bsd3; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ratelimit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ratelimit/default.nix index f706d043bf..7a1af77df0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ratelimit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ratelimit/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sed -i "/--cov/d" pytest.ini ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix index cccca46296..6c01a9e548 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ratelimiter/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-XDldyr273i5ReO8/ibVoowZkVKbdwiO3ZHPawi+JtPc="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rawkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rawkit/default.nix index 0a96123db0..65c5a57599 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rawkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rawkit/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { buildInputs = [ libraw ]; - checkInputs = [ pytest mock ]; + nativeCheckInputs = [ pytest mock ]; checkPhase = '' py.test tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix index 5ae23438b7..208f3ae127 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-cov pytestCheckHook ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reactivex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reactivex/default.nix index 4d95605a09..430581fce5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reactivex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reactivex/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix index b049463138..8f0006a3c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readability-lxml/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace 'sys.platform == "darwin"' "False" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook timeout-decorator ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readchar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readchar/default.nix index 0b21c483cd..cb8af2c949 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readchar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readchar/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { flake8 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pexpect ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readlike/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readlike/default.nix index fae5b1a787..6fc271f781 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readlike/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readlike/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1mw8j8ads8hqdbz42siwpffi4wi5s33z9g14a5c2i7vxp8m68qc1"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readme/default.nix index 95b45185a0..cf3c7f6e8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readme/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "32fbe1538a437da160fa4e4477270bfdcd8876e2e364d0d12898302644496231"; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix index daa9a4d490..dd733c8ee6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readme_renderer/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 6ff9d965b2..5dab116f14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest mock sphinx ]; + nativeCheckInputs = [ pytest mock sphinx ]; checkPhase = '' py.test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix index 4b4d283e30..fc3b22ec62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recipe-scrapers/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix index 48d92d43ec..7804029c0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recommonmark/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0kwm4smxbgq0c0ybkxfvlgrfb3gq9amdw94141jyykk9mmz38379"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ CommonMark docutils sphinx ]; dontUseSetuptoolsCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix index 2e0f03b897..64d2457adb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recordlinkage/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { # pytestCheckHook does not work # Reusing their CI setup which involves 'rm -rf recordlinkage' in preCheck phase do not work too. - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; pythonImportsCheck = [ "recordlinkage" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix index 989be20e4b..040148e369 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/recurring-ical-events/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { x-wr-timezone ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook restructuredtext_lint pygments diff --git a/third_party/nixpkgs/pkgs/development/python-modules/redbaron/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/redbaron/default.nix index 841d6a31fb..46123c3949 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/redbaron/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/redbaron/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { rm tests/test_bounding_box.py ''; #error about fixtures - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/gristlabs/asttokens"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix index 649a1192af..d16cff4f92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - hidredis = [ + hiredis = [ hiredis ]; ocsp = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rednose/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rednose/default.nix index 73b7f5d475..fdfcbff877 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rednose/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rednose/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # Also macOS tests are broken on python38 doCheck = !(isPy27 || (stdenv.isDarwin && pythonAtLeast "3.8")); - checkInputs = [ six ]; + nativeCheckInputs = [ six ]; propagatedBuildInputs = [ nose colorama termstyle ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix new file mode 100644 index 0000000000..467d5e1340 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/redshift-connector/default.nix @@ -0,0 +1,62 @@ +{ beautifulsoup4 +, boto3 +, buildPythonPackage +, fetchFromGitHub +, lib +, lxml +, packaging +, pytest-mock +, pytestCheckHook +, pythonOlder +, pytz +, requests +, scramp +}: + +buildPythonPackage rec { + pname = "redshift-connector"; + version = "2.0.910"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "amazon-redshift-python-driver"; + rev = "refs/tags/v${version}"; + hash = "sha256-24yI6pXSHxhT30N3rJXAMtpCOhhGsBuDrwx9jMO1FW0="; + }; + + # disable test coverage + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + + propagatedBuildInputs = [ + beautifulsoup4 + boto3 + lxml + packaging + pytz + requests + scramp + ]; + + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + ]; + + # integration tests require a Redshift cluster + pytestFlagsArray = [ "test/unit" ]; + + __darwinAllowLocalNetworking = true; # required for tests + + meta = { + description = "Redshift interface library"; + homepage = "https://github.com/aws/amazon-redshift-python-driver"; + changelog = "https://github.com/aws/amazon-redshift-python-driver/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ mcwitt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix index 44e2c3b9b4..65006ea823 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reedsolo/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = "nosetests"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reflink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reflink/default.nix index cb0a9fb585..1364f3a4b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reflink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reflink/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postPatch = '' substituteInPlace setup.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix index e52a2467fb..92e5c680b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-aiohttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/regional/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/regional/default.nix index 26f0755b3f..0fc894e9f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/regional/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/regional/default.nix @@ -4,38 +4,48 @@ , numpy , scipy , matplotlib -, pytest +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "regional"; version = "1.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "freeman-lab"; repo = pname; rev = "e3a29c58982e5cd3d5700131ac96e5e0b84fb981"; # no tags in repo - sha256 = "03qgm35q9sa5cy0kkw4bj60zfylw0isfzb96nlhdfrsigzs2zkxv"; + hash = "sha256-u88v9H9RZ9cgtSat73QEnHr3gZGL8DmBZ0XphMuoDw8="; }; propagatedBuildInputs = [ + matplotlib numpy scipy - matplotlib ]; - checkInputs = [ - pytest + nativeCheckInputs = [ + pytestCheckHook ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ + "regional" + ]; + + disabledTests = [ + "test_dilate" + "test_outline" + "test_mask" + ]; meta = with lib; { description = "Simple manipualtion and display of spatial regions"; homepage = "https://github.com/freeman-lab/regional"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix index c9c5011da6..dd75551b34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reikna/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "reikna"; - version = "0.7.6"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "722fefbd253d0bbcbf5250b7b9c4aca5722cde4ca38bfbf863a551a5fc26edfa"; + sha256 = "sha256-fpa1Pfo5EAafg7Pgha17G6k5G13fdErjclv0On/uYyI="; }; - checkInputs = [ sphinx pytest-cov pytest ]; + nativeCheckInputs = [ sphinx pytest-cov pytest ]; propagatedBuildInputs = [ Mako numpy funcsigs ] ++ lib.optional withCuda pycuda diff --git a/third_party/nixpkgs/pkgs/development/python-modules/related/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/related/default.nix index e6716b55b4..8c131e1469 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/related/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/related/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/relatorio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/relatorio/default.nix index 1baf6f4b0a..05a18ff34e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/relatorio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/relatorio/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { fodt = [ python-magic ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.fodt; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/remarshal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/remarshal/default.nix index 2b7a20a2dd..738c2f18f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/remarshal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/remarshal/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { u-msgpack-python ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/remi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/remi/default.nix index 4e2b9acdf6..1a6ac76db0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/remi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/remi/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { "self.assertEqual(" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook python-snap7 opencv4 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/remote-pdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/remote-pdb/default.nix new file mode 100644 index 0000000000..174b0bff31 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/remote-pdb/default.nix @@ -0,0 +1,18 @@ +{ buildPythonPackage, fetchFromGitHub, lib }: +buildPythonPackage rec { + pname = "remote-pdb"; + version = "2.1.0"; + src = fetchFromGitHub { + owner = "ionelmc"; + repo = "python-remote-pdb"; + rev = "v${version}"; + sha256 = "sha256-/7RysJOJigU4coC6d/Ob2lrtw8u8nLZI8wBk4oEEY3g="; + }; + meta = with lib; { + description = "Remote vanilla PDB (over TCP sockets)."; + homepage = "https://github.com/ionelmc/python-remote-pdb"; + license = licenses.bsd2; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix index 33e1f0124a..321b3daec1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { tabulate ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rencode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rencode/default.nix index 86192cbc29..ffbe1ef896 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rencode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rencode/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix index c743bba1c7..3ec6a5e183 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reolink-aio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink-aio"; - version = "0.2.2"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,25 +20,26 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - sha256 = "sha256-rHiKwr720aTpkem8urnK9TP5CkHCEOHdeBp00rhlitI="; + hash = "sha256-XFqZ/5eK7cYPNsWNFu8UlJfMe28qSZNFrtozB80ZcNM="; }; - propagatedBuildInputs = [ - aiohttp - ffmpeg-python - requests - ]; - - checkInputs = [ - aiounittest - pytestCheckHook - ]; - postPatch = '' # Packages in nixpkgs is different than the module name substituteInPlace setup.py \ --replace "ffmpeg" "ffmpeg-python" ''; + propagatedBuildInputs = [ + aiohttp + ffmpeg-python + requests + ]; + + doCheck = false; # all testse require a network device + + nativeCheckInputs = [ + aiounittest + pytestCheckHook + ]; pytestFlagsArray = [ "tests/test.py" @@ -51,7 +52,9 @@ buildPythonPackage rec { "test3_images" "test4_properties" "test_succes" + "test_wrong_host" "test_wrong_password" + "test_wrong_user" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix index 13b1c662c8..4ae14db36e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ aiounittest pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix index 632dbd5535..00efb26386 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { "reorder_python_imports" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/repeated-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/repeated-test/default.nix index 5d934d2559..4d68f52be9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/repeated-test/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/repeated-test/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reportengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reportengine/default.nix index 6168f62d46..17720e8bec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reportengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reportengine/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "reportengine"; - version = "0.30.dev0"; + version = "0.31"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "eb612994b7f364e872301b4569b544648e95e587d803284ddb5610efc8f2170f"; + sha256 = "sha256-jrt+ml8o1PUidV1bY0hCyNgcPaVTBloW574/i5Pl7iE="; }; nativeBuildInputs = [ flit ]; @@ -36,7 +36,7 @@ buildPythonPackage rec { curio ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pandoc pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix index a84ed43c5c..81aa02c634 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix @@ -23,7 +23,7 @@ in buildPythonPackage rec { ./darwin-m1-compat.patch ]; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; buildInputs = [ ft pillow ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix index 47bb842cc8..fb946fc1eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/repoze_who/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "repoze.who"; - version = "2.4.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ikybkmi0/w7dkG6Xwu7XzoPrn2LkJQv+A7zbum0xojc="; + sha256 = "sha256-6VWt8AwfCwxxXoKJeaI37Ev37nCCe9l/Xhe/gnYNyzA="; }; propagatedBuildInputs = [ zope_interface webob ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix index da88948299..2bc59b5535 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytest-astropy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix index 1e5ecc718d..a419e70cf1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { "reqif" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix index e024efb58b..d67f8f364e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "requests-aws4auth"; - version = "1.1.2"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tedder"; repo = pname; - rev = "v${version}"; - hash = "sha256-/SqU/ojP9I4JXzR0c5tLzxx9UyNaVsON7LG/dbdeiH0="; + rev = "refs/tags/v${version}"; + hash = "sha256-Dr3i+5xTKLKOMjGkCdKhkK2BCV8/FgTGMtGsYtvB5s8="; }; propagatedBuildInputs = [ @@ -29,10 +29,12 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - httpx = [ httpx ]; + httpx = [ + httpx + ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.httpx; @@ -43,6 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Amazon Web Services version 4 authentication for the Python Requests library"; homepage = "https://github.com/sam-washington/requests-aws4auth"; + changelog = "https://github.com/tedder/requests-aws4auth/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ basvandijk ]; }; 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 21648484b2..5cb90496ea 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 @@ -77,7 +77,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock rich diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-credssp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-credssp/default.nix index 20ce327b4e..8c7dfc3aee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-credssp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-credssp/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-file/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-file/default.nix index d8cd9d81c9..de7a94c75a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-file/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-file/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix index 96ade3b45f..36b993d795 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-http-signature/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix index 3a1382061b..38a38f27df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-kerberos/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pyspnego ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix index 85b9d9fe35..992dee5eda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-mock/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests six ]; - checkInputs = [ mock purl testrepository testtools pytest ]; + nativeCheckInputs = [ mock purl testrepository testtools pytest ]; meta = with lib; { description = "Mock out responses from the requests package"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix index d42de95779..d34d6c5c40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ oauthlib requests ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook requests-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-toolbelt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-toolbelt/default.nix index 1b86cddc50..cfb58b4fae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ betamax mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix index 57f4d5787c..4e32c712e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook waitress ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix index 26641f51a8..dfa4b16c8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests/default.nix @@ -18,21 +18,18 @@ buildPythonPackage rec { pname = "requests"; - version = "2.28.1"; + version = "2.28.2"; format = "setuptools"; + disabled = pythonOlder "3.7"; __darwinAllowLocalNetworking = true; src = fetchPypi { inherit pname version; - hash = "sha256-fFWZsQL+3apmHIJsVqtP7ii/0X9avKHrvj5/GdfJeYM="; + hash = "sha256-mLGyeC48bEkEk4uEwOuTJyEGnf25E0MTvv98g8LfJL8="; }; - patches = [ - ./relax-charset-normalizer.patch - ]; - propagatedBuildInputs = [ brotlicffi certifi @@ -51,7 +48,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytest-xdist pytestCheckHook @@ -90,6 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP library for Python"; homepage = "http://docs.python-requests.org/"; + changelog = "https://github.com/psf/requests/blob/v${version}/HISTORY.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests/relax-charset-normalizer.patch b/third_party/nixpkgs/pkgs/development/python-modules/requests/relax-charset-normalizer.patch deleted file mode 100644 index ef14c09fff..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests/relax-charset-normalizer.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 54ae822ce968f49a4d5a10e30c5d75e76c887fe4 Mon Sep 17 00:00:00 2001 -From: deedy5 <65482418+deedy5@users.noreply.github.com> -Date: Thu, 20 Oct 2022 18:26:18 +0000 -Subject: [PATCH] Allow charset normalizer >=2 and <4 (#6261) - ---- - requests/__init__.py | 4 ++-- - setup.cfg | 2 +- - setup.py | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/requests/__init__.py b/requests/__init__.py -index 7ac8e29..22db3c1 100644 ---- a/requests/__init__.py -+++ b/requests/__init__.py -@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_version, charset_normalizer_ver - elif charset_normalizer_version: - major, minor, patch = charset_normalizer_version.split(".")[:3] - major, minor, patch = int(major), int(minor), int(patch) -- # charset_normalizer >= 2.0.0 < 3.0.0 -- assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0) -+ # charset_normalizer >= 2.0.0 < 4.0.0 -+ assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0) - else: - raise Exception("You need either charset_normalizer or chardet installed") - -diff --git a/setup.cfg b/setup.cfg -index 93d1f99..ea45aaf 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -5,7 +5,7 @@ provides-extra = - use_chardet_on_py3 - requires-dist = - certifi>=2017.4.17 -- charset_normalizer>=2,<3 -+ charset_normalizer>=2,<4 - idna>=2.5,<4 - urllib3>=1.21.1,<1.27 - -diff --git a/setup.py b/setup.py -index 23977ed..092b40d 100755 ---- a/setup.py -+++ b/setup.py -@@ -59,7 +59,7 @@ if sys.argv[-1] == "publish": - sys.exit() - - requires = [ -- "charset_normalizer>=2,<3", -+ "charset_normalizer>=2,<4", - "idna>=2.5,<4", - "urllib3>=1.21.1,<1.27", - "certifi>=2017.4.17", --- -2.38.1 - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix index fa1b381126..d1c4806982 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requirements-detector/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix index 3e26c91014..e3b6d71d66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { types-setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix index 190463f8f2..f9827dca48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { numba ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix index 30345ae654..97304376b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { sha256 = "198vfv78hilpg0d0mjzchzp9zk6239wnra61vlsgwpcgz66d2bgv"; }; - checkInputs = [ + nativeCheckInputs = [ commentjson pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix index 15a538cbf3..c549b86bbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/responses/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpserver pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix index cdf4ea4f05..153fe4d8b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { httpx ]; - checkInputs = [ + nativeCheckInputs = [ httpcore httpx flask diff --git a/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix index 067230e804..8ebc4ee2b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/restfly/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { python-box ]; - checkInputs = [ + nativeCheckInputs = [ pytest-datafiles pytest-vcr pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix index e6e31041c2..08df5a3d9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/restrictedpython/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-QFzwvZ7sLxmxMmtfSCKO/lbWWQtOkYJrjMOyzUAKlq0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix index 0033794ef4..08c22ae267 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-GyNcDJIjQatsUwOQiS656S+QubdQRgY+BHys+w8FDEU="; }; - checkInputs = [ nose testtools ]; + nativeCheckInputs = [ nose testtools ]; propagatedBuildInputs = [ docutils ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix index fe41a3c951..817577cc44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/restview/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pygments ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/retry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/retry/default.nix index 03deee5bae..e093f761f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/retry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/retry/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { py ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix index 2a90adbd80..a2c984dfe4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/retry_decorator/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-0dZq4YbPcH4ItyMnpF7B20YYLtzwniJClBK9gRndU1M="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix index 62b419def8..1e42af234c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/retworkx/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; pythonImportsCheck = [ "retworkx" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook fixtures graphviz diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rfc3339-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rfc3339-validator/default.nix index d821d672a2..e1a9f03188 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rfc3339-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rfc3339-validator/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytestCheckHook hypothesis strict-rfc3339 ]; + nativeCheckInputs = [ pytestCheckHook hypothesis strict-rfc3339 ]; pythonImportsCheck = [ "rfc3339_validator" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rfc3986-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rfc3986-validator/default.nix index 793eb2f9fe..823eb16aef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rfc3986-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rfc3986-validator/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { --replace "'pytest-runner'," "" ''; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook rfc3987 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix index f8fcc9aef7..ed29754b66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { idna ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix index e866df5d12..d33d518fce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-Lmwgusc4EQlF0GHmMTUxWzUCjBk19cvurNwbOnT+1jM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rfcat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rfcat/default.nix index 5648d3efdd..edb17bc813 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rfcat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rfcat/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { cp etc/udev/rules.d/20-rfcat.rules $out/etc/udev/rules.d ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rflink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rflink/default.nix index f966b7ccba..a751ef1d4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rflink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rflink/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rich-click/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich-click/default.nix index 104e5bfb82..4c4de7f75d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rich-click/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rich-click/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.6.0"; + version = "1.6.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ewels"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-l8tMyxSkh4eckD21NofK9FBgeGKAqZB0J3B98HpWZ0s="; + hash = "sha256-Be6okg3zmbdbdlB4/uwioUxn6CZUay/istiIoiFrsJk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix index 75943ac537..b263a2d08c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix index bffa6fed7d..a484f6bff0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { requests-oauthlib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix index 34b22109d8..639d2637f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ripe-atlas-cousteau/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { python-socketio ] ++ python-socketio.optional-dependencies.client; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook jsonschema ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ripe-atlas-sagan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ripe-atlas-sagan/default.nix index 3b3b16ce78..a9ed4bd3f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ripe-atlas-sagan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ripe-atlas-sagan/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix index 5317b39f08..61e340057a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { persim ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix index 5537248072..5c8ccfbcdd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rising/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage -, isPy27 +, pythonOlder , fetchFromGitHub , pytestCheckHook +, pythonRelaxDepsHook , dill +, lightning-utilities , numpy , torch , threadpoolctl @@ -12,21 +14,34 @@ buildPythonPackage rec { pname = "rising"; - version = "0.2.1"; - - disabled = isPy27; + version = "0.3.0"; + disabled = pythonOlder "TODO"; src = fetchFromGitHub { owner = "PhoenixDL"; repo = pname; - rev = "v${version}"; - sha256 = "15wYWToXRae1cMpHWbJwzAp0THx6ED9ixQgL+n1v9PI="; + rev = "refs/tags/v${version}"; + hash = "sha256-sBzVTst5Tp2oZZ+Xsg3M7uAMbucL6idlpYwHvib3EaY="; }; - propagatedBuildInputs = [ numpy torch threadpoolctl tqdm ]; - checkInputs = [ dill pytestCheckHook ]; + nativeBuildInputs = [ pythonRelaxDepsHook ]; - disabledTests = [ "test_affine" ]; # deprecated division operator '/' + pythonRelaxDeps = [ "lightning-utilities" ]; + + propagatedBuildInputs = [ + lightning-utilities numpy torch threadpoolctl tqdm + ]; + nativeCheckInputs = [ dill pytestCheckHook ]; + + pythonImportsCheck = [ + "rising" + "rising.loading" + "rising.ops" + "rising.random" + "rising.transforms" + "rising.transforms.functional" + "rising.utils" + ]; meta = { description = "High-performance data loading and augmentation library in PyTorch"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix index 928723897b..0f7b47a012 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rki-covid-parser/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-aiohttp pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rl-coach/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rl-coach/default.nix index 0724abec19..f1da92d056 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rl-coach/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rl-coach/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix index c23f7d9cce..ac4aac2be5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { tensorflow-probability ]; - checkInputs = [ + nativeCheckInputs = [ bsuite dm-env dm-haiku diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix index e0736cdf05..7999e59b2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { eth-utils ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rnginline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rnginline/default.nix index a64c035dbc..20c5b22056 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rnginline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rnginline/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix index 01e6a98c02..47c8734eb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mockito pytestCheckHook robotframework diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 7f08c345bc..f885d4df05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { selenium ]; - checkInputs = [ + nativeCheckInputs = [ approvaltests pytest-mockito pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix index 2c2fe3945b..9b224775f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-tools/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { "setup_requires=SETUP_REQUIRES + (zfg.SETUP_REQUIRES or [])," "" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "test" ]; pythonImportsCheck = [ "robottools" ]; 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 67f77653df..eb8ebbeba1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-c7pPcDgqyqWQtiMbLQbQd0nAgx4TIFUFHrlBVDNdr8M="; }; - checkInputs = [ jsonschema ]; + nativeCheckInputs = [ jsonschema ]; checkPhase = '' python3 utest/run.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix index 618cd8da46..9bd1f6f811 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/roku/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/roku/default.nix index c82eda6e35..c4826e6bc4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/roku/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/roku/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest flask ]; + nativeCheckInputs = [ pytest flask ]; pythonImportsCheck = [ "roku" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix index e584fcdda8..44ea38934b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rokuecp/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytest-freezegun diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rollbar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rollbar/default.nix index 93a0349b9b..125c3732ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rollbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rollbar/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ webob blinker mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix index beb72d8878..c1ee853a10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/roombapy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { paho-mqtt ]; - checkInputs = [ + nativeCheckInputs = [ amqtt pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rope/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rope/default.nix index 2c91bdf72b..3a9c947a11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rope/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rope/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pytoolconfig ] ++ pytoolconfig.optional-dependencies.global; - checkInputs = [ + nativeCheckInputs = [ pytest-timeout pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ropper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ropper/default.nix index bf86e0e714..1bc393fd44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ropper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ropper/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { filebytes ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix index bdf6f0f319..d1561046fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ruamel-yaml ]; - checkInputs = [ + nativeCheckInputs = [ numpy pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpi-bad-power/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpi-bad-power/default.nix index 8c0dbd61c3..5a73ee4a1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpi-bad-power/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpi-bad-power/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { "rpi_bad_power" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpi-gpio2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpi-gpio2/default.nix index 3adf7a35ea..aaf958d269 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpi-gpio2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpi-gpio2/default.nix @@ -1,13 +1,15 @@ -{ lib, libgpiod, buildPythonPackage, fetchurl }: +{ lib, libgpiod, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { pname = "rpi-gpio2"; version = "0.3.0a3"; # PyPi source does not work for some reason - src = fetchurl { - url = "https://github.com/underground-software/RPi.GPIO2/archive/refs/tags/v${version}.tar.gz"; - sha256 = "sha256-AY1AD2Yu66eJUqB4OStZnUeEhmISLVRrTOAcmEHjuOM="; + src = fetchFromGitHub { + owner = "underground-software"; + repo = "RPi.GPIO2"; + rev = "v${version}"; + hash = "sha256-8HQbEnO+4Ppo2Z3HBulbBcSKJF1bNNQYz8k6aUt65oc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rply/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rply/default.nix index e05c08640e..ff42e93f95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rply/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rply/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { appdirs ]; - checkInputs = [ + nativeCheckInputs = [ py pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix index b7e546a01b..f21b2fa0c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix @@ -81,7 +81,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpyc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpyc/default.nix index b92252cae5..5ad8494634 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpyc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpyc/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { plumbum ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rsa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rsa/default.nix index 74953fa66a..792024166d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rsa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rsa/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { sed -i '/addopts/d' tox.ini ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix index 2a276c1aab..ecf06468f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rst2pdf/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "rst2pdf" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pymupdf sphinx diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rstcheck-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rstcheck-core/default.nix index 31938569ca..1126a61ff6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rstcheck-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rstcheck-core/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix index 2f2ee962e8..2a7b91e3db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { importlib-metadata ] ++ typer.optional-dependencies.all; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtoml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtoml/default.nix index 886073951f..f0e4482eaa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rtoml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtoml/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { "rtoml" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtsp-to-webrtc/default.nix index 2c8fd9e40b..812a4fc1ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rtsp-to-webrtc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtsp-to-webrtc/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ruffus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruffus/default.nix index 714ffebd8a..57d3005929 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ruffus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ruffus/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ gevent ]; - checkInputs = [ + nativeCheckInputs = [ hostname pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix index a54aeadb33..28c282ed6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/runway-python/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { wget ] ++ urllib3.optional-dependencies.secure; - checkInputs = [ + nativeCheckInputs = [ deepdiff pytest-cov pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ruuvitag-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruuvitag-ble/default.nix index dd8c338fd3..8280f62723 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ruuvitag-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ruuvitag-ble/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix index bb0728bd26..3ddede9d8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { distro ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix index 8d7277823a..3dc07cd0de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "b657ca2b45aa485da2f7dcfd09fac2e554f7ac51ff3c2f8f2ff962ecd963d91c"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; # Some tests are nondeterministic. (`grep sleep -r tests`) # test_timeout_schedule_action_cancel: https://hydra.nixos.org/build/74954646 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix index 9d59efd9bd..50e5f1482c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rxv/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytest-timeout diff --git a/third_party/nixpkgs/pkgs/development/python-modules/s3-credentials/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/s3-credentials/default.nix index 0173f14efd..9d0d4a7e2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/s3-credentials/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/s3-credentials/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { click-default-group ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis moto pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix index 4ffea01400..9efb29ba76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sacremoses/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click six tqdm joblib ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # ignore tests which call to remote host checkPhase = '' pytest -k 'not truecase' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/safe-pysha3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/safe-pysha3/default.nix new file mode 100644 index 0000000000..cf654cfd71 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/safe-pysha3/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, python +}: + +buildPythonPackage rec { + pname = "safe-pysha3"; + version = "1.0.3"; + format = "setuptools"; + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Kd+lb9t5ney50BvdfbwPKAb0Ro0sKW+DtuN9hlMZF8I="; + }; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} tests.py + + runHook postCheck + ''; + + pythonImportsCheck = [ + "sha3" + ]; + + meta = { + changelog = "https://github.com/5afe/pysha3/releases/tag/v${version}"; + description = "SHA-3 (Keccak) for Python 3.9 - 3.11"; + homepage = "https://github.com/5afe/pysha3"; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ wegank ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix index 06475eba26..1716dadda1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ruamel-yaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix index fcb51c4303..d213026bd5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/salmon-mail/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0q2m6xri1b7qv46rqpv2qfdgk2jvswj8lpaacnxwjna3m685fhfx"; }; - checkInputs = [ jinja2 mock ]; + nativeCheckInputs = [ jinja2 mock ]; propagatedBuildInputs = [ chardet dnspython lmtpd python-daemon six click ]; # Darwin tests fail without this. See: diff --git a/third_party/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix index 2e97bae92b..6284dccc3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/samsungtvws/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix index e92e464a9c..2290f40a64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/saneyaml/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix index 9e915dd66e..813df37a84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic-auth/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sanic ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook sanic-testing ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic-routing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic-routing/default.nix index ea18d0c1b1..197f508002 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic-routing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic-routing/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-2T6WY0nzvr8Q9lBoStzmX7m7Ct35lcG53OSLcqxkEcY="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic-testing/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic-testing/tests.nix index 6a228a9823..a8871c0b51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic-testing/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic-testing/tests.nix @@ -14,7 +14,7 @@ buildPythonPackage { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook sanic diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix index 22d6d17771..571606a9a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 gunicorn pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix index 98187f96af..d02b9da7be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sarge/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-bT1DbcQi+SbeRBsL7ILuQbSnAj3BBB4+FNl+Zek5xU4="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix index 700fb05bc6..77d28ae4da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sasmodels/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { # Note: the 1.0.5 release should be compatible with pytest6, so this can # be set back to 'pytest' at that point - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scales/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scales/default.nix index 3806ffb9d4..93e566fd38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scales/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scales/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "8b6930f7d4bf115192290b44c757af5e254e3fcfcb75ff9a51f5c96a404e2753"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; propagatedBuildInputs = [ six ]; # No tests included diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix index 87ef633119..773d945f3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -129,7 +129,7 @@ buildPythonPackage rec { typing ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix index 42a195008d..a76e8c5384 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scapy/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { # Running the tests seems too complicated: doCheck = false; - checkInputs = [ mock can brotli ]; + nativeCheckInputs = [ mock can brotli ]; checkPhase = '' # TODO: be more specific about files patchShebangs . diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix index 1b951f9403..9ae1fd02b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.3.20230109181936"; + version = "8.4.20230127112827"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4PuPvnk92kITPzdGQr6fGvFlG7+zyjfjQdiGbWld5Fo="; + hash = "sha256-nptZTNveutV9bGSkDPWLfiBusZblVqd/5m7DN4HwGJY="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { ruamel-yaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pycodegen; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix index dabe046e48..c095ea9ca9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/schema/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { contextlib2 ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix index 1ebbda5481..93dc48affc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytest-cov pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix index 27e2063b07..d7781f3fb8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-bio/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ cython ]; - checkInputs = [ coverage ]; + nativeCheckInputs = [ coverage ]; propagatedBuildInputs = [ lockfile cachecontrol decorator ipython matplotlib natsort numpy pandas scipy h5py hdmedians scikit-learn ]; # cython package not included for tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix index 2685c42df6..664bec81ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build-core/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; - checkInputs = [ + nativeCheckInputs = [ cattrs cmake pytest-subprocess diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix index e2d2cffde7..dc28674100 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { wheel ]; - checkInputs = [ + nativeCheckInputs = [ cmake cython ninja diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix index 1fd809010e..6d44cf0a37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ networkx numpy scipy ]; - checkInputs = [ matplotlib nose pytestCheckHook ]; + nativeCheckInputs = [ matplotlib nose pytestCheckHook ]; pythonImportsCheck = [ "skfuzzy" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix index 9098724da4..d899c940b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix @@ -52,7 +52,7 @@ let # test suite is very cpu intensive, move to passthru.tests doCheck = false; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # (1) The package has cythonized modules, whose .so libs will appear only in the wheel, i.e. in nix store; # (2) To stop Python from importing the wrong directory, i.e. the one in the build dir, not the one in nix store, `skimage` dir should be removed or renamed; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn-extra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn-extra/default.nix index f198b49c7a..c14c98489a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn-extra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn-extra/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ numpy cython ]; propagatedBuildInputs = [ numpy scipy scikit-learn ]; - checkInputs = [ matplotlib pytestCheckHook ]; + nativeCheckInputs = [ matplotlib pytestCheckHook ]; preCheck = '' # Remove the package in the build dir, because Python defaults to it and diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix index ca982ecb71..7499eb6e9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aAtls8ruRpVBOF0spbA/9wQI9sYYxYOUgxLw0hJd9oA="; + sha256 = "sha256-+/ilyJPJtLmbzH7Y+z6FAJV6ET9BAYYDhtBmNVIPfPs="; }; buildInputs = [ @@ -47,7 +47,7 @@ buildPythonPackage rec { threadpoolctl ]; - checkInputs = [ pytestCheckHook pytest-xdist ]; + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; LC_ALL="en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix index 5e87c58511..91eb003987 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-optimize/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix index 38d602e291..708979a4cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-survival/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "sksurv" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # Hack needed to make pytest + cython work # https://github.com/NixOS/nixpkgs/pull/82410#issuecomment-827186298 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix index cf2e524337..784dc84a08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-tda/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { tadasets ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix index f6d10e17c7..17cbfdfbde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ] ++ lib.optionals (!isPy3k) [ enum34 ]; doCheck = true; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' cd $out/${python.sitePackages}/scikits/odes/tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix index 34dfecd2eb..821cba9869 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scim2-filter-parser/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { "scim2_filter_parser" ]; - checkInputs = [ + nativeCheckInputs = [ django pytest-runner unittestCheckHook 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 bec9752bc4..7f9091d87f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - checkInputs = [ nose pytest pytest-xdist ]; + nativeCheckInputs = [ nose pytest pytest-xdist ]; doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix index f40f0f5b6f..0f2ffa7138 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scmrepo/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "0.1.6"; + version = "0.1.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qSD8FsaJ0wZ8h0mO6qge3Q5fKIbMrONvJraprKVoNDE="; + hash = "sha256-F+t/3Nfcw+LG9Kh0Je2JwPWUWBNsZXTEaQOKaTT5ig0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scooby/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scooby/default.nix index bdcc62963a..0bd037a74f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scooby/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scooby/default.nix @@ -1,27 +1,65 @@ { lib +, beautifulsoup4 , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, numpy +, pytest-console-scripts +, pytestCheckHook +, pythonOlder +, pyvips +, scipy , setuptools-scm }: buildPythonPackage rec { pname = "scooby"; - version = "0.7.0"; + version = "0.7.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-scD/uuAtepatt8Yn7b6PJMfSj9AT7iOy0HuVHyVvEhk="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "banesullivan"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-wKbCIA6Xp+VYhcQ5ZpHo5usB+ksnMAJyv5naBvl4Cxo="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; - pythonImportsCheck = [ "scooby" ]; + nativeCheckInputs = [ + beautifulsoup4 + numpy + pytest-console-scripts + pytestCheckHook + pyvips + scipy + ]; + + preCheck = '' + export PATH="$PATH:$out/bin"; + ''; + + pythonImportsCheck = [ + "scooby" + ]; + + disabledTests = [ + # Tests have additions requirements (e.g., time and module) + "test_get_version" + "test_tracking" + "test_import_os_error" + "test_import_time" + ]; meta = with lib; { - homepage = "https://github.com/banesullivan/scooby"; + changelog = "https://github.com/banesullivan/scooby/releases/tag/v${version}"; description = "A lightweight tool for reporting Python package versions and hardware resources"; + homepage = "https://github.com/banesullivan/scooby"; license = licenses.mit; maintainers = with maintainers; [ wegank ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix index ef0d132368..954a95c94c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index 643afd6dc8..c8a909691f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fake-useragent faker ]; - checkInputs = [ pytestCheckHook scrapy pytest-cov pytest-mock ]; + nativeCheckInputs = [ pytestCheckHook scrapy pytest-cov pytest-mock ]; meta = with lib; { description = "Random User-Agent middleware based on fake-useragent"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix index 4ac91771a4..646db47538 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { zope_interface ]; - checkInputs = [ + nativeCheckInputs = [ botocore glibcLocales jmespath diff --git a/third_party/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix index 6789c6b76c..40479baca0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { --replace 'load_library("Xrandr")' 'ctypes.cdll.LoadLibrary("${libXrandr}/lib/libXrandr.so")' ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix index 5419a51427..4e0513985a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.6.3"; + version = "0.6.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,14 +18,14 @@ buildPythonPackage rec { owner = "dieselrabbit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AWQiOTgYYqhsaJqYMwhCBoSWJ1ol6dJc6TArqptNu6Y="; + hash = "sha256-3V63DnMzICLZUyzcyWNa7XI0fd1kOat15cL6GPos04E="; }; propagatedBuildInputs = [ async-timeout ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scripttest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scripttest/default.nix index 5fe4b2b2ee..c6102f1453 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scripttest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scripttest/default.nix @@ -5,8 +5,8 @@ }: buildPythonPackage rec { - version = "1.3"; pname = "scripttest"; + version = "1.3"; src = fetchPypi { inherit pname version; @@ -20,8 +20,8 @@ buildPythonPackage rec { meta = with lib; { description = "A library for testing interactive command-line applications"; - homepage = "https://pypi.python.org/pypi/ScriptTest/"; + homepage = "https://pypi.org/project/scripttest/"; + maintainers = with maintainers; [ ]; license = licenses.mit; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scs/default.nix index 24b7d36343..b9ee0aed2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scs/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "scs" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sdds/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sdds/default.nix index 4d26c2ebf3..c36d066a75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sdds/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sdds/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix index a23c36e2b3..04b2f86121 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix index 6f048144df..92923170c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seabreeze/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { ''; # few backends enabled, but still some tests - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock zipp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix index f13f763974..17c2324598 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi secp256k1 ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # Tests are not included in archive doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/securetar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/securetar/default.nix index 68b2535574..c6010b8eef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/securetar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/securetar/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seedir/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seedir/default.nix index 8aadab61ca..f9b6c44286 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seedir/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seedir/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { natsort ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seekpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seekpath/default.nix index dbfe451077..8788bf6653 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seekpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seekpath/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ glibcLocales ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # I don't know enough about crystal structures to fix checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix index f1c0ad3bf0..97805642dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { clldutils ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/segno/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/segno/default.nix index 5db60d0d0b..e01c248749 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/segno/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/segno/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-+OEXG5OvrZ5Ft7IO/7zodf+SgiRF+frwjltrBENNnHo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pypng pyzbar diff --git a/third_party/nixpkgs/pkgs/development/python-modules/segyio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/segyio/default.nix index 546f1117e8..7b0ec0bea1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/segyio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/segyio/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { doCheck = true; # I'm not modifying the checkPhase nor adding a pytestCheckHook because the pytest is called # within the cmake test phase - checkInputs = [ pytest numpy ]; + nativeCheckInputs = [ pytest numpy ]; meta = with lib; { description = "Fast Python library for SEGY files"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix index dc108502ce..2611ae5c3a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/selectors2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { ./mapping-import.patch ]; - checkInputs = [ nose psutil mock ]; + nativeCheckInputs = [ nose psutil mock ]; checkPhase = '' # https://github.com/NixOS/nixpkgs/pull/46186#issuecomment-419450064 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix index 0cdbfdfec4..76c3956ec8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { urllib3 ] ++ urllib3.optional-dependencies.socks; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix index 131cf230ef..39c4df56ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-vau20zaZjLs3jUuds6S1ah4yNXAdwF6iaQ2amX7VBBw="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/semver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/semver/default.nix index 00fd16f156..637681dd2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/semver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/semver/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix index 1741c76b3d..6fd63a1c19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix index 8462b9924e..6a359d9889 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ flask pytestCheckHook pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix index b8b38a7efb..27161cac73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sensorpro-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sensorpro-ble/default.nix index 694f93be10..3e9793d097 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sensorpro-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sensorpro-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix index 00a01dc0df..3567b178bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentinels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentinels/default.nix index 17c2c94a30..ba2412cecb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentinels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentinels/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index 87834f6c72..e01c1828fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.12.1"; + version = "1.14.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-ugCbjhOZTJ1+DeTKDTQJMIO6wjkqVL5tvPGoRrZKwGI="; + hash = "sha256-2STQKIAoaGLreGGkqOSrNrByu7j+7oxZihwp9COhuGM="; }; propagatedBuildInputs = [ @@ -112,7 +112,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ asttokens executing gevent diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sepaxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sepaxml/default.nix index bc46aa5198..d865d1f014 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sepaxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sepaxml/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { xmlschema ]; - checkInputs = [ + nativeCheckInputs = [ lxml pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix index c27a2eb2c9..7fee814f97 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seqeval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seqeval/default.nix index 73ad00332b..05a284f47a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seqeval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seqeval/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { scikit-learn ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix index 2ab2b081f2..537b986a62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals isPy27 [ enum34 ]; - checkInputs = [ attrs pytz ]; + nativeCheckInputs = [ attrs pytz ]; checkPhase = '' ${python.interpreter} setup.py test ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/servefile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/servefile/default.nix index 76d72df128..a4a62a5145 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/servefile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/servefile/default.nix @@ -9,18 +9,18 @@ buildPythonPackage rec { pname = "servefile"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "sebageek"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-/ZEMZIH/ImuZ2gh5bwB0FlaWnG/ELxfBGEJ2SuNSEb8="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-hIqXwhmvstCslsCO973oK5FF2c8gZJ0wNUI/z8W+OjU="; }; propagatedBuildInputs = [ pyopenssl ]; - checkInputs = [ pytestCheckHook requests ]; + nativeCheckInputs = [ pytestCheckHook requests ]; # Test attempts to connect to a port on localhost which fails in nix build # environment. disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix index d3cc7e9c63..68ebeca520 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/serverlessrepo/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/service-identity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/service-identity/default.nix index 10eac468a1..9e13bdbe6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/service-identity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/service-identity/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix index cfcd221c5a..85b94cd668 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-ufuXkHyDDSYPoGWO1Yr9SKhrK4iqxSETXDUv9/00d/0="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # tries to compile programs with dependencies that aren't available pytestFlagsArray = [ "--ignore=tests/setproctitle_test.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix index f58515679e..d92d81f632 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setupmeta/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "setupmeta"; - version = "3.3.2"; + version = "3.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "codrsquad"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-kX7S5NSqO1LDRkfBHaNfTjzW+l0Pd+5KvQHiNF3eH/M="; + rev = "refs/tags/v${version}"; + hash = "sha256-HNGoLCTidgnaU5QA+0d/PQuCswigjdvQC3/w19i+Xuc="; }; preBuild = '' @@ -32,7 +32,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ git mock pep440 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix index 86d2784beb..8442ad6252 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ setuptools-scm ]; - checkInputs = [ pypiserver pytestCheckHook virtualenv ]; + nativeCheckInputs = [ pypiserver pytestCheckHook virtualenv ]; # Tests use network doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index 556f1e0a37..d2f6a10a37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm/tests.nix index c81323b27f..9bbdb1c694 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm/tests.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook setuptools-scm pip diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seventeentrack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seventeentrack/default.nix index 8e70b4af51..56bec41998 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seventeentrack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seventeentrack/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix index 8e1089c379..968dea44b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { rm sfepy/tests/test_quadratures.py ''; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sfrbox-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sfrbox-api/default.nix index 8f1746713b..208e8b13a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sfrbox-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sfrbox-api/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "sfrbox-api"; - version = "0.0.4"; + version = "0.0.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mdE7H17vbKwQS7JloYasap8qAjaacdLuDPvIPxJSUXI="; + hash = "sha256-6SwZAAWBnxeeunZwUAVQJBU8904czNVheBlRFg5yrOw="; }; postPatch = '' @@ -42,7 +42,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook respx diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sgmllib3k/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sgmllib3k/default.nix index c4b0d9bdb9..05eb7da773 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sgmllib3k/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sgmllib3k/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "0bzf6pv85dzfxfysm6zbj8m40hp0xzr9h8qlk4hp3nmy88rznqvr"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sgp4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sgp4/default.nix index 44ad00e10f..94522c6b78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sgp4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sgp4/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "sha256-YXm4dQRId+lBYzwgr3ci/SMaiNiomvAb8wvWTzPN7O8="; }; - checkInputs = [ numpy ]; + nativeCheckInputs = [ numpy ]; pythonImportsCheck = [ "sgp4" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix index 17dcc5acbe..bcc07dc14c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sed -i 's#/bin/sleep#${coreutils.outPath}/bin/sleep#' test.py ''; - checkInputs = [ coverage lsof glibcLocales pytestCheckHook ]; + nativeCheckInputs = [ coverage lsof glibcLocales pytestCheckHook ]; # A test needs the HOME directory to be different from $TMPDIR. preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix index 737156ad83..cdc4cb4fdf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { colorama ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "shamir_mnemonic" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix index 2f0660aafd..a16e645a81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { # These tests are marked as "Expected fail" (xfail) cat ${conftestSkipNetworkErrors} >> tests/conftest.py ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mpl matplotlib diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix index f23cc45ebe..8225751f90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shellescape/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shellescape/default.nix index 2d7309d882..6244baca90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shellescape/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shellescape/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-HAe3Qf3lLeVWw/tVkW0J+CfoxSoOnCcWDR2nEWZn7HM="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "shellescape" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shellingham/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shellingham/default.nix index 341d3f3c32..d8e9e6274b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shellingham/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shellingham/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix index 8038e0f2f0..8e0ec9de05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shiv/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "shiv" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # AssertionError diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shlib/default.nix index 73f963c79e..797e22f14c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shlib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { postPatch = '' patchShebangs . ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix index 097cf5be53..34ad5aa939 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shortuuid/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-/HXyYVkUgVqOTLFQGzpRN0XLZu8P1fxvufjD+jSB94k="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix index b733c1c951..20634f4a9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shouldbe/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; propagatedBuildInputs = [ forbiddenfruit ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/showit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/showit/default.nix index 0cc3791613..10638620b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/showit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/showit/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { matplotlib ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix index 41d5636d70..7a88773694 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ bashInteractive pytest-timeout pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shutilwhich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shutilwhich/default.nix index a30e23c894..5bcd2bca8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shutilwhich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shutilwhich/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "05fwcjn86w8wprck04iv1zccfi39skdf0lhwpb4b9gpvklyc9mj0"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest -rs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sievelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sievelib/default.nix index 4e0e058ac9..694f0f0f34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sievelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sievelib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/signalslot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/signalslot/default.nix index 8c3dfc8bb5..515267a70b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/signalslot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/signalslot/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { "weakrefmethod" # needed until https://github.com/Numergy/signalslot/pull/17 ]; - checkInputs = [ + nativeCheckInputs = [ eventlet mock pytest-xdist diff --git a/third_party/nixpkgs/pkgs/development/python-modules/signedjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/signedjson/default.nix index c7604126c7..e57a86c37f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/signedjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/signedjson/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/signify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/signify/default.nix index dbad1a8167..392bcd2eaa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/signify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/signify/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { "signify" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix index a41bdbf184..87dc4e91e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { attrs ]; - checkInputs = [ + nativeCheckInputs = [ mock repeated-test sphinx diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simanneal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simanneal/default.nix index c712edf5ca..a9d61dd652 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simanneal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simanneal/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "sha256-yKZHkrf6fM0WsHczIEK5Kxusz5dSBgydK3fLu1nDyvk="; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = "pytest tests"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simber/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simber/default.nix index 66aaf43a98..750af927e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simber/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simber/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { colorama ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix index 4b5b2ed068..c5d885f328 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { python-status ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpserver pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix index a75bc77510..566c5c7c83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { zeep ]; - checkInputs = [ + nativeCheckInputs = [ nose pytz responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix index 06fe8e236b..40bc248d8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplebayes/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { sha256 = "0mp7rvfdmpfxnka4czw3lv5kkh6gdxh6dm4r6hcln1zzfg9lxp4h"; }; - checkInputs = [ nose mock ]; + nativeCheckInputs = [ nose mock ]; postPatch = lib.optionalString isPy3k '' sed -i -e 's/open *(\([^)]*\))/open(\1, encoding="utf-8")/' setup.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simpleeval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simpleeval/default.nix index ddc4b56654..28e5c25786 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simpleeval/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simpleeval/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplehound/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplehound/default.nix index 1ecd446c5b..307010f3fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplehound/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplehound/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ + nativeCheckInputs = [ requests-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix index 0f691bb1bf..381c7688be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplejson/default.nix @@ -1,28 +1,34 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub -, stdenv , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "simplejson"; - version = "3.18.0"; + version = "3.18.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-X1lD/kCbKDPPgpr2deoVbC5LADqBlNZHvDg7206E9ZE="; + hash = "sha256-m5V1wmqkPxZBH25vWajztwa3HF4KtH+HXXs4TCecTm8="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; doCheck = !stdenv.isDarwin; - pythonImportsCheck = [ "simplejson" ]; + pythonImportsCheck = [ + "simplejson" + ]; meta = with lib; { description = "Extensible JSON encoder/decoder for Python"; @@ -33,6 +39,7 @@ buildPythonPackage rec { for unicode characters). ''; homepage = "https://github.com/simplejson/simplejson"; + changelog = "https://github.com/simplejson/simplejson/blob/v${version}/CHANGES.txt"; license = with licenses; [ mit afl21 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix index 15579c4d0d..ac6ca9c212 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ aresponses asynctest pytest-aiohttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simpy/default.nix index 6d805c68a8..2be43f157a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ py pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix index 39cd92f5f6..01671657ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/single-version/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "single_version" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/siobrultech-protocols/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/siobrultech-protocols/default.nix index 730ca8f5d6..10daf4a328 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/siobrultech-protocols/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/siobrultech-protocols/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { hash = "sha256-t8is68WrvLj57tNeM5AKuuvpn7kWbhbvoRnCI3+q4uE="; }; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/siosocks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/siosocks/default.nix index a1235b41a7..a72b54f56c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/siosocks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/siosocks/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { trio ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook pytest-trio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/siuba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/siuba/default.nix new file mode 100644 index 0000000000..97d90cac25 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/siuba/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, hypothesis +, numpy +, pandas +, psycopg2 +, pymysql +, python-dateutil +, pytz +, pyyaml +, six +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "siuba"; + version = "0.4.2"; + disabled = pythonOlder "3.7"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "machow"; + repo = "siuba"; + rev = "refs/tags/v${version}"; + hash = "sha256-Q2nkK51bmIO2OcBuWu+u7yB8UmaqiZJXpuxXcytTlUY="; + }; + + propagatedBuildInputs = [ + numpy + pandas + psycopg2 + pymysql + python-dateutil + pytz + pyyaml + six + sqlalchemy + ]; + + checkInputs = [ + hypothesis + pytestCheckHook + ]; + doCheck = false; + # requires running mysql and postgres instances; see docker-compose.yml + + pythonImportsCheck = [ + "siuba" + "siuba.data" + ]; + + meta = with lib; { + description = "Use dplyr-like syntax with pandas and SQL"; + homepage = "https://siuba.org"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/six/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/six/default.nix index 61e6a17866..775dd4b399 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/six/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/six/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sjcl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sjcl/default.nix index 0ef52c6571..a44ceb9158 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sjcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sjcl/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycryptodome ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "sjcl" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skein/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skein/default.nix index 5b486e0163..d3896772bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skein/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skein/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "skein" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # These tests require connecting to a YARN cluster. They could be done through NixOS tests later. disabledTests = [ "test_ui" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix index 49afcf8109..7784b5bee4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skia-pathops/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pathops" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skl2onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skl2onnx/default.nix index 96511df4f8..e4dde4d52b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skl2onnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skl2onnx/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "scikit-learn" ]; - checkInputs = [ + nativeCheckInputs = [ onnxruntime pandas unittestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix index 20d3fb5f4e..f4b45e8881 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ numpy torch scikit-learn scipy tabulate tqdm ]; - checkInputs = [ flaky pandas pytestCheckHook ]; + nativeCheckInputs = [ flaky pandas pytestCheckHook ]; # patch out pytest-cov dep/invocation postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skrl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skrl/default.nix index 9747218157..b40fc789ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skrl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skrl/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = torch.cudaSupport; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skybellpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skybellpy/default.nix index c94b03bcc6..093df95b56 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skybellpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skybellpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-sugar pytest-timeout pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skyfield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skyfield/default.nix index c6b3c69fc3..ca45a3de8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skyfield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skyfield/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ certifi numpy sgp4 jplephem ]; - checkInputs = [ pandas ipython matplotlib assay ]; + nativeCheckInputs = [ pandas ipython matplotlib assay ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-dtef/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-dtef/default.nix index 9a050e9c2b..401e5a8e01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-dtef/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { skytemple-files ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 86a944668e..22901130cc 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 @@ -42,7 +42,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ codecov databases flake8 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix index 49e3cc70a3..08671a0e0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slackclient/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ boto3 flask flask-sockets diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix index 506fad5db4..76d96346b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slicedimage/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { tifffile ] ++ lib.optionals isPy27 [ pathlib enum34 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix index f5352c3de9..7228c79146 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slicer/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "f5d5f7b45f98d155b9c0ba6554fa9770c6b26d5793a3e77a1030fb56910ebeec"; }; - checkInputs = [ pytestCheckHook pandas torch scipy ]; + nativeCheckInputs = [ pytestCheckHook pandas torch scipy ]; disabledTests = [ # IndexError: too many indices for array diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix index 1f9f5e9f04..809db713cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slixmpp/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pyasn1-modules ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slowapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slowapi/default.nix index c7f4fcf161..b8f2741cc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slowapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slowapi/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { redis ]; - checkInputs = [ + nativeCheckInputs = [ fastapi hiro mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sly/default.nix index 411bc3e929..7152980629 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sly/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { "sly" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 097ba1d558..5a306d1810 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 @@ -36,7 +36,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ moto paramiko pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smartypants/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smartypants/default.nix index 29a1e3c9a2..af21271edc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smartypants/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smartypants/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "00p1gnb9pzb3svdq3c5b9b332gsp50wrqqa39gj00m133zadanjp"; }; - checkInputs = [ + nativeCheckInputs = [ docutils pygments pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix index e1d07fe18f..9f199d6125 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pyspnego ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix index 79f177b1f9..ec3fbd8e8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smbus-cffi/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { # requires hardware access pytestFlagsArray = [ "--ignore=test/test_smbus_integration.py" ]; - checkInputs = [ py pytestCheckHook pyserial ]; + nativeCheckInputs = [ py pytestCheckHook pyserial ]; meta = with lib; { description = "Python module for SMBus access through Linux I2C /dev interface"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smbus2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smbus2/default.nix index 262e765ad0..8282d0b109 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smbus2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smbus2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-6JzFbhUq8XR1nYkadPeYqItcLZDIFAwTe3BriEW2nVI="; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smhi-pkg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smhi-pkg/default.nix index 529d3fe27d..b4a5ef4839 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smhi-pkg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smhi-pkg/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smmap/default.nix index 5e8344e3d6..53afd01afc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smmap/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936"; }; - checkInputs = [ nosexcover ]; + nativeCheckInputs = [ nosexcover ]; meta = { description = "A pure python implementation of a sliding window memory map manager"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix index a71d3d6bd3..d26d5707d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snapcast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snapcast/default.nix index 4bff67afd9..2588c57249 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snapcast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snapcast/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix index b20f9afff9..6f6a1df05b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ fastdiff six termcolor ]; - checkInputs = [ django pytestCheckHook pytest-cov ]; + nativeCheckInputs = [ django pytestCheckHook pytest-cov ]; pythonImportsCheck = [ "snapshottest" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sniffio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sniffio/default.nix index 0a8dc4aef4..b16cebd557 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sniffio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sniffio/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { glibcLocales ]; - checkInputs = [ + nativeCheckInputs = [ curio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix index 1b7bd7341e..40dbad84a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snitun/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { cryptography ]; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snuggs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snuggs/default.nix index f88b6080fd..9290e2f369 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snuggs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snuggs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click numpy pyparsing ]; - checkInputs = [ pytest hypothesis ]; + nativeCheckInputs = [ pytest hypothesis ]; checkPhase = "pytest test_snuggs.py"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix index bd38ef3a5a..eb928ec2e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "social_django" ]; - checkInputs = [ + nativeCheckInputs = [ django ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/social-auth-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/social-auth-core/default.nix index 6427208420..5636021ca0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/social-auth-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/social-auth-core/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook httpretty ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sockio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sockio/default.nix index 6476c88c31..5e1fcbe2a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sockio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sockio/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { --replace "--durations=2 --verbose" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/socksio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/socksio/default.nix index 5d42ed6e8e..ad0e8e2e6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/socksio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/socksio/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { rm pytest.ini ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix index 85b8d1ea2e..48a6978685 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soco/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook graphviz mock 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 70bfb13f80..25bc231b81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/softlayer/default.nix @@ -1,53 +1,55 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , click , fetchFromGitHub , mock +, prettytable , prompt-toolkit , ptable , pygments , pytestCheckHook , pythonOlder , requests +, rich , sphinx , testtools , tkinter , urllib3 -, prettytable -, rich , zeep }: buildPythonPackage rec { pname = "softlayer"; version = "6.1.3"; - disabled = pythonOlder "3.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = "softlayer-python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-msNW0PeDbs5iq77FBPKKWH0js/PAQz6xfbM0ycMVg5U="; + hash = "sha256-msNW0PeDbs5iq77FBPKKWH0js/PAQz6xfbM0ycMVg5U="; }; postPatch = '' substituteInPlace setup.py \ - --replace 'rich == 12.3.0' 'rich >= 12.3.0' + --replace "rich ==" "rich >=" ''; propagatedBuildInputs = [ click + prettytable prompt-toolkit ptable pygments requests - urllib3 - prettytable rich + urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook sphinx @@ -64,14 +66,17 @@ buildPythonPackage rec { disabledTestPaths = [ # Test fails with ConnectionError trying to connect to api.softlayer.com - "tests/transports/soap_tests.py" + "tests/transports/soap_tests.py.unstable" ]; - pythonImportsCheck = [ "SoftLayer" ]; + pythonImportsCheck = [ + "SoftLayer" + ]; meta = with lib; { description = "Python libraries that assist in calling the SoftLayer API"; homepage = "https://github.com/softlayer/softlayer-python"; + changelog = "https://github.com/softlayer/softlayer-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix index 3e9f2d4659..4a471bedf1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-cov pytest-httpserver diff --git a/third_party/nixpkgs/pkgs/development/python-modules/somecomfort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/somecomfort/default.nix deleted file mode 100644 index 89c5dedf50..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/somecomfort/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, prettytable -, requests -}: - -buildPythonPackage rec { - pname = "somecomfort"; - version = "0.8.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "56e60e4e9f76c12c0c9dd1016e9f1334be6800409e0762f5f143f9069d7292d3"; - }; - - propagatedBuildInputs = [ - requests - prettytable - ]; - - # tests require network access - doCheck = false; - - pythonImportsCheck = [ "somecomfort" ]; - - meta = with lib; { - description = "Client for Honeywell's US-based cloud devices"; - homepage = "https://github.com/kk7ds/somecomfort"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sonarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sonarr/default.nix index 9f73522def..2cc1095b9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sonarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sonarr/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix index ac0a393631..bd7efca27e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix index 9f9f99a185..30e7486c6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sortedcollections/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sortedcontainers ]; - checkInputs = [ + nativeCheckInputs = [ pytest-cov pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix index 4edd68f1f0..bbf22ed9b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix @@ -18,7 +18,7 @@ let doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix index c1b68e6108..4bbf606ff5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soundfile/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ numpy libsndfile cffi ]; propagatedNativeBuildInputs = [ cffi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix index 11a927a0a6..c9e1f3400f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-transformers/annotation-test/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { dontBuild = true; doCheck = true; - checkInputs = [ pytest spacy_models.en_core_web_trf ]; + nativeCheckInputs = [ pytest spacy_models.en_core_web_trf ]; checkPhase = '' pytest annotate.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/default.nix index 1b066ff3c3..c7d5efe866 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/annotation-test/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { dontBuild = true; doCheck = true; - checkInputs = [ pytest spacy_models.en_core_web_sm ]; + nativeCheckInputs = [ pytest spacy_models.en_core_web_sm ]; checkPhase = '' pytest annotate.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix index c64e1384c6..6dae66a661 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { --replace "typer>=0.3.0,<0.5.0" "typer>=0.3.0" ''; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix index 87523b7f62..a68ea0456f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "spacy-legacy"; - version = "3.0.9"; + version = "3.0.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256-T33LxObI6MtOrbsAn5wKGipnRC4AMsjWd2yUcMN1mQM="; + sha256 = "sha256-s31uDJtuHXyhz1vHFSq2SkxGcfWcha2vej/LhwNXp3Q="; }; - # checkInputs = [ pytestCheckHook spacy ]; + # nativeCheckInputs = [ pytestCheckHook spacy ]; doCheck = false; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spake2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spake2/default.nix index 4038e2255a..a5f5f6bf92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spake2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spake2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ hkdf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sparklines/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sparklines/default.nix index 9913cafdbc..b94a56439d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sparklines/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sparklines/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "sparklines" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix index 2a11e1f145..a9ed433c2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { scipy ]; - checkInputs = [ + nativeCheckInputs = [ dask pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix index d35846a110..d1e66d6764 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spdx-tools/default.nix @@ -12,13 +12,14 @@ buildPythonPackage rec { pname = "spdx-tools"; - version = "0.7.0a3"; + version = "0.7.0"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-afV1W1n5ubHhqfLFpPO5fxaIy5TaZdw9eDy3JYOJ1oE="; + hash = "sha256-QqKMKBedWOFYF1av9IgQuyJ6b5mNhhMpIZVJdEDcAK8="; }; propagatedBuildInputs = [ @@ -29,7 +30,7 @@ buildPythonPackage rec { xmltodict ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -40,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "SPDX parser and tools"; homepage = "https://github.com/spdx/tools-python"; + changelog = "https://github.com/spdx/tools-python/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.determinatesystems.members; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix index fae812319e..eb208528c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spectral-cube/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ astropy casa-formats-io radio_beam joblib six dask ]; - checkInputs = [ pytestCheckHook aplpy pytest-astropy ]; + nativeCheckInputs = [ pytestCheckHook aplpy pytest-astropy ]; # On x86_darwin, this test fails with "Fatal Python error: Aborted" # when sandbox = true. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix index 8b5e36b0f6..04742fbf02 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spglib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - checkInputs = [ pytest pyyaml ]; + nativeCheckInputs = [ pytest pyyaml ]; # pytestCheckHook doesn't work # ImportError: cannot import name '_spglib' from partially initialized module 'spglib' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-argparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-argparse/default.nix index 778ce64016..9a5164b3e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-argparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-argparse/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { sphinx ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix index bd3edbd9c0..3908ef631a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -34,7 +34,7 @@ buildPythonPackage { sphinx ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-automodapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-automodapi/default.nix index 9145cc416e..7560b37036 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-automodapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-automodapi/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { --replace '[0]), None)' "[0]), (None, '${testInventory}'))" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook cython gcc diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-codeautolink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-codeautolink/default.nix new file mode 100644 index 0000000000..c9dcec606f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-codeautolink/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonImportsCheckHook +# documentation build dependencies +, sphinxHook +, sphinx-rtd-theme +, matplotlib +, ipython +# runtime dependencies +, sphinx +, beautifulsoup4 +# check dependencies +, pytest +}: + +buildPythonPackage rec { + pname = "sphinx-codeautolink"; + version = "0.12.1"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "felix-hilden"; + repo = "sphinx-codeautolink"; + rev = "v${version}"; + hash = "sha256-x81jhYknJ6lsLxR5ZyuYNNz/zt0kto6bNyaeZmPKDIE="; + }; + + nativeBuildInputs = [ + pythonImportsCheckHook + sphinxHook + sphinx-rtd-theme + matplotlib + ipython + ]; + + sphinxRoot = "docs/src"; + + propagatedBuildInputs = [ sphinx beautifulsoup4 ]; + + nativeCheckInputs = [ pytest ]; + + pythonImportsCheck = [ "sphinx_codeautolink" ]; + + meta = with lib; { + description = "A sphinx extension that makes code examples clickable"; + homepage = "https://github.com/felix-hilden/sphinx-codeautolink"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-fortran/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-fortran/default.nix index 748e4c6948..6b52078f0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-fortran/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-fortran/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { # Tests are failing because reference files are not updated doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-hoverxref/default.nix new file mode 100644 index 0000000000..c606297e1a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-hoverxref/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonImportsCheckHook +# documentation build dependencies +, sphinxHook +, sphinx-notfound-page +, sphinx-prompt +, sphinx-rtd-theme +, sphinx-tabs +, sphinx-version-warning +, sphinxcontrib-autoapi +, sphinxcontrib-bibtex +, sphinxemoji +# runtime dependencies +, sphinx +, sphinx-jquery +}: + +buildPythonPackage rec { + pname = "sphinx-hoverxref"; + version = "1.3.0"; + format = "flit"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "readthedocs"; + repo = "sphinx-hoverxref"; + rev = version; + hash = "sha256-DJ+mHu9IeEYEyf/SD+nDNtWpTf6z7tQzG0ogaECDpkU="; + }; + + nativeBuildInputs = [ + flit-core + pythonImportsCheckHook + + sphinxHook + sphinx-notfound-page + sphinx-prompt + sphinx-rtd-theme + sphinx-tabs + sphinx-version-warning + sphinxcontrib-autoapi + sphinxcontrib-bibtex + sphinxemoji + ]; + + propagatedBuildInputs = [ sphinx sphinx-jquery ]; + + pythonImportsCheck = [ "hoverxref" ]; + + meta = with lib; { + description = "A sphinx extension for creating tooltips on the cross references of the documentation"; + longDescription = '' + sphinx-hoverxref is a Sphinx extension to show a floating window + (tooltips or modal dialogues) on the cross references of the + documentation embedding the content of the linked section on them. + + With sphinx-hoverxref, you don’t need to click a link to see what’s + in there. + ''; + homepage = "https://github.com/readthedocs/sphinx-hoverxref"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jquery/default.nix new file mode 100644 index 0000000000..6bbf8687f5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jquery/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonImportsCheckHook +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinx-jquery"; + version = "3.0.0"; + format = "flit"; + + src = fetchFromGitHub { + owner = "sphinx-contrib"; + repo = "jquery"; + rev = "v${version}"; + hash = "sha256-argG+jMUqLiWo4lKWAmHmUxotHl+ddJuJZ/zcUl9u5Q="; + }; + + nativeBuildInputs = [ + pythonImportsCheckHook + flit-core + ]; + + propagatedBuildInputs = [ sphinx ]; + + pythonImportsCheck = [ "sphinxcontrib.jquery" ]; + + meta = with lib; { + description = "A sphinx extension that ensures that jQuery is installed for use in Sphinx themes or extensions"; + homepage = "https://github.com/sphinx-contrib/jquery"; + license = licenses.bsd0; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-mdinclude/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-mdinclude/default.nix index ad4f1b5d32..ca7e574c82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-mdinclude/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-mdinclude/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ mistune docutils ]; - checkInputs = [ pygments ]; + nativeCheckInputs = [ pygments ]; meta = with lib; { homepage = "https://github.com/miyakogi/m2r"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix new file mode 100644 index 0000000000..dd2efe81fd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-notfound-page/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonImportsCheckHook +# documentation build dependencies +, sphinxHook +, sphinx-prompt +, sphinx-rtd-theme +, sphinx-tabs +, sphinxcontrib-autoapi +, sphinxemoji +# runtime dependencies +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinx-notfound-page"; + version = "0.8.3"; + format = "flit"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "readthedocs"; + repo = "sphinx-notfound-page"; + rev = version; + hash = "sha256-9iP6X2dqtMC3+CIrNI3fGDLL8xyXVAWNhN90DlMa9JU="; + }; + + nativeBuildInputs = [ + flit-core + pythonImportsCheckHook + sphinxHook + sphinx-prompt + sphinx-rtd-theme + sphinx-tabs + sphinxcontrib-autoapi + sphinxemoji + ]; + + propagatedBuildInputs = [ sphinx ]; + + pythonImportsCheck = [ "notfound" ]; + + meta = with lib; { + description = "A sphinx extension to create a custom 404 page with absolute URLs hardcoded"; + homepage = "https://github.com/readthedocs/sphinx-notfound-page"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-prompt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-prompt/default.nix new file mode 100644 index 0000000000..cc5d5f0b2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-prompt/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sphinxHook +, sphinx +}: + +buildPythonPackage rec { + pname = "sphinx-prompt"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "sbrunner"; + repo = "sphinx-prompt"; + rev = version; + hash = "sha256-ClUPAIyPrROJw4GXeakA8U443Vlhy3P/2vFnAtyrPHU="; + }; + + propagatedBuildInputs = [ sphinx ]; + + meta = with lib; { + description = "A sphinx extension for creating unselectable prompt"; + homepage = "https://github.com/sbrunner/sphinx-prompt"; + license = licenses.bsd3; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix index c1ecb232c8..019a5d177b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-pytest/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "sphinx_pytest" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix index 2820080e11..998ee4b8ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sphinx ]; - checkInputs = [ + nativeCheckInputs = [ readthedocs-sphinx-ext pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix new file mode 100644 index 0000000000..a2714c2d12 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-tabs/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonImportsCheckHook +# documentation build dependencies +, sphinxHook +# runtime dependencies +, sphinx +, pygments +, docutils +# test dependencies +, pytest +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "sphinx-tabs"; + version = "3.4.1"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "executablebooks"; + repo = "sphinx-tabs"; + rev = "v${version}"; + hash = "sha256-5lpo7NRCksXJOdbLSFjDxQV/BsxRBb93lA6tavz6YEs="; + }; + + postPatch = '' + substituteInPlace setup.py --replace 'docutils~=0.18.0' 'docutils' + ''; + + nativeBuildInputs = [ + pythonImportsCheckHook + sphinxHook + ]; + + propagatedBuildInputs = [ + sphinx + pygments + docutils + ]; + + nativeCheckInputs = [ pytest + beautifulsoup4 + ]; + + pythonImportsCheck = [ "sphinx_tabs" ]; + + meta = with lib; { + description = "A sphinx extension for creating tabbed content when building HTML."; + homepage = "https://github.com/executablebooks/sphinx-tabs"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-testing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-testing/default.nix index daf90bb3b5..d29cfdb7a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-testing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-testing/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "ef661775b5722d7b00f67fc229104317d35637a4fb4434bf2c005afdf1da4d09"; }; - checkInputs = [ unittestCheckHook mock ]; + nativeCheckInputs = [ unittestCheckHook mock ]; propagatedBuildInputs = [ sphinx six ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix index d031faa90c..1bf8685282 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "sphinx-thebe"; - version = "0.2.0"; + version = "0.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CHZ6WacLlFhpGyujW7b2KkRSlGmUR3rlg5ulPMsKUoc="; + sha256 = "f4c8c1542054f991b73fcb28c4cf21697e42aba2f83f22348c1c851b82766583"; }; propagatedBuildInputs = [ sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix new file mode 100644 index 0000000000..bf57d4f2fd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-version-warning/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pythonImportsCheckHook +, sphinx +, sphinxHook +, sphinxcontrib-autoapi +, sphinx-rtd-theme +, sphinx-tabs +, sphinx-prompt +, sphinxemoji +}: + +# Latest tagged release release "1.1.2" (Nov 2018) does not contain +# documenation, it was added in commits Aug 10, 2019. Repository does not have +# any activity since then. +buildPythonPackage rec { + pname = "sphinx-version-warning"; + version = "unstable-2019-08-10"; + outputs = [ "out" "doc" ]; + + src = fetchFromGitHub { + owner = "humitos"; + repo = "sphinx-version-warning"; + rev = "a82156c2ea08e5feab406514d0ccd9d48a345f48"; + hash = "sha256-WnJYMk1gPLT0dBn7lmxVDNVkLYkDCgQOtM9fQ3kc6k0="; + }; + + # It tries to write to file relative to it own location at runtime + # and gets permission denied, since Nix store is immutable. + patches = [ + (fetchpatch { + url = "https://github.com/humitos/sphinx-version-warning/commit/cb1b47becf2a0d3b2570ca9929f42f7d7e472b6f.patch"; + hash = "sha256-Vj0QAHIBmc0VxE+TTmJePzvr5nc45Sn2qqM+C/pkgtM="; + }) + ]; + + nativeBuildInputs = [ + pythonImportsCheckHook + sphinxHook + sphinxcontrib-autoapi + sphinx-rtd-theme + sphinx-tabs + sphinx-prompt + sphinxemoji + ]; + + propagatedBuildInputs = [ sphinx ]; + + pythonImportsCheck = [ "versionwarning" ]; + + meta = with lib; { + description = "A sphinx extension to show a warning banner at the top of your documentation"; + homepage = "https://github.com/humitos/sphinx-version-warning"; + license = licenses.mit; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix index d40416019b..74abbe90c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ cython html5lib pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index 2a029c468a..1f4eb94fea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { unidecode ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; @@ -47,6 +47,5 @@ buildPythonPackage rec { longDescription = "Sphinx AutoAPI provides 'autodoc' style documentation for multiple programming languages without needing to load, run, or import the project being documented."; license = licenses.mit; maintainers = with maintainers; [ karolchmist ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index 61b44aa2b7..8d22c58067 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { # Seems to look for files in the wrong dir doCheck = false; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix index 0e7216d1dd..1486372b02 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-openapi/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-openapi"; - version = "0.8.0"; + version = "0.8.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-rO1qloTOgU5qVHURMyA6Ug7rC3UOjICqPUiFJ9RsLzA="; + hash = "sha256-BPz4fCWTRRYqUEzj3+4PcTifUHw3l3mNxTHHdImVtOs="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 2f5f1a58d6..4bf2903288 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "refs/tags/v${version}"; - hash = "sha256-N8448GHg/lR7z7Y4F4vO7z+wAeaboo8Cj0X+HSyToAA="; + hash = "sha256-fNtXj7iYX7rSaGO6JcxC+PvR8WzTFl8gYwHyRExYdfI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -28,7 +28,7 @@ buildPythonPackage rec { sphinx ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook beautifulsoup4 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/splinter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/splinter/default.nix index d4fef974fc..e051388daf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/splinter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/splinter/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { selenium ]; - checkInputs = [ + nativeCheckInputs = [ cssselect django flask diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix index 01af1111a2..1247312ad0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.22.0"; + version = "2.22.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uLnumxbOJZ49utvHi0DzdgzcTMM9t9kwJS7HkJEhdtA="; + hash = "sha256-VGgNvyQ6Kwz/DlkeHSaWkulCZSc7UquQmUpmFVXASsc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spsdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spsdk/default.nix index a4683a8072..db23fee15c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spsdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spsdk/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { sly ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook voluptuous ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index 4338763d65..8a038bbb31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ psycopg2 pymysql pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix index a1bd6d9985..03732a154c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-sugar pymysql diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index bfae1d7b3b..c00aad2d40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -1,6 +1,19 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, fetchpatch, python -, scripttest, pytz, pbr, tempita, decorator, sqlalchemy -, six, sqlparse, testrepository +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, fetchpatch +, python +, pythonAtLeast +, scripttest +, pytz +, pbr +, tempita +, decorator +, sqlalchemy +, six +, sqlparse +, testrepository }: buildPythonPackage rec { @@ -29,7 +42,7 @@ buildPythonPackage rec { --replace "pylint" "" ''; - checkInputs = [ scripttest pytz testrepository ]; + nativeCheckInputs = [ scripttest pytz testrepository ]; propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ]; doCheck = !stdenv.isDarwin; @@ -51,5 +64,8 @@ buildPythonPackage rec { description = "Schema migration tools for SQLAlchemy"; license = licenses.asl20; maintainers = teams.openstack.members ++ (with maintainers; [ makefu ]); + # using deprecated inspect.getargspec function + # https://bugs.launchpad.net/sqlalchemy-migrate/+bug/2003619 + broken = pythonAtLeast "3.11"; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix index c979fc58b1..6986ab2343 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { sqlalchemy ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix index af108f17c0..633457c4b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { encrypted = [ cryptography ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pygments jinja2 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix index a517b35836..f378437b47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -125,7 +125,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix index 4a540b9783..05dfba9497 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlglot/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-dateutil ]; - checkInputs = [ pytestCheckHook duckdb ]; + nativeCheckInputs = [ pytestCheckHook duckdb ]; pythonImportsCheck = [ "sqlglot" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-fts4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-fts4/default.nix index 748587ed5a..27a6913020 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-fts4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-fts4/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-Ibiows3DSnzjIUv7U9tYNVnDaecBBxjXzDqxbIlNhhU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix index 92a4b34199..24fdb5b2fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { tabulate ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlitedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlitedict/default.nix index bb37376150..38847309ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlitedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlitedict/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { mkdir tests/db ''; - checkInputs = [ + nativeCheckInputs = [ py pytest-benchmark pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix index 7da5f8e580..4b30f56a9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pydispatcher ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix index 16b5626da1..479dcc91d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlparse/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postInstall = '' installManPage docs/sqlformat.1 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix index df1f988a03..39de5e7604 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlsoup/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ sqlalchemy ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { description = "A one step database access tool, built on the SQLAlchemy ORM"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix new file mode 100644 index 0000000000..76c1eb22b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix @@ -0,0 +1,52 @@ +{ lib +, attrs +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pygtrie +, orjson +, python +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "sqltrie"; + version = "0.0.27"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "iterative"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-8ymTdbJgRUf9BBNMEVF1lm29qA+N1629cekEohaxt0c="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + orjson + pygtrie + ]; + + # nox is not available at the moment + doCheck = false; + + pythonImportsCheck = [ + "sqltrie" + ]; + + meta = with lib; { + description = "DVC's data management subsystem"; + homepage = "https://github.com/iterative/sqltrie"; + changelog = "https://github.com/iterative/sqltrie/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srpenergy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srpenergy/default.nix index d0ac360244..e36bd7c2e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/srpenergy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/srpenergy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srptools/default.nix index a4022574f1..75435ca5a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/srptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/srptools/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ pytest pytest-runner ]; + nativeCheckInputs = [ pytest pytest-runner ]; meta = with lib; { description = "Python-Tools to implement Secure Remote Password (SRP) authentication"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix index 8dd111b079..9f1d946688 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { catalogue ]; - checkInputs = [ + nativeCheckInputs = [ mock numpy psutil diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srt/default.nix index b6a5f4df09..1e91aad7b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/srt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/srt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "7aa4ad5ce4126d3f53b3e7bc4edaa86653d0378bf1c0b1ab8c59f5ab41384450"; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix index 11f31c0655..15c0eedd0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/srvlookup/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { dnspython ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix index 48ca8b6b93..44a7f37190 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ssdeep/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ssdp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ssdp/default.nix index b21f043f0b..2ae8dbf68d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ssdp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ssdp/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pbr ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix index a9fdfe2050..0c3e597952 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sseclient/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # some tests use python3 strings doCheck = !isPy27; - checkInputs = [ backports_unittest-mock pytestCheckHook pytest-runner ]; + nativeCheckInputs = [ backports_unittest-mock pytestCheckHook pytest-runner ]; # tries to open connection to wikipedia disabledTests = [ "event_stream" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix index 3c53864ec3..f68647ce7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ paramiko ]; - checkInputs = [ pytestCheckHook mock ]; + nativeCheckInputs = [ pytestCheckHook mock ]; # disable impure tests disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix index 7f319333ca..300dccb944 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stack-data/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pure-eval ]; - checkInputs = [ + nativeCheckInputs = [ cython littleutils pygments diff --git a/third_party/nixpkgs/pkgs/development/python-modules/starkbank-ecdsa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/starkbank-ecdsa/default.nix index c539bb9df4..ec741b7e1e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/starkbank-ecdsa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/starkbank-ecdsa/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-HarlCDE2qOLbyhMLOE++bTC+7srJqwmohM6vrJkJ/gc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix index d23d83f7cf..54fe677dab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix @@ -6,20 +6,15 @@ # runtime , ApplicationServices -, aiofiles , anyio -, contextlib2 , itsdangerous , jinja2 , python-multipart , pyyaml +, httpx , typing-extensions # tests -, requests -, aiosqlite -, databases -, httpx , pytestCheckHook , pythonOlder , trio @@ -30,7 +25,7 @@ buildPythonPackage rec { version = "0.23.1"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "encode"; @@ -49,25 +44,19 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - aiofiles anyio itsdangerous jinja2 python-multipart pyyaml - requests - ] ++ lib.optionals (pythonOlder "3.8") [ + httpx + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions - ] ++ lib.optionals (pythonOlder "3.7") [ - contextlib2 ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; - checkInputs = [ - aiosqlite - databases - httpx + nativeCheckInputs = [ pytestCheckHook trio typing-extensions 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 e8621d8e95..9d24dd739f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/staticjinja/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { easywatch ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-check markdown diff --git a/third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix index 86ff5e69fe..f5fc9dd9c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ufo2ft ufoLib2 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/statsd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/statsd/default.nix index 3f9caa1313..a9dd1b3ff2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/statsd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/statsd/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ nose mock ]; + nativeCheckInputs = [ nose mock ]; patchPhase = '' # Failing test: ERROR: statsd.tests.test_ipv6_resolution_udp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix index 1259e4cc91..90bfaf8a62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stem/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sed -i '/MOCK_VERSION/d' run_tests.py ''; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; checkPhase = '' touch .gitignore diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stestr/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/stestr/tests.nix index 36935839e6..b66310f2dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stestr/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stestr/tests.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pythonOutputDistPhase() { touch $dist; } ''; - checkInputs = [ + nativeCheckInputs = [ stestr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stim/default.nix index d17f3f6e34..4ad0891e37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stim/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stim/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pybind11 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stm32loader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stm32loader/default.nix index 3e09506ac6..f79caf582f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stm32loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stm32loader/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ progress pyserial ]; - checkInputs = [ pytest ] ++ lib.optional isPy27 mock; + nativeCheckInputs = [ pytest ] ++ lib.optional isPy27 mock; checkPhase = '' pytest --strict tests/unit diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix index f404beb448..a0d07fa515 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix @@ -5,43 +5,53 @@ , ply , pytestCheckHook , six +, pythonOlder }: buildPythonPackage rec { pname = "stone"; version = "3.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # pypi sdist misses requirements.txt src = fetchFromGitHub { owner = "dropbox"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-0FWdYbv+paVU3Wj6g9OrSNUB0pH8fLwTkhVIBPeFB/U="; }; postPatch = '' - sed -i '/pytest-runner/d' setup.py + # https://github.com/dropbox/stone/issues/288 + substituteInPlace stone/frontend/ir_generator.py \ + --replace "inspect.getargspec" "inspect.getfullargspec" + substituteInPlace setup.py \ + --replace "'pytest-runner == 5.2.0'," "" ''; - propagatedBuildInputs = [ ply six ]; - - checkInputs = [ pytestCheckHook mock ]; - - # try to import from `test` directory, which is exported by the python interpreter - # and cannot be overridden without removing some py3 to py2 support - disabledTestPaths = [ - "test/test_tsd_types.py" - "test/test_js_client.py" + propagatedBuildInputs = [ + ply + six ]; + + nativeCheckInputs = [ + pytestCheckHook + mock + ]; + disabledTests = [ "test_type_name_with_module" ]; - pythonImportsCheck = [ "stone" ]; + pythonImportsCheck = [ + "stone" + ]; meta = with lib; { description = "Official Api Spec Language for Dropbox"; homepage = "https://github.com/dropbox/stone"; + changelog = "https://github.com/dropbox/stone/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/strategies/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strategies/default.nix index 2b03ddcf9c..f11ce2ce5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/strategies/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/strategies/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ multipledispatch toolz ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = { description = "A Python library for control flow programming"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix index c59ffc8253..c7e506e3ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "sha256-qn46u1Kq2fkEL/JnjDNKbJZMTz/pitveNFPaf2xkbYs="; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streaming-form-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streaming-form-data/default.nix index 2f52d4aeb3..959c47d812 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streaming-form-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streaming-form-data/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests-toolbelt ]; - checkInputs = [ numpy pytest ]; + nativeCheckInputs = [ numpy pytest ]; checkPhase = '' make test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix index a4fe702c8c..b1c013790b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { zict ]; - checkInputs = [ + nativeCheckInputs = [ confluent-kafka distributed flaky diff --git a/third_party/nixpkgs/pkgs/development/python-modules/strenum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strenum/default.nix index 563f20f6f7..963680c411 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/strenum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/strenum/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { --replace " --cov=strenum --cov-report term-missing --black --pylint" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix index cb21329cbf..8ec20e3b1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { "structlog" ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pretend pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix index 190ee6ccfa..8f0f9164dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { numba ]; - checkInputs = [ + nativeCheckInputs = [ pandas dask distributed diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stups-cli-support/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stups-cli-support/default.nix index 97a7d6ebbd..1ec1bb017d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stups-cli-support/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stups-cli-support/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { preCheck = "export HOME=$TEMPDIR"; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-cov ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stups-fullstop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stups-fullstop/default.nix index 8628c83334..46b5f9046f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stups-fullstop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stups-fullstop/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { export HOME=$TEMPDIR "; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-cov ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix index 3df2a3e289..b99ac4cf52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stups-pierone/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { export HOME=$TEMPDIR ''; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-cov hypothesis diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stups-tokens/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stups-tokens/default.nix index 62dec6f348..8f046986a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stups-tokens/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stups-tokens/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest pytest-cov diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stups-zign/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stups-zign/default.nix index e7f6c2805d..e9a1bad22e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stups-zign/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stups-zign/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { export HOME=$TEMPDIR "; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-cov ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix index 6923fe36c8..3817856f01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stytra/default.nix @@ -73,7 +73,7 @@ buildPythonPackage rec { av ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook pyserial diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix index a8e00cace5..99ba13d45e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { stdiomask ]; - checkInputs = [ + nativeCheckInputs = [ asynctest cryptography pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix index 9188ad223e..8c904808be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subliminal/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { appdirs rarfile pytz ]; - checkInputs = [ + nativeCheckInputs = [ sympy vcrpy pytest pytest-flakes pytest-cov pytest-runner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix index 4b1c120e31..467d0a20e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook enrich ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subunit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subunit/default.nix index 6f79bf563b..eb27ffdfb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subunit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subunit/default.nix @@ -34,7 +34,7 @@ buildPythonPackage { buildInputs = [ check cppunit ]; propagatedBuildInputs = [ testtools ]; - checkInputs = [ + nativeCheckInputs = [ testscenarios hypothesis fixtures diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix index 7803591039..03fa99fcd1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subunit2sql/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ mock oslo-concurrency stestr diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix index a138414356..0ede9c2de8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { spglib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sumtypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sumtypes/default.nix index c99fa05956..4c19828545 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sumtypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sumtypes/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { attrs ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix index 253be956cd..d316598946 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest-astropy pytest-mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix index db93064b54..22cec4dc86 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pygments ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; doCheck = false; # Segfaults... diff --git a/third_party/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix index 6b10e838e5..7d4c7f4e3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/supervise_api/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional (!isPy3k) whichcraft; - checkInputs = [ util-linux ]; + nativeCheckInputs = [ util-linux ]; meta = { description = "An API for running processes safely and securely"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix index 97492250dc..3999a4c8b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/supervisor/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # nixbld user on hydra doCheck = !stdenv.isDarwin; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix index e9fba4e4b4..fb2857a1be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { mock ]; - checkInputs = [ + nativeCheckInputs = [ rednose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/surt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/surt/default.nix index 21024c0ed0..9ae0b451f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/surt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/surt/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { tldextract ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/svg-path/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/svg-path/default.nix index 8c565b3d41..2ec9f5b780 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/svg-path/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/svg-path/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-GiFZ+duJjfk8RjfP08yvfaH9Bz9Z+ppZUMc+RtSqGso="; }; - checkInputs = [ + nativeCheckInputs = [ pillow pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix index b902572dbe..686c4298e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/svg2tikz/default.nix @@ -22,7 +22,7 @@ buildPythonPackage { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix index 2affcdd4af..59841b4cec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { tinycss2 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/svgwrite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/svgwrite/default.nix index 87e34b3763..10d02fa726 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/svgwrite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/svgwrite/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # svgwrite requires Python 3.6 or newer disabled = pythonOlder "3.6"; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # embed_google_web_font test tried to pull font from internet diff --git a/third_party/nixpkgs/pkgs/development/python-modules/swagger-spec-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/swagger-spec-validator/default.nix index ec15516b16..80fb6bb6a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/swagger-spec-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/swagger-spec-validator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/swift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/swift/default.nix index c56b8abd09..84dd9d77a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/swift/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/swift/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { installManPage doc/manpages/* ''; - checkInputs = [ + nativeCheckInputs = [ boto3 mock stestr diff --git a/third_party/nixpkgs/pkgs/development/python-modules/swisshydrodata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/swisshydrodata/default.nix index f9464382c4..38ed15981f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/swisshydrodata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/swisshydrodata/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix index ee2a087384..fc57fec57d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/symengine/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { buildInputs = [ cython ]; - checkInputs = [ pytest sympy ]; + nativeCheckInputs = [ pytest sympy ]; setupPyBuildFlags = [ "--symengine-dir=${symengine}/" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix index c00230e501..f7fb4b735e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sympy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-4yOA3OY8t8AQjtUlVwCS/UUWi9ri+qF+UoIh73Lohlg="; }; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; propagatedBuildInputs = [ mpmath ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/synergy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/synergy/default.nix index 53af1552ac..0b6c367db6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/synergy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/synergy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pandas ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "synergy" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/synologydsm-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/synologydsm-api/default.nix index 71bd111442..e86361979c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/synologydsm-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/synologydsm-api/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/syrupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/syrupy/default.nix index c3430a2d6f..3ad320751a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/syrupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/syrupy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { colored ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix index 840407cfa1..4862e3208d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix index fbe99c6fa9..2a50024dc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tables/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { "--blosc=${lib.getDev c-blosc}" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' cd .. ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix index b2d789683f..56af48f640 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pandas pytestCheckHook unicodecsv diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix index c029d7922f..25ae9a1b51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tabula-py/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix index e1867c9ce7..99420e9e32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { widechars = [ wcwidth ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tabview/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tabview/default.nix index 6123dc8a05..62eaf51235 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tabview/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tabview/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1d1l8fhdn3w2zg7wakvlmjmgjh9lh9h5fal1clgyiqmhfix4cn4m"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Python curses command line CSV and tabular data viewer"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tadasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tadasets/default.nix index d1de836a5b..a5dbed7133 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tadasets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tadasets/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { matplotlib ]; - checkInputs = [ + nativeCheckInputs = [ pytest scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix index 137759f5a5..d992b42508 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tag-expressions/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "1c0a49c3c0357976822b03c43db8d4a1c5548e16fb07ac939c10bbd5183f529d"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Package to parse logical tag expressions"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tailscale/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tailscale/default.nix index 63858112ce..806da0dc3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tailscale/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tank-utility/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tank-utility/default.nix index 658920abbe..ab4573594d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tank-utility/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tank-utility/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { setuptools ] ++ urllib3.optional-dependencies.secure; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tappy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tappy/default.nix index 612edc0e61..d2a311f7e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tappy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tappy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "3c0cd45212ad5a25b35445964e2517efa000a118a1bfc3437dae828892eaf1e1"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "tap" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tasklib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tasklib/default.nix index 8324f26e76..204bcb7df1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tasklib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tasklib/default.nix @@ -25,7 +25,7 @@ in buildPythonPackage rec { tzlocal ]; - checkInputs = [ + nativeCheckInputs = [ taskwarrior wsl_stub ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix index dfdbbcf5d8..76cfe0faf0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six python-dateutil kitchen pytz ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/ralphbean/taskw"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix index 274c8818b2..8f0adfc8d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ colorama regex ]; - checkInputs = [ pytestCheckHook pytest-mypy ]; + nativeCheckInputs = [ pytestCheckHook pytest-mypy ]; pythonImportsCheck = [ "tatsu" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/taxi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/taxi/default.nix index 28aa01e904..47a50d8ad2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/taxi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/taxi/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tcxparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tcxparser/default.nix index 2f8f4e6b1d..c011b9e32f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tcxparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tcxparser/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tcxreader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tcxreader/default.nix index ec4abfd886..dd11c6624e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tcxreader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tcxreader/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "tcxreader"; - version = "0.4.2"; + version = "0.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,10 +16,10 @@ buildPythonPackage rec { owner = "alenrajsp"; repo = "tcxreader"; rev = "v${version}"; - hash = "sha256-YJDuyInO5FCIdz7xE29qOpuH6rPKvO4FZChjgXdc+Aw="; + hash = "sha256-UJ6F+GcdF0b2gALQWepLyCnWm+6RKBRnBt1eJNoRRzo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/teamcity-messages/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/teamcity-messages/default.nix index 482386ac89..bb05dec3f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/teamcity-messages/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/teamcity-messages/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-9az7kD7nKqMF2b3/eFgF+pOKKIYLvTy2sf4TSJfHRnA="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/telegraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/telegraph/default.nix index 9eb246a99e..b6bca3a357 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/telegraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/telegraph/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix index 71df987208..f40809dabf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/telethon/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "telethon"; - version = "1.25.1"; + version = "1.26.1"; format = "pyproject"; disabled = pythonOlder "3.5"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "LonamiWebs"; repo = "Telethon"; rev = "refs/tags/v${version}"; - hash = "sha256-xmFoCUqYo600RH72KWG/aM7hKGiTYdCBsbPOFipxIzA="; + hash = "sha256-RxnC+PVSnLeCZ1xap6n6CjpeA8Ig6oLGiB0LDxqUmsA="; }; patchPhase = '' @@ -37,7 +37,7 @@ buildPythonPackage rec { pyaes ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/telfhash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/telfhash/default.nix index 86386ad48a..b2cb3c3ac9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/telfhash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/telfhash/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix index 0e24cbc034..7198620b8f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { debtcollector ]; - checkInputs = [ + nativeCheckInputs = [ stestr hacking oslotest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix index 2549fc234d..83f07a52f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytest-freezegun pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix index 1cd8e40913..15d67383c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook tornado diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix index 7d0a28a419..732d97946f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { soundfile ]; - checkInputs = [ + nativeCheckInputs = [ boto3 matplotlib moto diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix index b9639806b1..20837e9efd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { "tensorflow_datasets" ]; - checkInputs = [ + nativeCheckInputs = [ apache-beam beautifulsoup4 ffmpeg diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/bin.nix similarity index 86% rename from third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/bin.nix index 24fb681f3b..c7d8e4d630 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/bin.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "2.10.0"; + version = "2.11.0"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - hash = "sha256-8yTqF81X8W4zvxiHEdUHfmsuX1oSwyjW4BoHsjiI7c0="; + hash = "sha256-6jtkrP/z2aJE8GF4yb3ty90/Eltn0IiNuoIpSY0GRos="; }; propagatedBuildInputs = [ mock numpy absl-py ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix index 760e9a0e9d..bd447bd432 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,7 +1,10 @@ { lib +, stdenv , fetchFromGitHub +, bazel_6 , buildBazelPackage , buildPythonPackage +, cctools , python , setuptools , wheel @@ -24,7 +27,7 @@ }: let - version = "0.15.0"; + version = "0.19.0"; pname = "tensorflow_probability"; # first build all binaries and generate setup.py using bazel @@ -34,7 +37,7 @@ let owner = "tensorflow"; repo = "probability"; rev = "v" + version; - sha256 = "155fgmra90s08vjnp61qxdrpzq74xa3kdzhgdkavwgc25pvxn3mi"; + hash = "sha256-ZkQ20Qt/RF/leVP6Kc38tGgPz+C6lEuHvoL+s97oksE="; }; nativeBuildInputs = [ # needed to create the output wheel in installPhase @@ -45,10 +48,13 @@ let tensorflow ]; + bazel = bazel_6; + bazelTarget = ":pip_pkg"; + LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool"; fetchAttrs = { - sha256 = "0sgxdlw5x3dydy53l10vbrj8smh78b7r1wff8jxcgp4w69mk8zfm"; + sha256 = "sha256-pST4R45mWC5j0ngkkRe+hmostaMploW0+BN3WKPt0t0="; }; buildAttrs = { @@ -88,7 +94,7 @@ in buildPythonPackage { # Listed here: # https://github.com/tensorflow/probability/blob/f3777158691787d3658b5e80883fe1a933d48989/testing/dependency_install_lib.sh#L83 - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest scipy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix index 7a2d29b75c..dcfa8e0e96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix @@ -18,7 +18,7 @@ , wheel , opt-einsum , backports_weakref -, tensorflow-estimator +, tensorflow-estimator-bin , tensorboard , cudaSupport ? false , cudaPackages ? {} @@ -76,7 +76,7 @@ in buildPythonPackage { opt-einsum google-pasta wrapt - tensorflow-estimator + tensorflow-estimator-bin tensorboard keras-applications keras-preprocessing diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index d5aa29b23a..8082fd9267 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -6,7 +6,7 @@ , numpy, tensorboard, absl-py , packaging, setuptools, wheel, keras, keras-preprocessing, google-pasta , opt-einsum, astunparse, h5py -, termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator +, termcolor, grpcio, six, wrapt, protobuf-python, tensorflow-estimator-bin , dill, flatbuffers-python, portpicker, tblib, typing-extensions # Common deps , git, pybind11, which, binutils, glibcLocales, cython, perl, coreutils @@ -74,7 +74,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.10.1"; + version = "2.11.0"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -98,7 +98,7 @@ let six tblib tensorboard - tensorflow-estimator + tensorflow-estimator-bin termcolor typing-extensions wheel @@ -187,8 +187,8 @@ let src = fetchFromGitHub { owner = "tensorflow"; repo = "tensorflow"; - rev = "v${version}"; - hash = "sha256-AYHUtJEXYZdVDigKZo7mQnV+PDeQg8mi45YH18qXHZA="; + rev = "refs/tags/v${version}"; + hash = "sha256-OYh61/83yv+ycivylfdS8yFUIUAk8euAPvmfjPzldGs="; }; # On update, it can be useful to steal the changes from gentoo @@ -372,11 +372,11 @@ let fetchAttrs = { sha256 = { x86_64-linux = if cudaSupport - then "sha256-Q6a/Q4fr5cmqqkIoL8ZBJOKfF4NXnrhqFi2VgUpHC3E=" - else "sha256-RBrmxWBn5Yj5fIHlPYXuWOFMTqDGbgk+IvUXk7kIXHM="; - aarch64-linux = "sha256-MEkn2DplUW1R95q+A6uuIKNtMEBv08jU8kvTbMgIKJU="; - x86_64-darwin = "sha256-bqZTu0AABeg6M2IVwlkUPuF8EMsbQXurcmjWZY0EN9E="; - aarch64-darwin = "sha256-q1PfVqyZ3KG65aKw6l9vhxCfPoxH6Nb5y1Eh9P8Ovqk="; + then "sha256-/wB9EpaDPg3TrD9qggdA4vPgzvmaKc6dDnLjoYTJC5o=" + else "sha256-QgOaUaq0V5HG9BOv9nEw8OTSlzINNFvbnyP8Vx+r9Xw="; + aarch64-linux = "sha256-zjnRtTG1j9cZTbP0Xnk2o/zWTNsP8T0n4Ai8IiAT3PE="; + x86_64-darwin = "sha256-RBLox9rzBKcZMm4NwnT7vQ/EjapWQJkqxuQ0LIdaM1E="; + aarch64-darwin = "sha256-BRzh79lYvMHsUMk8BEYDLHTpnmeZ9+0lrDtj4XI1YY4="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; @@ -419,6 +419,7 @@ let }; meta = with lib; { + changelog = "https://github.com/tensorflow/tensorflow/releases/tag/v${version}"; description = "Computation using data flow graphs for scalable machine learning"; homepage = "http://tensorflow.org"; license = licenses.asl20; @@ -438,11 +439,13 @@ in buildPythonPackage { src = bazel-build.python; # Adjust dependency requirements: + # - Drop tensorflow-io dependency until we get it to build # - Relax flatbuffers and gast version requirements # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now. postPatch = '' sed -i setup.py \ + -e '/tensorflow-io-gcs-filesystem/,+1d' \ -e "s/'flatbuffers[^']*',/'flatbuffers',/" \ -e "s/'gast[^']*',/'gast',/" \ -e "/'libclang[^']*',/d" \ @@ -476,7 +479,7 @@ in buildPythonPackage { packaging protobuf-python six - tensorflow-estimator + tensorflow-estimator-bin termcolor typing-extensions wrapt @@ -499,7 +502,7 @@ in buildPythonPackage { # TODO try to run them anyway # TODO better test (files in tensorflow/tools/ci_build/builds/*test) # TEST_PACKAGES in tensorflow/tools/pip_package/setup.py - checkInputs = [ + nativeCheckInputs = [ dill keras portpicker diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix index 58260b62d0..52b3be102a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorly/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { sparse ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/termcolor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/termcolor/default.nix index e6bb7e3baf..19a7525d6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/termcolor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/termcolor/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { "termcolor" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/termgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/termgraph/default.nix index 24e76a5df7..30d37d9f87 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/termgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/termgraph/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ colorama ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "termgraph" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix index 92586f3724..baa5e9b290 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { "terminado" ]; - checkInputs = [ + nativeCheckInputs = [ pytest-timeout pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/termplotlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/termplotlib/default.nix index 89fd114ad7..5ed244959e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/termplotlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/termplotlib/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ]; format = "pyproject"; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook exdown ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tesla-powerwall/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tesla-powerwall/default.nix index e2781daed9..50fc9b2be6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tesla-powerwall/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tesla-powerwall/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tesla-wall-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tesla-wall-connector/default.nix index 3f2c68b87d..9bce448f7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tesla-wall-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tesla-wall-connector/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { backoff ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index 453ea140ef..12fdd29bff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix index c8e1d2e64f..73b5a5727a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tesserocr/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { "tesserocr" ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/test-tube/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/test-tube/default.nix index d480600b25..b2044e2f07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/test-tube/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/test-tube/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { sha256 = "0w60xarmcw06gc4002sy7bjfykdz34gbgniswxkl0lw8a1v0xn2m"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testbook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testbook/default.nix index 615fb96cd1..b78e453b3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testbook/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testbook/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { nbformat ]; - checkInputs = [ + nativeCheckInputs = [ ipykernel pandas pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix index 19f9ef7ead..bfbb1f697c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { hash = "sha256-xSaqiXjBAC8FnxUsSt43WMShJBjfqyspdUrmIwyvPQQ="; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook sybil diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testing-postgresql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testing-postgresql/default.nix index fd88ea03bf..5c6eaa7ac2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testing-postgresql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testing-postgresql/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pg8000 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook psycopg2 sqlalchemy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testpath/default.nix index 4db5aa362f..1f8469ad2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testpath/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testrepository/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testrepository/default.nix index 45093a5f7c..908779a45d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testrepository/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testrepository/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "1ssqb07c277010i6gzzkbdd46gd9mrj0bi0i8vn560n2k2y4j93m"; }; - checkInputs = [ testresources ]; + nativeCheckInputs = [ testresources ]; buildInputs = [ pbr ]; propagatedBuildInputs = [ fixtures subunit testtools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testresources/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testresources/default.nix index 1aaddc3dec..8a7a6160e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testresources/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testresources/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pbr ]; - checkInputs = [ fixtures testtools ]; + nativeCheckInputs = [ fixtures testtools ]; checkPhase = '' ${python.interpreter} -m testtools.run discover diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testtools/default.nix index e20bd74a6a..e0780dd768 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testtools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # testscenarios has a circular dependency on testtools doCheck = false; - checkInputs = [ testscenarios ]; + nativeCheckInputs = [ testscenarios ]; pythonRemoveDeps = [ "fixtures" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/text-unidecode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/text-unidecode/default.nix index 5f5a0bf851..30f5b73f5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/text-unidecode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/text-unidecode/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix index 2eae44aeeb..2986f3428e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textacy/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix index e1bfdb5909..409cffd338 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { future ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textile/default.nix index a8acf346cd..adae00ef3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textile/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { regex ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textual/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textual/default.nix index 856ec4e652..5decea0777 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textual/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textual/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "textual"; - version = "0.9.1"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-a32H5X3VsfYuU1TkOH5uGn1eDLvGUDI6WhXEQ0AKwq8="; + sha256 = "sha256-DPE8brf8y6DJDPfDNUBk09ngthSWN59UYw6yPfI4+Qw="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp click jinja2 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix index afbc9ce839..2a3fa04268 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textwrap3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "5008eeebdb236f6303dcd68f18b856d355f6197511d952ba74bc75e40e0c3414"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textx/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/textx/tests.nix index 021224e9f3..af910a1611 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textx/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textx/tests.nix @@ -25,7 +25,7 @@ buildPythonPackage { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ click gprof2dot html5lib diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tgcrypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tgcrypto/default.nix index 9152bb4b2a..a9c9dd96c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tgcrypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tgcrypto/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thefuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thefuzz/default.nix index 2f203e74b3..2748381f7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thefuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thefuzz/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { "thefuzz" ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thermobeacon-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thermobeacon-ble/default.nix index 4974e42e51..16fed5c055 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thermobeacon-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thermobeacon-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix index 8a26660791..ee2a4fb2e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thermopro-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix index 64646c08cc..f3c94bbb77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix index 5316c90c5d..b2d85107e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/threadpoolctl/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "sha256-/qt7cgFbvpc1BLZC7a4S0RToqSggKXAqF1Xr6xOqzw8="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook numpy scipy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/threat9-test-bed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/threat9-test-bed/default.nix index 35d5f1389f..4eab16c304 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/threat9-test-bed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/threat9-test-bed/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix index f2b841e22b..29dcb22b90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ dask fsspec lxml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tika/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tika/default.nix index 375560ad98..f71772749c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tika/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tika/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "tika"; - version = "1.24"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "wsUPQFYi90UxhBEE+ehcF1Ea7eEd6OU4XqsaKaMfGRs="; + sha256 = "sha256-VmcOuBKUTrJe1z8bOwdapB56E1t0skCCLyi4GeWzc9o="; }; propagatedBuildInputs = [ pyyaml requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tikzplotlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tikzplotlib/default.nix index ebf58dd12e..8a38bb9a7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tikzplotlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tikzplotlib/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pandas ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix index ab5cf84d86..7e05668b23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { wheel # No idea why but it is listed ]; - checkInputs = [ + nativeCheckInputs = [ psutil # optional pandas diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tiler/default.nix index de4517ff32..7f26871b29 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tiler/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tilt-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tilt-ble/default.nix index a663ba8429..c4164ce070 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tilt-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tilt-ble/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix index 44335c7248..1c410042ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { backports-zoneinfo ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timeago/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timeago/default.nix index 0c2a688f67..fa89cff6eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timeago/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timeago/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "03vm7c02l4g2d1x33w382i1psk8i3an7xchk69yinha33fjj1cag"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix index ee264c9093..e85786b378 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix index 355fa0270c..eceeb7d929 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timezonefinder/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ numba pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timm/default.nix new file mode 100644 index 0000000000..5f2d0135cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/timm/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, expecttest +, pytest-timeout +, huggingface-hub +, pyyaml +, torch +, torchvision +}: + +buildPythonPackage rec { + pname = "timm"; + version = "0.6.12"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "rwightman"; + repo = "pytorch-image-models"; + rev = "refs/tags/v${version}"; + hash = "sha256-RNjCcCnNhtr5a+29Bx+k427a03MSooqvnuiDQ8cT8FA="; + }; + + propagatedBuildInputs = [ + huggingface-hub + pyyaml + torch + torchvision + ]; + + nativeCheckInputs = [ expecttest pytestCheckHook pytest-timeout ]; + pytestFlagsArray = [ "tests" ]; + # takes too long and also tries to download models: + disabledTestPaths = [ "tests/test_models.py" ]; + + pythonImportsCheck = [ + "timm" + "timm.data" + ]; + + meta = with lib; { + description = "PyTorch image models, scripts, and pretrained weights"; + homepage = "https://huggingface.co/docs/timm/index"; + changelog = "https://github.com/rwightman/pytorch-image-models/blob/v${version}/README.md#whats-new"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinycss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinycss/default.nix index 42250b058d..5dc443a0e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tinycss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tinycss/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "12306fb50e5e9e7eaeef84b802ed877488ba80e35c672867f548c0924a76716e"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ cssutils ]; nativeBuildInputs = [ cython diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix index 8d6d457d31..937c475053 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tinycss2/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ webencodings ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Low-level CSS parser for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix index ae08cceab1..87d3502f6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tinydb/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "tinydb"; - version = "4.7.0"; + version = "4.7.1"; disabled = pythonOlder "3.5"; format = "pyproject"; src = fetchFromGitHub { owner = "msiemens"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-cAIo/qdIOIpPt9vPan5oJfKtH2Gmrm03aLuAHpfUfLY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-nKsTMakCOBVHDDp8AX/xDkvHpCMBoIb0pa24F4VX/14="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { --replace "--cov-append --cov-report term --cov tinydb" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pycodestyle pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix index 33fe952ad2..0614f375a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { regex ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix index d64acf2db5..a19858c46e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tld/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "69fed19d26bb3f715366fb4af66fdeace896c55c052b00e8aaba3a7b63f3e7f0"; }; - checkInputs = [ + nativeCheckInputs = [ factory_boy faker pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix index 1aac6f4557..c87cb7a799 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tldextract/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { requests-file ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix index a886e116e4..1c0669b72b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tls-parser/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-A1lYRe1sHDoOFdF20DP+xRMcPBWzokIXFphIpaBmwBc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/todoist-api-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/todoist-api-python/default.nix index 8604b32d7a..fca8d0acad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/todoist-api-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/todoist-api-python/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook responses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix index e8b97e3f10..a72e329bc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/toggl-cli/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { validate-email ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock faker diff --git a/third_party/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix index 072b084db6..d11db6d031 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/token-bucket/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pytest-runner ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenize-rt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tokenize-rt/default.nix index 556c35c307..6f5d1f08ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tokenize-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenize-rt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "sha256-YNt4YwkuA3DVq4EjJaIES9V3A6ENa3k6/qVKisjA5Pc="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "A wrapper around the stdlib `tokenize` which roundtrips"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix index 2ff5c452a1..a3c02f70ed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix @@ -97,7 +97,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ datasets pytestCheckHook requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tololib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tololib/default.nix index d4ca96c82d..6d2ad4815b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tololib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tololib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toml-adapt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toml-adapt/default.nix index 51497c3fbc..8387fb386b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/toml-adapt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/toml-adapt/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix index 24a3b2f51f..c196d1e487 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; pythonImportsCheck = [ "tomli" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix index 03ccef3a78..861560c2ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { lib.optionals isPy27 [ enum34 functools32 ] ++ lib.optional isPy27 typing; - checkInputs = [ + nativeCheckInputs = [ pyaml pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix index 6ca48fd1ff..d1961b970d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-iMVwhhxEDuPy9gN8RlRhMij/QMk6bCXg66cNFygsYZQ="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/pytoolz/toolz"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix index a9722b053b..2559399b25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "toposort"; - version = "1.7"; + version = "1.9"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3cIYLEKRKkQFEb1/9dPmocq8Osy8Z0oyWMjEHL+7ISU="; + sha256 = "sha256-9Bo0SQ1Ek0tTOnva/5ee6KRyA/0tinRtuD8tWrEkWLk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch-tb-profiler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch-tb-profiler/default.nix index 41ff63a21f..108acfb0d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch-tb-profiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch-tb-profiler/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pandas tensorboard ]; - checkInputs = [ pytestCheckHook torch torchvision ]; + nativeCheckInputs = [ pytestCheckHook torch torchvision ]; disabledTests = [ # Tests that attempt to access the filesystem in naughty ways. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix index c91ae972d2..c64f36c8df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix @@ -242,7 +242,7 @@ in buildPythonPackage rec { "torch" ]; - checkInputs = [ hypothesis ninja psutil ]; + nativeCheckInputs = [ hypothesis ninja psutil ]; checkPhase = with lib.versions; with lib.strings; concatStringsSep " " [ "runHook preCheck" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix index 8bde4937ea..0ebce5b66d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchgpipe/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ torch ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "test_inplace_on_requires_grad" "test_input_requiring_grad" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix index c18f1c68be..c36372235e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { torchvision ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchlibrosa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchlibrosa/default.nix new file mode 100644 index 0000000000..bab73b0dae --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchlibrosa/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, librosa +, numpy +, torch +}: + +buildPythonPackage rec { + pname = "torchlibrosa"; + version = "0.0.9"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-+LzejKvLlJIIwWm9rYPCWQDSueIwnG5gbkwNE+wbv0A="; + }; + + propagatedBuildInputs = [ + librosa + numpy + torch + ]; + + patches = [ + # Fix run against librosa 0.9.0, https://github.com/qiuqiangkong/torchlibrosa/pull/8 + (fetchpatch { + url = "https://github.com/qiuqiangkong/torchlibrosa/commit/eec7e7559a47d0ef0017322aee29a31dad0572d5.patch"; + hash = "sha256-c1x3MA14Plm7+lVuqiuLWgSY6FW615qnKbcWAfbrcas="; + }) + ]; + + # Project has no tests. + # In order to make pythonImportsCheck work, NUMBA_CACHE_DIR env var need to + # be set to a writable dir (https://github.com/numba/numba/issues/4032#issuecomment-488102702). + # pythonImportsCheck has no pre* hook, use checkPhase to workaround that. + checkPhase = '' + export NUMBA_CACHE_DIR="$(mktemp -d)" + ''; + pythonImportsCheck = [ "torchlibrosa" ]; + + meta = with lib; { + description = "PyTorch implemention of part of librosa functions"; + homepage = "https://github.com/qiuqiangkong/torchlibrosa"; + license = licenses.mit; + maintainers = with maintainers; [ azuwis ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix index 8dbf0cd3cd..c1ce980176 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix @@ -37,7 +37,7 @@ buildPythonPackage { torch ]; - checkInputs = [ + nativeCheckInputs = [ pytorch-lightning scikit-learn scikitimage diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix index 3d7ae3f584..de8852035c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix @@ -56,7 +56,7 @@ in buildPythonPackage rec { HOME=$TMPDIR py.test test --ignore=test/test_datasets_download.py ''; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; meta = with lib; { description = "PyTorch vision library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tornado/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/tornado/4.nix index 5765dee441..e4f59c1487 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tornado/4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tornado/4.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tornado/5.nix b/third_party/nixpkgs/pkgs/development/python-modules/tornado/5.nix index 5dfb4f8054..d3961d06c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tornado/5.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tornado/5.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix index c9fa36ec65..7c8a374a8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-m2MEGb3oTsZmv9fqCkyyqKZRwtXMzb3RlyoMhZ38PBM="; }; - checkInputs = [ + nativeCheckInputs = [ pycares pycurl twisted diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torpy/default.nix index 7602e66808..635b975f28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torpy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix index d36e404821..0d65d0ade1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/total-connect-client/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { zeep ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/towncrier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/towncrier/default.nix index 7be96c79a0..06ec0f00a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/towncrier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/towncrier/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { export PATH=$out/bin:$PATH ''; - checkInputs = [ + nativeCheckInputs = [ git mock twisted diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix index 04e7f890bf..c51830b7fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.0.2"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-W3WJPYQofNcpW5AyIW3ms6FxQ2yWzocL3nrZGCdm+gk="; + hash = "sha256-p58W6PIYdimJz8Cdzv/rr8GRW1wLcb0jnhNxkbuQiBo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix index 45ac7a9e87..fe7df9d9ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { # https://github.com/tpm2-software/tpm2-pytss/issues/341 doCheck = false; - checkInputs = [ + nativeCheckInputs = [ ibm-sw-tpm2 pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix index 6da72cde5e..edb182d8b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tqdm/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-asyncio pytest-timeout diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix index 9459772638..bab98930c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { numba ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix index 1e0b177b89..4145fdf1a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trainer/default.nix @@ -9,6 +9,7 @@ , torch-bin , tensorboardx , protobuf +, psutil , pytestCheckHook , soundfile @@ -37,16 +38,17 @@ buildPythonPackage { propagatedBuildInputs = [ coqpit fsspec - torch-bin + protobuf + psutil soundfile tensorboardx - protobuf + torch-bin ]; # only one test and that requires training data from the internet doCheck = false; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook torchvision-bin ]; @@ -58,6 +60,7 @@ buildPythonPackage { meta = with lib; { description = "A general purpose model trainer, as flexible as it gets"; homepage = "https://github.com/coqui-ai/Trainer"; + changelog = "https://github.com/coqui-ai/Trainer/releases/tag/v${version}"; license = licenses.asl20; maintainers = teams.tts.members; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix index 565730bd34..a42fc6f95e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ hatchling ]; - checkInputs = [ glibcLocales pytest mock ]; + nativeCheckInputs = [ glibcLocales pytest mock ]; propagatedBuildInputs = [ ipython_genutils decorator six ]; checkPhase = '' @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Traitlets Python config system"; - homepage = "http://ipython.org/"; + homepage = "https://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix index 290892672e..a26ab6b46f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ traitlets ]; - checkInputs = [ numpy pandas xarray nose pytestCheckHook ]; + nativeCheckInputs = [ numpy pandas xarray nose pytestCheckHook ]; pythonImportsCheck = [ "traittypes" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transforms3d/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transforms3d/default.nix index 8b21e64e9a..549ad85c78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transforms3d/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transforms3d/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy sympy ]; - checkInputs = [ pytest scipy ]; + nativeCheckInputs = [ pytest scipy ]; checkPhase = "pytest transforms3d"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transip/default.nix index ff37464a0f..1179f92402 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transip/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { suds-jurko ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix index 42efd9d001..77eec05114 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pygraphviz # optional ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock graphviz diff --git a/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix index 374c1d5dfa..90ccce1c9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { inquirer ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ # Requires network connection "tests/test_translate.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix index b82a61b751..da95234c1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytz pytestCheckHook yarl diff --git a/third_party/nixpkgs/pkgs/development/python-modules/treeo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/treeo/default.nix index febb59880b..30a90bd36e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/treeo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/treeo/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { jax ]; - checkInputs = [ jaxlib ]; + nativeCheckInputs = [ jaxlib ]; pythonImportsCheck = [ "treeo" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix index 17f12cab5b..cfbadc344e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { torch ]; - checkInputs = [ + nativeCheckInputs = [ cloudpickle dm-haiku hypothesis diff --git a/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix index 0f77463077..5f71842066 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { twisted ] ++ twisted.optional-dependencies.tls; - checkInputs = [ + nativeCheckInputs = [ httpbin twisted ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix index 080792a98b..c56e3663c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { trezor-udev-rules ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTestPaths = [ "tests/test_stellar.py" # requires stellar-sdk diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trfl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trfl/default.nix index 0f986f7148..356eb98500 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trfl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trfl/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { tensorflow-probability ]; - checkInputs = [ + nativeCheckInputs = [ nose pytestCheckHook ]; 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 46d1b97894..672a0916b2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.18.0"; + version = "3.18.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RYjJdbi60vHDwlShKmEoK6g3mmtb3euuM9qvdqpn5oE="; + sha256 = "sha256-8Jw5YmHsATchcchiPqxqxA+PYgl7elqZLqG8vTu/b0k="; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio-asyncio/default.nix index 2cbd32b910..127da2d476 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trio-asyncio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trio-asyncio/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { sniffio ]; - checkInputs = [ + nativeCheckInputs = [ pytest-trio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix index 3b33b80e92..4549a056b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { wsproto ]; - checkInputs = [ + nativeCheckInputs = [ pytest-trio pytestCheckHook trustme diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix index c38011978d..194dc3f718 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { # tests are failing on Darwin doCheck = !stdenv.isDarwin; - checkInputs = [ + nativeCheckInputs = [ astor jedi pyopenssl diff --git a/third_party/nixpkgs/pkgs/development/python-modules/troposphere/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/troposphere/default.nix index a22028fcbf..a7a27bd86c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/troposphere/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/troposphere/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ awacs ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix index c8dbe1ffe5..647bfbbafc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { calver ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trustme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trustme/default.nix index 649e2de1c1..786b6f5bc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trustme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trustme/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "sha256-XgeyPXDO7WTzuzauS5q8UjVMFsmNRasDe+4rX7/+WGw="; }; - checkInputs = [ + nativeCheckInputs = [ pyopenssl pytestCheckHook service-identity diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix index 9f13bbe53d..8f7dd450c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { ++ passlib.optional-dependencies.argon2 ++ lib.optional withPostgresql psycopg2; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttach/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttach/default.nix new file mode 100644 index 0000000000..11b43fd992 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ttach/default.nix @@ -0,0 +1,33 @@ +{ fetchFromGitHub +, pythonOlder +, pytestCheckHook +, torch +, buildPythonPackage +, lib +}: + +buildPythonPackage rec { + pname = "ttach"; + version = "0.0.3"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "qubvel"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-R6QO+9hv0eI7dZW5iJf096+LU1q+vnmOpveurgZemPc="; + }; + + propagatedBuildInputs = [ torch ]; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "ttach" ]; + + meta = with lib; { + description = "Image Test Time Augmentation with PyTorch"; + homepage = "https://github.com/qubvel/ttach"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ cfhammill ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix index 46daca68a6..f350b2e10a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { "ttp" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pyyaml ttp-templates diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tunigo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tunigo/default.nix index 9f2f177552..c69f00f251 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tunigo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tunigo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "07q9girrjjffzkn8xj4l3ynf9m4psi809zf6f81f54jdb330p2fs"; }; - checkInputs = [ mock responses pytest ]; + nativeCheckInputs = [ mock responses pytest ]; checkPhase = '' py.test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix index 1264f07c18..91b360f936 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tvdb_api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests-cache ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # requires network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix index 69b126481d..a768e3559d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tweedledum/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "tweedledum" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "python/test" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix index 325ce0e5fc..e313818daf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tweepy/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook vcrpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix index 39f8629a5b..c54f897a51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twentemilieu/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix index 2ff9236b37..1f8f402583 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.16.1"; + version = "7.16.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-n4n6lG3lzfGh5HPjt1oNWGjSTobHP7IJach2xLdBNdY="; + hash = "sha256-Z783lHGZc5/Fl4pnM5mf863UVuFroRNwV5cljPSpCmw="; }; propagatedBuildInputs = [ @@ -32,7 +32,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ cryptography django mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix index e8f0b815f0..0f0f455a42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix @@ -140,10 +140,11 @@ buildPythonPackage rec { $out/bin/twistd --help > /dev/null ''; - checkInputs = [ + nativeCheckInputs = [ git glibcLocales - hypothesis + # "hypothesis" indirectly depends on twisted to build its documentation. + (hypothesis.override { enableDocumentation = false; }) pyhamcrest ] ++ passthru.optional-dependencies.conch diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix index c11e8bd4fd..7bb1d04f54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests rx ]; - checkInputs = [ pytestCheckHook responses ]; + nativeCheckInputs = [ pytestCheckHook responses ]; pythonImportsCheck = [ "twitch" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txaio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txaio/default.nix index 3c7f94ed4d..eeb53a8092 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/txaio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/txaio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { zope_interface ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txrequests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txrequests/default.nix index eaf94e21ee..afe4b0f93b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/txrequests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/txrequests/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { # Require network access doCheck = false; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Asynchronous Python HTTP for Humans."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix index ef06f71184..85385347b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { zope_interface ] ++ twisted.optional-dependencies.tls; - checkInputs = [ pytestCheckHook mock lsof GeoIP ]; + nativeCheckInputs = [ pytestCheckHook mock lsof GeoIP ]; doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txzmq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txzmq/default.nix index 6ae66dba90..f47c33924c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/txzmq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/txzmq/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { twisted ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typecode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typecode/default.nix index 2fa0010bdd..929f53785a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typecode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typecode/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { typecode-libmagic ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix index 0c5e1fa3cd..8487b7ff9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-GRmKw7SRrrIIb61VeB8GLhSKCmLUd54AA+GAf43vor8="; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix index f866e631a0..af8b9c5ef3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix @@ -1,53 +1,70 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchPypi -, setuptoolsBuildHook , attrs +, buildPythonPackage , cattrs -, toml -, pytestCheckHook , click , click-option-group +, fetchPypi +, hatchling +, pytestCheckHook +, pythonOlder +, tomli +, typing-extensions }: buildPythonPackage rec { pname = "typed-settings"; - version = "2.0.0"; + version = "2.0.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "typed_settings"; inherit version; - hash = "sha256-o0cPD/7/DS9aUtLDA1YhxKrxUDE7Elv4B7zlKVSsFJQ="; + hash = "sha256-AYHA1xFS0g99cloGIjvi8loKS/Q/AteyLiLH8rf+2No="; }; nativeBuildInputs = [ - setuptoolsBuildHook + hatchling ]; propagatedBuildInputs = [ attrs cattrs click-option-group - toml + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; + passthru.optional-dependencies = { + click = [ + click + ]; + }; + + checkInputs = [ + pytestCheckHook + typing-extensions + ] ++ passthru.optional-dependencies.click; + pytestFlagsArray = [ "tests" ]; - checkInputs = [ - click - pytestCheckHook + disabledTests = [ + # AssertionError: assert [OptionInfo(p... + "test_deep_options" ]; - pythonImportsCheck = [ "typed_settings" ]; + pythonImportsCheck = [ + "typed_settings" + ]; meta = { description = "Typed settings based on attrs classes"; homepage = "https://gitlab.com/sscherfke/typed-settings"; + changelog = "https://gitlab.com/sscherfke/typed-settings/-/blob/${version}/CHANGELOG.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix index dd3f62527a..7c69463d9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { substituteInPlace setup.cfg --replace " --cov" "" ''; - checkInputs = [ pytestCheckHook typing-extensions ]; + nativeCheckInputs = [ pytestCheckHook typing-extensions ]; disabledTestPaths = [ # mypy tests aren't passing with latest mypy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix index 0048109bcc..f02a0f0c51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ coverage # execs coverage in tests pytest-sugar pytest-xdist diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix index 0af21f38a4..44389574ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-decorator/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-decorator"; - version = "5.1.8.1"; + version = "5.1.8.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+SkMviPSZ0uxii2V9ZPCdUdGPtRZ4OYEgAxCCZw8akQ="; + sha256 = "sha256-Sddr47Ry/U+k3DO6VapLke5h6/c3nRrSVfxWMvy9wAc="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix index af33403ee7..31906b220a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-docutils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.19.1.1"; + version = "0.19.1.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-vgpRuhx90hXZ0t9m1oReY8EAm0u/TFvrh6DZdFzbqWI="; + hash = "sha256-yj0hNUhK21LdBCu929bt3LvajGCLo/Xl+Qi9VI/8s5k="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix index 39430b9214..e671b91bb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-python-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.19.5"; + version = "2.8.19.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-q5H8X3FffXbZpQ09100MaN/jilTwI5z6BQZXWuTYep0="; + hash = "sha256-Sm9MwZzkuhoIZwhx4pe/OAL1XU8SnmqiRD9UC2z4A9I="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix index e1ff2f67a3..5968bb38f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2022.7.0.0"; + version = "2022.7.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TyDClTs6OgWH6USJ7EyeAsPTrtubpc1+eW4S9M+nAn4="; + sha256 = "sha256-kY+cPnqVC6fn1vhLGKfKyryIhstxJfsZJ/8cdStLWd4="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix index 7198e4e923..f0b4056e2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pyyaml"; - version = "6.0.12.2"; + version = "6.0.12.3"; format = "setuptools"; src = fetchPypi { pname = "types-PyYAML"; inherit version; - sha256 = "sha256-aECBmHHJLe6+aiBn+4AMEbigY2MutOPnVZFOerNgToM="; + sha256 = "sha256-F84Xs+rY8G5BajsdW43cbLgqQiuyACVN2LRpQ0sEX/w="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix index 2703f8bcce..274e69ca77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.11.7"; + version = "2.28.11.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CuOGM3NJkNAZuA9UY9+hZOvTWBmYrIQ19Sbab+TVmMM="; + sha256 = "sha256-5nQkUl+ErfvqtyaKFZ08Yzhi2vrhXFsZVHzhtVlU8KM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-retry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-retry/default.nix index 53323d950c..29652179d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-retry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-retry/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-retry"; - version = "0.9.9"; + version = "0.9.9.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-sQh7J0aAtULHllSehIiJjQsizYmYjvEBbvVtQ2f/T0E="; + hash = "sha256-NE6tQ4fg6YxtYDdYwTGO5OWwRCnOy5o0Khz4c947UQ0="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typesentry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typesentry/default.nix index a4d8125b5d..5aa12fb041 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typesentry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typesentry/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { }; propagatedBuildInputs = [ colorama ]; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; checkPhase = '' pytest ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix index 30d26293e5..18834d9c38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix index 066c3f452e..4914e011e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typical/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ujson ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mypy pydantic diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typing-inspect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typing-inspect/default.nix index e79eb6823e..b0418176bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typing-inspect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typing-inspect/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { mypy-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typish/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typish/default.nix index 8b7fcdce39..c0942c7016 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typish/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typish/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "0mc5hw92f15mwd92rb2q9isc4wi7xq76449w7ph5bskcspas0wrf"; }; - checkInputs = [ + nativeCheckInputs = [ numpy pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix index e908a10b43..7059c9cae1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-subtests ] ++ lib.optionals (pythonOlder "3.7") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix index bb51abb182..392e8e8992 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pytz-deprecation-shim ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix index a472cc1546..18215f96bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ glibcLocales ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = { description = "A portable, lightweight MessagePack serializer and deserializer written in pure Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ua-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ua-parser/default.nix index e324459e98..e9c9a56173 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ua-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ua-parser/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uarray/default.nix index 4d7fe6b034..f1b3c49646 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uarray/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { } )]; - checkInputs = [ pytestCheckHook pytest-cov ]; + nativeCheckInputs = [ pytestCheckHook pytest-cov ]; propagatedBuildInputs = [ matchpy numpy astunparse typing-extensions ]; # Tests must be run from outside the source directory diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uasiren/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uasiren/default.nix index 49ab9906c5..b6771266f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uasiren/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uasiren/default.nix @@ -38,7 +38,7 @@ buildPythonPackage { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uc-micro-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uc-micro-py/default.nix index 9b20e22511..d83a4cbd54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uc-micro-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uc-micro-py/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-23mKwoRGjtxpCOC26V8bAN5QEHLDOoSqPeTlUuIrxZ0="; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "uc_micro" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix index 5e20ffaafe..8f3eb8c485 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ++ fonttools.optional-dependencies.lxml ++ fonttools.optional-dependencies.ufo; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufoLib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufoLib2/default.nix index e42b6766f4..7a959147de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ufoLib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufoLib2/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { msgpack = [ cattrs msgpack ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix index ac0fd9fb66..ce9d4da479 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ ApplicationServices ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 372a2df841..7f9ca14ebd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ukkonen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ukkonen/default.nix index dfdcf35152..5ea0930d7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ukkonen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ukkonen/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ukrainealarm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ukrainealarm/default.nix index 00854ded31..4cd4d2a852 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ukrainealarm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ukrainealarm/default.nix @@ -38,7 +38,7 @@ buildPythonPackage { aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix index 25016f9b4c..001a5f1b42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , keras , numba , numpy @@ -27,6 +28,22 @@ buildPythonPackage rec { hash = "sha256-S2+k7Ec4AxsN6d0GUGnU81oLnBgmlZp8OmUFCNaUJYw="; }; + patches = [ + # Fix tests with sklearn>=1.2.0 + (fetchpatch { + url = "https://github.com/lmcinnes/umap/commit/a714b59bd9e2ca2e63312bc3491b2b037a42f2f2.patch"; + hash = "sha256-WOSWNN5ewVTV7IEBEA7ZzgZYMZxctF1jAWs9ylKTyLs="; + }) + (fetchpatch { + url = "https://github.com/lmcinnes/umap/commit/c7d05683325589ad432a55e109cacb9d631cfaa9.patch"; + hash = "sha256-hE2Svxf7Uja+DbCmTDCnd7mZynjNbC5GUjfqg4ZRO9Y="; + }) + (fetchpatch { + url = "https://github.com/lmcinnes/umap/commit/949abd082524fce8c45dfb147bcd8e8ef49eade3.patch"; + hash = "sha256-8/1k8iYeF77FIaUApNtY07auPJkrt3vNRR/HTYRvq+0="; + }) + ]; + propagatedBuildInputs = [ numba numpy @@ -36,7 +53,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ keras pytestCheckHook tensorflow diff --git a/third_party/nixpkgs/pkgs/development/python-modules/umodbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/umodbus/default.nix index 845548dcb7..331a4b1306 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/umodbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/umodbus/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pyserial ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unasync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unasync/default.nix index 9b37edfb28..d6e8c99510 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unasync/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unasync/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix index 06bdf12349..f2fdbd748c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ future ]; - checkInputs = [ nose numpy ]; + nativeCheckInputs = [ nose numpy ]; checkPhase = '' nosetests -sv diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix index b22de9043e..4f9a2a9526 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uncompyle6/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-HmqQLeYOpcP30q9+J0UAa05Lm97eiIoH+EQcmTjy7n0="; }; - checkInputs = [ nose pytest hypothesis six ]; + nativeCheckInputs = [ nose pytest hypothesis six ]; propagatedBuildInputs = [ spark_parser xdis ]; # six import errors (yet it is supplied...) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix index 8ddd24470c..0501a1695c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unearth/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { cached-property ]; - checkInputs = [ + nativeCheckInputs = [ flask pytest-httpserver pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix index 3d91368dd6..1a4ccb1ee7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unicode-slugify/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six unidecode ]; - checkInputs = [ + nativeCheckInputs = [ nose unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix index ea878d6e0c..5e09df1f6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unicodedata2/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0bcgls7m2zndpd8whgznnd5908jbsa50si2bh88wsn0agcznhv7d"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Backport and updates for the unicodedata module"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unidecode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unidecode/default.nix index e2ac00de21..5fcf87e9ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unidecode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unidecode/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { hash = "sha256-75E2OlrGIxvwR9MeZEB4bDLdFd1SdprCVcBIJCPS3hM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; 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 2fea8dca66..c34e70eb9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unidiff/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "2bbcbc986e1fb97f04b1d7b864aa6002ab02f4d8a996bf03aa6e5a81447d1fc5"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix index 3878185837..cd53dae368 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pyroute2 ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unify/default.nix index 45b7557117..1935374d37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unify/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ untokenize ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Modifies strings to all use the same quote where possible"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix index c59b3428c0..d84f5c36d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { lxml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix index ca3f2b6ce4..f40fc7d99e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs packaging pyparsing semantic-version semver ]; - checkInputs = [ commoncode pytestCheckHook saneyaml ]; + nativeCheckInputs = [ commoncode pytestCheckHook saneyaml ]; dontConfigure = true; # ./configure tries to setup virtualenv and downloads dependencies diff --git a/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix index 22472549e6..0948e91c72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { defusedxml ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/untokenize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/untokenize/default.nix index 2977ffd76e..3ee6b53d05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/untokenize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/untokenize/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "3865dbbbb8efb4bb5eaa72f1be7f3e0be00ea8b7f125c69cbd1f5fda926f37a2"; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; meta = with lib; { description = "Transforms tokens into original source code while preserving whitespace"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix index 310480a49a..50b4d7a4d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/upb-lib/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.5.2"; + version = "0.5.3"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "upb_lib"; inherit version; - hash = "sha256-/TNKsno0JJtxBY9HCPQfp7OhlfkOP6sJI51rgp2ujDg="; + hash = "sha256-I1lnIr8ptDCyK8r0bvFWFPUGRwoMsQcNnSCSwzdt1Bc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/upcloud-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/upcloud-api/default.nix index e70a49be5a..379a3ebd2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/upcloud-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/upcloud-api/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/update-dotdee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/update-dotdee/default.nix index a89f0df403..00e4e51ebb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/update-dotdee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/update-dotdee/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix index 4705999a79..b4d0f71a5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook lz4 pytest-timeout diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix new file mode 100644 index 0000000000..e9af904e9c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/uptime-kuma-api/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-socketio +, pythonOlder +}: + +buildPythonPackage rec { + pname = "uptime-kuma-api"; + version = "0.9.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "uptime_kuma_api"; + inherit version; + hash = "sha256-nbRBsG4Mietd6kcrvpbTbWUP0SMRXbW4mWme1G5n3ks="; + }; + + propagatedBuildInputs = [ + python-socketio + python-socketio.optional-dependencies.client + ]; + + pythonImportsCheck = [ + "uptime_kuma_api" + ]; + + # Tests need an uptime-kuma instance to run + doCheck = false; + + meta = with lib; { + description = "A Python wrapper for the Uptime Kuma Socket.IO API"; + homepage = "https://github.com/lucasheld/uptime-kuma-api"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ julienmalka ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uritemplate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uritemplate/default.nix index 814e7fd8c1..ccd1126439 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uritemplate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uritemplate/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { simplejson ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix index 3032f7791a..a3cca49393 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/url-normalize/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytest-flakes pytest-mock pytest-socket diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urlextract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urlextract/default.nix index 2d3917e06d..90fb0d457c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urlextract/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urlextract/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { uritools ]; - checkInputs = [ + nativeCheckInputs = [ dnspython pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix index 86083a4cc5..37390c12ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = passthru.optional-dependencies.brotli ++ passthru.optional-dependencies.socks; - checkInputs = [ + nativeCheckInputs = [ python-dateutil mock pytest-freezegun diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urlpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urlpy/default.nix index cd0e028c50..cd03957e00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urlpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urlpy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { publicsuffix2 ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix index 192676ceac..3ea35c2a90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urwid-readline/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { urwid ]; - checkInputs = [ + nativeCheckInputs = [ glibcLocales pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix index 57e64ba97a..7e135e2aa7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , isPy3k , glibcLocales }: @@ -15,9 +16,18 @@ buildPythonPackage rec { sha256 = "588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae"; }; + patches = [ + # https://github.com/urwid/urwid/pull/517 + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/urwid/urwid/commit/42c1ed1eeb663179b265bae9b384d7ec11c8a9b5.patch"; + hash = "sha256-Oz8O/M6AdqbB6C/BB5rtxp8FgdGhZUxkSxKIyq5Dmho="; + }) + ]; + # tests need to be able to set locale LC_ALL = "en_US.UTF-8"; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; # tests which assert on strings don't decode results correctly doCheck = isPy3k; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix index 863989156c..372d6830f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { }) ]; - checkInputs = [ glibcLocales ]; + nativeCheckInputs = [ glibcLocales ]; LC_ALL="en_US.UTF-8"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/usb-devices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/usb-devices/default.nix index ac63251a72..8a77fd8597 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/usb-devices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/usb-devices/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ush/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ush/default.nix index 3e7773fb2f..7ce8ec1f28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ush/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ush/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-eL3vG3yS02enbLYorKvvYKbju9HInffUhrZgkodwhvo="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/utils/default.nix index a6dd57e0e5..c2ad8a8790 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/utils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "07pr39cfw5ayzkp6h53y7lfpd0w19pphsdzsf100fsyy3npavgbr"; }; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvcclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvcclient/default.nix index 1490172a46..61a14b85eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvcclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvcclient/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0k8aswrk1n08w6pi6dg0zdzsmk23cafihkrss9ywg3i85w7q43x2"; }; - checkInputs = [ + nativeCheckInputs = [ nose mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix index 116a9f1d28..cb8e479377 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ asgiref uvicorn httpx diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index fafc027337..ac3da7eb78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ]; dontUseSetuptoolsCheck = true; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook psutil ] ++ lib.optionals (pythonOlder "3.11") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vaa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vaa/default.nix index d43f007c35..54c2520ee6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vaa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vaa/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { flit-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook cerberus django diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix index 8cb42064ba..85809e0a5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix index 3f0f40fc26..be42bfc079 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ flit ]; - checkInputs = [ hypothesis pytestCheckHook ]; + nativeCheckInputs = [ hypothesis pytestCheckHook ]; pythonImportsCheck = [ "validobj" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix index 8e760921ba..0b667d9218 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vapoursynth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vapoursynth/default.nix index 3a72e5c2d9..da75653962 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vapoursynth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vapoursynth/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { vapoursynth ]; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/variants/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/variants/default.nix index 2b5dccec55..e1483dbf96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/variants/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/variants/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix index 9abd727e72..043d08a022 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix @@ -1,51 +1,57 @@ -{ buildPythonPackage -, lib -, isPy27 -, six +{ lib +, buildPythonPackage , fetchPypi -, pyyaml , mock -, contextlib2 -, wrapt -, pytest , pytest-httpbin -, yarl +, pytestCheckHook , pythonOlder -, pythonAtLeast +, pyyaml +, six +, yarl +, wrapt }: buildPythonPackage rec { pname = "vcrpy"; version = "4.2.1"; + format = "setuptools"; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fNPoGixJLgHCgfGAvMKoa1ILFz0rZWy12J2ZR1Qj4BM="; + hash = "sha256-fNPoGixJLgHCgfGAvMKoa1ILFz0rZWy12J2ZR1Qj4BM="; }; - checkInputs = [ - pytest - pytest-httpbin - ]; - propagatedBuildInputs = [ pyyaml - wrapt six - ] - ++ lib.optionals (pythonOlder "3.3") [ contextlib2 mock ] - ++ lib.optionals (pythonAtLeast "3.4") [ yarl ]; + yarl + wrapt + ]; - checkPhase = '' - py.test --ignore=tests/integration -k "not TestVCRConnection" - ''; + nativeCheckInputs = [ + pytest-httpbin + pytestCheckHook + ]; + + disabledTestPaths = [ + "tests/integration" + ]; + + disabledTests = [ + "TestVCRConnection" + ]; + + pythonImportsCheck = [ + "vcr" + ]; meta = with lib; { description = "Automatically mock your HTTP interactions to simplify and speed up testing"; homepage = "https://github.com/kevin1024/vcrpy"; + changelog = "https://github.com/kevin1024/vcrpy/releases/tag/v${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vdf/default.nix index 70ddf7bec9..91c6fe3085 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vdf/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-6ozglzZZNKDtADkHwxX2Zsnkh6BE8WbcRcC9HkTTgPU="; }; - checkInputs = [ mock pytestCheckHook ]; + nativeCheckInputs = [ mock pytestCheckHook ]; pythonImportsCheck = [ "vdf" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix index c61ec16b87..418850444c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vdirsyncer/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook pytest-subtesthack diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix index 04190a8eb4..a1b153deef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vector/default.nix @@ -1,10 +1,16 @@ { lib +, awkward , buildPythonPackage , fetchPypi , hatch-vcs , hatchling +, numba , numpy +, notebook +, packaging +, papermill , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -12,6 +18,8 @@ buildPythonPackage rec { version = "0.11.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchPypi { inherit pname version; sha256 = "sha256-/e0wZDWIIm9vi37NEkIEitQj0p1M132AAO6id0eaA5Y="; @@ -21,17 +29,30 @@ buildPythonPackage rec { hatch-vcs hatchling ]; + propagatedBuildInputs = [ numpy + packaging ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + awkward + notebook + numba + papermill + pytestCheckHook + ]; - pythonImportsCheck = [ "vector" ]; + pythonImportsCheck = [ + "vector" + ]; + + __darwinAllowLocalNetworking = true; meta = with lib; { - description = "A Python 3.7+ library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; + description = "Library for 2D, 3D, and Lorentz vectors, especially arrays of vectors, to solve common physics problems in a NumPy-like way"; homepage = "https://github.com/scikit-hep/vector"; + changelog = "https://github.com/scikit-hep/vector/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vega_datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vega_datasets/default.nix index 70235aa95b..629f540743 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vega_datasets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vega_datasets/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pandas ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test vega_datasets --doctest-modules -k 'not column_names' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix index 7328494a61..24ee92f492 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vehicle/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix index 46a53c0c39..3c7b7ba032 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pyserial-asyncio ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/venusian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/venusian/default.nix index f13bd4cbdc..2e81a9559f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/venusian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/venusian/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "f6842b7242b1039c0c28f6feef29016e7e7dd3caaeb476a193acf737db31ee38"; }; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; checkPhase = '' pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/verboselogs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/verboselogs/default.nix index 009dcd60ed..45f747b936 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/verboselogs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/verboselogs/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { hash = "sha256-hcIdbn0gdkdJ33KcOx6uv0iMXW0x+i880SoROi+qX4I="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/versionfinder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/versionfinder/default.nix index 5ca8d76499..3e2d01b5eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/versionfinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/versionfinder/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { backoff ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/versioningit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/versioningit/default.nix index 5cfe9861f4..480b72e2e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/versioningit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/versioningit/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { tomli ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook build pydantic diff --git a/third_party/nixpkgs/pkgs/development/python-modules/versiontag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/versiontag/default.nix index 8c4bb49eba..3e250cd5ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/versiontag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/versiontag/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { --replace "get_version(pypi=True)" '"${version}"' ''; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; pythonImportsCheck = [ "versiontag" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix index 6a850fed99..1bd12d4a3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vertica-python/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock parameterized pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/videocr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/videocr/default.nix index 1158d9fa91..0685b184c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/videocr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/videocr/default.nix @@ -25,6 +25,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ + --replace "python-Levenshtein" "Levenshtein" \ --replace "opencv-python" "opencv" substituteInPlace videocr/constants.py \ --replace "master" "main" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/viewstate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/viewstate/default.nix index cd64dcc756..3b1c5e7461 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/viewstate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/viewstate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "15s0n1lhkz0zwi33waqkkjipal3f7s45rxsj1bw89xpr4dj87qx5"; }; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vilfo-api-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vilfo-api-client/default.nix index 05ce501997..d628a12fff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vilfo-api-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vilfo-api-client/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { semver ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vine/default.nix index 3f272a84b8..200f4f68eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vine/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-fTsWJKlT2oLvY0YgE7vScdPrdXUUifmAdZjo80C9Y34="; }; - checkInputs = [ + nativeCheckInputs = [ case pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix index 6d407d7ea2..3723daec55 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { virtualenv ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix index cb9f8ed989..c57a1e0e04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { ./0001-Check-base_prefix-and-base_exec_prefix-for-Python-2.patch ]; - checkInputs = [ + nativeCheckInputs = [ cython flaky pytest-freezegun diff --git a/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix index 4df2ecd0ed..f70d4771ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { vivisect ]; - checkInputs = [ + nativeCheckInputs = [ pytest-sugar pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix index 31ea68662a..2cb55c69ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook voluptuous ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix index 4212de031b..c7e82d193f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/voluptuous/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-cz3Bd+/yPh+VOHxzi/W+gbDh/H5Nl/n4jvxDOirmAVk="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix index adb55bd072..f3df712c3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix @@ -1,34 +1,43 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, setuptools -, geopy -, docopt -, certifi -, amqtt -, websockets , aiohttp -, pytestCheckHook -, asynctest +, amqtt +, buildPythonPackage +, certifi +, docopt +, fetchFromGitHub +, fetchpatch +, geopy +, mock , pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +, websockets }: buildPythonPackage rec { pname = "volvooncall"; version = "0.10.1"; + format = "setuptools"; disabled = pythonOlder "3.8"; - format = "setuptools"; - src = fetchFromGitHub { owner = "molobrakos"; repo = "volvooncall"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-udYvgKj7Rlc/hA86bbeBfnoVRjKkXT4TwpceWz226cU="; }; + patches = [ + # Remove async, https://github.com/molobrakos/volvooncall/pull/92 + (fetchpatch { + name = "remove-asnyc.patch"; + url = "https://github.com/molobrakos/volvooncall/commit/ef0df403250288c00ed4c600e9dfa79dcba8941e.patch"; + hash = "sha256-U+hM7vzD9JSEUumvjPSLpVQcc8jAuZHG3/1dQ3wnIcA="; + }) + ]; + propagatedBuildInputs = [ aiohttp ]; @@ -46,16 +55,19 @@ buildPythonPackage rec { }; checkInputs = [ - asynctest + mock pytest-asyncio pytestCheckHook ] ++ passthru.optional-dependencies.mqtt; - pythonImportsCheck = [ "volvooncall" ]; + pythonImportsCheck = [ + "volvooncall" + ]; meta = with lib; { description = "Retrieve information from the Volvo On Call web service"; homepage = "https://github.com/molobrakos/volvooncall"; + changelog = "https://github.com/molobrakos/volvooncall/releases/tag/v${version}"; license = licenses.unlicense; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vpk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vpk/default.nix index a39f0a47df..6adf28cebd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vpk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vpk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-SPkPb8kveAR2cN9kd2plS+TjmBYBCfa6pJ0c22l69M0="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix index 1fbcf76a63..e0f37922c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vt-py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vt-py"; - version = "0.17.3"; + version = "0.17.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,14 +19,14 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nveMsebW828ATEW6vw+var+GxbJj2N0mNaQlkx+GH3w="; + hash = "sha256-4CmSsSZqFhH3rwctCJUqU4JdDxBgIxFnUZ5FQCBZXqg="; }; propagatedBuildInputs = [ aiohttp ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-httpserver pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix index bb5d1fd31b..501b08969d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pint pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vxi11/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vxi11/default.nix index 242fe47b33..e33fb6dbc0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vxi11/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vxi11/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "1xv7chp7rm0vrvbz6q57fpwhlgjz461h08q9zgmkcl2l0w96hmsn"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix index ea878ac489..a01b1e5f5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-DhGY8bdFGVtrPdGkzWYBH7+C8wpNnauu4fnlyG8CAnQ="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix index e88a6ad21d..934f55f2aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wakeonlan/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix index b0e943b433..d6747b3d72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wand/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { "magick_home = '${imagemagickBig}'" ''; - checkInputs = [ + nativeCheckInputs = [ py pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix index 8925ea7f34..f6d1769f52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, appdirs , azure-core , bokeh , buildPythonPackage @@ -39,7 +40,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.13.7"; + version = "0.13.9"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -48,7 +49,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-o9mIGSILztnHY3Eyb0MlznUEdMbCfA1BT6ux0UlesBc="; + hash = "sha256-BpFLN4WLT+fm5+50NDOU4bM73WjeGEhD6P8XKE9n9cI="; }; patches = [ @@ -65,6 +66,7 @@ buildPythonPackage rec { # setuptools is necessary since pkg_resources is required at runtime. propagatedBuildInputs = [ + appdirs click docker_pycreds gitpython @@ -80,7 +82,7 @@ buildPythonPackage rec { shortuuid ]; - checkInputs = [ + nativeCheckInputs = [ azure-core bokeh flask @@ -99,8 +101,10 @@ buildPythonPackage rec { tqdm ]; + # Set BOKEH_CDN_VERSION to stop bokeh throwing an exception in tests preCheck = '' export HOME=$(mktemp -d) + export BOKEH_CDN_VERSION=3.0.3 ''; pythonRelaxDeps = [ "protobuf" ]; @@ -117,7 +121,6 @@ buildPythonPackage rec { "tests/unit_tests_old/test_logging.py" "tests/unit_tests_old/test_metric_internal.py" "tests/unit_tests_old/test_public_api.py" - "tests/unit_tests_old/test_report_api.py" "tests/unit_tests_old/test_runtime.py" "tests/unit_tests_old/test_sender.py" "tests/unit_tests_old/test_tb_watcher.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/warcio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/warcio/default.nix index ae870a37fe..6b9fd5d171 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/warcio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/warcio/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook httpbin requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ward/default.nix new file mode 100644 index 0000000000..9d438d7425 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/ward/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, click +, click-completion +, click-default-group +, cucumber-tag-expressions +, fetchFromGitHub +, pluggy +, poetry-core +, pprintpp +, pythonOlder +, pythonRelaxDepsHook +, rich +, tomli +}: + +buildPythonPackage rec { + pname = "ward"; + version = "0.67.0b0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "darrenburns"; + repo = pname; + rev = "refs/tags/release%2F${version}"; + hash = "sha256-4dEMEEPySezgw3dIcYMl56HrhyaYlql9JvtamOn7Y8g="; + }; + + pythonRelaxDeps = [ + "rich" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + click + rich + tomli + pprintpp + cucumber-tag-expressions + click-default-group + click-completion + pluggy + ]; + + # Fixture is missing. Looks like an issue with the import of the sample file + doCheck = false; + + pythonImportsCheck = [ + "ward" + ]; + + meta = with lib; { + description = "Test framework for Python"; + homepage = "https://github.com/darrenburns/ward"; + changelog = "https://github.com/darrenburns/ward/releases/tag/release%2F${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix index c646107c32..b0b16aed16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { jsonschema ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/warrant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/warrant/default.nix index 8da1cf55b5..6482024a4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/warrant/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/warrant/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { --replace "python-jose-cryptodome>=1.3.2" "python-jose>=2.0.0" ''; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; propagatedBuildInputs = [ boto3 envs python-jose requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix index 6fc0f16bec..da3b4b2fc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "sha256-RaYTplXhFKsnL1rxRMNR+VT92S2ym3z6buIQuCwZeeU="; }; - checkInputs = [ + nativeCheckInputs = [ ipykernel nbconvert typing-extensions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wasmer/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/wasmer/tests.nix index bdb3adfe93..523d06a401 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wasmer/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wasmer/tests.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { dontBuild = true; dontInstall = true; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook wasmer wasmer-compiler-cranelift diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wasserstein/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wasserstein/default.nix index 391712828e..1609e12f20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wasserstein/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wasserstein/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { wurlitzer ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; pytestFlagsArray = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix index b4c8dcaf6b..a242c7ec9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ flaky pytest-timeout pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix index 034566f90a..c31aa264bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { anyio ]; - checkInputs = [ + nativeCheckInputs = [ dirty-equals pytest-mock pytest-timeout diff --git a/third_party/nixpkgs/pkgs/development/python-modules/waterfurnace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/waterfurnace/default.nix index 526066f1fa..7c57fc4d0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/waterfurnace/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/waterfurnace/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { websocket-client ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix index 10be746606..6cb717679d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watermark/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix index cce9a162e8..25e7222608 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ cairosvg pillow pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wavefile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wavefile/default.nix index 3090ee8154..21641008c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wavefile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wavefile/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ + nativeCheckInputs = [ pyaudio numpy libsndfile diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix index c7b7e9bc9e..e6025b7690 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-aRkrjlwKfQ3F/xGH7rPjmBQWM6S95RxpyH9Y/oftNhw="; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix index defd5df7a6..6105838ec5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ bracex ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix index 7d5cbc69ec..7b58fb111f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"; }; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; propagatedBuildInputs = [ setuptools ] ++ lib.optionals (!isPy3k) [ backports_functools_lru_cache diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix index 96b7ec4898..071fe20111 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { tinycss2 ] ++ fonttools.optional-dependencies.woff; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ghostscript ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/web/default.nix index 1b40519d59..35d89947c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/web/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "web" ]; - checkInputs = [ pytestCheckHook dbutils mysqlclient pymysql mysql-connector psycopg2 ]; + nativeCheckInputs = [ pytestCheckHook dbutils mysqlclient pymysql mysql-connector psycopg2 ]; meta = with lib; { description = "Makes web apps"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/web3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/web3/default.nix index 8515ccda36..c31fe93b02 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/web3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/web3/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { pythonRelaxDeps = true; # TODO: package eth-tester - #checkInputs = [ + #nativeCheckInputs = [ # eth-tester # eth-tester.optional-dependencies.py-evm # py-geth diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webargs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webargs/default.nix index 57b0e82b6b..e98156a13f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webargs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webargs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ marshmallow ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-aiohttp webtest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webassets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webassets/default.nix index 176d2f6616..081fdc59bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webassets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webassets/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pyyaml ]; - checkInputs = [ nose jinja2 mock pytest ]; + nativeCheckInputs = [ nose jinja2 mock pytest ]; # Needs Babel CLI tool doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix index e9de15488d..f26c85f58f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pyopenssl ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix index 46498b5950..5ec245676a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-FtBD06CP1qGxt+Pp5iZA0JeQ3OgNK91HkqF1s1/nlKk="; }; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "tests" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webdav4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webdav4/default.nix index 7aab18e3c6..5459617cd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webdav4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webdav4/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { python-dateutil ]; - checkInputs = [ + nativeCheckInputs = [ cheroot colorama pytest-xdist 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 4d2c37f6b0..d74d7b2e7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webdavclient3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webdavclient3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ python-dateutil lxml requests ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # disable tests completely, as most of them fail due to urllib3 not being able to establish a http connection doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webencodings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webencodings/default.nix index fa89241d7d..a8686fb7c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webencodings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webencodings/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test webencodings/tests.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix index e4fb4f0ea3..2b07f61e1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-tk71FBvlWc+t5EjwRPpFwiYDUe3Lao72t+AMfc7wwyM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weboob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weboob/default.nix index 6ceefbaa20..79a88db2a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weboob/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weboob/default.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { --replace "weboob.tools.capabilities.bank.transactions," "" ''; - checkInputs = [ + nativeCheckInputs = [ nose ]; 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 b54b0b5e26..8b0287c9aa 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 @@ -22,7 +22,7 @@ buildPythonPackage rec { python-socks ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix index 7ccafafad5..98bc6cc863 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/websockets/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { done ''; - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webssh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webssh/default.nix index e60fc87a1c..55c9b9e6e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webssh/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { tornado ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webtest-aiohttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webtest-aiohttp/default.nix index c1ae249c87..34c61524f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webtest-aiohttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webtest-aiohttp/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytest-aiohttp , pytestCheckHook , pythonOlder @@ -22,11 +23,19 @@ buildPythonPackage rec { sha256 = "sha256-UuAz/k/Tnumupv3ybFR7PkYHwG3kH7M5oobZykEP+ao="; }; + patches = [ + (fetchpatch { + name = "python311-compat.patch"; + url = "https://github.com/sloria/webtest-aiohttp/commit/64e5ab1867ea9ef87901bb2a1a6142566bffc90b.patch"; + hash = "sha256-OKJGajqJLFMkcbGmGfU9G5hCpJaj24Gs363sI0z7YZw="; + }) + ]; + propagatedBuildInputs = [ webtest ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp pytest-aiohttp pytestCheckHook @@ -37,6 +46,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/sloria/webtest-aiohttp/blob/${src.rev}/CHANGELOG.rst"; description = "Provides integration of WebTest with aiohttp.web applications"; homepage = "https://github.com/sloria/webtest-aiohttp"; license = licenses.mit; 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 50e7a1c73e..ce34b045fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webtest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webtest/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { webob ]; - checkInputs = [ + nativeCheckInputs = [ pastedeploy pyquery pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix index 8681554277..4f6a8b00d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { --replace "pytest-cov" "" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix index c476581fc4..db66c2e9b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytest-httpserver pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix index 5562fd13b9..204e4a848a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { watchdog ]; - checkInputs = [ + nativeCheckInputs = [ ephemeral-port-reserve pytest-timeout pytest-xprocess diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix index 91afabd368..f7a197bcc1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wfuzz/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { colorama ]; - checkInputs = [ + nativeCheckInputs = [ netaddr pytest pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whatthepatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whatthepatch/default.nix index 12ffa8ebea..0d7aa81230 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whatthepatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whatthepatch/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wheel-filename/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wheel-filename/default.nix index d4dd51ab2c..e874894b13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wheel-filename/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wheel-filename/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wheel-inspect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wheel-inspect/default.nix index 438084e6c0..c8ce155c78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wheel-inspect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wheel-inspect/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { wheel-filename ]; - checkInputs = [ + nativeCheckInputs = [ jsonschema pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whichcraft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whichcraft/default.nix index b771615ebb..c68925b46a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whichcraft/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whichcraft/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { LC_ALL="en_US.utf-8"; buildInputs = [ glibcLocales ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' py.test diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index d77ad762d8..aae90576e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "whirlpool-sixth-sense"; - version = "0.18"; + version = "0.18.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-XmbRUVivV+jSJUpksMIJ88CwNtOD+Qkwtqyg3dX33ZU="; + hash = "sha256-6vmevL/VDuBnsPeYxtBZkCi9SVuINpM6jVlNR1Y6AuA="; }; propagatedBuildInputs = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { websockets ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook 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 b36a5c9a23..114c32356d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whisper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whisper/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whispers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whispers/default.nix index a0032baa71..9a0ad6756c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whispers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whispers/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook ]; 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 0f95515c62..e56abe4cba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { brotli ]; - checkInputs = [ + nativeCheckInputs = [ django pytestCheckHook requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix index 131cf0125c..8dd65d1191 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { httpx ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix index 78368377fa..7c8ce7492e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whois/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "whois"; - version = "0.9.23"; + version = "0.9.25"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "DannyCork"; repo = "python-whois"; rev = "refs/tags/${version}"; - hash = "sha256-HYzCdWX0gz1W73ZPlrdt+kqUPbBRrDnkGJE56nQ3UVc="; + hash = "sha256-h4s0cJbzc5uorT9yPtXIgVDwUExUe3cNMSHCWRhN1Q4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whoosh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whoosh/default.nix index e31d97a07d..10053bc279 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whoosh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whoosh/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; # Wrong encoding postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wifi/default.nix index 0b5a9444db..c02ab8781b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wifi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { --replace "/sbin/iwlist" "${wirelesstools}/bin/iwlist" ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/withings-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/withings-api/default.nix index fbfab134b1..df5af3299d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/withings-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/withings-api/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook responses ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix index 11e5beeb60..8c2967c5ae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { yarl ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wn/default.nix index 18fe23e1ea..1bdb096f7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wn/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { tomli ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix index e9f5ec19d1..ee71b7cae4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/woob/default.nix @@ -74,7 +74,7 @@ buildPythonPackage rec { --replace "with-coverage = 1" "" ''; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix index c3caf374ff..58d513adcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/word2vec/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cython numpy scikit-learn six ]; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; # Checks require test data downloaded separately # See project source Makefile:test-data rule for reference diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix index 2ac682c775..08ae8cfc34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wordcloud/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pillow ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix index ce8c81b2ab..a0313bc23f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wordfreq/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "regex ==" "regex >=" ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # These languages require additional dictionaries that aren't packaged "test_languages" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/worldengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/worldengine/default.nix index fed9a3c900..837b619e77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/worldengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/worldengine/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { ''; doCheck = !isPy27; # google namespace clash - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "TestSerialization" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wrapt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wrapt/default.nix index 8074cf940c..590100c300 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wrapt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wrapt/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-nXwDuNo4yZxgjnkus9bVwIZltPaSH93D+PcZMGT2nGM="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix index 2714169aad..78b3486c72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { wrapt ]; - checkInputs = [ + nativeCheckInputs = [ netcdf4 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ws4py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ws4py/default.nix index 8abf78520d..58649de205 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ws4py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ws4py/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "29d073d7f2e006373e6a848b1d00951a1107eb81f3742952be905429dc5a5483"; }; - checkInputs = [ pytest mock git ]; + nativeCheckInputs = [ pytest mock git ]; propagatedBuildInputs = [ cherrypy gevent tornado ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wsdiscovery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wsdiscovery/default.nix index 8ba7974494..784172b7ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wsdiscovery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wsdiscovery/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { netifaces ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix index 164cdbf014..2d6b5911d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wsgi-intercept/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ httplib2 py pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wsgidav/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wsgidav/default.nix index 90be9491f3..b54a351b47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wsgidav/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wsgidav/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ cheroot pytestCheckHook requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix index ce9f0c0d7a..583b8111ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ h11 ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "wsproto" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wtforms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wtforms/default.nix index ef2e06cc3e..037bbb394e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wtforms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wtforms/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ markupsafe babel ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook email-validator ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix index cf5f514df1..ee93a2c645 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { hash = "sha256-Ik9f5wYYvjhywF393IxFcZHsGHBlRZYnn8we2t6+Pls="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/x-wr-timezone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/x-wr-timezone/default.nix index 1e16db7c30..8944078f70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/x-wr-timezone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/x-wr-timezone/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pytz ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook restructuredtext_lint pygments diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix index b942caf944..9ca01d574d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { xarray ]; - checkInputs = [ + nativeCheckInputs = [ einops numba pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix index a24743ed28..3448ad879b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pandas ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xbox-webapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xbox-webapi/default.nix index de4500378f..e4701e806d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xbox-webapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xbox-webapi/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pydantic ]; - checkInputs = [ + nativeCheckInputs = [ aresponses pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xboxapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xboxapi/default.nix index 973f2f6aba..0f34bec3c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xboxapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xboxapi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "xboxapi" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix index 3f3a35edf1..4de24783ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xcffib/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook xorg.xeyes xorg.xorgserver diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix index ddf66a7417..a84d2656cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { clikit ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "XDG Base Directory Specification for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix index 407375cbcd..4528bad359 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xdis/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix index ef413e79c2..cd7fdd9a21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xdot/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { disabled = !isPy3k; nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; propagatedBuildInputs = [ pygobject3 graphviz gtk3 numpy ]; - checkInputs = [ xvfb-run ]; + nativeCheckInputs = [ xvfb-run ]; postInstall = '' wrapProgram "$out/bin/xdot" --prefix PATH : "${lib.makeBinPath [ graphviz ]}" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xgboost/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xgboost/default.nix index ea8e8a5699..5d0b3b5612 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xgboost/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xgboost/default.nix @@ -32,7 +32,7 @@ buildPythonPackage { ''; # test setup tries to download test data with no option to disable - # (removing sklearn from checkInputs causes all previously enabled tests to be skipped) + # (removing sklearn from nativeCheckInputs causes all previously enabled tests to be skipped) # and are extremely cpu intensive anyway doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix index 31ae00ec78..ad1e3b731f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { svglib ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix index 852fc0c8b9..c868801e2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { sensor-state-data ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xkbcommon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xkbcommon/default.nix index 6de7a435a6..f9320a4bca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xkbcommon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xkbcommon/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedNativeBuildInputs = [ cffi ]; buildInputs = [ libxkbcommon ]; propagatedBuildInputs = [ cffi ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postBuild = '' ${python.interpreter} xkbcommon/ffi_build.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix index 5aac18d210..1186cac192 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xkcdpass/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { installShellFiles ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix index 9d97d0268e..2d1cbab86c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.2.0"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vz24saI0wuhax4/zCBDM3HB+ZjZI8bGOWr2va4V3zV8="; + hash = "sha256-G4az6YmCDv1MPF30mBQVNBPZdebjZqd+0vxo5F5iDWY="; }; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { ifaddr ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix index 29bab5e9b2..c9fd701403 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook mock nose diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xlrd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xlrd/default.nix index bc88880f30..6fa9b6935d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xlrd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xlrd/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "http://www.python-excel.org/"; + homepage = "https://www.python-excel.org/"; description = "Library for developers to extract data from Microsoft Excel (tm) spreadsheet files"; license = licenses.bsd0; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xlwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xlwt/default.nix index 7b8e931fb8..efcc4adfda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xlwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xlwt/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests -v ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix index 5a9b839c3b..ff8451da3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,32 +1,33 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, intervaltree -, pyflakes -, requests -, lxml -, google-i18n-address -, pycountry -, html5lib -, six -, kitchen -, pypdf2 -, dict2xml -, weasyprint -, pyyaml -, jinja2 -, configargparse , appdirs +, buildPythonPackage +, configargparse , decorator +, dict2xml +, fetchFromGitHub +, google-i18n-address +, html5lib +, intervaltree +, jinja2 +, lxml +, markupsafe , pycairo +, pycountry +, pyflakes +, pypdf2 , pytestCheckHook , python-fontconfig +, pythonOlder +, pyyaml +, requests +, six +, wcwidth }: buildPythonPackage rec { pname = "xml2rfc"; - version = "3.15.3"; + version = "3.16.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; @@ -34,7 +35,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - sha256 = "sha256-kA6Ali5zFEwe4iGpSSabUfNoaqY9/dxLyG+SccA94zc="; + hash = "sha256-H2m6WZTIu2xLIz3ysOZcicIibPj8mErrxYM2+F07aS0="; }; postPatch = '' @@ -46,43 +47,46 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + appdirs + configargparse + dict2xml + google-i18n-address + html5lib intervaltree jinja2 + lxml + markupsafe + pycountry pyflakes + pypdf2 pyyaml requests - lxml - google-i18n-address - pycountry - html5lib six - kitchen - pypdf2 - dict2xml - weasyprint - configargparse - appdirs + wcwidth ]; - checkInputs = [ + nativeCheckInputs = [ decorator pycairo pytestCheckHook python-fontconfig ]; - # requires Noto Serif and Roboto Mono font + # Requires Noto Serif and Roboto Mono font doCheck = false; checkPhase = '' make tests-no-network ''; - pythonImportsCheck = [ "xml2rfc" ]; + pythonImportsCheck = [ + "xml2rfc" + ]; meta = with lib; { description = "Tool generating IETF RFCs and drafts from XML sources"; homepage = "https://github.com/ietf-tools/xml2rfc"; + changelog = "https://github.com/ietf-tools/xml2rfc/blob/v${version}/CHANGELOG.md"; # Well, parts might be considered unfree, if being strict; see: # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmldiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmldiff/default.nix index 5d91208722..9f3bde9f34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmldiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmldiff/default.nix @@ -1,24 +1,35 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi , lxml , setuptools -, six , pytestCheckHook }: buildPythonPackage rec { pname = "xmldiff"; - version = "2.4"; + version = "2.5"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Bb6iDOHyyWeGg7zODDupmB+H2StwnRkOAYvL8Efsz2M="; + sha256 = "sha256-bF8wvGXOboHZpwo8sCafe6YYUv1sqnoPv8Dt8zs8txc="; }; - propagatedBuildInputs = [ lxml setuptools six ]; + propagatedBuildInputs = [ + lxml + setuptools + ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "xmldiff" + ]; meta = with lib; { description = "Creates diffs of XML files"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmljson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmljson/default.nix index dd5d84afac..60752537e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmljson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmljson/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "b4158e66aa1e62ee39f7f80eb2fe4f767670ba3c0d5de9804420dc53427fdec8"; }; - checkInputs = [ + nativeCheckInputs = [ lxml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix index b22f626d1a..cfec72b968 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { elementpath ]; - checkInputs = [ + nativeCheckInputs = [ lxml pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix index 1aec0cc114..0817764cc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lxml ]; - checkInputs = [ pytestCheckHook hypothesis ]; + nativeCheckInputs = [ pytestCheckHook hypothesis ]; disabledTestPaths = [ # Full git clone required for test_doc_examples diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix index 19c2b1d283..c0dbe6dc3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-NBWVpIjj4BqFqdiRHYkS/ZIu3l/sxNzkN+tLbI0DflY="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmodem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmodem/default.nix index a53567f7fa..7358f843eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xmodem/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xmodem/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1xx7wd8bnswxa1fv3bfim2gcamii79k7qmwg7dbxbjvrhbcjjc0l"; }; - checkInputs = [ pytest which lrzsz ]; + nativeCheckInputs = [ pytest which lrzsz ]; checkPhase = '' pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix index a7c08ddc0b..eebd30364e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xpath-expressions/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { poetry-core ]; - checkInputs = [ + nativeCheckInputs = [ lxml pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix index 2783578180..6ad48ac123 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ]; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.cli ++ passthru.optional-dependencies.lxml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xtensor-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xtensor-python/default.nix index 7d973c0906..217d856e77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xtensor-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xtensor-python/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { dontUsePipInstall = true; dontUseSetuptoolsCheck = true; - checkInputs = [ + nativeCheckInputs = [ gtest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix index f037cb4033..90890677ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # See: https://github.com/cgoldberg/xvfbwrapper/issues/30 doCheck = false; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; meta = with lib; { description = "Run headless display inside X virtual framebuffer (Xvfb)"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xyzservices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xyzservices/default.nix index fc74c7c374..56a2ad45ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xyzservices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xyzservices/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { "xyzservices.providers" ]; - checkInputs = [ + nativeCheckInputs = [ mercantile pytestCheckHook requests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix index 9c9013df2d..2fab492268 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yabadaba/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix index 11f2a9573b..3e2de3d2af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "1.12.5"; + version = "1.12.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wofdqwgMbwxUgUVwBT44qbD4m0q0CtmGH7AxRNMBMbE="; + hash = "sha256-04Xl2TBs9RL+KWmJgUY+PDoYN4AAvrcWP7TJBEu5lNU="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { pycryptodome ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix index 2ffd5fe287..22919fa0a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses aiounittest asynctest 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 5cd60f02b5..7e0d693abc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ruamel-yaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix index b789aab037..96a5c74aec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix @@ -2,41 +2,45 @@ , buildPythonPackage , click , fetchFromGitHub +, maison +, pdm-pep517 , pytest-xdist , pytestCheckHook , pythonOlder , ruyaml +, setuptools }: buildPythonPackage rec { pname = "yamlfix"; - version = "0.8.2"; - format = "setuptools"; + version = "1.6.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "lyz-code"; repo = pname; - rev = version; - sha256 = "sha256-YCC4xK1fB5Gyv32JhbSuejtzLNMRnH7iyUpzccVijS0="; + rev = "refs/tags/${version}"; + hash = "sha256-OXo9PkvKn+XPxfXUObwps62lwNo6lE4Ot5L0lZPIYPw="; }; + nativeBuildInputs = [ + setuptools + pdm-pep517 + ]; + propagatedBuildInputs = [ click + maison ruyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-xdist pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'python_paths = "."' "" - ''; - pythonImportsCheck = [ "yamlfix" ]; @@ -44,7 +48,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python YAML formatter that keeps your comments"; homepage = "https://github.com/lyz-code/yamlfix"; - license = licenses.gpl3Plus; + changelog = "https://github.com/lyz-code/yamlfix/blob/${version}/CHANGELOG.md"; + license = licenses.gpl3Only; maintainers = with maintainers; [ koozz ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix index ca092cef8c..84fb0dd9a4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pathspec ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamlloader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamlloader/default.nix index 5dd4b4d8a1..33f9a0ccfd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamlloader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamlloader/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yanc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yanc/default.nix index 37e7d91a80..dfe5903901 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yanc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yanc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # Tests fail on Python>=3.5. See: https://github.com/0compute/yanc/issues/10 doCheck = pythonOlder "3.5"; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; checkPhase = '' nosetests . diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix index 2978799699..c8e8809bcd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pyxb ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yapf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yapf/default.nix index 2d6fc9520c..80b84b73ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yapf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yapf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-o/UIXTfvfj4ATEup+bPkDFT/GQHNER8FFFrjE6fGfRs="; }; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yappi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yappi/default.nix index 764fcaf901..cb12c4f63f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yappi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yappi/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ./tests.patch ]; - checkInputs = [ + nativeCheckInputs = [ gevent ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yapsy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yapsy/default.nix index a6471d8f07..2787120195 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yapsy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yapsy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = "http://yapsy.sourceforge.net/"; + homepage = "https://yapsy.sourceforge.net/"; description = "Yet another plugin system"; license = licenses.bsd0; # tests fail and are not using pytest to easily disable them diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yara-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yara-python/default.nix index e9774ae85d..85b8a26abc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yara-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yara-python/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { yara ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yarg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yarg/default.nix index 97237ba09b..6368fbc463 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yarg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yarg/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ nose mock ]; + nativeCheckInputs = [ nose mock ]; checkPhase = '' nosetests ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix index c9be7901c1..c2ac28e64d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix @@ -1,26 +1,57 @@ -{ lib, buildPythonPackage, fetchPypi, - click, colorama, flask, requests, yt-dlp }: +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, pythonRelaxDepsHook +, click +, colorama +, flask +, requests +, yt-dlp +, progress +}: buildPythonPackage rec { pname = "yark"; - version = "1.2.3"; + version = "1.2.4"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KMnQpEH2Z19Y0jBjqx2rZjmlle2M9bcuDCjDIljQEYY="; + sha256 = "fdd50d0e832b4522cbe24433f42ed571a1f199f571c1d0c98472b94a501db9cf"; }; + pythonRelaxDeps = [ + "requests" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ - click colorama flask requests yt-dlp + click + colorama + flask + progress + requests + yt-dlp ]; # There aren't any unit tests. If test discovery runs, it will crash, halting the build. # When upstream adds unit tests, please configure them here. Thanks! ~ C. doCheck = false; + pythonImportsCheck = [ + "yark" + ]; + meta = with lib; { description = "YouTube archiving made simple"; homepage = "https://github.com/Owez/yark"; license = licenses.mit; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix index 3c0a218b8e..1a1295d29b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yarl/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pushd tests ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yaspin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yaspin/default.nix index 9bad354d73..bf68acafba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yaspin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yaspin/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { termcolor ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yaswfp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yaswfp/default.nix index 267052f5c1..8b7843d917 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yaswfp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yaswfp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1dxdz89hlycy1rnn269fwl1f0qxgxqarkc0ivs2m77f8xba2qgj9"; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix index 211a4b60c8..6bac02af7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "5731a31cb7452c0c6930dd1a284e0170b39eee959851a2aceb8d6af4134a5fa8"; + sha256 = "sha256-ap/z/TMKYCh4BOpzcKhBZrYk6/S3rZ7XiLfFd3m2UmM="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ydiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ydiff/default.nix index e7452b89a5..46490a098e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ydiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ydiff/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { patchShebangs tests/*.sh ''; - checkInputs = [ docutils pygments ]; + nativeCheckInputs = [ docutils pygments ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix index b2c0198894..2a67d6a9b6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yeelight/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ifaddr ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix index 86d93a6049..d2a113fb51 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yfinance/default.nix @@ -1,8 +1,10 @@ { lib , appdirs +, beautifulsoup4 , buildPythonPackage , cryptography , fetchFromGitHub +, frozendict , multitasking , numpy , pandas @@ -13,7 +15,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.3"; + version = "0.2.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,12 +24,14 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1xO+zz+syuiWeZAxnRIV0va8WOIW2P9elRBtHDk7w1M="; + hash = "sha256-CcvBVW9MdXVx1BnIcPB9b1PHGK2zw4Hg0vVNW6s87/Q="; }; propagatedBuildInputs = [ appdirs + beautifulsoup4 cryptography + frozendict multitasking numpy pandas diff --git a/third_party/nixpkgs/pkgs/development/python-modules/youless-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/youless-api/default.nix index f29c10a8a4..c5f5b7f1f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/youless-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/youless-api/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/youtube-transcript-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/youtube-transcript-api/default.nix index 100aa2eaf0..888389f59d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/youtube-transcript-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/youtube-transcript-api/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ mock httpretty pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix index 30c056db93..08b137402b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { --replace "==" ">=" \ ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix index 937c95864a..599cb56c4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { argcomplete ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yte/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yte/default.nix index 90bb34a71c..cb5e036b6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yte/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yte/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { pyyaml ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index 53a6b1846d..a2adbeb87d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.24.1"; + version = "0.25.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-8NYutkZwR8tQzsVzYsOo6HdkiZ6WbIconDjcOwgs3PM="; + hash = "sha256-hpX/qmRRwvCE0N5jIWl6AZkcYaVViK30nPbJwyZD+rM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix index 0db092a144..5aad3df78a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ zc-buildout ]; - checkInputs = [ zope_testrunner ]; + nativeCheckInputs = [ zope_testrunner ]; doCheck = !python.pkgs.isPy27; checkPhase = '' ${python.interpreter} -m zope.testrunner --test-path=src [] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zadnegoale/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zadnegoale/default.nix index 5b08fa950f..64feef2724 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zadnegoale/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zadnegoale/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { orjson ]; - checkInputs = [ + nativeCheckInputs = [ aioresponses pytest-asyncio pytest-error-for-skips diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zake/default.nix index f144bc9d2c..a9a5902b4c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zake/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ kazoo six ]; buildInputs = [ testtools ]; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; preCheck = '' # Skip test - fails with our new kazoo version substituteInPlace zake/tests/test_client.py \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix index dbe5597247..53609f6b34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { numcodecs ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zconfig/default.nix index 22e4530674..2f965d1e63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zconfig/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; - checkInputs = [ pygments ]; + nativeCheckInputs = [ pygments ]; meta = with lib; { description = "Structured Configuration Library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zcs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zcs/default.nix index 723ace81de..89ee7a2390 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zcs/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { "zcs" ]; - checkInputs = [ + nativeCheckInputs = [ boxx ]; 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 033975ed5d..8f0aff1db6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeep/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { xmlsec ]; - checkInputs = [ + nativeCheckInputs = [ aiohttp aioresponses freezegun diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix index 1c015d4d75..4fd287f3be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.8"; + version = "3.7.8.2"; src = fetchPypi { inherit version pname; - sha256 = "sha256-kodRHIkMXdFUBGNVRtSyjbVqGQRxPaHqgp6ddFT5ZIY="; + sha256 = "sha256-ZDiiyNT871XMDHNPOhKHm4NzgXHcJ0fN/iO4sEz8pRE="; }; buildInputs = [ openssl bzip2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index a65e485004..9c2b394564 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { # OSError: [Errno 48] Address already in use doCheck = !stdenv.isDarwin; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zetup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zetup/default.nix index 41b5f05cfe..4808aa4972 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zetup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zetup/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools-scm ]; - checkInputs = [ + nativeCheckInputs = [ path nbconvert pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeversolarlocal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeversolarlocal/default.nix index feb56c384d..04063837b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeversolarlocal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeversolarlocal/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { httpx ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zfec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zfec/default.nix index f91706b97d..2101c36adb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zfec/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zfec/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyutil ]; - checkInputs = [ setuptoolsTrial twisted ]; + nativeCheckInputs = [ setuptoolsTrial twisted ]; # argparse is in the stdlib but zfec doesn't know that. postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index c0e0edb124..ce35780dfc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.90"; + version = "0.0.92"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-SfzwS7M821uGfbOLR37iiw+gEebKDgu1H7f0fs3J9kw="; + hash = "sha256-WKuME0OVNdNGv0nG40ctG2UAOmDXTkIr6mIh3+JE/uo="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { zigpy ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix index ed4629c07f..54c750d94b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { zigpy ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix index 5671a7c122..299fb706fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { zigpy ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix index 30bfe8ad41..e09c22f56f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { zigpy ]; - checkInputs = [ + nativeCheckInputs = [ asynctest pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix index 24cf7f30eb..16228f5386 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { zigpy ]; - checkInputs = [ + nativeCheckInputs = [ mock pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix index b545752b4e..f1b846e948 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { zigpy ]; - checkInputs = [ + nativeCheckInputs = [ pytest-asyncio pytest-mock pytest-timeout diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index 893a59dffa..e8949b496e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.53.0"; + version = "0.53.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-9KTBzPklQpqzLOQYRz6Kd0wUSHr2sfypvTu0X7om31Y="; + hash = "sha256-1ey1JDxRF9zYSTn1EKWz1gcCw5WrCCH1eNyp6KOO8eI="; }; propagatedBuildInputs = [ @@ -40,7 +40,7 @@ buildPythonPackage rec { voluptuous ]; - checkInputs = [ + nativeCheckInputs = [ asynctest freezegun pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zimports/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zimports/default.nix index 20e23afcfc..53c4bd8ed2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zimports/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zimports/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { tomli ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zipfile36/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zipfile36/default.nix deleted file mode 100644 index 46dd1e173f..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/zipfile36/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, python -, isPy3k -, pythonOlder -}: - -buildPythonPackage rec { - pname = "zipfile36"; - version = "0.1.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "a78a8dddf4fa114f7fe73df76ffcce7538e23433b7a6a96c1c904023f122aead"; - }; - - checkPhase = '' - ${python.interpreter} -m unittest test_zipfile.py - ''; - - # Only works with Python 3.x. - # Not supposed to be used with 3.6 and up. - disabled = !(isPy3k && (pythonOlder "3.6")); - - meta = { - description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; - homepage = "https://gitlab.com/takluyver/zipfile36"; - license = lib.licenses.psfl; - maintainers = lib.maintainers.fridh; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix index 5a80489e80..267f376620 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix @@ -26,7 +26,7 @@ let zipp = buildPythonPackage rec { # Prevent infinite recursion with pytest doCheck = false; - checkInputs = [ + nativeCheckInputs = [ func-timeout jaraco_itertools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zipstream-new/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zipstream-new/default.nix index 3f95fd5d4c..143f4040cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zipstream-new/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zipstream-new/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { "zipstream" ]; - checkInputs = [ + nativeCheckInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zipstream-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zipstream-ng/default.nix index b1f620557b..0db1a30733 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zipstream-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zipstream-ng/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { "zipstream" ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zipstream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zipstream/default.nix index 00c291a1c5..3ec6fd24aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zipstream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zipstream/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = { description = "A zip archive generator"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zm-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zm-py/default.nix index 65f5ec1fa7..ce461a3dff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zm-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zm-py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' PYTHONPATH="./zoneminder:$PYTHONPATH" pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zodb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zodb/default.nix index f1f960ada7..d44642d751 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zodb/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { BTrees ]; - checkInputs = [ + nativeCheckInputs = [ manuel zope_testrunner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-cachedescriptors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-cachedescriptors/default.nix index 7696e07834..56c6875cee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope-cachedescriptors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-cachedescriptors/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix index e1cba0ebc0..b60a393e42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_proxy ]; - checkInputs = [ zope_testrunner ]; + nativeCheckInputs = [ zope_testrunner ]; checkPhase = '' zope-testrunner --test-path=src [] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix index 20d810064b..ff5fe9bb20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-hookable/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "sha256-+2AfAKyH5apYKoExXtlnaM41EygHKdP1H3kxLiuLlKw="; }; - checkInputs = [ zope_testing ]; + nativeCheckInputs = [ zope_testing ]; meta = with lib; { description = "Supports the efficient creation of “hookable” objects"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope-testbrowser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope-testbrowser/default.nix index 31de6e28f2..59c6e67693 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope-testbrowser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope-testbrowser/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { six ]; - checkInputs = [ + nativeCheckInputs = [ mock zope_testing zope_testrunner diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix index b8d364b95e..7e1ed3d5dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "sha256-giPqSvU5hmznqccwrH6xjlHRfrUVk6p3c7NZPI1tdgg="; }; - checkInputs = [ zope_testrunner manuel ]; + nativeCheckInputs = [ zope_testrunner manuel ]; propagatedBuildInputs = [ zope_i18nmessageid zope_schema ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix index bb748eaec9..1e5ac40d1c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_contenttype/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "sha256-NnVoeLxSWzY2TQ1b2ZovCw/TuaUND+m73Eqxs4rCOAA="; }; - checkInputs = [ zope_testrunner ]; + nativeCheckInputs = [ zope_testrunner ]; meta = with lib; { homepage = "https://github.com/zopefoundation/zope.contenttype"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix index ce9595ad53..88d26cee5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_copy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface ]; doCheck = !isPy27; # namespace conflicts - checkInputs = [ unittestCheckHook zope_location zope_schema ]; + nativeCheckInputs = [ unittestCheckHook zope_location zope_schema ]; unittestFlagsArray = [ "-s" "src/zope/copy" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix index 4792a09e26..6539143a00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_filerepresentation/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zope.filerepresentation"; - version = "5.0.0"; + version = "6.0"; src = fetchPypi { inherit pname version; - sha256 = "1mp2r80v6ns92j089l7ngh8l9fk95g2661vkp4vqw7c71irs9g1z"; + sha256 = "sha256-yza3iGspJ2+C8WhfPykfQjXmac2HhdFHQtRl0Trvaqs="; }; propagatedBuildInputs = [ zope_interface zope_schema ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix index 3e89f05f60..856b51d067 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ coverage zope_testrunner ]; + nativeCheckInputs = [ coverage zope_testrunner ]; meta = with lib; { homepage = "https://github.com/zopefoundation/zope.i18nmessageid"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix index 87bb1511e4..97625a3e3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zopfli/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ zopfli ]; USE_SYSTEM_ZOPFLI = "True"; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "cPython bindings for zopfli"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix index bbcc6d67c8..580ab130d8 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { cffi ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix index db33c7f367..eb98ae6f78 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { VERSION = zstd.version; PKG_VERSION = version; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix index fc0a49687e..fe889522e5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix index 1f18447ee7..3a759b1581 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = lib.versionAtLeast pytest-aiohttp.version "1.0.0"; - checkInputs = [ + nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zxcvbn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zxcvbn/default.nix index 96568bcd56..e9a8f32700 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zxcvbn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zxcvbn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { hash = "sha256-etcST7pxlpOH5Q9KtOPGf1vmnkyjEp6Cd5QCmBjW9Hc="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix index 9f58b7014a..9c43844888 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zxing_cpp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { cmake ]; - checkInputs = [ + nativeCheckInputs = [ pillow ]; diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/coverage/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/coverage/default.nix index f93d32d392..94da2f4c7b 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/coverage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/coverage/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; meta = { description = "Code coverage measurement for python"; diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/hypothesis/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/hypothesis/default.nix index 47bc8860bc..f1eb403d81 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/hypothesis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/hypothesis/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { sortedcontainers ] ++ lib.optional (!isPy3k) enum34; - checkInputs = [ pytest pytest-xdist flaky mock pexpect ]; + nativeCheckInputs = [ pytest pytest-xdist flaky mock pexpect ]; inherit doCheck; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/jinja2/default.nix index 0be970d499..3b59333876 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/jinja2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/jinja2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"; }; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; propagatedBuildInputs = [ markupsafe setuptools ]; # Multiple tests run out of stack space on 32bit systems with python2. diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/mock/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/mock/default.nix index f30c407e6f..a343acfffa 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/mock/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { #doCheck = !(python.isPyPy && python.isPy27); doCheck = false; # Infinite recursion pytest - checkInputs = [ + nativeCheckInputs = [ unittestCheckHook pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/more-itertools/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/more-itertools/default.nix index f9a6ac732e..615b1d00d2 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/more-itertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/more-itertools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4"; }; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; propagatedBuildInputs = [ six ]; # iterable = range(10 ** 10) # Is efficiently reversible diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/packaging/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/packaging/default.nix index 0f9e61859a..61f0ed3a73 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/packaging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/packaging/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyparsing six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pretend ]; diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/pip/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pip/default.nix index e3666d6a79..ba78377f59 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/pip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/pip/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { # to force it a little. pipInstallFlags = [ "--ignore-installed" ]; - checkInputs = [ mock scripttest virtualenv pretend pytest ]; + nativeCheckInputs = [ mock scripttest virtualenv pretend pytest ]; # Pip wants pytest, but tests are not distributed doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/pyparsing/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pyparsing/default.nix index d51032a154..5b61dc0c85 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/pyparsing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/pyparsing/default.nix @@ -22,7 +22,7 @@ let # circular dependencies if enabled by default doCheck = false; - checkInputs = [ + nativeCheckInputs = [ jinja2 railroad-diagrams ]; diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/pytest-xdist/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pytest-xdist/default.nix index 466d86f50f..5da424a0c3 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/pytest-xdist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/pytest-xdist/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ setuptools-scm pytest ]; - checkInputs = [ pytest filelock ]; + nativeCheckInputs = [ pytest filelock ]; propagatedBuildInputs = [ execnet pytest-forked psutil six ]; # Encountered a memory leak diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/pytest/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pytest/default.nix index 0a0ae571ba..0edfd30391 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/pytest/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" ''; - checkInputs = [ hypothesis mock ]; + nativeCheckInputs = [ hypothesis mock ]; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] ++ lib.optionals (!isPy3k) [ funcsigs ] diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/typing/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/typing/default.nix index a835be985f..b8c143cbd5 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/typing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/typing/default.nix @@ -20,7 +20,7 @@ in buildPythonPackage rec { # Also, don't bother on PyPy: AssertionError: TypeError not raised doCheck = pythonOlder "3.6" && !isPyPy; - checkInputs = [ unittestCheckHook ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" testDir ]; diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/zipp/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/zipp/default.nix index 82f100aaa0..c256ed4f7a 100644 --- a/third_party/nixpkgs/pkgs/development/python2-modules/zipp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python2-modules/zipp/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ more-itertools ]; - checkInputs = [ pytest pytest-flake8 ]; + nativeCheckInputs = [ pytest pytest-flake8 ]; checkPhase = '' pytest diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix index 4645a3530c..0483feccb6 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix @@ -1,32 +1,40 @@ -{ lib, buildRubyGem, ruby, writeScript }: +{ lib, buildRubyGem, ruby, writeScript, testers, bundler }: buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.4.3"; - source.sha256 = "sha256-AfX4PydFNdghhYk3cApKLxtTw8L8sLEvU3Y49nKHxwA="; + version = "2.4.6"; + source.sha256 = "sha256-MI/g13w5NMoHQ78AJ11BlKhulroUI6xNPqQ19iH51P8="; dontPatchShebangs = true; - passthru.updateScript = writeScript "gem-update-script" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl common-updater-scripts jq - - set -eu -o pipefail - - latest_version=$(curl -s https://rubygems.org/api/v1/gems/${gemName}.json | jq --raw-output .version) - update-source-version ${gemName} "$latest_version" - ''; - postFixup = '' sed -i -e "s/activate_bin_path/bin_path/g" $out/bin/bundle ''; + passthru = { + updateScript = writeScript "gem-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts jq + + set -eu -o pipefail + + latest_version=$(curl -s https://rubygems.org/api/v1/gems/${gemName}.json | jq --raw-output .version) + update-source-version ${gemName} "$latest_version" + ''; + tests.version = testers.testVersion { + package = bundler; + command = "bundler -v"; + version = version; + }; + }; + meta = with lib; { description = "Manage your Ruby application's gem dependencies"; homepage = "https://bundler.io"; changelog = "https://github.com/rubygems/rubygems/blob/bundler-v${version}/bundler/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [anthonyroussel]; + maintainers = with maintainers; [ anthonyroussel ]; + mainProgram = "bundler"; }; } diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index ccc4430ca8..9f2e8dbfcd 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -26,7 +26,7 @@ , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz , bison, flex, pango, python3, patchelf, binutils, freetds, wrapGAppsHook, atk , bundler, libsass, libexif, libselinux, libsepol, shared-mime-info, libthai, libdatrie -, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb +, CoreServices, DarwinTools, cctools, libtool, discount, exiv2, libmaxminddb, libyaml }@args: let @@ -370,7 +370,7 @@ in # otherwise the gem will fail to link to the libv8 binary. # see: https://github.com/cowboyd/libv8/pull/161 libv8 = attrs: { - buildInputs = [ which v8 python3 ]; + buildInputs = [ which v8 python2 ]; buildFlags = [ "--with-system-v8=true" ]; dontBuild = false; # The gem includes broken symlinks which are ignored during unpacking, but @@ -384,6 +384,9 @@ in --replace "location = Libv8::Location::Vendor.new" \ "location = Libv8::Location::System.new" ''; + meta.broken = true; # At 2023-01-20, errors as: + # "Failed to build gem native extension." + # Requires Python 2. Project is abandoned. }; execjs = attrs: { @@ -541,6 +544,10 @@ in ]; }; + psych = attrs: { + buildInputs = [ libyaml ]; + }; + puma = attrs: { buildInputs = [ openssl ]; }; diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix index 32bf8ed820..dbb9e4f451 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { inherit ruby; inherit dontBuild; inherit dontStrip; - inherit type; + gemType = type; nativeBuildInputs = [ ruby makeWrapper @@ -143,7 +143,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { buildPhase = attrs.buildPhase or '' runHook preBuild - if [[ "$type" == "gem" ]]; then + if [[ "$gemType" == "gem" ]]; then if [[ -z "$gemspec" ]]; then gemspec="$(find . -name '*.gemspec')" echo "found the following gemspecs:" @@ -158,7 +158,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { gempkg=$(echo "$output" | grep -oP 'File: \K(.*)') echo "gem package built: $gempkg" - elif [[ "$type" == "git" ]]; then + elif [[ "$gemType" == "git" ]]; then git init # remove variations to improve the likelihood of a bit-reproducible output rm -rf .git/logs/ .git/hooks/ .git/index .git/FETCH_HEAD .git/ORIG_HEAD .git/refs/remotes/origin/HEAD .git/config diff --git a/third_party/nixpkgs/pkgs/development/tools/air/default.nix b/third_party/nixpkgs/pkgs/development/tools/air/default.nix index 3b4103626b..819cb38fef 100644 --- a/third_party/nixpkgs/pkgs/development/tools/air/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/air/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "air"; - version = "1.40.4"; + version = "1.41.0"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - hash = "sha256-MipTBepFLcP3TJQtCLi/33D6HCJu4oX48tGnSGG5qho="; + hash = "sha256-31C1iNiYokClAZlk9KOVE12lFdOKJBSOwQK+zOp082k="; }; - vendorSha256 = "sha256-+hZpCIDASPerI7Wetpx+ah2H5ODjoeyoqUi+uFwR/9A="; + vendorHash = "sha256-i3bXf/EsPAJOg2aWh4mANtNeRXnie4jtuLCd/01DB/0="; ldflags = [ "-s" "-w" "-X=main.airVersion=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix new file mode 100644 index 0000000000..4556b4360d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/algolia-cli/default.nix @@ -0,0 +1,35 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "algolia-cli"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "algolia"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-rmxLbxotATyURRcG9ryWCDHkH7a/bop/BCDQAoQjXSo="; + }; + + vendorHash = "sha256-iG8g7mBbIulKSxc1a3/fOBOCWoFYaB5FLwJPNKJRZDg="; + + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "cmd/algolia" ]; + + ldflags = [ "-s" "-w" "-X github.com/algolia/cli/pkg/version.Version=${version}" ]; + + postInstall = '' + installShellCompletion --cmd algolia \ + --bash <($out/bin/algolia completion bash) \ + --fish <($out/bin/algolia completion fish) \ + --zsh <($out/bin/algolia completion zsh) + ''; + + meta = with lib; { + description = "Algolia’s official CLI devtool"; + homepage = "https://algolia.com/doc/tools/cli/"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix index f9d1c4549a..5d69cef598 100644 --- a/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "5.0.10"; + version = "5.0.13"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-NrFkLZiqX21BSIuE8qF7lurNWKgmf7PAa/1IpPbcUf0="; + sha256 = "sha256-kjAC21gZ3VKM+WFKV3tOPzIaG3t9rUSo2M3CEsA1q+I="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix b/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix index 4239f5c005..303275e3b9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "1.0.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - hash = "sha256-dvhGk6IbSV3pxtoIV7+0+qf47hz2TooPhsSwFd2+xkw="; + hash = "sha256-9dMzT/SnO16jfUfYYiT4MOGnlgrw0jWTNL37u1Y5oBI="; }; format = "make"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix b/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix index 7d9dbe6f39..39f69f402b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchurl, jre, writeScript, common-updater-scripts, git, nixfmt , nix, coreutils, gnused, disableRemoteLogging ? true }: -with lib; - let repo = "git@github.com:lihaoyi/Ammonite.git"; @@ -22,7 +20,7 @@ let installPhase = '' install -Dm755 $src $out/bin/amm sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm - '' + optionalString (disableRemoteLogging) '' + '' + lib.optionalString (disableRemoteLogging) '' sed -i "0,/ammonite.Main/{s|ammonite.Main'|ammonite.Main' --no-remote-logging|}" $out/bin/amm sed -i '1i #!/bin/sh' $out/bin/amm ''; @@ -66,7 +64,7 @@ let runHook postInstallCheck ''; - meta = { + meta = with lib; { description = "Improved Scala REPL"; longDescription = '' The Ammonite-REPL is an improved Scala REPL, re-implemented from first principles. diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix index ac255df01d..0217b37fa1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/actionlint/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.22"; + version = "1.6.23"; subPackages = [ "cmd/actionlint" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - sha256 = "sha256-Gkhk6lI10pUuZN09BDhNWfTjVdc7kN6KQjgc3gFrobk="; + sha256 = "sha256-0S7sTiTr22FlHHCT3Yw7UccrvgKvUVcPzR8QBUQiOh4="; }; - vendorSha256 = "sha256-vWU3tEC+ZlrrTnX3fbuEuZRoSg1KtfpgpXmK4+HWrNY="; + vendorHash = "sha256-3H7reGAJ2RY7WAHOJW92Bl5WW3VSVP8Qg4DVlGZPU+E="; nativeBuildInputs = [ makeWrapper ronn installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix index 2d8348bfc9..e826fd9d2c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/bingrep/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bingrep"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "m4b"; repo = pname; rev = "v${version}"; - hash = "sha256-M3BYj1SKQKjEqP9cxaVlh7UeleDbcx6JN+UI6Ez+QJ8="; + hash = "sha256-Uzkz4KEFOf4XdcfkjQm8OQRenUX9jDxTJaRivfIy0ak="; }; - cargoHash = "sha256-botAoLNg/qTh+cjPXcjo/Ol2Vktj/c5130k5falEuLY="; + cargoHash = "sha256-NbZ9E3vUiDDKyEHZfgS8ErxXhQSTTsoPA/g+kGxCbXc="; meta = with lib; { description = "Greps through binaries from various OSs and architectures, and colors them"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix index 17e8458e7d..499a424292 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tarpaulin"; - version = "0.23.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; rev = version; - sha256 = "sha256-UDUbndsuXZDu7j+JhkS6kkFP6ju88+hXffy42XQY8gQ="; + sha256 = "sha256-9duL16AuwG3lBMq1hUAXbNrvoBF6SASCiakmT42LQ/E="; }; nativeBuildInputs = [ @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - cargoSha256 = "sha256-iLqxixUEZhz3Kv7D84RqVyvtoZx69dhdLKTnVnsO0k0="; + cargoHash = "sha256-MXnE3Fq/jzWHvmO2i8cWixRKRuwVbUU/OmBj1SUkEiY="; #checkFlags = [ "--test-threads" "1" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix index dc7cccd9dc..49c8fb140e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cccc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { on various metrics of the code. Metrics supported include lines of code, McCabe's complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura. ''; - homepage = "http://cccc.sourceforge.net/"; + homepage = "https://cccc.sourceforge.net/"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.linquize ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix index 2db9533590..e9ce87dc08 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix @@ -89,7 +89,7 @@ buildPythonApplication rec { update_checker ]; - checkInputs = with py.pkgs; [ + nativeCheckInputs = with py.pkgs; [ aioresponses mock pytest-asyncio diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/coan/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/coan/default.nix index ff564916dd..d88a4a8a92 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/coan/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/coan/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { respect to a specified configuration. Dead code removal is an application of this sort. ''; - homepage = "http://coan2.sourceforge.net/"; + homepage = "https://coan2.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix index 27f758f39b..0a9cefb57b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.11.0"; + version = "2.12.1"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-nY31/coUnBNkKg10SOd64sBBkV44g+eIXyKIrPq1IWU="; + sha256 = "sha256-rJdB1G2/Fbs5zwfXF/Q79k1IztkOJrL7b0sjH5kcEMs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix index 1a8183ebab..51fd3aefa8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.9.3"; + version = "2.10"; src = fetchFromGitHub { owner = "danmar"; repo = "cppcheck"; rev = version; - hash = "sha256-AaZzr5r+tpG5M40HSx45KCUBPhN/nSpXxS5H3FuSx2c="; + hash = "sha256-Ss35foFlh4sw6TxMp++0b9E5KDUjBpDPuWIHsak8OGY="; }; buildInputs = [ pcre diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cpplint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cpplint/default.nix index 2f665b8395..7be303a52a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cpplint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cpplint/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { patchShebangs cpplint_unittest.py ''; - checkInputs = with python3Packages; [ pytest pytest-runner ]; + nativeCheckInputs = with python3Packages; [ pytest pytest-runner ]; checkPhase = '' ./cpplint_unittest.py ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cvehound/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cvehound/default.nix index 5bd6cdc006..d6b08fb061 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cvehound/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cvehound/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { sympy ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ gitpython psutil pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix index fdd4d84673..fec39c962a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "dotenv-linter"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "dotenv-linter"; repo = "dotenv-linter"; rev = "v${version}"; - sha256 = "sha256-YWL1aPcMdU4lo7h/T2sdl2H6qnx3lfMtV39Ak4yP88w="; + sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo="; }; - cargoSha256 = "sha256-q59hpnXc00OzrJk1KOWbIPQYfIE+7ku9XtTDXHgwQBg="; + cargoSha256 = "sha256-4r4NTq2rLnpmm/nwxJ9RoN2+JrUI6XKGfYFI78NY710="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/emma/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/emma/default.nix index c8db40c7b6..a1804eafd8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/emma/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/emma/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://emma.sourceforge.net/"; + homepage = "https://emma.sourceforge.net/"; description = "A code coverage tool for Java"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix index 4061090b18..d340cb7562 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/evmdis/default.nix @@ -1,17 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage { - pname = "evmdis-unstable"; - version = "2018-03-23"; - goPackagePath = "github.com/Arachnid/evmdis"; +buildGoModule { + pname = "evmdis"; + version = "unstable-2022-05-09"; src = fetchFromGitHub { owner = "Arachnid"; repo = "evmdis"; - rev = "0d1406905c5fda6224651fa53260a21c907eb986"; - sha256 = "09y4j7ipgv8yd99g3xk3f079w8fqfj7kl1y7ry81ainysn0qlqrg"; + rev = "7fad4fbee443262839ce9f88111b417801163086"; + hash = "sha256-jfbjXoGT8RtwLlqX13kcKdiFlhrVwA7Ems6abGJVRbA="; }; + vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + preBuild = '' + # Add go modules support + cp ${./go.mod} go.mod + ''; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://github.com/Arachnid/evmdis"; description = "Ethereum EVM disassembler"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/evmdis/go.mod b/third_party/nixpkgs/pkgs/development/tools/analysis/evmdis/go.mod new file mode 100644 index 0000000000..d71cfe7084 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/evmdis/go.mod @@ -0,0 +1,3 @@ +module github.com/Arachnid/evmdis + +go 1.18 diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix index e758aa40d2..63301622c1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/findbugs/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A static analysis tool to find bugs in Java programs automatically"; - homepage = "http://findbugs.sourceforge.net/"; + homepage = "https://findbugs.sourceforge.net/"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; sourceProvenance = with sourceTypes; [ binaryBytecode ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix index dc941f1229..349b44730b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/lcov/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { HTML output. ''; - homepage = "http://ltp.sourceforge.net/coverage/lcov.php"; + homepage = "https://ltp.sourceforge.net/coverage/lcov.php"; license = lib.licenses.gpl2Plus; maintainers = with maintainers; [ dezgeg ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix index 9e8d1da4d3..c28c8b0ead 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/oclgrind/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix index 4695854dbf..fdc20a3eef 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.49.0"; + version = "6.53.0"; src = fetchurl { url = "https://github.com/pmd/pmd/releases/download/pmd_releases/${version}/pmd-bin-${version}.zip"; - hash = "sha256-dEKfQIdWkx6XAKnEBHaVI0l729Xj2RnjoHl59t0Kal0="; + hash = "sha256-pHEGBIvC4XAuzWZpws7ldRGabfKhAqZnaahqVdNpUJE="; }; nativeBuildInputs = [ unzip makeWrapper ]; 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 e02ce86d8e..14474f9955 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/radare2/default.nix @@ -31,47 +31,33 @@ let # FIXME: Compare revision with - # https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35arm64/Makefile#L26-L27 + # https://github.com/radareorg/radare2/blob/master/libr/arch/p/arm/v35/Makefile#L26-L27 arm64 = fetchFromGitHub { owner = "radareorg"; repo = "vector35-arch-arm64"; - rev = "c9e7242972837ac11fc94db05fabcb801a8269c9"; - hash = "sha256-HFQj23GlLAyyzMGnPq40XaPv5qPDHdDlQOo0Hprc9Cs="; + rev = "55d73c6bbb94448a5c615933179e73ac618cf876"; + hash = "sha256-pZxxp5xDg8mgkGEx7LaBSoKxNPyggFYA4um9YaO20LU="; }; armv7 = fetchFromGitHub { owner = "radareorg"; repo = "vector35-arch-armv7"; - rev = "dde39f69ffea19fc37e681874b12cb4707bc4f30"; - - hash = "sha256-bnWQc0dScM9rhIdzf+iVXvMqYWq/bguEAUQPaZRgdlU="; + rev = "f270a6cc99644cb8e76055b6fa632b25abd26024"; + hash = "sha256-YhfgJ7M8ys53jh1clOzj0I2yfJshXQm5zP0L9kMYsmk="; }; in stdenv.mkDerivation rec { pname = "radare2"; - version = "5.8.0"; + version = "5.8.2"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - hash = "sha256-9bDwtMNru7tG0L735y+Vrcg7Htk/TV9SVZn7WP4Ap4c="; + hash = "sha256-jwr3QPgJ6vKSk8yGxndQ69AickP8PorNDuGyJzHMpV4="; }; - patches = [ - (fetchpatch { - name = "CVE-2022-4843.patch"; - url = "https://github.com/radareorg/radare2/commit/842f809d4ec6a12af2906f948657281c9ebc8a24.patch"; - sha256 = "sha256-asEXW9Ox48w9WQhOA9tleXIvynIjsWb6ItKmFTojgbQ="; - }) - (fetchpatch { - name = "CVE-2023-0302.patch"; - url = "https://github.com/radareorg/radare2/commit/961f0e723903011d4f54c2396e44efa91fcc74ce.patch"; - hash = "sha256-QinRQDIY4p3P+M3Hh9w3Dv3N/2XTaf3N0nUluHPpAvg="; - }) - ]; - preBuild = '' - pushd ../libr/arch/p/arm/v35arm64 + pushd ../libr/arch/p/arm/v35 cp -r ${arm64} arch-arm64 chmod -R +w arch-arm64 diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix index 62026d5278..6cf84434cd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/spin/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/spin --prefix PATH : ${binPath} + + mkdir -p $out/share/spin + cp $src/optional_gui/ispin.tcl $out/share/spin + makeWrapper $out/share/spin/ispin.tcl $out/bin/ispin \ + --prefix PATH : $out/bin:${binPath} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/ansi/default.nix b/third_party/nixpkgs/pkgs/development/tools/ansi/default.nix new file mode 100644 index 0000000000..305b29aef6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ansi/default.nix @@ -0,0 +1,25 @@ +{ fetchCrate, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "ansi-escape-sequences-cli"; + version = "0.1.4"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-KGPlNXkF16VdoOb3tg3nsQRdtgU83z7ibPy965bvvDk="; + }; + + cargoSha256 = "sha256-Q46VKBrOsjqUeSruuK/Bur2L69JAGr3c+ianfPlfzi0="; + + meta = with lib; { + description = "Quickly get ANSI escape sequences"; + longDescription = '' + CLI utility called "ansi" to quickly get ANSI escape sequences. Supports + the colors and styles, such as bold or italic."; + ''; + homepage = "https://github.com/phip1611/ansi-escape-sequences-cli"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ phip1611 ]; + mainProgram = "ansi"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/apkid/default.nix b/third_party/nixpkgs/pkgs/development/tools/apkid/default.nix index f5e05fe96b..06d798e481 100644 --- a/third_party/nixpkgs/pkgs/development/tools/apkid/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/apkid/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { yara-python ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/apktool/default.nix b/third_party/nixpkgs/pkgs/development/tools/apktool/default.nix index 2538bf76af..5ea63e2837 100644 --- a/third_party/nixpkgs/pkgs/development/tools/apktool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "apktool"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "sha256-vCuah6xahpBbbKNDwhoNs7w3vdURVLyc32VSPZWJXTQ="; + sha256 = "sha256-wRtetRjZrCqxjpWcvgh0mQeQcrBNVnzcrlzrRH+afn0="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/appthreat-depscan/default.nix b/third_party/nixpkgs/pkgs/development/tools/appthreat-depscan/default.nix index 461b250fa6..82571293ab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/appthreat-depscan/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/appthreat-depscan/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { rich ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix b/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix index 9b6d00c0ef..f8e1a36a99 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ashpd-demo/default.nix @@ -64,6 +64,10 @@ stdenv.mkDerivation rec { libshumate ]; + # FIXME: workaround for Pipewire 0.3.64 deprecated API change, remove when fixed upstream + # https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/issues/55 + NIX_CFLAGS_COMPILE = [ "-DPW_ENABLE_DEPRECATED" ]; + passthru = { updateScript = nix-update-script { }; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/asmfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/asmfmt/default.nix index 953a5469ec..61b5d624c8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/asmfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/asmfmt/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-YxIVqPGsqxvOY0Qz4Jw5FuO9IbplCICjChosnHrSCgc="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; # This package comes with its own version of goimports, gofmt and goreturns # but these binaries are outdated and are offered by other packages. diff --git a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix b/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix index c4572f9e1b..1a7e13e0ec 100644 --- a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.16.0"; + version = "10.17.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-FLrYovepVOE1NUB46Kc8z/l5o6IMFbJyY3smxPyuIsI="; + sha256 = "sha256-a25MA/fDjCvsKzEh34IM34TyXECJ0j07H9jr6JX1uc0="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-OlsNFhduilo8fJs/mynrAiwuXcfCZERdaJk3VcAUCJw="; + vendorHash = "sha256-Cb4RVY+E8QcvxSworBujsvqSSGxFGfW0W7nFjmpfLQ8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix b/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix index 78224176e5..a38acbd53c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { tabulate ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ backoff more-itertools pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/tools/bashate/default.nix b/third_party/nixpkgs/pkgs/development/tools/bashate/default.nix index d768ff481a..31714db5c8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bashate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bashate/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ fixtures mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/tools/beautysh/default.nix b/third_party/nixpkgs/pkgs/development/tools/beautysh/default.nix index f01857fc60..e592133e59 100644 --- a/third_party/nixpkgs/pkgs/development/tools/beautysh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/beautysh/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { types-setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/bingo/default.nix b/third_party/nixpkgs/pkgs/development/tools/bingo/default.nix index 0c0d90bb9f..f95810fb77 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bingo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bingo/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "bwplotka"; repo = "bingo"; rev = "v${version}"; - sha256 = "sha256-s+vdtMzeHUtUlmMlvgnK83RYoMqS3GqrTnu7LssIK6A="; + hash = "sha256-s+vdtMzeHUtUlmMlvgnK83RYoMqS3GqrTnu7LssIK6A="; }; - vendorSha256 = "sha256-28p1g+p+guJ0x4/5QDGsGN6gDnZkE4AKF/2cFgNjPDM="; + vendorHash = "sha256-28p1g+p+guJ0x4/5QDGsGN6gDnZkE4AKF/2cFgNjPDM="; postPatch = '' rm get_e2e_test.go get_e2e_utils_test.go diff --git a/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix b/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix index 839f7b1b6c..610b991ec5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "biodiff"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "8051Enthusiast"; repo = "biodiff"; rev = "v${version}"; - sha256 = "sha256-ZIZ6XpRuqhacpvi1kf7zvMszzbF8IvWrMlxAZnJJSxE="; + sha256 = "sha256-anGiqTiZVm6q8BII1Ahg2ph7OwX5isCa16orEcf4aFE="; }; - cargoSha256 = "sha256-/LrrHK9j6xg3J56ubM9RdkJeMn4nvpddUGMtHu2s6OE="; + cargoSha256 = "sha256-uyATu6M04IRFtzFb2ox0xUYFXjkW+t+71Iy58TuqCko="; meta = with lib; { description = "Hex diff viewer using alignment algorithms from biology"; diff --git a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix index 0ebf23d5dc..79c7962865 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.12.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - hash = "sha256-tEeAr1QSec1Sayfg2/erk5u6wBZDodZIMYq9MaU7ATA="; + hash = "sha256-FEc83SVFCsGDrCg7IYmn8iZ6NozYFsIUJ3QORBYUdMI="; }; - vendorHash = "sha256-FCAxqyacDdt3mR628/sguvrBx+nG10648XqF5hA8z+s="; + vendorHash = "sha256-Zmias6mJWYh+PCyBdnRlNyKIoFqEYJZNF19i559SGTI="; patches = [ # Skip a test that requires networking to be available to work. @@ -32,7 +32,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - checkInputs = [ + nativeCheckInputs = [ git # Required for TestGitCloner protobuf # Required for buftesting.GetProtocFilePaths ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 832ca7062d..6f86be80f9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -26,22 +26,22 @@ }: let - version = "6.0.0-pre.20220720.3"; + version = "6.0.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-i8d4yLSq8fL+YT11wYmBvLDLSprq1gVfyjsKBYci1bk="; + hash = "sha256-e8DFFFwZpW2CoI/OaQjF4aDnXk+/s7bxK03q5/SzjLw="; }; - # Update with `eval $(nix-build -A bazel_5.updater)`, + # Update with `eval $(nix-build -A bazel_6.updater)`, # then add new dependencies from the dict in ./src-deps.json as required. srcDeps = lib.attrsets.attrValues srcDepsSet; srcDepsSet = let srcs = lib.importJSON ./src-deps.json; toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { - urls = d.urls; + urls = d.urls or [d.url]; sha256 = d.sha256; }); in builtins.listToAttrs (map toFetchurl [ @@ -54,8 +54,8 @@ let srcs.remote_java_tools_for_testing srcs."coverage_output_generator-v2.6.zip" srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.26.0.tar.gz" - srcs."zulu11.56.19-ca-jdk11.0.15-linux_x64.tar.gz" + srcs.android_tools_for_testing + srcs.openjdk_linux_vanilla srcs.bazel_toolchains srcs.com_github_grpc_grpc srcs.upb @@ -69,6 +69,9 @@ let srcs.com_google_absl srcs.com_googlesource_code_re2 srcs.com_github_cares_cares + srcs.com_envoyproxy_protoc_gen_validate + srcs.com_google_googleapis + srcs.bazel_gazelle ]); distDir = runCommand "bazel-deps" {} '' @@ -386,7 +389,7 @@ stdenv.mkDerivation rec { sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl sed -i -e 's;"/usr/bin/libtool";_find_generic(repository_ctx, "libtool", "LIBTOOL", overriden_tools);g' tools/cpp/unix_cc_configure.bzl - wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) + wrappers=( tools/cpp/osx_cc_wrapper.sh.tpl ) for wrapper in "''${wrappers[@]}"; do sed -i -e "s,/usr/bin/gcc,${stdenv.cc}/bin/clang,g" $wrapper sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json index 032ec1f80a..ae10299be9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_6/src-deps.json @@ -23,12 +23,20 @@ "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" ] }, - "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz": { - "name": "2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", - "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4", + "2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz": { + "name": "2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", + "sha256": "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", - "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz" + "https://mirror.bazel.build/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", + "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz" + ] + }, + "4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz": { + "name": "4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz", + "sha256": "1e490b98005664d149b379a9529a6aa05932b8a11b76b4cd86f3d22d76346f47", + "urls": [ + "https://mirror.bazel.build/github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz", + "https://github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz" ] }, "5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip": { @@ -39,6 +47,14 @@ "https://github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip" ] }, + "6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz": { + "name": "6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz", + "sha256": "ec76c5e79db59762776bece58b69507d095856c37b81fd35bfb0958e74b61d93", + "urls": [ + "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz", + "https://github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz" + ] + }, "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", @@ -55,6 +71,14 @@ "https://github.com/bazelbuild/rules_proto/archive/7e4afce6fe62dbff0a4a03450143146f9f2d7488.tar.gz" ] }, + "a5477045acaa34586420942098f5fecd3570f577.tar.gz": { + "name": "a5477045acaa34586420942098f5fecd3570f577.tar.gz", + "sha256": "cf7f71eaff90b24c1a28b49645a9ff03a9a6c1e7134291ce70901cb63e7364b5", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz", + "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz" + ] + }, "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz": { "name": "aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", @@ -78,22 +102,22 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "a86d205da8bd08515d18bb4b98e4b66b8805e57008ec55118ff5ce038c57a5f1", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.26.0.tar.gz" + "sha256": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz" }, - "android_tools_pkg-0.26.0.tar.gz": { - "name": "android_tools_pkg-0.26.0.tar.gz", - "sha256": "a86d205da8bd08515d18bb4b98e4b66b8805e57008ec55118ff5ce038c57a5f1", + "android_tools_pkg-0.27.0.tar.gz": { + "name": "android_tools_pkg-0.27.0.tar.gz", + "sha256": "1afa4b7e13c82523c8b69e87f8d598c891ec7e2baa41d9e24e08becd723edb4d", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.26.0.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.27.0.tar.gz" ] }, - "b1c40e1de81913a3c40e5948f78719c28152486d.zip": { - "name": "b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", + "bazel-gazelle-v0.24.0.tar.gz": { + "name": "bazel-gazelle-v0.24.0.tar.gz", + "sha256": "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz" ] }, "bazel-skylib-1.0.3.tar.gz": { @@ -116,14 +140,13 @@ ] }, "bazel_gazelle": { - "generator_function": "grpc_deps", + "generator_function": "dist_http_archive", "generator_name": "bazel_gazelle", "name": "bazel_gazelle", - "sha256": "d987004a72697334a095bbaa18d615804a28280201a50ed6c234c40ccc41e493", - "strip_prefix": "bazel-gazelle-0.19.1", + "sha256": "de69a09dc70417580aabf20a28619bb3ef60d038470c7cf8442fafcf627c21cb", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/bazel-gazelle/archive/v0.19.1.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/archive/v0.19.1.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.24.0/bazel-gazelle-v0.24.0.tar.gz" ] }, "bazel_skylib": { @@ -148,11 +171,11 @@ "generator_function": "grpc_deps", "generator_name": "bazel_toolchains", "name": "bazel_toolchains", - "sha256": "0b36eef8a66f39c8dbae88e522d5bbbef49d5e66e834a982402c79962281be10", - "strip_prefix": "bazel-toolchains-1.0.1", + "sha256": "179ec02f809e86abf56356d8898c8bd74069f1bd7c56044050c2cd3d79d0e024", + "strip_prefix": "bazel-toolchains-4.1.0", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/1.0.1.tar.gz", - "https://github.com/bazelbuild/bazel-toolchains/releases/download/1.0.1/bazel-toolchains-1.0.1.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/4.1.0.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/releases/download/4.1.0/bazel-toolchains-4.1.0.tar.gz" ] }, "bazelci_rules": { @@ -186,32 +209,31 @@ "generator_function": "grpc_deps", "generator_name": "boringssl", "name": "boringssl", - "sha256": "6f640262999cd1fb33cf705922e453e835d2d20f3f06fe0d77f6426c19257308", - "strip_prefix": "boringssl-fc44652a42b396e1645d5e72aba053349992136a", + "sha256": "534fa658bd845fd974b50b10f444d392dfd0d93768c4a51b61263fd37d851c40", + "strip_prefix": "boringssl-b9232f9e27e5668bc0414879dcdedb2a59ea75f2", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/fc44652a42b396e1645d5e72aba053349992136a.tar.gz", - "https://github.com/google/boringssl/archive/fc44652a42b396e1645d5e72aba053349992136a.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/boringssl/archive/b9232f9e27e5668bc0414879dcdedb2a59ea75f2.tar.gz", + "https://github.com/google/boringssl/archive/b9232f9e27e5668bc0414879dcdedb2a59ea75f2.tar.gz" ] }, "build_bazel_apple_support": { "generator_function": "grpc_deps", "generator_name": "build_bazel_apple_support", "name": "build_bazel_apple_support", - "sha256": "122ebf7fe7d1c8e938af6aeaee0efe788a3a2449ece5a8d6a428cb18d6f88033", + "sha256": "76df040ade90836ff5543888d64616e7ba6c3a7b33b916aa3a4b68f342d1b447", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz", - "https://github.com/bazelbuild/apple_support/releases/download/0.7.1/apple_support.0.7.1.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/apple_support/releases/download/0.11.0/apple_support.0.11.0.tar.gz", + "https://github.com/bazelbuild/apple_support/releases/download/0.11.0/apple_support.0.11.0.tar.gz" ] }, "build_bazel_rules_apple": { "generator_function": "grpc_deps", "generator_name": "build_bazel_rules_apple", "name": "build_bazel_rules_apple", - "sha256": "bdc8e66e70b8a75da23b79f1f8c6207356df07d041d96d2189add7ee0780cf4e", - "strip_prefix": "rules_apple-b869b0d3868d78a1d4ffd866ccb304fb68aa12c3", + "sha256": "0052d452af7742c8f3a4e0929763388a66403de363775db7e90adecb2ba4944b", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz", - "https://github.com/bazelbuild/rules_apple/archive/b869b0d3868d78a1d4ffd866ccb304fb68aa12c3.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/bazelbuild/rules_apple/releases/download/0.31.3/rules_apple.0.31.3.tar.gz", + "https://github.com/bazelbuild/rules_apple/releases/download/0.31.3/rules_apple.0.31.3.tar.gz" ] }, "build_bazel_rules_nodejs": { @@ -224,15 +246,29 @@ "https://github.com/bazelbuild/rules_nodejs/releases/download/5.5.0/rules_nodejs-5.5.0.tar.gz" ] }, + "cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz": { + "name": "cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz", + "sha256": "5bc8365613fe2f8ce6cc33959b7667b13b7fe56cb9d16ba740c06e1a7c4242fc", + "urls": [ + "https://mirror.bazel.build/github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz", + "https://github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz" + ] + }, "com_envoyproxy_protoc_gen_validate": { - "generator_function": "grpc_deps", + "generator_function": "dist_http_archive", "generator_name": "com_envoyproxy_protoc_gen_validate", "name": "com_envoyproxy_protoc_gen_validate", - "sha256": "dd4962e4a9e8388a4fbc5c33e64d73bdb222f103e4bad40ca5535f81c2c606c2", - "strip_prefix": "protoc-gen-validate-59da36e59fef2267fc2b1849a05159e3ecdf24f3", + "patch_args": [ + "-p1" + ], + "patches": [ + "//third_party/protoc_gen_validate:protoc_gen_validate.patch" + ], + "sha256": "1e490b98005664d149b379a9529a6aa05932b8a11b76b4cd86f3d22d76346f47", + "strip_prefix": "protoc-gen-validate-4694024279bdac52b77e22dc87808bd0fd732b69", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/protoc-gen-validate/archive/59da36e59fef2267fc2b1849a05159e3ecdf24f3.tar.gz", - "https://github.com/envoyproxy/protoc-gen-validate/archive/59da36e59fef2267fc2b1849a05159e3ecdf24f3.tar.gz" + "https://mirror.bazel.build/github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz", + "https://github.com/envoyproxy/protoc-gen-validate/archive/4694024279bdac52b77e22dc87808bd0fd732b69.tar.gz" ] }, "com_github_cares_cares": { @@ -240,22 +276,39 @@ "generator_function": "grpc_deps", "generator_name": "com_github_cares_cares", "name": "com_github_cares_cares", - "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", - "strip_prefix": "c-ares-e982924acee7f7313b4baa4ee5ec000c5e373c30", + "sha256": "ec76c5e79db59762776bece58b69507d095856c37b81fd35bfb0958e74b61d93", + "strip_prefix": "c-ares-6654436a307a5a686b008c1d4c93b0085da6e6d8", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", - "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz", + "https://github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz" + ] + }, + "com_github_cncf_udpa": { + "generator_function": "dist_http_archive", + "generator_name": "com_github_cncf_udpa", + "name": "com_github_cncf_udpa", + "patch_args": [ + "-p1" + ], + "patches": [ + "//third_party/cncf_udpa:cncf_udpa_0.0.1.patch" + ], + "sha256": "5bc8365613fe2f8ce6cc33959b7667b13b7fe56cb9d16ba740c06e1a7c4242fc", + "strip_prefix": "xds-cb28da3451f158a947dfc45090fe92b07b243bc1", + "urls": [ + "https://mirror.bazel.build/github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz", + "https://github.com/cncf/xds/archive/cb28da3451f158a947dfc45090fe92b07b243bc1.tar.gz" ] }, "com_github_google_benchmark": { "generator_function": "grpc_deps", "generator_name": "com_github_google_benchmark", "name": "com_github_google_benchmark", - "sha256": "daa4a97e0547d76de300e325a49177b199f3689ce5a35e25d47696f7cb050f86", - "strip_prefix": "benchmark-73d4d5e8d6d449fc8663765a42aa8aeeee844489", + "sha256": "0b921a3bc39e35f4275c8dcc658af2391c150fb966102341287b0401ff2e6f21", + "strip_prefix": "benchmark-0baacde3618ca617da95375e0af13ce1baadea47", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/73d4d5e8d6d449fc8663765a42aa8aeeee844489.tar.gz", - "https://github.com/google/benchmark/archive/73d4d5e8d6d449fc8663765a42aa8aeeee844489.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/benchmark/archive/0baacde3618ca617da95375e0af13ce1baadea47.tar.gz", + "https://github.com/google/benchmark/archive/0baacde3618ca617da95375e0af13ce1baadea47.tar.gz" ] }, "com_github_grpc_grpc": { @@ -266,14 +319,26 @@ "-p1" ], "patches": [ - "//third_party/grpc:grpc_1.41.0.patch", - "//third_party/grpc:grpc_1.41.0.win_arm64.patch" + "//third_party/grpc:grpc_1.47.0.patch", + "//third_party/grpc:grpc_1.47.0.win_arm64.patch" ], - "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656", - "strip_prefix": "grpc-1.41.0", + "sha256": "271bdc890bf329a8de5b65819f0f9590a5381402429bca37625b63546ed19e54", + "strip_prefix": "grpc-1.47.0", "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.41.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.41.0.tar.gz" + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.47.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.47.0.tar.gz" + ] + }, + "com_github_libuv_libuv": { + "build_file": "@com_github_grpc_grpc//third_party:libuv.BUILD", + "generator_function": "grpc_deps", + "generator_name": "com_github_libuv_libuv", + "name": "com_github_libuv_libuv", + "sha256": "5ca4e9091f3231d8ad8801862dc4e851c23af89c69141d27723157776f7291e7", + "strip_prefix": "libuv-02a9e1be252b623ee032a3137c0b0c94afbe6809", + "urls": [ + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/libuv/libuv/archive/02a9e1be252b623ee032a3137c0b0c94afbe6809.tar.gz", + "https://github.com/libuv/libuv/archive/02a9e1be252b623ee032a3137c0b0c94afbe6809.tar.gz" ] }, "com_google_absl": { @@ -288,23 +353,23 @@ ] }, "com_google_googleapis": { - "generator_function": "grpc_deps", + "generator_function": "dist_http_archive", "generator_name": "com_google_googleapis", "name": "com_google_googleapis", "sha256": "5bb6b0253ccf64b53d6c7249625a7e3f6c3bc6402abd52d3778bfa48258703a0", "strip_prefix": "googleapis-2f9af297c84c55c8b871ba4495e01ade42476c92", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", + "https://mirror.bazel.build/github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz", "https://github.com/googleapis/googleapis/archive/2f9af297c84c55c8b871ba4495e01ade42476c92.tar.gz" ] }, "com_google_googletest": { "name": "com_google_googletest", - "sha256": "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb", - "strip_prefix": "googletest-release-1.10.0", + "sha256": "81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2", + "strip_prefix": "googletest-release-1.12.1", "urls": [ - "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz", - "https://github.com/google/googletest/archive/release-1.10.0.tar.gz" + "https://mirror.bazel.build/github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz", + "https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz" ] }, "com_google_protobuf": { @@ -323,13 +388,13 @@ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], "patches": [ - "//third_party/protobuf:3.19.2.patch" + "//third_party/protobuf:3.19.6.patch" ], - "sha256": "4dd35e788944b7686aac898f77df4e9a54da0ca694b8801bd6b2a9ffc1b3085e", - "strip_prefix": "protobuf-3.19.2", + "sha256": "9a301cf94a8ddcb380b901e7aac852780b826595075577bb967004050c835056", + "strip_prefix": "protobuf-3.19.6", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz" + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz" ] }, "com_google_testparameterinjector": { @@ -346,11 +411,11 @@ "generator_function": "grpc_deps", "generator_name": "com_googlesource_code_re2", "name": "com_googlesource_code_re2", - "sha256": "9f385e146410a8150b6f4cb1a57eab7ec806ced48d427554b1e754877ff26c3e", - "strip_prefix": "re2-aecba11114cf1fac5497aeb844b6966106de3eb6", + "sha256": "319a58a58d8af295db97dfeecc4e250179c5966beaa2d842a82f0a013b6a239b", + "strip_prefix": "re2-8e08f47b11b413302749c0d8b17a1c94777495d5", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz", - "https://github.com/google/re2/archive/aecba11114cf1fac5497aeb844b6966106de3eb6.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/google/re2/archive/8e08f47b11b413302749c0d8b17a1c94777495d5.tar.gz", + "https://github.com/google/re2/archive/8e08f47b11b413302749c0d8b17a1c94777495d5.tar.gz" ] }, "coverage_output_generator-v2.6.zip": { @@ -365,10 +430,10 @@ "generator_function": "grpc_deps", "generator_name": "cython", "name": "cython", - "sha256": "e2e38e1f0572ca54d6085df3dec8b607d20e81515fb80215aed19c81e8fe2079", - "strip_prefix": "cython-0.29.21", + "sha256": "bb72b2f0ef029472759c711f0a4bded6e15e3f9bda3797550cef3c1d87d02283", + "strip_prefix": "cython-0.29.26", "urls": [ - "https://github.com/cython/cython/archive/0.29.21.tar.gz" + "https://github.com/cython/cython/archive/0.29.26.tar.gz" ] }, "desugar_jdk_libs": { @@ -382,14 +447,6 @@ "https://github.com/google/desugar_jdk_libs/archive/5847d6a06302136d95a14b4cbd4b55a9c9f1436e.zip" ] }, - "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz": { - "name": "e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", - "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a", - "urls": [ - "https://mirror.bazel.build/github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz", - "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz" - ] - }, "enum34": { "build_file": "@com_github_grpc_grpc//third_party:enum34.BUILD", "generator_function": "grpc_deps", @@ -405,11 +462,11 @@ "generator_function": "grpc_deps", "generator_name": "envoy_api", "name": "envoy_api", - "sha256": "330f2f9c938fc038b7ab438919b692d30cdfba3cf596e7824410f88da16c30b5", - "strip_prefix": "data-plane-api-2f0d081fab0b0823f088c6e368f40e1992f46fcd", + "sha256": "c5807010b67033330915ca5a20483e30538ae5e689aa14b3631d6284beca4630", + "strip_prefix": "data-plane-api-9c42588c956220b48eb3099d186487c2f04d32ec", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/2f0d081fab0b0823f088c6e368f40e1992f46fcd.tar.gz", - "https://github.com/envoyproxy/data-plane-api/archive/2f0d081fab0b0823f088c6e368f40e1992f46fcd.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/envoyproxy/data-plane-api/archive/9c42588c956220b48eb3099d186487c2f04d32ec.tar.gz", + "https://github.com/envoyproxy/data-plane-api/archive/9c42588c956220b48eb3099d186487c2f04d32ec.tar.gz" ] }, "futures": { @@ -427,18 +484,24 @@ "generator_function": "grpc_deps", "generator_name": "io_bazel_rules_go", "name": "io_bazel_rules_go", - "sha256": "dbf5a9ef855684f84cac2e7ae7886c5a001d4f66ae23f6904da0faaaef0d61fc", + "sha256": "69de5c704a05ff37862f7e0f5534d4f479418afc21806c887db544a316f3cb6b", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.24.11/rules_go-v0.24.11.tar.gz", - "https://github.com/bazelbuild/rules_go/releases/download/v0.24.11/rules_go-v0.24.11.tar.gz" + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz", + "https://github.com/bazelbuild/rules_go/releases/download/v0.27.0/rules_go-v0.27.0.tar.gz" ] }, "io_bazel_rules_python": { "generator_function": "grpc_deps", "generator_name": "io_bazel_rules_python", "name": "io_bazel_rules_python", - "sha256": "aa96a691d3a8177f3215b14b0edc9641787abaaa30363a080165d06ab65e1161", - "url": "https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz" + "patch_args": [ + "-p1" + ], + "patches": [ + "@com_github_grpc_grpc//third_party:rules_python.patch" + ], + "sha256": "954aa89b491be4a083304a2cb838019c8b8c3720a7abb9c4cb81ac7a24230cea", + "url": "https://github.com/bazelbuild/rules_python/releases/download/0.4.0/rules_python-0.4.0.tar.gz" }, "io_bazel_rules_sass": { "generator_function": "dist_http_archive", @@ -473,36 +536,36 @@ "https://github.com/census-instrumentation/opencensus-cpp/archive/c9a4da319bc669a772928ffc55af4a61be1a1176.tar.gz" ] }, - "java_tools-v11.8.zip": { - "name": "java_tools-v11.8.zip", - "sha256": "8fb4d3138bd92a9d3324dae29c9f70d91ca2db18cd0bf1997446eed4657d19b3", + "java_tools-v11.9.zip": { + "name": "java_tools-v11.9.zip", + "sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip" ] }, - "java_tools_darwin-v11.8.zip": { - "name": "java_tools_darwin-v11.8.zip", - "sha256": "0dcf4500cc4a1de8e563c1d48a079a7a0cf77cc246e39fd37fcc78ddf409ed26", + "java_tools_darwin-v11.9.zip": { + "name": "java_tools_darwin-v11.9.zip", + "sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_darwin-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_darwin-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip" ] }, - "java_tools_linux-v11.8.zip": { - "name": "java_tools_linux-v11.8.zip", - "sha256": "41502b293eea292b0577b46e8d7738bfe88180562acbf99ed620b5387a60efee", + "java_tools_linux-v11.9.zip": { + "name": "java_tools_linux-v11.9.zip", + "sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_linux-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_linux-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip" ] }, - "java_tools_windows-v11.8.zip": { - "name": "java_tools_windows-v11.8.zip", - "sha256": "056ed8ba64920409eab63e3c4888c1970a523d2c03965784fc3243e37195318b", + "java_tools_windows-v11.9.zip": { + "name": "java_tools_windows-v11.9.zip", + "sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_windows-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_windows-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip" ] }, "microsoft-jdk-11.0.13.8.1-windows-aarch64.zip": { @@ -512,6 +575,126 @@ "https://mirror.bazel.build/aka.ms/download-jdk/microsoft-jdk-11.0.13.8.1-windows-aarch64.zip" ] }, + "nuget_python_i686_3.10.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python310.dll\",\n interface_library = \"libs/python310.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_i686_3.10.0", + "name": "nuget_python_i686_3.10.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "e115e102eb90ce160ab0ef7506b750a8d7ecc385bde0a496f02a54337a8bc333", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/pythonx86/3.10.0" + ] + }, + "nuget_python_i686_3.7.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python37.dll\",\n interface_library = \"libs/python37.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_i686_3.7.0", + "name": "nuget_python_i686_3.7.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "a8bb49fa1ca62ad55430fcafaca1b58015e22943e66b1a87d5e7cef2556c6a54", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/pythonx86/3.7.0" + ] + }, + "nuget_python_i686_3.8.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python38.dll\",\n interface_library = \"libs/python38.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_i686_3.8.0", + "name": "nuget_python_i686_3.8.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "87a6481f5eef30b42ac12c93f06f73bd0b8692f26313b76a6615d1641c4e7bca", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/pythonx86/3.8.0" + ] + }, + "nuget_python_i686_3.9.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python39.dll\",\n interface_library = \"libs/python39.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_i686_3.9.0", + "name": "nuget_python_i686_3.9.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "229abecbe49dc08fe5709e0b31e70edfb3b88f23335ebfc2904c44f940fd59b6", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/pythonx86/3.9.0" + ] + }, + "nuget_python_x86-64_3.10.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python310.dll\",\n interface_library = \"libs/python310.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_x86-64_3.10.0", + "name": "nuget_python_x86-64_3.10.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "4474c83c25625d93e772e926f95f4cd398a0abbb52793625fa30f39af3d2cc00", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/python/3.10.0" + ] + }, + "nuget_python_x86-64_3.7.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python37.dll\",\n interface_library = \"libs/python37.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_x86-64_3.7.0", + "name": "nuget_python_x86-64_3.7.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "66eb796a5bdb1e6787b8f655a1237a6b6964af2115b7627cf4f0032cf068b4b2", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/python/3.7.0" + ] + }, + "nuget_python_x86-64_3.8.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python38.dll\",\n interface_library = \"libs/python38.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_x86-64_3.8.0", + "name": "nuget_python_x86-64_3.8.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "96c61321ce90dd053c8a04f305a5f6cc6d91350b862db34440e4a4f069b708a0", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/python/3.8.0" + ] + }, + "nuget_python_x86-64_3.9.0": { + "build_file_content": "\ncc_import(\n name = \"python_full_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python39.dll\",\n interface_library = \"libs/python39.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n\ncc_import(\n name = \"python_limited_api\",\n hdrs = glob([\"**/*.h\"]),\n shared_library = \"python3.dll\",\n interface_library = \"libs/python3.lib\",\n visibility = [\"@upb//python:__pkg__\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "nuget_python_x86-64_3.9.0", + "name": "nuget_python_x86-64_3.9.0", + "patch_cmds": [ + "cp -r include/* ." + ], + "sha256": "6af58a733e7dfbfcdd50d55788134393d6ffe7ab8270effbf724bdb786558832", + "strip_prefix": "tools", + "type": "zip", + "urls": [ + "https://www.nuget.org/api/v2/package/python/3.9.0" + ] + }, "opencensus_proto": { "generator_function": "grpc_deps", "generator_name": "opencensus_proto", @@ -897,6 +1080,19 @@ "https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz" ] }, + "python-3.7.0": { + "build_file_content": "\ncc_library(\n name = \"python_headers\",\n hdrs = glob([\"**/Include/**/*.h\"]),\n strip_include_prefix = \"Python-3.7.0/Include\",\n visibility = [\"//visibility:public\"],\n)\n", + "generator_function": "grpc_extra_deps", + "generator_name": "python-3.7.0", + "name": "python-3.7.0", + "patch_cmds": [ + "echo '#define SIZEOF_WCHAR_T 4' > Python-3.7.0/Include/pyconfig.h" + ], + "sha256": "85bb9feb6863e04fb1700b018d9d42d1caac178559ffa453d7e6a436e259fd0d", + "urls": [ + "https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tgz" + ] + }, "r8-3.3.28.jar": { "name": "r8-3.3.28.jar", "sha256": "8626ca32fb47aba7fddd2c897615e2e8ffcdb4d4b213572a2aefb3f838f01972", @@ -933,10 +1129,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "0dcf4500cc4a1de8e563c1d48a079a7a0cf77cc246e39fd37fcc78ddf409ed26", + "sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_darwin-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_darwin-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip" ] }, "remote_java_tools_for_testing": { @@ -951,10 +1147,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "8fb4d3138bd92a9d3324dae29c9f70d91ca2db18cd0bf1997446eed4657d19b3", + "sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip" ] }, "remote_java_tools_linux": { @@ -979,10 +1175,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "41502b293eea292b0577b46e8d7738bfe88180562acbf99ed620b5387a60efee", + "sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_linux-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_linux-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip" ] }, "remote_java_tools_test": { @@ -997,10 +1193,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "8fb4d3138bd92a9d3324dae29c9f70d91ca2db18cd0bf1997446eed4657d19b3", + "sha256": "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip" ] }, "remote_java_tools_test_darwin": { @@ -1015,10 +1211,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "0dcf4500cc4a1de8e563c1d48a079a7a0cf77cc246e39fd37fcc78ddf409ed26", + "sha256": "b9e962c6a836ba1d7573f2473fab3a897c6370d4c2724bde4017b40932ff4fe4", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_darwin-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_darwin-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_darwin-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_darwin-v11.9.zip" ] }, "remote_java_tools_test_linux": { @@ -1033,10 +1229,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "41502b293eea292b0577b46e8d7738bfe88180562acbf99ed620b5387a60efee", + "sha256": "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_linux-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_linux-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip" ] }, "remote_java_tools_test_windows": { @@ -1051,10 +1247,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "056ed8ba64920409eab63e3c4888c1970a523d2c03965784fc3243e37195318b", + "sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_windows-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_windows-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip" ] }, "remote_java_tools_windows": { @@ -1079,10 +1275,10 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "056ed8ba64920409eab63e3c4888c1970a523d2c03965784fc3243e37195318b", + "sha256": "677ab910046205020fd715489147c2bcfad8a35d9f5d94fdc998d217545bd87a", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.8/java_tools_windows-v11.8.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v11.8/java_tools_windows-v11.8.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_windows-v11.9.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_windows-v11.9.zip" ] }, "remotejdk11_linux": { @@ -1617,11 +1813,16 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "d0c573b94a6ef20ef6ff20154a23d0efcb409fb0e1ff0979cec318dfe42f0cdd", - "strip_prefix": "rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d", + "sha256": "58bff40957ace85c2de21ebfc72e53ed3a0d33af8cc20abd0ceec55c63be7de2", "urls": [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip", - "https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip" + "https://github.com/bazelbuild/rules_cc/releases/download/0.0.2/rules_cc-0.0.2.tar.gz" + ] + }, + "rules_cc-0.0.2.tar.gz": { + "name": "rules_cc-0.0.2.tar.gz", + "sha256": "58bff40957ace85c2de21ebfc72e53ed3a0d33af8cc20abd0ceec55c63be7de2", + "urls": [ + "https://github.com/bazelbuild/rules_cc/releases/download/0.0.2/rules_cc-0.0.2.tar.gz" ] }, "rules_java": { @@ -1745,38 +1946,38 @@ ] }, "upb": { - "generator_function": "grpc_deps", + "generator_function": "dist_http_archive", "generator_name": "upb", "name": "upb", - "sha256": "6a5f67874af66b239b709c572ac1a5a00fdb1b29beaf13c3e6f79b1ba10dc7c4", - "strip_prefix": "upb-2de300726a1ba2de9a468468dc5ff9ed17a3215f", + "sha256": "cf7f71eaff90b24c1a28b49645a9ff03a9a6c1e7134291ce70901cb63e7364b5", + "strip_prefix": "upb-a5477045acaa34586420942098f5fecd3570f577", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz", - "https://github.com/protocolbuffers/upb/archive/2de300726a1ba2de9a468468dc5ff9ed17a3215f.tar.gz" + "https://mirror.bazel.build/github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz", + "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz" ] }, - "v1.41.0.tar.gz": { - "name": "v1.41.0.tar.gz", - "sha256": "e5fb30aae1fa1cffa4ce00aa0bbfab908c0b899fcf0bbc30e268367d660d8656", + "v1.47.0.tar.gz": { + "name": "v1.47.0.tar.gz", + "sha256": "271bdc890bf329a8de5b65819f0f9590a5381402429bca37625b63546ed19e54", "urls": [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.41.0.tar.gz", - "https://github.com/grpc/grpc/archive/v1.41.0.tar.gz" + "https://mirror.bazel.build/github.com/grpc/grpc/archive/v1.47.0.tar.gz", + "https://github.com/grpc/grpc/archive/v1.47.0.tar.gz" ] }, - "v1.5.0-4.zip": { - "name": "v1.5.0-4.zip", - "sha256": "d320d59b89a163c5efccbe4915ae6a49883ce653cdc670643dfa21c6063108e4", + "v1.5.2-3.zip": { + "name": "v1.5.2-3.zip", + "sha256": "366009a43cfada35015e4cc40a7efc4b7f017c6b8df5cac3f87d2478027b2056", "urls": [ - "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/v1.5.0-4.zip", - "https://github.com/luben/zstd-jni/archive/v1.5.0-4.zip" + "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip", + "https://github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip" ] }, - "v3.19.2.tar.gz": { - "name": "v3.19.2.tar.gz", - "sha256": "4dd35e788944b7686aac898f77df4e9a54da0ca694b8801bd6b2a9ffc1b3085e", + "v3.19.6.tar.gz": { + "name": "v3.19.6.tar.gz", + "sha256": "9a301cf94a8ddcb380b901e7aac852780b826595075577bb967004050c835056", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz" + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.19.6.tar.gz" ] }, "zlib": { @@ -1784,11 +1985,11 @@ "generator_function": "grpc_deps", "generator_name": "zlib", "name": "zlib", - "sha256": "6d4d6640ca3121620995ee255945161821218752b551a1a180f4215f7d124d45", - "strip_prefix": "zlib-cacf7f1d4e3d44d871b605da3b647f07d718623f", + "sha256": "ef47b0fbe646d69a2fc5ba012cb278de8e8946a8e9649f83a807cc05559f0eff", + "strip_prefix": "zlib-21767c654d31d2dccdde4330529775c6c5fd5389", "urls": [ - "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz", - "https://github.com/madler/zlib/archive/cacf7f1d4e3d44d871b605da3b647f07d718623f.tar.gz" + "https://storage.googleapis.com/grpc-bazel-mirror/github.com/madler/zlib/archive/21767c654d31d2dccdde4330529775c6c5fd5389.tar.gz", + "https://github.com/madler/zlib/archive/21767c654d31d2dccdde4330529775c6c5fd5389.tar.gz" ] }, "zstd-jni": { @@ -1810,11 +2011,11 @@ "patches": [ "//third_party:zstd-jni/Native.java.patch" ], - "sha256": "d320d59b89a163c5efccbe4915ae6a49883ce653cdc670643dfa21c6063108e4", - "strip_prefix": "zstd-jni-1.5.0-4", + "sha256": "366009a43cfada35015e4cc40a7efc4b7f017c6b8df5cac3f87d2478027b2056", + "strip_prefix": "zstd-jni-1.5.2-3", "urls": [ - "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/v1.5.0-4.zip", - "https://github.com/luben/zstd-jni/archive/v1.5.0-4.zip" + "https://mirror.bazel.build/github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip", + "https://github.com/luben/zstd-jni/archive/refs/tags/v1.5.2-3.zip" ] }, "zulu11.56.19-ca-jdk11.0.15-linux_aarch64.tar.gz": { @@ -1865,6 +2066,22 @@ "https://cdn.azul.com/zulu/bin/zulu17.30.15-ca-jdk17.0.1-win_aarch64.zip" ] }, + "zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz": { + "name": "zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz", + "sha256": "2b8066bbdbc5cff422bb6b6db1b8f8d362b576340cce8492f1255502af632b06", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_aarch64.tar.gz" + ] + }, + "zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz": { + "name": "zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz", + "sha256": "a1d5f78172f32f819d08e9043b0f82fa7af738b37c55c6ca8d6092c61d204d53", + "urls": [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz", + "https://cdn.azul.com/zulu/bin/zulu18.28.13-ca-jdk18.0.0-linux_aarch64.tar.gz" + ] + }, "zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip": { "name": "zulu18.28.13-ca-jdk18.0.0-win_aarch64.zip", "sha256": "9b52b259516e4140ee56b91f77750667bffbc543e78ad8c39082449d4c377b54", diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix index e7255d6e75..b371a1f111 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.20"; + version = "3.0.21"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "sha256-8hA0Y/AGczFwggxkTG7PQKOVnr2Oizx4OH38nS5jCU0="; + sha256 = "sha256-wT3s8CjgFPKrJiMWHWsvmUQwpuuS4figJZUXJn3RclU="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix index 0c2b2005ba..fbe933f6b6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix @@ -8,13 +8,13 @@ , pkgsMusl # for passthru.tests }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (self: { pname = "bmake"; - version = "20220928"; + version = "20230126"; src = fetchurl { - url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-yAS3feP+uOMd7ipMn7Hp7CTFo0dk56KBXIi07QFlDpA="; + url = "http://www.crufty.net/ftp/pub/sjg/${self.pname}-${self.version}.tar.gz"; + hash = "sha256-hk9yGFgs95Dsc7ILcQVCXLn/ozUiJUF3LwMTMGtqC8Q="; }; # Make tests work with musl @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ tzdata ] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [ ksh diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/bpkg.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/bpkg.nix index 628c9304c1..cb0bcd7034 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/bpkg.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/build2/bpkg.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libodb libodb-sqlite ]; - checkInputs = [ + nativeCheckInputs = [ git openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix index 7b81126dae..2b7ccc4a6c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix @@ -64,7 +64,7 @@ in newPython.pkgs.buildPythonApplication rec { urllib3 ] ++ lib.optionals stdenv.isDarwin [ idna cryptography pyopenssl ]; - checkInputs = [ + nativeCheckInputs = [ pkg-config git ] ++ (with newPython.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/goredo/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/goredo/default.nix index 473cbb8202..54c5fed72d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/goredo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/goredo/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { nativeBuildInputs = [ zstd ]; - checkInputs = lib.optionals doCheck [ python3 perl ]; + nativeCheckInputs = lib.optionals doCheck [ python3 perl ]; SHARNESS_TEST_SRCDIR = sharness + "/share/sharness"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index 7e34249f20..d8a797dc91 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -139,20 +139,4 @@ rec { sha256 = "0p83zgszmrwa26a4q8nvzva2af5lfzy6xvcs57y9588smsw51wyw"; defaultJava = jdk11; }; - - # NOTE: No GitHub Release for the following versions. `update.sh` will not work. - - gradle_5 = gen { - version = "5.6.4"; - nativeVersion = "0.18"; - sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z"; - defaultJava = jdk11; - }; - - gradle_4 = gen { - version = "4.10.3"; - nativeVersion = "0.14"; - sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6"; - defaultJava = jdk8; - }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix index 5f4fa56bd1..5591b16342 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix @@ -69,7 +69,7 @@ python3.pkgs.buildPythonApplication rec { # require a typical building environment (including C compiler and stuff). # Just for the sake of documentation, the next lines are maintained here. doCheck = false; - checkInputs = [ ninja pkg-config ]; + nativeCheckInputs = [ ninja pkg-config ]; checkPhase = '' python ./run_project_tests.py ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix index 966937deff..6ede440cc6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.10.10"; + version = "0.10.11"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-Qen3z2qbgyHHYUscBh7Udc1/c82WDLnDIsZJF+tcR5M="; + hash = "sha256-B47C7sqOqiHa/2kC5lk/J1pXK61l1M5umVKaCfVO7cc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix index 5357dc805e..f2589c1e75 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/remake/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # make check fails, see https://github.com/rocky/remake/issues/117 meta = { - homepage = "http://bashdb.sourceforge.net/remake/"; + homepage = "https://bashdb.sourceforge.net/remake/"; license = lib.licenses.gpl3Plus; description = "GNU Make with comprehensible tracing and a debugger"; platforms = with lib.platforms; linux ++ darwin; 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 aa7f997d19..81f6c8dcff 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 = "5eeee846642c8226931263ed758ef80f077cadaf"; - version = "2022-11-11"; + rev = "32c96866364964b3e2f7272e0f9ef3e1a76ea7d7"; + version = "2023-01-05"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "2eUGQa0SdfnENbnjy9ZDxd0lKhUrzmTyDLB4fupqVIs="; + sha256 = "AgwqWmNkUkyQDu6R8LO86/JYJJHI6ZjEhPglt/jWBRY="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json index f2d895598f..85a3563f02 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "0.1.19", + "version": "0.1.20", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1n5x07n3g7r8cx22mv9prfq1gs9sjj41xdj615lbs4dbfjp8z66d" + "sha256": "0gb6xmv5qm77nfn49p7r180hz91a3kpilw27s9all8zcmca2xhml" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "02mwinm4ggpqr9j6c0ap1nsa4bgad5h3xgkplamwrzqa2kvqxx2i" + "sha256": "1ax9yqzp4l7aa74x3lgr75h58pl3w92921fjsg8yw3imi2j57h09" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "0cz5dd6f3j6czrbjiz9l6bf0ycfrba9h2wjpa6l80nn86yyr7i4r" + "sha256": "1i5g8afgcg701g7n22sgbs2639mlwgjmr5jhmw7bz6wvj8h5nz1z" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "19fcj631gwg6cjx3q5rqywgdafw18bdjkan52jj2awh2vxpikgdm" + "sha256": "0a53kxhl9n6p9mblk4r0zy8aklhpsvkg0g42il8hqvf72y0kl4ks" } } } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix index e53acd4e9e..902508129c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation rec { algorithms to avoid doing unnecessary work. This means you can stay focused on your project rather than on your build system. ''; - homepage = "http://gittup.org/tup/"; + homepage = "https://gittup.org/tup/"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/wafHook/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/wafHook/default.nix index 2131caede3..f0f3a683aa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/wafHook/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/wafHook/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, pkgs, makeSetupHook, waf }: makeSetupHook { + name = "waf-hook"; substitutions = { inherit waf; crossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix index aa14a01b86..575ee45d7d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix @@ -1,6 +1,7 @@ { buildah-unwrapped , runCommand , makeWrapper +, symlinkJoin , lib , stdenv , extraPackages ? [] @@ -11,6 +12,8 @@ , fuse-overlayfs # CoW for images, much faster than default vfs , util-linux # nsenter , iptables +, aardvark-dns +, netavark }: let @@ -25,6 +28,17 @@ let iptables ] ++ extraPackages); + helpersBin = symlinkJoin { + name = "${buildah-unwrapped.pname}-helper-binary-wrapper-${buildah-unwrapped.version}"; + + # this only works for some binaries, others may need to be be added to `binPath` or in the modules + paths = [ + ] ++ lib.optionals stdenv.isLinux [ + aardvark-dns + netavark + ]; + }; + in runCommand buildah-unwrapped.name { name = "${buildah-unwrapped.pname}-wrapper-${buildah-unwrapped.version}"; inherit (buildah-unwrapped) pname version; @@ -48,5 +62,6 @@ in runCommand buildah-unwrapped.name { mkdir -p $out/bin ln -s ${buildah-unwrapped}/share $out/share makeWrapper ${buildah-unwrapped}/bin/buildah $out/bin/buildah \ + --set CONTAINERS_HELPER_BINARY_DIR ${helpersBin}/bin \ --prefix PATH : ${binPath} '' diff --git a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix index 0b8478164f..11c0d85ee4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-zRkfH/CHLoulB/IDq2VPc8a6N2wMzX0Ws9oE9339VOQ="; + hash = "sha256-P1hu60vjJJASWxgc9LOwdy7psqgIHi8Z/D5c++TProY="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/butane/default.nix b/third_party/nixpkgs/pkgs/development/tools/butane/default.nix index d3d0b4293a..22ce9a40f9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/butane/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/butane/default.nix @@ -1,7 +1,5 @@ { lib, fetchFromGitHub, buildGoModule }: -with lib; - buildGoModule rec { pname = "butane"; version = "0.17.0"; @@ -27,7 +25,7 @@ buildGoModule rec { mv $out/bin/{internal,butane} ''; - meta = { + meta = with lib; { description = "Translates human-readable Butane configs into machine-readable Ignition configs"; license = licenses.asl20; homepage = "https://github.com/coreos/butane"; diff --git a/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix b/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix index 69e48a28a2..8b1685b171 100644 --- a/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/castxml/default.nix @@ -1,14 +1,14 @@ -{ lib, - stdenv, - fetchFromGitHub, - cmake, - libffi, - libxml2, - zlib, - withManual ? true, - withHTML ? true, - llvmPackages, - python3, +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libffi +, libxml2 +, zlib +, withManual ? true +, withHTML ? true +, llvmPackages +, python3 }: let diff --git a/third_party/nixpkgs/pkgs/development/tools/changie/default.nix b/third_party/nixpkgs/pkgs/development/tools/changie/default.nix index 0bf4f9be59..d108422919 100644 --- a/third_party/nixpkgs/pkgs/development/tools/changie/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/changie/default.nix @@ -2,18 +2,16 @@ buildGoModule rec { pname = "changie"; - version = "1.10.2"; + version = "1.11.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "miniscruff"; repo = pname; - sha256 = "sha256-1UUF82sYzZDzlhPD8R8QIfR/Vm/9uUAxHzai+A1FCaQ="; + sha256 = "sha256-hnRK9pj5NruSRvo2oetyRMVwhO7T/wSEZjcbYHb7ZUY="; }; - vendorSha256 = "sha256-oz327wlTrFCj8Hf1wPiND40Ew4kBB/k5doj1us8lhm4="; - - patches = [ ./skip-flaky-test.patch ]; + vendorSha256 = "sha256-0/3Ou8z6yLWhc81hdN2gkaFLLlKQWUGcIdvRHVLTrjQ="; ldflags = [ "-s" "-w" "-X=main.version=${version}" ]; @@ -22,7 +20,6 @@ buildGoModule rec { changelog = "https://github.com/miniscruff/changie/blob/v${version}/CHANGELOG.md"; description = "Automated changelog tool for preparing releases with lots of customization options"; license = licenses.mit; - platforms = platforms.unix; maintainers = with maintainers; [ figsoda matthiasbeyer ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/changie/skip-flaky-test.patch b/third_party/nixpkgs/pkgs/development/tools/changie/skip-flaky-test.patch deleted file mode 100644 index 48c038ecf6..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/changie/skip-flaky-test.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/core/change_test.go -+++ b/core/change_test.go -@@ -353,6 +353,7 @@ var _ = Describe("Change ask prompts", func() { - }) - - It("gets error for invalid body", func() { -+ Skip("") - var min int64 = 5 - submitFailed := false - config := Config{ diff --git a/third_party/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix b/third_party/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix index dd49074300..7c25ddd34c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/check-jsonschema/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist responses diff --git a/third_party/nixpkgs/pkgs/development/tools/circup/default.nix b/third_party/nixpkgs/pkgs/development/tools/circup/default.nix index 210f0d8f84..90c2ea916c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/circup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/circup/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { update_checker ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/clickable/default.nix b/third_party/nixpkgs/pkgs/development/tools/clickable/default.nix index 6d3bc86636..093e015d36 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clickable/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clickable/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { argcomplete ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Test require network connection diff --git a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix index 81b876bf45..741983b7e6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2023.01.16"; + version = "2023.01.20"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-pTqzgNtllx7yaStn9H3WDz03h2na3Uh2k2O7t6lVH98="; + sha256 = "sha256-QS4/kGR3QqwUk0U68AdKvip9YJndltx7YBo9IhZ9syY="; }; extraNativeImageBuildArgs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix index 46e2a7801f..f08d020f41 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix @@ -1,17 +1,16 @@ -{ python3 -, lib +{ lib +, python3 }: python3.pkgs.buildPythonApplication rec { pname = "cloudsmith-cli"; - version = "0.32.0"; - + version = "0.35.2"; format = "wheel"; src = python3.pkgs.fetchPypi { pname = "cloudsmith_cli"; inherit format version; - sha256 = "ZETVtRlzd9KUOeDyAH0MnnIy1WtGLVBm+bActUM4zBw="; + hash = "sha256-+M4CPveS9dltMI291Atm84T/cf4dPOO3wPvPI15E73Y="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -33,11 +32,16 @@ python3.pkgs.buildPythonApplication rec { # Wheels have no tests doCheck = false; - meta = { + pythonImportsCheck = [ + "cloudsmith_cli" + ]; + + meta = with lib; { homepage = "https://help.cloudsmith.io/docs/cli/"; description = "Cloudsmith Command Line Interface"; - maintainers = with lib.maintainers; [ jtojnar ]; - license = lib.licenses.asl20; - platforms = with lib.platforms; unix; + changelog = "https://github.com/cloudsmith-io/cloudsmith-cli/blob/v${version}/CHANGELOG.md"; + maintainers = with maintainers; [ jtojnar ]; + license = licenses.asl20; + platforms = with platforms; unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix b/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix index 52fdf0c1e4..e4217f06e2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cocogitto"; - version = "5.2.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "oknozor"; repo = pname; rev = version; - sha256 = "sha256-ZjDZMI84z8riRtidZVeCktwJUMkZU28E23MveJSD7xY="; + sha256 = "sha256-Z0snC5NomUWzxI2qcRMxdZbC1aOQ8P2Ll9EdVfhP7ZU="; }; - cargoSha256 = "sha256-oaWWAVTKxrshfvqE+HMQ1WeeEz8lOE7qc6RrgSjDtdU="; + cargoHash = "sha256-P/xwE3oLVsIoxPmG+S0htSHhZxCj79z2ARGe2WzWCEo="; # Test depend on git configuration that would likly exist in a normal user enviroment # and might be failing to create the test repository it works in. diff --git a/third_party/nixpkgs/pkgs/development/tools/coder/default.nix b/third_party/nixpkgs/pkgs/development/tools/coder/default.nix index 6998c9b8fb..9fd3a86f59 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coder/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coder/default.nix @@ -5,19 +5,19 @@ }: buildGoModule rec { pname = "coder"; - version = "0.14.3"; + version = "0.15.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-S+s6cOO2iISW3x+JM6mkpAC6KJv/x84RgXuaiFHZs+I="; + hash = "sha256-d3Cg7G1rjxEqKMsIqxZ6ZZDEMIoisDtjZMmyixZRpF4="; }; # integration tests require network access doCheck = false; - vendorHash = "sha256-nqmwwdIOm6jTPTAuvIqPf0xgVgIbKsUIs0Mbfka0jyU="; + vendorHash = "sha256-F9r99WhL1Uv5NNVlQYpQc282BAl8bUhJI5mZZYwyEEg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/codespell/default.nix b/third_party/nixpkgs/pkgs/development/tools/codespell/default.nix index 87fab56778..8315aa20aa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/codespell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/codespell/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { setuptools-scm ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ aspell-python chardet pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/tools/comby/default.nix b/third_party/nixpkgs/pkgs/development/tools/comby/default.nix index f77acfffa9..60221444da 100644 --- a/third_party/nixpkgs/pkgs/development/tools/comby/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/comby/default.nix @@ -44,7 +44,7 @@ let ocamlPackages.angstrom ] ++ extraBuildInputs; - checkInputs = [ cacert ]; + nativeCheckInputs = [ cacert ]; meta = { description = "Tool for searching and changing code structure"; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 659cba2c42..7542ba0f94 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,16 +3,16 @@ nixosTests }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.42.0"; + version = "3.43.1"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-vLfIZ2y9e6I0kEqI10D/B6VaNFh/D0k6GXY2OB8mZf8="; + sha256 = "sha256-gTtWfqz1XVvDPULHY4hKdhJlwEWY84VYUPloAX/9afY="; }; - vendorHash = "sha256-8nMN62vnzlus2kjefVUKj1SMkM1YfIm8ppPQaDXSeIA="; + vendorHash = "sha256-srzTHUqXxyZY2hFCx3FhhuixclXHskYrQ586W1dB334="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix index 91ad0b3ee9..9e5dc5628b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-tq3b/4ysGG7fozIou1cvWs+BJSe9rPDYKaV2GT3hLGE="; + hash = "sha256-/JbKnDjC3C0mF4WHOmmvblrr/e1MhOws3Q/oXZCgdEM="; }; - vendorHash = "sha256-8FjzL++AFNhHvk9ipeVK3tmPMEgTKg8Fz/vJZMEAPJE="; + vendorHash = "sha256-wufztmiOwgY0Q6x9oMrJo28JGx8iprC1gr9zZjSWwuw="; proxyVendor = true; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch new file mode 100644 index 0000000000..6dfb50271a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/0001-use-builtin-go-syscerts.patch @@ -0,0 +1,39 @@ +From 93f4f92b017935a35988e7210036db8020753f9e Mon Sep 17 00:00:00 2001 +From: Jake Hillion +Date: Sun, 21 Feb 2021 21:26:39 +0000 +Subject: [PATCH] removed dependency for systemcertpool + +--- + drone/internal/util.go | 7 +++++-- + go.mod | 1 - + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drone/internal/util.go b/drone/internal/util.go +index 46c8ec6f..25d4def7 100644 +--- a/drone/internal/util.go ++++ b/drone/internal/util.go +@@ -2,11 +2,11 @@ package internal + + import ( + "crypto/tls" ++ "crypto/x509" + "fmt" + "net/http" + "strings" + +- "github.com/jackspirou/syscerts" + "github.com/urfave/cli" + "golang.org/x/net/proxy" + "golang.org/x/oauth2" +@@ -35,7 +35,10 @@ func NewClient(c *cli.Context) (drone.Client, error) { + } + + // attempt to find system CA certs +- certs := syscerts.SystemRootsPool() ++ certs, err := x509.SystemCertPool() ++ if err != nil { ++ return nil, err ++ } + tlsConfig := &tls.Config{ + RootCAs: certs, + InsecureSkipVerify: skip, diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/0001-use-different-upstream-for-gomod.patch b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/0001-use-different-upstream-for-gomod.patch deleted file mode 100644 index e9bd040f67..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/0001-use-different-upstream-for-gomod.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/go.mod b/go.mod -index 99f9b37..ebbdb54 100644 ---- a/go.mod -+++ b/go.mod -@@ -28,3 +28,5 @@ require ( - golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 - golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d - ) -+ -+replace github.com/jackspirou/syscerts => github.com/akhenakh/syscerts v0.0.0-20201230132944-1f7ee1de1ba3 -diff --git a/go.sum b/go.sum -index 8c379ed..283ba39 100644 ---- a/go.sum -+++ b/go.sum -@@ -64,6 +64,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE - github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= - github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= - github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= -+github.com/akhenakh/syscerts v0.0.0-20201230132944-1f7ee1de1ba3 h1:2d14fzBv1dj4PimhBxXDlaltfNU6rGmA4NyYa3aB5xQ= -+github.com/akhenakh/syscerts v0.0.0-20201230132944-1f7ee1de1ba3/go.mod h1:ijVDlqqT/Ok/B2v7GaiSj4gfCl7uipB8/8jwgJvrTSk= - github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= - github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= - github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= 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 6d0c414fe3..ccbadee620 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 @@ -1,27 +1,32 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +}: buildGoModule rec { - version = "1.6.0"; + version = "1.7.0"; pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "sha256-0vHOPuSn7eczlUeCTz+SOMuDdRQTzw/TnH1rt/ltWOQ="; - - doCheck = false; - - patches = [ ./0001-use-different-upstream-for-gomod.patch ]; - - ldflags = [ - "-X main.version=${version}" - ]; - src = fetchFromGitHub { owner = "harness"; repo = "drone-cli"; rev = revision; - sha256 = "sha256-TVOj1C5X3fTRZF29hId13LjkkwaAFntlozpmYVUfVJI="; + hash = "sha256-PZ0M79duSctPepD5O+NdJZKhkyR21g/4P6loJtoWZiU="; }; + vendorSha256 = "sha256-JC7OR4ySDsVWmrBBTjpwZrkJlM8RJehbsvXW/VtA4VA="; + + # patch taken from https://patch-diff.githubusercontent.com/raw/harness/drone-cli/pull/179.patch + # but with go.mod changes removed due to conflict + patches = [ ./0001-use-builtin-go-syscerts.patch ]; + + ldflags = [ + "-X main.version=${version}" + ]; + + doCheck = false; + meta = with lib; { mainProgram = "drone"; maintainers = with maintainers; [ techknowlogick ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix new file mode 100644 index 0000000000..1d15cdc604 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-ssh/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "drone-runner-ssh"; + version = "unstable-2022-12-22"; + + src = fetchFromGitHub { + owner = "drone-runners"; + repo = pname; + rev = "ee70745c60e070a7fac57d9cecc41252e7a3ff55"; + sha256 = "sha256-YUyhEA1kYIFLN+BI2A8PFeSgifoVNmNPKtdS58MwwVU="; + }; + + vendorHash = "sha256-Vj6ZmNwegKBVJPh6MsjtLMmX9WR76msuR2DPM8Qyhe0="; + + meta = with lib; { + description = "Experimental Drone runner that executes a pipeline on a remote machine"; + homepage = "https://github.com/drone-runners/drone-runner-ssh"; + license = licenses.unfreeRedistributable; + maintainers = teams.c3d2.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix index 9e4dda5475..136e7c9baf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone/default.nix @@ -22,8 +22,9 @@ buildGoModule rec { doCheck = false; meta = with lib; { + description = "Continuous Integration platform built on container technology"; + homepage = "https://github.com/harness/drone"; maintainers = with maintainers; [ elohmeier vdemeester techknowlogick ]; license = with licenses; if enableUnfree then unfreeRedistributable else asl20; - description = "Continuous Integration platform built on container technology"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix index 30e3043ba8..143362d98a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -208,7 +208,7 @@ stdenv.mkDerivation rec { "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchCancellation" "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchRunNewJob" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index a4e319020b..14984ba951 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "15.7.2"; + version = "15.8.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorSha256 = "sha256-lZAESAJ7ZRjHW6MD/xm3rOczK0h8EfmRAAVxRbVLu/k="; + vendorSha256 = "sha256-YHBp6Grm+atGne/5Ia/1H2xQRODmfWsMGCqHAIE9P4k="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-NiBQQ36F8aYi1Uk3P0UgBy4Pai6Coz3oQDvWWOGGQNw="; + sha256 = "sha256-U7yVlnEzwqcgTX8WjXe2i4SQ0KyW7PgSM3UyuGkjm9g="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/convco/default.nix b/third_party/nixpkgs/pkgs/development/tools/convco/default.nix index e00c3ed1aa..c3b0af4e82 100644 --- a/third_party/nixpkgs/pkgs/development/tools/convco/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/convco/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "convco"; - version = "0.3.14"; + version = "0.3.15"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-irn6L8tKOrtgTExLw5ycPLNZcnCKNEW6RayZVePVofw="; + sha256 = "sha256-a/C93Uuf++FIBqZSA0LaUQX4ZQoUMD2lHnV5MRlCw4g="; }; - cargoHash = "sha256-eoWtmUQf1/X4cd/b1aiNoN8HS+qrylaoTdq21/97kPU="; + cargoHash = "sha256-JQvLezX8L2yEDyiVxH93Uk1V5qFjwXNVQWEI9ur9YOQ="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix index 9689df362a..f4f814f2d9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cpm-cmake"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "cpm-cmake"; repo = "cpm.cmake"; rev = "v${finalAttrs.version}"; - hash = "sha256-XI3yDBhmglQnIe/t6sfL9WxaclqtOgE1kDmocQL+xnA="; + hash = "sha256-zZUk0brG9dAfQRN1LzKRo5/ZAG35TblY0nZvVhy6azE="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/csvq/default.nix b/third_party/nixpkgs/pkgs/development/tools/csvq/default.nix new file mode 100644 index 0000000000..badc9aba08 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/csvq/default.nix @@ -0,0 +1,23 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "csvq"; + version = "1.17.11"; + + src = fetchFromGitHub { + owner = "mithrandie"; + repo = "csvq"; + rev = "v${version}"; + sha256 = "sha256-jhj03xpWBcLVCCk1S9nsi8O6x1/IVwNT3voGfWBg2iw="; + }; + + vendorSha256 = "sha256-C+KQHSp4aho+DPlkaYegjYSaoSHaLiQOa1WJXIn9FdQ="; + + meta = with lib; { + description = "SQL-like query language for CSV"; + homepage = "https://mithrandie.github.io/csvq/"; + changelog = "https://github.com/mithrandie/csvq/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ tomodachi94 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/ctlptl/default.nix b/third_party/nixpkgs/pkgs/development/tools/ctlptl/default.nix index f4b155da72..1759596e8f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ctlptl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ctlptl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.15"; + version = "0.8.16"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JCBlP8ESCiqr4pk8QyG5CVs+3qSlnvw0jYS5R0Civk0="; + hash = "sha256-JCBlP8ESCiqr4pk8QyG5CVs+3qSlnvw0jYS5R0Civk0="; }; - vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s="; + vendorHash = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/cue/default.nix b/third_party/nixpkgs/pkgs/development/tools/cue/default.nix index d159a329e5..5ef396d383 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cue/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cue/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - sha256 = "sha256-v9MYrijnbtJpTgRZ4hmkaekisOyujldGewCRNbkVzWw="; + hash = "sha256-v9MYrijnbtJpTgRZ4hmkaekisOyujldGewCRNbkVzWw="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -f cmd/cue/cmd/script_test.go ''; - vendorSha256 = "sha256-jTfV8DJlr5LxS3HjOEBkVzBvZKiySrmINumXSUIq2mI="; + vendorHash = "sha256-jTfV8DJlr5LxS3HjOEBkVzBvZKiySrmINumXSUIq2mI="; excludedPackages = [ "internal/ci/updatetxtar" "internal/cmd/embedpkg" "internal/cmd/qgo" "pkg/gen" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix index 5acfd6ea99..09c3fce04d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "sha256-eBes5BqoR7K6ntCKjWECwWuoTwAodNtLqcTei5WocLU="; + sha256 = "sha256-6M7ruiBjvXO6LTdZNuGwUIVwa3QzdBQo0Y34UslCGAE="; }; - vendorSha256 = "sha256-U9VTS0rmLHxweFiIcFyoybHMBihy5ezloDC2iLc4IMc="; + vendorSha256 = "sha256-DwQUrNBfKZaVIpqI8yI/C9CQF5Ok/sApOrsLeIxt3hM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix index a1c35c88ee..34264dad65 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/litecli/default.nix @@ -21,13 +21,17 @@ python3Packages.buildPythonApplication rec { sqlparse ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook mock ]; pythonImportsCheck = [ "litecli" ]; + disabledTests = [ + "test_auto_escaped_col_names" + ]; + meta = with lib; { description = "Command-line interface for SQLite"; longDescription = '' 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 index 399c8801f7..c3ec5f9d58 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/pg_activity/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/pg_activity/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "pg_activity"; - version = "3.0.1"; + version = "3.0.3"; disabled = python3Packages.pythonOlder "3.6"; src = fetchFromGitHub { owner = "dalibo"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-YsHY2Hvr1aDKA+YOftc7iUi1qXDv6HW+jQtTQgQ5+M4="; + sha256 = "sha256-djpBdhCgtlm6+DiZVKSKh0nu30YVm/qZHlBHPtdObfU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/database/pgweb/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/pgweb/default.nix index 665ce591cd..7cdf913736 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/pgweb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/pgweb/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgweb"; - version = "0.11.12"; + version = "0.13.1"; src = fetchFromGitHub { owner = "sosedoff"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5BFTvfTXsz5ZerSoAudavT/C+SA/xkmVBtAOhAixcAE="; + sha256 = "sha256-+sU+kNTOv78g4mvynXoIyNtmeIDxzfAs4Kr/Lx9zfiU="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -f pkg/client/{client,dump}_test.go ''; - vendorSha256 = "sha256-pXV1BodOEZs5sv7UE/C58SAyIUZW5Cp2gJD7g8EuWog="; + vendorSha256 = "sha256-W+Vybea4oppD4BHRqcyouQL79cF+y+sONY9MRggti20="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix index 3a7b086f7d..e42c42e149 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix @@ -14,19 +14,19 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-+L8w7FG74V6z9IUfkQHo2B7/vjLhdVHeoVBttgqoUNc="; + sha256 = "sha256-Nxpv3ibhHTFiO0hqSrT1hqTK9Vb0P8Svu5riufCChwI="; }; # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-CQFTO43/b0ymYtnAtvySrp8cOF7rRdzY8mvcYTiiUp0="; + cargoSha256 = "sha256-PiDW7+LrCDfRpQirJlgaYDnGenowbsCmwQz1mbgA08E="; nativeBuildInputs = [ pkg-config git ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlcl/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlcl/default.nix index 733282cd40..ccf3bd4a23 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlcl/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, makeWrapper, requireFile, unzip, jdk }: let - version = "22.3.1"; - fileVersion = "1032109-01"; + version = "22.4.0.342.1212"; + fileVersion = "1032835-01"; in stdenv.mkDerivation { @@ -37,7 +37,7 @@ in nix-prefetch-url --type sha256 file:///path/to/${name} ''; - sha256 = "0yqj8m2zwl8m7zxrzjnbl2rqnl2imn5h1bfpnmklp03nkakbzjbn"; + sha256 = "0i4xsj502s465fgmlcqn80r8rqzr11mv74x9fzrlbqmkkh5c782k"; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index b93b1ab763..256178e7a9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { importlib_metadata ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ hypothesis pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix index dd503834dd..1a931b2b10 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { pname = "squirrel-sql"; - version = "4.4.0"; + version = "4.5.1"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "sha256-uMOVhLqjZB21SAvNXT6VhdmFyCFhBYHID9lXeDABvnk="; + sha256 = "sha256-LKX8yNSLs60546ZcvLlQF3e++VxHmPsczui4cfrpia0="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix b/third_party/nixpkgs/pkgs/development/tools/datree/default.nix index 572a9c46be..13fc840b0c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/datree/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/datree/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "datree"; - version = "1.8.14"; + version = "1.8.21"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = "refs/tags/${version}"; - hash = "sha256-VBFVoBPKT+yUELhKvMUvCAcjamhwvOAKYfO5iFnngjM="; + hash = "sha256-OURnQo38ofiDRu01GeEFTNiTYUeiDLMr1j28HzHVxds="; }; vendorHash = "sha256-mkVguYzjNGgFUdATjGfenCx3h97LS3SEOkYo3CuP9fA="; diff --git a/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix b/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix index 43207e5a9c..65e6dd4b2a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-peqLeZ8RxkvaqUER2FBQeTdy1AQ/+Bcz9gGOGz1CACc="; + sha256 = "sha256-bS/7S4PxZSTYvxLFmC486PBHNhkGUIPAnUJQztp3ouw="; }; vendorHash = "sha256-3y5ppTtvGqwWhgnVBpP4gf26DHKPnSNYK4jfhBiYDwY="; diff --git a/third_party/nixpkgs/pkgs/development/tools/detekt/default.nix b/third_party/nixpkgs/pkgs/development/tools/detekt/default.nix new file mode 100644 index 0000000000..0c67c5dd66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/detekt/default.nix @@ -0,0 +1,38 @@ +{ detekt, lib, stdenv, fetchurl, makeWrapper, jre_headless, testers }: +stdenv.mkDerivation rec { + pname = "detekt"; + version = "1.22.0"; + + jarfilename = "${pname}-${version}-executable.jar"; + + src = fetchurl { + url = "https://github.com/detekt/detekt/releases/download/v${version}/detekt-cli-${version}-all.jar"; + sha256 = "sha256-NCOMBcAtk7cOlP3H8Bz/hfR/305j/DfaoFrwc504b/4="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + install -D "$src" "$out/share/java/${jarfilename}" + + makeWrapper ${jre_headless}/bin/java $out/bin/detekt \ + --add-flags "-jar $out/share/java/${jarfilename}" + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { package = detekt; }; + + meta = with lib; { + description = "Static code analysis for Kotlin"; + homepage = "https://detekt.dev/"; + license = licenses.asl20; + platforms = jre_headless.meta.platforms; + maintainers = with maintainers; [ mdr ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix b/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix index 8817a5726c..08f7cce902 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.2.2"; + version = "0.2.4"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-n2zFfa+UlrAOvBtqF+FkF+oSF1t/7Hg79um7Rl8yTCc="; + hash = "sha256-b3vBwWya5xj/y5/32KIHtvPRT6JdMpO/IKO4sVAg4AA="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # integration tests want file system access doCheck = false; - vendorHash = "sha256-pZ9s2i62uMebGLpWerOkSJLxShD06vY4MybqM9ZcdGc="; + vendorHash = "sha256-3u3qg8BojCVp0gx8ZKRv2WS5K307CnTlFjvTgrlfw8w="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix index b308d8a48c..27af4acb35 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devpi-client/default.nix @@ -48,7 +48,7 @@ buildPythonApplication rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ devpi-server git mercurial diff --git a/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix index c6852ddf1c..d9de1b09c2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/devpi-server/default.nix @@ -61,7 +61,7 @@ buildPythonApplication rec { waitress ] ++ passlib.optional-dependencies.argon2; - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 nginx py diff --git a/third_party/nixpkgs/pkgs/development/tools/distgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/distgen/default.nix index dbf00ea8e0..d1e506ea97 100644 --- a/third_party/nixpkgs/pkgs/development/tools/distgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/distgen/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "08f9rw5irgv0gw7jizk5f9csn0yhrdnb84k40px1zbypsylvr5c5"; }; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest mock ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix index 6f2928195c..cfbf2752c0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.34.1"; + version = "0.34.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-sdRmBzP5H/engoa68w1hYlzMgIrHhRltKYsMg/TGTv0="; + sha256 = "sha256-JCCmGlvL2OLkeq25lCzVRXvmVCAvkwO4yD81gbKmSsw="; }; - cargoSha256 = "sha256-nkRD1Qx+OgqTwc/mfVa08d790yj/K7BJO4dqu5qig8o="; + cargoHash = "sha256-5biUsZTLoYcEqOPJnzR8YpdN7U1ztXjprRhHTUxKCl4="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix b/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix index f433c54ad5..4a8f8bf2ac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/eclipse-mat/default.nix @@ -18,13 +18,12 @@ , zlib }: -with lib; let pVersion = "1.13.0.20220615"; - pVersionTriple = splitVersion pVersion; - majorVersion = elemAt pVersionTriple 0; - minorVersion = elemAt pVersionTriple 1; - patchVersion = elemAt pVersionTriple 2; + pVersionTriple = lib.splitVersion pVersion; + majorVersion = lib.elemAt pVersionTriple 0; + minorVersion = lib.elemAt pVersionTriple 1; + patchVersion = lib.elemAt pVersionTriple 2; baseVersion = "${majorVersion}.${minorVersion}.${patchVersion}"; jdk = jdk11; in diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix index 5c0838fce7..717f66b4cc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix @@ -133,30 +133,30 @@ rec { headers = "09dbx4qh0rgp5mdm6srz6fgx12zq6b9jqq1k6l3gzyvwigi3wny1"; }; - electron_20 = mkElectron "20.1.3" { - armv7l-linux = "99710a57c55d95b540f4c3568da2a7caccb7f91da23b530c8c40db5ac861ab24"; - aarch64-linux = "8f39562f20210d7cdedbb063683d632df442c8553f62104c7d676121f3d9a357"; - x86_64-linux = "219fb6f01305669f78cf1881d257e3cc48e5563330338516f8b6592d85fdb4a3"; - x86_64-darwin = "134714291dcbecbf10cbc27c490a6501e2810bd4147a74f3b2671503445f2ce8"; - aarch64-darwin = "a09f83442f1e9f4b1edc07445a1dca73d9597529b23d62731eaa3fa0488f4ab0"; - headers = "11cv0p52864k4knwlwakiq8v6rxdv3iz6kvwhn0w8mpap2h5pzii"; + electron_20 = mkElectron "20.3.11" { + armv7l-linux = "709b9eb958e9488f6375811041179556b9cd0b8fc1eab6b899ef4a89423f98b2"; + aarch64-linux = "0f488ac9eeda2baa4c4e571fd75ac8e055dac9dcdf83051164232b1005a29224"; + x86_64-linux = "7899bf391ae35e10d78a5da622e506dd4ae859cd8c18953cd2dc54f1a5e5225e"; + x86_64-darwin = "751204887aa553c2a7811d3cb04d71e85359ccce2cf21d38e43eda24575ef4db"; + aarch64-darwin = "8ea1a446b41413b97d83d2955a4800c5f7c9061662f78c3e8d96827741f8e211"; + headers = "06s4z2hs9sbri4jsjrgybq0sn7rrx7zf3iwfg8da1wb6ahwqcd7w"; }; - electron_21 = mkElectron "21.2.1" { - armv7l-linux = "1f68ffacbcd0086c5bcbc726e3a0bd707b03acdf5c82d5cc44666b6e9a0d8a78"; - aarch64-linux = "78c1c6ecf5959e67fa6c67d82dc7deb170bc10d34d45265d6e972dd5b996bcb9"; - x86_64-linux = "d8aa2ea7b1a1421ca245ced1a9bdd77408bf7aee6f75c19d5e0e73dc120442b7"; - x86_64-darwin = "f20c0be6cb51bad1bb591ec1116be622e631cbc89876b2258c55579bbe52de30"; - aarch64-darwin = "2ac1bde2bbb4a265422e00eb5e1d81302b0c349b2db6e7bf1ee6f236a68b3d53"; - headers = "1c1g6jc0p678d5sr2w4irhfkj02vm4kb92b7cvimz8an0jwy58x7"; + electron_21 = mkElectron "21.4.0" { + armv7l-linux = "20ed4fab8b2046e10c999592ea06cd6ef13bc5826bcd7e8874c6e5e3b3cdb5b7"; + aarch64-linux = "5841060f67c23371f2739e043b51f56d04125fe781cc50e298590247477eacf2"; + x86_64-linux = "1c0da48b2b9d1fb320577429298397d67d94fbf5864d6a4f3c6eeadee3114f2e"; + x86_64-darwin = "3eea42022d21b6bb0416da8da787740b908febd2552e74cbac63bf403df0745a"; + aarch64-darwin = "aee691fd7da0343e09c4574d09e0d9962d2d1071f845ae57acf1fd9c76adbd3c"; + headers = "0zvwd3gz5y3yq5jgkswnarv75j05lfaz58w37fidq5aib1hi50hn"; }; - electron_22 = mkElectron "22.0.0" { - armv7l-linux = "f2b9c870c12d4cfd6a4ac23bf937d4a89cd34381aedc2c9a64f00f22ff984985"; - aarch64-linux = "7c031d1d907953399126e9ed072db66ab7c82e3aff29c8268c8c3a83f825f5de"; - x86_64-linux = "ea0f4ad9a91bef4d5918d73c27b2731a5a93fe8917ad13d9eca83f39c5acbf05"; - x86_64-darwin = "b072e64ae563997abed9b76e30b617dfc23a33d6bba6b85fdf30c0877a6215c2"; - aarch64-darwin = "79b700953a20f4055bf94f11d7a6be9d39a7545774b45ca487cf33482828ebfd"; - headers = "06fi1m6g0g81a1lkx11ryxbic0srp4iq2z2lf2449sjnaw1sh2hr"; + electron_22 = mkElectron "22.1.0" { + armv7l-linux = "9bad02cd8e8604400eb90d9bd8fa58b6e400321cea8db7e774908611f4fca2a2"; + aarch64-linux = "1d3e0011761f5ba05faf994a7f78cf518e49e0fef7e4528853e1bff9378d02cf"; + x86_64-linux = "543e5fa7f2b602c3cd7e62a358441faf6f490e738de9b0bd796ad65d6bbd35ee"; + x86_64-darwin = "969cad3fad6a03cbbc1658722cbf87547a8465c90dd4287fd5c03bd15bbf8a5b"; + aarch64-darwin = "4ebf838308e93ad9956f3ce3a14b8d41607ffec5cd2054818d0c91b79df101a2"; + headers = "1vydsk4fxk5hlpcs0r1s21gdr1kvxip8qc88ncs5w7ybqg31hzsh"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix index 76f2bc4275..eee9538628 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix @@ -32,7 +32,7 @@ let ++ optionals (versionAtLeast version "11.0.0") [ "aarch64-darwin" ] ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - knownVulnerabilities = optional (versionOlder version "18.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "20.0.0") "Electron version ${version} is EOL"; }; fetcher = vers: tag: hash: fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/tools/eliot-tree/default.nix b/third_party/nixpkgs/pkgs/development/tools/eliot-tree/default.nix index adcedfe643..7188835e27 100644 --- a/third_party/nixpkgs/pkgs/development/tools/eliot-tree/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/eliot-tree/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "18gvijsm0vh3x83mv8dd80c3mpm80r7i111qsg4y7rj4i590phma"; }; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ testtools pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index a9179e7b37..34a7a166ef 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.16.17"; + version = "0.17.5"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + hash = "sha256-QLV6+1se3F7naG3jgXtSfmoTR0d7cFByRznzf+xjDpk="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix index 7bbbfb4535..2921a7b394 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.7.0"; + version = "9.12.0"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-HXLwC5T+hPbUTf4grKjCnhIMpqsFAz5yK6kH4XicLG8="; + sha256 = "sha256-8Zx+0lWaPAgPhxcvb84FzT2z58yAwDDLHegtXpRTr5M="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix index 3d2f3b867c..5a68519f66 100644 --- a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.16.2"; + version = "3.16.14"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zZ4CueyDugaOY62KCyTcbF2QVvp0N8pI/ChmQSscn1w="; + sha256 = "sha256-6U4mYS5ukcOaxGeIiI2UFYlz0PpjKdtQH9cOshYRUg0="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-0pPSEYPGluuRsDuTa2wmDPY6PqG3+YeJG6mphf8X96M="; + vendorHash = "sha256-CbneZtwGab5dlGASZqa69Y70fXgt4PJzAODPJlcpJoA="; meta = with lib; { description = "Thrift improved"; diff --git a/third_party/nixpkgs/pkgs/development/tools/garble/default.nix b/third_party/nixpkgs/pkgs/development/tools/garble/default.nix index 0d01de127e..d42a53beee 100644 --- a/third_party/nixpkgs/pkgs/development/tools/garble/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/garble/default.nix @@ -6,19 +6,19 @@ }: buildGoModule rec { pname = "garble"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "burrowers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T6iUhfBcHlz9oUuovwU4ljHh4y6PRd3sRhwG6RwuspM="; + sha256 = "sha256-f7coWG1CS4UL8GGqwADx5CvIk2sPONPlWW+JgRhFsb8="; }; - vendorSha256 = "sha256-lGU9jbeOM8tSYZGIqQhH5I2RlBGnqrA6JUQpuHrLwKU="; + vendorSha256 = "sha256-SOdIlu0QrQokl9j9Ff594+1K6twU1mCuECFQaVKaPV4="; # Used for some of the tests. - checkInputs = [git]; + nativeCheckInputs = [git]; preBuild = lib.optionalString (!stdenv.isx86_64) '' # The test assumex amd64 assembly diff --git a/third_party/nixpkgs/pkgs/development/tools/gci/default.nix b/third_party/nixpkgs/pkgs/development/tools/gci/default.nix new file mode 100644 index 0000000000..170b9c41dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gci/default.nix @@ -0,0 +1,25 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "gci"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "daixiang0"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-qWEEcIbTgYmGVnnTW+hM8e8nw5VLWN1TwzdUIZrxF3s="; + }; + + vendorSha256 = "sha256-dlt+i/pEP3RzW4JwndKTU7my2Nn7/2rLFlk8n1sFR60="; + + meta = with lib; { + description = "Controls golang package import order and makes it always deterministic"; + homepage = "https://github.com/daixiang0/gci"; + license = licenses.bsd3; + maintainers = with maintainers; [krostar]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix index e33d773a40..d8a31630f2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-UXuRhozEC6zjOzjRi88mS7vyMqvBSnFCj6HXC4zZEp0="; + sha256 = "sha256-KqDGnEvPGIRz41IMaHhmDWTMvTRVhGHwGDd8IpzxVDE="; }; - vendorHash = "sha256-SV7G/FZ7kj2ghr15oTMK25Y4SjaIfRc3UfxMPFr4src="; + vendorHash = "sha256-jqDZmlCEgU4Nqc2vNH6NGdM74mywdVIj5v96tmRCvjQ="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix b/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix index d2d7e523a9..c09ec90207 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { sha256 = "sha256-CoreqnMRuPuv+Ci1uyF3HJCJFwK2jwB79okynv6AHTA="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; - checkInputs = with llvmPackages; [ + nativeCheckInputs = with llvmPackages; [ clang llvm ] ++ lib.optionals stdenv.isDarwin [ getconf ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/glslviewer/default.nix b/third_party/nixpkgs/pkgs/development/tools/glslviewer/default.nix index c5cbdef598..fcebe93aaa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/glslviewer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/glslviewer/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Live GLSL coding renderer"; - homepage = "http://patriciogonzalezvivo.com/2015/glslViewer/"; + homepage = "https://patriciogonzalezvivo.com/2015/glslViewer/"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.hodapp ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix index ea6ba727d7..dff78895fa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-bindata-assetfs/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-yQgIaTl06nmIu8BfmQzrvEnlPQ2GQ/2nnvTmYXCL1oI="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix index 11f42d81a3..293f5c078e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-dEfD5oV2nXLVg+a7PlB6LqhEBosG7eTptqKKDWcQAss="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; patches = [ # Add go modules support diff --git a/third_party/nixpkgs/pkgs/development/tools/go-motion/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-motion/default.nix index d06f6e5acd..d7e686235a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-motion/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-motion/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-bD6Mm9/LOzguoK/xMpVEeT7G8j1shCsMv14wFostlW4="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix index 0417f8d567..026433cabc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swag"; - version = "1.8.9"; + version = "1.8.10"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-8UnDrWZ0gQlhPQLDqA5DLBBeHqQFlNxK7+y4qlUk/fI="; + sha256 = "sha256-PDK1TI99/8hAuyK4NOb357WZG0JBno8er8HMfus5V7Q="; }; - vendorSha256 = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ="; + vendorHash = "sha256-iu4rSgB7Gu5n1Sgu0jU9QwdwvuZ5rAqysvKuBnJd2jQ="; subPackages = [ "cmd/swag" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/goa/default.nix b/third_party/nixpkgs/pkgs/development/tools/goa/default.nix index bbbdbe5bab..eac91732be 100644 --- a/third_party/nixpkgs/pkgs/development/tools/goa/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "sha256-Z/J1L6fYuim6LkVh+LDrr3FLTZO7uQwHXRg0YTofkWA="; + sha256 = "sha256-KgCF44kpr8dAHzLgoRKXfd9warQUiFggGZ/Dy/49j1Q="; }; - vendorSha256 = "sha256-r/1huS/6qqS6TuqPQkwqKuYwye5DYQWYfBS1IcXWRgk="; + vendorHash = "sha256-d76aeiSkW0sZeFylWIkCoquWzX78s2iaDeX3VE8cYfI="; subPackages = [ "cmd/goa" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/goconst/default.nix b/third_party/nixpkgs/pkgs/development/tools/goconst/default.nix index 27e43fec99..002f13c77e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/goconst/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/goconst/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "sha256-chBWxOy9V4pO3hMaeCoKwnQxIEYiSejUOD3QDBCpaoE="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/gocyclo/default.nix b/third_party/nixpkgs/pkgs/development/tools/gocyclo/default.nix index bef3d3e750..b8e0bb1c4f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gocyclo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gocyclo/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-1IwtGUqshpLDyxH5NNkGUads1TKLs48eslNnFylGUPA="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; meta = with lib; { description = "Calculate cyclomatic complexities of functions in Go source code"; diff --git a/third_party/nixpkgs/pkgs/development/tools/goda/default.nix b/third_party/nixpkgs/pkgs/development/tools/goda/default.nix index e2bddfb5dd..0564cfa315 100644 --- a/third_party/nixpkgs/pkgs/development/tools/goda/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/goda/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goda"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "loov"; repo = "goda"; rev = "v${version}"; - sha256 = "sha256-5MkErXgRJtaXbThJYjGWyvt+RAbtULTe0VoXKU3HQug="; + sha256 = "sha256-yKhgk/DRcifh+exxTZFti1Aac/sgpvUsNKdioLAzmX0="; }; vendorSha256 = "sha256-BYYuB4ZlCWD8NILkf4qrgM4q72ZTy7Ze3ICUXdoI5Ms="; diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/3/dont_clobber_environment.patch b/third_party/nixpkgs/pkgs/development/tools/godot/3/dont_clobber_environment.patch index 74e1241513..cfd3113a6a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/godot/3/dont_clobber_environment.patch +++ b/third_party/nixpkgs/pkgs/development/tools/godot/3/dont_clobber_environment.patch @@ -1,19 +1,23 @@ -diff --git a/SConstruct b/SConstruct -index d138c7b250..c925bf908e 100644 +scons does not use os environment by default: + https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html + +nixpkgs' cc-wrapper on the other hand relies on various NIX_* variables +to be passed through like NIX_CFLAGS_COMPILE_BEFORE. --- a/SConstruct +++ b/SConstruct -@@ -65,10 +65,10 @@ elif platform_arg == "javascript": - # want to have to pull in manually. - # Then we prepend PATH to make it take precedence, while preserving SCons' own entries. - env_base = Environment(tools=custom_tools) +@@ -67,14 +67,7 @@ elif platform_arg == "javascript": + elif os.name == "nt" and methods.get_cmdline_bool("use_mingw", False): + custom_tools = ["mingw"] + +-# We let SCons build its default ENV as it includes OS-specific things which we don't +-# want to have to pull in manually. +-# Then we prepend PATH to make it take precedence, while preserving SCons' own entries. +-env_base = Environment(tools=custom_tools) -env_base.PrependENVPath("PATH", os.getenv("PATH")) -env_base.PrependENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH")) -if "TERM" in os.environ: # Used for colored output. - env_base["ENV"]["TERM"] = os.environ["TERM"] -+for k in ("TERM", "PATH", "PKG_CONFIG_PATH"): -+ if (k in os.environ): -+ env_base["ENV"][k] = os.environ[k] -+ - ++env_base = Environment(ENV = os.environ, tools=custom_tools) + env_base.disabled_modules = [] env_base.use_ptrcall = False diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix b/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix index 22b14dd283..5732b8f44f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix @@ -1,11 +1,12 @@ { stdenv , lib , fetchFromGitHub -, installShellFiles -, autoPatchelfHook , pkg-config +, autoPatchelfHook +, installShellFiles , scons , vulkan-loader +, libGL , libX11 , libXcursor , libXinerama @@ -14,7 +15,7 @@ , libXrender , libXi , libXfixes -, freetype +, libxkbcommon , alsa-lib , libpulseaudio , dbus @@ -24,9 +25,9 @@ , withPlatform ? "linuxbsd" , withTarget ? "editor" , withPrecision ? "single" -, withPulseaudio ? false +, withPulseaudio ? true , withDbus ? true -, withSpeechd ? false +, withSpeechd ? true , withFontconfig ? true , withUdev ? true , withTouch ? true @@ -42,7 +43,7 @@ let precision = withPrecision; # Floating-point precision level # Options from 'godot/platform/linuxbsd/detect.py' - pulseaudio = withPulseaudio; + pulseaudio = withPulseaudio; # Use PulseAudio dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support fontconfig = withFontconfig; # Use fontconfig for system fonts support @@ -52,13 +53,13 @@ let in stdenv.mkDerivation rec { pname = "godot"; - version = "4.0-beta10"; + version = "4.0-beta16"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; - rev = "d0398f62f08ce0cfba80990b21c6af4181f93fe9"; - sha256 = "sha256-h4DpK7YC7/qMc6GAD2nvNVmrlGjKT5d7OK+1NcuZCMg="; + rev = "518b9e5801a19229805fe837d7d0cf92920ad413"; + sha256 = "sha256-45x4moHOn/PWRazuJ/CBb3WYaPZqv4Sn8ZIugUSaVjY="; }; nativeBuildInputs = [ @@ -69,10 +70,11 @@ stdenv.mkDerivation rec { buildInputs = [ scons - ] - ++ runtimeDependencies; + ]; runtimeDependencies = [ + vulkan-loader + libGL libX11 libXcursor libXinerama @@ -81,8 +83,8 @@ stdenv.mkDerivation rec { libXrender libXi libXfixes + libxkbcommon alsa-lib - vulkan-loader ] ++ lib.optional withPulseaudio libpulseaudio ++ lib.optional withDbus dbus @@ -92,12 +94,6 @@ stdenv.mkDerivation rec { ++ lib.optional withFontconfig fontconfig.lib ++ lib.optional withUdev udev; - patches = [ - # Godot expects to find xfixes inside xi, but nix's pkg-config only - # gives the libs for the requested package (ignoring the propagated-build-inputs) - ./xfixes.patch - ]; - enableParallelBuilding = true; # Options from 'godot/SConstruct' and 'godot/platform/linuxbsd/detect.py' diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/4/xfixes.patch b/third_party/nixpkgs/pkgs/development/tools/godot/4/xfixes.patch deleted file mode 100644 index df5c914d7f..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/godot/4/xfixes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py -index 844b15e9fb..0c8bee1757 100644 ---- a/platform/linuxbsd/detect.py -+++ b/platform/linuxbsd/detect.py -@@ -192,6 +192,7 @@ def configure(env: "Environment"): - env.ParseConfig("pkg-config xrandr --cflags") - env.ParseConfig("pkg-config xrender --cflags") - env.ParseConfig("pkg-config xi --cflags") -+ env.ParseConfig("pkg-config xfixes --cflags") - - if env["touch"]: - env.Append(CPPDEFINES=["TOUCH_ENABLED"]) diff --git a/third_party/nixpkgs/pkgs/development/tools/gojq/default.nix b/third_party/nixpkgs/pkgs/development/tools/gojq/default.nix index 177d838ff0..e1690aea4d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gojq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gojq/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "itchyny"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xJx3ge+8cIGL1j5vnU4JhCcwmXIRhJ66PYnEG223Fbc="; + hash = "sha256-xJx3ge+8cIGL1j5vnU4JhCcwmXIRhJ66PYnEG223Fbc="; }; - vendorSha256 = "sha256-BnDtHqqU/kFJyeG1g4UZ51eSnUlbQ6eRKTFoz6kxl0s="; + vendorHash = "sha256-BnDtHqqU/kFJyeG1g4UZ51eSnUlbQ6eRKTFoz6kxl0s="; ldflags = [ "-s" "-w" ]; 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 913cde8ca4..ccd230cc5f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.50.1"; + version = "1.51.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-7HoneQtKxjQVvaTdkjPeu+vJWVOZG3AOiRD87/Ntgn8="; + hash = "sha256-mmnzbgnu/S9DhFY5JQSs8U5tvsGqIcDaX5Y7dhCgr68="; }; - vendorSha256 = "sha256-6ttRd2E8Zsf/2StNYt6JSC64A57QIv6EbwAwJfhTDaY="; + vendorHash = "sha256-QoUxZBl0wOpbD2xPCQAeTNiLxdtXZ3+KWB/TLSt53v4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/gotags/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotags/default.nix index c4c0b7cbb0..9fa71187aa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotags/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotags/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "gotags"; version = "1.4.1"; @@ -8,10 +8,20 @@ buildGoPackage rec { owner = "jstemmer"; repo = pname; rev = "4c0c4330071a994fbdfdff68f412d768fbcca313"; - sha256 = "sha256-cHTgt+zW6S6NDWBE6NxSXNPdn84CLD8WmqBe+uXN8sA="; + hash = "sha256-cHTgt+zW6S6NDWBE6NxSXNPdn84CLD8WmqBe+uXN8sA="; }; - goPackagePath = "github.com/jstemmer/gotags"; + vendorHash = null; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/jstemmer/gotags/commit/9146999bce9a88e15b5f123d1aa1613926dd9a9c.patch"; + hash = "sha256-6v/Ws15y50S6iCI1c0kEw5WHSg+1WqVT4mwdQKoi5G8="; + }) + ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "ctags-compatible tag generator for Go"; diff --git a/third_party/nixpkgs/pkgs/development/tools/gotestfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotestfmt/default.nix index 69f90c1f97..9c78196531 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotestfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotestfmt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-Rb/nIsHISzvqd+jJU4TNrHbailvgGEq4y0JuM9IdA3w="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; meta = with lib; { description = "Go test output for humans"; diff --git a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix index 09c6e4b77a..7ee87aa3f1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -1,26 +1,34 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +}: buildGoModule rec { pname = "gotestsum"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; - rev = "v${version}"; - sha256 = "sha256-BpT5FxqDOLnlWtOHMqwruR/CkD46xEgU7D8sAzsVO14="; + rev = "refs/tags/v${version}"; + hash = "sha256-22srQmvbVu8eWVAbLDZG93yod/bJS6hfoc/YwFs64pY="; }; - vendorSha256 = "sha256-zUqa6xlDV12ZV4N6+EZ7fLPsL8U+GB7boQ0qG9egvm0="; + vendorHash = "sha256-zUqa6xlDV12ZV4N6+EZ7fLPsL8U+GB7boQ0qG9egvm0="; doCheck = false; - ldflags = [ "-s" "-w" "-X gotest.tools/gotestsum/cmd.version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X gotest.tools/gotestsum/cmd.version=${version}" + ]; subPackages = [ "." ]; meta = with lib; { homepage = "https://github.com/gotestyourself/gotestsum"; + changelog = "https://github.com/gotestyourself/gotestsum/releases/tag/v${version}"; description = "A human friendly `go test` runner"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/tools/hatch/default.nix b/third_party/nixpkgs/pkgs/development/tools/hatch/default.nix index 952a8ecb16..f7604220f3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hatch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hatch/default.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { virtualenv ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ git pytestCheckHook pytest-mock @@ -63,6 +63,9 @@ python3.pkgs.buildPythonApplication rec { "test_editable_pth" # AssertionError: assert len(extract_installed_requirements(output.splitlines())) > 0 "test_creation_allow_system_packages" + ] ++ lib.optionals stdenv.isDarwin [ + # https://github.com/NixOS/nixpkgs/issues/209358 + "test_scripts_no_environment" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix index dc31aa23ac..b21b1be54d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-bGxgL/Vajy2AtYtSE5/RoURvHHyajpXpR8m7DUeqsks="; + hash = "sha256-dsso9KQMZhFgnN6CxoQbXRnjbfaKeLRA8ZEYc9NYEe0="; }; - vendorSha256 = "sha256-QZzDFVAmmjkm7n/KpMxDMAjShKiVVGZbZB1W3/TeVjs="; + vendorHash = "sha256-QZzDFVAmmjkm7n/KpMxDMAjShKiVVGZbZB1W3/TeVjs="; # The code repository includes other tools which are not useful. Only build # hclfmt. diff --git a/third_party/nixpkgs/pkgs/development/tools/hostess/default.nix b/third_party/nixpkgs/pkgs/development/tools/hostess/default.nix index 47eab1abd8..0d32f835f8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hostess/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hostess/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; meta = with lib; { description = "An idempotent command-line utility for managing your /etc/hosts* file."; diff --git a/third_party/nixpkgs/pkgs/development/tools/iaca/2.1.nix b/third_party/nixpkgs/pkgs/development/tools/iaca/2.1.nix index 6695716aa6..584b8856e8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/iaca/2.1.nix +++ b/third_party/nixpkgs/pkgs/development/tools/iaca/2.1.nix @@ -1,5 +1,4 @@ { lib, stdenv, makeWrapper, requireFile, gcc, unzip }: -with lib; # v2.1: last version with NHM/WSM arch support stdenv.mkDerivation rec { @@ -17,17 +16,17 @@ stdenv.mkDerivation rec { cp bin/iaca $out/bin/ cp lib/* $out/lib ''; - preFixup = let libPath = makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in '' + preFixup = let libPath = lib.makeLibraryPath [ stdenv.cc.cc.lib gcc ]; in '' patchelf \ --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 \ --set-rpath $out/lib:"${libPath}" \ $out/bin/iaca ''; postFixup = "wrapProgram $out/bin/iaca --set LD_LIBRARY_PATH $out/lib"; - meta = { + meta = with lib; { description = "Intel Architecture Code Analyzer"; homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kazcw ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/iaca/3.0.nix b/third_party/nixpkgs/pkgs/development/tools/iaca/3.0.nix index b5ad92cc08..1c0a4f5460 100644 --- a/third_party/nixpkgs/pkgs/development/tools/iaca/3.0.nix +++ b/third_party/nixpkgs/pkgs/development/tools/iaca/3.0.nix @@ -1,5 +1,4 @@ { lib, stdenv, requireFile, unzip }: -with lib; stdenv.mkDerivation rec { pname = "iaca"; @@ -15,10 +14,10 @@ stdenv.mkDerivation rec { cp iaca $out/bin patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $out/bin/iaca ''; - meta = { + meta = with lib; { description = "Intel Architecture Code Analyzer"; homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kazcw ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ineffassign/default.nix b/third_party/nixpkgs/pkgs/development/tools/ineffassign/default.nix index 16e392b6bb..c472d9b0b0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ineffassign/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ineffassign/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { allowGoReference = true; - checkInputs = [ go ]; + nativeCheckInputs = [ go ]; meta = with lib; { description = "Detect ineffectual assignments in Go code"; diff --git a/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix b/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix index 834a32d65b..bbc7fbde55 100644 --- a/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix @@ -1,26 +1,23 @@ -{ fetchCrate, lib, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "inferno"; - version = "0.11.7"; + version = "0.11.14"; - # github version doesn't have a Cargo.lock - src = fetchCrate { - inherit pname version; - sha256 = "sha256-HZBCLgWC9yEo3lY7If18SILKZV3rwHv7FBVdumiTbJg="; + src = fetchFromGitHub { + owner = "jonhoo"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0H+h4BM4x3vlI6EMeXNzcCQpW2S4czJR2GaviZ0nhEM="; + fetchSubmodules = true; }; - cargoSha256 = "sha256-upO+G9569NXFuc2vpxR6E4nxJqCjg+RMlxV7oKb7v1E="; + cargoHash = "sha256-5VQNgZUgakQUczKs7T+c305c3I1DDSaVMO3tFXqIdIc="; - # these tests depend on a patched version of flamegraph which is included in - # the github repository as a submodule, but absent from the crates version + # skip flaky tests checkFlags = [ - "--skip=collapse::dtrace::tests::test_collapse_multi_dtrace" - "--skip=collapse::dtrace::tests::test_collapse_multi_dtrace_simple" - "--skip=collapse::perf::tests::test_collapse_multi_perf" - "--skip=collapse::perf::tests::test_collapse_multi_perf_simple" - "--skip=collapse::perf::tests::test_multiple_skip_after" - "--skip=collapse::perf::tests::test_one_skip_after" + "--skip=flamegraph_base_symbol" + "--skip=flamegraph_multiple_base_symbol" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix index e2697e2fce..2a1197cae0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.97.0"; + version = "0.102.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-36yDwNHnDY/wA/juD2e8hf3Xm22aWcNy3SqAhN8FCo8="; + sha256 = "sha256-5T0MQ1b1kA7MVm2drNbUdK6CitTjT76ORPN/BJmsmsM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/jet/default.nix b/third_party/nixpkgs/pkgs/development/tools/jet/default.nix index 0808b81df0..bf34d472be 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jet/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "jet"; - version = "0.3.21"; + version = "0.4.23"; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-p7jTPnXpDg1bbPMEmznFWNZ4lq/zt2fZUOE6IOc9akY="; + sha256 = "sha256-ijqMyzmF1C3+5oT3ho1MSkoGuFJGvjhh7WWF/JDV/j8="; }; extraNativeImageBuildArgs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/jira-cli-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/jira-cli-go/default.nix index ccbee96fdd..31d6d281ba 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jira-cli-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jira-cli-go/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}" ]; - checkInputs = [ less more ]; # Tests expect a pager in $PATH + nativeCheckInputs = [ less more ]; # Tests expect a pager in $PATH passthru = { tests.version = testers.testVersion { diff --git a/third_party/nixpkgs/pkgs/development/tools/jira_cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/jira_cli/default.nix index 9145f4a42c..d8a639ec5b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jira_cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jira_cli/default.nix @@ -16,7 +16,7 @@ in # Tests rely on VCR cassettes being written during tests. R/O nix store prevents this. doCheck = false; - checkInputs = with python3Packages; [ vcrpy mock hiro ]; + nativeCheckInputs = with python3Packages; [ vcrpy mock hiro ]; buildInputs = [ libffi openssl ]; propagatedBuildInputs = with python3Packages; [ requests six suds-jurko termcolor keyring diff --git a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix index 071f944a82..1a1c3e7a99 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "5.1.4"; + version = "5.1.6"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D6Y3I5UPChdLlTZ49iToQpE8CrHh3VjWV6PI7fRhU/A="; + sha256 = "sha256-ybcX2dm+gnvhWAcraCq22uGqe8NdqNd8QMNKVkqgNqY="; }; - cargoSha256 = "sha256-GqfQD8NK/HYODEGUmfo+MMVsWg2CabZFLfBTp4UXV2Q="; + cargoHash = "sha256-GzRxXBDMALaXLhpklVoSn+8uCgws5AjkC+fynym0iYo="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/third_party/nixpkgs/pkgs/development/tools/just/default.nix b/third_party/nixpkgs/pkgs/development/tools/just/default.nix index 002dffd05f..fd97cc2634 100644 --- a/third_party/nixpkgs/pkgs/development/tools/just/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/just/default.nix @@ -10,22 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.11.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; - rev = version; - hash = "sha256-TYw2YrilrEUCvyT9VvzrQnHcSnhPrNiAMRjLEk/QjgU="; + rev = "refs/tags/${version}"; + hash = "sha256-5JI3QaUuWvwI3pClZXMPU8v1lcPZ5YioMPGKl/lIjQ0="; }; - cargoHash = "sha256-pgktCRxYlxo/kMdBm3/dzdU3rOXSNFY9IIE8j8Dgro0="; + cargoHash = "sha256-91C/5m2avsW7GKQDg/Ez9fzzFhe8ih1De1RbV/MBJbM="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - checkInputs = [ coreutils bash ]; - preCheck = '' # USER must not be empty export USER=just-user @@ -64,6 +62,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/casey/just/blob/${version}/CHANGELOG.md"; description = "A handy way to save and run project-specific commands"; license = licenses.cc0; - maintainers = with maintainers; [ xrelkd jk ]; + maintainers = with maintainers; [ xrelkd jk adamcstephens ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/kafkactl/default.nix b/third_party/nixpkgs/pkgs/development/tools/kafkactl/default.nix index c3af6e9c1a..d18b32c6f4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kafkactl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kafkactl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kafkactl"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "deviceinsight"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lwyM2l4eBCtkyAtG51cEy29Jw/vakjrfYVBSZ9pIBFs="; + sha256 = "sha256-ZEXW9nqkR0yuVIY9qr1RyKVE7tSlP59Xb4JZfdAK2To="; }; - vendorSha256 = "sha256-ba7amhYuCB3k1esu1qYBCgUZMjlq5iac498TMqeGuz0="; + vendorHash = "sha256-e7SJjDWcHPgupZujeRD3Zg6vFAudDC3V60R2B61fjGU="; doCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/kind/default.nix b/third_party/nixpkgs/pkgs/development/tools/kind/default.nix index 15cf9c3032..8c40281cbd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kind/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kind/default.nix @@ -1,7 +1,5 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: -with lib; - buildGoModule rec { pname = "kind"; version = "0.17.0"; @@ -36,11 +34,11 @@ buildGoModule rec { done ''; - meta = { + meta = with lib; { description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; homepage = "https://github.com/kubernetes-sigs/kind"; maintainers = with maintainers; [ offline rawkode ]; - license = lib.licenses.asl20; + license = licenses.asl20; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ko/default.nix b/third_party/nixpkgs/pkgs/development/tools/ko/default.nix index 490ea32410..ab77a3d060 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ko/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ko/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X github.com/google/ko/pkg/commands.Version=${version}" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; preCheck = '' # Feed in all the tests for testing # This is because subPackages above limits what is built to just what we diff --git a/third_party/nixpkgs/pkgs/development/tools/krankerl/default.nix b/third_party/nixpkgs/pkgs/development/tools/krankerl/default.nix index 0d8a5e8acf..6951b358b6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/krankerl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/krankerl/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { sqlite ]; - checkInputs = [ + nativeCheckInputs = [ file ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix b/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix index e80e4c8b4d..dbc794e020 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ktlint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ktlint"; - version = "0.48.0"; + version = "0.48.2"; src = fetchurl { url = "https://github.com/pinterest/ktlint/releases/download/${version}/ktlint"; - sha256 = "0sdmfdmxgks9bbzg8nn1gdx55g7qiwpdxkx6p9lwa71mdfc14r2z"; + sha256 = "0hh3zm21a976px3lhf2przczspiyk88k68fmnwsknn281y9pyr70"; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://ktlint.github.io/"; license = licenses.mit; platforms = jre_headless.meta.platforms; + changelog = "https://github.com/pinterest/ktlint/blob/master/CHANGELOG.md"; maintainers = with maintainers; [ tadfisher SubhrajyotiSen ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/kube-linter/default.nix b/third_party/nixpkgs/pkgs/development/tools/kube-linter/default.nix index 690095d44f..6261cdc1b5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kube-linter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kube-linter/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-linter"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "stackrox"; repo = pname; rev = version; - sha256 = "sha256-FEiUnJFmrHj97aSjfJtsjS9Qy4A6mzXicIrJZdgZbag="; + sha256 = "sha256-/iwNyThgdXAXu1ulf68+X7nA9wE9jEqN7F5wuT5GMwk="; }; - vendorSha256 = "sha256-5dsM5jfD/apRs5NT/XqM8eHEgiyGQHHG3MG6cOFQKr8="; + vendorHash = "sha256-jWXR7tHYT15h7QSxinYyPaBs5utUmdeWWm+GPpfwiA4="; ldflags = [ "-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}" diff --git a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix index b2e69d7fc3..4d363d4e75 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.19.1"; + version = "0.19.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-tZ4qa48I/J62bqc9eoSSpTrJjU+LpweF/kI1TMiFrEY="; + sha256 = "sha256-foY1fcIn+jywABwEVBWctx4zwLg7k2zxkpL8UAhx6kA="; }; - cargoSha256 = "sha256-WpX1wkMPtUwT6KOi0Bij1tzGlDhti828wBSfzpXuZaY="; + cargoHash = "sha256-WHaORWwR7PeKacaCtXjTYMTCyZ4ZFWo1smVx5ig+Z9U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix index 6efeaad638..28c8044465 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "3.1.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sufP/+YixgrOCJJ4P1SjmZpRlSaufRmnVDiv6H+RCyQ="; + sha256 = "sha256-8CZcPZLainc7iRZ5Ul27QxW3oK7sikCjzCBEkfCeNUc="; }; - vendorHash = "sha256-WZb8VsFKpvvMys1iK3irEsWCnvKaKDzuyFertVswpdE="; + vendorHash = "sha256-GBjMN6pyB+48e5LNqLBbh6a5fC9P0T53CZUPGNcbBDc="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/jdt-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/jdt-language-server/default.nix index 1af6970015..1b194814a2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/jdt-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/jdt-language-server/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "jdt-language-server"; - version = "1.17.0"; - timestamp = "202210271413"; + version = "1.19.0"; + timestamp = "202301171536"; src = fetchurl { url = "https://download.eclipse.org/jdtls/milestones/${version}/jdt-language-server-${version}-${timestamp}.tar.gz"; - sha256 = "sha256-3NVzL3o/8LXR94/3Yma42XHfwNEFEVrmUijkeMs/vL0="; + sha256 = "sha256-9rreuMw2pODzOVX5PBmUZoV5ixUDilQyTsrnyCQ+IHs="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix index 66983ea8a4..036c5057d8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.7.0"; + version = "0.7.6"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-qjwnHFJpgDVaiSF3rKkyEbhIG4QbMOUrN1rnc9MnKU0="; + hash = "sha256-7Mv1+c8X+rZQyw3y+eGvSyqVqiSPdTj1WxoUv1mynSs="; }; - cargoHash = "sha256-efVnO9hNIEiAzOK0mkPMNrWlWHYEWwV2HWac8jBxW5k="; + cargoHash = "sha256-0fJIp2zlZkeidTFg6jQs6S2mVHJL8flqiZtTvM0F9OQ="; postPatch = '' rm .cargo/config.toml diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/rnix-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/rnix-lsp/default.nix index 3da8d44d43..c7ab04d7cd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/rnix-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/rnix-lsp/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-RKHBp+/bEH9FEPLcf1MKmTugk1A8rQU447mNm9Le3DE="; - checkInputs = lib.optional (!stdenv.isDarwin) nix; + nativeCheckInputs = lib.optional (!stdenv.isDarwin) nix; meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix index 9a372b1c6d..24b360a781 100644 --- a/third_party/nixpkgs/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "3.6.5"; + version = "3.6.7"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-4/RRE9IB/qy8YszPzEvrBVLi1X0XCNh+lJYwMXTTD1I="; + sha256 = "sha256-x7/yO1rJ+VBG4EFpISYblRECLW2lsLz5wcqLR14UV/g="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix b/third_party/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix index 6c09b5392e..6066286fc9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/libsigrokdecode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib python3 libxcrypt ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix b/third_party/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix index caacc04903..7ad966c6b6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/literate-programming/eweb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://eweb.sourceforge.net/"; + homepage = "https://eweb.sourceforge.net/"; description = "An Asciidoc-based literate programming tool, written in Python"; platforms = platforms.linux; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/tools/ls-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/ls-lint/default.nix new file mode 100644 index 0000000000..e42f7f5012 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ls-lint/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ls-lint"; + version = "1.11.2"; + + src = fetchFromGitHub { + owner = "loeffel-io"; + repo = "ls-lint"; + rev = "v${version}"; + sha256 = "sha256-mt1SvRHtAA0lChZ//8XIQGDPg1l1EOMkPIAe8YKhMSs="; + }; + + vendorSha256 = "sha256-OEwN9kj1npI+H7DY+e3tl5TIY/qr4y2CgAV5fwNA9l4="; + + meta = with lib; { + description = "An extremely fast file and directory name linter"; + homepage = "https://ls-lint.org/"; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix b/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix index b2d719267a..207ef4d9fe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/luaformatter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, libyamlcpp }: +{ lib, stdenv, fetchFromGitHub, substituteAll, antlr4_9, libargs, catch2, cmake, yaml-cpp }: let antlr4 = antlr4_9; @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { (substituteAll { src = ./fix-lib-paths.patch; antlr4RuntimeCpp = antlr4.runtime.cpp.dev; - inherit libargs catch2 libyamlcpp; + inherit libargs catch2 yaml-cpp; }) ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ antlr4.runtime.cpp libyamlcpp ]; + buildInputs = [ antlr4.runtime.cpp yaml-cpp ]; meta = with lib; { description = "Code formatter for Lua"; diff --git a/third_party/nixpkgs/pkgs/development/tools/luaformatter/fix-lib-paths.patch b/third_party/nixpkgs/pkgs/development/tools/luaformatter/fix-lib-paths.patch index fce2347d8e..610a313ca2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/luaformatter/fix-lib-paths.patch +++ b/third_party/nixpkgs/pkgs/development/tools/luaformatter/fix-lib-paths.patch @@ -12,7 +12,7 @@ index 4a21b94..0ac7911 100644 - ${PROJECT_SOURCE_DIR}/third_party/antlr4/runtime/Cpp/runtime/src + @libargs@/include + @catch2@/include -+ @libyamlcpp@/include ++ @yaml-cpp@/include + @antlr4RuntimeCpp@/include/antlr4-runtime ${PROJECT_SOURCE_DIR}/src/ ) diff --git a/third_party/nixpkgs/pkgs/development/tools/maligned/default.nix b/third_party/nixpkgs/pkgs/development/tools/maligned/default.nix index f39b83489f..8df4d79b59 100644 --- a/third_party/nixpkgs/pkgs/development/tools/maligned/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/maligned/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { allowGoReference = true; - checkInputs = [ go ]; + nativeCheckInputs = [ go ]; meta = with lib; { description = "Tool to detect Go structs that would take less memory if their fields were sorted"; diff --git a/third_party/nixpkgs/pkgs/development/tools/manifest-tool/default.nix b/third_party/nixpkgs/pkgs/development/tools/manifest-tool/default.nix new file mode 100644 index 0000000000..6282619535 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/manifest-tool/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +, stdenv +, testers +, manifest-tool +}: + +buildGoModule rec { + pname = "manifest-tool"; + version = "2.0.6"; + gitCommit = "2ed9312726765567a84f2acc44a0c8a6e50f4b7a"; + modRoot = "v2"; + + src = fetchFromGitHub { + owner = "estesp"; + repo = "manifest-tool"; + rev = "v${version}"; + sha256 = "sha256-oopk++IdNF6msxOszT0fKxQABgWKbaQZ2aNH9chqWU0="; + leaveDotGit = true; + postFetch = '' + git -C $out rev-parse HEAD > $out/.git-revision + rm -rf $out/.git + ''; + }; + + vendorHash = null; + + nativeBuildInputs = [ git ]; + + preConfigure = '' + ldflags="-X main.gitCommit=$(cat .git-revision)" + ''; + + CGO_ENABLED = if stdenv.hostPlatform.isStatic then "0" else "1"; + GO_EXTLINK_ENABLED = if stdenv.hostPlatform.isStatic then "0" else "1"; + ldflags = lib.optionals stdenv.hostPlatform.isStatic [ "-w" "-extldflags" "-static" ]; + tags = lib.optionals stdenv.hostPlatform.isStatic [ "netgo" ]; + + passthru.tests.version = testers.testVersion { + package = manifest-tool; + }; + + meta = with lib; { + description = "Command line tool to create and query container image manifest list/indexes"; + homepage = "https://github.com/estesp/manifest-tool"; + license = licenses.asl20; + maintainers = with maintainers; [ tricktron ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/marksman/default.nix b/third_party/nixpkgs/pkgs/development/tools/marksman/default.nix index aa3b292751..d31268f9ce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/marksman/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/marksman/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "marksman"; - version = "2022-12-28"; + version = "2023-01-29"; src = fetchFromGitHub { owner = "artempyanykh"; repo = "marksman"; rev = version; - sha256 = "sha256-IOmAOO45sD0TkphbHWLCXXyouxKNJoiNYHXV/bw0xH4="; + sha256 = "sha256-UPPO4ueu7gMR7a573M2/xT3N0QgRSNBshJAqoyXEZpc="; }; projectFile = "Marksman/Marksman.fsproj"; diff --git a/third_party/nixpkgs/pkgs/development/tools/mbed-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/mbed-cli/default.nix index 12e7d19154..cf6e65c46c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mbed-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mbed-cli/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "1228plh55id03qywsw0ai88ypdpbh9iz18jfcyhn21pci7mj77fv"; }; - checkInputs = [ + nativeCheckInputs = [ git mercurial pytest diff --git a/third_party/nixpkgs/pkgs/development/tools/memray/default.nix b/third_party/nixpkgs/pkgs/development/tools/memray/default.nix index 0d4a9c6ccf..e5510aa5f8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/memray/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/memray/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { rich ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ ipython pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ diff --git a/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix index 9c254bb2c7..f6d5103745 100644 --- a/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/metal-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "metal-cli"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "equinix"; repo = pname; rev = "v${version}"; - hash = "sha256-oPMojw6CGncBJ8PZOTrzvQu2gRs1cw1Jwi38eOZggI8="; + hash = "sha256-v+8zfNV93nrRSwfn1u7SNYv7WYY74R8nPJFmreDb7i4="; }; vendorHash = "sha256-drsNZXLNUWICLI8D+IvJE4X8GmWrP9U3dmpf9HnKCWw="; diff --git a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix index 0e809bb32f..a7c8c1f8db 100644 --- a/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "3.7.4"; + version = "3.8.3"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-VUavNwj5MCMZFV9WASF3olOdZb4JNBYbcQdgUfvPS8k="; + sha256 = "sha256-IrgypySq5RUi9X3pVC0t+Ezw7aNu8mIKZYY4CEaKhU4="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix index 47e2fbc14a..1c6fa49d7c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.40"; + version = "0.2.41"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZnGy/N2+/dfmtquyTqpAcuQgqKMuQnDYYR/GOHFOpc0="; + hash = "sha256-nfMLw3fjEex1XV+Vhi84xR+ghBLrmKDtuFIIeNhP/yQ="; }; - vendorHash = "sha256-5uF0ZdyJtUoEHQLPEe9ZKIBukdfvZ7kF5LetJB/yel8="; + vendorHash = "sha256-qXjDeR0VZyyhASpt6zv6OyltEZDoguILhhD1ejpd0F4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/astyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/astyle/default.nix index 4ce8c1edff..66e972826c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/astyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/astyle/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java"; - homepage = "http://astyle.sourceforge.net/"; + homepage = "https://astyle.sourceforge.net/"; license = licenses.lgpl3; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix index 4f9a92d362..161dca6f18 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -22,9 +22,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl autoconf ]; buildInputs = [ autoconf ]; - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; doCheck = false; # takes _a lot_ of time, fails 11 of 782 tests # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix b/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix index 470827c2b4..f0df759ee2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -16,9 +16,6 @@ stdenv.mkDerivation rec { patches = [ ./help2man-SOURCE_DATE_EPOCH-support.patch ]; - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths doInstallCheck = false; # runs the same thing, fails the same tests 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 65d6185f50..0d9572c6f3 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 @@ -15,9 +15,6 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - # Disable indented log output from Make, otherwise "make.test" will - # fail. - preCheck = "unset NIX_INDENT_MAKE"; doCheck = false; # takes _a lot_ of time, fails 3 out of 2698 tests, all seem to be related to paths doInstallCheck = false; # runs the same thing, fails the same tests diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix index c7d261e6f5..2babde7afa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/bashdb/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Bash script debugger"; - homepage = "http://bashdb.sourceforge.net/"; + homepage = "https://bashdb.sourceforge.net/"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index 3d53c5122f..39e852a60b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -15,7 +15,6 @@ in , noSysDirs , perl , substitute -, texinfo , zlib , enableGold ? withGold stdenv.targetPlatform @@ -52,7 +51,7 @@ let targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-"; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = targetPrefix + "binutils"; inherit version; @@ -110,10 +109,12 @@ stdenv.mkDerivation { strictDeps = true; depsBuildBuild = [ buildPackages.stdenv.cc ]; + # texinfo was removed here in https://github.com/NixOS/nixpkgs/pull/210132 + # to reduce rebuilds during stdenv bootstrap. Please don't add it back without + # checking the impact there first. nativeBuildInputs = [ bison perl - texinfo ] ++ lib.optionals targetPlatform.isiOS [ autoreconfHook ] ++ lib.optionals buildPlatform.isDarwin [ autoconf269 automake gettext libtool ] @@ -144,6 +145,20 @@ stdenv.mkDerivation { for i in binutils/Makefile.in gas/Makefile.in ld/Makefile.in gold/Makefile.in; do sed -i "$i" -e 's|ln |ln -s |' done + + # autoreconfHook is not included for all targets. + # Call it here explicitly as well. + ${finalAttrs.postAutoreconf} + ''; + + postAutoreconf = '' + # As we regenerated configure build system tries hard to use + # texinfo to regenerate manuals. Let's avoid the dependency + # on texinfo in bootstrap path and keep manuals unmodified. + touch gas/doc/.dirstamp + touch gas/doc/asconfig.texi + touch gas/doc/as.1 + touch gas/doc/as.info ''; # As binutils takes part in the stdenv building, we don't want references @@ -226,4 +241,4 @@ stdenv.mkDerivation { # collision due to the ld/as wrappers/symlinks in the latter. priority = 10; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index 2b24582d70..cad25a942d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -47,7 +47,7 @@ let ccache = stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ # test/run requires the compgen function which is available in # bashInteractive, but not bash. bashInteractive diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 29be3fe3ed..6fcdb5b753 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.22924"; + version = "0.1.23272"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zfkvSfwjh3HUE0aKvBLQuNnT+GBWCOWM+mwrAdZUJ9U="; + sha256 = "sha256-Yj7bIVVCG2q6Q2ij+rH3AAC4xW7Drz+pmdIM2ToPJX4="; }; - vendorSha256 = "sha256-qnn55C9ZK80gd/ZOtPvAGNJs0d96KqwruU4bZD6TQzY="; + vendorHash = "sha256-qnn55C9ZK80gd/ZOtPvAGNJs0d96KqwruU4bZD6TQzY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix index f55857a4ef..8c4c58c052 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cli11/default.nix @@ -10,18 +10,18 @@ stdenv.mkDerivation rec { pname = "cli11"; - version = "2.3.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "CLIUtils"; repo = "CLI11"; rev = "v${version}"; - sha256 = "sha256-J/hOgCDQPI0n2BGJK0+HIwlfNDVaZcxCC45uFAR7JUc="; + sha256 = "sha256-x3/kBlf5LdzkTO4NYOKanZBfcU4oK+fJw9L7cf88LsY="; }; nativeBuildInputs = [ cmake ]; - checkInputs = [ boost python3 catch2 ]; + nativeCheckInputs = [ boost python3 catch2 ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index c77cf7833d..ddc8f596c7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.12.09-15.51.10"; + version = "2023.01.26-11.08.16"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-hWDTxYtL0c9zkJDle9/XNPMwDDCltfAnz/Os83xL3iM="; + sha256 = "sha256-1dbeS9yF+qjmwDyfELQhlEyAI5B8092Lg0SwqvqXPgc="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "df8e000a69fc2aaa85312952f27a9b79625928d825acfe1da69cb67d220ada33"; + sha256 = "7fe2f384233d5101483803f72d995b75cf3587eae10dc954989018c2accf711b"; }; extraNativeImageBuildArgs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix index 892884e933..e245128aa2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix @@ -1,39 +1,35 @@ { lib , buildPythonApplication , fetchFromGitHub -, poetry-core -, pythonRelaxDepsHook , cmake-format , pygls , cmake +, pdm-pep517 , pytest-datadir , pytestCheckHook }: buildPythonApplication rec { pname = "cmake-language-server"; - version = "0.1.6"; + version = "unstable-2023-01-08"; format = "pyproject"; src = fetchFromGitHub { owner = "regen100"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "sha256-B7dhCQo3g2E8+fzyl1RhaYQE6TFoqoLtp9Z7sZcv5xk="; + rev = "60c376a5fda29835060687569cb212350a292116"; + hash = "sha256-vNG43sZy2wMetY5mbgxIoei5jCCj1f8vWiovWtwzbPc="; }; + PDM_PEP517_SCM_VERSION = "2023.1"; + patches = [ # Test timeouts occasionally cause the build to fail ./disable-test-timeouts.patch ]; - pythonRelaxDeps = [ - "pygls" - ]; - nativeBuildInputs = [ - poetry-core - pythonRelaxDepsHook + pdm-pep517 ]; propagatedBuildInputs = [ @@ -41,7 +37,7 @@ buildPythonApplication rec { pygls ]; - checkInputs = [ + nativeCheckInputs = [ cmake cmake-format pytest-datadir @@ -49,7 +45,10 @@ buildPythonApplication rec { ]; dontUseCmakeConfigure = true; - pythonImportsCheck = [ "cmake_language_server" ]; + + pythonImportsCheck = [ + "cmake_language_server" + ]; meta = with lib; { description = "CMake LSP Implementation"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix index 0229aba0f3..f204b28ee1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -19,12 +19,12 @@ let stdenvNoCC.mkDerivation rec { pname = "coreboot-toolchain-${arch}"; - version = "4.16"; + version = "4.19"; src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = version; - sha256 = "sha256-PCum+IvJ136eZQLovUi9u4xTLLs17MkMP5Oc0/2mMY4="; + sha256 = "sha256-pGS+bfX2k/ot7sHL9aiaQpA0wtbHHZEObJ/h2JGF5/4="; fetchSubmodules = false; leaveDotGit = true; postFetch = '' @@ -70,7 +70,7 @@ let ); in -lib.listToAttrs (map (arch: lib.nameValuePair arch (common arch {})) [ +lib.listToAttrs (map (arch: lib.nameValuePair arch (common arch { })) [ "i386" "x64" "arm" diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix index 64ee3da1ad..f8b6bd0ea6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -7,10 +7,10 @@ }; } { - name = "mpfr-4.1.0.tar.xz"; + name = "mpfr-4.1.1.tar.xz"; archive = fetchurl { - sha256 = "0zwaanakrqjf84lfr5hfsdr7hncwv9wj0mchlr7cmxigfgqs760c"; - url = "mirror://gnu/mpfr/mpfr-4.1.0.tar.xz"; + sha256 = "0gf3ibi7kzz39zj72qc9r607clyhm80gs8wbp71zzfkxasyrblgz"; + url = "mirror://gnu/mpfr/mpfr-4.1.1.tar.xz"; }; } { @@ -35,10 +35,10 @@ }; } { - name = "acpica-unix2-20211217.tar.gz"; + name = "R10_20_22.tar.gz"; archive = fetchurl { - sha256 = "0521hmaw2zhi0mpgnaf2i83dykfgql4bx98cg7xqy8wmj649z194"; - url = "https://acpica.org/sites/acpica/files/acpica-unix2-20211217.tar.gz"; + sha256 = "11iv3jrz27g7bv7ffyxsrgm4cq60cld2gkkl008p3lcwfyqpx88s"; + url = "https://github.com/acpica/acpica/archive/refs/tags//R10_20_22.tar.gz"; }; } { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh index 3acf22e2cd..fc758e4ab0 100755 --- a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh +++ b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/update.sh @@ -1,24 +1,26 @@ #!/usr/bin/env nix-shell #!nix-shell --pure -i bash -p nix cacert git getopt +# shellcheck shell=bash + if [ ! -d .git ]; then - echo "This script needs to be run from the root directory of nixpkgs. Exiting." - exit 1 + echo "This script needs to be run from the root directory of nixpkgs. Exiting." + exit 1 fi pkg_dir="$(dirname "$0")" src="$(nix-build . --no-out-link -A coreboot-toolchain.i386.src)" -urls=$($src/util/crossgcc/buildgcc -u) +urls=$("${src}/util/crossgcc/buildgcc" -u) tmp=$(mktemp) -echo '{ fetchurl }: [' > $tmp +echo '{ fetchurl }: [' >"$tmp" for url in $urls; do - name="$(basename $url)" - hash="$(nix-prefetch-url "$url")" + name="$(basename "$url")" + hash="$(nix-prefetch-url "$url")" - cat << EOF >> $tmp + cat <>"$tmp" { name = "$name"; archive = fetchurl { @@ -29,8 +31,8 @@ for url in $urls; do EOF done -echo ']' >> $tmp +echo ']' >>"$tmp" -sed -ie 's/https\:\/\/ftpmirror\.gnu\.org/mirror\:\/\/gnu/g' $tmp +sed -ie 's/https\:\/\/ftpmirror\.gnu\.org/mirror\:\/\/gnu/g' "$tmp" -mv $tmp $pkg_dir/sources.nix +mv "$tmp" "${pkg_dir}/sources.nix" diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cscope/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cscope/default.nix index c79a2d2520..432f689d64 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cscope/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cscope/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { license = "BSD-style"; - homepage = "http://cscope.sourceforge.net/"; + homepage = "https://cscope.sourceforge.net/"; maintainers = with lib.maintainers; [viric]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ctags/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ctags/default.nix index dc6ee48152..b33d6cafbe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ctags/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ctags/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { alternatively, the index entry created for that object). Many programming languages are supported. ''; - homepage = "http://ctags.sourceforge.net/"; + homepage = "https://ctags.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix index 3dc84ad599..59f00a9b02 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cvise/default.nix @@ -65,7 +65,7 @@ buildPythonApplication rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook unifdef ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/debugedit/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/debugedit/default.nix index afac7168c5..8da0effe7b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/debugedit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/debugedit/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config help2man ]; buildInputs = [ elfutils ]; - checkInputs = [ util-linux ]; # Tests use `rev` + nativeCheckInputs = [ util-linux ]; # Tests use `rev` src = fetchgit { url = "git://sourceware.org/git/debugedit.git"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix index 8dddea94f0..b34c460fa1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/devspace/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.2.4"; + version = "6.2.5"; src = fetchFromGitHub { owner = "loft-sh"; repo = "devspace"; rev = "v${version}"; - sha256 = "sha256-Y2MFxceOS3H4Ya0EupgQqtOnkhEk6DXbg6rix3J9OtM="; + sha256 = "sha256-IdJlYCoI8wTl1kIY5M5Lfn+Y9WjSZkLuWI5pFsfAO0I="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix index 2b9d543fb7..0ce3bb52cd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/dfu-util/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 ]; src = fetchurl { - url = "http://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; + url = "https://dfu-util.sourceforge.net/releases/${pname}-${version}.tar.gz"; sha256 = "sha256-tLU7ohqC7349TEffKVKt9fpJT0mbawtXxYxdBK6P8Z4="; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix index 87271cf50f..2b71fa7116 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix @@ -37,10 +37,27 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/elfutils/musl-strndupa.patch?id=2e3d4976eeffb4704cf83e2cc3306293b7c7b2e9"; sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0="; }) + (fetchpatch { + name = "use-curlopt_protocols_str-for-new-libcurl.patch"; + url = "https://sourceware.org/git/?p=elfutils.git;a=patch;h=6560fb26a62ef135a804357ef4f15a47de3e49b3;hp=a5b07cdf9c491fb7a4a16598c482c68b718f59b9"; + excludes = [ "debuginfod/ChangeLog" ]; # Doesn't apply + sha256 = "sha256-yjeliqojRGvfwbXynmxFGyKqAY7AEr0mbSGQEliYhZ4="; + }) + (fetchpatch { + name = "fix-usage-of-deprecated-curlinfo.patch"; + url = "https://sourceware.org/git/?p=elfutils.git;a=patch;h=d2bf497b12fbd49b4996ccf0744303ffd67735b1;hp=6ecd16410ce1fe5cb0ac5b7c3342c5cc330e3a04"; + excludes = [ "debuginfod/ChangeLog" ]; # Doesn't apply + sha256 = "sha256-zMx/TazM7vXJre2XagIWvwRS8cd8pbzMTmAbpbqZmx0="; + }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]; postPatch = '' patchShebangs tests/*.sh + '' + lib.optionalString stdenv.hostPlatform.isRiscV '' + # disable failing test: + # + # > dwfl_thread_getframes: No DWARF information found + sed -i s/run-backtrace-dwarf.sh//g tests/Makefile.in ''; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gef/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gef/default.nix index cfc6f1b5de..b814cd2b23 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/gef/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/gef/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ]} ''; - checkInputs = [ + nativeCheckInputs = [ gdb file ps diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix index 11e7547afc..155324aa49 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-a9yCnGg+4f+UoHbGG8a47z2duBD3qXcAzPKnE4PQsvM="; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; meta = with lib; { description = "Reliable project licenses detector"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix index ff5fe7bcba..c977ca3070 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Application designed to test GTK performance"; - homepage = "http://gtkperf.sourceforge.net/"; + homepage = "https://gtkperf.sourceforge.net/"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix index 1277050d1c..4c141f5a87 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/unstable.nix @@ -186,7 +186,7 @@ stdenv.mkDerivation rec { nukeReferences ]; - checkInputs = [ + nativeCheckInputs = [ cacert foreman glibcLocales diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/igprof/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/igprof/default.nix index 91d78d0f5f..a4e170f31b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/igprof/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/igprof/default.nix @@ -1,14 +1,14 @@ {lib, stdenv, fetchFromGitHub, libunwind, cmake, pcre, gdb}: stdenv.mkDerivation rec { - version = "5.9.16"; + version = "5.9.18"; pname = "igprof"; src = fetchFromGitHub { owner = "igprof"; repo = "igprof"; rev = "v${version}"; - sha256 = "0rx3mv8zdh9bmcpfbzkib3d52skzfr8600gh5gv21wcsh50jnifx"; + sha256 = "sha256-UTrAaH8C79km78Z/7NxvQ6dnl4u4Ki80nORf4bsoSNw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/itstool/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/itstool/default.nix index 2c189cbf5a..d4950caaa9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/itstool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/itstool/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://itstool.org/"; + homepage = "https://itstool.org/"; description = "XML to PO and back again"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix index 2d566b0eac..9889ca67c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - checkInputs = [ jq ]; + nativeCheckInputs = [ jq ]; postInstall = '' wrapProgram $out/bin/jiq \ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix b/third_party/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix index 3798da7af7..fa58d1fbbf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/kibana/7.x.nix @@ -9,11 +9,10 @@ , which }: -with lib; let nodejs = nodejs-16_x; inherit (builtins) elemAt; - info = splitString "-" stdenv.hostPlatform.system; + info = lib.splitString "-" stdenv.hostPlatform.system; arch = elemAt info 0; plat = elemAt info 1; shas = @@ -50,7 +49,7 @@ in stdenv.mkDerivation rec { sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana ''; - meta = { + meta = with lib; { description = "Visualize logs and time-stamped data"; homepage = "http://www.elasticsearch.org/overview/kibana"; license = licenses.elastic; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix b/third_party/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix index 8625a421af..a2c58010ef 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoconf, automake, m4, perl, help2man +{ lib, stdenv, fetchurl, fetchpatch, m4 , runtimeShell , file }: @@ -23,28 +23,22 @@ stdenv.mkDerivation rec { # https://lists.gnu.org/archive/html/autotools-announce/2022-03/msg00000.html FILECMD = "${file}/bin/file"; - # Normally we'd use autoreconfHook, but that includes libtoolize. - postPatch = '' - aclocal -I m4 - automake - autoconf - - pushd libltdl - aclocal -I ../m4 - automake - autoconf - popd - '' + + postPatch = # libtool commit da2e352735722917bf0786284411262195a6a3f6 changed # the shebang from `/bin/sh` (which is a special sandbox exception) # to `/usr/bin/env sh`, meaning that we now need to patch shebangs # in libtoolize.in: '' substituteInPlace libtoolize.in --replace '#! /usr/bin/env sh' '#!${runtimeShell}' + # avoid help2man run after 'libtoolize.in' update + touch doc/libtoolize.1 ''; strictDeps = true; - nativeBuildInputs = [ autoconf automake help2man m4 perl ]; + # As libtool is an early bootstrap dependency try hard not to + # add autoconf and automake or help2man dependencies here. That way we can + # avoid pulling in perl and get away with just an `m4` depend. + nativeBuildInputs = [ m4 file ]; propagatedBuildInputs = [ m4 file ]; # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/libtree/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/libtree/default.nix index 219ce239f4..624d33561e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/libtree/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/libtree/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # note: "make check" returns exit code 0 even when the tests fail. # This has been reported upstream: # https://github.com/haampie/libtree/issues/77 - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; checkTarget = [ "check" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix index aeda527114..aee79b8264 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libwhich"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "vtjnash"; repo = pname; rev = "v${version}"; - sha256 = "0s0pqai61jszmi495k621rdlf288ij67adkz72hwqqarqp54idhb"; + sha256 = "sha256-JNIWdI12sL3TZqVA3GeH0KbgqFDbMsEdecea3392Goc="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/linuxkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/linuxkit/default.nix index 13944ad022..be07f7e9c2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/linuxkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/linuxkit/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { "-X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.Version=${version}" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; passthru.tests.version = testers.testVersion { package = linuxkit; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/loccount/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/loccount/default.nix index 5fd519eb06..899ee219c4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/loccount/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/loccount/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { hash = "sha256-9tzDNwWM4uzxC+xqM603l8EIqYrGUUvZgSe6r1EyHi8="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; excludedPackages = "tests"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix index ac80fc471e..017367e90b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix @@ -6,13 +6,13 @@ in stdenv.mkDerivation rec { pname = "lsof"; - version = "4.96.4"; + version = "4.96.5"; src = fetchFromGitHub { owner = "lsof-org"; repo = "lsof"; rev = version; - sha256 = "sha256-S+8KizjayqeiWsMySWjRoZQf7ODCjdMq5ULoetOdYiA="; + hash = "sha256-3ZEGCKc7inbqcE4LuhfKON3C8LebVOlZPEhOHVgx8Lo="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix index 79b6cf2a8b..9114e7cf4c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # Some patches impact ./configure. buildInputs = [ elfutils ]; - checkInputs = [ dejagnu ]; + nativeCheckInputs = [ dejagnu ]; # Import Fedora's (very) large patch series: bug fixes, architecture support, # etc. RH/Fedora are currently working with upstream to merge all these diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun/default.nix new file mode 100644 index 0000000000..062cb39d62 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php80 }: + +let + pname = "n98-magerun"; + version = "2.3.0"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "netz98"; + repo = "n98-magerun1-dist"; + rev = version; + sha256 = "sha256-T7wQmEEYMG0J6+9nRt+tiMuihjnjjQ7UWy1C0vKoQY4="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src/n98-magerun $out/libexec/n98-magerun/n98-magerun-${version}.phar + makeWrapper ${php80}/bin/php $out/bin/n98-magerun \ + --add-flags "$out/libexec/n98-magerun/n98-magerun-${version}.phar" \ + --prefix PATH : ${lib.makeBinPath [ unzip ]} + runHook postInstall + ''; + + meta = with lib; { + description = "The swiss army knife for Magento1/OpenMage developers"; + license = licenses.mit; + homepage = "https://magerun.net/"; + changelog = "https://magerun.net/category/magerun/"; + maintainers = teams.php.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix new file mode 100644 index 0000000000..d9c138281e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/n98-magerun2/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, makeWrapper, unzip, lib, php }: + +let + pname = "n98-magerun2"; + version = "6.1.1"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "netz98"; + repo = "n98-magerun2-dist"; + rev = version; + sha256 = "sha256-D2U1kLG6sOpBHDzNQ/LbiFUknvFhK+rkOPgWvW0pNmY="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + install -D $src/n98-magerun2 $out/libexec/n98-magerun2/n98-magerun2-${version}.phar + makeWrapper ${php}/bin/php $out/bin/n98-magerun2 \ + --add-flags "$out/libexec/n98-magerun2/n98-magerun2-${version}.phar" \ + --prefix PATH : ${lib.makeBinPath [ unzip ]} + runHook postInstall + ''; + + meta = with lib; { + description = "The swiss army knife for Magento2 developers"; + license = licenses.mit; + homepage = "https://magerun.net/"; + changelog = "https://magerun.net/category/magerun/"; + maintainers = teams.php.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix index af4ed6977b..9c6505b3ab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix @@ -2,17 +2,17 @@ nimPackages.buildNimPackage rec { pname = "nimlsp"; - version = "0.4.1"; + version = "0.4.4"; nimBinOnly = true; src = fetchFromGitHub { owner = "PMunch"; repo = "nimlsp"; rev = "v${version}"; - sha256 = "sha256-LAtUGhYEcOwvZzexQ2y3/HPgOge2EsScCbujJ/hz5Ec="; + sha256 = "sha256-Z67iKlL+dnRbxdFt/n/fsUcb2wpZwzPpL/G29jfCaMY="; }; - buildInputs = with nimPackages; [ jsonschema ]; + buildInputs = with nimPackages; [ jsonschema asynctools ]; nimFlags = [ "--threads:on" diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix index 5c88bd1305..3719772797 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ behave nose ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index 2106a64977..6dd504a3cf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "nxpmicro-mfgtools"; - version = "1.4.243"; + version = "1.5.11"; src = fetchFromGitHub { owner = "NXPmicro"; repo = "mfgtools"; rev = "uuu_${version}"; - hash = "sha256-gyy9D6y1y+9GlT3wfW+huoWaZP1e8YzZnc7EbJftppI="; + hash = "sha256-RD0haw0C89uvTlLHtvlv1VwU4Jw2U19Caiq+BSfB4hU="; }; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/om4/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/om4/default.nix index 30f1bb273f..4425ae52fb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/om4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/om4/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 bsd3 isc publicDomain ]; mainProgram = "m4"; platforms = platforms.unix; - maintainers = [ maintainers.ninjin ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix index ab4db7a8cc..ec9fb436f7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/pahole/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/"; - description = "Pahole and other DWARF utils"; + description = "Shows, manipulates, and pretty-prints debugging information in DWARF, CTF, and BTF formats"; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/setup-hook.sh b/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/setup-hook.sh index 576b9ca210..8f010a3f4d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/tools/misc/patchelf/setup-hook.sh @@ -8,7 +8,7 @@ patchELF() { local dir="$1" [ -e "$dir" ] || return 0 - header "shrinking RPATHs of ELF executables and libraries in $dir" + echo "shrinking RPATHs of ELF executables and libraries in $dir" local i while IFS= read -r -d $'\0' i; do @@ -17,6 +17,4 @@ patchELF() { echo "shrinking $i" patchelf --shrink-rpath "$i" || true done < <(find "$dir" -type f -print0) - - stopNest } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/patsh/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/patsh/default.nix index 63ec7ec1e5..ba3b232a41 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/patsh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/patsh/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-R6ScpLYbEJAu7+CyJsMdljtXq7wsMojHK5O1lH+E/E8="; - checkInputs = [ custom ]; + nativeCheckInputs = [ custom ]; # see comment on `custom` postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix index f2721ab952..d4feca6dfe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/pkg-config/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, libiconv, vanilla ? false }: -with lib; - stdenv.mkDerivation rec { pname = "pkg-config"; version = "0.29.2"; @@ -17,20 +15,20 @@ stdenv.mkDerivation rec { # Process Requires.private properly, see # http://bugs.freedesktop.org/show_bug.cgi?id=4738, migrated to # https://gitlab.freedesktop.org/pkg-config/pkg-config/issues/28 - patches = optional (!vanilla) ./requires-private.patch - ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch; + patches = lib.optional (!vanilla) ./requires-private.patch + ++ lib.optional stdenv.isCygwin ./2.36.3-not-win32.patch; # These three tests fail due to a (desired) behavior change from our ./requires-private.patch postPatch = if vanilla then null else '' rm -f check/check-requires-private check/check-gtk check/missing ''; - buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; + buildInputs = [ libiconv ]; configureFlags = [ "--with-internal-glib" ] - ++ optionals (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ] + ++ lib.optionals (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ] # Can't run these tests while cross-compiling - ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) + ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "glib_cv_stack_grows=no" "glib_cv_uscore=no" "ac_cv_func_posix_getpwuid_r=yes" @@ -42,7 +40,7 @@ stdenv.mkDerivation rec { postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file - meta = { + meta = with lib; { description = "A tool that allows packages to find out information about other packages"; homepage = "http://pkg-config.freedesktop.org/wiki/"; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix index 7e7b60de29..b80def8388 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/pkgconf/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "pkgconf"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "https://distfiles.dereferenced.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-X7NVtIfVT7bTQeTxjU4vfoE6ZiLPA6noev+mpAVlaZ0="; + hash = "sha256-2szxu+WjDRSbVWx9L//+r9dte1FOJJJxq91QFTPB2K4="; }; outputs = [ "out" "lib" "dev" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/premake/5.nix b/third_party/nixpkgs/pkgs/development/tools/misc/premake/5.nix index 3c7dc14327..8fefb65e79 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/premake/5.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/premake/5.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, libuuid, cacert, Foundation, readline }: -with lib; - stdenv.mkDerivation rec { pname = "premake5"; version = "5.0.0-beta2"; @@ -13,13 +11,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-2R5gq4jaQsp8Ny1oGuIYkef0kn2UG9jMf20vq0714oY="; }; - buildInputs = [ libuuid ] ++ optionals stdenv.isDarwin [ Foundation readline ]; + buildInputs = [ libuuid ] ++ lib.optionals stdenv.isDarwin [ Foundation readline ]; patches = [ ./no-curl-ca.patch ]; patchPhase = '' substituteInPlace contrib/curl/premake5.lua \ --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' substituteInPlace premake5.lua \ --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 ''; @@ -42,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "https://premake.github.io"; description = "A simple build configuration and project generation tool using lua"; license = lib.licenses.bsd3; - platforms = platforms.darwin ++ platforms.linux; + platforms = lib.platforms.darwin ++ lib.platforms.linux; broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/python-launcher/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/python-launcher/default.nix index f8023022bc..c1d07cf0c7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/python-launcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/python-launcher/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-2lgWybEPi6HEUMYuGDRWMjWoc94CrFHPP5IeKUjj0q4="; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; useNextest = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/qtspim/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/qtspim/default.nix index 7329ad5096..1ef63f1a43 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/qtspim/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/qtspim/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "New user interface for spim, a MIPS simulator"; - homepage = "http://spimsimulator.sourceforge.net/"; + homepage = "https://spimsimulator.sourceforge.net/"; license = licenses.bsdOriginal; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/replacement/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/replacement/default.nix index cbdd8e37c5..75c5363ff6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/replacement/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/replacement/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { ruamel-yaml ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook sh ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rsass/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/rsass/default.nix index 8ce2e3c581..dd681f4685 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/rsass/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/rsass/default.nix @@ -2,16 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "rsass"; - version = "0.26.0"; + version = "0.27.0"; src = fetchCrate { - inherit pname version; - sha256 = "sha256-Ksub+VYTbaWbFpHJFrMr6Dnx6LOnEOUlI2qHhCfbS40="; + pname = "rsass-cli"; + inherit version; + sha256 = "sha256-IaXfxccRRY868waEPI7qbWp1SSAhJlRqgeEiRNddC/c="; }; - cargoSha256 = "sha256-ugG4ivQ2NzLJeZss7h9TME2Aipurl1LZBgxt1cYaK2E="; - - buildFeatures = [ "commandline" ]; + cargoSha256 = "sha256-2owdX9ePHcAXpE43Svan252lAa5ICk0/DrDeADegZ6U="; meta = with lib; { description = "Sass reimplemented in rust with nom"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix index db88c615e6..e44d8a9ce1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seer"; - version = "1.11"; + version = "1.14"; src = fetchFromGitHub { owner = "epasveer"; repo = "seer"; rev = "v${version}"; - sha256 = "sha256-HIRNCcE1EhxsiJ5/MQZgR7IXaeM4rWoepPhALXoW7Hw="; + sha256 = "sha256-IxFG+OhRhPRPSyGFJh559Tz2E7aMOtpphm9GbYS0dRA="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix index 434fba18c5..a26c991716 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/semver-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "semver-tool"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "fsaintjacques"; repo = pname; rev = version; - sha256 = "sha256-LqZTHFiis4BYL1bnJoeuW56wf8+o38Ygs++CV9CKNhM="; + sha256 = "sha256-BnHuiCxE0VjzMWFTEMunQ9mkebQKIKbbMxZVfBUO57Y="; }; dontBuild = true; # otherwise we try to 'make' which fails. diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix index 23fc5cc25e..befeafa87a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/slint-lsp/default.nix @@ -25,14 +25,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "0.3.0"; + version = "0.3.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-dZYkiYrotW8td5dxnPSvDzkWf+xV4ceISVLRZx2goXo="; + sha256 = "sha256-M4rd7179hpQW8jqjCY9ce64AhE6YWOC32tJg3v+00bo="; }; - cargoSha256 = "sha256-9zbA9JXfLdosCU6gVsrsAyiyX8Qh6x5wMw1W4QKqbp4="; + cargoHash = "sha256-3HcgnC2PQUyINm2gjxzqbCicvcGvpYtQn1p3qnqBzjc="; nativeBuildInputs = [ cmake pkg-config fontconfig ]; buildInputs = rpathLibs ++ [ xorg.libxcb.dev ] diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/srecord/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/srecord/default.nix index d986ef0524..1d542383bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/srecord/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/srecord/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Collection of powerful tools for manipulating EPROM load files"; - homepage = "http://srecord.sourceforge.net/"; + homepage = "https://srecord.sourceforge.net/"; license = licenses.gpl3Plus; maintainers = [ maintainers.bjornfor ]; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix index 95b1a5cc12..9694fcd527 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/strace-analyzer/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-p/HYG/KaHtvgvAd+eg1fKmDnLoWCL+XiT66jRBU2xRE="; - checkInputs = [ strace ]; + nativeCheckInputs = [ strace ]; meta = with lib; { description = "Analyzes strace output"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix b/third_party/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix index 1068b3e2ad..ac03372d97 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/swig/2.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = "http://swig.org/"; + homepage = "https://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix b/third_party/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix index 109243b54b..f50c02d3e0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/swig/3.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An interface compiler that connects C/C++ code to higher-level languages"; - homepage = "http://swig.org/"; + homepage = "https://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/swig/4.nix b/third_party/nixpkgs/pkgs/development/tools/misc/swig/4.nix index 5610614302..6b6d1bc02d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/swig/4.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/swig/4.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = "http://swig.org/"; + homepage = "https://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; maintainers = with maintainers; [ orivej ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/swig/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/swig/default.nix index 3c1a5b82dc..41f33f4db6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/swig/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/swig/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = "http://swig.org/"; + homepage = "https://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix index 036e992e97..38a44e8c9c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { installFlags = [ "TEXMF=$(out)/texmf-dist" ]; installTargets = [ "install" "install-tex" ]; - checkInputs = [ procps ]; + nativeCheckInputs = [ procps ]; doCheck = interactive && !stdenv.isDarwin diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index fb118450cf..cfcbe1b2b9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.0.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - sha256 = "sha256-sLdW/MmgkB8is3+UGBdXA94MssI/7E2CEqC3ILRn804="; + sha256 = "sha256-OHfJJ3Oth6mu3UQkZeTcbxaivduIuZzmrMmkWQ8FB/4="; }; - cargoSha256 = "sha256-ks/+2VoilDnxgahOfC9QkyVJ8HE1NEjMsQTdfk1AK3o="; + cargoSha256 = "sha256-Vqm8KBNABYuRsn3HviRw93BQqPUj9EHD9L+ddUb1X+M="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { # generate the man page postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v5.0.0/.github/workflows/publish.yml#L126-L130 + # https://github.com/latex-lsp/texlab/blob/v5.2.0/.github/workflows/publish.yml#L127-L131 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix index 32b7ffe784..f1a66f5478 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; - homepage = "http://uncrustify.sourceforge.net/"; + homepage = "https://uncrustify.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix index d448251bf1..08f5b85bc5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace ${pname}.py --replace 0.1.6 ${version} ''; - checkInputs = [ clang-unwrapped /* clang-format */ ]; + nativeCheckInputs = [ clang-unwrapped /* clang-format */ ]; doCheck = false; # 3 or 4 failures depending on version, haven't investigated. diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/xspim/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/xspim/default.nix index 808e9f92da..ccef80747a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/xspim/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/xspim/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A MIPS32 simulator"; - homepage = "http://spimsimulator.sourceforge.net/"; + homepage = "https://spimsimulator.sourceforge.net/"; license = licenses.bsdOriginal; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix index b6c018693e..bb55ba8079 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.9.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-i4+MOEZWt+Qb05HgXcGR0uDuMoOAyMhVeLPQwnGiEw8="; + hash = "sha256-5zE5a+BYzQjgVb0Ti7bSQrGzTyysOTTR0NMOO5IKG68="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix index 26dd21ef0d..c16cab26b7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix @@ -39,16 +39,16 @@ let in stdenv.mkDerivation rec { pname = "mysql-shell"; - version = "8.0.31"; + version = "8.0.32"; srcs = [ (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz"; - sha256 = "sha256-VA9dqvPmw2WXP3hAJS2xRTvxBM8D/IPsWYIaYwRZI/s="; + hash = "sha256-GUkeZ856/olOssiqkb3qc8ddnianVGXwrcW6hrIG3wE="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz"; - sha256 = "sha256-Z7uMunWyjpXH95SFY/AfuEUo/LsaNduoOdTORP4Bm6o="; + hash = "sha256-Hw2SojeJgkRxbdWB95k1bgc8LaY8Oy5KAeEDLL7VDig="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/nasmfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/nasmfmt/default.nix index bb94e8f8ee..413d7df678 100644 --- a/third_party/nixpkgs/pkgs/development/tools/nasmfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/nasmfmt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-1c7ZOdoM0/Us7cnTT3sds2P5pcCedrCfl0GqQBnf9Rk="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; preBuild = '' cp ${./go.mod} go.mod diff --git a/third_party/nixpkgs/pkgs/development/tools/neil/default.nix b/third_party/nixpkgs/pkgs/development/tools/neil/default.nix index 289e90aec3..e4af4f24e1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/neil/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/neil/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "neil"; - version = "0.1.45"; + version = "0.1.47"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-QEeJWR4aBx1DsXjlTanhDSQn91I9JzEitU+Az+wTVFY="; + sha256 = "sha256-fsFIBT1voh6QcGRoGYx10JoKqZuV3xcA+eOo03DYz1s="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/norminette/default.nix b/third_party/nixpkgs/pkgs/development/tools/norminette/default.nix index 5709fa0f46..73fb701278 100644 --- a/third_party/nixpkgs/pkgs/development/tools/norminette/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/norminette/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-JpWziUKZPOD+AwiYeHR7e0B9l3XKNNp+XQkZEvynKGY="; }; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix index a2b4ddabaf..7e48203c09 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune-release/default.nix @@ -23,7 +23,7 @@ in buildDunePackage rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core rresult logs odoc bos yojson astring fpath ]; - checkInputs = [ alcotest ] ++ runtimeInputs; + nativeCheckInputs = [ alcotest ] ++ runtimeInputs; doCheck = true; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix index 51df81cea5..f48ce5abf3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix @@ -44,6 +44,15 @@ stdenv.mkDerivation rec { mkdir -p $OCAMLFIND_DESTDIR fi } + detectOcamlConflicts () { + local conflict + conflict="$(ocamlfind list |& grep "has multiple definitions" || true)" + if [[ -n "$conflict" ]]; then + echo "Conflicting ocaml packages detected"; + echo "$conflict" + exit 1 + fi + } # run for every buildInput addEnvHooks "$targetOffset" addOCamlPath @@ -51,6 +60,10 @@ stdenv.mkDerivation rec { preInstallHooks+=(createOcamlDestDir) # run even in nix-shell, and even without buildInputs addEnvHooks "$hostOffset" exportOcamlDestDir + # runs after all calls to addOCamlPath + if [[ -z "''${dontDetectOcamlConflicts-}" ]]; then + postHooks+=("detectOcamlConflicts") + fi ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix index a37a8c8b39..938fa24374 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/obelisk/default.nix @@ -3,7 +3,7 @@ ocamlPackages.buildDunePackage rec { pname = "obelisk"; version = "0.6.0"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "Lelio-Brun"; repo = pname; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix index 0aa456ee6c..11564d4e98 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, ocaml , buildDunePackage , fix , menhirLib @@ -7,12 +8,15 @@ , gitUpdater }: +lib.throwIf (lib.versionAtLeast ocaml.version "5.0") + "ocaml-recovery-parser is not available for OCaml ${ocaml.version}" + buildDunePackage rec { pname = "ocaml-recovery-parser"; version = "0.2.4"; minimalOCamlVersion = "4.08"; - useDune2 = true; + duneVersion = "3"; src = fetchFromGitHub { owner = "serokell"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix index cf24a13221..551a36adae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { installPhase = "ocaml setup.ml -install"; inherit doCheck; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; checkPhase = "ocaml setup.ml -test"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-indent/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-indent/default.nix index 29673d99dd..aae650fbdc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ cmdliner ]; meta = with lib; { - homepage = "http://typerex.ocamlpro.com/ocp-indent.html"; + homepage = "https://www.typerex.org/ocp-indent.html"; description = "A customizable tool to indent OCaml code"; license = licenses.gpl3; maintainers = [ maintainers.jirkamarsik ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix index 2108ba2840..de831fde99 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper, getconf, - ocaml, unzip, ncurses, curl, bubblewrap + ocaml, unzip, ncurses, curl, bubblewrap, Foundation }: assert lib.versionAtLeast ocaml.version "4.02.3"; @@ -10,6 +10,10 @@ let url = "https://github.com/0install/0install/releases/download/v2.17/0install-v2.17.tbz"; sha256 = "08q95mzmf9pyyqs68ff52422f834hi313cxmypwrxmxsabcfa10p"; }; + "base64" = fetchurl { + url = "https://github.com/mirage/ocaml-base64/releases/download/v3.5.0/base64-v3.5.0.tbz"; + sha256 = "19735bvb3k263hzcvdhn4d5lfv2qscc9ib4q85wgxsvq0p0fk7aq"; + }; "cmdliner" = fetchurl { url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.4.tbz"; sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw"; @@ -19,20 +23,20 @@ let sha256 = "0lxy4xkkkwgs1cj6d9lyzsqi9f6fc9r6cir5imi7yjqrpd86s1by"; }; "cudf" = fetchurl { - url = "https://github.com/ocaml/opam-source-archives/raw/main/cudf-0.9.tar.gz"; - sha256 = "0771lwljqwwn3cryl0plny5a5dyyrj4z6bw66ha5n8yfbpcy8clr"; + url = "https://gitlab.com/irill/cudf/-/archive/v0.10/cudf-v0.10.tar.gz"; + sha256 = "0l7vzvlrk4x4vw1lkd1wzarxz3h82r3835singcay8m8zj8777bv"; }; "dose3" = fetchurl { - url = "https://gitlab.com/irill/dose3/-/archive/5.0.1/dose3-5.0.1.tar.gz"; - sha256 = "1mh6fv8qbf8xx4h2dc0dpv2lzygvikzjhw1idrknibbwsjw3jg9c"; + url = "https://gitlab.com/irill/dose3/-/archive/7.0.0/dose3-7.0.0.tar.gz"; + sha256 = "0ab0llqdmy82ljh8xdf57y00c9jvf1vnxiq9hczli0r6vc263nq2"; }; "dune-local" = fetchurl { - url = "https://github.com/ocaml/dune/releases/download/2.9.1/dune-2.9.1.tbz"; - sha256 = "09lzq04b642iy0ljp59p32lgk3q8iphjh8fkdp69q29l5frgwx5k"; + url = "https://github.com/ocaml/dune/releases/download/3.5.0/dune-3.5.0.tbz"; + sha256 = "041n16sn41wwj6fgi7l10hvbl5x5swygqv33d4csx7rm0iklrgbp"; }; "extlib" = fetchurl { - url = "https://ygrek.org/p/release/ocaml-extlib/extlib-1.7.7.tar.gz"; - sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; + url = "https://github.com/ygrek/ocaml-extlib/releases/download/1.7.9/extlib-1.7.9.tar.gz"; + sha256 = "1jydzw2n84cfiz9y6lk4gih4wbr8jybanmiryfs01svd07g4vpjq"; }; "mccs" = fetchurl { url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+13.tar.gz"; @@ -67,21 +71,24 @@ let sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs"; }; opam = fetchurl { - url = "https://github.com/ocaml/opam/archive/2.1.3.zip"; - sha256 = "08n72n5wc476p28ypxjs8fmlvcb42129fcva753gqm0xicqh24xf"; + url = "https://github.com/ocaml/opam/archive/2.1.4.zip"; + sha256 = "0zp8sb75pw1kyqlm7bsiagfwq46mv41mxh5q2prn2cwg6xri2wrg"; }; }; in stdenv.mkDerivation { pname = "opam"; - version = "2.1.3"; + version = "2.1.4"; nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; + buildInputs = [ curl ncurses ocaml getconf ] + ++ lib.optionals stdenv.isLinux [ bubblewrap ] + ++ lib.optionals stdenv.isDarwin [ Foundation ]; src = srcs.opam; postUnpack = '' ln -sv ${srcs."0install-solver"} $sourceRoot/src_ext/0install-solver.tbz + ln -sv ${srcs."base64"} $sourceRoot/src_ext/base64.tbz ln -sv ${srcs."cmdliner"} $sourceRoot/src_ext/cmdliner.tbz ln -sv ${srcs."cppo"} $sourceRoot/src_ext/cppo.tar.gz ln -sv ${srcs."cudf"} $sourceRoot/src_ext/cudf.tar.gz @@ -129,8 +136,10 @@ in stdenv.mkDerivation { meta = with lib; { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; + changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES"; maintainers = [ maintainers.henrytill maintainers.marsam ]; + license = licenses.lgpl21Only; platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.1.3 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.1.4 -p opam-shebangs.patch diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/installer.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/installer.nix index 4501ddd63f..9b3b7a5617 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/installer.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/installer.nix @@ -3,7 +3,7 @@ ocamlPackages.buildDunePackage { pname = "opam-installer"; - useDune2 = true; + duneVersion = "3"; inherit (opam) version src; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl index 2e816da8cc..8929afdef0 100755 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -26,7 +26,7 @@ my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" \{>= "(.*)"}$/m print <<"EOF"; { stdenv, lib, fetchurl, makeWrapper, getconf, - ocaml, unzip, ncurses, curl, bubblewrap + ocaml, unzip, ncurses, curl, bubblewrap, Foundation }: assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION"; @@ -69,7 +69,9 @@ in stdenv.mkDerivation { version = "$OPAM_RELEASE"; nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ curl ncurses ocaml getconf ] ++ lib.optional stdenv.isLinux bubblewrap; + buildInputs = [ curl ncurses ocaml getconf ] + ++ lib.optionals stdenv.isLinux [ bubblewrap ] + ++ lib.optionals stdenv.isDarwin [ Foundation ]; src = srcs.opam; @@ -124,7 +126,9 @@ print <<'EOF'; meta = with lib; { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; + changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES"; maintainers = [ maintainers.henrytill maintainers.marsam ]; + license = licenses.lgpl21Only; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix b/third_party/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix index c9728f9cbb..faa7b3eae9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix @@ -11,7 +11,7 @@ mkDerivation { version = "unstable-2019-11-18"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/network/ofono/phonesim.git"; + url = "https://git.kernel.org/pub/scm/network/ofono/phonesim.git"; rev = "adf231a84cd3708b825dc82c56e841dd7e3b4541"; sha256 = "1840914sz46l8h2jwa0lymw6dvgj72wq9bhp3k4v4rk6masbf6hp"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix b/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix index e1676cf568..b4843ddc10 100644 --- a/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/oh-my-posh/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "13.1.2"; + version = "13.8.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/of1jeyHdVyXJ5O8aAN/InaJ5CtCPVFUTk96Q9n5Gr4="; + hash = "sha256-mplWF/lmgRfYd1Gg2loZI5NIfmTHR8quG1/KcZj5W54="; }; vendorHash = "sha256-WiH4qu8DODEhAkxUm6VDcBwFyQO7kNjaiaWPDHCHj9E="; diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix index 0fc9952b59..0469560570 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -13,13 +13,13 @@ let in let finalPackage = buildDotnetModule rec { pname = "omnisharp-roslyn"; - version = "1.39.2"; + version = "1.39.4"; src = fetchFromGitHub { owner = "OmniSharp"; repo = pname; rev = "v${version}"; - sha256 = "/MxBdMjPpq3Gwhi/93+JCAI+BuiiWu0n9QThQi+s/kE="; + sha256 = "rX0FeURw6WMbcJOomqHFcZ9tpKO1td60/HbbVClV324="; }; projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj"; diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix index ca9228eddb..e19073c933 100644 --- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -4,13 +4,13 @@ { fetchNuGet }: [ (fetchNuGet { pname = "Cake.Scripting.Abstractions"; version = "0.9.0"; sha256 = "15nqr100crclha0lzgil25j1wn45517gb34059qypj05j8psfmjx"; }) (fetchNuGet { pname = "Cake.Scripting.Transport"; version = "0.9.0"; sha256 = "1gpbvframx4dx4mzfh44cib6dfd26q7878vf073m9gv3y43sws7b"; }) - (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.3.1"; sha256 = "0bi9rg6c77qav8mb0rbvs5pczf9f0ii8i11c9vyib53bv6fiifxp"; }) - (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.3.1"; sha256 = "1v2xd0f2xrkgdznnjad5vhjan51k9qwi4piyg5vdz9mvywail51q"; }) + (fetchNuGet { pname = "Dotnet.Script.DependencyModel"; version = "1.4.0"; sha256 = "08269f79r3a7iwf3i661k6vzi9xk21f0z21997dpyl2qhl5igndg"; }) + (fetchNuGet { pname = "Dotnet.Script.DependencyModel.NuGet"; version = "1.4.0"; sha256 = "0mhbxvcf9p48zzc3f2x25ihh1lxzzn63mwld5lkny5m1bx1fp198"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "7.2.1.6856"; sha256 = "19z68rgzl93lh1h8anbgzw119mhvcgr9nh5q2nxk6qihl2mx97ba"; }) (fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "3.1.0"; sha256 = "075n1mfsxwz514r94l8i3ax0wp43c3xb4f9w25a96h6xxnj0k2hd"; }) (fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.1"; sha256 = "1hwjihnjcycnzqksa6pcljj515nprpqjqbqy3shykd86micyhhxr"; }) (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.3.1"; sha256 = "0v27f8nv0q6q3n5h4sdf3hm2j9b1dmjx5hpxv9s16gb4ayiaq8y9"; }) @@ -20,61 +20,47 @@ (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.1"; sha256 = "0yib6x7hankpr9knfxascybhydkq6zwc3ahg8f2hzph9pcf9krjz"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.4.0-3.22429.3"; sha256 = "1f8jjy4v0f5banvg3d0qwv43w86ja1hz3rq452kg44ikrsnhzvcw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.4.0-3.22429.3/microsoft.codeanalysis.common.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.4.0-3.22429.3"; sha256 = "1y5llwvgzzi294dh501h064l4c2niin4k0hkq1vr5hlyzcbzgdxg"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.4.0-3.22429.3/microsoft.codeanalysis.csharp.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.4.0-3.22429.3"; sha256 = "0swcsc4g6k1dfw8gmdk6dq35yrrw2idqzfxjqvx8hns453z33x73"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.4.0-3.22429.3/microsoft.codeanalysis.csharp.features.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.4.0-3.22429.3"; sha256 = "0sbwidq35lakh0y58ci67kpqayiyc69ag850fmrnjg7zwgcjc8p8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.4.0-3.22429.3/microsoft.codeanalysis.csharp.scripting.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.4.0-3.22429.3"; sha256 = "0k4kzg4b3wirp1n6ic995g35h70iwpcwr18c9z1246i0kc0nll2q"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.4.0-3.22429.3/microsoft.codeanalysis.csharp.workspaces.4.4.0-3.22429.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0-2.22527.10"; sha256 = "0xvlmg1n5aj7ifb1kd6jg1sk6251rz8xi877v8jz4qx178vqcx8s"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/4.5.0-2.22527.10/microsoft.codeanalysis.common.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0-2.22527.10"; sha256 = "15vsv35zzgjysyr5hsrykc9qx8l062i4fyqg6hay7acqfx5kp539"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Features"; version = "4.5.0-2.22527.10"; sha256 = "0bq3512kkhwq5p81svy7s850apdq0qmydjxqmms6f70sspyxh38b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.features.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.5.0-2.22527.10"; sha256 = "0lr2y28amwg5p0bb9gyh1yybci9swjwm0pp85nlr8zj8a8d1633w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.scripting/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.scripting.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Workspaces"; version = "4.5.0-2.22527.10"; sha256 = "0xwclnvvlq36955vlih56a28fp79c6927rmhlqkdhqs3lsdz9l23"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/4.5.0-2.22527.10/microsoft.codeanalysis.csharp.workspaces.4.5.0-2.22527.10.nupkg"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; sha256 = "1y5r6pm9rp70xyiaj357l3gdl4i4r8xxvqllgdyrwn9gx2aqzzqk"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.4.0-3.22429.3"; sha256 = "1vi1dfwm4qq5vv10iaza174ikj3jqywv68hbjlm5g92iyw5v2j19"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.4.0-3.22429.3/microsoft.codeanalysis.externalaccess.omnisharp.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.4.0-3.22429.3"; sha256 = "1p49rjcgwb3hsh78h3n5ifi4iaywbkx6jdi4n8xpm8nyicjy524c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.4.0-3.22429.3/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.4.0-3.22429.3"; sha256 = "19dfwpz35cvgvg9cgmfbf5c63msp1800kgk3v1ssphzfpmc35ws1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.4.0-3.22429.3/microsoft.codeanalysis.features.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.4.0-3.22429.3"; sha256 = "1g0ly8qfz3j26il3pz5xh7kg13a41kbw2rm81srlamgv9djgxa8l"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.4.0-3.22429.3/microsoft.codeanalysis.scripting.common.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.4.0-3.22429.3"; sha256 = "080r4cwckhmvs9zjwi225q3gssi7f1h4ic93yakmk89mph0wjkaq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.4.0-3.22429.3/microsoft.codeanalysis.workspaces.common.4.4.0-3.22429.3.nupkg"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp"; version = "4.5.0-2.22527.10"; sha256 = "0lg4bgm4awidj41p8gdjy6j4a2dq5hwvq7rw37sv9af93ri16pfh"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp/4.5.0-2.22527.10/microsoft.codeanalysis.externalaccess.omnisharp.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.ExternalAccess.OmniSharp.CSharp"; version = "4.5.0-2.22527.10"; sha256 = "1ffcwf7pwcx4s63k6dhbgyj2anrw3n49cyj1845983vm918p9ymw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.omnisharp.csharp/4.5.0-2.22527.10/microsoft.codeanalysis.externalaccess.omnisharp.csharp.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Features"; version = "4.5.0-2.22527.10"; sha256 = "1n06zkwpyc6jxsy3mlr23ad42yga40fbsyfnxdi632p4iav294w0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/4.5.0-2.22527.10/microsoft.codeanalysis.features.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.5.0-2.22527.10"; sha256 = "1xlm9n7kgin9cfr2xybjxgiwwbnfifyx0r4mm1gfdhgfjbykbqhf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/4.5.0-2.22527.10/microsoft.codeanalysis.scripting.common.4.5.0-2.22527.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Workspaces.Common"; version = "4.5.0-2.22527.10"; sha256 = "00swl909fqjp6vd41jc7f9kd7n5fzzqvpf1jicrbyr2nmh3mk0xk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/4.5.0-2.22527.10/microsoft.codeanalysis.workspaces.common.4.5.0-2.22527.10.nupkg"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "1.4.0"; sha256 = "0li9shnm941jza40kqfkbbys77mrr55nvi9h3maq9fipq4qwx92d"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; version = "6.0.0"; sha256 = "0qn30d3pg4rx1x2k525jj4x5g1fxm2v5m0ksz2dmk1gmqalpask8"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; version = "6.0.0"; sha256 = "0dq1x7962zsp926rj76i4akk4hsy7r5ldys8r4xsd78rq5f67rhq"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "6.0.0"; sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "6.0.0"; sha256 = "15hb2rbzgri1fq8wpj4ll7czm3rxqzszs02phnhjnncp90m5rmpc"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.CommandLine"; version = "6.0.0"; sha256 = "1hb4qrq9xdxzh2px515pv1vkz1jigwaxw1hfg9w8s6pgl8z04l4c"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "6.0.0"; sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "6.0.0"; sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "6.0.0"; sha256 = "1c6l5szma1pdn61ncq1kaqibg0dz65hbma2xl626a8d1m6awn353"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "2.0.0"; sha256 = "018izzgykaqcliwarijapgki9kp2c560qv8qsxdjywr7byws5apq"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "1wlhb2vygzfdjbdzy7waxblmrx0q3pdcqvpapnpmq9fcx5m8r6w1"; }) - (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "6.0.0"; sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "6.0.0"; sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "6.0.0"; sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "6.0.0"; sha256 = "0plx785hk61arjxf0m3ywy9hl5nii25raj4523n3ql7mmv6hxqr1"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "6.0.0"; sha256 = "1383b0r33dzz0hrch9cqzzxr9vxr21qq0a5vnrpkfq71m2fky31d"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.0.0"; sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "6.0.0"; sha256 = "1k6q91vrhq1r74l4skibn7wzxzww9l74ibxb2i8gg4q6fzbiivba"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; sha256 = "17d02106ksijzcnh03h8qaijs77xsba5l50chng6gb8nwi7wrbd5"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.1"; sha256 = "0c8yicvhmwgm3z076hy3zgkqznhmrm8qygiscawlc9k01l5ilkrs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.0.0"; sha256 = "1bk8r4r3ihmi6322jmcag14jmw11mjqys202azqjzglcx59pxh51"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; }) @@ -85,46 +71,44 @@ (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.3.0"; sha256 = "0n0iahawk4cjc7pkddjyaqnb10fn5qcjy59645ni0wy8q3myiskh"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.SDK.EmbedInteropTypes"; version = "15.0.12"; sha256 = "083pva0a0xxvqqrjv75if25wr3rq034wgjhbax74zhzdb665nzsw"; }) (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "1.14.114"; sha256 = "062mqkmjf4k6zm3wi9ih0lzypfsnv82lgh88r35fj66akihn86gv"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "16.7.56"; sha256 = "13x0xrsjxd86clf9cjjwmpzlyp8pkrf13riya7igs8zy93zw2qap"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "16.7.56"; sha256 = "04v9df0k7bsc0rzgkw4mnvi43pdrh42vk6xdcwn9m6im33m0nnz2"; }) - (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "15.5.31"; sha256 = "1ah99rn922qa0sd2k3h64m324f2r32pw8cn4cfihgvwx4qdrpmgw"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.4.27"; sha256 = "17f9bj01qxdd7mjxslgxkhky6xmg7agpimkf071k451csj5k2vkd"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.4.27"; sha256 = "1js19g9i2vz012l1ma2wx23awyxh2jqng1qs652l9jwj6gmp71v8"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.0.64"; sha256 = "1qm2dc9v1glpgy2blbcmsljwrsx55k82rjw4hiqh031h8idwryrl"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.6.0"; sha256 = "0i4y782yrqqyx85pg597m20gm0v126w0j9ddk5z7xb3crx4z9f2s"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) - (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.6.81"; sha256 = "06wihcaga8537ibh0mkj28m720m6vzkqk562zkynhca85nd236yi"; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.8.57"; sha256 = "05p1vqs09xj6pa3nv08xymzz8sg5sg59598bn1rmfmbpqp3glvax"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { pname = "NuGet.Common"; version = "5.2.0"; sha256 = "14y7axpmdl9fg8jfc42gxpcq9wj8k3vzc07npmgjnzqlp5xjyyac"; }) + (fetchNuGet { pname = "NuGet.Common"; version = "6.2.0"; sha256 = "1xvjlly8x3gs26sbcil8vn3xf8wfb7lkmb36sics46b7a6fmkdhn"; }) (fetchNuGet { pname = "NuGet.Common"; version = "6.4.0-preview.1.53"; sha256 = "1p3f3p9md7d880hbp50msp54qkhwknxkz62sm79ndgldnclwrr3i"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.4.0-preview.1.53/nuget.common.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.Configuration"; version = "5.2.0"; sha256 = "0b4dkym3vnj7qldnqqq6h6ry0gkql5c2ps5wy72b8s4fc3dmnvf1"; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "6.2.0"; sha256 = "07hmnm1v5qbqpa2m77gikm0pds8c7blnc98il17alswc5hhmblm8"; }) (fetchNuGet { pname = "NuGet.Configuration"; version = "6.4.0-preview.1.53"; sha256 = "0zlkzgwqspja7j1j7jb5h3wdzvg42zp11ysgl93s96yxjr92ivx5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.4.0-preview.1.53/nuget.configuration.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "5.2.0"; sha256 = "156yjfsk9pzqviiwy69lxfqf61yyj4hn4vdgfcbqvw4d567i150r"; }) + (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.2.0"; sha256 = "0b00072yx20qnr9riq3b72ia1129llhw9a2fw6yv7ak77a70c3pq"; }) (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.4.0-preview.1.53"; sha256 = "05gmy611x4vppw2xjkbnnvf97nj3lrjkg5q1ilp625hf5hrmmx68"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.4.0-preview.1.53/nuget.dependencyresolver.core.6.4.0-preview.1.53.nupkg"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.2.0"; sha256 = "1fh4rp26m77jq5dyln68wz9qm217la9vv21amis2qvcy6gknk2wp"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.2.0"; sha256 = "0swbxdzvrd6jnpnr5kss6v5f7grhgzl1z5nk6b00z2x8pbrjfr42"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.4.0-preview.1.53"; sha256 = "0sp7phay7764wfwz9p4yl17zcxi8h9xpzv5x5kpqq9dmv79mx7ld"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.4.0-preview.1.53/nuget.frameworks.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.LibraryModel"; version = "5.2.0"; sha256 = "0vxd0y7rzzxvmxji9bzp95p2rx48303r3nqrlhmhhfc4z5fxjlqk"; }) + (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.2.0"; sha256 = "02l13hkpc6p86ibni8gzk65gdv85fmm1wqn39j86s68p5wf8l892"; }) (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.4.0-preview.1.53"; sha256 = "1syji2ml2mpsalyd4b7i3vni2d65mjmdy5csky7226m8nwxsaf9m"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.4.0-preview.1.53/nuget.librarymodel.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.Packaging"; version = "5.2.0"; sha256 = "14frrbdkka9jd6g52bv4lbqnpckw09yynr08f9kfgbc3j8pklqqb"; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "6.2.0"; sha256 = "05xkba6bckq1vpni9j7ng20zy0l7srk8lyx4mxy9cf1z14ca30bl"; }) (fetchNuGet { pname = "NuGet.Packaging"; version = "6.4.0-preview.1.53"; sha256 = "1rxbjc2430ry7aqyb9k9bk8qg6l3max84rg81445y0s3f23cbmpp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.4.0-preview.1.53/nuget.packaging.6.4.0-preview.1.53.nupkg"; }) (fetchNuGet { pname = "NuGet.Packaging.Core"; version = "6.4.0-preview.1.53"; sha256 = "08fkl1kp4sizncd0mgsgyas0qzq2wdxby7m3r9q3c8isk7m44lw7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging.core/6.4.0-preview.1.53/nuget.packaging.core.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.ProjectModel"; version = "5.2.0"; sha256 = "1j23jk2zql52v2nqgi0k6d7z63pjjzrvw8y1s38zpf0sn7lzdr0h"; }) + (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.2.0"; sha256 = "1fsr9dzxibllhzd80dap593snms7jp7mzsihq7mh55vbj3n6qss8"; }) (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.4.0-preview.1.53"; sha256 = "08y3gwlw26jbx5chmmgrbvpad42zf5f668cd2vh1xj9i0li9df9g"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.4.0-preview.1.53/nuget.projectmodel.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.Protocol"; version = "5.2.0"; sha256 = "1vlrrlcy7p2sf23wqax8mfhplnzppd73xqlr2g83ya056w0yf2rd"; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "6.2.0"; sha256 = "1fai84b45sv2h4wm6jqghf16x8hc6ksdsq4llay9qh1mak0zfg33"; }) (fetchNuGet { pname = "NuGet.Protocol"; version = "6.4.0-preview.1.53"; sha256 = "064l1cfx2483lvy9w5khigp07bp7y42rnrz8i85jalkrc4p3jvmr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.4.0-preview.1.53/nuget.protocol.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "NuGet.Versioning"; version = "5.2.0"; sha256 = "08ay8bhddj9yiq6h9lk814l65fpx5gh1iprkl7pcp78g57a6k45k"; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "6.2.0"; sha256 = "0qpsf9wywwi49d0p9gvb0h6m6ja17lg8wyiyk1gg502cb73b90zn"; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "6.4.0-preview.1.53"; sha256 = "1mvc81qy3s5iwqikyw5hypfkrf9ji5br91dybavznhhls9j96999"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.4.0-preview.1.53/nuget.versioning.6.4.0-preview.1.53.nupkg"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.0"; sha256 = "0m9lw21iz90ayl35f24ir3vbiydf4sjqw590qqgwknykpzsi1ai2"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.0"; sha256 = "17akjdh9dnyxr01lnlsa41ca52psqnny8j3wxz904zs15pz932ln"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.0"; sha256 = "06d4wakdaj42c9qnlhdyqrjnm97azp4hrvfg70f96ldl765y9vrf"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.0"; sha256 = "0k1z3zchl1d82fj0ha63i54g5j046iaz8vb3cyxpjb6kp7zah28v"; }) - (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.0"; sha256 = "0s3h9v5p043ip27g9jcvd0np9q3hn2pfv6gn539m45yb5d74a6i5"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc"; version = "0.19.7"; sha256 = "02fsw54jmh037a5q518nrsd9657kdy111m31q13ll759a601bai7"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.JsonRpc.Generators"; version = "0.19.7"; sha256 = "15wy1ql68bdbz507488ivdlc4wsd3f73cbwqwc8yci1mwpfcwryd"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageProtocol"; version = "0.19.7"; sha256 = "0c2mh69cx4lzf0s146i9ci43inb9mns4rcy08qdzki56irb0y3yh"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer"; version = "0.19.7"; sha256 = "004jacz3w9rqvccfa1f88vzkz68agx786bncg43bc6mzg8j7mcvr"; }) + (fetchNuGet { pname = "OmniSharp.Extensions.LanguageServer.Shared"; version = "0.19.7"; sha256 = "05a5vh32vq6jipzvwwjzjf40l2ar2qxp6v9sxpfjnxdvm1bxyxmf"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -166,21 +150,19 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.0.7"; sha256 = "083saqlwx1hbhy0rv7vi973aw7jv8q53fcxlrprx1wgxdwnbi5ni"; }) - (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.0.7"; sha256 = "0b25qz3h1aarza2b74alsl9v6czns3y61i8p10yqgd9djk1b1byj"; }) - (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.0.7"; sha256 = "0wkrzcpc9vcd27gwj6w537i1i5i3h5zsips8b9v9ngk003n50mia"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.0.7"; sha256 = "1kmyf4v4157n2194j17ijf62xnqiapxhg4aka851zx0hzlxm7ygp"; }) - (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.0.7"; sha256 = "1davv3fqd05353d7dl7wm2sg58fyy59b29pk58w1vf7m33580grj"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.1.0"; sha256 = "008bnj279y7gxcai69r4bqgxpxwsdb8jvai4kxkd97arlcr1cpjv"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.0"; sha256 = "0kq5x9k5kl6lh7jp1hgjn08wl37zribrykfimhln6mkqbp1myncp"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.0"; sha256 = "1ibkkz5dsac64nf7alsdsr8r1jm8j87vv6chsi3azkf5zv0rphsy"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.dynamic_cdecl"; version = "2.1.0"; sha256 = "12a6s3knynfrzf9vxxy6hwg4hvxncc0ad59g3bigqx86p8xfb4nq"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.0"; sha256 = "1g7gi1kdil8iv67g42xbmfhr1l0pkz645gqnd8lfv3q24449shan"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.CodeDom"; version = "6.0.0"; sha256 = "1i55cxp8ycc03dmxx4n22qi6jkwfl23cgffb95izq7bjar8avxxq"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) @@ -195,35 +177,25 @@ (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) (fetchNuGet { pname = "System.Data.DataSetExtensions"; version = "4.5.0"; sha256 = "0gk9diqx388qjmbhljsx64b5i0p9cwcaibd4h7f8x901pz84x6ma"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) - (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) - (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; }) (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.7.3"; sha256 = "0djp59x56klidi04xx8p5jc1nchv5zvd1d59diphqxwvgny3aawy"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "5.0.1"; sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; }) (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) @@ -233,56 +205,40 @@ (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { pname = "System.Net.WebSockets"; version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) (fetchNuGet { pname = "System.Reactive"; version = "4.4.1"; sha256 = "0gx8jh3hny2y5kijz5k9pxiqw481d013787c04zlhps21ygklw4a"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.5.1"; sha256 = "0cdnl4i9mfk7kx2ylglayqwqw7kl5k1xr8siaxch45hfyc2cpds8"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.0"; sha256 = "1x0b289r9yjzdqypi2x3dc8sa66s3b6bpc7l2f8hxrzl6czdg4al"; }) (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; sha256 = "1h73gps9ffw77vys4zwgm78fgackqw6a7rjrg75mmx79vdw1shgw"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.WindowsRuntime"; version = "4.3.0"; sha256 = "0bpsy91yqm2ryp5y9li8p6yh4yrxcvg9zvm569ifw25rpy67bgp9"; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) - (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.6.0"; sha256 = "1wl1dyghi0qhpap1vgfhg2ybdyyhy9vc2a7dpm1xb30vfgmlkjmf"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) @@ -296,7 +252,6 @@ (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.0"; sha256 = "0hb2mndac3xrw3786bsjxjfh19bwnr991qib54k6wsqjhjyyvbwj"; }) (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; }) (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.3.0"; sha256 = "1kg264xmqabyz8gfg8ymp6qp6aw43vawfp0znf0909d7b5jd3dq9"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) @@ -307,32 +262,22 @@ (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) - (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.6.0"; sha256 = "1jmfzfz1n8hp63s5lja5xxpzkinbp6g59l3km9h8avjiisdrg5wm"; }) (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "6.0.0"; sha256 = "1qbyi7yymqc56frqy7awvcqc1m7x3xrpx87a37dgb3mbrjg9hlcj"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "6.0.0"; sha256 = "1b4vyjdir9kdkiv2fqqm4f76h0df68k8gcd7jb2b38zgr2vpnk3c"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) ] diff --git a/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix b/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix index d3b46e1d95..f3e8c942bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/opcr-policy/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.1.43"; + version = "0.1.47"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-6j3PEdSI8pLyTaYVUGmnPXV8P3arr3BukAI8R9eikCI="; + sha256 = "sha256-HjoVD3GLNg1jdCPMwEUJR/0BLJexbVxacVfmIm/P4SI="; }; - vendorSha256 = "sha256-wPtChLsIWX1YckA9p6YMxGMvqGqO0ohXYsOdkuCHbd4="; + vendorHash = "sha256-/wTLnJ3l22owDL5dFR9H/QN3UItxP7QQgU/NcmzBL6U="; ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index f7f0eca56c..530d349303 100644 --- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -11,15 +11,15 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.47.4"; + version = "0.48.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-EHDSil077g/K8XCWQ9Pry/oyh0Bs3ckS/5Co1z/+Yes="; + hash = "sha256-//xwk5T477Ae61MqZCrj8VcG23mqrP04/VVuUwtxyio="; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; @@ -42,7 +42,7 @@ buildGoModule rec { getGoDirs() { go list ./... | grep -v -e e2e ${lib.optionalString stdenv.isDarwin "-e wasm"} } - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' # remove tests that have "too many open files"/"no space left on device" issues on darwin in hydra rm server/server_test.go ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index b1d8e5065f..3b38cc97e6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -29,6 +29,8 @@ buildGoModule rec { doCheck = false; subPackages = [ + "cmd/ansible-operator" + "cmd/helm-operator" "cmd/operator-sdk" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/oq/default.nix b/third_party/nixpkgs/pkgs/development/tools/oq/default.nix index 298a68d3a4..3c2a0223dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/oq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/oq/default.nix @@ -19,7 +19,7 @@ crystal.buildCrystalPackage rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libxml2 ]; - checkInputs = [ jq ]; + nativeCheckInputs = [ jq ]; format = "shards"; diff --git a/third_party/nixpkgs/pkgs/development/tools/oras/default.nix b/third_party/nixpkgs/pkgs/development/tools/oras/default.nix index b0adcadd84..183e26d704 100644 --- a/third_party/nixpkgs/pkgs/development/tools/oras/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/oras/default.nix @@ -1,25 +1,37 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles, testers, oras }: buildGoModule rec { pname = "oras"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "oras-project"; repo = "oras"; rev = "v${version}"; - sha256 = "sha256-8QmMC4eB7WNxfEsVRUzv/gb7QmNBvcgDEENa1XxpCug="; + hash = "sha256-7fmrWkJ2f9LPaBB0vqLqPCCLpkdsS1gVfJ1xn6K/M3E="; }; - vendorSha256 = "sha256-THqrGnJnNDL6BJpRxeNLPjWB+SEUMUhiVOcJZDTM6n8="; + + vendorHash = "sha256-BLjGu1xk5OCNILc2es5Q0fEIqoexq/lHnJtHz72w6iI="; + + nativeBuildInputs = [ installShellFiles ]; + + excludedPackages = [ "./test/e2e" ]; ldflags = [ "-s" "-w" - "-X github.com/oras-project/oras/internal/version.Version=${version}" - "-X github.com/oras-project/oras/internal/version.BuildMetadata=" - "-X github.com/oras-project/oras/internal/version.GitTreeState=clean" + "-X oras.land/oras/internal/version.Version=${version}" + "-X oras.land/oras/internal/version.BuildMetadata=" + "-X oras.land/oras/internal/version.GitTreeState=clean" ]; + postInstall = '' + installShellCompletion --cmd oras \ + --bash <($out/bin/oras completion bash) \ + --fish <($out/bin/oras completion fish) \ + --zsh <($out/bin/oras completion zsh) + ''; + doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck @@ -30,6 +42,11 @@ buildGoModule rec { runHook postInstallCheck ''; + passthru.tests.version = testers.testVersion { + package = oras; + command = "oras version"; + }; + meta = with lib; { homepage = "https://oras.land/"; changelog = "https://github.com/oras-project/oras/releases/tag/v${version}"; diff --git a/third_party/nixpkgs/pkgs/development/tools/packcc/default.nix b/third_party/nixpkgs/pkgs/development/tools/packcc/default.nix index 77ad731580..b16b0491c9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/packcc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/packcc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ bats uncrustify ]; + nativeCheckInputs = [ bats uncrustify ]; preCheck = '' patchShebangs ../../tests 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 a80e75559d..c13abf071c 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 @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { branch = "2.5.35"; - homepage = "http://flex.sourceforge.net/"; + homepage = "https://flex.sourceforge.net/"; description = "A fast lexical analyser generator"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix index 8179855e6e..e9bd834169 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://jikes.sourceforge.net/"; + homepage = "https://jikes.sourceforge.net/"; description = "The Jikes Parser Generator"; platforms = platforms.all; license = licenses.ipl10; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index 728100c540..13ba669bb4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -51,14 +51,17 @@ let '' + (lib.concatStrings (lib.mapAttrsToList (name: grammar: "ln -s ${if grammar ? src then grammar.src else fetchGrammar grammar} $out/${name}\n") (import ./grammars { inherit lib; })))); + + buildGrammar = callPackage ./grammar.nix { }; + builtGrammars = let - change = name: grammar: - callPackage ./grammar.nix { } { - language = if grammar ? language then grammar.language else name; + build = name: grammar: + buildGrammar { + language = grammar.language or name; inherit version; - source = if grammar ? src then grammar.src else fetchGrammar grammar; - location = if grammar ? location then grammar.location else null; + src = grammar.src or fetchGrammar grammar; + location = grammar.location or null; }; grammars' = import ./grammars { inherit lib; } // extraGrammars; grammars = grammars' // @@ -70,7 +73,7 @@ let { tree-sitter-markdown = grammars'.tree-sitter-markdown // { location = "tree-sitter-markdown"; }; } // { tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; }; in - lib.mapAttrs change (grammars); + lib.mapAttrs build (grammars); # Usage: # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ]) @@ -142,7 +145,7 @@ rustPlatform.buildRustPackage { updater = { inherit update-all-grammars; }; - inherit grammars builtGrammars withPlugins allGrammars; + inherit grammars buildGrammar builtGrammars withPlugins allGrammars; tests = { # make sure all grammars build diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammar.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammar.nix index 5b62959db0..c2c3ce4a89 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammar.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammar.nix @@ -9,10 +9,8 @@ { # language name language - # version of tree-sitter , version - # source for the language grammar -, source +, src , location ? null , generate ? false , ... @@ -21,7 +19,7 @@ stdenv.mkDerivation ({ pname = "${language}-grammar"; - src = source; + inherit src version; nativeBuildInputs = lib.optionals generate [ nodejs tree-sitter ]; @@ -60,4 +58,4 @@ stdenv.mkDerivation ({ fi runHook postInstall ''; -} // removeAttrs args [ "language" "source" "location" "generate" ]) +} // removeAttrs args [ "language" "location" "generate" ]) diff --git a/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix b/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix index 2baaf4f6a5..7d6e986ff1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix @@ -52,7 +52,7 @@ buildPythonApplication rec { rich ]; - checkInputs = [ + nativeCheckInputs = [ pretend pytestCheckHook ]; 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 f52bf6c0c9..80002ecdf7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -71,7 +71,7 @@ let ) ); nativeBuildInputs = mkInput "nativeBuildInputs" [ ]; - checkInputs = mkInput "checkInputs" ( + nativeCheckInputs = mkInput "nativeCheckInputs" ( getDeps (pyProject.tool.poetry."dev-dependencies" or { }) # =poetry-1.2.0 dependency groups ++ lib.flatten (map (g: getDeps (pyProject.tool.poetry.group.${g}.dependencies or { })) checkGroups) @@ -248,7 +248,7 @@ lib.makeScope pkgs.newScope (self: { } ) - # Fix infinite recursion in a lot of packages because of checkInputs + # Fix infinite recursion in a lot of packages because of nativeCheckInputs (self: super: lib.mapAttrs (name: value: ( if lib.isDerivation value && lib.hasAttr "overridePythonAttrs" value diff --git a/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix index cadf9b9eeb..84f1670e6d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/profiling/systemtap/default.nix @@ -42,7 +42,7 @@ in runCommand "systemtap-${kernel.version}-${version}" { homepage = "https://sourceware.org/systemtap/"; description = "Provides a scripting language for instrumentation on a live kernel plus user-space"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.systems.inspect.patterns.isGnu; }; } '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/development/tools/prospector/default.nix b/third_party/nixpkgs/pkgs/development/tools/prospector/default.nix index 95b5512c6f..e53760f54a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/prospector/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/prospector/default.nix @@ -9,14 +9,14 @@ in python3.pkgs.buildPythonApplication rec { pname = "prospector"; - version = "1.8.3"; + version = "1.8.4"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-R3Sc4Qx6bht+XJhNj+fy32akzDOgSDF5LP3WE1qEyms="; + hash = "sha256-g7tyn6pj5I/+b28wIitqDapR5ffk1xDEAtcYs2TpIUk="; }; pythonRelaxDeps = [ @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { vulture ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix index a968c26ff5..5941b2cc51 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-9dLILgDolHgQx33dAtYT3RJ0scWUVh52z+2Fh6FS+K4="; + hash = "sha256-lk7PcSsqm2oLYerhXGxcyqkw5VJ46JIASU87ppybd78="; }; vendorHash = "sha256-Bh2JCWTaML/QU/sLBsxLKMzzH++K22BTGusfcVW2GBw="; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-vtproto/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-vtproto/default.nix index ee1793f01c..3adab62053 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-vtproto/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go-vtproto/default.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "protoc-gen-go-vtproto"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "vtprotobuf"; rev = "v${version}"; - sha256 = "sha256-fOF7n1WeQ3s1S+o5NbAoTUnqqk5IHtKvXCb2o8LmI5U="; + sha256 = "sha256-WtiXoQWjjFf+TP2zpAXNH05XdcrLSpw3S0TG4lkzp2E="; }; - vendorSha256 = "sha256-JpSVO8h7+StLG9/dJQkmrIlh9zIHABoqP1hq+X5ajVs="; + vendorHash = "sha256-JpSVO8h7+StLG9/dJQkmrIlh9zIHABoqP1hq+X5ajVs="; excludedPackages = [ "conformance" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix index 279f8101f7..0b7eca7e1d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-grpc-web/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ protobuf ]; + nativeCheckInputs = [ protobuf ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/development/tools/protoscope/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoscope/default.nix index 12c120196f..70eeab5f15 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoscope/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoscope/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoscope"; - version = "unstable-2022-10-04"; + version = "unstable-2022-11-09"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protoscope"; - rev = "8b1d63939ee1a5d922b38f3976e1e58cae525163"; - sha256 = "sha256-/vt02rvKVsryJZ+Bw4QLaGzDErGI04/4NUbSBkbbN3Y="; + rev = "8e7a6aafa2c9958527b1e0747e66e1bfff045819"; + hash = "sha256-+VIy+CD6bKJzwtpHXRr9MqmsPE2MJ1dRdtvSMUkCh5I="; }; - vendorSha256 = "sha256-mK8eGo6oembs4nofvROn4g0+oO5E5/zQrmPKMe3xXik="; + vendorHash = "sha256-mK8eGo6oembs4nofvROn4g0+oO5E5/zQrmPKMe3xXik="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix index c68410063a..6c6e88fc15 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.125.0"; + version = "0.128.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-B765hV5hs5FfpzkRwQY9szu6l8ImDTUoEl77IcgRngA="; + sha256 = "sha256-2EIaK7UyJH9YEKlOGnnKrq3ucVgEjbF2jVui0bASNcA="; }; - vendorSha256 = "sha256-YOytSBJDktWIwN1vhD1imIZVTg6t+Lmfg4cFtE3lys4="; + vendorHash = "sha256-uQ8/cNNFelG8zzrcEs9fEs8KkY6/odwOGmwMmyxUKS4="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix b/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix index 561187eae0..948115c332 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pulumictl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pulumictl"; - version = "0.0.39"; + version = "0.0.41"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumictl"; rev = "v${version}"; - sha256 = "sha256-85a0qW4Fy+ojAhdlRU/m7mkHX91GoZAHlEGPljLAj4c="; + sha256 = "sha256-6QBE6+wJ9MQXey9nXaJn69uVUhIVlWMdH9ROiMi7bZk="; }; vendorHash = "sha256-WzfTS68YIpoZYbm6i0USxXyEyR4px+hrNRbsCTXdJsk="; diff --git a/third_party/nixpkgs/pkgs/development/tools/pur/default.nix b/third_party/nixpkgs/pkgs/development/tools/pur/default.nix index d065b7b135..710dc9e714 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pur/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pur/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { python3.pkgs.click ]; - checkInputs = [ + nativeCheckInputs = [ python3.pkgs.pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/pxview/default.nix b/third_party/nixpkgs/pkgs/development/tools/pxview/default.nix index 20049215a7..84bf11c448 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pxview/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pxview/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Program to convert Paradox databases"; - homepage = "http://pxlib.sourceforge.net/pxview/"; + homepage = "https://pxlib.sourceforge.net/pxview/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.winpat ]; 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 0ade6d722d..e9bcb2efae 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.12"; + version = "0.3.14"; src = fetchFromGitHub { owner = "benfred"; repo = "py-spy"; rev = "v${version}"; - sha256 = "sha256-k58PPJAF9MsKRlscFSqdtTY5/rriaF0mXjgkADT+F4s="; + sha256 = "sha256-NciyzKiDKIMeuHhTjzmHIc3dYW4AniuCNjZugm4hMss="; }; NIX_CFLAGS_COMPILE = "-L${libunwind}/lib"; @@ -18,9 +18,9 @@ rustPlatform.buildRustPackage rec { export RUSTFLAGS="-Clinker=$CC" ''; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; - cargoSha256 = "sha256-DC+EfJ671/bvFoHHjpJlFCO/phdndNcldnP3DsIKqAg="; + cargoSha256 = "sha256-nm+44YWSJOOg9a9d8b3APXW50ThV3iA2C/QsJMttscE="; meta = with lib; { description = "Sampling profiler for Python programs"; diff --git a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix index cc1baad2bb..5072bb88f4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix @@ -3,8 +3,6 @@ , withDocumentation ? false, withClangPlugins ? true }: -with lib; - let # Fetch clang from qt vendor, this contains submodules like this: # clang<-clang-tools-extra<-clazy. @@ -31,7 +29,7 @@ mkDerivation rec { }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative elfutils.dev ] ++ - optionals withClangPlugins [ llvmPackages_8.libclang + lib.optionals withClangPlugins [ llvmPackages_8.libclang clang_qt_vendor llvmPackages_8.llvm ]; @@ -47,9 +45,9 @@ mkDerivation rec { doCheck = true; - buildFlags = optional withDocumentation "docs"; + buildFlags = lib.optional withDocumentation "docs"; - installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; + installFlags = [ "INSTALL_ROOT=$(out)" ] ++ lib.optional withDocumentation "install_docs"; qtWrapperArgs = [ "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" ]; @@ -58,7 +56,7 @@ mkDerivation rec { --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' substituteInPlace src/libs/libs.pro \ --replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls' - '' + optionalString withClangPlugins '' + '' + lib.optionalString withClangPlugins '' # Fix paths for llvm/clang includes directories. substituteInPlace src/shared/clang/clang_defines.pri \ --replace '$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)' '${clang_qt_vendor}/lib/clang/8.0.0/include' \ @@ -72,8 +70,8 @@ mkDerivation rec { --replace 'LLVM_CXXFLAGS ~= s,-gsplit-dwarf,' '${lib.concatStringsSep "\n" ["LLVM_CXXFLAGS ~= s,-gsplit-dwarf," " LLVM_CXXFLAGS += -fno-rtti"]}' ''; - preBuild = optionalString withDocumentation '' - ln -s ${getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share + preBuild = lib.optionalString withDocumentation '' + ln -s ${lib.getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share ''; postInstall = '' @@ -92,7 +90,7 @@ mkDerivation rec { ''; homepage = "https://wiki.qt.io/Category:Tools::QtCreator"; license = "LGPL"; - maintainers = [ maintainers.akaWolf ]; + maintainers = [ lib.maintainers.akaWolf ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix b/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix index 80adc6f30a..aa3dd1ee86 100644 --- a/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/quick-lint-js/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "quick-lint-js"; - version = "2.9.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - sha256 = "sha256-hWwEaUf+TntRfxI3HjJV+hJ+dV6TRncxSCbaxE1sIjs="; + sha256 = "sha256-hpDVR58Qez+TcAO77GXvjuH7NfBxdRvIi8WsBIuz3nI="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix index 31510c45d7..43eb79c0e1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "railway"; - version = "2.0.13"; + version = "2.1.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-NYYzMwwRm49YPcXUeriYIXjjK4ZJbbtF9Otr3MWXsiY="; + sha256 = "sha256-JpIy8u6L7yOZgTFxFft+vhcat3uPT9EvOXAQOmrpvpc="; }; ldflags = [ "-s" "-w" ]; - vendorSha256 = "sha256-nLuomuAScodgLUKzMTiygtFBnNHrqAojOySZgKLVGJY="; + vendorHash = "sha256-nLuomuAScodgLUKzMTiygtFBnNHrqAojOySZgKLVGJY="; postInstall = '' mv $out/bin/cli $out/bin/railway diff --git a/third_party/nixpkgs/pkgs/development/tools/refurb/default.nix b/third_party/nixpkgs/pkgs/development/tools/refurb/default.nix index d216ca4b91..d0b0000e59 100644 --- a/third_party/nixpkgs/pkgs/development/tools/refurb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/refurb/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { typing-extensions ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ attrs click colorama diff --git a/third_party/nixpkgs/pkgs/development/tools/relic/default.nix b/third_party/nixpkgs/pkgs/development/tools/relic/default.nix index 6fb5507b87..6652e5547f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/relic/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/relic/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "relic"; - version = "7.5.3"; + version = "7.5.4"; src = fetchFromGitHub { owner = "sassoftware"; repo = pname; rev = "v${version}"; - sha256 = "sha256-urueDWvHhDsIiLIAatAforBM//UEJz8wUHEVyhwV7JY="; + sha256 = "sha256-rm52XrN0554copqIllfaNC9EIZ+6rxVeZWTWR2y9X14="; }; - vendorSha256 = "sha256-wlylASK2RES0nbf6UZHJBrYQaz9jrq5j7/KF1wYOqE0="; + vendorHash = "sha256-389ki4hsx7l2gHSiOHledo/ZP+I3NAkk1K8anq2kfEE="; meta = with lib; { homepage = "https://github.com/sassoftware/relic"; diff --git a/third_party/nixpkgs/pkgs/development/tools/reno/default.nix b/third_party/nixpkgs/pkgs/development/tools/reno/default.nix index ca01f6ebfa..d0cb440ec4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/reno/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/reno/default.nix @@ -21,7 +21,7 @@ with python3Packages; buildPythonApplication rec { setuptools # required for finding pkg_resources at runtime ]; - checkInputs = [ + nativeCheckInputs = [ # Python packages pytestCheckHook docutils diff --git a/third_party/nixpkgs/pkgs/development/tools/reshape/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/reshape/Cargo.lock new file mode 100644 index 0000000000..1fd0e6d028 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/reshape/Cargo.lock @@ -0,0 +1,1080 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "any_ascii" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e" + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" +dependencies = [ + "backtrace", +] + +[[package]] +name = "async-trait" +version = "0.1.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" + +[[package]] +name = "cc" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "3.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +dependencies = [ + "atty", + "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "once_cell", + "strsim", + "termcolor", + "textwrap", +] + +[[package]] +name = "clap_derive" +version = "3.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "colored" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +dependencies = [ + "atty", + "lazy_static", + "winapi", +] + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dotenv" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" + +[[package]] +name = "erased-serde" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ca605381c017ec7a5fef5e548f1cfaa419ed0f6df6367339300db74c92aa7d" +dependencies = [ + "serde", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "futures-channel" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-macro" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" + +[[package]] +name = "futures-task" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-util" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures-core", + "futures-macro", + "futures-sink", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "ghost" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41973d4c45f7a35af8753ba3457cc99d406d863941fd7f52663cff54a5ab99b3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "gimli" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec" + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "inventory" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84344c6e0b90a9e2b6f3f9abe5cc74402684e348df7b32adca28747e0cef091a" +dependencies = [ + "ctor", + "ghost", +] + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lexical-sort" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c09e4591611e231daf4d4c685a66cb0410cc1e502027a20ae55f2bb9e997207a" +dependencies = [ + "any_ascii", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "md-5" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys", +] + +[[package]] +name = "object" +version = "0.30.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "phf" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_shared" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "postgres" +version = "0.19.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960c214283ef8f0027974c03e9014517ced5db12f021a9abb66185a5751fab0a" +dependencies = [ + "bytes", + "fallible-iterator", + "futures-util", + "log", + "tokio", + "tokio-postgres", +] + +[[package]] +name = "postgres-protocol" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "878c6cbf956e03af9aa8204b407b9cbf47c072164800aa918c516cd4b056c50c" +dependencies = [ + "base64", + "byteorder", + "bytes", + "fallible-iterator", + "hmac", + "md-5", + "memchr", + "rand", + "sha2", + "stringprep", +] + +[[package]] +name = "postgres-types" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73d946ec7d256b04dfadc4e6a3292324e6f417124750fc5c0950f981b703a0f1" +dependencies = [ + "bytes", + "fallible-iterator", + "postgres-protocol", + "serde", + "serde_json", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "reshape" +version = "0.6.1" +dependencies = [ + "anyhow", + "clap", + "colored", + "dotenv", + "lexical-sort", + "postgres", + "rand", + "serde", + "serde_json", + "toml", + "typetag", + "version", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "stringprep" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "pin-project-lite", + "socket2", + "windows-sys", +] + +[[package]] +name = "tokio-postgres" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29a12c1b3e0704ae7dfc25562629798b29c72e6b1d0a681b6f29ab4ae5e7f7bf" +dependencies = [ + "async-trait", + "byteorder", + "bytes", + "fallible-iterator", + "futures-channel", + "futures-util", + "log", + "parking_lot", + "percent-encoding", + "phf", + "pin-project-lite", + "postgres-protocol", + "postgres-types", + "socket2", + "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-util" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "typetag" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4080564c5b2241b5bff53ab610082234e0c57b0417f4bd10596f183001505b8a" +dependencies = [ + "erased-serde", + "inventory", + "once_cell", + "serde", + "typetag-impl", +] + +[[package]] +name = "typetag-impl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e60147782cc30833c05fba3bab1d9b5771b2685a2557672ac96fa5d154099c0e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "version" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a449064fee414fcc201356a3e6c1510f6c8829ed28bb06b91c54ebe208ce065" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/third_party/nixpkgs/pkgs/development/tools/reshape/default.nix b/third_party/nixpkgs/pkgs/development/tools/reshape/default.nix new file mode 100644 index 0000000000..45e76ccaf6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/reshape/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, fetchpatch +, git +, postgresqlTestHook +, postgresql +}: + +rustPlatform.buildRustPackage rec { + pname = "reshape"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "fabianlindfors"; + repo = pname; + rev = "v${version}"; + hash = "sha256-iX8qhDk0PP0AB3bJ6ck8AZ9SCErFH416ggAkgK8O900="; + }; + + nativeCheckInputs = [ + postgresqlTestHook + postgresql + ]; + + dontUseCargoParallelTests = true; + + postgresqlTestSetupPost = '' + export POSTGRES_CONNECTION_STRING="user=$PGUSER dbname=$PGDATABASE host=$PGHOST" + ''; + + postgresqlTestUserOptions = "LOGIN SUPERUSER"; + + # upstream doesn't ship a Cargo.lock, is generated by the update script + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoLock.lockFile = ./Cargo.lock; + + cargoHash = "sha256-UL/vP8055JRbbf5bqf0V3wGh+iF9ztVhyoMrtNs/c+4="; + + meta = with lib; { + description = "An easy-to-use, zero-downtime schema migration tool for Postgres"; + homepage = "https://github.com/fabianlindfors/reshape"; + license = licenses.mit; + maintainers = with maintainers; [ ilyakooo0 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/revive/default.nix b/third_party/nixpkgs/pkgs/development/tools/revive/default.nix index 8179f117fd..9b75282fbf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/revive/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/revive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tD6Z7W/sPwHKqvCXjXLlxkGj3FZ4+QCv9vn7KdCmSv4="; + sha256 = "sha256-pWX3dZqZ9UZ/k8c1K0xAgonsxZVrutWJ1PROQusO9vQ="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -18,7 +18,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorSha256 = "sha256-sa4OkTSRyoPFXTGmjpiqBug+EKgxkcJrNxQwbTRfN2A="; + vendorHash = "sha256-IfayKnHCe1HHSi7YPNz8Wlz1TSAiVGs0rxpY9HYG3s8="; ldflags = [ "-s" @@ -35,7 +35,7 @@ buildGoModule rec { # The following tests fail when built by nix: # - # $ nix log /nix/store/build-revive.1.2.4.drv | grep FAIL + # $ nix log /nix/store/build-revive.1.2.5.drv | grep FAIL # # --- FAIL: TestAll (0.01s) # --- FAIL: TestTimeEqual (0.00s) diff --git a/third_party/nixpkgs/pkgs/development/tools/riot-redis/default.nix b/third_party/nixpkgs/pkgs/development/tools/riot-redis/default.nix index 945da3b0e3..55ac4e8399 100644 --- a/third_party/nixpkgs/pkgs/development/tools/riot-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/riot-redis/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "riot-redis"; - version = "2.18.5"; + version = "2.19.0"; src = fetchzip { url = "https://github.com/redis-developer/riot/releases/download/v${version}/riot-redis-${version}.zip"; - sha256 = "sha256-XMcWNsQpFG1ovIIXGMURV5IVrL3+Aq2qls+r4IZbBl8="; + sha256 = "sha256-q2ZqFVdjg5HSH4kiwoC1W+a8VgHNxBgNeMaw5n97isc="; }; buildInputs = [ jre_headless ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix b/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix index 697d39d99f..c15cb643c6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix @@ -4,8 +4,12 @@ , rustPlatform , pkg-config , openssl +, darwin }: +let + inherit (darwin.apple_sdk.frameworks) CoreServices; +in rustPlatform.buildRustPackage rec { pname = "rojo"; version = "7.2.1"; @@ -26,8 +30,13 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices ]; + # tests flaky on darwin on hydra + doCheck = !stdenv.isDarwin; + meta = with lib; { description = "Project management tool for Roblox"; longDescription = '' @@ -38,7 +47,5 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/rojo-rbx/rojo/raw/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ wackbyte ]; - # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix b/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix index d58a7b49bb..2d1b2ffa08 100644 --- a/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "roswell"; - version = "22.12.14.112"; + version = "22.12.14.113"; src = fetchFromGitHub { owner = "roswell"; repo = pname; rev = "v${version}"; - hash = "sha256-Aqgv2WPmQDuBR4/OgjPeC+kzHL3DrImL24z7fbsfGRo="; + hash = "sha256-tNOkZcdjwvrsleWMtcQ76KMBnssnuYQU3gqXnBVPN6w="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix b/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix index fcad6097d0..f8319fe6c2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix @@ -1,22 +1,27 @@ { lib , rustPlatform , fetchFromGitHub +, installShellFiles , stdenv , darwin }: rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.226"; + version = "0.0.239"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1JLzDkwcC1EnJfJ03h3NZT+NxKMzhmCsDY2ATjgqM8w="; + sha256 = "sha256-ogAy1HrkoG7PWvDd4HlqTVNjrWpyWw2B+E9DANCoJNo="; }; - cargoSha256 = "sha256-JK89z52fMV3BC2UO90F2j5fV5Skp7yN0vtTf4YOHnVs="; + cargoSha256 = "sha256-C5ZOV2EUiV4W3J3jXS+aDyL3w+Rjx1YGTaE8ikqB2VQ="; + + nativeBuildInputs = [ + installShellFiles + ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices @@ -25,6 +30,13 @@ rustPlatform.buildRustPackage rec { # building tests fails with `undefined symbols` doCheck = false; + postInstall = '' + installShellCompletion --cmd ruff \ + --bash <($out/bin/ruff generate-shell-completion bash) \ + --fish <($out/bin/ruff generate-shell-completion fish) \ + --zsh <($out/bin/ruff generate-shell-completion zsh) + ''; + meta = with lib; { description = "An extremely fast Python linter"; homepage = "https://github.com/charliermarsh/ruff"; diff --git a/third_party/nixpkgs/pkgs/development/tools/run/default.nix b/third_party/nixpkgs/pkgs/development/tools/run/default.nix index 89ccdaf7ec..c6ee65d79c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/run/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/run/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "run"; - version = "0.9.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "TekWizely"; repo = "run"; rev = "v${version}"; - sha256 = "sha256-ClSB+v153Tj1cKLSmT9Z0IEyc+OABPeG519PzT03pX0="; + sha256 = "sha256-EIzIkew1JXPeUN3guLEjAwR0kBDrMkQtSUiBJd+Ww7E="; }; - vendorSha256 = "sha256-4n8RRnDNu1Khv3V5eUB/eaFFJGVD/GdqMOywksc2LPw="; + vendorHash = "sha256-BAyhuE9hGGDfDGmXQ7dseUvHlK5vC87uLT78lHSvLeg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index 444db11732..cc2cb444a5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -17,19 +17,19 @@ let passthru.tests = { simple-c = runCommandCC "simple-c-bindgen-tests" { } '' echo '#include ' > a.c - ${self}/bin/bindgen a.c --whitelist-function atoi | tee output + ${self}/bin/bindgen a.c --allowlist-function atoi | tee output grep atoi output touch $out ''; simple-cpp = runCommandCC "simple-cpp-bindgen-tests" { } '' echo '#include ' > a.cpp - ${self}/bin/bindgen a.cpp --whitelist-function erf -- -xc++ | tee output + ${self}/bin/bindgen a.cpp --allowlist-function erf -- -xc++ | tee output grep erf output touch $out ''; with-lib = runCommandCC "zlib-bindgen-tests" { buildInputs = [ zlib ]; } '' echo '#include ' > a.c - ${self}/bin/bindgen a.c --whitelist-function compress | tee output + ${self}/bin/bindgen a.c --allowlist-function compress | tee output grep compress output touch $out ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/unwrapped.nix b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/unwrapped.nix index 3a4cd640d9..f9e8038b6b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -7,15 +7,15 @@ let rustfmt-nightly = rustfmt.override { asNightly = true; }; in rustPlatform.buildRustPackage rec { pname = "rust-bindgen-unwrapped"; - version = "0.61.0"; + version = "0.63.0"; src = fetchCrate { pname = "bindgen-cli"; inherit version; - sha256 = "sha256-sKcKIAkUC2GfAZ4tJBNweXhoFzqO95iCpHgekpOyHzc="; + sha256 = "sha256-qynsHbcljbJyi4wq9AxEE7KIclnDqNTMFAW366JhBSo="; }; - cargoSha256 = "sha256-P246tw5Kznpxav0LashIkLlmQGVB+aKbFUQQdmcASPw="; + cargoSha256 = "sha256-nOPJo6vWMAcG9VG03uceYyLiJfomFERViDCZ0vFnenY="; buildInputs = [ clang.cc.lib ]; @@ -24,7 +24,7 @@ in rustPlatform.buildRustPackage rec { ''; doCheck = true; - checkInputs = [ clang ]; + nativeCheckInputs = [ clang ]; RUSTFMT = "${rustfmt-nightly}/bin/rustfmt"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix index 88b99889f1..b3b49da4a4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/default.nix @@ -9,24 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-8476jJK1oiXVX9G09NSL+xvXZdZ+h7grCHC6R0XXewo="; + sha256 = "sha256-zr9Y07VoW8XQELzw7C1QT8Ared8ntH9yjncZqZJ1uj4="; }; - cargoPatches = [ - # update mimalloc to fix build with older apple sdks - ./update-mimalloc.patch - - # enable pkg-config feature of zstd - ./zstd-pkg-config.patch - ]; - - cargoSha256 = "sha256-EFpkBWQSWYyMrUa9Dh+n9kDNmXL/2yuEmFN3DcPeE7U="; + cargoSha256 = "sha256-L01NvZbJggOMcoBLXZw8peiCQxA1DPqnrZVx2pMb40o="; nativeBuildInputs = [ pkg-config ]; @@ -34,6 +26,8 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; + ZSTD_SYS_USE_PKG_CONFIG = true; + meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; homepage = "https://github.com/EmbarkStudios/cargo-about"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/update-mimalloc.patch b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/update-mimalloc.patch deleted file mode 100644 index 2d467fb811..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/update-mimalloc.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -829,9 +829,9 @@ checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" - - [[package]] - name = "libmimalloc-sys" --version = "0.1.24" -+version = "0.1.26" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7705fc40f6ed493f73584abbb324e74f96b358ff60dfe5659a0f8fc12c590a69" -+checksum = "8fc093ab289b0bfda3aa1bdfab9c9542be29c7ef385cfcbe77f8c9813588eb48" - dependencies = [ - "cc", - ] -@@ -884,9 +884,9 @@ dependencies = [ - - [[package]] - name = "mimalloc" --version = "0.1.28" -+version = "0.1.30" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b0dfa131390c2f6bdb3242f65ff271fcdaca5ff7b6c08f28398be7f2280e3926" -+checksum = "76ce6a4b40d3bff9eb3ce9881ca0737a85072f9f975886082640cd46a75cdb35" - dependencies = [ - "libmimalloc-sys", - ] diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch deleted file mode 100644 index ea8b67085f..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-about/zstd-pkg-config.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -207,6 +207,7 @@ dependencies = [ - "toml_edit", - "twox-hash", - "url", -+ "zstd", - ] - - [[package]] -@@ -1093,6 +1094,12 @@ version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -+[[package]] -+name = "pkg-config" -+version = "0.3.26" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" -+ - [[package]] - name = "ppv-lite86" - version = "0.2.16" -@@ -2045,4 +2052,5 @@ checksum = "2141bed8922b427761470e6bbfeff255da94fa20b0bbeab0d9297fcaf71e3aa7" - dependencies = [ - "cc", - "libc", -+ "pkg-config", - ] ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -80,6 +80,8 @@ toml_edit = "0.15" - twox-hash = "1.6" - # Url parsing - url = "2.2" -+# Use pkg-config feature of zstd -+zstd = { version = "*", features = ["pkg-config"] } - - [dev-dependencies] - # Filesystems - Filesystem fixtures and assertions for testing diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-careful/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-careful/default.nix new file mode 100644 index 0000000000..ae3e0f1631 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-careful/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-careful"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "RalfJung"; + repo = "cargo-careful"; + rev = "v${version}"; + hash = "sha256-kKF/Fp6RCF9PUdgqeo2e4vLVhl8+5M4oa0Q18ZdXJRc="; + }; + + cargoHash = "sha256-rhTi4rHfU+ZgNAMXSX7r5k3NfMUPNjHIUDs6FzeqcWk="; + + meta = with lib; { + description = "A tool to execute Rust code carefully, with extra checking along the way"; + homepage = "https://github.com/RalfJung/cargo-careful"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix index 5a47ce4826..55658c5544 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-crev/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration Security CoreFoundation libiconv curl ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; meta = with lib; { description = "A cryptographically verifiable code review system for the cargo (Rust) package manager"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix index 2eb2ddd2d9..0472dd8dfa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deb/default.nix @@ -1,49 +1,41 @@ -{ stdenv -, lib -, fetchFromGitHub +{ lib , rustPlatform -, rust -, libiconv -, Security +, fetchFromGitHub +, makeWrapper +, dpkg }: rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.30.0"; + version = "1.42.0"; src = fetchFromGitHub { - owner = "mmstick"; + owner = "kornelski"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rAmG6Aj0D9dHVueh1BN1Chhit+XFhqGib1WTvMDy0LI="; + hash = "sha256-5IWx9tScm64Rwi6RMsbXl1Eajtc/c5PWaZEDrgibTAY="; }; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; + cargoHash = "sha256-nwCfUxIrr4DxKqePu/vwxfLld08+GGXZwQWz6Gltmao="; - cargoSha256 = "sha256-MEpyEdjLWNZvqE7gJLvQ169tgmJRzec4vqQI9fF3xr8="; + nativeBuildInputs = [ + makeWrapper + ]; - preCheck = '' - substituteInPlace tests/command.rs \ - --replace 'target/debug' "target/${rust.toRustTarget stdenv.buildPlatform}/release" + # This is an FHS specific assert depending on glibc location + checkFlags = [ + "--skip=dependencies::resolve_test" + ]; - # This is an FHS specific assert depending on glibc location - substituteInPlace src/dependencies.rs \ - --replace 'assert!(deps.iter().any(|d| d.starts_with("libc")));' '// no libc assert here' + postInstall = '' + wrapProgram $out/bin/cargo-deb \ + --prefix PATH : ${lib.makeBinPath [ dpkg ]} ''; meta = with lib; { - description = "Generate Debian packages from information in Cargo.toml"; - homepage = "https://github.com/mmstick/cargo-deb"; + description = "A cargo subcommand that generates Debian packages from information in Cargo.toml"; + homepage = "https://github.com/kornelski/cargo-deb"; license = licenses.mit; - # test failures: - # control::tests::generate_scripts_generates_maintainer_scripts_for_unit - # dh_installsystemd::tests::find_units_in_empty_dir_finds_nothing - # dh_lib::tests::apply_with_no_matching_files - # dh_lib::tests::debhelper_script_subst_with_generated_file_only - # dh_lib::tests::debhelper_script_subst_with_no_matching_files - # dh_lib::tests::pkgfile_finds_most_specific_match_without_pkg_file - # dh_lib::tests::pkgfile_finds_most_specific_match_without_unit_file - broken = (stdenv.isDarwin && stdenv.isx86_64); maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix index f5ccafc481..12d0340230 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.11.7"; + version = "0.11.8"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-u0t/Zh427ZWN1wJ1LISEWa/2r0gAnpWUf8C8eLGA7wc="; + hash = "sha256-v6EhYfdub4zuWX5oPzNWpqEgv0qoZujt00SCP+RoKfU="; }; - cargoSha256 = "sha256-hQvxcS3DXY4SZiEKQSST5GQ40BMNDKSkwi3AqQstJvc="; + cargoSha256 = "sha256-R7FFWVOpzQ/u/KVnJQuYwLmmqei2ZymP610XrA5HZr0="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix index 03eecf8a31..94ee2371ce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix @@ -1,28 +1,27 @@ { lib , stdenv , rustPlatform -, fetchFromGitHub +, fetchCrate , libusb1 , libftdi1 , pkg-config -, rustfmt +, DarwinTools , AppKit }: rustPlatform.buildRustPackage rec { pname = "cargo-embed"; - version = "0.13.0"; + version = "0.16.0"; - src = fetchFromGitHub { - owner = "probe-rs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-UlQ7KJmzPWu0vVsYPIkYeqkFFhxe7mEMfUVN7iMaUw0="; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-YAeE3pDw5xqSn4rAv3lxJtKQHki1bf97CJHBEK8JoiA="; }; - cargoSha256 = "sha256-RkYX5z764Kkr0xK7yYQ0lCw0/7KpmdJmKWqLzwkj4hs="; + cargoSha256 = "sha256-p6d8vdiAVkufTQv3FliKCBgF5ZXM24UnG96EzlpyfZE="; + + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; - nativeBuildInputs = [ pkg-config rustfmt ]; buildInputs = [ libusb1 libftdi1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; buildFeatures = [ "ftdi" ]; @@ -30,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A cargo extension for working with microcontrollers"; homepage = "https://probe.rs/"; - changelog = "https://github.com/probe-rs/cargo-embed/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/cargo-embed/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker newam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index 6112b01e79..3798c766d2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,30 +1,26 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub -, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.37"; + version = "1.0.39"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-BdaOtbZ+F1cgoZRmoQM/5Rzx4OUHmqSnsApeNfWz+J8="; + sha256 = "sha256-wJyCRg6qvkjjaFuFK6hTqt3u7ugFKAc9K4M/BojND6o="; }; - cargoHash = "sha256-2wD0QJFTW8cIv8S1JSgffBqlcPOVd151WuKlaZF+6aA="; - - buildInputs = lib.optional stdenv.isDarwin libiconv; + cargoHash = "sha256-n4fraxlMtkVNNmteVBoS6BlS0qE6bpFL/fKRp2pjxIs="; meta = with lib; { - description = - "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; + description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; homepage = "https://github.com/dtolnay/cargo-expand"; + changelog = "https://github.com/dtolnay/cargo-expand/releases/tag/${version}"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ figsoda xrelkd ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix index 537392a65b..3fd76ed2bc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix @@ -1,33 +1,31 @@ { lib , stdenv , rustPlatform -, fetchFromGitHub +, fetchCrate , libusb1 , pkg-config -, rustfmt +, DarwinTools , AppKit }: rustPlatform.buildRustPackage rec { pname = "cargo-flash"; - version = "0.13.0"; + version = "0.16.0"; - src = fetchFromGitHub { - owner = "probe-rs"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-O6T1Wul0nJaTVp9MEOj9FT+FUt4oYfqR5pGFaAxuK30="; + src = fetchCrate { + inherit pname version; + sha256 = "sha256-Zwb9jUZwkvuBzvACMwKwpAHEMkjLVDkXfDLo4ntG3+k="; }; - cargoSha256 = "sha256-E2gBkr50hjkzY+ZVgMm7tpdwr9yuyFh65Ht6FAPvxYg="; + cargoSha256 = "sha256-giGSTMtGTIw4ZZglHqbW2sGKO/D/3TVQR5olTgitBjE="; - nativeBuildInputs = [ pkg-config rustfmt ]; + nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { description = "A cargo extension for working with microcontrollers"; homepage = "https://probe.rs/"; - changelog = "https://github.com/probe-rs/cargo-flash/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/cargo-flash/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ fooker newam ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix index d8fdd4e0d9..da90015752 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/default.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.17.5"; + version = "0.17.6"; src = fetchFromGitHub { owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-VKhlPg4H04HdfIgXCXx560oFRwxPotGnGfczZ8PfVog="; + sha256 = "sha256-SDcJmEh4DBxe6icKom559B8tkvl0dbXUeACwH69PZRM="; }; # patch Cargo.toml to not vendor libgit2 and openssl cargoPatches = [ ./no-vendor.patch ]; - cargoSha256 = "sha256-TbmivH9LXwESpqk2RFEZYZRDlLyuAyek8JxQEROsPYs="; + cargoSha256 = "sha256-wbovccAWeAPa8xbVhM2TGiLcqQYGBvGnS5/05672QKU="; nativeBuildInputs = [ pkg-config ]; @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; preCheck = '' export HOME=$(mktemp -d) USER=nixbld diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/no-vendor.patch b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/no-vendor.patch index b7788d3d65..c8233cd5dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/no-vendor.patch +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-generate/no-vendor.patch @@ -4,8 +4,8 @@ [dependencies] clap = { version = "4.0", features = ["derive", "std", "help"], default-features = false } --git2 = { version = "0.15", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false } -+git2 = { version = "0.15", features = ["ssh", "https"], default-features = false } +-git2 = { version = "0.16", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false } ++git2 = { version = "0.16", features = ["ssh", "https"], default-features = false } console = "0.15" dialoguer = "0.10" dirs = "4.0" diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix index a951076a07..2ea51ee354 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-guppy"; - version = "unstable-2023-01-14"; + version = "unstable-2023-01-19"; src = fetchFromGitHub { owner = "guppy-rs"; repo = "guppy"; - rev = "d593660fbcbfe50569de5a8aad5bd1ac19885733"; - sha256 = "sha256-5kJTkVAklaSWqGIRjVJX56e8cjxyKAx/2E54OF0mIuw="; + rev = "0f2e0627d430fa6488980f2808c472ae406d3603"; + sha256 = "sha256-7ADq5yDVpYn91K/rbXWxp0+34twQ8LArD+vVd48tee4="; }; - cargoSha256 = "sha256-H2ta/eH2VzEzHbYs0ugzFseLh0S5lxhB7/wvJEFGj0M="; + cargoSha256 = "sha256-oVG3x0yGTqNKMaqkOJhfhqRWNwAkUgfkGr7Vxr+nY4I="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix index a63af24765..61bc713748 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.5.26"; + version = "0.5.27"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ZVR3bycEWpOV4T/85OsERNjKooz2rwBF5kMSEfHnmEI="; + sha256 = "sha256-oiCZiwJr1BqMCWCNUOTQT3XPX0QZRr0wLewf8OU6lHA="; }; - cargoSha256 = "sha256-4TChr6dKxUerpuaX63WShrWyXTLH4m85P6E30a5rmH8="; + cargoSha256 = "sha256-g5O51V4BPNqzsQo1prLIpamqwcOy+SJat2Rb5UDHRLc="; # some necessary files are absent in the crate version doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hakari/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hakari/default.nix index 7c48a87454..ef44a35249 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hakari/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hakari/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hakari"; - version = "0.9.21"; + version = "0.9.23"; src = fetchFromGitHub { owner = "guppy-rs"; repo = "guppy"; rev = "cargo-hakari-${version}"; - sha256 = "sha256-wra3p3WAcGpsvW0DMMqWKFbAsrDTDnrYWQd6HS3sEls="; + sha256 = "sha256-Ewki2Ux233WEW7x3jgpdeMH6xoMYJQ9X3vP8CqY+0hc="; }; - cargoHash = "sha256-aNsG3ZmTMc5myOVs4h7uI5I5jjnjPd8AC2H7sSGmtHk="; + cargoHash = "sha256-IpTWyp0o6OKS8h0U8ybC2Io3Tbs592UBzAWmd8zEm2I="; cargoBuildFlags = [ "-p" "cargo-hakari" ]; cargoTestFlags = [ "-p" "cargo-hakari" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix index 67cd2ae525..37ecf56426 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-limit"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "alopatindev"; repo = "cargo-limit"; rev = version; - sha256 = "sha256-GRitz9LOdZhbakbLZI2BUfZjqXLrsMK2MQJgixiEHaA="; + sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk="; }; - cargoSha256 = "sha256-uiANH9HOvy41FiABTTx2D9Rz1z/F7eITc5aiofaMSfI="; + cargoSha256 = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 5805bd971e..28be262ca7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-cov"; - version = "0.5.8"; + version = "0.5.9"; src = fetchzip { url = "https://crates.io/api/v1/crates/${pname}/${version}/download#${pname}-${version}.tar.gz"; - sha256 = "sha256-APUr3eSEw//ruDeBG3NeJCgN62A7J+125DiYjg2GktA="; + sha256 = "sha256-GEnEcVYejDMnnJtGTbbMHOC85hYjGFEOIF9/Jdm3288="; }; - cargoSha256 = "sha256-0DetcbwAv8FtIZWH7VQWxjAf6r16nbgWxxQe6lkkT5k="; + cargoSha256 = "sha256-Yk43FM6YswlM/XYJD+XiunFsOY4+n/xVmnIIEo1ogKY="; # skip tests which require llvm-tools-preview checkFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lock/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lock/default.nix index 608faf92a5..b5347f4637 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lock/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-lock/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-lock"; - version = "8.0.2"; + version = "8.0.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-I64LXY8e8ztICS6AKfrNr/7Ntap7ESjindNWEeny6ZA="; + sha256 = "sha256-Xh39gaiTC3g1FHVWqUr8PR/MzeoRaGlCmGZZZnHB4Kc="; }; - cargoSha256 = "sha256-Yy7KQvPeyw5YSzUmoxUJAueVzkfQqDPE1j2+L+KifpU="; + cargoSha256 = "sha256-gf9KDzGKjZt4p5ldZShH4lOwrieJeI2WJQ8hU4hhGJE="; buildFeatures = [ "cli" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index 945d89e096..a56cca2ca0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.36.3"; + version = "0.36.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-9P5LoS8wdzJA8vGj9dRxKJYBXaSSzxplpvRc2aqRWlY="; + sha256 = "sha256-motvwMacwqD6MMWxehCV/Eb+8EN9XthcEr0e5DFlvOg="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-NgjBGoJTJNF4HwhDtBDWxcLHfpM6Jk4D9cbKLvojnaI="; + cargoHash = "sha256-/hgCYgWx7hDAUTrDT9ndlk7t/bGXTtDS9Eth3OWkbKM="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix index 52a89b9204..576c9eacd7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - sha256 = "sha256-5j7zTAFUkevhSpiOn8KNG5+N7M9M1+c6hAKpDwPXdBQ="; + sha256 = "sha256-G9ResHOBEqnKsMXVbr8q1rvywFI8LJcb8gR7hMTI0p4="; }; - cargoSha256 = "sha256-jCbs/y0L9YP9VDEtofeqWXbUlsBpVRMbjIYtPRlmQVY="; + cargoSha256 = "sha256-p6mq+P9ntlhjMPHpcwXV9XBlAX6R63Iqastl9ZHI8Vs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix index 8103229bb6..6ed10aee16 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -5,25 +5,27 @@ , openssl , stdenv , curl +, CoreFoundation , Security , SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.11.1"; + version = "0.11.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-vEgYmtRAashBRsGDExewqaGsVYF7EJ4ky+cE/PMFW38="; + sha256 = "sha256-SkFMdE7VAZrT7e5SMrfW8bBA6zPqQV7LhSy3OmshUAs="; }; - cargoSha256 = "sha256-xstcKIXQDk4ngwWSzMueO47U2oFRHAqvvjRnDXFsPE8="; + cargoHash = "sha256-ZcG/4vyrcJNAMiZdR3MFyqX5Udn8wGAfiGT5uP1BSMo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl + CoreFoundation Security SystemConfiguration ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix index 2c21bf90bf..5d1b99f02d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.27.0"; + version = "0.27.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-NpOufmqaNsJeWv0I0PYRMs60rvWnUA3CrwsJ9U/t8Ps="; + sha256 = "sha256-mG+OjoOlpmmCpsAIs3m3FIRO36CrmWWgki9LgoXxiKo="; }; - cargoSha256 = "sha256-eFCqUV5P4QSvxqCjj4Esb/E0PosU5wJK31O92pRt1XA="; + cargoSha256 = "sha256-zfqqreNQhxetldE801e6/5KYFKsywXJVt7oIkm8ldS8="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix index dc48795356..9653d4c556 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 30fda10323..359f5dbe64 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.15.2"; + version = "0.17.1"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+YRyShALdDQDfh5XDY36R29SzbBjlT8mCIucwJ++KrQ="; + sha256 = "sha256-zObflf9BKq24km54LW7It4Lvff0OKYNDb02uatdX7g4="; }; - cargoSha256 = "sha256-wwsFqoQXasCKfnCBF4qGFIoD7Kj53K9IKQ1auuqTPAM="; + cargoSha256 = "sha256-itL6WpM4OLn4mzdB0ytM2J7F1fRDrXwCaI/8WdLo6y0="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 585833ef46..13023a83ef 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8HZBenv2bL6D8TXzjklEFUAnqk7LkYXjtEwxpTbbzr4="; + sha256 = "sha256-XFbpRESpx3ALpWcS29yFXv8vjizc1srHazvDy0jxF94="; }; - cargoSha256 = "sha256-zCk+b7jcR7yDpBUVfKXIozQkcsB+73HosdCmZW9abkA="; + cargoSha256 = "sha256-2DoBvkriSUtgxzZgwt3leEVaqqzfpRNC0YB5sekhje4="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix index e2fde75ba8..55b63dadad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.21"; + version = "1.0.22"; src = fetchCrate { inherit pname version; - sha256 = "sha256-YEsgXIZ4R2w0HOkTV8LOGi2g32nHRs63nhk9yVR4vak="; + sha256 = "sha256-h3w9xxzExDojJw2OIPMT9lQ/lzYQNf9WJVHBP+tOnPw="; }; - cargoSha256 = "sha256-jLbYC862fZONvMHh0CLsiuUmn/hmAF6sRLuav3P+bck="; + cargoSha256 = "sha256-EPYfmRms00AE4NkmOJBnIKYOCFbjd2qwRi6/i09hQ6U="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix index 3f95494014..64bf3fccbc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -16,20 +16,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - sha256 = "sha256-4v0ZlFBVBB+0xWbTRncVwELaZWLKyCmIceTfseXvS8s="; + sha256 = "sha256-BzstYoRZuZTNAkVGqPGYrd/AiWEhoH6t/XezDaFdmVo="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "source/tooling/cli"; - cargoSha256 = "sha256-Hp6+T2CN0CsXaGnCVqAYaOjZNDkmI+MXDfHIgbU1S0g="; + cargoHash = "sha256-t5MlJpQOA5T/EwbPoSD95kATGReiZTmq+JkbDVbRj+0="; buildInputs = lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-temp/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-temp/default.nix index a51185096d..c94c1eb56a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-temp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-temp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-temp"; - version = "0.2.14"; + version = "0.2.15"; src = fetchFromGitHub { owner = "yozhgoor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N5PRwUSUAFwvbyq5Uo6nEr05QqmeA1yI9ru0VRnrXa8="; + sha256 = "sha256-Z6qmtZfnpEZ1/XkmAijDo4nRfZOPW9hEIFTycdOYILk="; }; - cargoSha256 = "sha256-vzru7+EA41kQGciA4q03bvcIYOMGYLAiws35ZMh413g="; + cargoSha256 = "sha256-EDdOnkOk5VIrzjJSTojdjmGAEDPMqW4PPE0JP+GUYnE="; meta = with lib; { description = "A CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix index 5cc3fa39ea..c06420d253 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, CoreServices, Foundation, rust, libiconv }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, Cocoa, CoreServices, Foundation, rust, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "8.1.2"; + version = "8.3.0"; src = fetchFromGitHub { - owner = "passcod"; + owner = "watchexec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zhOYKvsCK5am4Ystt3+cPAQM77IlIBJysAEix5cXKbI="; + hash = "sha256-2keI5hTWglqh+mLeGzRCxpfnUt6kur0I9fefYwZr5l4="; }; - cargoSha256 = "sha256-OAOzrGS8n0jfUiQyIAHWLJMEkRINyasgkIjiLw977LE="; + cargoHash = "sha256-kR12j0Z7nXfwh9nPT35/LpkK56a8D1gvVkl9/2s6rIQ="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ Cocoa CoreServices Foundation libiconv ]; # `test with_cargo` tries to call cargo-watch as a cargo subcommand # (calling cargo-watch with command `cargo watch`) diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 496c8768ed..79822a7735 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OHr+VCYt+w1VWv6XAfMZv0I7IZJ1m0UtErgMonGytns="; + sha256 = "sha256-4Sp3PVhUvXn7FzPHHyyRBUHY5TQYEPLFdoI4ARQ4V0k="; }; - cargoSha256 = "sha256-tOJNQLPWpCqHCFRk85PW91axUTljo8YoeWUpPrl8P4c="; + cargoSha256 = "sha256-QplcedhsqFiAwcqBrEe2ns4DdZ+R/IuoKtkx8eGk19g="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index 69307e8091..372f368797 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin Security; - checkInputs = [ + nativeCheckInputs = [ python3Packages.cython ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix index 43f49a28d2..b005ae9192 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/duckscript/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "duckscript_cli"; - version = "0.8.16"; + version = "0.8.17"; src = fetchCrate { inherit pname version; - sha256 = "sha256-H9lZIIJrE6onqGHw0l8Y58IW9EAcQ7eCHxgqqeSLgGY="; + sha256 = "sha256-fEAm7HhRGYZpGL9I8h3wX8AnPs00pG/ui7Rm+PaXJpA="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-DQw3DDOUo4ogf6PIY7/1U0uiyX8dpXE5D2P8QDdie9M="; + cargoHash = "sha256-kll2q5HhcpizBDbWipj30F8WEQnjG1fndxCHoXBbik8="; meta = with lib; { description = "Simple, extendable and embeddable scripting language."; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/panamax/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/panamax/default.nix index 0d040afd42..6dd1d5e32b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/panamax/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/panamax/default.nix @@ -1,19 +1,34 @@ -{ lib, rustPlatform, fetchCrate, pkg-config, openssl, stdenv, Security }: +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, libgit2 +, openssl +, zlib +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "panamax"; - version = "1.0.3"; + version = "1.0.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-w4waFdzd/Ps0whOp39QLBE/YF2eyc4t2Ili7FskUt1M="; + sha256 = "sha256-/JW2QB5PtwKo0TLU/QmkgsE6/ne+51EVmWyGn7Lljdw="; }; - cargoSha256 = "sha256-52snmkTFHI26xJo9qJkmqh1M5lLzhDxw8WT6uFd57aw="; + cargoSha256 = "sha256-aKdDismdPcExqznS6S2LvAij6gv9/Hw2FBvkhr9rJGo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ + libgit2 + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; meta = with lib; { description = "Mirror rustup and crates.io repositories for offline Rust and cargo usage"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs-cli/default.nix index 3f26e4bd3a..d4140bc0b5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs-cli/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-rs-cli"; - version = "0.14.0"; + version = "0.16.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-y9EHksRDVbw58XiV7/dKzy4p6OWWAkQ3X9LP/WDWD2c="; + sha256 = "sha256-YNOD0hDDQ6M496m9lps28UX41pMO1r/CE30rcS53h48="; }; - cargoSha256 = "sha256-vv8XSAsGs1M97Y6cIGYevCdaxmPy3aDmHFF00exumq8="; + cargoSha256 = "sha256-/1bnDtfNxnOI4Inmnd+r2epT236ghQsiNuoAuROEfPM="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ DarwinTools ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix index 59d9f7c6d5..0033a1c5f0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/probe-run/default.nix @@ -3,6 +3,7 @@ , rustPlatform , fetchCrate , pkg-config +, DarwinTools , libusb1 , libiconv , AppKit @@ -11,17 +12,19 @@ rustPlatform.buildRustPackage rec { pname = "probe-run"; - version = "0.3.5"; + version = "0.3.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-C9JxQVsS1Bv9euQ7l+p5aehiGLKdrUMcno9z8UoZKR4="; + sha256 = "sha256-HYFVdj1kASu+VKnDJA35zblPsgUeYC9YVlS84Hkx1Sk="; }; - cargoSha256 = "sha256-kmdRwAq6EOniGHC7JhB6Iov1E4hbQbxHlOcc6gUDOhY="; + cargoSha256 = "sha256-nhs9qNFd1GK70sL5sPPeMazuPUP67epHayXnw3aXTfk="; nativeBuildInputs = [ pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + DarwinTools ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 05d20447dc..a90ac2780e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2023-01-16"; - cargoSha256 = "sha256-M0AwSksEUKVw+Eo+D7BnkoKycNRQDOnemIgremXp5fs="; + version = "2023-01-23"; + cargoSha256 = "sha256-NSdHvWN5BIEXZMFiweKYbJayxDqlFmqJp+sIzeORhSU="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-m+EVsqnYIDdabuIs7K+e343RZ7V3mQHijoYuHWS7Dj4="; + sha256 = "sha256-Uq6jngJnf2UqKrOzqMXtq5IVxkU3eNCkmORPdccLxp0="; }; auditable = true; # TODO: remove when this is the default diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustfilt/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rustfilt/default.nix new file mode 100644 index 0000000000..353cdcdbfd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rustfilt/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "rustfilt"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "luser"; + repo = pname; + rev = version; + hash = "sha256-zb1tkeWmeMq7aM8hWssS/UpvGzGbfsaVYCOKBnAKwiQ="; + }; + + cargoSha256 = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE="; + + meta = with lib; { + description = "Demangle Rust symbol names using rustc-demangle"; + homepage = "https://github.com/luser/rustfilt"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ wykurz ]; + mainProgram = "rustfilt"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/sauce-connect/default.nix b/third_party/nixpkgs/pkgs/development/tools/sauce-connect/default.nix index ab75664f5a..69a532ccb5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sauce-connect/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sauce-connect/default.nix @@ -1,7 +1,5 @@ { stdenv, lib, fetchurl, zlib, unzip }: -with lib; - stdenv.mkDerivation rec { pname = "sauce-connect"; version = "4.5.4"; @@ -24,7 +22,7 @@ stdenv.mkDerivation rec { patchPhase = lib.optionalString stdenv.isLinux '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${makeLibraryPath [zlib]}" \ + --set-rpath "$out/lib:${lib.makeLibraryPath [zlib]}" \ bin/sc ''; @@ -35,7 +33,7 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = { + meta = with lib; { description = "A secure tunneling app for executing tests securely when testing behind firewalls"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix index ac684f081f..dcea17d807 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl }: -with lib; - stdenv.mkDerivation rec { pname = "htmlunit-driver-standalone"; version = "2.27"; @@ -15,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = "install -D $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar"; - meta = { + meta = with lib; { homepage = "https://github.com/SeleniumHQ/htmlunit-driver"; description = "A WebDriver server for running Selenium tests on the HtmlUnit headless browser"; maintainers = with maintainers; [ coconnor offline ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix index d18ca0012d..66a9b97d0d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selenium/selendroid/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }: -with lib; let pname = "selendroid-standalone"; pluginName = "selendroid-grid-plugin-${version}"; @@ -39,7 +38,7 @@ stdenv.mkDerivation { --add-flags "-capabilityMatcher io.selendroid.grid.SelendroidCapabilityMatcher" ''; - meta = { + meta = with lib; { homepage = "http://selendroid.io/"; description = "Test automation for native or hybrid Android apps and the mobile web"; maintainers = with maintainers; [ offline ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/server/default.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/server/default.nix index 56ff4f3ad3..b1cc26bec5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selenium/server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selenium/server/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, jre , htmlunit-driver, chromedriver, chromeSupport ? true }: -with lib; - let minorVersion = "3.141"; patchVersion = "59"; @@ -26,11 +24,11 @@ in stdenv.mkDerivation rec { cp $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar makeWrapper ${jre}/bin/java $out/bin/selenium-server \ --add-flags "-cp $out/share/lib/${pname}-${version}/${pname}-${version}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \ - ${optionalString chromeSupport "--add-flags -Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \ + ${lib.optionalString chromeSupport "--add-flags -Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \ --add-flags "org.openqa.grid.selenium.GridLauncherV3" ''; - meta = { + meta = with lib; { homepage = "http://www.seleniumhq.org/"; description = "Selenium Server for remote WebDriver"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/simavr/default.nix b/third_party/nixpkgs/pkgs/development/tools/simavr/default.nix index 8aa9ccd538..11b146e55c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/simavr/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/simavr/default.nix @@ -1,9 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, libelf, which, pkg-config, freeglut +{ lib, stdenv, makeSetupHook, fetchFromGitHub, libelf, which, pkg-config, freeglut , avrgcc, avrlibc , libGLU, libGL , GLUT }: -stdenv.mkDerivation rec { +let + setupHookDarwin = makeSetupHook { + name = "darwin-avr-gcc-hook"; + substitutions = { + darwinSuffixSalt = stdenv.cc.suffixSalt; + avrSuffixSalt = avrgcc.suffixSalt; + }; + } ./setup-hook-darwin.sh; +in stdenv.mkDerivation rec { pname = "simavr"; version = "1.7"; @@ -22,9 +30,8 @@ stdenv.mkDerivation rec { "AVR=avr-" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; - - nativeBuildInputs = [ which pkg-config avrgcc ]; + nativeBuildInputs = [ which pkg-config avrgcc ] + ++ lib.optional stdenv.isDarwin setupHookDarwin; buildInputs = [ libelf freeglut libGLU libGL ] ++ lib.optional stdenv.isDarwin GLUT; @@ -35,7 +42,6 @@ stdenv.mkDerivation rec { checkTarget = "-C tests run_tests"; meta = with lib; { - broken = stdenv.isDarwin; description = "A lean and mean Atmel AVR simulator"; homepage = "https://github.com/buserror/simavr"; license = licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/development/tools/simavr/setup-hook-darwin.sh b/third_party/nixpkgs/pkgs/development/tools/simavr/setup-hook-darwin.sh new file mode 100644 index 0000000000..3861e45973 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/simavr/setup-hook-darwin.sh @@ -0,0 +1,34 @@ + +fixupCFlagsForDarwin() { + # Because it’s getting called from a Darwin stdenv, avr-gcc will pick up on + # Darwin-specific flags, and it will barf and die on -iframework in + # particular. Strip them out, so simavr can compile its test firmware. + cflagsFilter='s|-F[^ ]*||g;s|-iframework [^ ]*||g;s|-isystem [^ ]*||g;s| *| |g' + + # The `CoreFoundation` reference is added by `linkSystemCoreFoundationFramework` in the + # Apple SDK’s setup hook. Remove that because avr-gcc will fail due to file not found. + ldFlagsFilter='s|/nix/store/[^-]*-apple-framework-CoreFoundation[^ ]*||g' + + # `cc-wrapper.sh`` supports getting flags from a system-specific salt. While it is currently a + # tuple, that’s not considered a stable interface, so the derivation will provide them. + export NIX_CFLAGS_COMPILE_@darwinSuffixSalt@=${NIX_CFLAGS_COMPILE-} + export NIX_LDFLAGS_@darwinSuffixSalt@=${NIX_LDFLAGS-} + + echo removing @darwinSuffixSalt@-specific flags from NIX_CFLAGS_COMPILE for @avrSuffixSalt@ + export NIX_CFLAGS_COMPILE_@avrSuffixSalt@+="$(sed "$cflagsFilter" <<< "$NIX_CFLAGS_COMPILE")" + echo removing @darwinSuffixSalt@-specific flags from NIX_LDFLAGS for @avrSuffixSalt@ + export NIX_LDFLAGS_@avrSuffixSalt@+="$(sed "$ldFlagsFilter;$cflagsFilter" <<< "$NIX_LDFLAGS")" + + # Make sure the global flags aren’t accidentally influencing the platform-specific flags. + export NIX_CFLAGS_COMPILE="" + export NIX_LDFLAGS="" +} + +# This is pretty hacky, but this hook _must_ run after `linkSystemCoreFoundationFramework`. +function runFixupCFlagsForDarwinLast() { + preConfigureHooks+=(fixupCFlagsForDarwin) +} + +if [ -z "${dontFixupCFlagsForDarwin-}" ]; then + postUnpackHooks+=(runFixupCFlagsForDarwinLast) +fi diff --git a/third_party/nixpkgs/pkgs/development/tools/skjold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skjold/default.nix index 173de27d94..a8334a0a5e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skjold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skjold/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { toml ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-mock pytest-watch pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix index aaae3082d3..08bcde3ae5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -16,18 +16,18 @@ buildGoModule rec { pname = "skopeo"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-Q6gdkaIYTDUqDbjmE9TcRtQcHjpOJ3bXLJtN8NPp9KA="; + hash = "sha256-P556Is03BeC0Tf+kNv+Luy0KASgTXsyZ/MrPaPFUHE8="; }; outputs = [ "out" "man" ]; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/summon/default.nix b/third_party/nixpkgs/pkgs/development/tools/summon/default.nix index 2ed17061c2..ab618253e7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/summon/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/summon/default.nix @@ -1,7 +1,5 @@ { buildGoModule, fetchFromGitHub, lib, patchResolver ? true }: -with lib; - buildGoModule rec { pname = "summon"; version = "0.8.2"; @@ -19,7 +17,7 @@ buildGoModule rec { # Patches provider resolver to support resolving unqualified names # from $PATH, e.g. `summon -p gopass` instead of `summon -p $(which gopass)` - patches = optionals patchResolver [ ./resolve-paths.patch ]; + patches = lib.optionals patchResolver [ ./resolve-paths.patch ]; postInstall = '' mv $out/bin/cmd $out/bin/summon diff --git a/third_party/nixpkgs/pkgs/development/tools/swiftpm2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/swiftpm2nix/default.nix new file mode 100644 index 0000000000..25d6b06ef9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/swiftpm2nix/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, callPackage, makeWrapper, jq, nix-prefetch-git }: + +stdenv.mkDerivation { + name = "swiftpm2nix"; + + nativeBuildInputs = [ makeWrapper ]; + + dontUnpack = true; + + installPhase = '' + install -vD ${./swiftpm2nix.sh} $out/bin/swiftpm2nix + wrapProgram $out/bin/$name \ + --prefix PATH : ${lib.makeBinPath [ jq nix-prefetch-git ]} \ + ''; + + preferLocalBuild = true; + + passthru = callPackage ./support.nix { }; + + meta = { + description = "Generate a Nix expression to fetch swiftpm dependencies"; + maintainers = with lib.maintainers; [ dtzWill trepetti dduan trundle stephank ]; + platforms = lib.platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/swiftpm2nix/support.nix b/third_party/nixpkgs/pkgs/development/tools/swiftpm2nix/support.nix new file mode 100644 index 0000000000..94076517eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/swiftpm2nix/support.nix @@ -0,0 +1,56 @@ +{ lib, fetchgit, formats }: +with lib; +let + json = formats.json { }; +in rec { + + # Derive a pin file from workspace state. + mkPinFile = workspaceState: + assert workspaceState.version == 5; + json.generate "Package.resolved" { + version = 1; + object.pins = map (dep: { + package = dep.packageRef.name; + repositoryURL = dep.packageRef.location; + state = dep.state.checkoutState; + }) workspaceState.object.dependencies; + }; + + # Make packaging helpers from swiftpm2nix generated output. + helpers = generated: let + inherit (import generated) workspaceStateFile hashes; + workspaceState = builtins.fromJSON (builtins.readFile workspaceStateFile); + pinFile = mkPinFile workspaceState; + in rec { + + # Create fetch expressions for dependencies. + sources = listToAttrs ( + map (dep: nameValuePair dep.subpath (fetchgit { + url = dep.packageRef.location; + rev = dep.state.checkoutState.revision; + sha256 = hashes.${dep.subpath}; + })) workspaceState.object.dependencies + ); + + # Configure phase snippet for use in packaging. + configure = '' + mkdir -p .build/checkouts + ln -sf ${pinFile} ./Package.resolved + install -m 0600 ${workspaceStateFile} ./.build/workspace-state.json + '' + + concatStrings (mapAttrsToList (name: src: '' + ln -s '${src}' '.build/checkouts/${name}' + '') sources) + + '' + # Helper that makes a swiftpm dependency mutable by copying the source. + swiftpmMakeMutable() { + local orig="$(readlink .build/checkouts/$1)" + rm .build/checkouts/$1 + cp -r "$orig" .build/checkouts/$1 + chmod -R u+w .build/checkouts/$1 + } + ''; + + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh b/third_party/nixpkgs/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh new file mode 100755 index 0000000000..72051b4e44 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/swiftpm2nix/swiftpm2nix.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +# Generates a Nix expression to fetch swiftpm dependencies, and a +# configurePhase snippet to prepare a working directory for swift-build. + +set -eu -o pipefail +shopt -s lastpipe + +stateFile=".build/workspace-state.json" +if [[ ! -f "$stateFile" ]]; then + echo >&2 "Missing $stateFile. Run 'swift package resolve' first." + exit 1 +fi + +if [[ "$(jq .version $stateFile)" != "5" ]]; then + echo >&2 "Unsupported $stateFile version" + exit 1 +fi + +# Iterate dependencies and prefetch. +hashes="" +jq -r '.object.dependencies[] | "\(.subpath) \(.packageRef.location) \(.state.checkoutState.revision)"' $stateFile \ +| while read -r name url rev; do + echo >&2 "-- Fetching $name" + sha256="$(nix-prefetch-git $url $rev | jq -r .sha256)" + hashes+=" + \"$name\" = \"$sha256\";" + echo >&2 +done +hashes+=$'\n'" " + +# Generate output. +mkdir -p nix +# Copy the workspace state, but clear 'artifacts'. +jq '.object.artifacts = []' < $stateFile > nix/workspace-state.json +# Build an expression for fetching sources, and preparing the working directory. +cat > nix/default.nix << EOF +# This file was generated by swiftpm2nix. +{ + workspaceStateFile = ./workspace-state.json; + hashes = {$hashes}; +} +EOF +echo >&2 "-- Generated ./nix" diff --git a/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix b/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix new file mode 100644 index 0000000000..a3b8898eac --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ttfb/default.nix @@ -0,0 +1,45 @@ +{ darwin +, fetchCrate +, lib +, openssl +, pkg-config +, rustPlatform +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "ttfb"; + version = "1.6.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-o7kzQ8jtAqDwTUPtjeNqgotxREeWl7jQG+EDrYWJL/Q="; + }; + + cargoSha256 = "sha256-ayyYrrFDVOYVjVo5TLaRn2mvmywe5BjQ7kRVV2r0iK8="; + + # The bin feature activates all dependencies of the binary. Otherwise, + # only the library is build. + buildFeatures = [ "bin" ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + meta = with lib; { + description = "CLI-Tool to measure the TTFB (time to first byte) of HTTP(S) requests"; + longDescription = '' + This crate measures the times of DNS lookup, TCP connect, TLS handshake, and HTTP's TTFB + for a given IP or domain. + ''; + homepage = "https://github.com/phip1611/ttfb"; + changelog = "https://github.com/phip1611/ttfb/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ phip1611 ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix index c9dabfffe0..983e91e62e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix @@ -1,16 +1,14 @@ -{ lib, stdenvNoCC, nodejs, fetchzip, makeBinaryWrapper, testers }: +{ lib, stdenvNoCC, nodejs, fetchzip, testers }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.3.2"; + version = "5.3.3"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-Ld7drg2N+4XUtpsA7Jpg7BrrSWTWBVa1QhuJ+FNOIGw="; + sha256 = "sha256-4ZgPytpv2yxKXADGR4I5+U0YjsvGEvcaF0cGrCJ21aI="; }; - nativeBuildInputs = [ makeBinaryWrapper ]; - buildInputs = [ nodejs ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/txtpbfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/txtpbfmt/default.nix index 3f1c9eab04..a4e26cfb4c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/txtpbfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/txtpbfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "txtpbfmt"; - version = "unstable-2022-06-08"; + version = "unstable-2023-01-18"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "txtpbfmt"; - rev = "fc78c767cd6a4e6e3953f5d72f1e0e4c5811990b"; - sha256 = "sha256-5Pj2REFrzWCzrqdplNlyfX+sJqPjXEld6MFNy0S3MFM="; + rev = "fcc1fa29197ce17bc56812f84f5ff311f767fcd1"; + hash = "sha256-U+Kk2tQw+rJX7Xa8b5Hd7x0xY/6PN6TTYsLJkpB1Osg="; }; - vendorSha256 = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g="; + vendorHash = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix index 78ad742945..87ec2964a0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.13.6"; + version = "1.13.9"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-aaKjtxy0SVZB9/dcARmDkiiPM8XzwFHYqEctY3kfPWg="; + hash = "sha256-dAe19D9q5JXeWCnsfbz0NnAtnAQj0dyIy6cdyjqVxEg="; }; - cargoHash = "sha256-tTArwBfxzbX6FJiOsAuyT6HRbdelp1txcmcDszACfn8="; + cargoHash = "sha256-gc3tDTsmgvMfLbWh5XALEpZuK6e8FXsomfq4U/xTPXM="; meta = with lib; { description = "Source code spell checker"; diff --git a/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix b/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix index 5d48a7a3ba..f10c38539a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. disabled = ! pythonAtLeast "3.5"; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; propagatedBuildInputs = [ ansicolor chardet pyyaml setuptools ]; # Unpin test dependency versions. This is fixed in master but not yet released. diff --git a/third_party/nixpkgs/pkgs/development/tools/wails/default.nix b/third_party/nixpkgs/pkgs/development/tools/wails/default.nix index 714354b059..0b6dc6ab05 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wails/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wails/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "wails"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g5tZUVOZ2ywD2vS9B3y3GHaoABr2rSIZGUOsdUJOL8Q="; + sha256 = "sha256-WKA21bU7H9V/X3oPGTgf8ysXX91/tjfEqEzkBMgtMRM="; } + "/v2"; - vendorSha256 = "sha256-jRW8SROt0CON17xZ+I3WiQow7yC1ly7pPHgbpEr1kW8="; + vendorSha256 = "sha256-MPdAl8fwIoO+0IDTWVDktQND/BM/v7sms13l9PNjKDY="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix index adc088baf2..ec336d422a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.83"; + version = "0.2.84"; src = fetchCrate { inherit pname version; - sha256 = "sha256-+PWxeRL5MkIfJtfN3/DjaDlqRgBgWZMa6dBt1Q+lpd0="; + sha256 = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk="; }; - cargoSha256 = "sha256-GwLeA6xLt7I+NzRaqjwVpt1pzRex1/snq30DPv4FR+g="; + cargoSha256 = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - checkInputs = [ nodejs ]; + nativeCheckInputs = [ nodejs ]; # other tests require it to be ran in the wasm-bindgen monorepo cargoTestFlags = [ "--test=interface-types" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix index 58b4b89ad9..6f5d9162c5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix @@ -26,7 +26,7 @@ llvmPackages.stdenv.mkDerivation rec { nativeBuildInputs = [ cmake llvmPackages.lld ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" diff --git a/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix b/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix index f2075f683b..7a5470a334 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wlcs/default.nix @@ -12,27 +12,22 @@ stdenv.mkDerivation rec { pname = "wlcs"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "MirServer"; repo = "wlcs"; rev = "v${version}"; - hash = "sha256-ep5BHa9PgfB50gxJySaw0YAc1upBbncOiX9PCqHLbpE="; + hash = "sha256-QxmWxu+w77/WE5pGXMWXm+NP95QmYo2O8ltZYrgCIWw="; }; patches = [ - # Fixes pkg-config paths - # Remove when https://github.com/MirServer/wlcs/pull/258 merged & in a release + # Improves pkg-config paths even more + # Remove when https://github.com/MirServer/wlcs/pull/260 merged & in a release (fetchpatch { - name = "0001-wlcs-pkgsconfig-use-FULL-install-vars.patch"; - url = "https://github.com/MirServer/wlcs/pull/258/commits/9002cb7323d94aba7fc1ce5927f445e9beb30d70.patch"; - hash = "sha256-+uhFRKhG59w99oES4RA+L5hHyJ5pf4ij97pTokERPys="; - }) - (fetchpatch { - name = "0002-wlcs-CMAKE_INSTALL_INCLUDEDIR-for-headers.patch"; - url = "https://github.com/MirServer/wlcs/pull/258/commits/71263172c9ba57be9c05f1e07dd40d1f378ca6d0.patch"; - hash = "sha256-nV/72W9DW3AvNGhUZ+tzmQZow3BkxEH3D6QFBZIGjj8="; + name = "0001-wlcs-pkgsconfig-Use-better-path-concatenations.patch"; + url = "https://github.com/MirServer/wlcs/pull/260/commits/20f28d82fa4dfa6a6e27212dbd6b0f2e8a833c69.patch"; + hash = "sha256-m8zPD27JbX/vN2YQgNhcRsh/O+qLfvoeky5E5ZEeD1I="; }) ]; @@ -72,6 +67,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/MirServer/wlcs/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ OPNA2608 ]; - inherit (wayland.meta) platforms; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/wp4nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/wp4nix/default.nix index a97ae77370..8460cb7d94 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wp4nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wp4nix/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "sha256-WJteeFUMr684yZEtUP13MqRjJ1UAeo48AzOPdLEE65w="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/development/tools/xcbuild/sdks.nix b/third_party/nixpkgs/pkgs/development/tools/xcbuild/sdks.nix index 5ff3ca6808..e1b8254d7f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/xcbuild/sdks.nix +++ b/third_party/nixpkgs/pkgs/development/tools/xcbuild/sdks.nix @@ -2,7 +2,7 @@ , writeText, version, xcodePlatform }: let - inherit (lib.generators) toPlist; + inherit (lib.generators) toPlist toJSON; SDKSettings = { CanonicalName = sdkName; @@ -22,6 +22,7 @@ in runCommand "SDKs" {} '' sdk=$out/${sdkName}.sdk install -D ${writeText "SDKSettings.plist" (toPlist {} SDKSettings)} $sdk/SDKSettings.plist + install -D ${writeText "SDKSettings.json" (toJSON {} SDKSettings)} $sdk/SDKSettings.json install -D ${writeText "SystemVersion.plist" (toPlist {} SystemVersion)} $sdk/System/Library/CoreServices/SystemVersion.plist ln -s $sdk $sdk/usr diff --git a/third_party/nixpkgs/pkgs/development/tools/xcbuild/wrapper.nix b/third_party/nixpkgs/pkgs/development/tools/xcbuild/wrapper.nix index 2dbea4e383..35eddd40f8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/xcbuild/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/xcbuild/wrapper.nix @@ -77,7 +77,7 @@ while [ $# -gt 0 ]; do --toolchain | -toolchain) shift ;; --find | -find | -f) shift - command -v $1 ;; + command -v $1 || exit 1 ;; --log | -log) ;; # noop --verbose | -verbose) ;; # noop --no-cache | -no-cache) ;; # noop diff --git a/third_party/nixpkgs/pkgs/development/tools/yamlpath/default.nix b/third_party/nixpkgs/pkgs/development/tools/yamlpath/default.nix index 43434c65c4..2a2abf9cf0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yamlpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yamlpath/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { ruamel-yaml ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ hiera-eyaml mock pytest-console-scripts diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix index b3bc6bc62b..f642b22ef2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn/default.nix @@ -1,30 +1,40 @@ -{ lib, stdenv, nodejs, fetchzip, testers, yarn }: +{ lib, fetchFromGitHub, fetchzip, nodejs, stdenvNoCC, testers }: -stdenv.mkDerivation rec { +let + completion = fetchFromGitHub { + owner = "dsifford"; + repo = "yarn-completion"; + rev = "v0.17.0"; + hash = "sha256-z7KPXeYPPRuaEPxgY6YqsLt9n8cSsW3n2FhOzVde1HU="; + }; +in +stdenvNoCC.mkDerivation (finalAttrs: { pname = "yarn"; version = "1.22.19"; src = fetchzip { - url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; + url = "https://github.com/yarnpkg/yarn/releases/download/v${finalAttrs.version}/yarn-v${finalAttrs.version}.tar.gz"; sha256 = "sha256-12wUuWH+kkqxAgVYkyhIYVtexjv8DFP9kLpFLWg+h0o="; }; buildInputs = [ nodejs ]; installPhase = '' - mkdir -p $out/{bin,libexec/yarn/} + mkdir -p $out/{bin,libexec/yarn/,share/bash-completion/completions/} cp -R . $out/libexec/yarn ln -s $out/libexec/yarn/bin/yarn.js $out/bin/yarn ln -s $out/libexec/yarn/bin/yarn.js $out/bin/yarnpkg + ln -s ${completion}/yarn-completion.bash $out/share/bash-completion/completions/yarn.bash ''; - passthru.tests = testers.testVersion { package = yarn; }; + passthru.tests = testers.testVersion { package = finalAttrs.finalPackage; }; meta = with lib; { - homepage = "https://yarnpkg.com/"; description = "Fast, reliable, and secure dependency management for javascript"; + homepage = "https://classic.yarnpkg.com/"; + changelog = "https://github.com/yarnpkg/yarn/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.bsd2; - maintainers = with maintainers; [ offline screendriver ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ offline screendriver marsam ]; + platforms = nodejs.meta.platforms; }; -} +}) 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 459de39282..3af3e43fe2 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 @@ -2,7 +2,7 @@ , nodejs ? pkgs.nodejs , yarn ? pkgs.yarn , allowAliases ? pkgs.config.allowAliases -}: +}@inputs: let inherit (pkgs) stdenv lib fetchurl linkFarm callPackage git rsync makeWrapper runCommandLocal; @@ -70,6 +70,8 @@ in rec { offlineCache ? importOfflineCache yarnNix, yarnFlags ? [ ], ignoreScripts ? true, + nodejs ? inputs.nodejs, + yarn ? inputs.yarn.override { nodejs = nodejs; }, pkgConfig ? {}, preBuild ? "", postBuild ? "", @@ -169,6 +171,8 @@ in rec { src, packageJSON ? src + "/package.json", yarnLock ? src + "/yarn.lock", + nodejs ? inputs.nodejs, + yarn ? inputs.yarn.override { nodejs = nodejs; }, packageOverrides ? {}, ... }@attrs: @@ -226,7 +230,7 @@ in rec { inherit name; value = mkYarnPackage ( builtins.removeAttrs attrs ["packageOverrides"] - // { inherit src packageJSON yarnLock packageResolutions workspaceDependencies; } + // { inherit src packageJSON yarnLock nodejs yarn packageResolutions workspaceDependencies; } // lib.attrByPath [name] {} packageOverrides ); }) @@ -241,6 +245,8 @@ in rec { yarnLock ? src + "/yarn.lock", yarnNix ? mkYarnNix { inherit yarnLock; }, offlineCache ? importOfflineCache yarnNix, + nodejs ? inputs.nodejs, + yarn ? inputs.yarn.override { nodejs = nodejs; }, yarnFlags ? [ ], yarnPreBuild ? "", yarnPostBuild ? "", @@ -268,7 +274,7 @@ in rec { preBuild = yarnPreBuild; postBuild = yarnPostBuild; workspaceDependencies = workspaceDependenciesTransitive; - inherit packageJSON pname version yarnLock offlineCache yarnFlags pkgConfig packageResolutions; + inherit packageJSON pname version yarnLock offlineCache nodejs yarn yarnFlags pkgConfig packageResolutions; }; publishBinsFor_ = unlessNull publishBinsFor [pname]; diff --git a/third_party/nixpkgs/pkgs/development/tools/zprint/default.nix b/third_party/nixpkgs/pkgs/development/tools/zprint/default.nix index c401ecf0bb..f93098aebf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/zprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/zprint/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "zprint"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}"; - sha256 = "sha256-PgmaKxTOZPgHhEfFA5FdHrKHHpfieoK2QZBYR3f0J8s="; + sha256 = "sha256-PWdR5jqyzvTk9HoxqDldwtZNik34dmebBtZZ5vtva4A="; }; extraNativeImageBuildArgs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/zsv/default.nix b/third_party/nixpkgs/pkgs/development/tools/zsv/default.nix index d5f188f80b..639b9bcb4b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/zsv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/zsv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsv"; - version = "0.3.4-alpha"; + version = "0.3.5-alpha"; src = fetchFromGitHub { owner = "liquidaty"; repo = "zsv"; rev = "v${version}"; - sha256 = "sha256-3drVqKRs5bjkvQiHyEANI5geeF5g7ba2+RxmAhxbu84="; + hash = "sha256-HW/w2bJVnTELh36rUfGIzAsc6e+PTBGsAdHDz7gFAdI="; }; nativeBuildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index 659af1aec6..7d570f07ac 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.29.3"; + version = "1.30.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CH0uri8mnpcojuE8Pil/gsvEfDu/txjCevvGjqhiK1k="; + sha256 = "sha256-He8RgzmiL8Zp+klm0JPNeqbyjK/5CsE7HB2Hco7GZss="; }; - cargoSha256 = "sha256-I7MIcZeMQzgplza8YAqmuWaX4Gw3ZoDXHyzq/5opO4M="; + cargoSha256 = "sha256-lPgVivYsR3SljPkjRRkb3qM3ZO7RALfk1KGPd7cwSYQ="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds @@ -85,6 +85,7 @@ rustPlatform.buildRustPackage rec { ''; passthru.updateScript = ./update/update.ts; + passthru.tests = callPackage ./tests { }; meta = with lib; { homepage = "https://deno.land/"; diff --git a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix index ec13f634ea..52b3e12f02 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.60.0"; + version = "0.60.1"; shas = { - x86_64-linux = "sha256-2cq9fpKhx3ctZ5Lo2RofXD5bXfVUUN6bRtG453MQMW4="; - aarch64-linux = "sha256-hjVUzCYdGkc3kMC/cSXDFOaqJmMBi83dqqASS5R2158="; - x86_64-darwin = "sha256-EyYWfDU0eVFVzSVAHBFUbsppzpHtwe+Fd+z2ZmIub2c="; - aarch64-darwin = "sha256-2VyEFqWsPZlkEDvNxkmrMCIKfsO7LAO+VvsjSMcyFUo="; + x86_64-linux = "sha256-P8H+XJqrt9jdKM885L1epMldp+stwmEw+0Gtd2x3r4g="; + aarch64-linux = "sha256-frHpBP2pL3o4efFLHP2r3zsWJrNT93yYu2Qkxv+7m8Y="; + x86_64-darwin = "sha256-taewoYBkyikqWueLSD9dW1EDjzkV68Xplid1UaLZgRM="; + aarch64-darwin = "sha256-s2YEVbuYpiT/qrmE37aXk13MetrnJo6l+s1Q2y6b5kU="; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/basic.ts b/third_party/nixpkgs/pkgs/development/web/deno/tests/basic.ts new file mode 100644 index 0000000000..5959aa217b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/deno/tests/basic.ts @@ -0,0 +1 @@ +console.log(1 + 1) diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/tests/default.nix new file mode 100644 index 0000000000..b6787c913b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/deno/tests/default.nix @@ -0,0 +1,68 @@ +{ deno, runCommand, lib, testers }: +let + testDenoRun = + name: + { args ? "" + , dir ? ./. + "/${name}" + , file ? "index.ts" + , expected ? "" + , expectFailure ? false + }: + let + command = "deno run ${args} ${dir}/${file}"; + in + runCommand "deno-test-${name}" { nativeBuildInputs = [ deno ]; meta.timeout = 60; } '' + HOME=$(mktemp -d) + if output=$(${command} 2>&1); then + if [[ $output =~ '${expected}' ]]; then + echo "Test '${name}' passed" + touch $out + else + echo -n ${lib.escapeShellArg command} >&2 + echo " output did not match what was expected." >&2 + echo "The expected was:" >&2 + echo '${expected}' >&2 + echo "The output was:" >&2 + echo "$output" >&2 + exit 1 + fi + else + if [[ "${toString expectFailure}" == "1" ]]; then + echo "Test '${name}' failed as expected" + touch $out + exit 0 + fi + echo -n ${lib.escapeShellArg command} >&2 + echo " returned a non-zero exit code." >&2 + echo "$output" >&2 + exit 1 + fi + ''; +in +(lib.mapAttrs testDenoRun { + basic = { + dir = ./.; + file = "basic.ts"; + expected = "2"; + }; + import-json = { + expected = "hello from JSON"; + }; + import-ts = { + expected = "hello from ts"; + }; + read-file = { + args = "--allow-read"; + expected = "hello from a file"; + }; + fail-read-file = { + expectFailure = true; + dir = ./read-file; + }; +}) // +{ + version = testers.testVersion { + package = deno; + command = "deno --version"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/import-json/data.json b/third_party/nixpkgs/pkgs/development/web/deno/tests/import-json/data.json new file mode 100644 index 0000000000..7f0de9ebe0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/deno/tests/import-json/data.json @@ -0,0 +1 @@ +{ "msg": "hello from JSON" } diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/import-json/index.ts b/third_party/nixpkgs/pkgs/development/web/deno/tests/import-json/index.ts new file mode 100644 index 0000000000..525f25f74d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/deno/tests/import-json/index.ts @@ -0,0 +1,2 @@ +import file from "./data.json" assert { type: "json" }; +console.log(file.msg); diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/import-ts/index.ts b/third_party/nixpkgs/pkgs/development/web/deno/tests/import-ts/index.ts new file mode 100644 index 0000000000..34fec283a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/deno/tests/import-ts/index.ts @@ -0,0 +1,3 @@ +import { sayHello } from "./lib.ts" + +sayHello("ts") diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/import-ts/lib.ts b/third_party/nixpkgs/pkgs/development/web/deno/tests/import-ts/lib.ts new file mode 100644 index 0000000000..3b5e05aaaa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/deno/tests/import-ts/lib.ts @@ -0,0 +1,3 @@ +export function sayHello(thing: string) { + console.log(`hello from ${thing}`); +} diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/read-file/data.txt b/third_party/nixpkgs/pkgs/development/web/deno/tests/read-file/data.txt new file mode 100644 index 0000000000..7eee1b0c10 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/deno/tests/read-file/data.txt @@ -0,0 +1 @@ +hello from a file diff --git a/third_party/nixpkgs/pkgs/development/web/deno/tests/read-file/index.ts b/third_party/nixpkgs/pkgs/development/web/deno/tests/read-file/index.ts new file mode 100644 index 0000000000..be792a3d66 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/web/deno/tests/read-file/index.ts @@ -0,0 +1,5 @@ +// trim 'file://' prefix +const thisDir = Deno.mainModule.substring(7, Deno.mainModule.length); +const getParent = (path: string) => path.substring(0, path.lastIndexOf("/")) +const text = await Deno.readTextFile(getParent(thisDir) + "/data.txt"); +console.log(text); diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index c97bfd0909..e12230f453 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.450"; + version = "0.0.451"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-UfqjrWzpi1axud4MkrJxIwq1vzqHZ0qAvI1kNh/tywY="; + sha256 = "sha256-Tm05vO1mdeTGLpz++rahUubb69ajw04eK57VKZFUoDo="; }; - vendorHash = "sha256-ljyaF6Yz3bz5vjwZfDgYBb3o2l90YnV5DgolaDH3B9o="; + vendorHash = "sha256-oJa+HUuv8RG4ldAe/cS8iR6QcWdPl8BgHE4sRASauRM="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix index ca7753aa56..8c6c2c73c2 100644 --- a/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/insomnia/default.nix @@ -15,12 +15,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2022.6.0"; + version = "2022.7.5"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-ARGIcNHnqQEyp1JVNV59FvvYv9JTSS55R+lTHl0IrWk="; + sha256 = "sha256-BJAiDv+Zg+wU6ovAkuMVTGN9WElOlC96m/GEYrg6exE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix index 27bc3edb27..18edea1ab6 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix @@ -9,25 +9,23 @@ , procps, icu }: -with lib; - { enableNpm ? true, version, sha256, patches ? [] } @args: let inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; - majorVersion = versions.major version; - minorVersion = versions.minor version; + majorVersion = lib.versions.major version; + minorVersion = lib.versions.minor version; pname = if enableNpm then "nodejs" else "nodejs-slim"; - useSharedHttpParser = !stdenv.isDarwin && versionOlder "${majorVersion}.${minorVersion}" "11.4"; + useSharedHttpParser = !stdenv.isDarwin && lib.versionOlder "${majorVersion}.${minorVersion}" "11.4"; - sharedLibDeps = { inherit openssl zlib libuv; } // (optionalAttrs useSharedHttpParser { inherit http-parser; }); + sharedLibDeps = { inherit openssl zlib libuv; } // (lib.optionalAttrs useSharedHttpParser { inherit http-parser; }); - sharedConfigureFlags = concatMap (name: [ + sharedConfigureFlags = lib.concatMap (name: [ "--shared-${name}" - "--shared-${name}-libpath=${getLib sharedLibDeps.${name}}/lib" + "--shared-${name}-libpath=${lib.getLib sharedLibDeps.${name}}/lib" /** Closure notes: we explicitly avoid specifying --shared-*-includes, * as that would put the paths into bin/nodejs. * Including pkg-config in build inputs would also have the same effect! @@ -38,10 +36,10 @@ let copyLibHeaders = map - (name: "${getDev sharedLibDeps.${name}}/include/*") + (name: "${lib.getDev sharedLibDeps.${name}}/include/*") (builtins.attrNames sharedLibDeps); - extraConfigFlags = optionals (!enableNpm) [ "--without-npm" ]; + extraConfigFlags = lib.optionals (!enableNpm) [ "--without-npm" ]; self = stdenv.mkDerivation { inherit pname version; @@ -54,11 +52,11 @@ let CXX_host = "c++"; depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib ]; - buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ] ++ [ zlib libuv openssl http-parser icu ]; nativeBuildInputs = [ which pkg-config python ] - ++ optionals stdenv.isDarwin [ xcbuild ]; + ++ lib.optionals stdenv.isDarwin [ xcbuild ]; outputs = [ "out" "libv8" ]; setOutputFlags = false; @@ -67,9 +65,9 @@ let configureFlags = let isCross = stdenv.hostPlatform != stdenv.buildPlatform; inherit (stdenv.hostPlatform) gcc isAarch32; - in sharedConfigureFlags ++ optionals (versionOlder version "19") [ + in sharedConfigureFlags ++ lib.optionals (lib.versionOlder version "19") [ "--without-dtrace" - ] ++ (optionals isCross [ + ] ++ (lib.optionals isCross [ "--cross-compiling" "--without-intl" "--without-snapshot" @@ -86,9 +84,9 @@ let else if platform.isS390 && platform.is64bit then "s390x" else if platform.isRiscV && platform.is64bit then "riscv64" else throw "unsupported cpu ${stdenv.hostPlatform.uname.processor}"}" - ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" gcc) [ + ]) ++ (lib.optionals (isCross && isAarch32 && lib.hasAttr "fpu" gcc) [ "--with-arm-fpu=${gcc.fpu}" - ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" gcc) [ + ]) ++ (lib.optionals (isCross && isAarch32 && lib.hasAttr "float-abi" gcc) [ "--with-arm-float-abi=${gcc.float-abi}" ]) ++ extraConfigFlags; @@ -122,18 +120,18 @@ let substituteInPlace $a \ --replace "/usr/bin/env" "${coreutils}/bin/env" done - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' sed -i -e "s|tr1/type_traits|type_traits|g" \ -e "s|std::tr1|std|" src/util.h ''; - checkInputs = [ procps ]; + nativeCheckInputs = [ procps ]; doCheck = false; # fails 4 out of 1453 tests postInstall = '' PATH=$out/bin:$PATH patchShebangs $out - ${optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) '' + ${lib.optionalString (enableNpm && stdenv.hostPlatform == stdenv.buildPlatform) '' mkdir -p $out/share/bash-completion/completions/ HOME=$TMPDIR $out/bin/npm completion > $out/share/bash-completion/completions/npm for dir in "$out/lib/node_modules/npm/man/"*; do @@ -145,7 +143,7 @@ let ''} # install the missing headers for node-gyp - cp -r ${concatStringsSep " " copyLibHeaders} $out/include/node + cp -r ${lib.concatStringsSep " " copyLibHeaders} $out/include/node # assemble a static v8 library and put it in the 'libv8' output mkdir -p $libv8/lib @@ -183,7 +181,7 @@ let inherit majorVersion; }; - meta = { + meta = with lib; { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = "https://nodejs.org"; changelog = "https://github.com/nodejs/node/releases/tag/v${version}"; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v19.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v19.nix index 454d647dad..b9cd476a19 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v19.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v19.nix @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "19.4.0"; - sha256 = "0qdj67dgxbjpllm2z9vm46c50s3dqk8a34hbp81vsa7mf3b42182"; + version = "19.5.0"; + sha256 = "sha256-KBMXvce6iVITi/jw9fB2SV95+G6FGmWb4fmD3sM8pXc="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/third_party/nixpkgs/pkgs/development/web/shopify-cli/Gemfile.lock b/third_party/nixpkgs/pkgs/development/web/shopify-cli/Gemfile.lock index 06da84ee00..79a4220d4a 100644 --- a/third_party/nixpkgs/pkgs/development/web/shopify-cli/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/web/shopify-cli/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.2) - bugsnag (6.24.2) + bugsnag (6.25.1) concurrent-ruby (~> 1.0) concurrent-ruby (1.1.10) ffi (1.15.5) @@ -10,21 +10,21 @@ GEM listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mini_portile2 (2.8.0) - nokogiri (1.13.9) + mini_portile2 (2.8.1) + nokogiri (1.14.0) mini_portile2 (~> 2.8.0) racc (~> 1.4) - parser (3.1.2.1) + parser (3.2.0.0) ast (~> 2.4.1) - racc (1.6.0) + racc (1.6.2) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - shopify-cli (2.32.0) + shopify-cli (2.34.0) bugsnag (~> 6.22) listen (~> 3.7.0) - theme-check (~> 1.11.0) - theme-check (1.11.0) + theme-check (~> 1.14.0) + theme-check (1.14.0) liquid (>= 5.4.0) nokogiri (>= 1.12) parser (~> 3) @@ -36,4 +36,4 @@ DEPENDENCIES shopify-cli BUNDLED WITH - 2.3.25 + 2.4.3 diff --git a/third_party/nixpkgs/pkgs/development/web/shopify-cli/gemset.nix b/third_party/nixpkgs/pkgs/development/web/shopify-cli/gemset.nix index 74b31a1365..3bc3e2edef 100644 --- a/third_party/nixpkgs/pkgs/development/web/shopify-cli/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/web/shopify-cli/gemset.nix @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vlsqawqy8jn6cy03zcqw944p323zmr2lgadbw00m5r4lqc3bll4"; + sha256 = "108q00vcx3vkr85mpayns3ini6ids807bmhl8nfham9900ric27y"; type = "gem"; }; - version = "6.24.2"; + version = "6.25.1"; }; concurrent-ruby = { groups = ["default"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.1"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + sha256 = "1fqld4wnamj7awdr1lwdifpylqdrrg5adm8xj2jl9sc5ms3nxjjm"; type = "gem"; }; - version = "1.13.9"; + version = "1.14.0"; }; parser = { dependencies = ["ast"]; @@ -88,20 +88,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q31n7yj59wka8xl8s5wkf66hm4pgvblx95czyxffprdnlhrir2p"; + sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; type = "gem"; }; - version = "3.1.2.1"; + version = "3.2.0.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.2"; }; rb-fsevent = { groups = ["default"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zwq99zlsk624g5k706daapzhwm9v4whc8l6h3yw48265b6wkdwv"; + sha256 = "0zzg2vv58s7ylbk35vfb3gj9q6wr59m18gb8sw9f2rnsgsmkivbr"; type = "gem"; }; - version = "2.32.0"; + version = "2.34.0"; }; theme-check = { dependencies = ["liquid" "nokogiri" "parser"]; @@ -141,9 +141,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0971ma7qnbbycfnlwwq3pfz8f6axcslif9dbzmgimv7ad0nrjpp2"; + sha256 = "1w5mmxnyc0h612c04x6h3xb8jjcq5l6mh2vql4138h2r2z98vdwq"; type = "gem"; }; - version = "1.11.0"; + version = "1.14.0"; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/xmlindent/default.nix b/third_party/nixpkgs/pkgs/development/web/xmlindent/default.nix index f6df21d576..0edbf41e2a 100644 --- a/third_party/nixpkgs/pkgs/development/web/xmlindent/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/xmlindent/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "XML stream reformatter"; - homepage = "http://xmlindent.sourceforge.net/"; + homepage = "https://xmlindent.sourceforge.net/"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = [ ]; diff --git a/third_party/nixpkgs/pkgs/games/BeatSaberModManager/deps.nix b/third_party/nixpkgs/pkgs/games/BeatSaberModManager/deps.nix index 57f7add09f..1542b120c9 100644 --- a/third_party/nixpkgs/pkgs/games/BeatSaberModManager/deps.nix +++ b/third_party/nixpkgs/pkgs/games/BeatSaberModManager/deps.nix @@ -26,9 +26,9 @@ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.11"; sha256 = "15n8x52njzxs2cwzzswi0kawm673jkvf2yga87jaf7hr729bfmcr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.11"; sha256 = "1pw25rnw5nm51wjdjbrhzhz9v0c8gjjqn2na2bam3c5xawvnqkqf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.11"; sha256 = "0vd5da34frm7avrc9d16d39s2k5sgzd260j5pkjsianhpjby5rbn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.12"; sha256 = "0x8x922jhdn4zzbqqhlnzg5cmg69myn9zibk363py3yamkywcami"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.12"; sha256 = "1zi1x4w51fawi8083s48mxrlpqzkc48qsvrq2h7xx58x48ml465s"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.12"; sha256 = "1wwciddbnykamlwl9i88l9081q27l0i17jmvymsxddbi0v9rr3sb"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) @@ -36,11 +36,11 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.11"; sha256 = "0k8nl3hnr8h0ljw185dyhavrz2f7x6wavyadyf7f1v289jzasj72"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.11"; sha256 = "0bnq4dj7s5mspi7f8ihpp2y4bncb229ihrcmxvifsbb15mlhh8g4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.11"; sha256 = "1j64ppdvh5s3pqr6sm3sq9bmk3fzj7l4j3bx023zn3dyllibpv68"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.11"; sha256 = "03kvh4l5j8i8263wz7fmznzf5rs1grgazrhi3ayhynvhdal04mdk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.11"; sha256 = "1f60dyl8pnj067i7bvmsbazcvrjkgrz9943vjj0ym49cfyq98cnw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.12"; sha256 = "0axj326a79h8762ahrxgpnzczivfvdjn2xa2np2djc7ybn6j3491"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.12"; sha256 = "0dfivz2wq18gsdn8b9d0v6q0lf2mvayl85nad7cvysfc93aw05jg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.12"; sha256 = "00s1flhzvxsdhgn469vc1q63qkcv05g5zqx10p1gsnzxjpdx01in"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.12"; sha256 = "1j615cjwkyjkvvc03pvwmfgqbh1z9aq08bvw0bnjkhs1qs6dz7x0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.12"; sha256 = "1w7kfgld8wcbqqyb1cpbnd6b08f83jfny2q70vb1qdqfn5bgcb1h"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) diff --git a/third_party/nixpkgs/pkgs/games/anki/default.nix b/third_party/nixpkgs/pkgs/games/anki/default.nix index 71575c35fd..28bf794a8a 100644 --- a/third_party/nixpkgs/pkgs/games/anki/default.nix +++ b/third_party/nixpkgs/pkgs/games/anki/default.nix @@ -104,7 +104,7 @@ buildPythonApplication rec { ++ lib.optionals stdenv.isDarwin [ CoreAudio ] ; - checkInputs = [ pytest glibcLocales nose ]; + nativeCheckInputs = [ pytest glibcLocales nose ]; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; buildInputs = [ lame mpv-unwrapped libpulseaudio ]; diff --git a/third_party/nixpkgs/pkgs/games/bugdom/default.nix b/third_party/nixpkgs/pkgs/games/bugdom/default.nix index 75bcad2f0d..9bceef0129 100644 --- a/third_party/nixpkgs/pkgs/games/bugdom/default.nix +++ b/third_party/nixpkgs/pkgs/games/bugdom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bugdom"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "jorio"; repo = pname; rev = version; - sha256 = "sha256-pgms2mipW1zol35LVCuU5+7mN7CBiVGFvu1CJ3CrGU0="; + hash = "sha256-oe7xxvoL82YF+EoIJDK6AfN3PmpqeGRlIsbaGx8xGeM="; fetchSubmodules = true; }; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { # Passing this in cmakeFlags doesn't work because the path is hard-coded for Darwin substituteInPlace cmake/FindSDL2.cmake \ --replace 'set(SDL2_LIBRARIES' 'set(SDL2_LIBRARIES "${SDL2}/lib/libSDL2.dylib") #' + # Expects plutil, which we don't have + sed -i '/plutil/d' CMakeLists.txt ''; buildInputs = [ @@ -43,7 +45,7 @@ stdenv.mkDerivation rec { '' + (if stdenv.hostPlatform.isDarwin then '' mkdir -p $out/{bin,Applications} mv {,$out/Applications/}Bugdom.app - ln -s $out/{Applications/Bugdom.app/Contents/MacOS,bin}/Bugdom + makeWrapper $out/{Applications/Bugdom.app/Contents/MacOS,bin}/Bugdom '' else '' mkdir -p $out/share/bugdom mv Data $out/share/bugdom diff --git a/third_party/nixpkgs/pkgs/games/chessdb/default.nix b/third_party/nixpkgs/pkgs/games/chessdb/default.nix index 6de8726722..4b96662d84 100644 --- a/third_party/nixpkgs/pkgs/games/chessdb/default.nix +++ b/third_party/nixpkgs/pkgs/games/chessdb/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://chessdb.sourceforge.net/"; + homepage = "https://chessdb.sourceforge.net/"; description = "A free chess database"; platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/games/classicube/default.nix b/third_party/nixpkgs/pkgs/games/classicube/default.nix index 06c914e56f..ec2490196a 100644 --- a/third_party/nixpkgs/pkgs/games/classicube/default.nix +++ b/third_party/nixpkgs/pkgs/games/classicube/default.nix @@ -5,7 +5,8 @@ , makeWrapper , makeDesktopItem , copyDesktopItems -, SDL2 +, libX11 +, libXi , libGL , curl , openal @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ClassiCube"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "UnknownShadow200"; repo = "ClassiCube"; rev = version; - sha256 = "sha256-m7pg9OL2RuCVKgFD3hMtIeY0XdJ1YviXBFVJH8/T5gI="; + sha256 = "sha256-anBi9hPwX1AAIc8dXsKyX4u7UbkKqC1P+7f7wdKWAig="; }; nativeBuildInputs = [ dos2unix makeWrapper copyDesktopItems ]; @@ -46,12 +47,8 @@ stdenv.mkDerivation rec { patches = [ # Fix hardcoded font paths ./font-location.patch - # ClassiCube doesn't compile with its X11 backend - # because of issues with libXi. - ./use-sdl.patch # For some reason, the Makefile doesn't link # with libcurl and openal when ClassiCube requires them. - # Also links with SDL2 instead of libX11 and libXi. ./fix-linking.patch ]; @@ -71,7 +68,7 @@ stdenv.mkDerivation rec { --replace 'JOBS=1' "JOBS=$NIX_BUILD_CORES" ''; - buildInputs = [ SDL2 libGL curl openal liberation_ttf ]; + buildInputs = [ libX11 libXi libGL curl openal liberation_ttf ]; preBuild = "cd src"; diff --git a/third_party/nixpkgs/pkgs/games/classicube/fix-linking.patch b/third_party/nixpkgs/pkgs/games/classicube/fix-linking.patch index 987c882367..197a3ab694 100644 --- a/third_party/nixpkgs/pkgs/games/classicube/fix-linking.patch +++ b/third_party/nixpkgs/pkgs/games/classicube/fix-linking.patch @@ -7,7 +7,7 @@ index 83188ce..3439cdb 100644 ifeq ($(PLAT),linux) -LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -+LIBS=-lSDL2 -lpthread -lGL -lm -ldl -lcurl -lopenal ++LIBS=-lX11 -lXi -lpthread -lGL -lm -ldl -lcurl -lopenal endif ifeq ($(PLAT),sunos) diff --git a/third_party/nixpkgs/pkgs/games/classicube/use-sdl.patch b/third_party/nixpkgs/pkgs/games/classicube/use-sdl.patch deleted file mode 100644 index 3456ef8b64..0000000000 --- a/third_party/nixpkgs/pkgs/games/classicube/use-sdl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Core.h b/src/Core.h -index e94a39e..96527d0 100644 ---- a/src/Core.h -+++ b/src/Core.h -@@ -170,7 +170,7 @@ Thus it is **NOT SAFE** to allocate a string on the stack. */ - #define CC_BUILD_LINUX - #define CC_BUILD_POSIX - #define CC_BUILD_GL --#define CC_BUILD_X11 -+#define CC_BUILD_SDL - #define CC_BUILD_CURL - #define CC_BUILD_OPENAL - #if defined CC_BUILD_RPI diff --git a/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix b/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix index 7454242c72..e3385eaca5 100644 --- a/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix +++ b/third_party/nixpkgs/pkgs/games/crispy-doom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.11.1"; + version = "5.12.0"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-2Sjl9XO01ko0BwbFQSFv9mNoetyMa8Dxx17y0JmlLS0="; + sha256 = "sha256-ep48Lgxw0yKd7+Cx6wMEnOqu/1vjdCM36+TKv1sb1Tk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/games/ddnet/default.nix b/third_party/nixpkgs/pkgs/games/ddnet/default.nix index eed383a3ab..1aaa752fbd 100644 --- a/third_party/nixpkgs/pkgs/games/ddnet/default.nix +++ b/third_party/nixpkgs/pkgs/games/ddnet/default.nix @@ -1,9 +1,11 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , ninja , pkg-config +, rustPlatform , curl , freetype , libGLU @@ -22,6 +24,7 @@ , vulkan-loader , glslang , spirv-tools +, gtest , Carbon , Cocoa , OpenGL @@ -30,16 +33,33 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "16.4"; + version = "16.7.2"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-8t4UKytYmkELEMQ06jIj7C9cdOc5L22AnigwkGBzx20="; + hash = "sha256-dK46ubcq/sYSXLeZwAeomj9+jpSNpgHsTmXKdrllLTc="; }; - nativeBuildInputs = [ cmake ninja pkg-config ]; + cargoDeps = rustPlatform.fetchCargoTarball { + name = "${pname}-${version}"; + inherit src; + hash = "sha256-jLR/XriiKXmpHGBHtPa1vpE5ms3Dw1wrNt/4KARyM74="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + rustPlatform.rust.rustc + rustPlatform.rust.cargo + rustPlatform.cargoSetupHook + ]; + + nativeCheckInputs = [ + gtest + ]; buildInputs = [ curl @@ -62,10 +82,13 @@ stdenv.mkDerivation rec { spirv-tools ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa OpenGL Security ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DAUTOUPDATE=OFF" - "-GNinja" + patches = [ + (fetchpatch { + # error: use of undeclared identifier 'pthread_attr_set_qos_class_np' + # https://github.com/ddnet/ddnet/pull/5913 + url = "https://github.com/ddnet/ddnet/pull/5913/commits/ccc6cd59de58905dce3a3bd5d8461a03b1adb249.patch"; + hash = "sha256-CkHckE+bOMKDcoijNYDo+zEQ9Eq9ePDV18LybzCMPYs="; + }) ]; postPatch = '' @@ -73,6 +96,13 @@ stdenv.mkDerivation rec { --replace /usr/ $out/ ''; + cmakeFlags = [ + "-DAUTOUPDATE=OFF" + ]; + + doCheck = true; + checkTarget = "run_tests"; + meta = with lib; { description = "A Teeworlds modification with a unique cooperative gameplay."; longDescription = '' @@ -84,9 +114,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://ddnet.org"; license = licenses.asl20; - maintainers = with maintainers; [ sirseruju lom ]; + maintainers = with maintainers; [ sirseruju lom ncfavier ]; mainProgram = "DDNet"; - # error: use of undeclared identifier 'pthread_attr_set_qos_class_np' - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/games/domination/default.nix b/third_party/nixpkgs/pkgs/games/domination/default.nix index 919d22b41d..30fc870b25 100644 --- a/third_party/nixpkgs/pkgs/games/domination/default.nix +++ b/third_party/nixpkgs/pkgs/games/domination/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation { pname = "domination"; - version = "1.2.5"; + version = "1.2.7"; # The .zip releases do not contain the build.xml file src = fetchsvn { @@ -34,8 +34,8 @@ in stdenv.mkDerivation { # There are no tags in the repository. # Look for commits like "new version x.y.z info on website" # or "website update for x.y.z". - rev = "2212"; - sha256 = "sha256-XuPMxGDap8x7I+U7+1C+DlkQkoV/u2FCwYyTZFWmYHM="; + rev = "2261"; + sha256 = "sha256-xvlPC7M6DaF3g2O3vQDmcdp7914qOaiikY02RTgAVkM="; }; nativeBuildInputs = [ @@ -88,8 +88,8 @@ in stdenv.mkDerivation { }; meta = with lib; { - homepage = "http://domination.sourceforge.net/"; - downloadPage = "http://domination.sourceforge.net/download.shtml"; + homepage = "https://domination.sourceforge.net/"; + downloadPage = "https://domination.sourceforge.net/download.shtml"; description = "A game that is a bit like the board game Risk or RisiKo"; longDescription = '' Domination is a game that is a bit like the well known board game of Risk diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix index 89f980f8d5..a4433821d2 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -56,7 +56,11 @@ let settings_ = lib.recursiveUpdate { init = { - PRINT_MODE = if enableTextMode then "TEXT" else if enableTWBT then "TWBT" else null; + PRINT_MODE = + if enableTextMode then "TEXT" + else if enableTWBT then "TWBT" + else if stdenv.hostPlatform.isDarwin then "STANDARD" # https://www.bay12games.com/dwarves/mantisbt/view.php?id=11680 + else null; INTRO = enableIntro; TRUETYPE = enableTruetype; FPS = enableFPS; diff --git a/third_party/nixpkgs/pkgs/games/ecwolf/default.nix b/third_party/nixpkgs/pkgs/games/ecwolf/default.nix index f8ca3b40f5..40b06d8826 100644 --- a/third_party/nixpkgs/pkgs/games/ecwolf/default.nix +++ b/third_party/nixpkgs/pkgs/games/ecwolf/default.nix @@ -1,16 +1,32 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, copyDesktopItems, cmake, pkg-config, zlib, bzip2, libjpeg, SDL, SDL_mixer, gtk2 }: +{ stdenv +, lib +, fetchFromBitbucket +, makeDesktopItem +, copyDesktopItems +, cmake +, pkg-config +, zlib +, bzip2 +, libjpeg +, SDL2 +, SDL2_net +, SDL2_mixer +, gtk3 +}: stdenv.mkDerivation rec { pname = "ecwolf"; - version = "1.3.3"; + version = "1.4.0"; - src = fetchurl { - url = "https://maniacsvault.net/ecwolf/files/ecwolf/1.x/${pname}-${version}-src.tar.xz"; - sha256 = "1sbdv672dz47la5a5qwmdi1v258k9kc5dkx7cdj2b6gk8nbm2srl"; + src = fetchFromBitbucket { + owner = pname; + repo = pname; + rev = version; + sha256 = "n1G1zvfE1l42fbJ7ZaMdV0QXn45PjMpaaZTDQAOBtYk="; }; nativeBuildInputs = [ cmake copyDesktopItems pkg-config ]; - buildInputs = [ zlib bzip2 libjpeg SDL SDL_mixer gtk2 ]; + buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ]; desktopItems = [ (makeDesktopItem { @@ -50,5 +66,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; platforms = platforms.all; + # On Darwin, the linker fails to find a bunch of symbols. + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/games/egoboo/default.nix b/third_party/nixpkgs/pkgs/games/egoboo/default.nix index 32678ecdf0..995d69d0a9 100644 --- a/third_party/nixpkgs/pkgs/games/egoboo/default.nix +++ b/third_party/nixpkgs/pkgs/games/egoboo/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { description = "3D dungeon crawling adventure"; - homepage = "http://egoboo.sourceforge.net/"; + homepage = "https://egoboo.sourceforge.net/"; license = lib.licenses.gpl2Plus; # I take it out of hydra as it does not work as well as I'd like diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json index 629f184068..2dceedf776 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/versions.json +++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.74.tar.xz", + "name": "factorio_alpha_x64-1.1.76.tar.xz", "needsAuth": true, - "sha256": "0ygnqlw92gz2s2c4pdhb11lvh86d7byhw5l3qw1fjsx0xv3qnxrs", + "sha256": "1kz93imyddivpp8zslggldm8zyb9j0zdj67pgkxazn8fd9avrq1p", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.74/alpha/linux64", - "version": "1.1.74" + "url": "https://factorio.com/get-download/1.1.76/alpha/linux64", + "version": "1.1.76" }, "stable": { "name": "factorio_alpha_x64-1.1.74.tar.xz", @@ -20,12 +20,12 @@ }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.69.tar.xz", + "name": "factorio_demo_x64-1.1.76.tar.xz", "needsAuth": false, - "sha256": "08nakf6f31dra3rzv2l57pnww04i4ppil6c3vvvhjcv8j35b5k29", + "sha256": "0f3m0p5baakc6cv9fr3rwyq39bydraji9wh3ivblg1mj6dwpqnlj", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.69/demo/linux64", - "version": "1.1.69" + "url": "https://factorio.com/get-download/1.1.76/demo/linux64", + "version": "1.1.76" }, "stable": { "name": "factorio_demo_x64-1.1.69.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.74.tar.xz", + "name": "factorio_headless_x64-1.1.76.tar.xz", "needsAuth": false, - "sha256": "1lqxprmai3vrm3hf9zdj9c9c6w05086nzn0vy88zy7xm2dgw7ylv", + "sha256": "19xx6sv382ijwv8nbqw3c3izckvqkpsf949bn4g09qmg7b663g94", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.74/headless/linux64", - "version": "1.1.74" + "url": "https://factorio.com/get-download/1.1.76/headless/linux64", + "version": "1.1.76" }, "stable": { "name": "factorio_headless_x64-1.1.74.tar.xz", diff --git a/third_party/nixpkgs/pkgs/games/fish-fillets-ng/default.nix b/third_party/nixpkgs/pkgs/games/fish-fillets-ng/default.nix index e610f2427a..787795828f 100644 --- a/third_party/nixpkgs/pkgs/games/fish-fillets-ng/default.nix +++ b/third_party/nixpkgs/pkgs/games/fish-fillets-ng/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; - homepage = "http://fillets.sourceforge.net/"; + homepage = "https://fillets.sourceforge.net/"; }; } diff --git a/third_party/nixpkgs/pkgs/games/fltrator/default.nix b/third_party/nixpkgs/pkgs/games/fltrator/default.nix index 9df7d9cccf..b1a2bb6b8c 100644 --- a/third_party/nixpkgs/pkgs/games/fltrator/default.nix +++ b/third_party/nixpkgs/pkgs/games/fltrator/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "A simple retro style arcade side-scroller game"; longDescription = '' FLTrator is a simple retro style arcade side-scroller game in which you steer a spaceship through a landscape with hostile rockets and other obstacles. It has ten different levels and a level editor to create new levels or modify the existing.''; # from https://libregamewiki.org/FLTrator - homepage = "http://fltrator.sourceforge.net/"; + homepage = "https://fltrator.sourceforge.net/"; platforms = platforms.linux; maintainers = [ maintainers.marius851000 ]; license = licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/games/garden-of-coloured-lights/default.nix b/third_party/nixpkgs/pkgs/games/garden-of-coloured-lights/default.nix index 9f9e85905a..9d89a6d0b7 100644 --- a/third_party/nixpkgs/pkgs/games/garden-of-coloured-lights/default.nix +++ b/third_party/nixpkgs/pkgs/games/garden-of-coloured-lights/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Old-school vertical shoot-em-up / bullet hell"; - homepage = "http://garden.sourceforge.net/drupal/"; + homepage = "https://garden.sourceforge.net/drupal/"; maintainers = with maintainers; [ Profpatsch ]; license = licenses.gpl3; }; diff --git a/third_party/nixpkgs/pkgs/games/gav/default.nix b/third_party/nixpkgs/pkgs/games/gav/default.nix index e94b73d763..dc2868ba21 100644 --- a/third_party/nixpkgs/pkgs/games/gav/default.nix +++ b/third_party/nixpkgs/pkgs/games/gav/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Remake of AV Arcade Volleyball"; - homepage = "http://gav.sourceforge.net/"; + homepage = "https://gav.sourceforge.net/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/games/gcompris/default.nix b/third_party/nixpkgs/pkgs/games/gcompris/default.nix index 99ee63ed05..af41da4a3e 100644 --- a/third_party/nixpkgs/pkgs/games/gcompris/default.nix +++ b/third_party/nixpkgs/pkgs/games/gcompris/default.nix @@ -1,42 +1,46 @@ -{ mkDerivation +{ stdenv , cmake , fetchurl , gettext , gst_all_1 , lib , ninja +, wrapQtAppsHook , qmlbox2d , qtbase +, qtcharts , qtdeclarative , qtgraphicaleffects , qtmultimedia -, qtquickcontrols +, qtquickcontrols2 , qtsensors , qttools , qtxmlpatterns }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "gcompris"; - version = "2.4"; + version = "3.1"; src = fetchurl { url = "https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz"; - sha256 = "sha256-/QZub48rarVHcD0PgOPc6NTlOKrsEzVK/qjHb5CjWS0="; + hash = "sha256-wABGojMfiMgjUT5gVDfB5JmXK1SPkrIkqLT/403zUFI="; }; cmakeFlags = [ "-DQML_BOX2D_LIBRARY=${qmlbox2d}/${qtbase.qtQmlPrefix}/Box2D.2.1" ]; - nativeBuildInputs = [ cmake gettext ninja qttools ]; + nativeBuildInputs = [ cmake gettext ninja qttools wrapQtAppsHook ]; buildInputs = [ qmlbox2d + qtbase + qtcharts qtdeclarative qtgraphicaleffects qtmultimedia - qtquickcontrols + qtquickcontrols2 qtsensors qtxmlpatterns ] ++ (with gst_all_1; [ diff --git a/third_party/nixpkgs/pkgs/games/gogui/default.nix b/third_party/nixpkgs/pkgs/games/gogui/default.nix index c7b37b31c3..d2c25e031d 100644 --- a/third_party/nixpkgs/pkgs/games/gogui/default.nix +++ b/third_party/nixpkgs/pkgs/games/gogui/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = { maintainers = [ lib.maintainers.cleverca22 ]; description = "A graphical user interface to programs that play the board game Go and support the Go Text Protocol such as GNU Go"; - homepage = "http://gogui.sourceforge.net/"; + homepage = "https://gogui.sourceforge.net/"; platforms = lib.platforms.unix; license = lib.licenses.gpl3; }; diff --git a/third_party/nixpkgs/pkgs/games/grapejuice/default.nix b/third_party/nixpkgs/pkgs/games/grapejuice/default.nix index 1d67947d7a..a8f3069771 100644 --- a/third_party/nixpkgs/pkgs/games/grapejuice/default.nix +++ b/third_party/nixpkgs/pkgs/games/grapejuice/default.nix @@ -19,13 +19,13 @@ python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; rev = "v${version}"; - sha256 = "sha256-BNVoSJbGi+u2DHuAicOjEUpDlmu25vMWoBudbV1FLgM="; + sha256 = "sha256-bx0jqG03GSHj1lO9NRh8DJRUyJBbyVUKCy/2pZ3OWas="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/gtetrinet/default.nix b/third_party/nixpkgs/pkgs/games/gtetrinet/default.nix index d34b3775bd..af16d5e9f7 100644 --- a/third_party/nixpkgs/pkgs/games/gtetrinet/default.nix +++ b/third_party/nixpkgs/pkgs/games/gtetrinet/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { GTetrinet is a client program for Tetrinet, a multiplayer tetris game that is played over the internet. ''; - homepage = "http://gtetrinet.sourceforge.net/"; + homepage = "https://gtetrinet.sourceforge.net/"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.chris-martin ]; diff --git a/third_party/nixpkgs/pkgs/games/hexgui/default.nix b/third_party/nixpkgs/pkgs/games/hexgui/default.nix index 1282f03a0e..49dae42175 100644 --- a/third_party/nixpkgs/pkgs/games/hexgui/default.nix +++ b/third_party/nixpkgs/pkgs/games/hexgui/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation { pname = "hexgui"; - version = "unstable-2022-5-30"; + version = "unstable-2023-1-7"; src = fetchFromGitHub { owner = "selinger"; repo = "hexgui"; - rev = "d94ce1d35a22dad28d3e7def4d28e6bebd54da9d"; - hash = "sha256-1MroFH2JSEZHFigcsw1+xyHJWEnHTvHmRPVirUgwM6I="; + rev = "62f07ff51db0d4a945ad42f86167cc2f2ce65d90"; + hash = "sha256-yEdZs9HUt3lcrdNO1OH8M8g71+2Ltf+v1RR1fKRDV0o="; }; nativeBuildInputs = [ ant jdk makeWrapper ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - description = "GUI for the board game Hex (and Y)"; + description = "GUI for the board game Hex"; homepage = "https://github.com/selinger/hexgui"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.ursi ]; diff --git a/third_party/nixpkgs/pkgs/games/hhexen/default.nix b/third_party/nixpkgs/pkgs/games/hhexen/default.nix index 19a0b783ef..d677962fbe 100644 --- a/third_party/nixpkgs/pkgs/games/hhexen/default.nix +++ b/third_party/nixpkgs/pkgs/games/hhexen/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux port of Raven Game's Hexen"; - homepage = "http://hhexen.sourceforge.net/hhexen.html"; + homepage = "https://hhexen.sourceforge.net/hhexen.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ djanatyn ]; }; diff --git a/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix b/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix index 2370b00822..f8f0d55fb9 100644 --- a/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix +++ b/third_party/nixpkgs/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "12.1a"; + version = "12.1h"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-VmWZkIjDy/yv0g9YCW9x8b0LE5guHIA/KZc3OXJoCdA="; + sha256 = "sha256-9ChPO0YCsrAyQ81TAbKCMJSgSXoUtkvvNPMTPimPBUo="; }; CXXFLAGS = [ diff --git a/third_party/nixpkgs/pkgs/games/itchiodl/default.nix b/third_party/nixpkgs/pkgs/games/itchiodl/default.nix new file mode 100644 index 0000000000..c68be798f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/itchiodl/default.nix @@ -0,0 +1,35 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "itchiodl"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "Emersont1"; + repo = "itchio"; + rev = "v${version}"; + hash = "sha256-tylMEsUdeMUuLcxRMkkJE7vPAVuqc/cVJ4DB3xmV+iA="; + }; + + format = "pyproject"; + + nativeBuildInputs = with python3Packages; [ + poetry-core + ]; + + propagatedBuildInputs = with python3Packages; [ + beautifulsoup4 + clint + requests + ]; + + meta = with lib; { + homepage = "https://github.com/Emersont1/itchio"; + description = "itch.io download tool"; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix b/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix index f867efc382..a863b1d1ce 100644 --- a/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix +++ b/third_party/nixpkgs/pkgs/games/legendary-gl/default.nix @@ -8,13 +8,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.31"; + version = "0.20.32"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; rev = "refs/tags/${version}"; - sha256 = "sha256-XxCYL41xhtJ2z1Ps2ANTbzi4/PZu7lo78cRbr6R4iTM="; + sha256 = "sha256-MsvhVS3lqhgBJ+S/cjXFP70I3rM5WBYT7TyVlRWhNWw="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/games/mars/default.nix b/third_party/nixpkgs/pkgs/games/mars/default.nix index 9b715b02ae..3ce42bb774 100644 --- a/third_party/nixpkgs/pkgs/games/mars/default.nix +++ b/third_party/nixpkgs/pkgs/games/mars/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { chmod +x "$out/bin/mars" ''; meta = with lib; { - homepage = "http://mars-game.sourceforge.net/"; + homepage = "https://mars-game.sourceforge.net/"; description = "A game about fighting with ships in a 2D space setting"; license = licenses.gpl3Plus; maintainers = [ maintainers.astsmtl ]; diff --git a/third_party/nixpkgs/pkgs/games/ninvaders/default.nix b/third_party/nixpkgs/pkgs/games/ninvaders/default.nix index df4a3ad111..c3f455b71b 100644 --- a/third_party/nixpkgs/pkgs/games/ninvaders/default.nix +++ b/third_party/nixpkgs/pkgs/games/ninvaders/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Space Invaders clone based on ncurses"; - homepage = "http://ninvaders.sourceforge.net/"; + homepage = "https://ninvaders.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ _1000101 ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/games/njam/default.nix b/third_party/nixpkgs/pkgs/games/njam/default.nix index 6fbffc37d0..971cd1d072 100644 --- a/third_party/nixpkgs/pkgs/games/njam/default.nix +++ b/third_party/nixpkgs/pkgs/games/njam/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./logfile.patch ]; meta = { - homepage = "http://trackballs.sourceforge.net/"; + homepage = "https://trackballs.sourceforge.net/"; description = "Cross-platform pacman-like game"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/games/npush/default.nix b/third_party/nixpkgs/pkgs/games/npush/default.nix index fb7300a5f7..34293ce4fc 100644 --- a/third_party/nixpkgs/pkgs/games/npush/default.nix +++ b/third_party/nixpkgs/pkgs/games/npush/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; - homepage = "http://npush.sourceforge.net/"; + homepage = "https://npush.sourceforge.net/"; description = "A Sokoban-like game"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/third_party/nixpkgs/pkgs/games/openra/common.nix b/third_party/nixpkgs/pkgs/games/openra/common.nix index 59c897ba37..d9cc93e823 100644 --- a/third_party/nixpkgs/pkgs/games/openra/common.nix +++ b/third_party/nixpkgs/pkgs/games/openra/common.nix @@ -12,7 +12,9 @@ with lib; let path = makeBinPath ([ mono python3 ] ++ optional (zenity != null) zenity); rpath = makeLibraryPath [ lua freetype openal SDL2 ]; - mkdirp = makeSetupHook { } ./mkdirp.sh; + mkdirp = makeSetupHook { + name = "openra-mkdirp-hook"; + } ./mkdirp.sh; in { patchEngine = dir: version: '' diff --git a/third_party/nixpkgs/pkgs/games/openttd/nml.nix b/third_party/nixpkgs/pkgs/games/openttd/nml.nix index 666e284cfe..5859f51328 100644 --- a/third_party/nixpkgs/pkgs/games/openttd/nml.nix +++ b/third_party/nixpkgs/pkgs/games/openttd/nml.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "openttd-nml"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "OpenTTD"; repo = "nml"; rev = "refs/tags/${version}"; - hash = "sha256-tmipHRe6qXoSLNbc0OEKxBJZrmTX3DEiuSfQeWRj1sU="; + hash = "sha256-+TJZ6/JazxzXyKawFE4GVh0De1LTUI95vXQwryJ2NDk="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/games/openxcom/default.nix b/third_party/nixpkgs/pkgs/games/openxcom/default.nix index 661cf394e5..ce9d098082 100644 --- a/third_party/nixpkgs/pkgs/games/openxcom/default.nix +++ b/third_party/nixpkgs/pkgs/games/openxcom/default.nix @@ -7,7 +7,7 @@ , libGL , zlib , openssl -, libyamlcpp +, yaml-cpp , boost , SDL , SDL_image @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU libGL openssl zlib ]; + buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost yaml-cpp libGLU libGL openssl zlib ]; meta = with lib; { description = "Open source clone of UFO: Enemy Unknown"; diff --git a/third_party/nixpkgs/pkgs/games/papermc/default.nix b/third_party/nixpkgs/pkgs/games/papermc/default.nix index 7b8733d621..66754073db 100644 --- a/third_party/nixpkgs/pkgs/games/papermc/default.nix +++ b/third_party/nixpkgs/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, bash, jre }: let - mcVersion = "1.19.2"; - buildNum = "131"; + mcVersion = "1.19.3"; + buildNum = "375"; jar = fetchurl { url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; - sha256 = "sha256-y7+bByWPc/2KBG/DOX/CFsIQWNboJs68++6Y64lyVt4="; + sha256 = "sha256-NAl4+mCkO6xQQpIx2pd9tYX2N8VQa+2dmFwyBNbDa10="; }; in stdenv.mkDerivation { pname = "papermc"; diff --git a/third_party/nixpkgs/pkgs/games/performous/default.nix b/third_party/nixpkgs/pkgs/games/performous/default.nix index 10ce4dd06f..7a58cc8e60 100644 --- a/third_party/nixpkgs/pkgs/games/performous/default.nix +++ b/third_party/nixpkgs/pkgs/games/performous/default.nix @@ -2,12 +2,16 @@ , stdenv , fetchFromGitHub , SDL2 +, aubio , boost , cmake , ffmpeg , gettext +, git , glew , glibmm +, glm +, icu , libepoxy , librsvg , libxmlxx @@ -18,16 +22,31 @@ stdenv.mkDerivation rec { pname = "performous"; - version = "1.1"; + version = "1.2.0"; src = fetchFromGitHub { - owner = "performous"; - repo = "performous"; - rev = version; - hash = "sha256-neTHfug2RkcH/ZvAMCJv++IhygGU0L5Ls/jQYjLEQCI="; + owner = pname; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-ueTSirov/lj4/IzaMqHitbOqx8qqUpsTghcb9DUnNEg="; }; - patches = [ ./performous-cmake.patch ]; + cedSrc = fetchFromGitHub { + owner = pname; + repo = "compact_enc_det"; + rev = "9ca1351fe0b1e85992a407b0fc54a63e9b3adc6e"; + hash = "sha256-ztfeblR4YnB5+lb+rwOQJjogl+C9vtPH9IVnYO7oxec="; + }; + + patches = [ + ./performous-cmake.patch + ./performous-fftw.patch + ]; + + postPatch = '' + mkdir ced-src + cp -R ${cedSrc}/* ced-src + ''; nativeBuildInputs = [ cmake @@ -37,10 +56,13 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 + aubio boost ffmpeg glew glibmm + glm + icu libepoxy librsvg libxmlxx @@ -49,9 +71,10 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://performous.org/"; description = "Karaoke, band and dancing game"; + homepage = "https://performous.org/"; license = licenses.gpl2Plus; + maintainers = with maintainers; [ wegank ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/games/performous/performous-cmake.patch b/third_party/nixpkgs/pkgs/games/performous/performous-cmake.patch index 59d2cc9a92..5c1a4c9101 100644 --- a/third_party/nixpkgs/pkgs/games/performous/performous-cmake.patch +++ b/third_party/nixpkgs/pkgs/games/performous/performous-cmake.patch @@ -1,86 +1,21 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48af2a89..43786c31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 3.6) - project(Performous CXX C) +@@ -75,15 +75,7 @@ else() + message(STATUS "Localization disabled: Gettext tools (msgfmt) missing") + endif() - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") ---- a/cmake/Modules/FindPango.cmake -+++ b/cmake/Modules/FindPango.cmake -@@ -2,31 +2,10 @@ - # Once done, this will define - # - # Pango_FOUND - system has Pango --# Pango_INCLUDE_DIRS - the Pango include directories - # Pango_LIBRARIES - link these to use Pango - - include(LibFindMacros) - --# Dependencies --libfind_package(Pango Freetype) --libfind_package(Pango Glib) --libfind_package(Pango GObject) -- --# Use pkg-config to get hints about paths --libfind_pkg_check_modules(Pango_PKGCONF pango) -- --# Include dir --find_path(Pango_INCLUDE_DIR -- NAMES pango/pango.h -- HINTS ${Pango_PKGCONF_INCLUDE_DIRS} -- PATH_SUFFIXES pango-1.0 +-include(FetchContent) +-FetchContent_Declare(ced-sources +- GIT_REPOSITORY https://github.com/performous/compact_enc_det.git +- #https://github.com/google/compact_enc_det.git +- GIT_TAG master +- SOURCE_DIR ced-src -) - --# Finally the library itself --find_library(Pango_LIBRARY -- NAMES pango-1.0 -- HINTS ${Pango_PKGCONF_LIBRARY_DIRS} --) -- -+libfind_pkg_check_modules(Pango_PKGCONF IMPORTED_TARGET pango) -+set(Pango_LIBRARY PkgConfig::Pango_PKGCONF) - libfind_process(Pango) -- ---- a/cmake/Modules/FindPangoCairo.cmake -+++ b/cmake/Modules/FindPangoCairo.cmake -@@ -1,35 +1,11 @@ - # - Try to find PangoCairo - # Once done, this will define - # --# PangoCairo_FOUND - system has Pango --# PangoCairo_INCLUDE_DIRS - the Pango include directories --# PangoCairo_LIBRARIES - link these to use Pango -+# PangoCairo_FOUND - system has PangoCairo -+# PangoCairo_LIBRARIES - link these to use PangoCairo +-FetchContent_MakeAvailable(ced-sources) ++add_subdirectory(ced-src) - include(LibFindMacros) + option(USE_SELF_BUILT_AUBIO "Use custom aubio local build instead of using system lib (if available)" FALSE) --# Dependencies --libfind_package(PangoCairo Pango) --libfind_package(PangoCairo Cairo) -- --# Use pkg-config to get hints about paths --libfind_pkg_check_modules(PangoCairo_PKGCONF pangocairo) -- --# Include dir --find_path(PangoCairo_INCLUDE_DIR -- NAMES pango/pangocairo.h -- HINTS ${PangoCairo_PKGCONF_INCLUDE_DIRS} -- PATH_SUFFIXES pango-1.0 --) -- --# Finally the library itself --find_library(PangoCairo_LIBRARY -- NAMES pangocairo-1.0 -- HINTS ${PangoCairo_PKGCONF_LIBRARY_DIRS} --) -- --# Set the include dir variables and the libraries and let libfind_process do the rest. --# NOTE: Singular variables for this library, plural for libraries this this lib depends on. --set(PangoCairo_PROCESS_INCLUDES PangoCairo_INCLUDE_DIR Pango_INCLUDE_DIR Cairo_INCLUDE_DIR) --set(PangoCairo_PROCESS_LIBS PangoCairo_LIBRARY Pango_LIBRARY Cairo_LIBRARY) -+libfind_pkg_check_modules(PangoCairo_PKGCONF IMPORTED_TARGET pangocairo) -+set(PangoCairo_LIBRARY PkgConfig::PangoCairo_PKGCONF) - libfind_process(PangoCairo) -- diff --git a/third_party/nixpkgs/pkgs/games/performous/performous-fftw.patch b/third_party/nixpkgs/pkgs/games/performous/performous-fftw.patch new file mode 100644 index 0000000000..f24808ae80 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/performous/performous-fftw.patch @@ -0,0 +1,15 @@ +diff --git a/game/audio.cc b/game/audio.cc +index da810488..d7f3d072 100644 +--- a/game/audio.cc ++++ b/game/audio.cc +@@ -121,8 +121,8 @@ Music::Music(Audio::Files const& files, unsigned int sr, bool preview): srate(sr + suppressCenterChannel = config["audio/suppress_center_channel"].b(); + } + +-unsigned Audio::aubio_win_size = 1536; +-unsigned Audio::aubio_hop_size = 768; ++unsigned Audio::aubio_win_size = 2048; ++unsigned Audio::aubio_hop_size = 1024; + + std::unique_ptr Audio::aubioTempo = + std::unique_ptr( diff --git a/third_party/nixpkgs/pkgs/games/pioneers/default.nix b/third_party/nixpkgs/pkgs/games/pioneers/default.nix index 9e292da8c9..f4122dc6bf 100644 --- a/third_party/nixpkgs/pkgs/games/pioneers/default.nix +++ b/third_party/nixpkgs/pkgs/games/pioneers/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Addicting game based on The Settlers of Catan"; - homepage = "http://pio.sourceforge.net/"; # https does not work + homepage = "https://pio.sourceforge.net/"; # https does not work license = licenses.gpl2Plus; maintainers = with maintainers; [ viric ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/games/portmod/default.nix b/third_party/nixpkgs/pkgs/games/portmod/default.nix index 3ae372a0a8..fe8eff36f0 100644 --- a/third_party/nixpkgs/pkgs/games/portmod/default.nix +++ b/third_party/nixpkgs/pkgs/games/portmod/default.nix @@ -82,7 +82,7 @@ python3Packages.buildPythonApplication rec { fasteners ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ] ++ bin-programs; diff --git a/third_party/nixpkgs/pkgs/games/quakespasm/default.nix b/third_party/nixpkgs/pkgs/games/quakespasm/default.nix index 6681370c79..51d0528ac9 100644 --- a/third_party/nixpkgs/pkgs/games/quakespasm/default.nix +++ b/third_party/nixpkgs/pkgs/games/quakespasm/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An engine for iD software's Quake"; - homepage = "http://quakespasm.sourceforge.net/"; + homepage = "https://quakespasm.sourceforge.net/"; longDescription = '' QuakeSpasm is a modern, cross-platform Quake 1 engine based on FitzQuake. It includes support for 64 bit CPUs and custom music playback, a new sound driver, diff --git a/third_party/nixpkgs/pkgs/games/rare/default.nix b/third_party/nixpkgs/pkgs/games/rare/default.nix index 766673d3ea..68ad3c8726 100644 --- a/third_party/nixpkgs/pkgs/games/rare/default.nix +++ b/third_party/nixpkgs/pkgs/games/rare/default.nix @@ -1,5 +1,15 @@ -{ lib, fetchFromGitHub, buildPythonApplication, qt5 -, legendary-gl, pypresence, pyqt5, python, qtawesome, requests, typing-extensions }: +{ lib +, fetchFromGitHub +, buildPythonApplication +, qt5 +, legendary-gl +, pypresence +, pyqt5 +, python +, qtawesome +, requests +, typing-extensions +}: buildPythonApplication rec { pname = "rare"; @@ -25,7 +35,11 @@ buildPythonApplication rec { typing-extensions ]; - patches = [ ./fix-instance.patch ]; + patches = [ + ./fix-instance.patch + # Not able to run pythonRelaxDepsHook because of https://github.com/NixOS/nixpkgs/issues/198342 + ./legendary-gl-version.patch + ]; dontWrapQtApps = true; diff --git a/third_party/nixpkgs/pkgs/games/rare/legendary-gl-version.patch b/third_party/nixpkgs/pkgs/games/rare/legendary-gl-version.patch new file mode 100644 index 0000000000..bd7fa1af74 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/rare/legendary-gl-version.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 2416360..08de818 100644 +--- a/setup.py ++++ b/setup.py +@@ -7,7 +7,7 @@ with open("README.md", "r") as fh: + + requirements = [ + "requests<3.0", +- "legendary-gl==0.20.31", ++ "legendary-gl~=0.20.31", + "setuptools", + "wheel", + "PyQt5", diff --git a/third_party/nixpkgs/pkgs/games/rigsofrods/default.nix b/third_party/nixpkgs/pkgs/games/rigsofrods/default.nix index c3bf4498fa..580f0ef2b1 100644 --- a/third_party/nixpkgs/pkgs/games/rigsofrods/default.nix +++ b/third_party/nixpkgs/pkgs/games/rigsofrods/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "3D simulator game where you can drive, fly and sail various vehicles"; - homepage = "http://rigsofrods.sourceforge.net/"; + homepage = "https://rigsofrods.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/games/rrootage/default.nix b/third_party/nixpkgs/pkgs/games/rrootage/default.nix index 6cd5919c4e..a5b656a404 100644 --- a/third_party/nixpkgs/pkgs/games/rrootage/default.nix +++ b/third_party/nixpkgs/pkgs/games/rrootage/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Abstract shooter created by Kenta Cho"; - homepage = "http://rrootage.sourceforge.net/"; + homepage = "https://rrootage.sourceforge.net/"; license = licenses.bsd2; maintainers = with maintainers; [ fgaz ]; }; diff --git a/third_party/nixpkgs/pkgs/games/runescape-launcher/default.nix b/third_party/nixpkgs/pkgs/games/runescape-launcher/default.nix index 9fd89c062e..6fbe73a6be 100644 --- a/third_party/nixpkgs/pkgs/games/runescape-launcher/default.nix +++ b/third_party/nixpkgs/pkgs/games/runescape-launcher/default.nix @@ -1,48 +1,69 @@ -{ stdenv, lib, buildFHSUserEnv, dpkg, glibc, gcc-unwrapped, autoPatchelfHook, fetchurl, wrapGAppsHook -, gnome2, xorg -, libSM, libXxf86vm, libX11, glib, pango, cairo, gtk2-x11, zlib, openssl_1_1 +{ stdenv +, lib +, autoPatchelfHook +, buildFHSUserEnv +, cairo +, dpkg +, fetchurl +, gcc-unwrapped +, glib +, glibc +, gnome2 +, gtk2-x11 +, libGL , libpulseaudio -, SDL2, xorg_sys_opengl, libGL +, libSM +, libXxf86vm +, libX11 +, openssl_1_1 +, pango +, SDL2 +, wrapGAppsHook +, xdg-utils +, xorg +, xorg_sys_opengl +, zlib }: let runescape = stdenv.mkDerivation rec { pname = "runescape-launcher"; - version = "2.2.9"; + version = "2.2.10"; # Packages: https://content.runescape.com/downloads/ubuntu/dists/trusty/non-free/binary-amd64/Packages # upstream is https://content.runescape.com/downloads/ubuntu/pool/non-free/r/${pname}/${pname}_${version}_amd64.deb src = fetchurl { url = "https://archive.org/download/${pname}_${version}_amd64/${pname}_${version}_amd64.deb"; - sha256 = "1zilpxh8k8baylbl9nqq9kgjiv2xzw4lizbgcmzky5rhmych8n4g"; + sha256 = "1v96vjiblphhbqhpp3m7wbvdvcnp76ncdlf4pdcr2z1dz8nh6shg"; }; nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook dpkg + wrapGAppsHook ]; buildInputs = [ - glibc + cairo gcc-unwrapped + glib + glibc + gtk2-x11 libSM libXxf86vm libX11 - glib - pango - cairo - gtk2-x11 - zlib openssl_1_1 + pango + zlib ]; runtimeDependencies = [ - libpulseaudio libGL + libpulseaudio SDL2 - xorg_sys_opengl openssl_1_1 + xdg-utils # The launcher uses `xdg-open` to open HTTP URLs in the user's browser + xorg_sys_opengl zlib ]; @@ -95,11 +116,24 @@ in name = "RuneScape"; targetPkgs = pkgs: [ runescape - dpkg glibc gcc-unwrapped - libSM libXxf86vm libX11 glib pango cairo gtk2-x11 zlib openssl_1_1 + cairo + dpkg + gcc-unwrapped + glib + glibc + gtk2-x11 + libGL libpulseaudio + libSM + libXxf86vm + libX11 + openssl_1_1 + pango + SDL2 + xdg-utils xorg.libX11 - SDL2 xorg_sys_opengl libGL + xorg_sys_opengl + zlib ]; multiPkgs = pkgs: [ libGL ]; runScript = "runescape-launcher"; diff --git a/third_party/nixpkgs/pkgs/games/scid-vs-pc/default.nix b/third_party/nixpkgs/pkgs/games/scid-vs-pc/default.nix index 4711ffa2f5..63ffa4999e 100644 --- a/third_party/nixpkgs/pkgs/games/scid-vs-pc/default.nix +++ b/third_party/nixpkgs/pkgs/games/scid-vs-pc/default.nix @@ -73,7 +73,7 @@ tcl.mkTclDerivation rec { meta = with lib; { description = "Chess database with play and training functionality"; - homepage = "http://scidvspc.sourceforge.net/"; + homepage = "https://scidvspc.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = [ maintainers.paraseba ]; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/games/scid/default.nix b/third_party/nixpkgs/pkgs/games/scid/default.nix index a1955e9cce..792909f856 100644 --- a/third_party/nixpkgs/pkgs/games/scid/default.nix +++ b/third_party/nixpkgs/pkgs/games/scid/default.nix @@ -53,7 +53,7 @@ tcl.mkTclDerivation { meta = { description = "Chess database with play and training functionality"; maintainers = with lib.maintainers; [ agbrooks ]; - homepage = "http://scid.sourceforge.net/"; + homepage = "https://scid.sourceforge.net/"; license = lib.licenses.gpl2; }; } diff --git a/third_party/nixpkgs/pkgs/games/sm64ex/coop.nix b/third_party/nixpkgs/pkgs/games/sm64ex/coop.nix new file mode 100644 index 0000000000..9e34e184ad --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/sm64ex/coop.nix @@ -0,0 +1,41 @@ +{ callPackage +, fetchFromGitHub +, autoPatchelfHook +, zlib +, stdenvNoCC +}: + +callPackage ./generic.nix { + pname = "sm64ex-coop"; + version = "0.pre+date=2022-08-05"; + + src = fetchFromGitHub { + owner = "djoslin0"; + repo = "sm64ex-coop"; + rev = "68634493de4cdd9db263e0f4f0b9b6772a60d30a"; + sha256 = "sha256-3Ve93WGyBd8SAA0TBrpIrhj+ernjn1q7qXSi9mp36cQ="; + }; + + extraNativeBuildInputs = [ + autoPatchelfHook + ]; + + extraBuildInputs = [ + zlib + ]; + + postInstall = + let + sharedLib = stdenvNoCC.hostPlatform.extensions.sharedLibrary; + in + '' + mkdir -p $out/lib + cp $src/lib/bass/libbass{,_fx}${sharedLib} $out/lib + cp $src/lib/discordsdk/libdiscord_game_sdk${sharedLib} $out/lib + ''; + + extraMeta = { + homepage = "https://github.com/djoslin0/sm64ex-coop"; + description = "Super Mario 64 online co-op mod, forked from sm64ex"; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/sm64ex/default.nix b/third_party/nixpkgs/pkgs/games/sm64ex/default.nix index a6bf7202ad..17fcfdd131 100644 --- a/third_party/nixpkgs/pkgs/games/sm64ex/default.nix +++ b/third_party/nixpkgs/pkgs/games/sm64ex/default.nix @@ -1,55 +1,9 @@ -{ lib -, stdenv -, fetchFromGitHub -, callPackage -, autoPatchelfHook +{ callPackage , branch }: { - sm64ex = callPackage ./generic.nix { - pname = "sm64ex"; - version = "0.pre+date=2021-11-30"; + sm64ex = callPackage ./sm64ex.nix { }; - src = fetchFromGitHub { - owner = "sm64pc"; - repo = "sm64ex"; - rev = "db9a6345baa5acb41f9d77c480510442cab26025"; - sha256 = "sha256-q7JWDvNeNrDpcKVtIGqB1k7I0FveYwrfqu7ZZK7T8F8="; - }; - - extraMeta = { - homepage = "https://github.com/sm64pc/sm64ex"; - description = "Super Mario 64 port based off of decompilation"; - }; - }; - - sm64ex-coop = callPackage ./generic.nix { - pname = "sm64ex-coop"; - version = "0.pre+date=2022-05-14"; - - src = fetchFromGitHub { - owner = "djoslin0"; - repo = "sm64ex-coop"; - rev = "8200b175607fe2939f067d496627c202a15fe24c"; - sha256 = "sha256-c1ZmMBtvYYcaJ/WxkZBVvNGVCeSXfm8NKe/BiAIJtks="; - }; - - extraNativeBuildInputs = [ - autoPatchelfHook - ]; - - postInstall = let - sharedLib = stdenv.hostPlatform.extensions.sharedLibrary; - in '' - mkdir -p $out/lib - cp $src/lib/bass/libbass{,_fx}${sharedLib} $out/lib - cp $src/lib/discordsdk/libdiscord_game_sdk${sharedLib} $out/lib - ''; - - extraMeta = { - homepage = "https://github.com/djoslin0/sm64ex-coop"; - description = "Super Mario 64 online co-op mod, forked from sm64ex"; - }; - }; + sm64ex-coop = callPackage ./coop.nix { }; }.${branch} diff --git a/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix b/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix index ab75ac70b9..95ba3be4a5 100644 --- a/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix +++ b/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix @@ -2,7 +2,8 @@ , version , src , extraNativeBuildInputs ? [ ] -, extraMeta ? {} +, extraBuildInputs ? [ ] +, extraMeta ? { } , compileFlags ? [ ] , postInstall ? "" , region ? "us" @@ -44,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = [ audiofile SDL2 - ]; + ] ++ extraBuildInputs; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/games/sm64ex/sm64ex.nix b/third_party/nixpkgs/pkgs/games/sm64ex/sm64ex.nix new file mode 100644 index 0000000000..66c84dd0b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/sm64ex/sm64ex.nix @@ -0,0 +1,21 @@ +{ callPackage +, fetchFromGitHub +}: + +callPackage ./generic.nix { + pname = "sm64ex"; + version = "0.pre+date=2021-11-30"; + + src = fetchFromGitHub { + owner = "sm64pc"; + repo = "sm64ex"; + rev = "db9a6345baa5acb41f9d77c480510442cab26025"; + sha256 = "sha256-q7JWDvNeNrDpcKVtIGqB1k7I0FveYwrfqu7ZZK7T8F8="; + }; + + extraMeta = { + homepage = "https://github.com/sm64pc/sm64ex"; + description = "Super Mario 64 port based off of decompilation"; + }; +} + diff --git a/third_party/nixpkgs/pkgs/games/speed-dreams/default.nix b/third_party/nixpkgs/pkgs/games/speed-dreams/default.nix index d06e3c1aa1..a44c3d6705 100644 --- a/third_party/nixpkgs/pkgs/games/speed-dreams/default.nix +++ b/third_party/nixpkgs/pkgs/games/speed-dreams/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game - TORCS fork with more experimental approach"; - homepage = "http://speed-dreams.sourceforge.net/"; + homepage = "https://speed-dreams.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [raskin]; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix index ea9db37cbd..614d9823f9 100644 --- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -97,6 +97,7 @@ in buildFHSUserEnv rec { libdrm libxkbcommon # paradox launcher libvorbis # Dead Cells + libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2 mono xorg.xkeyboardconfig xorg.libpciaccess diff --git a/third_party/nixpkgs/pkgs/games/teeworlds/default.nix b/third_party/nixpkgs/pkgs/games/teeworlds/default.nix index b0a49cc77d..e12c19f6cb 100644 --- a/third_party/nixpkgs/pkgs/games/teeworlds/default.nix +++ b/third_party/nixpkgs/pkgs/games/teeworlds/default.nix @@ -1,6 +1,8 @@ { fetchFromGitHub, lib, stdenv, cmake, pkg-config, python3, alsa-lib , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils , nixosTests +, Carbon +, Cocoa }: stdenv.mkDerivation rec { @@ -15,26 +17,57 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # Can't use fetchpatch or fetchpatch2 because of https://github.com/NixOS/nixpkgs/issues/32084 + # Using fetchurl instead is also not a good idea, see https://github.com/NixOS/nixpkgs/issues/32084#issuecomment-727223713 + ./rename-VERSION-to-VERSION.txt.patch + ]; + postPatch = '' # set compiled-in DATA_DIR so resources can be found substituteInPlace src/engine/shared/storage.cpp \ --replace '#define DATA_DIR "data"' \ '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"' + + # Quote nonsense is a workaround for https://github.com/NixOS/nix/issues/661 + substituteInPlace 'other/bundle/client/Info.plist.in' \ + --replace ${"'"}''${TARGET_CLIENT}' 'teeworlds' \ + --replace ${"'"}''${PROJECT_VERSION}' '${version}' ''; - nativeBuildInputs = [ cmake pkg-config icoutils ]; - - buildInputs = [ - python3 alsa-lib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack + nativeBuildInputs = [ + cmake + pkg-config + ] ++ lib.optionals stdenv.isLinux [ + icoutils ]; - postInstall = '' + buildInputs = [ + python3 libGLU SDL2 lua5_3 zlib freetype wavpack + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + libX11 + ] ++ lib.optionals stdenv.isDarwin [ + Carbon + Cocoa + ]; + + postInstall = lib.optionalString stdenv.isLinux '' # Convert and install desktop icon mkdir -p $out/share/pixmaps icotool --extract --index 1 --output $out/share/pixmaps/teeworlds.png $src/other/icons/teeworlds.ico # Install menu item install -D $src/other/teeworlds.desktop $out/share/applications/teeworlds.desktop + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p "$out/Applications/teeworlds.app/Contents/MacOS" + mkdir -p "$out/Applications/teeworlds.app/Contents/Resources" + + cp '../other/icons/teeworlds.icns' "$out/Applications/teeworlds.app/Contents/Resources/" + cp '../other/bundle/client/Info.plist.in' "$out/Applications/teeworlds.app/Contents/Info.plist" + cp '../other/bundle/client/PkgInfo' "$out/Applications/teeworlds.app/Contents/" + ln -s "$out/bin/teeworlds" "$out/Applications/teeworlds.app/Contents/MacOS/" + ln -s "$out/share/teeworlds/data" "$out/Applications/teeworlds.app/Contents/Resources/data" ''; passthru.tests.teeworlds = nixosTests.teeworlds; @@ -51,7 +84,7 @@ stdenv.mkDerivation rec { homepage = "https://teeworlds.com/"; license = "BSD-style, see `license.txt'"; - maintainers = with lib.maintainers; [ astsmtl ]; - platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ astsmtl Luflosi ]; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/games/teeworlds/rename-VERSION-to-VERSION.txt.patch b/third_party/nixpkgs/pkgs/games/teeworlds/rename-VERSION-to-VERSION.txt.patch new file mode 100644 index 0000000000..4d56286cb4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/teeworlds/rename-VERSION-to-VERSION.txt.patch @@ -0,0 +1,33 @@ +From 86d6687ef07f7f05457a7f67537b650656b13820 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert=20M=C3=BCller?= +Date: Fri, 15 Oct 2021 23:45:50 +0200 +Subject: [PATCH] rename VERSION to VERSION.txt: + +Fixes compilation on systems with case insensitive file names where the standard library includes the version file source code. +--- + src/engine/external/json-parser/{VERSION => VERSION.txt} | 0 + src/engine/external/pnglite/{VERSION => VERSION.txt} | 0 + src/engine/external/wavpack/{VERSION => VERSION.txt} | 0 + src/engine/external/zlib/{VERSION => VERSION.txt} | 0 + 4 files changed, 0 insertions(+), 0 deletions(-) + rename src/engine/external/json-parser/{VERSION => VERSION.txt} (100%) + rename src/engine/external/pnglite/{VERSION => VERSION.txt} (100%) + rename src/engine/external/wavpack/{VERSION => VERSION.txt} (100%) + rename src/engine/external/zlib/{VERSION => VERSION.txt} (100%) + +diff --git a/src/engine/external/json-parser/VERSION b/src/engine/external/json-parser/VERSION.txt +similarity index 100% +rename from src/engine/external/json-parser/VERSION +rename to src/engine/external/json-parser/VERSION.txt +diff --git a/src/engine/external/pnglite/VERSION b/src/engine/external/pnglite/VERSION.txt +similarity index 100% +rename from src/engine/external/pnglite/VERSION +rename to src/engine/external/pnglite/VERSION.txt +diff --git a/src/engine/external/wavpack/VERSION b/src/engine/external/wavpack/VERSION.txt +similarity index 100% +rename from src/engine/external/wavpack/VERSION +rename to src/engine/external/wavpack/VERSION.txt +diff --git a/src/engine/external/zlib/VERSION b/src/engine/external/zlib/VERSION.txt +similarity index 100% +rename from src/engine/external/zlib/VERSION +rename to src/engine/external/zlib/VERSION.txt diff --git a/third_party/nixpkgs/pkgs/games/tinyfugue/default.nix b/third_party/nixpkgs/pkgs/games/tinyfugue/default.nix index e75d2f12b9..46a5aae09e 100644 --- a/third_party/nixpkgs/pkgs/games/tinyfugue/default.nix +++ b/third_party/nixpkgs/pkgs/games/tinyfugue/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-fcommon"; meta = { - homepage = "http://tinyfugue.sourceforge.net/"; + homepage = "https://tinyfugue.sourceforge.net/"; description = "A terminal UI, screen-oriented MUD client"; longDescription = '' TinyFugue, aka "tf", is a flexible, screen-oriented MUD client, for use diff --git a/third_party/nixpkgs/pkgs/games/torcs/default.nix b/third_party/nixpkgs/pkgs/games/torcs/default.nix index e3ec82b549..4764db4413 100644 --- a/third_party/nixpkgs/pkgs/games/torcs/default.nix +++ b/third_party/nixpkgs/pkgs/games/torcs/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; - homepage = "http://torcs.sourceforge.net/"; + homepage = "https://torcs.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/games/typespeed/default.nix b/third_party/nixpkgs/pkgs/games/typespeed/default.nix index 0c2d928dd5..a6ae1d9866 100644 --- a/third_party/nixpkgs/pkgs/games/typespeed/default.nix +++ b/third_party/nixpkgs/pkgs/games/typespeed/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.5"; buildInputs = [ ncurses ]; src = fetchurl { - url = "http://typespeed.sourceforge.net/typespeed-${version}.tar.gz"; + url = "https://typespeed.sourceforge.net/typespeed-${version}.tar.gz"; sha256 = "5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A curses based typing game"; - homepage = "http://typespeed.sourceforge.net/"; + homepage = "https://typespeed.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.auntie ]; diff --git a/third_party/nixpkgs/pkgs/games/uhexen2/default.nix b/third_party/nixpkgs/pkgs/games/uhexen2/default.nix index b9bde8d3e4..1a43679bd1 100644 --- a/third_party/nixpkgs/pkgs/games/uhexen2/default.nix +++ b/third_party/nixpkgs/pkgs/games/uhexen2/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { HoT includes countless bug fixes, improved music, sound and video modes, opengl improvements, support for many operating systems and architectures, and documentation among many others. ''; - homepage = "http://uhexen2.sourceforge.net/"; + homepage = "https://uhexen2.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ xdhampus ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/games/unciv/default.nix b/third_party/nixpkgs/pkgs/games/unciv/default.nix index 604f01fafd..b036ded0b7 100644 --- a/third_party/nixpkgs/pkgs/games/unciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.3.1"; + version = "4.4.6"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - sha256 = "sha256-qgjMQSkSYp/Tk9Acr21Nd5gLq9JLmEYsfSC+Ia362+c="; + sha256 = "sha256-I4EKYoN+36a65mcZ2UWH3Ws75Ojdmpw/6flKFmEuIk8="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/games/uqm/default.nix b/third_party/nixpkgs/pkgs/games/uqm/default.nix index 797c41916f..7da4c1e597 100644 --- a/third_party/nixpkgs/pkgs/games/uqm/default.nix +++ b/third_party/nixpkgs/pkgs/games/uqm/default.nix @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy! ''; - homepage = "http://sc2.sourceforge.net/"; + homepage = "https://sc2.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ jcumming aszlig ]; platforms = with lib.platforms; linux; diff --git a/third_party/nixpkgs/pkgs/games/vassal/default.nix b/third_party/nixpkgs/pkgs/games/vassal/default.nix index fd3df36bdb..d199918218 100644 --- a/third_party/nixpkgs/pkgs/games/vassal/default.nix +++ b/third_party/nixpkgs/pkgs/games/vassal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.6.7"; + version = "3.6.10"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-WTYMbVtAciscnBzR4uHmVVXpuge53e32uLmUF8/w6I0="; + sha256 = "sha256-YQUKYsuDaCHChiRBQOKr813ptyc4UxZQ5aQFeC6tutU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix b/third_party/nixpkgs/pkgs/games/vintagestory/default.nix index b26fca1530..96c8e5ba7a 100644 --- a/third_party/nixpkgs/pkgs/games/vintagestory/default.nix +++ b/third_party/nixpkgs/pkgs/games/vintagestory/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.17.9"; + version = "1.17.10"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; - sha256 = "sha256-Lii6WoAKS237vK2I9R8l2Q8ktp8WiArVYO5Vf93ummo="; + sha256 = "sha256-1HsWby4Jf+ndE9xsDrS+vELymDedRwSgNiCDLoiPBec="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; diff --git a/third_party/nixpkgs/pkgs/games/wesnoth/default.nix b/third_party/nixpkgs/pkgs/games/wesnoth/default.nix index a98e695950..6b5e0c117c 100644 --- a/third_party/nixpkgs/pkgs/games/wesnoth/default.nix +++ b/third_party/nixpkgs/pkgs/games/wesnoth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.16.6"; + version = "1.16.7"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "sha256-oQRjVjVjLIvCCafLr0FXvLwnKDjJY2FU20dYGLtNFiU="; + sha256 = "sha256-YcBF/iNr6Q5NaA+G55xa0SOCCHW2BCoJlmXsTtkF1fk="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/games/zaz/default.nix b/third_party/nixpkgs/pkgs/games/zaz/default.nix index 81d42b1b29..ebc7dff540 100644 --- a/third_party/nixpkgs/pkgs/games/zaz/default.nix +++ b/third_party/nixpkgs/pkgs/games/zaz/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; description = "A puzzle game about arranging balls in triplets, like Luxor, Zuma, or Puzzle Bobble"; - homepage = "http://zaz.sourceforge.net/"; + homepage = "https://zaz.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/misc/cups/default.nix b/third_party/nixpkgs/pkgs/misc/cups/default.nix index b707647377..d9f136f813 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/default.nix @@ -9,7 +9,7 @@ , libtiff , pam , dbus -, enableSystemd ? stdenv.isLinux +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , acl , gmp @@ -22,10 +22,8 @@ , nixosTests }: -with lib; stdenv.mkDerivation rec { pname = "cups"; - version = "2.4.2"; src = fetchurl { @@ -48,9 +46,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config removeReferencesTo ]; buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ] - ++ optionals stdenv.isLinux [ avahi pam dbus acl ] - ++ optional enableSystemd systemd - ++ optionals stdenv.isDarwin (with darwin; [ + ++ lib.optionals stdenv.isLinux [ avahi pam dbus acl ] + ++ lib.optional enableSystemd systemd + ++ lib.optionals stdenv.isDarwin (with darwin; [ configd apple_sdk.frameworks.ApplicationServices ]); @@ -62,18 +60,18 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--enable-raw-printing" "--enable-threads" - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ "--enable-dbus" "--enable-pam" "--with-dbusdir=${placeholder "out"}/share/dbus-1" - ] ++ optional (libusb1 != null) "--enable-libusb" - ++ optional (gnutls != null) "--enable-ssl" - ++ optional (avahi != null) "--enable-avahi" - ++ optional (libpaper != null) "--enable-libpaper"; + ] ++ lib.optional (libusb1 != null) "--enable-libusb" + ++ lib.optional (gnutls != null) "--enable-ssl" + ++ lib.optional (avahi != null) "--enable-avahi" + ++ lib.optional (libpaper != null) "--enable-libpaper"; # AR has to be an absolute path preConfigure = '' - export AR="${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" + export AR="${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" configureFlagsArray+=( # Put just lib/* and locale into $lib; this didn't work directly. # lib/cups is moved back to $out in postInstall. @@ -84,7 +82,7 @@ stdenv.mkDerivation rec { "--with-systemd=$out/lib/systemd/system" - ${optionalString stdenv.isDarwin '' + ${lib.optionalString stdenv.isDarwin '' "--with-bundledir=$out" ''} ) @@ -130,7 +128,7 @@ stdenv.mkDerivation rec { for f in "$out"/lib/systemd/system/*; do substituteInPlace "$f" --replace "$lib/$libexec" "$out/$libexec" done - '' + optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' # Use xdg-open when on Linux substituteInPlace "$out"/share/applications/cups.desktop \ --replace "Exec=htmlview" "Exec=xdg-open" @@ -138,7 +136,7 @@ stdenv.mkDerivation rec { passthru.tests.nixos = nixosTests.printing; - meta = { + meta = with lib; { homepage = "https://openprinting.github.io/cups/"; description = "A standards-based printing system for UNIX"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index 8a0b981a82..f290b9563c 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; maintainers = [ ]; - platforms = [ "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/misc/documentation-highlighter/default.nix b/third_party/nixpkgs/pkgs/misc/documentation-highlighter/default.nix index 2a34e36742..22ea3a5f86 100644 --- a/third_party/nixpkgs/pkgs/misc/documentation-highlighter/default.nix +++ b/third_party/nixpkgs/pkgs/misc/documentation-highlighter/default.nix @@ -7,6 +7,16 @@ runCommand "documentation-highlighter" { platforms = lib.platforms.all; maintainers = [ lib.maintainers.grahamc ]; }; + src = lib.sources.cleanSourceWith { + src = ./.; + filter = path: type: lib.elem path (map toString [ + ./highlight.pack.js + ./LICENSE + ./loader.js + ./mono-blue.css + ./README.md + ]); + }; } '' - cp -r ${./.} $out + cp -r "$src" "$out" '' diff --git a/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix index c1d38656b2..91f6d98e9d 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/foo2zjs/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { sed -e "/PRINTERID=/s@=.*@=$out/bin/usb_printerid@" -i hplj1000 ''; - checkInputs = [ time ]; + nativeCheckInputs = [ time ]; doCheck = false; # fails to find its own binary. Also says "Tests will pass only if you are using ghostscript-8.71-16.fc14". preInstall = '' diff --git a/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix index 61d36052e2..0aeb5f2e96 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/sc-controller/default.nix @@ -27,7 +27,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ evdev pygobject3 pylibacl vdf ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; patches = [ # Fix a broken test diff --git a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix index 5cc1b46013..eb2fc165cc 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/spacenavd/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { - homepage = "http://spacenav.sourceforge.net/"; + homepage = "https://spacenav.sourceforge.net/"; description = "Device driver and SDK for 3Dconnexion 3D input devices"; longDescription = "A free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xwiimote/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/xwiimote/default.nix index 414a207fa5..69ffcdd788 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/xwiimote/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/xwiimote/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-doxygen=no" ]; meta = { - homepage = "http://dvdhrm.github.io/xwiimote"; + homepage = "https://dvdhrm.github.io/xwiimote"; description = "Userspace utilities to control connected Nintendo Wii Remotes"; platforms = lib.platforms.linux; license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/misc/dxvk/default.nix b/third_party/nixpkgs/pkgs/misc/dxvk/default.nix index b93c46f091..0e46011e7e 100644 --- a/third_party/nixpkgs/pkgs/misc/dxvk/default.nix +++ b/third_party/nixpkgs/pkgs/misc/dxvk/default.nix @@ -1,74 +1,34 @@ { lib -, pkgs , stdenvNoCC , fetchFromGitHub , pkgsCross +, stdenv +, bash }: stdenvNoCC.mkDerivation (finalAttrs: let - inherit (stdenvNoCC.hostPlatform.uname) system; - # DXVK needs to be a separate derivation because it’s actually a set of DLLs for Windows that - # needs to be built with a cross-compiler. - dxvk32 = pkgsCross.mingw32.callPackage ./dxvk.nix { - inherit (finalAttrs) src version dxvkPatches; - }; - dxvk64 = pkgsCross.mingwW64.callPackage ./dxvk.nix { - inherit (finalAttrs) src version dxvkPatches; - }; - - # Split out by platform to make maintenance easy in case supported versions on Darwin and other - # platforms diverge (due to the need for Darwin-specific patches that would fail to apply). - # Should that happen, set `darwin` to the last working `rev` and `hash`. - srcs = rec { - darwin = { - rev = "v${finalAttrs.version}"; - hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE="; - version = "1.10.3"; - }; - default = { - rev = "v${finalAttrs.version}"; - hash = "sha256-mboVLdPgZMzmqyeF0jAloEz6xqfIDiY/X98e7l2KZnw="; - version = "2.0"; - }; - }; + dxvk32 = if stdenv.isDarwin then pkgsCross.mingw32.dxvk_1 else pkgsCross.mingw32.dxvk_2; + dxvk64 = if stdenv.isDarwin then pkgsCross.mingwW64.dxvk_1 else pkgsCross.mingwW64.dxvk_2; in { name = "dxvk"; - inherit (srcs."${system}" or srcs.default) version; - - src = fetchFromGitHub { - owner = "doitsujin"; - repo = "dxvk"; - inherit (srcs."${system}" or srcs.default) rev hash; - }; - - # Override this to patch DXVK itself (rather than the setup script). - dxvkPatches = lib.optionals stdenvNoCC.isDarwin [ - # Patch DXVK to work with MoltenVK even though it doesn’t support some required features. - # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well. - ./darwin-dxvk-compat.patch - # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin. - # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/ - ./darwin-thread-primitives.patch - ]; + inherit (dxvk64) version; outputs = [ "out" "bin" "lib" ]; - # Also copy `mcfgthread-12.dll` due to DXVK’s being built in a MinGW cross environment. - patches = [ ./mcfgthread.patch ]; - + dontUnpack = true; dontConfigure = true; dontBuild = true; installPhase = '' mkdir -p $out/bin $bin $lib - # Replace both basedir forms to support both DXVK 2.0 and older versions. - substitute setup_dxvk.sh $out/bin/setup_dxvk.sh \ + substitute ${./setup_dxvk.sh} $out/bin/setup_dxvk.sh \ + --subst-var-by bash ${bash} \ + --subst-var-by dxvk32 ${dxvk32} \ + --subst-var-by dxvk64 ${dxvk64} \ --subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads}" \ - --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" \ - --replace 'basedir=$(dirname "$(readlink -f $0)")' "basedir=$bin" \ - --replace 'basedir="$(dirname "$(readlink -f "$0")")"' "basedir=$bin" + --subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" chmod a+x $out/bin/setup_dxvk.sh declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} ) for arch in "''${!dxvks[@]}"; do @@ -78,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: ''; meta = { - description = "A Vulkan-based translation layer for Direct3D 9/10/11"; + description = "Setup script for DXVK"; homepage = "https://github.com/doitsujin/dxvk"; changelog = "https://github.com/doitsujin/dxvk/releases"; maintainers = [ lib.maintainers.reckenrode ]; diff --git a/third_party/nixpkgs/pkgs/misc/dxvk/dxvk.nix b/third_party/nixpkgs/pkgs/misc/dxvk/dxvk.nix index 7607c9ee44..793264f9b3 100644 --- a/third_party/nixpkgs/pkgs/misc/dxvk/dxvk.nix +++ b/third_party/nixpkgs/pkgs/misc/dxvk/dxvk.nix @@ -5,31 +5,81 @@ , meson , ninja , windows -, src -, version +, dxvkVersion , spirv-headers , vulkan-headers -, dxvkPatches +, SDL2 +, glfw +, pkgsBuildHost +, sdl2Support ? true +, glfwSupport ? false }: +# SDL2 and GLFW support are mutually exclusive. +assert !sdl2Support || !glfwSupport; + let # DXVK 2.0+ no longer vendors certain dependencies. This derivation also needs to build on Darwin, # which does not currently support DXVK 2.0, so adapt conditionally for this situation. - isDxvk2 = lib.versionAtLeast version "2.0"; + isDxvk2 = lib.versionAtLeast (srcs.${dxvkVersion}.version) "2.0"; + + # DXVK has effectively the same build script regardless of platform. + srcs = { + "1.10" = rec { + version = "1.10.3"; + src = fetchFromGitHub { + owner = "doitsujin"; + repo = "dxvk"; + rev = "v${version}"; + hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE="; + }; + # These patches are required when using DXVK with Wine on Darwin. + patches = lib.optionals stdenv.buildPlatform.isDarwin [ + # Patch DXVK to work with MoltenVK even though it doesn’t support some required features. + # Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well. + ./darwin-dxvk-compat.patch + # Use synchronization primitives from the C++ standard library to avoid deadlocks on Darwin. + # See: https://www.reddit.com/r/macgaming/comments/t8liua/comment/hzsuce9/ + ./darwin-thread-primitives.patch + ]; + }; + "2.1" = rec { + version = "2.1"; + src = fetchFromGitHub { + owner = "doitsujin"; + repo = "dxvk"; + rev = "v${version}"; + hash = "sha256-A4KR11brfQbR56dGt371MRwMN/H6HFAU8TlFC97/bRs="; + fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info + }; + patches = [ ]; + }; + }; + + isWindows = stdenv.targetPlatform.uname.system == "Windows"; + isCross = stdenv.hostPlatform != stdenv.targetPlatform; in stdenv.mkDerivation { pname = "dxvk"; - inherit src version; + inherit (srcs.${dxvkVersion}) version src patches; nativeBuildInputs = [ glslang meson ninja ]; - buildInputs = [ windows.pthreads ] - ++ lib.optionals isDxvk2 [ spirv-headers vulkan-headers ]; + buildInputs = lib.optional isWindows [ windows.pthreads ] + ++ lib.optionals isDxvk2 ( + [ spirv-headers vulkan-headers ] + ++ lib.optional (!isWindows && sdl2Support) SDL2 + ++ lib.optional (!isWindows && glfwSupport) glfw + ); - patches = dxvkPatches; + postPatch = lib.optionalString isDxvk2 '' + substituteInPlace "subprojects/libdisplay-info/tool/gen-search-table.py" \ + --replace "/usr/bin/env python3" "${lib.getBin pkgsBuildHost.python3}/bin/python3" + ''; - preConfigure = lib.optionalString isDxvk2 '' - ln -s ${lib.getDev spirv-headers}/include include/spirv/include - ln -s ${lib.getDev vulkan-headers}/include include/vulkan/include + # Build with the Vulkan SDK in nixpkgs. + preConfigure = '' + rm -rf include/spirv/include include/vulkan/include + mkdir -p include/spirv/include include/vulkan/include ''; mesonFlags = @@ -38,9 +88,12 @@ stdenv.mkDerivation { in [ "--buildtype" "release" - "--cross-file" "build-win${arch}.txt" "--prefix" "${placeholder "out"}" - ]; + ] + ++ lib.optionals isCross [ "--cross-file" "build-win${arch}.txt" ] + ++ lib.optional glfwSupport "-Ddxvk_native_wsi=glfw"; + + doCheck = isDxvk2 && !isCross; meta = { description = "A Vulkan-based translation layer for Direct3D 9/10/11"; @@ -48,6 +101,6 @@ stdenv.mkDerivation { changelog = "https://github.com/doitsujin/dxvk/releases"; maintainers = [ lib.maintainers.reckenrode ]; license = lib.licenses.zlib; - platforms = lib.platforms.windows; + platforms = lib.platforms.windows ++ lib.optionals isDxvk2 lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/misc/dxvk/mcfgthread.patch b/third_party/nixpkgs/pkgs/misc/dxvk/mcfgthread.patch deleted file mode 100644 index 0370716301..0000000000 --- a/third_party/nixpkgs/pkgs/misc/dxvk/mcfgthread.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/setup_dxvk.sh b/setup_dxvk.sh -index 3e63ecf0..87c04f23 100755 ---- a/setup_dxvk.sh -+++ b/setup_dxvk.sh -@@ -133,6 +133,8 @@ - rm -v "${dstfile}" - fi - $file_cmd "${srcfile}" "${dstfile}" -+ elif [ "${4}" = "--force" ]; then -+ $file_cmd "${srcfile}" "${dstfile}" - else - echo "${dstfile}: File not found in wine prefix" >&2 - return 1 -@@ -170,12 +172,12 @@ - } - - install() { -- installFile "$win64_sys_path" "$dxvk_lib64" "$1" -+ installFile "$win64_sys_path" "$dxvk_lib64" "$1" "${2-}" - inst64_ret="$?" - - inst32_ret=-1 - if $wow64; then -- installFile "$win32_sys_path" "$dxvk_lib32" "$1" -+ installFile "$win32_sys_path" "$dxvk_lib32" "$1" "${2-}" - inst32_ret="$?" - fi - -@@ -214,3 +216,5 @@ - - $action d3d10core - $action d3d11 -+ -+basedir="" dxvk_lib32=@mcfgthreads32@/bin dxvk_lib64=@mcfgthreads64@/bin $action mcfgthread-12 --force diff --git a/third_party/nixpkgs/pkgs/misc/dxvk/setup_dxvk.sh b/third_party/nixpkgs/pkgs/misc/dxvk/setup_dxvk.sh new file mode 100644 index 0000000000..8fadb264fd --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/dxvk/setup_dxvk.sh @@ -0,0 +1,265 @@ +#!@bash@/bin/bash -e + +set -eu -o pipefail + +dxvk32_dir=@dxvk32@/bin +dxvk64_dir=@dxvk64@/bin + +mcfgthreads32_dir=@mcfgthreads32@/bin +mcfgthreads64_dir=@mcfgthreads64@/bin + +## Defaults + +declare -A dlls=( + [d3d9]="dxvk/d3d9.dll" + [d3d10]="dxvk/d3d10.dll dxvk/d3d10_1.dll dxvk/d3d10core.dll" + [d3d11]="dxvk/d3d11.dll" + [dxgi]="dxvk/dxgi.dll" + [mcfgthreads]="mcfgthreads/mcfgthread-12.dll" +) + +declare -A targets=([d3d9]=1 [d3d11]=1 [dxgi]=1 [mcfgthreads]=1) + +## Command-line Parsing + +usage() { + echo "DXVK @version@" + echo "Set up Wine prefix with DXVK DLLs" + echo + echo "USAGE" + echo " $0 [install|uninstall] [OPTIONS]" + echo + echo "COMMANDS" + echo " install Copy the DXVK DLLs into the prefix" + echo " uninstall Restore the backed up Wine DLLs in the prefix" + echo + echo "OPTIONS" + echo " --with(out)-dxgi Copy DXVK DXGI DLL into prefix (default: with DXGI)" + echo " --with(out)-d3d10 Copy D3D10 DLLs into prefix (default: without D3D10)" + echo " -s, --symlink Symlink instead of copy" + echo " -f, --force Create a Wine prefix even if it does not exist" + echo " -p, --prefix Wine prefix to manage (default: \$WINEPREFIX)" + exit 1 +} + +case "$1" in + uninstall|install) + action=$1 + shift + ;; + -h|--help) + usage + ;; + *) + if [ ! -z "${1:-}" ]; then + echo "Unrecognized command: $1" + fi + usage + ;; +esac + + +do_symlink=false +do_makeprefix=false + +while [ ! -z "${1:-}" ]; do + case "$1" in + --with-dxgi) + targets[dxgi]=1 + ;; + --without-dxgi) + unset targets[dxgi] + ;; + --with-d3d10) + targets[d3d10]=1 + ;; + --without-d3d10) + unset targets[d3d10] + ;; + -s|--symlink) + do_symlink=true + ;; + --no-symlink) + do_symlink=false + ;; + -f|--force) + do_makeprefix=true + ;; + --no-force) + do_makeprefix=false + ;; + -p|--prefix) + shift + if [ ! -z "${1:-}" ]; then + WINEPREFIX=$1 + else + echo "Required PREFIX missing" + usage + fi + ;; + -h|--help) + usage + ;; + *) + echo "Unrecognized option: $1" + usage + ;; + esac + shift +done + +## Get information on the Wine environment + +export WINEPREFIX=${WINEPREFIX:-"$HOME/.wine"} + +# check wine prefix before invoking wine, so that we +# don't accidentally create one if the user screws up +if ! $do_makeprefix && [ -n "$WINEPREFIX" ] && ! [ -f "$WINEPREFIX/system.reg" ]; then + echo "$WINEPREFIX: Not a valid wine prefix." >&2 + exit 1 +fi + +export WINEDEBUG=-all +# disable mscoree and mshtml to avoid downloading +# wine gecko and mono +export WINEDLLOVERRIDES="mscoree,mshtml=" + +wine="wine" +wine64="wine64" +wineboot="wineboot" + +# $PATH is the way for user to control where wine is located (including custom Wine versions). +# Pure 64-bit Wine (non Wow64) requries skipping 32-bit steps. +# In such case, wine64 and winebooot will be present, but wine binary will be missing, +# however it can be present in other PATHs, so it shouldn't be used, to avoid versions mixing. +wine_path=$(dirname "$(command -v $wineboot)") +wow64=true +if ! [ -f "$wine_path/$wine" ]; then + wine=$wine64 + wow64=false +fi + +# resolve 32-bit and 64-bit system32 path +winever=$($wine --version | grep wine) +if [ -z "$winever" ]; then + echo "$wine: Not a wine executable. Check your $wine." >&2 + exit 1 +fi + +# ensure wine placeholder dlls are recreated +# if they are missing +$wineboot -u + +win64_sys_path=$($wine64 winepath -u 'C:\windows\system32' 2> /dev/null) +win64_sys_path="${win64_sys_path/$'\r'/}" +if $wow64; then + win32_sys_path=$($wine winepath -u 'C:\windows\system32' 2> /dev/null) + win32_sys_path="${win32_sys_path/$'\r'/}" +fi + +if [ -z "${win32_sys_path:-}" ] && [ -z "${win64_sys_path:-}" ]; then + echo 'Failed to resolve C:\windows\system32.' >&2 + exit 1 +fi + +## Utility functions + +install_file() { + $do_symlink && file_cmd="ln -sv" || file_cmd="install -m 755 -v" + + srcfile=$1 + dstfile=$2 + + if [ -f "${srcfile}.so" ]; then + srcfile="${srcfile}.so" + fi + + if ! [ -f "${srcfile}" ]; then + echo "${srcfile}: File not found. Skipping." >&2 + return 1 + fi + + if [ -n "$1" ]; then + if [ -f "${dstfile}" ] || [ -h "${dstfile}" ]; then + if ! [ -f "${dstfile}.old" ]; then + mv -v "${dstfile}" "${dstfile}.old" + else + rm -v "${dstfile}" + fi + fi + $file_cmd "${srcfile}" "${dstfile}" + else + echo "${dstfile}: File not found in wine prefix" >&2 + return 1 + fi +} + +uninstall_file() { + srcfile=$1 + dstfile=$2 + + if [ -f "${srcfile}.so" ]; then + srcfile="${srcfile}.so" + fi + + if ! [ -f "${srcfile}" ]; then + echo "${srcfile}: File not found. Skipping." >&2 + return 1 + fi + + if ! [ -f "${dstfile}" ] && ! [ -h "${dstfile}" ]; then + echo "${dstfile}: File not found. Skipping." >&2 + return 1 + fi + + if [ -f "${dstfile}.old" ]; then + rm -v "${dstfile}" + mv -v "${dstfile}.old" "${dstfile}" + return 0 + else + return 1 + fi +} + +install_override() { + dll=$(basename "$1") + $wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$dll" /d native /f >/dev/null 2>&1 + if [ $? -ne 0 ]; then + echo -e "Failed to add override for $dll" + exit 1 + fi +} + +uninstall_override() { + dll=$(basename "$1") + $wine reg delete 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$dll" /f > /dev/null 2>&1 + if [ $? -ne 0 ]; then + echo "Failed to remove override for $dll" + fi +} + +## Perform the requested command + +declare -A paths + +for target in "${!targets[@]}"; do + [ ${targets[$target]} -eq 1 ] || continue + for dll in ${dlls[$target]}; do + dllname=$(basename "$dll") + basedir=$(dirname "$dll") + + if [ ! -z "${win32_sys_path:-}" ]; then + basedir32=${basedir}32_dir + paths["${!basedir32}/$dllname"]="$win32_sys_path/$dllname" + fi + if [ ! -z "${win64_sys_path:-}" ]; then + basedir64=${basedir}64_dir + paths["${!basedir64}/$dllname"]="$win64_sys_path/$dllname" + fi + done +done + +for srcpath in "${!paths[@]}"; do + ${action}_file "$srcpath" "${paths["$srcpath"]}" + ${action}_override "$(basename srcpath)" +done diff --git a/third_party/nixpkgs/pkgs/misc/fastly/default.nix b/third_party/nixpkgs/pkgs/misc/fastly/default.nix index 60e5a72e37..2a4f51048b 100644 --- a/third_party/nixpkgs/pkgs/misc/fastly/default.nix +++ b/third_party/nixpkgs/pkgs/misc/fastly/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "fastly"; - version = "4.6.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-E91Vg/dPJQwBZar7Wo5IeMlFoI/jwz7ALtv67DW1Rsk="; + hash = "sha256-IbLSNgf4uB8JFNsCXkmkK+w4qhirpd8/ALEfVzGCTUA="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -31,7 +31,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-Gyc0c3RntrWFEqk+AixvXSRRqjr7SEYGeqIJ/ysoFgs="; + vendorHash = "sha256-fBU7829heM6T6Ba2r984qdd19VCuOP72jYwYCP7ECBU="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/misc/flashfocus/default.nix b/third_party/nixpkgs/pkgs/misc/flashfocus/default.nix index 5f6df66dd4..e43dc00ba2 100644 --- a/third_party/nixpkgs/pkgs/misc/flashfocus/default.nix +++ b/third_party/nixpkgs/pkgs/misc/flashfocus/default.nix @@ -10,15 +10,17 @@ python3.pkgs.buildPythonApplication rec { }; postPatch = '' - substituteInPlace setup.py \ - --replace "pyyaml>=5.1,<6.0" "pyyaml>=5.1" - substituteInPlace bin/nc_flash_window \ --replace "nc" "${lib.getExe netcat-openbsd}" ''; nativeBuildInputs = with python3.pkgs; [ - pytest-runner + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "pyyaml" + "xcffib" ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix index 9527c156e4..ac18998130 100644 --- a/third_party/nixpkgs/pkgs/misc/lilypond/default.nix +++ b/third_party/nixpkgs/pkgs/misc/lilypond/default.nix @@ -1,19 +1,19 @@ { stdenv, lib, fetchurl, ghostscript, gyre-fonts, texinfo, imagemagick, texi2html, guile , python3, gettext, flex, perl, bison, pkg-config, autoreconfHook, dblatex , fontconfig, freetype, pango, fontforge, help2man, zip, netpbm, groff -, makeWrapper, t1utils +, makeWrapper, t1utils, boehmgc, rsync , texlive, tex ? texlive.combine { - inherit (texlive) scheme-small lh metafont epsf; + inherit (texlive) scheme-small lh metafont epsf fontinst; } }: stdenv.mkDerivation rec { pname = "lilypond"; - version = "2.22.2"; + version = "2.24.0"; src = fetchurl { url = "http://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-3ekIVPp94QEvThMEpoYXrqmrMiky7AznaYT2DSaqI74="; + sha256 = "sha256-PO2+O5KwJWnjpvLwZ0hYlns9onjXCqPpiu9b3Nf3i2k="; }; postInstall = '' @@ -43,13 +43,18 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscript texinfo imagemagick texi2html guile dblatex tex zip netpbm python3 gettext perl fontconfig freetype pango - fontforge help2man groff t1utils + fontforge help2man groff t1utils boehmgc rsync ]; autoreconfPhase = "NOCONFIGURE=1 sh autogen.sh"; enableParallelBuilding = true; + passthru.updateScript = { + command = [ ./update.sh ]; + supportedFeatures = [ "commit" ]; + }; + meta = with lib; { description = "Music typesetting system"; homepage = "http://lilypond.org/"; diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix b/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix index a8472b66f1..468cd51439 100644 --- a/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix +++ b/third_party/nixpkgs/pkgs/misc/lilypond/unstable.nix @@ -1,11 +1,14 @@ -{ lib, fetchurl, guile, lilypond }: +{ lib, fetchurl, lilypond }: -(lilypond.override { - inherit guile; -}).overrideAttrs (oldAttrs: rec { - version = "2.23.12"; +lilypond.overrideAttrs (oldAttrs: rec { + version = "2.25.1"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - sha256 = "sha256-SLZ9/Jybltd8+1HANk8pTGHRb7MuZSJJDDY/S4Kwz/k="; + sha256 = "sha256-DchY+4+bWIvTZb4v9q/fAqStkbsxHhvty3eur0ZFYVs="; + }; + + passthru.updateScript = { + command = [ ./update.sh "unstable" ]; + supportedFeatures = [ "commit" ]; }; }) diff --git a/third_party/nixpkgs/pkgs/misc/lilypond/update.sh b/third_party/nixpkgs/pkgs/misc/lilypond/update.sh new file mode 100755 index 0000000000..e9c3f48805 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/lilypond/update.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl gnused nix + +set -euo pipefail + +if [ $# -gt 0 ] && [ "$1" = "unstable" ]; then + ATTR="lilypond-unstable" + FILE="$(dirname "${BASH_SOURCE[@]}")/unstable.nix" + QUERY="VERSION_DEVEL=" +else + ATTR="lilypond" + FILE="$(dirname "${BASH_SOURCE[@]}")/default.nix" + QUERY="VERSION_STABLE=" +fi + +# update version +PREV=$(nix eval --raw -f default.nix $ATTR.version) +NEXT=$(curl -s 'https://gitlab.com/lilypond/lilypond/-/raw/master/VERSION' | grep "$QUERY" | cut -d= -f2) +sed -i "s|$PREV|$NEXT|" "$FILE" +echo "[{\"commitMessage\":\"$ATTR: $PREV -> $NEXT\"}]" + +# update hash +PREV=$(nix eval --raw -f default.nix $ATTR.src.outputHash) +NEXT=$(nix hash to-sri --type sha256 $(nix-prefetch-url --type sha256 $(nix eval --raw -f default.nix $ATTR.src.url))) +sed -i "s|$PREV|$NEXT|" "$FILE" diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix index 72e283eaf1..d2a6dfcec9 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix @@ -5,7 +5,7 @@ , gtk2, gdk-pixbuf, gdk-pixbuf-xlib, libxml2, pam , systemd, coreutils , forceInstallAllHacks ? false -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/misc/t-rec/default.nix b/third_party/nixpkgs/pkgs/misc/t-rec/default.nix index e138a62e39..2bbfeda4d3 100644 --- a/third_party/nixpkgs/pkgs/misc/t-rec/default.nix +++ b/third_party/nixpkgs/pkgs/misc/t-rec/default.nix @@ -9,13 +9,13 @@ let in rustPlatform.buildRustPackage rec { pname = "t-rec"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "sassman"; repo = "t-rec-rs"; rev = "v${version}"; - sha256 = "sha256-tkt0XAofBhHytbA24g0+jU13aNjmgQ5RspbLTPclnrI="; + sha256 = "sha256-o1fO0N65L6Z6W6aBNhS5JqDHIc1MRQx0yECGzVSCsbo="; }; nativeBuildInputs = [ makeWrapper ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" ''; - cargoSha256 = "sha256-bb0fwz0fI6DJWgnW0rX63qH2niCLtPeVKex7m6BhVWs="; + cargoHash = "sha256-3NExPlHNcoYVkpOzWCyd66chJpeDzQLRJUruSLAwGNw="; meta = with lib; { description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; diff --git a/third_party/nixpkgs/pkgs/misc/talkfilters/default.nix b/third_party/nixpkgs/pkgs/misc/talkfilters/default.nix index 0f265f7e25..3b785dfc56 100644 --- a/third_party/nixpkgs/pkgs/misc/talkfilters/default.nix +++ b/third_party/nixpkgs/pkgs/misc/talkfilters/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Converts English text into text that mimics a stereotyped or humorous dialect"; - homepage = "http://www.hyperrealm.com/talkfilters/talkfilters.html"; + homepage = "https://www.hyperrealm.com/talkfilters/talkfilters.html"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ikervagyok ]; platforms = with lib.platforms; unix; diff --git a/third_party/nixpkgs/pkgs/misc/uboot/default.nix b/third_party/nixpkgs/pkgs/misc/uboot/default.nix index 2358a59f5d..42d7021f34 100644 --- a/third_party/nixpkgs/pkgs/misc/uboot/default.nix +++ b/third_party/nixpkgs/pkgs/misc/uboot/default.nix @@ -92,6 +92,16 @@ let passAsFile = [ "extraConfig" ]; + # Workaround '-idirafter' ordering bug in staging-next: + # https://github.com/NixOS/nixpkgs/pull/210004 + # where libc '-idirafter' gets added after user's idirafter and + # breaks. + # TODO(trofi): remove it in staging once fixed in cc-wrapper. + preConfigure = '' + export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] buildPackages.stdenv.hostPlatform.config}=$(< ${buildPackages.stdenv.cc}/nix-support/libc-cflags) + export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] stdenv.hostPlatform.config}=$(< ${stdenv.cc}/nix-support/libc-cflags) + ''; + configurePhase = '' runHook preConfigure @@ -119,7 +129,7 @@ let dontStrip = true; meta = with lib; { - homepage = "http://www.denx.de/wiki/U-Boot/"; + homepage = "https://www.denx.de/wiki/U-Boot/"; description = "Boot loader for embedded systems"; license = licenses.gpl2; maintainers = with maintainers; [ bartsch dezgeg samueldr lopsided98 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/default.nix index 3a53916a46..e7252ab35e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/default.nix @@ -2,7 +2,7 @@ , makeScopeWithSplicing, generateSplicesForMkScope , buildPackages , bsdSetupHook, makeSetupHook -, fetchgit, fetchurl, coreutils, groff, mandoc, byacc, flex, which, m4, gawk, substituteAll, runtimeShell +, fetchgit, fetchzip, coreutils, groff, mandoc, byacc, flex, which, m4, gawk, substituteAll, runtimeShell , zlib, expat, libmd , runCommand, writeShellScript, writeText, symlinkJoin }: @@ -75,6 +75,11 @@ in makeScopeWithSplicing in { inherit freebsdSrc; + ports = fetchzip { + url = "https://cgit.freebsd.org/ports/snapshot/ports-dde3b2b456c3a4bdd217d0bf3684231cc3724a0a.tar.gz"; + sha256 = "BpHqJfnGOeTE7tkFJBx0Wk8ryalmf4KNTit/Coh026E="; + }; + # Why do we have splicing and yet do `nativeBuildInputs = with self; ...`? # See note in ../netbsd/default.nix. @@ -388,6 +393,12 @@ in makeScopeWithSplicing outputs = [ "out" "man" "test" ]; }; + sed = mkDerivation { + path = "usr.bin/sed"; + TESTSRC = "${freebsdSrc}/contrib/netbsd-tests"; + MK_TESTS = "no"; + }; + # Don't add this to nativeBuildInputs directly. Use statHook instead. stat = mkDerivation { path = "usr.bin/stat"; diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix new file mode 100644 index 0000000000..3c3dcb6d5d --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/evdev-proto/default.nix @@ -0,0 +1,64 @@ +{ lib, stdenv, linuxHeaders, freebsd, runCommandCC, buildPackages }: + +stdenv.mkDerivation { + pname = "evdev-proto"; + inherit (linuxHeaders) version; + + src = freebsd.ports; + + sourceRoot = "source/devel/evdev-proto"; + + useTempPrefix = true; + + nativeBuildInputs = [ freebsd.makeMinimal ]; + + ARCH = freebsd.makeMinimal.MACHINE_ARCH; + OPSYS = "FreeBSD"; + _OSRELEASE = "${lib.versions.majorMinor freebsd.makeMinimal.version}-RELEASE"; + + AWK = "awk"; + CHMOD = "chmod"; + FIND = "find"; + MKDIR = "mkdir -p"; + PKG_BIN = "${buildPackages.pkg}/bin/pkg"; + RM = "rm -f"; + SED = "${buildPackages.freebsd.sed}/bin/sed"; + SETENV = "env"; + SH = "sh"; + TOUCH = "touch"; + XARGS = "xargs"; + + ABI_FILE = runCommandCC "abifile" {} "$CC -shared -o $out"; + CLEAN_FETCH_ENV = true; + INSTALL_AS_USER = true; + NO_CHECKSUM = true; + NO_MTREE = true; + SRC_BASE = freebsd.freebsdSrc; + + preUnpack = '' + export MAKE_JOBS_NUMBER="$NIX_BUILD_CORES" + + export DISTDIR="$PWD/distfiles" + export PKG_DBDIR="$PWD/pkg" + export PREFIX="$prefix" + + mkdir -p "$DISTDIR/evdev-proto" + tar -C "$DISTDIR/evdev-proto" \ + -xf ${linuxHeaders.src} \ + --strip-components 4 \ + linux-${linuxHeaders.version}/include/uapi/linux + ''; + + makeFlags = [ "DIST_SUBDIR=evdev-proto" ]; + + postInstall = '' + mv $prefix $out + ''; + + meta = with lib; { + description = "Input event device header files for FreeBSD"; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.freebsd; + license = licenses.gpl2Only; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix index 37a0c35b18..1033927ce6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix @@ -54,7 +54,8 @@ in makeScopeWithSplicing mkDerivation = lib.makeOverridable (attrs: let stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; in stdenv'.mkDerivation ({ - name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}"; + pname = "${attrs.pname or (baseNameOf attrs.path)}-netbsd"; + inherit (attrs) version; src = fetchNetBSD attrs.path attrs.version attrs.sha256; extraPaths = [ ]; @@ -679,6 +680,13 @@ in makeScopeWithSplicing ## ## START LIBRARIES ## + libarch = mkDerivation { + path = "lib/libarch"; + version = "9.2"; + sha256 = "6ssenRhuSwp0Jn71ErT0PrEoCJ+cIYRztwdL4QTDZsQ="; + meta.platforms = lib.platforms.netbsd; + }; + libutil = mkDerivation { path = "lib/libutil"; version = "9.2"; @@ -808,6 +816,16 @@ in makeScopeWithSplicing meta.platforms = lib.platforms.netbsd; }; + libpci = mkDerivation { + pname = "libpci"; + path = "lib/libpci"; + version = "9.2"; + sha256 = "+IOEO1Bw3/H3iCp3uk3bwsFZbvCqN5Ciz70irnPl8E8="; + NIX_CFLAGS_COMPILE = [ "-I." ]; + meta.platforms = lib.platforms.netbsd; + extraPaths = with self; [ sys.src ]; + }; + libpthread-headers = mkDerivation { pname = "libpthread-headers"; path = "lib/libpthread"; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/DarwinTools/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/DarwinTools/default.nix index f648435eed..72a3750284 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/DarwinTools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/DarwinTools/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { version = "1"; src = fetchurl { - url = "https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz"; - sha256 = "0hh4jl590jv3v830p77r3jcrnpndy7p2b8ajai3ldpnx2913jfhp"; + url = "https://web.archive.org/web/20180408044816/https://opensource.apple.com/tarballs/DarwinTools/DarwinTools-${version}.tar.gz"; + hash = "sha256-Fzo5QhLd3kZHVFKhJe7xzV6bmRz5nAsG2mNLkAqVBEI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix index d7ac5d9fd9..839548ae8f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/apple_sdk.nix @@ -45,12 +45,20 @@ let cp -r ${MacOSX-SDK}${standardFrameworkPath name private} $out/Library/Frameworks + if [[ -d ${MacOSX-SDK}/usr/lib/swift/${name}.swiftmodule ]]; then + mkdir -p $out/lib/swift + cp -r -t $out/lib/swift \ + ${MacOSX-SDK}/usr/lib/swift/${name}.swiftmodule \ + ${MacOSX-SDK}/usr/lib/swift/libswift${name}.tbd + fi + # Fix and check tbd re-export references chmod u+w -R $out find $out -name '*.tbd' -type f | while read tbd; do echo "Fixing re-exports in $tbd" rewrite-tbd \ -p ${standardFrameworkPath name private}/:$out/Library/Frameworks/${name}.framework/ \ + -p /usr/lib/swift/:$out/lib/swift/ \ ${mkDepsRewrites deps} \ -r ${builtins.storeDir} \ "$tbd" @@ -163,6 +171,15 @@ in rec { # Seems to be appropriate given https://developer.apple.com/forums/thread/666686 JavaVM = super.JavaNativeFoundation; + + CoreVideo = lib.overrideDerivation super.CoreVideo (drv: { + installPhase = drv.installPhase + '' + # When used as a module, complains about a missing import for + # Darwin.C.stdint. Apparently fixed in later SDKs. + awk -i inplace '/CFBase.h/ { print "#include " } { print }' \ + $out/Library/Frameworks/CoreVideo.framework/Headers/CVBase.h + ''; + }); }; bareFrameworks = ( diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index a4f71f1282..dfa52606c8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -3,16 +3,7 @@ , xar, cpio, python3, pbzx }: let - MacOSX-SDK = stdenvNoCC.mkDerivation rec { - pname = "MacOSX-SDK"; - version = "11.0.0"; - - # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog - src = fetchurl { - url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_macOSNMOS_SDK.pkg"; - sha256 = "0n425smj4q1vxbza8fzwnk323fyzbbq866q32w288c44hl5yhwsf"; - }; - + mkSusDerivation = args: stdenvNoCC.mkDerivation (args // { dontBuild = true; darwinDontCodeSign = true; @@ -24,16 +15,45 @@ let pbzx $src | cpio -idm ''; + passthru = { + inherit (args) version; + }; + }); + + MacOSX-SDK = mkSusDerivation { + pname = "MacOSX-SDK"; + version = "11.0.0"; + + # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog + src = fetchurl { + url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_macOSNMOS_SDK.pkg"; + sha256 = "0n425smj4q1vxbza8fzwnk323fyzbbq866q32w288c44hl5yhwsf"; + }; + installPhase = '' cd Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk mkdir $out cp -r System usr $out/ ''; + }; - passthru = { - inherit version; + CLTools_Executables = mkSusDerivation { + pname = "CLTools_Executables"; + version = "11.0.0"; + + # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog + src = fetchurl { + url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_Executables.pkg"; + sha256 = "0nvb1qx7l81l2wcl8wvgbpsg5rcn51ylhivqmlfr2hrrv3zrrpl0"; }; + + installPhase = '' + cd Library/Developer/CommandLineTools + + mkdir $out + cp -r Library usr $out/ + ''; }; callPackage = newScope (packages // pkgs.darwin // { inherit MacOSX-SDK; }); @@ -43,7 +63,7 @@ let # TODO: this is nice to be private. is it worth the callPackage above? # Probably, I don't think that callPackage costs much at all. - inherit MacOSX-SDK; + inherit MacOSX-SDK CLTools_Executables; Libsystem = callPackage ./libSystem.nix {}; LibsystemCross = pkgs.darwin.Libsystem; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix index dc4ab1955b..59cbc2b106 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/frameworks.nix @@ -75,7 +75,7 @@ FileProviderUI = {}; FinderSync = {}; ForceFeedback = { inherit IOKit; }; - Foundation = { inherit ApplicationServices CoreFoundation Security SystemConfiguration libobjc; }; + Foundation = { inherit ApplicationServices CoreFoundation Security SystemConfiguration Combine libobjc; }; GLKit = {}; GLUT = { inherit OpenGL; }; GSS = {}; @@ -169,7 +169,7 @@ Speech = {}; SpriteKit = {}; StoreKit = {}; - SwiftUI = {}; + SwiftUI = { inherit AppKit DeveloperToolsSupport UniformTypeIdentifiers; }; SyncServices = {}; System = {}; SystemConfiguration = { inherit Security; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix index 0297f8897f..7be670425d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { ]; installPhase = '' - mkdir -p $out/{include,lib} + mkdir -p $out/{include,lib/swift} for dir in $includeDirs; do from=${MacOSX-SDK}/usr/include/$dir @@ -57,6 +57,13 @@ stdenvNoCC.mkDerivation { $out/lib done + for name in os Dispatch; do + cp -dr \ + ${MacOSX-SDK}/usr/lib/swift/$name.swiftmodule \ + ${MacOSX-SDK}/usr/lib/swift/libswift$name.tbd \ + $out/lib/swift + done + for f in $csu; do from=${MacOSX-SDK}/usr/lib/$f if [ -e "$from" ]; then @@ -71,6 +78,7 @@ stdenvNoCC.mkDerivation { rewrite-tbd \ -c /usr/lib/libsystem.dylib:$out/lib/libsystem.dylib \ -p /usr/lib/system/:$out/lib/system/ \ + -p /usr/lib/swift/:$out/lib/swift/ \ -r ${builtins.storeDir} \ "$tbd" done diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix index 63ef2a1c26..9288097ef3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-11.0/libobjc.nix @@ -8,14 +8,17 @@ let self = stdenvNoCC.mkDerivation { dontBuild = true; installPhase = '' - mkdir -p $out/{include,lib} + mkdir -p $out/{include,lib/swift} cp -r ${MacOSX-SDK}/usr/include/objc $out/include cp ${MacOSX-SDK}/usr/lib/libobjc* $out/lib + cp -r ${MacOSX-SDK}/usr/lib/swift/ObjectiveC.swiftmodule $out/lib/swift + cp ${MacOSX-SDK}/usr/lib/swift/libswiftObjectiveC.tbd $out/lib/swift ''; passthru = { tbdRewrites = { const."/usr/lib/libobjc.A.dylib" = "${self}/lib/libobjc.A.dylib"; + const."/usr/lib/swift/libswiftObjectiveC.dylib" = "${self}/lib/swift/libswiftObjectiveC.dylib"; }; }; }; in self diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix index b413744677..74f1160e43 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/IOKit/default.nix @@ -5,8 +5,6 @@ appleDerivation' stdenv { srcs = lib.attrValues IOKitSrcs; sourceRoot = "."; - phases = [ "unpackPhase" "installPhase" ]; - __propagatedImpureHostDeps = [ "/System/Library/Frameworks/IOKit.framework/IOKit" "/System/Library/Frameworks/IOKit.framework/Resources" diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix index bb09adce25..f4fe65b806 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix @@ -1,8 +1,6 @@ { appleDerivation', stdenv, darwin-stubs }: appleDerivation' stdenv { - phases = [ "unpackPhase" "installPhase" ]; - __propagatedImpureHostDeps = [ "/System/Library/Frameworks/Security.framework/Security" "/System/Library/Frameworks/Security.framework/Resources" diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix index 1f13cbef9f..6678f1f5b2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix @@ -1,9 +1,9 @@ -{ appleDerivation, xcbuildHook, CoreSymbolication +{ appleDerivation, xcbuildHook, CoreSymbolication, apple_sdk , xnu, bison, flex, darling, stdenv, fixDarwinDylibNames }: appleDerivation { nativeBuildInputs = [ xcbuildHook flex bison fixDarwinDylibNames ]; - buildInputs = [ CoreSymbolication darling xnu ]; + buildInputs = [ CoreSymbolication apple_sdk.frameworks.CoreSymbolication darling xnu ]; # -fcommon: workaround build failure on -fno-common toolchains: # duplicate symbol '_kCSRegionMachHeaderName' in: libproc.o dt_module_apple.o NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration -fcommon"; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix index 64de728805..4082f5b760 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/mDNSResponder/default.nix @@ -1,8 +1,7 @@ { appleDerivation', stdenvNoCC }: appleDerivation' stdenvNoCC { - phases = [ "unpackPhase" "installPhase" ]; - + dontBuild = true; installPhase = '' mkdir -p $out/include cp mDNSShared/dns_sd.h $out/include diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix index 2fc4afa77d..315f0fb062 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/objc4/default.nix @@ -1,8 +1,6 @@ { appleDerivation, darwin-stubs }: appleDerivation { - phases = [ "unpackPhase" "installPhase" ]; - # Not strictly necessary, since libSystem depends on it, but it's nice to be explicit so we # can easily find out what's impure. __propagatedImpureHostDeps = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/apple.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/apple.nix new file mode 100644 index 0000000000..f8ff90dbb1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/apple.nix @@ -0,0 +1,118 @@ +{ lib, stdenv, fetchurl, symlinkJoin, xcbuildHook, tcsh, libobjc, libtapi, libunwind, llvm, memstreamHook, xar }: + +let + +cctools = stdenv.mkDerivation rec { + pname = "cctools"; + version = "973.0.1"; + + src = fetchurl { + url = "https://opensource.apple.com/tarballs/cctools/cctools-${version}.tar.gz"; + hash = "sha256-r/6tsyyfi3R/0cLl+lN/B9ZaOaVF+Z7vJ6xj4LzSgiQ="; + }; + + patches = [ + ./cctools-add-missing-vtool-libstuff-dep.patch + ]; + + postPatch = '' + for file in libstuff/writeout.c misc/libtool.c misc/lipo.c; do + substituteInPlace "$file" \ + --replace '__builtin_available(macOS 10.12, *)' '0' + done + substituteInPlace libmacho/swap.c \ + --replace '#ifndef RLD' '#if 1' + ''; + + nativeBuildInputs = [ xcbuildHook memstreamHook ]; + buildInputs = [ libobjc llvm ]; + + xcbuildFlags = [ + "MACOSX_DEPLOYMENT_TARGET=10.12" + ]; + + doCheck = true; + checkPhase = '' + runHook preCheck + + Products/Release/libstuff_test + rm Products/Release/libstuff_test + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + rm -rf "$out/usr" + mkdir -p "$out/bin" + find Products/Release -maxdepth 1 -type f -perm 755 -exec cp {} "$out/bin/" \; + cp -r include "$out/" + + ln -s ./nm-classic "$out"/bin/nm + ln -s ./otool-classic "$out"/bin/otool + + runHook postInstall + ''; +}; + +ld64 = stdenv.mkDerivation rec { + pname = "ld64"; + version = "609"; + + src = fetchurl { + url = "https://opensource.apple.com/tarballs/ld64/ld64-${version}.tar.gz"; + hash = "sha256-SqQ7SqmK+uOPijzxOTqtkEu3qYmcth6H7rrQ03R1Q+4="; + }; + + postPatch = '' + substituteInPlace ld64.xcodeproj/project.pbxproj \ + --replace "/bin/csh" "${tcsh}/bin/tcsh" \ + --replace 'F9E8D4BE07FCAF2A00FD5801 /* PBXBuildRule */,' "" \ + --replace 'F9E8D4BD07FCAF2000FD5801 /* PBXBuildRule */,' "" + + sed -i src/ld/Options.cpp -e '1iconst char ldVersionString[] = "${version}";' + ''; + + nativeBuildInputs = [ xcbuildHook ]; + buildInputs = [ + libtapi + libunwind + llvm + xar + ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + find Products/Release-assert -maxdepth 1 -type f -perm 755 -exec cp {} "$out/bin/" \; + + runHook postInstall + ''; +}; + +in + +symlinkJoin rec { + name = "cctools-${version}"; + version = "${cctools.version}-${ld64.version}"; + + paths = [ + cctools + ld64 + ]; + + # workaround for the fetch-tarballs script + passthru = { + inherit (cctools) src; + ld64_src = ld64.src; + }; + + meta = with lib; { + description = "MacOS Compiler Tools"; + homepage = "http://www.opensource.apple.com/source/cctools/"; + license = licenses.apsl20; + platforms = platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch b/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch new file mode 100644 index 0000000000..1cd65ec6bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch @@ -0,0 +1,11 @@ +diff -ru a/cctools.xcodeproj/project.pbxproj b/cctools.xcodeproj/project.pbxproj +--- a/cctools.xcodeproj/project.pbxproj 2021-02-24 20:30:55.000000000 -0500 ++++ b/cctools.xcodeproj/project.pbxproj 2022-01-31 20:01:09.000000000 -0500 +@@ -2558,6 +2558,7 @@ + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( ++ DE97E92421F3B86100C7947D /* libstuff.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix index 3171f44451..07645c5e61 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/moltenvk/default.nix @@ -23,67 +23,30 @@ stdenv.mkDerivation (finalAttrs: { pname = "MoltenVK"; - version = "1.2.0"; + version = "1.2.1"; - buildInputs = [ AppKit Foundation Metal QuartzCore cereal ] - ++ lib.attrValues finalAttrs.passthru; + buildInputs = [ + AppKit + Foundation + Metal + QuartzCore + cereal + glslang + spirv-cross + spirv-headers + spirv-tools + vulkan-headers + ]; nativeBuildInputs = [ cctools sigtool xcbuild ]; outputs = [ "out" "bin" "dev" ]; - # MoltenVK requires specific versions of its dependencies. - # Pin them here except for cereal, which is four years old and has several CVEs. - passthru = { - glslang = (glslang.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "glslang"; - rev = "5755de46b07e4374c05fb1081f65f7ae1f8cca81"; - hash = "sha256-huPrQr+lPi7QCF8CufAavHEKGDDimGrcskiojhH9QYk="; - }; - })).override { inherit (finalAttrs.passthru) spirv-headers spirv-tools; }; - spirv-cross = spirv-cross.overrideAttrs (old: { - cmakeFlags = (old.cmakeFlags or [ ]) - ++ [ "-DSPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross" ]; - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "SPIRV-Cross"; - rev = "f09ba2777714871bddb70d049878af34b94fa54d"; - hash = "sha256-yVpLW1DbcHDuM9Bm3uGhAC0v9XjmpBoU9x7kmWdg6/o="; - }; - }); - spirv-headers = spirv-headers.overrideAttrs (_: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "spirv-headers"; - rev = "85a1ed200d50660786c1a88d9166e871123cce39"; - hash = "sha256-lUWgZYGPu+IaLUrbtyC7R0o3Hq/q7C7BE8r7DAsiC30="; - }; - }); - spirv-tools = (spirv-tools.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "spirv-tools"; - rev = "eb0a36633d2acf4de82588504f951ad0f2cecacb"; - hash = "sha256-sqjQoz9v9alSPc0ujEcWZxDAWh2S6oAPP1+JZmNCpA0="; - }; - })).override { inherit (finalAttrs.passthru) spirv-headers; }; - vulkan-headers = vulkan-headers.overrideAttrs (old: { - src = fetchFromGitHub { - owner = "KhronosGroup"; - repo = "Vulkan-Headers"; - rev = "98f440ce6868c94f5ec6e198cc1adda4760e8849"; - hash = "sha256-EoD48jBoJmIet4BDC6bYxOsKK2358SZ/NcZeM61q/5g="; - }; - }); - }; - src = fetchFromGitHub { owner = "KhronosGroup"; repo = "MoltenVK"; rev = "v${finalAttrs.version}"; - hash = "sha256-PqrKGNGw7nJbirRgIargIV6Jbgoblu+2fn5qdHKI6BI="; + hash = "sha256-JqHPKLSFq+8hyOjVZbjh4AsHM8zSF7ZVxlEePmnEC2w="; }; patches = [ @@ -97,6 +60,11 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \ --replace '$'''{BUILT_PRODUCTS_DIR}' "$NIX_BUILD_TOP/$sourceRoot/build/include" \ --replace '$(git rev-parse HEAD)' ${finalAttrs.src.rev} + # Use the SPIRV-Cross packaged in nixpkgs instead of one built specifically for MoltenVK. + substituteInPlace MoltenVK/MoltenVK.xcodeproj/project.pbxproj \ + --replace SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross + substituteInPlace MoltenVKShaderConverter/MoltenVKShaderConverter.xcodeproj/project.pbxproj \ + --replace SPIRV_CROSS_NAMESPACE_OVERRIDE=MVK_spirv_cross SPIRV_CROSS_NAMESPACE_OVERRIDE=spirv_cross # Adding all of `usr/include` from the SDK results in header conflicts with `libcxx.dev`. # Work around it by symlinking just the SIMD stuff needed by MoltenVK. mkdir -p build/include @@ -107,8 +75,8 @@ stdenv.mkDerivation (finalAttrs: { NIX_CFLAGS_COMPILE = [ "-isystem ${lib.getDev libcxx}/include/c++/v1" - "-I${finalAttrs.passthru.spirv-cross}/include/spirv_cross" - "-I${finalAttrs.passthru.spirv-headers}/include/spirv/unified1/" + "-I${lib.getDev spirv-cross}/include/spirv_cross" + "-I${lib.getDev spirv-headers}/include/spirv/unified1/" ]; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/utm/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/utm/default.nix index 979780e3ca..2e21945288 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/utm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/utm/default.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.0.8"; + version = "4.1.5"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - sha256 = "sha256-a6GQyiW8pqw6fN3WVuTVUfnsl/qPtmzDxUvWNElli5k="; + hash = "sha256-YOmTf50UUvvh4noWnmV6WsoWSua0tpWTgLTg+Cdr3bQ="; }; nativeBuildInputs = [ undmg ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/xattr/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/xattr/default.nix index a1e3c49148..7fe0f84606 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/xattr/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/xattr/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchzip +, fetchFromGitHub , buildPythonPackage , python , ed @@ -11,9 +11,11 @@ buildPythonPackage rec { pname = "xattr"; version = "61.60.1"; - src = fetchzip rec { - url = "https://opensource.apple.com/tarballs/python_modules/python_modules-${version}.tar.gz"; - sha256 = "19kydl7w4vpdi7zmfd5z9vjkq24jfk2cv4j0pppw69j06czhdwwi"; + src = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "python_modules"; + rev = "python_modules-${version}"; + hash = "sha256-kfMGPzNAJsPvvUCSzcR0kgg85U6/NFf/ie1uwg9tfqY="; }; sourceRoot = "${src.name}/Modules/xattr-0.6.4"; @@ -61,7 +63,10 @@ buildPythonPackage rec { ''; makeWrapperArgs = [ - "--prefix" "PYTHONPATH" ":" "${placeholder "python"}/${python.sitePackages}" + "--prefix" + "PYTHONPATH" + ":" + "${placeholder "python"}/${python.sitePackages}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix index da0660ad11..e6961684d0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix @@ -5,15 +5,18 @@ , nixosTests }: +let + tag = "0.3.0"; +in stdenv.mkDerivation { pname = "apfs"; - version = "unstable-2022-10-20-${kernel.version}"; + version = "${tag}-${kernel.version}"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "linux-apfs-rw"; - rev = "e6eb67c92d425d395eac1c4403629391bdd5064d"; - sha256 = "sha256-6rv5qZCjOqt0FaNFhA3tYg6/SdssvoT8kPVhalajgOo="; + rev = "v${tag}"; + sha256 = "sha256-ABFqkiIJuFapFsUIFHfw8+TujePZm7ZX/qHuFO2KdnQ="; }; hardeningDisable = [ "pic" ]; @@ -29,6 +32,15 @@ stdenv.mkDerivation { meta = with lib; { description = "APFS module for linux"; + longDescription = '' + The Apple File System (APFS) is the copy-on-write filesystem currently + used on all Apple devices. This module provides a degree of experimental + support on Linux. + If you make use of the write support, expect data corruption. + Read-only support is somewhat more complete, with sealed volumes, + snapshots, and all the missing compression algorithms recently added. + Encryption is still not in the works though. + ''; homepage = "https://github.com/linux-apfs/linux-apfs-rw"; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix index 22d8e81f59..e0a4b9a086 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { dbus-python ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook python-dbusmock pytest-httpserver diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ax99100/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ax99100/default.nix index 9167b4e5f8..600e02de70 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ax99100/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ax99100/default.nix @@ -1,15 +1,35 @@ -{ kernel, stdenv, kmod, lib, fetchzip }: +{ kernel, stdenv, kmod, lib, fetchzip, fetchpatch, dos2unix }: stdenv.mkDerivation { pname = "ax99100"; version = "1.8.0"; - nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; + + nativeBuildInputs = [ dos2unix kmod ] ++ kernel.moduleBuildDependencies; + src = fetchzip { url = "https://www.asix.com.tw/en/support/download/file/1229"; sha256 = "1rbp1m01qr6b3nbr72vpbw89pjh8mddc60im78z2yjd951xkbcjh"; extension = "tar.bz2"; }; + prePatch = '' + # The sources come with Windows file endings and that makes + # applying patches hard without first fixing the line endings. + dos2unix *.c *.h + ''; + + # The patches are adapted from: https://aur.archlinux.org/packages/asix-ax99100 + # + # We included them here instead of fetching them, because of line + # ending issues that are easier to fix manually. Also the + # set_termios patch needs to be applied for 6.1 not for 6.0. + patches = [ + ./kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch + ./kernel-6.1-set_termios-const-ktermios.patch + ]; + + patchFlags = [ "-p0" ]; + makeFlags = [ "KDIR='${kernel.dev}/lib/modules/${kernel.modDirVersion}/build'" ]; installPhase = '' @@ -18,12 +38,13 @@ stdenv.mkDerivation ''; meta = { - description = "ASIX AX99100 Serial and Parralel Port driver"; + description = "ASIX AX99100 Serial and Parallel Port driver"; homepage = "https://www.asix.com.tw/en/product/Interface/PCIe_Bridge/AX99100"; # According to the source code in the tarball, the license is gpl2. license = lib.licenses.gpl2; platforms = lib.platforms.linux; - # currently, the build fails with kernels newer than 5.17 - broken = lib.versionAtLeast kernel.version "5.18.0"; + + # Older Linux versions need more patches to work. + broken = lib.versionOlder kernel.version "5.4.0"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch new file mode 100644 index 0000000000..05ec0cfad2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ax99100/kernel-5.18-pci_free_consistent-pci_alloc_consistent.patch @@ -0,0 +1,14 @@ +diff -pNaru5 a/ax99100_sp.h b/ax99100_sp.h +--- ax99100_sp.h 2022-06-07 16:55:26.621034945 -0400 ++++ ax99100_sp.h 2022-06-07 16:58:32.488989767 -0400 +@@ -255,5 +255,10 @@ struct custom_eeprom { + #define _INLINE_ + #endif + + #define DEFAULT99100_BAUD 115200 + #endif ++ ++/* #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,18,0) */ ++#define pci_alloc_consistent(hwdev,size,dma_handle) dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC) ++#define pci_free_consistent(hwdev,size,vaddr,dma_handle) dma_free_coherent(&hwdev->dev, size, vaddr, dma_handle) ++/* #endif */ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch new file mode 100644 index 0000000000..8d75ad454c --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ax99100/kernel-6.1-set_termios-const-ktermios.patch @@ -0,0 +1,18 @@ +diff -pNaru5 a/ax99100_sp.c b/ax99100_sp.c +--- ax99100_sp.c 2023-01-02 23:44:46.707423858 -0500 ++++ ax99100_sp.c 2023-01-02 23:44:27.171293092 -0500 +@@ -1915,11 +1915,13 @@ static unsigned int serial99100_get_divi + DEBUG("In %s quot=%u----baud=%u-----------------------------END\n",__FUNCTION__,quot,baud); + return quot; + } + + //This is a port ops function to set the terminal settings. +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0) ++static void serial99100_set_termios(struct uart_port *port, struct ktermios *termios, const struct ktermios *old) ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) + static void serial99100_set_termios(struct uart_port *port, struct ktermios *termios, struct ktermios *old) + #else + static void serial99100_set_termios(struct uart_port *port, struct termios *termios, struct termios *old) + #endif + { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/blktrace/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/blktrace/default.nix index e44f90a363..8ff4b16a1a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/blktrace/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/blktrace/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; # Official source - # "git://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" + # "https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git" src = fetchurl { url = "https://brick.kernel.dk/snaps/blktrace-${version}.tar.bz2"; sha256 = "sha256-1t7aA4Yt4r0bG5+6cpu7hi2bynleaqf3yoa2VoEacNY="; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bluez/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bluez/default.nix index 020aee04af..303eb80147 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bluez/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bluez/default.nix @@ -130,6 +130,10 @@ in stdenv.mkDerivation rec { mkdir $out/etc/bluetooth ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf + # https://github.com/NixOS/nixpkgs/issues/204418 + ln -s /etc/bluetooth/input.conf $out/etc/bluetooth/input.conf + ln -s /etc/bluetooth/network.conf $out/etc/bluetooth/network.conf + # Add missing tools, ref https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/bluez for files in `find tools/ -type f -perm -755`; do filename=$(basename $files) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bolt/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bolt/default.nix index 07214f4827..fba4f8adba 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bolt/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bolt/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH=${umockdev.out}/lib/ ''; - checkInputs = [ + nativeCheckInputs = [ dbus gobject-introspection umockdev diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix index 3feb590eb5..8a510a4d0c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/busybox/default.nix @@ -50,14 +50,14 @@ in stdenv.mkDerivation rec { pname = "busybox"; - version = "1.35.0"; + version = "1.36.0"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-+u6yRMNaNIozT0pZ5EYm7ocPsHtohNaMEK6LwZ+DppQ="; + sha256 = "sha256-VCdQyK98smMOIBeAtPmfPczusG9QW0eexoJBweavYaU="; }; hardeningDisable = [ "format" "pie" ] @@ -75,11 +75,6 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/main/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch?id=ed92963eb55bbc8d938097b9ccb3e221a94653f4"; sha256 = "sha256-vl1wPbsHtXY9naajjnTicQ7Uj3N+EQ8pRNnrdsiow+w="; }) - (fetchurl { - name = "CVE-2022-30065.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/busybox/CVE-2022-30065.patch?id=4ffd996b3f8298c7dd424b912c245864c816e354"; - sha256 = "sha256-+WSYxI6eF8S0tya/S62f9Nc6jVMnHO0q1OyM69GlNTY="; - }) ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch; separateDebugInfo = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/conky/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/conky/default.nix index 0d9fa44a87..a5fbc2817d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/conky/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/conky/default.nix @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = "http://conky.sourceforge.net/"; + homepage = "https://conky.sourceforge.net/"; description = "Advanced, highly configurable system monitor based on torsmo"; maintainers = [ maintainers.guibert ]; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix index 6ea68c9d57..7d6431b5ce 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cpuid/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20221201"; + version = "20230120"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-CP7cOCgQZnqdCkF9KXXeOrXYFXNFLP9Xst6rBtgvj24="; + sha256 = "sha256-uJtB+IldDVj9uwpUECu0kLx8WCjbLNFb6C0U0ZRjpXk="; }; # For pod2man during the build process. diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/criu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/criu/default.nix index 5475a565b0..71bde6220a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/criu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/criu/default.nix @@ -1,6 +1,8 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, protobuf, protobufc, asciidoc, iptables , xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config, iproute2 -, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd }: +, which, python3, makeWrapper, docbook_xml_dtd_45, perl, nftables, libbsd +, buildPackages +}: stdenv.mkDerivation rec { pname = "criu"; @@ -22,9 +24,34 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython perl ]; - buildInputs = [ protobuf asciidoc xmlto libpaper libnl libcap libnet nftables libbsd ]; - propagatedBuildInputs = [ protobufc ] ++ (with python3.pkgs; [ python python3.pkgs.protobuf ]); + depsBuildBuild = [ protobufc buildPackages.stdenv.cc ]; + nativeBuildInputs = [ + pkg-config + asciidoc + xmlto + libpaper + docbook_xsl + which + makeWrapper + docbook_xml_dtd_45 + python3 + python3.pkgs.wrapPython + perl + ]; + buildInputs = [ + protobuf + libnl + libcap + libnet + nftables + libbsd + ]; + propagatedBuildInputs = [ + protobufc + ] ++ (with python3.pkgs; [ + python + python3.pkgs.protobuf + ]); postPatch = '' substituteInPlace ./Documentation/Makefile \ @@ -34,7 +61,27 @@ stdenv.mkDerivation rec { ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto ''; - makeFlags = [ "PREFIX=$(out)" "ASCIIDOC=${asciidoc}/bin/asciidoc" "XMLTO=${xmlto}/bin/xmlto" ]; + makeFlags = let + # criu's Makefile infrastructure expects to be passed a target architecture + # which neither matches the config-tuple's first part, nor the + # targetPlatform.linuxArch attribute. Thus we take the latter and map it + # onto the expected string: + linuxArchMapping = { + "x86_64" = "x86"; + "arm" = "arm"; + "arm64" = "aarch64"; + "powerpc" = "ppc64"; + "s390" = "s390"; + "mips" = "mips"; + }; + in [ + "PREFIX=$(out)" + "ASCIIDOC=${buildPackages.asciidoc}/bin/asciidoc" + "XMLTO=${buildPackages.xmlto}/bin/xmlto" + ] ++ (lib.optionals (stdenv.buildPlatform != stdenv.targetPlatform) [ + "ARCH=${linuxArchMapping."${stdenv.targetPlatform.linuxArch}"}" + "CROSS_COMPILE=${stdenv.targetPlatform.config}-" + ]); outputs = [ "out" "dev" "man" ]; @@ -58,7 +105,7 @@ stdenv.mkDerivation rec { description = "Userspace checkpoint/restore for Linux"; homepage = "https://criu.org"; license = licenses.gpl2; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; maintainers = [ maintainers.thoughtpolice ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cryptodev/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cryptodev/default.nix index cc3a1d8110..2fe98f8b80 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cryptodev/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cryptodev/default.nix @@ -14,9 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; - KERNEL_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = "\${out}"; - prefix = "\${out}"; + makeFlags = kernel.makeFlags ++ [ + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=$(out)" + "prefix=$(out)" + ]; meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/default.nix index 8b8cca911a..fb8e92f233 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/device-tree/default.nix @@ -22,21 +22,19 @@ with lib; { # skip incompatible and non-matching overlays if [[ ! "$dtbCompat" =~ "$overlayCompat" ]]; then - echo -n "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")" - continue - fi - ${optionalString (o.filter != null) '' - if [[ "''${dtb//${o.filter}/}" == "$dtb" ]]; then - echo -n "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")" - continue - fi + echo "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")" + elif ${if (o.filter == null) then "false" else '' + [[ "''${dtb//${o.filter}/}" == "$dtb" ]] ''} - - echo -n "Applying overlay ${o.name} to $(basename "$dtb")... " - mv "$dtb"{,.in} - fdtoverlay -o "$dtb" -i "$dtb.in" "${o.dtboFile}" - echo "ok" - rm "$dtb.in" + then + echo "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")" + else + echo -n "Applying overlay ${o.name} to $(basename "$dtb")... " + mv "$dtb"{,.in} + fdtoverlay -o "$dtb" -i "$dtb.in" "${o.dtboFile}" + echo "ok" + rm "$dtb.in" + fi '')} done diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix index 1f53dc8e83..78acb45bb3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dpdk/default.nix @@ -5,18 +5,24 @@ , libbsd, numactl, libbpf, zlib, libelf, jansson, openssl, libpcap, rdma-core , doxygen, python3, pciutils , withExamples ? [] -, shared ? false }: +, shared ? false +, machine ? ( + if stdenv.isx86_64 then "nehalem" + else if stdenv.isAarch64 then "generic" + else null + ) +}: let mod = kernel != null; - dpdkVersion = "22.07"; + dpdkVersion = "22.11.1"; in stdenv.mkDerivation rec { pname = "dpdk"; version = "${dpdkVersion}" + lib.optionalString mod "-${kernel.version}"; src = fetchurl { url = "https://fast.dpdk.org/rel/dpdk-${dpdkVersion}.tar.xz"; - sha256 = "sha256-n2Tf3gdf21cIy2Leg4uP+4kVdf7R4dKusma6yj38m+o="; + sha256 = "sha256-3gdkZfcXSg1ScUuQcuSDenJrqsgtj+fcZEytXIz3TUw="; }; nativeBuildInputs = [ @@ -63,8 +69,7 @@ in stdenv.mkDerivation rec { # kni kernel driver is currently not compatble with 5.11 ++ lib.optional (mod && kernel.kernelOlder "5.11") "-Ddisable_drivers=kni" ++ lib.optional (!shared) "-Ddefault_library=static" - ++ lib.optional stdenv.isx86_64 "-Dmachine=nehalem" - ++ lib.optional stdenv.isAarch64 "-Dmachine=generic" + ++ lib.optional (machine != null) "-Dmachine=${machine}" ++ lib.optional mod "-Dkernel_dir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dracut/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dracut/default.nix index 2b483e2c7c..583bd4115a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dracut/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dracut/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; meta = with lib; { - homepage = "https://dracut.wiki.kernel.org"; + homepage = "https://github.com/dracutdevs/dracut/wiki"; description = "An event driven initramfs infrastructure"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lilyinstarlight ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix index 3306d87527..e4ac8c3929 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - checkInputs = [ + nativeCheckInputs = [ dbus ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/error-inject/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/error-inject/default.nix index 87a40580de..f4a5441721 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/error-inject/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/error-inject/default.nix @@ -10,7 +10,7 @@ version = "4cbe46321b4a81365ff3aafafe63967264dbfec5"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git"; + url = "https://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git"; rev = version; sha256 = "0gjapg2hrlxp8ssrnhvc19i3r1xpcnql7xv0zjgbv09zyha08g6z"; }; @@ -40,7 +40,7 @@ version = "9bd5e2c7886fca72f139cd8402488a2235957d41"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git"; + url = "https://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git"; rev = version; sha256 = "0bh6mzpk2mr4xidkammmkfk21b4dbq793qjg25ryyxd1qv0c6cg4"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix index 9a2c20ca38..03ab973c8b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "eventstat"; - version = "0.04.13"; + version = "0.05.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-psamt9omhakiO3Kx2EzofPL2VAsva7XKQTZmn6zKefA="; + hash = "sha256-yGEFegUpWNBsrGZJjWud3aOsRJgXsOJmXkgpXcsPHo0="; }; buildInputs = [ ncurses ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fanctl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fanctl/default.nix new file mode 100644 index 0000000000..d8769b0f04 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fanctl/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitLab, rustPlatform }: + +rustPlatform.buildRustPackage rec { + version = "0.6.4"; + pname = "fanctl"; + + src = fetchFromGitLab { + owner = "mcoffin"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XmawybmqRJ9Lj6ii8TZBFwqdQZVp0pOLN4xiSLkU/bw="; + }; + + cargoSha256 = "sha256-tj00DXQEqC/8+3uzTMWcph+1fNTTVZLSJbV/5lLFkFs="; + + meta = with lib; { + description = "Replacement for fancontrol with more fine-grained control interface in its config file"; + homepage = "https://gitlab.com/mcoffin/fanctl"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ icewind1991 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix index 7b7abdb844..9ab8eac772 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firejail/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "firejail"; - version = "0.9.70"; + version = "0.9.72"; src = fetchFromGitHub { owner = "netblue30"; repo = "firejail"; rev = version; - sha256 = "sha256-x1txt0uER66bZN6BD6c/31Zu6fPPwC9kl/3bxEE6Ce8="; + sha256 = "sha256-XAlb6SSyY2S1iWDaulIlghQ16OGvT/wBCog95/nxkog="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index 2a6ae96cef..cb33eb1c21 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -10,7 +10,7 @@ index b0ff5b106..13ac380d0 100644 ) endif diff --git a/data/meson.build b/data/meson.build -index 3a77a7bfc..747bd1988 100644 +index 865b20e26..ff1c2657b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -26,7 +26,7 @@ endif @@ -20,8 +20,8 @@ index 3a77a7bfc..747bd1988 100644 - install_dir: join_paths(sysconfdir, 'fwupd') + install_dir: join_paths(sysconfdir_install, 'fwupd') ) - plugin_quirks += join_paths(meson.current_source_dir(), 'power.quirk') - plugin_quirks += join_paths(meson.current_source_dir(), 'cfi.quirk') + plugin_quirks += files([ + 'power.quirk', diff --git a/data/pki/meson.build b/data/pki/meson.build index 3649fecea..c3462744b 100644 --- a/data/pki/meson.build @@ -57,28 +57,27 @@ index 3649fecea..c3462744b 100644 ) endif diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build -index 1d1698a7e..5469d00a6 100644 +index c20a1a05e..87b1fa930 100644 --- a/data/remotes.d/meson.build +++ b/data/remotes.d/meson.build -@@ -2,7 +2,7 @@ if build_standalone and get_option('lvfs') != 'false' - install_data([ - 'lvfs-testing.conf', - ], -- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d') -+ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d') - ) - con3 = configuration_data() - if get_option('lvfs') == 'disabled' -@@ -15,7 +15,7 @@ if build_standalone and get_option('lvfs') != 'false' +@@ -15,14 +15,14 @@ if build_standalone and get_option('lvfs') != 'false' output: 'lvfs.conf', configuration: con3, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), ++ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), + ) + configure_file( + input: 'lvfs-testing.conf', + output: 'lvfs-testing.conf', + configuration: con3, + install: true, +- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) i18n.merge_file( input: 'lvfs.metainfo.xml', -@@ -49,12 +49,12 @@ configure_file( +@@ -54,12 +54,12 @@ configure_file( output: 'vendor.conf', configuration: con2, install: true, @@ -94,10 +93,10 @@ index 1d1698a7e..5469d00a6 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index e7980e965..2c66e2dc4 100644 +index d3e08af43..30011f548 100644 --- a/meson.build +++ b/meson.build -@@ -195,6 +195,12 @@ endif +@@ -193,6 +193,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -111,7 +110,7 @@ index e7980e965..2c66e2dc4 100644 gio = dependency('gio-2.0', version: '>= 2.45.8') giounix = dependency('gio-unix-2.0', version: '>= 2.45.8', required: false) diff --git a/meson_options.txt b/meson_options.txt -index 6cf92e72e..2e8568292 100644 +index 204690640..6fc7e8437 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ @@ -120,10 +119,10 @@ index 6cf92e72e..2e8568292 100644 option('consolekit', type : 'feature', description : 'ConsoleKit support', deprecated: {'true': 'enabled', 'false': 'disabled'}) option('static_analysis', type : 'boolean', value : false, description : 'enable GCC static analysis support') diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build -index 67bd3b9d9..ad04a91b6 100644 +index 88c039f85..62a7691f3 100644 --- a/plugins/dell-esrt/meson.build +++ b/plugins/dell-esrt/meson.build -@@ -38,6 +38,6 @@ configure_file( +@@ -27,6 +27,6 @@ configure_file( output: 'dell-esrt.conf', configuration: con2, install: true, @@ -132,7 +131,7 @@ index 67bd3b9d9..ad04a91b6 100644 ) endif diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build -index d626c3ad3..5a2f847d5 100644 +index 23ec5ec82..b03826fc0 100644 --- a/plugins/msr/meson.build +++ b/plugins/msr/meson.build @@ -10,7 +10,7 @@ install_data(['fwupd-msr.conf'], @@ -142,27 +141,27 @@ index d626c3ad3..5a2f847d5 100644 - install_dir: join_paths(sysconfdir, 'fwupd') + install_dir: join_paths(sysconfdir_install, 'fwupd') ) - shared_module('fu_plugin_msr', - fu_hash, + plugin_builtins += static_library('fu_plugin_msr', + sources: [ diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build -index 95606e478..e5355e520 100644 +index 1e35b6ce9..33ca1447f 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build -@@ -43,7 +43,7 @@ shared_module('fu_plugin_redfish', - ) +@@ -35,7 +35,7 @@ plugin_builtin_redfish = static_library('fu_plugin_redfish', + plugin_builtins += plugin_builtin_redfish install_data(['redfish.conf'], - install_dir: join_paths(sysconfdir, 'fwupd'), + install_dir: join_paths(sysconfdir_install, 'fwupd'), + install_mode: 'rw-r-----', ) - if get_option('tests') diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build -index 5f8ffbf90..9ba323e75 100644 +index 71d930e62..399fb5781 100644 --- a/plugins/thunderbolt/meson.build +++ b/plugins/thunderbolt/meson.build -@@ -32,7 +32,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', - ) +@@ -19,7 +19,7 @@ plugin_builtin_thunderbolt = static_library('fu_plugin_thunderbolt', + plugin_builtins += plugin_builtin_thunderbolt install_data(['thunderbolt.conf'], - install_dir: join_paths(sysconfdir, 'fwupd') @@ -171,7 +170,7 @@ index 5f8ffbf90..9ba323e75 100644 # we use functions from 2.52 in the tests if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52') diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build -index ef38dc03e..78ff65e1d 100644 +index b4b038313..9c5407c3f 100644 --- a/plugins/uefi-capsule/meson.build +++ b/plugins/uefi-capsule/meson.build @@ -20,7 +20,7 @@ if host_machine.system() == 'linux' @@ -183,7 +182,7 @@ index ef38dc03e..78ff65e1d 100644 ) elif host_machine.system() == 'freebsd' backend_srcs += 'fu-uefi-backend-freebsd.c' -@@ -110,7 +110,7 @@ if get_option('compat_cli') and get_option('man') +@@ -87,7 +87,7 @@ if get_option('compat_cli') and get_option('man') endif install_data(['uefi_capsule.conf'], diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix index 66cfbef940..8939aef06c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -15,6 +15,7 @@ , gusb , sqlite , libarchive +, libredirect , curl , libjcat , elfutils @@ -30,6 +31,7 @@ , protobufc , python3 , wrapGAppsNoGuiHook +, ensureNewerSourcesForZipFilesHook , json-glib , bash-completion , shared-mime-info @@ -52,6 +54,7 @@ , libmbim , libcbor , xz +, enableFlashrom ? false }: let @@ -74,7 +77,7 @@ let # # Currently broken on Aarch64 # haveFlashrom = isx86; # Experimental - haveFlashrom = false; + haveFlashrom = isx86 && enableFlashrom; runPythonCommand = name: buildCommandPython: runCommand name { nativeBuildInputs = [ python3 ]; @@ -85,13 +88,13 @@ let test-firmware = let - version = "unstable-2021-11-02"; + version = "unstable-2022-04-02"; src = fetchFromGitHub { name = "fwupd-test-firmware-${version}"; owner = "fwupd"; repo = "fwupd-test-firmware"; - rev = "aaa2f9fd68a40684c256dd85b86093cba38ffd9d"; - sha256 = "Slk7CNfkmvmOh3WtIBkPs3NYT96co6i8PwqcbpeVFgA="; + rev = "39954e434d63e20e85870dd1074818f48a0c08b7"; + hash = "sha256-d4qG3fKyxkfN91AplRYqARFz+aRr+R37BpE450bPxi0="; passthru = { inherit src version; # For update script updateScript = unstableGitUpdater { @@ -114,7 +117,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.8.4"; + version = "1.8.10"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -123,7 +126,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "sha256-rfoHQ0zcKexBxA/vRg6Nlwlj/gx+hJ3sfzkyrbFh+IY="; + hash = "sha256-vvNUidNdhW9xeksjEVnkIR7CZ4oBQizZJRMFtZUq6Ow="; }; patches = [ @@ -147,6 +150,8 @@ let ]; nativeBuildInputs = [ + # required for firmware zipping + ensureNewerSourcesForZipFilesHook meson ninja gi-docgen @@ -187,7 +192,7 @@ let libmbim libcbor libqmi - xz # for liblzma. + xz # for liblzma ] ++ lib.optionals haveDell [ libsmbios ] ++ lib.optionals haveFlashrom [ @@ -210,14 +215,9 @@ let "-Dsysconfdir_install=${placeholder "out"}/etc" "-Defi_os_dir=nixos" "-Dplugin_modem_manager=enabled" - # Requires Meson 0.63 - "-Dgresource_quirks=disabled" # We do not want to place the daemon into lib (cyclic reference) "--libexecdir=${placeholder "out"}/libexec" - # Our builder only adds $lib/lib to rpath but some things link - # against libfwupdplugin which is in $out/lib. - "-Dc_link_args=-Wl,-rpath,${placeholder "out"}/lib" ] ++ lib.optionals (!haveDell) [ "-Dplugin_dell=disabled" "-Dplugin_synaptics_mst=disabled" @@ -232,8 +232,7 @@ let # TODO: wrapGAppsHook wraps efi capsule even though it is not ELF dontWrapGApps = true; - # /etc/os-release not available in sandbox - # doCheck = true; + doCheck = true; # Environment variables @@ -254,16 +253,18 @@ let postPatch = '' patchShebangs \ contrib/generate-version-script.py \ - meson_post_install.sh \ po/test-deps - # This checks a version of a dependency of gi-docgen but gi-docgen is self-contained in Nixpkgs. - echo "Clearing docs/test-deps.py" - test -f docs/test-deps.py - echo > docs/test-deps.py - substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \ --replace "gdbus" ${glib.bin}/bin/gdbus + + # tests fail with: Failed to load SMBIOS: neither SMBIOS or DT found + sed -i 's/test(.*)//' plugins/lenovo-thinklmi/meson.build + sed -i 's/test(.*)//' plugins/mtd/meson.build + # fails on amd cpu + sed -i 's/test(.*)//' libfwupdplugin/meson.build + # in nixos test tries to chmod 0777 $out/share/installed-tests/fwupd/tests/redfish.conf + sed -i "s/get_option('tests')/false/" plugins/redfish/meson.build ''; preBuild = '' @@ -273,6 +274,10 @@ let preCheck = '' addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" + + echo "12345678901234567890123456789012" > machine-id + export NIX_REDIRECTS=/etc/machine-id=$(realpath machine-id) \ + LD_PRELOAD=${libredirect}/lib/libredirect.so ''; preInstall = '' @@ -328,7 +333,6 @@ let "fwupd/remotes.d/lvfs.conf" "fwupd/remotes.d/vendor.conf" "fwupd/remotes.d/vendor-directory.conf" - "fwupd/thunderbolt.conf" "fwupd/uefi_capsule.conf" "pki/fwupd/GPG-KEY-Linux-Foundation-Firmware" "pki/fwupd/GPG-KEY-Linux-Vendor-Firmware-Service" @@ -343,13 +347,14 @@ let "fwupd/redfish.conf" ] ++ lib.optionals haveMSR [ "fwupd/msr.conf" + ] ++ lib.optionals isx86 [ + "fwupd/thunderbolt.conf" ]; # DisabledPlugins key in fwupd/daemon.conf defaultDisabledPlugins = [ "test" "test_ble" - "invalid" ]; # For updating. diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch index afee6d9f61..a91adc1a69 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/efi-app-path.patch @@ -1,13 +1,13 @@ diff --git a/meson.build b/meson.build -index b91dd037..01d70a61 100644 +index 7ac8c937a..5a23d0c80 100644 --- a/meson.build +++ b/meson.build -@@ -413,7 +413,7 @@ if build_standalone and efiboot.found() and efivar.found() +@@ -419,7 +419,7 @@ if build_standalone and efiboot.found() and efivar.found() conf.set('HAVE_EFI_TIME_T', '1') endif - efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') -+ efi_app_location = join_paths(dependency('fwupd-efi').get_pkgconfig_variable('prefix'), 'libexec', 'fwupd', 'efi') ++ efi_app_location = join_paths(dependency('fwupd-efi').get_variable(pkgconfig: 'prefix'), 'libexec', 'fwupd', 'efi') conf.set_quoted('EFI_APP_LOCATION', efi_app_location) if host_cpu == 'x86' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch index f3369b6e13..e6269ae840 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch @@ -1,37 +1,14 @@ -diff --git a/libfwupdplugin/meson.build b/libfwupdplugin/meson.build -index 1afa28e1..3da81d30 100644 ---- a/libfwupdplugin/meson.build -+++ b/libfwupdplugin/meson.build -@@ -220,7 +220,8 @@ fwupdplugin = library( - ], - link_args: cc.get_supported_link_arguments([vflag]), - link_depends: fwupdplugin_mapfile, -- install: true -+ install: true, -+ install_dir: bindir / '..' / 'lib', - ) - - fwupdplugin_pkgg = import('pkgconfig') -@@ -280,7 +281,8 @@ if introspection.allowed() - girtargets, - fwupd_gir[0], - ], -- install: true -+ install: true, -+ install_dir_typelib: bindir / '..' / 'lib' / 'girepository-1.0', - ) - - # Verify the map file is correct -- note we can't actually use the generated diff --git a/meson.build b/meson.build -index b91dd037..f97b4c26 100644 +index 9ae278b66..7cddf1a0d 100644 --- a/meson.build +++ b/meson.build -@@ -504,7 +504,7 @@ if build_standalone +@@ -507,7 +507,7 @@ if build_standalone if host_machine.system() == 'windows' - plugin_dir = 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current) + libdir_pkg = 'fwupd-@0@'.format(fwupd_version) else -- plugin_dir = join_paths(libdir, 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)) -+ plugin_dir = join_paths(bindir, '..', 'lib', 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)) +- libdir_pkg = join_paths(libdir, 'fwupd-@0@'.format(fwupd_version)) ++ libdir_pkg = join_paths(prefix, 'lib', 'fwupd-@0@'.format(fwupd_version)) endif - conf.set_quoted('FWUPD_PLUGINDIR', plugin_dir) + conf.set_quoted('FWUPD_LIBDIR_PKG', libdir_pkg) endif + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch index 49bca65d9c..a914f56c66 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch @@ -1,19 +1,19 @@ diff --git a/data/installed-tests/meson.build b/data/installed-tests/meson.build -index b8ec916f..38209b36 100644 +index be3d5c6d9..14d45dcaf 100644 --- a/data/installed-tests/meson.build +++ b/data/installed-tests/meson.build @@ -83,5 +83,5 @@ configure_file( - output : 'fwupd-tests.conf', - configuration : con2, + output: 'fwupd-tests.conf', + configuration: con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index b91dd037..d7e20b18 100644 +index 30011f548..7ac8c937a 100644 --- a/meson.build +++ b/meson.build -@@ -188,8 +188,8 @@ else +@@ -186,8 +186,8 @@ else datadir = join_paths(prefix, get_option('datadir')) sysconfdir = join_paths(prefix, get_option('sysconfdir')) localstatedir = join_paths(prefix, get_option('localstatedir')) @@ -24,7 +24,7 @@ index b91dd037..d7e20b18 100644 daemon_dir = join_paths(libexecdir, 'fwupd') endif mandir = join_paths(prefix, get_option('mandir')) -@@ -492,6 +492,7 @@ gnome = import('gnome') +@@ -498,6 +498,7 @@ gnome = import('gnome') i18n = import('i18n') conf.set_quoted('FWUPD_PREFIX', prefix) @@ -33,10 +33,10 @@ index b91dd037..d7e20b18 100644 conf.set_quoted('FWUPD_LIBDIR', libdir) conf.set_quoted('FWUPD_LIBEXECDIR', libexecdir) diff --git a/meson_options.txt b/meson_options.txt -index d00038db..be1c45b4 100644 +index 6fc7e8437..29832fd08 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -56,6 +56,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated: +@@ -57,6 +57,7 @@ option('systemd', type : 'feature', description : 'systemd support', deprecated: option('systemd_unit_user', type : 'string', description : 'User account to use for fwupd-refresh.service (empty for DynamicUser)') option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on') option('elogind', type : 'feature', description : 'elogind support', deprecated: {'true': 'enabled', 'false': 'disabled'}) @@ -44,16 +44,3 @@ index d00038db..be1c45b4 100644 option('tests', type : 'boolean', value : true, description : 'enable tests') option('soup_session_compat', type : 'boolean', value : true, description : 'enable SoupSession runtime compatibility support') option('curl', type : 'feature', description : 'libcurl support', deprecated: {'true': 'enabled', 'false': 'disabled'}) -diff --git a/plugins/redfish/fu-self-test.c b/plugins/redfish/fu-self-test.c -index 4d19e560..91cfaa61 100644 ---- a/plugins/redfish/fu-self-test.c -+++ b/plugins/redfish/fu-self-test.c -@@ -27,7 +27,7 @@ fu_test_is_installed_test(void) - const gchar *builddir = g_getenv("G_TEST_BUILDDIR"); - if (builddir == NULL) - return FALSE; -- return g_str_has_prefix(builddir, FWUPD_PREFIX); -+ return g_str_has_prefix(builddir, FWUPD_INSTALLED_TEST_PREFIX); - } - - static void diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index 716c5e4d82..af9a44b92f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Firmware for Intel 2200BG cards"; - homepage = "http://ipw2200.sourceforge.net/firmware.php"; + homepage = "https://ipw2200.sourceforge.net/firmware.php"; license = licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ sternenseemann ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix index 1c3f3342e0..100b51e301 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/forkstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "forkstat"; - version = "0.02.17"; + version = "0.03.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-Rw1Xwst0+seksTLL+v3IUEojGjwCERwF89xkk70npUU="; + hash = "sha256-hxheElo/v23Xt7m6GvDgGdyIH+fC4eZSUztiuBbQ8T8="; }; installFlags = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fuse/common.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fuse/common.nix index ac4deb19f5..1ff496abd0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fuse/common.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fuse/common.nix @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { ./makeconf.sh ''); - checkInputs = [ which ] ++ (with python3Packages; [ python pytest ]); + nativeCheckInputs = [ which ] ++ (with python3Packages; [ python pytest ]); checkPhase = '' python3 -m pytest test/ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/fxload/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fxload/default.nix index 3c5443f343..e8b9d0648b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/fxload/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/fxload/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { # fxload binary exist inside the `examples/bin` directory of `libusb1` postFixup = '' - mkdir -p $out/sbin - ln -s ${passthru.libusb}/examples/bin/fxload $out/sbin/fxload + mkdir -p $out/bin + ln -s ${passthru.libusb}/examples/bin/fxload $out/bin/fxload ''; passthru.libusb = libusb1.override { withExamples = true; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/health-check/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/health-check/default.nix index e876808b46..9e85281ea4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/health-check/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/health-check/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "health-check"; - version = "0.03.10"; + version = "0.03.11"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-1dm7tl7DHv1CzuLe1/UewDSUOanO0hN+STkPrAHcZmI="; + hash = "sha256-QLa/7kA0juefzOba7ELopDmOVfiGJReo4LCfhnxW1tk="; }; buildInputs = [ json_c libbsd ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix index d2d7c6218a..5ff7529d23 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , patchelf , cmake , pkg-config @@ -12,15 +13,24 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "22.43.24595.35"; + version = "22.43.24595.41"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-CWiWkv3CmHhXAk2M92voeQ06ximSOnT9hgIA4rIxWmM="; + sha256 = "sha256-AdAQX8wurZjXHf3z8IPxnW57CDOwwYlgJ09dNNDhUYQ="; }; + patches = [ + # fix compile with level-zero 1.9.4 + (fetchpatch { + url = "https://github.com/intel/compute-runtime/commit/dce17d319f91b39806b2cd39b6eecd5c5cff2a68.patch"; + excludes = [ "manifests/manifest.yml" ]; + sha256 = "sha256-YGzS4LeNO8FO1GXowD2gARj0TL6tBFaeZJNLZOwSsWQ="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ intel-gmmlib intel-graphics-compiler libva level-zero ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix index 39429cba4b..2917ace349 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.22"; + version = "1.23"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "sha256-MHjG14vZsuDrR9/SLotb7Uc3RW8Np9E2X0GXkSM+RxE="; + sha256 = "sha256-4DTYtUltmZ+nkm4ZLac+6JbBW3z+qby7sP33LwEXtcQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iputils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iputils/default.nix index 0ca6d8aa18..8396fd5e3d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iputils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iputils/default.nix @@ -1,47 +1,48 @@ -{ lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, gettext, libxslt, docbook_xsl_ns -, libcap, libidn2 +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gettext +, libxslt +, docbook_xsl_ns +, libcap +, libidn2 , iproute2 , apparmorRulesFromClosure }: -let - version = "20211215"; - sunAsIsLicense = { - fullName = "AS-IS, SUN MICROSYSTEMS license"; - url = "https://github.com/iputils/iputils/blob/s${version}/rdisc.c"; - }; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "iputils"; - inherit version; + version = "20221126"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1vzdch1xi2x2j8mvnsr4wwwh7kdkgf926xafw5kkb74yy1wac5qv"; + hash = "sha256-XVoQhdjBmEK8TbCpaKLjebPw7ZT8iEvyLJDTCkzezeE="; }; - outputs = ["out" "apparmor"]; + outputs = [ "out" "apparmor" ]; # We don't have the required permissions inside the build sandbox: # /build/source/build/ping/ping: socket: Operation not permitted doCheck = false; mesonFlags = [ - "-DBUILD_RARPD=true" "-DNO_SETCAP_OR_SUID=true" "-Dsystemdunitdir=etc/systemd/system" "-DINSTALL_SYSTEMD_UNITS=true" "-DSKIP_TESTS=${lib.boolToString (!doCheck)}" ] - # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): - ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; + # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): + ++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; nativeBuildInputs = [ meson ninja pkg-config gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap ] ++ lib.optional (!stdenv.hostPlatform.isMusl) libidn2; - checkInputs = [ iproute2 ]; + nativeCheckInputs = [ iproute2 ]; postInstall = '' mkdir $apparmor @@ -65,23 +66,19 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { + homepage = "https://github.com/iputils/iputils"; + changelog = "https://github.com/iputils/iputils/releases/tag/${version}"; description = "A set of small useful utilities for Linux networking"; - inherit (src.meta) homepage; - changelog = "https://github.com/iputils/iputils/releases/tag/s${version}"; - license = with licenses; [ gpl2Plus bsd3 sunAsIsLicense ]; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos lheckemann ]; - longDescription = '' A set of small useful utilities for Linux networking including: - arping - clockdiff - ninfod - ping - rarpd - rdisc - tracepath + - arping: send ARP REQUEST to a neighbour host + - clockdiff: measure clock difference between hosts + - ping: send ICMP ECHO_REQUEST to network hosts + - tracepath: traces path to a network host discovering MTU along this path ''; + license = with licenses; [ gpl2Plus bsd3 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos lheckemann ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix index d09b5f38f9..585c1661b8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "irqbalance"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "irqbalance"; repo = "irqbalance"; rev = "v${version}"; - sha256 = "sha256-OifGlOUT/zFz5gussEmLL24w4AovGeyNfbg/yCfzerw="; + sha256 = "sha256-dk5gdDCXNELTlbZ34gUOVwPHvXF3N07v/ZqeNVfGTGw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix index 54a9a53a03..2d37d07dbe 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { readline ]; - checkInputs = [ openssl ]; + nativeCheckInputs = [ openssl ]; # wrapPython wraps the scripts in $test. They pull in gobject-introspection, # which doesn't cross-compile. diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/jool/source.nix b/third_party/nixpkgs/pkgs/os-specific/linux/jool/source.nix index 600dd8a33a..b221598c0e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/jool/source.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/jool/source.nix @@ -1,11 +1,11 @@ { fetchFromGitHub }: rec { - version = "4.1.8"; + version = "4.1.9"; src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; - rev = "v${version}"; - hash = "sha256-b+1EM172NRnnTcbJOwBQfytIRuIr8zZBlKBBV/e7Ttg="; + rev = "refs/tags/v${version}"; + hash = "sha256-sKrjn/XQANiXfkjNiFfvAkmONyQjVigFBKgcGkuIPs0="; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index fe406af8c3..a2cace8bc1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,71 +2,61 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.303-hardened1.patch", - "sha256": "1ihq6kf19fribpyiisv5wdax0467pylmlmsqn88vf50ps3akc4ix", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.303-hardened1/linux-hardened-4.14.303-hardened1.patch" + "name": "linux-hardened-4.14.304-hardened1.patch", + "sha256": "099fqlfl9p57pfh5jr7cv30476q2cbhrqs6w63cy3mkwj7l4jwln", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.304-hardened1/linux-hardened-4.14.304-hardened1.patch" }, - "sha256": "17pxl4fgzpz48y7nx1z8891mll64givxgch3z5an6dkr13c2xy2b", - "version": "4.14.303" + "sha256": "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4", + "version": "4.14.304" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.270-hardened1.patch", - "sha256": "1xii5xchbxnswy7qhhvvivx6c6a5n7iw920yrvm2chrnp5s9mikh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.270-hardened1/linux-hardened-4.19.270-hardened1.patch" + "name": "linux-hardened-4.19.271-hardened1.patch", + "sha256": "0xvd9n2fqmr863a4vljki2saa85dccj7mflcfwaslj9g2ygbrf93", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.271-hardened1/linux-hardened-4.19.271-hardened1.patch" }, - "sha256": "14nj1skd73rn59v2ah80vgpc8fh37jvpc75wafpa4glfphx88i11", - "version": "4.19.270" + "sha256": "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3", + "version": "4.19.271" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.164-hardened1.patch", - "sha256": "1z2qd460wnna658zi8mbz2rqjwbvkxrk03ncicqszfjbinigxp6x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.164-hardened1/linux-hardened-5.10.164-hardened1.patch" + "name": "linux-hardened-5.10.165-hardened1.patch", + "sha256": "0gnvnywagqqdsdrbd9fbl671pzfv49mf2xqan9bk3q41mgcyyfgg", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.165-hardened1/linux-hardened-5.10.165-hardened1.patch" }, - "sha256": "0y42xgpmg2mhx81d3bswhk0n3f8vdvmf4k0g8ii6cb01gflalzhc", - "version": "5.10.164" + "sha256": "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp", + "version": "5.10.165" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.89-hardened1.patch", - "sha256": "0gwgdgmc9c7cpgp5vcyxwqxc5y2br3ghi6x3r11frs1kcwvqjix9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.89-hardened1/linux-hardened-5.15.89-hardened1.patch" + "name": "linux-hardened-5.15.90-hardened1.patch", + "sha256": "1zj80v6xpgz00z1lpw5j9qdm0gp44pk7vkflrngbk8m3cwmpw5ha", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.90-hardened1/linux-hardened-5.15.90-hardened1.patch" }, - "sha256": "1s1gflnzvfza5m94c9f3l42kskjadayij4q5gk9vcjq19s3incg7", - "version": "5.15.89" + "sha256": "0hiv74mxkp3v04lphnyw16akgavaz527bzhnfnpm6rv848047zg6", + "version": "5.15.90" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.229-hardened1.patch", - "sha256": "0cww74kkh2n7apzqbdz72d04x39wkasxj5mi7giivpp0s2f0c24a", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.229-hardened1/linux-hardened-5.4.229-hardened1.patch" + "name": "linux-hardened-5.4.230-hardened1.patch", + "sha256": "0xk80i6wddd909wzhcp7b64sbsjjqpwyjr8gknpc83zcdzv3y892", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.230-hardened1/linux-hardened-5.4.230-hardened1.patch" }, - "sha256": "1bx77x4x10v38ygfiz0dcw938ybczq7f3srg11ifzvwm243r5if5", - "version": "5.4.229" - }, - "6.0": { - "patch": { - "extra": "-hardened1", - "name": "linux-hardened-6.0.19-hardened1.patch", - "sha256": "11yn5mrvs170685pwa9k7asxlv64vgfqfg2b6m5yn2a11pr1rxg5", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.19-hardened1/linux-hardened-6.0.19-hardened1.patch" - }, - "sha256": "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb", - "version": "6.0.19" + "sha256": "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7", + "version": "5.4.230" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.7-hardened1.patch", - "sha256": "1hp3mbl8vfd2cwpxbhmqqy77nzyk265k1rcf1rz048ivnsppw4cx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.7-hardened1/linux-hardened-6.1.7-hardened1.patch" + "name": "linux-hardened-6.1.8-hardened1.patch", + "sha256": "1ry0cb1dsq84n6cxn8ndx47qz1g69kqlfkb16rrlgk49w81i8y8z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.8-hardened1/linux-hardened-6.1.8-hardened1.patch" }, - "sha256": "03v0pvg831qzbpc09ip1h0p4zz6js9das7vzh8xhsf77sax4ic2a", - "version": "6.1.7" + "sha256": "0vc1ggjy4wvna7g6xgbjzhk93whssj9ixcal0hkhldxsp0xba2xn", + "version": "6.1.8" } } 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 c76fc306bb..3e5cc00957 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.303"; + version = "4.14.304"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "17pxl4fgzpz48y7nx1z8891mll64givxgch3z5an6dkr13c2xy2b"; + sha256 = "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4"; }; } // (args.argsOverride or {})) 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 999cf84a5d..506d57d797 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.270"; + version = "4.19.271"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14nj1skd73rn59v2ah80vgpc8fh37jvpc75wafpa4glfphx88i11"; + sha256 = "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3"; }; } // (args.argsOverride or {})) 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 86698c5f3a..b2a9f27947 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.164"; + version = "5.10.166"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0y42xgpmg2mhx81d3bswhk0n3f8vdvmf4k0g8ii6cb01gflalzhc"; + sha256 = "1bz1sgkqniwg84wv9vcg08mksa5q533vgynsd3y0xnjv1rwa2l80"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix index 35a9097c14..9ae7546f3c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.89"; + version = "5.15.91"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1s1gflnzvfza5m94c9f3l42kskjadayij4q5gk9vcjq19s3incg7"; + sha256 = "107yw7mibibhfrggm8idzn5bayjvkxaq1kv3kkm1lpxipsqjng56"; }; } // (args.argsOverride or { })) 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 a9b04d5bc0..aef87aaa42 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.229"; + version = "5.4.230"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1bx77x4x10v38ygfiz0dcw938ybczq7f3srg11ifzvwm243r5if5"; + sha256 = "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.0.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.0.nix deleted file mode 100644 index 87050462e6..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "6.0.19"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = versions.pad 3 version; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb"; - }; -} // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix index dd42454b3a..2bed730a8b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.7"; + version = "6.1.9"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "03v0pvg831qzbpc09ip1h0p4zz6js9das7vzh8xhsf77sax4ic2a"; + sha256 = "0awjynyy049px0h7li59w3zgn3z39alv6glzrmx6wf1wd62z236n"; }; } // (args.argsOverride or { })) 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 aefd662aa4..6a1ba266a3 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.162-rt78"; # updated by ./update-rt.sh + version = "5.10.165-rt81"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -17,14 +17,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "05yjgp1la5flwqji9b6j7nbdgg5fwzv2ph536v4f9pzza3y01i1f"; + sha256 = "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "146y62kzxm0d7bw8riqds0m8iilx3zd6yh5dfxr5q90jcjnah16x"; + sha256 = "1441lwmz4v427gcyddps17ms96y86klmnlw95kc74j6wmy387fcg"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf/default.nix index ae028b980c..c1f6fd03a2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/perf/default.nix @@ -108,7 +108,6 @@ stdenv.mkDerivation { libunwind zlib openssl - systemtap.stapBuild numactl python3 perl @@ -116,6 +115,7 @@ stdenv.mkDerivation { ] ++ (if (lib.versionAtLeast kernel.version "5.19") then [ libbfd libopcodes ] else [ libbfd_2_38 libopcodes_2_38 ]) + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform systemtap) systemtap.stapBuild ++ lib.optional withGtk gtk2 ++ lib.optional withZstd zstd ++ lib.optional withLibcap libcap diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 5cbc94d5ab..09562d42ec 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,14 +3,14 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "5.15.84"; - hash = "sha256-CN3GOuwSicJ6Oa9BiKTyZg7fpzWc846v2SV9JRiOu3M="; + version = "5.15.89"; + hash = "sha256-wlb6er8L2EaqgJbmbATBdSxx1BGcJXNcsu+/4UBmYdQ="; variant = "lts"; }; mainVariant = { - version = "6.1.3"; - hash = "sha256-YtkmbbFEfvww7yJ4MpLQ3M6QjbBXSU9Pjwu0Dq/dIcs="; + version = "6.1.7"; + hash = "sha256-cgUxM40cDl4lzoF4St3ckKAtsle2PRehfSag3VaycrY="; variant = "main"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix index a5376d5641..35cb84e077 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.1.6"; #zen + version = "6.1.9"; #zen suffix = "zen1"; #zen - sha256 = "14f24w8cww1096lawrk0absx6sqy4mm0f2wpsijgjx4br2ln7p4r"; #zen + sha256 = "0fsmcjsawxr32fxhpp6sgwfwwj8kqymy0rc6vh4qli42fqmwdjgv"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.1.6"; #lqx + version = "6.1.9"; #lqx suffix = "lqx1"; #lqx - sha256 = "0w1ckias1j1baidyw1a6kq1za7i3ig0w1phkb4s7sw9p7bnhbrx1"; #lqx + sha256 = "167qr1mxsr5llmzixsijsn72d8jyphhgg2k8qsf369m7y58sz0s9"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix index d0a1f1f4e6..5a58c198c0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ksmbd-tools/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ksmbd-tools"; - version = "3.4.5"; + version = "3.4.6"; src = fetchFromGitHub { owner = "cifsd-team"; repo = pname; rev = version; - sha256 = "sha256-sSCLXNdVUAdk+GnFlVx/BsAzyfz0KDdugJ1isrOztgs="; + sha256 = "sha256-zquHhr+Zf4jR/TlVA0Zea3eZ9JjRjYXefcYIQs76gSw="; }; buildInputs = [ glib libnl ] ++ lib.optional withKerberos libkrb5; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libaio/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libaio/default.nix index fe2e69e06f..324e2695dd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libaio/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libaio/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for asynchronous I/O in Linux"; - homepage = "http://lse.sourceforge.net/io/aio.html"; + homepage = "https://lse.sourceforge.net/io/aio.html"; platforms = lib.platforms.linux; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix index 46d0e94bb1..2049b7cf0e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, help2man, gettext -, libxml2, perl, python3, doxygen }: - +{ lib, stdenv, fetchFromGitHub, fetchurl +, pkg-config, autoreconfHook, help2man, gettext, libxml2, perl, python3, doxygen +}: stdenv.mkDerivation rec { pname = "libsmbios"; @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0krwwydyvb9224r884y1mlmzyxhlfrcqw73vi1j8787rl0gl5a2i"; }; + patches = [ + (fetchurl { + name = "musl.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/libsmbios/fixes.patch?id=bdc4f67889c958c1266fa5d0cab71c3cd639122f"; + sha256 = "aVVc52OovDYvqWRyKcRAi62daa9AalkKvnVOGvrTmRk="; + }) + ]; + nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkg-config ]; buildInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix index c81949bf39..427f2eb69c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.6.2"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; sha256 = "sha256-iLy2rEKn0UJguRcY/W8RvUq7uX+snQojb/cXOmMsjwc="; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libtracefs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libtracefs/default.nix index 46a633aec5..3cb79ae077 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libtracefs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libtracefs/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.5.0"; + version = "1.6.4"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; + url = "https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; rev = "libtracefs-${version}"; - sha256 = "sha256-5OUTOIla4adtSJwQkii6f/mB99R5QzodyQkq/g6oNSw="; + sha256 = "sha256-fWop0EMkoVulLBzU7q8x1IhMtdnEJ89wMz0cz964F6s="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix index 4c14d2ecae..8901f6bcca 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/linuxptp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Implementation of the Precision Time Protocol (PTP) according to IEEE standard 1588 for Linux"; - homepage = "http://linuxptp.sourceforge.net/"; + homepage = "https://linuxptp.sourceforge.net/"; maintainers = [ maintainers.markuskowa ]; license = licenses.gpl2Only; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix index 19d6f10e3d..24915143fb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux Kernel Stream Control Transmission Protocol Tools"; - homepage = "http://lksctp.sourceforge.net/"; + homepage = "https://lksctp.sourceforge.net/"; license = with licenses; [ gpl2 lgpl21 ]; # library is lgpl21 platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix index 047b2499a8..3cdb64becb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lockdep/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; doCheck = true; - checkInputs = [ valgrind ]; + nativeCheckInputs = [ valgrind ]; checkPhase = '' # there are more /bin/bash references than just shebangs for f in lockdep run_tests.sh tests/*.sh; do diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/2_03.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/2_03.nix index 2f48448541..5a5193997b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.17"; - hash = "sha256-cobPqWUYKMWJOJUJVGMzuNqWXfqEoaTIqz5oGkf6uuc="; + version = "2.03.18"; + hash = "sha256-n2g+KYDZXA3Ou9JcfBdwMsVhXXJnv8iF6r/OWSgPR2k="; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix index c28c55091e..925901d226 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "unstable-2022-09-27"; + version = "unstable-2022-11-09"; src = fetchzip rec { url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz"; - passthru.rev = "dfc3b6ecda84d21418fb4408b39c5c71db4c6458"; - sha256 = "G4sBwRW8NOq7CGTADvXgMbcVInStSueGfGsb4ApVaSk="; + passthru.rev = "c62dd8e415b12cc7f9a362db23cd384caf77ff03"; + sha256 = "zTrMounPmos+9Reyfa3xS5/5/tyMs0WapSmzqdXUBNk="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix index d39da5fb9d..91363969ff 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/multipath-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, coreutils , pkg-config , perl , lvm2 @@ -9,31 +10,28 @@ , systemd , liburcu , json_c -, kmod +, linuxHeaders , cmocka , nixosTests }: stdenv.mkDerivation rec { pname = "multipath-tools"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "opensvc"; repo = "multipath-tools"; rev = "refs/tags/${version}"; - sha256 = "sha256-pIGeZ+jB+6GqkfVN83axHIuY/BobQ+zs+tH+MkLIln0="; + sha256 = "sha256-CPvtnjzkyxKXrT8+YXaIgDA548h8X61+jCxMHKFfEyg="; }; postPatch = '' - substituteInPlace libmultipath/Makefile \ - --replace /usr/include/libdevmapper.h ${lib.getDev lvm2}/include/libdevmapper.h + substituteInPlace create-config.mk \ + --replace /bin/echo ${coreutils}/bin/echo - # systemd-udev-settle.service is deprecated. substituteInPlace multipathd/multipathd.service \ - --replace /sbin/modprobe ${lib.getBin kmod}/sbin/modprobe \ - --replace /sbin/multipathd "$out/bin/multipathd" \ - --replace " systemd-udev-settle.service" "" + --replace /sbin/multipathd "$out/bin/multipathd" sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", @@ -45,15 +43,16 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config perl ]; - buildInputs = [ systemd lvm2 libaio readline liburcu json_c ]; + buildInputs = [ systemd lvm2 libaio readline liburcu json_c linuxHeaders ]; makeFlags = [ "LIB=lib" "prefix=$(out)" + "systemd_prefix=$(out)" + "kernel_incdir=${linuxHeaders}/include/" "man8dir=$(out)/share/man/man8" "man5dir=$(out)/share/man/man5" "man3dir=$(out)/share/man/man3" - "SYSTEMDPATH=lib" ]; doCheck = true; @@ -61,7 +60,7 @@ stdenv.mkDerivation rec { # skip test attempting to access /sys/dev/block substituteInPlace tests/Makefile --replace ' devt ' ' ' ''; - checkInputs = [ cmocka ]; + nativeCheckInputs = [ cmocka ]; passthru.tests = { inherit (nixosTests) iscsi-multipath-root; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix index 126b640f2d..96dc2e6ffa 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = { broken = kernel.kernelAtLeast "5.16"; - homepage = "http://www.magewell.com/"; + homepage = "https://www.magewell.com/"; description = "Linux driver for the Magewell Pro Capture family"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ MP2E ]; 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 b0b155c784..f90da9db3b 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 @@ -157,10 +157,6 @@ if [[ -n "$SUDO_USER" || -n $remoteSudo ]]; then maybeSudo=(sudo --preserve-env="$preservedSudoVars" --) fi -if [[ -z "$buildHost" && -n "$targetHost" ]]; then - buildHost="$targetHost" -fi - # log the given argument to stderr if verbose mode is on logVerbose() { if [ -n "$verboseScript" ]; then diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numatop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/numatop/default.nix index 0946d5050d..ad0138f18b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/numatop/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/numatop/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ numactl ncurses ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; patches = [ (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index 02111abb4d..df9aca8e24 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -51,14 +51,14 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "525.47.04"; - persistencedVersion = "525.78.01"; - settingsVersion = "525.78.01"; - sha256_64bit = "sha256-PcDRM39s4vh5++4TocIJKI3wsxWxJdy3p3KAenpdIc0="; - openSha256 = "sha256-jH7mwSpasOdWMvN1xuPkO33g0XJjObzA45aqHwKoD4w="; - settingsSha256 = "sha256-1d3Cn+7Gm1ORQxmTKr18GFmYHVb8t050XVLler1dCtw="; - persistencedSha256 = "sha256-t6dViuvA2fw28w4kh4koIoxh9pQ8f7KI1PIUFJcGlYA="; - url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; + version = "525.47.06"; + persistencedVersion = "525.85.05"; + settingsVersion = "525.85.05"; + sha256_64bit = "sha256-HxRXtd3ubjS1V/y1hDWe16XNSCbQYHoEw+Jz8Emy5/4="; + openSha256 = "sha256-oiOlCdkFMXm4vVZzmnnI5/INVWUqC02gGj/aIfzjGig="; + settingsSha256 = "sha256-ck6ra8y8nn5kA3L9/VcRR2W2RaWvfVbgBiOh2dRJr/8="; + persistencedSha256 = "sha256-dt/Tqxp7ZfnbLel9BavjWDoEdLJvdJRwFjTFOBYYKLI="; + url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux"; }; # Update note: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix index 32b3e636ac..38912e0aa2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix @@ -1,55 +1,60 @@ -{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, gettext -, util-linux, open-isns, openssl, kmod, perl, systemd, pkgconf, nixosTests -}: +{ stdenv +, lib +, fetchFromGitHub +, meson +, pkg-config +, ninja +, perl +, util-linux +, open-isns +, openssl +, kmod +, systemd +, runtimeShell +, nixosTests }: stdenv.mkDerivation rec { pname = "open-iscsi"; - version = "2.1.7"; - - nativeBuildInputs = [ autoconf automake gettext libtool perl pkgconf ]; - buildInputs = [ kmod open-isns.lib openssl systemd util-linux ]; + version = "2.1.8"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "open-iscsi"; rev = version; - sha256 = "sha256-R1ttHHxVSQ5TGtWVy4I9BAmEJfcRhKRD5jThoeddjUw="; + hash = "sha256-JzSyX9zvUkhCEpNwTMneTZpCRgaYxHZ1wP215YnMI78="; }; - DESTDIR = "$(out)"; - - NIX_LDFLAGS = "-lkmod -lsystemd"; - NIX_CFLAGS_COMPILE = "-DUSE_KMOD"; + nativeBuildInputs = [ + meson + pkg-config + ninja + perl + ]; + buildInputs = [ + kmod + (lib.getLib open-isns) + openssl + systemd + util-linux + ]; preConfigure = '' - # Remove blanket -Werror. Fails for minor error on gcc-11. - substituteInPlace usr/Makefile --replace ' -Werror ' ' ' + patchShebangs . ''; - # avoid /usr/bin/install - makeFlags = [ - "INSTALL=install" - "SED=sed" - "prefix=/" - "manprefix=/share" + prePatch = '' + substituteInPlace etc/systemd/iscsi-init.service.template \ + --replace /usr/bin/sh ${runtimeShell} + sed -i '/install_dir: db_root/d' meson.build + ''; + + mesonFlags = [ + "-Discsi_sbindir=${placeholder "out"}/sbin" + "-Drulesdir=${placeholder "out"}/etc/udev/rules.d" + "-Dsystemddir=${placeholder "out"}/lib/systemd" + "-Ddbroot=/etc/iscsi" ]; - installFlags = [ - "install" - ]; - - postInstall = '' - cp usr/iscsistart $out/sbin/ - for f in $out/lib/systemd/system/*; do - substituteInPlace $f --replace /sbin $out/bin - done - $out/sbin/iscsistart -v - ''; - - postFixup = '' - sed -i "s|/sbin/iscsiadm|$out/bin/iscsiadm|" $out/bin/iscsi_fw_login - ''; - passthru.tests = { inherit (nixosTests) iscsi-root iscsi-multipath-root; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/generic.nix b/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/generic.nix index c3d180bcbb..ff0238e51a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/generic.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/openvswitch/generic.nix @@ -94,7 +94,7 @@ in stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ iproute2 ] ++ (with python3.pkgs; [ netaddr diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix index bd81715bda..1c1edc5abc 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pax-utils/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "pax-utils"; - version = "1.3.6"; + version = "1.3.7"; src = fetchurl { url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; - sha256 = "sha256-pNU5isAZh9cPgaWZSSvWmSqukKV3TFGGntOKN6y1zIo="; + sha256 = "sha256-EINi0pZo0lz3sMrcY7FaTBz8DbxxrcFRszxf597Ok5o="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix new file mode 100644 index 0000000000..4a651bf473 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/picoprobe-udev-rules/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchurl }: + +## Usage +# In NixOS, simply add this package to services.udev.packages: +# services.udev.packages = [ pkgs.picoprobe-udev-rules ]; + +stdenv.mkDerivation rec { + pname = "picoprobe-udev-rules"; + version = "unstable-2023-01-31"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/probe-rs/webpage/1cba61acc6ecb5ff96f74641269844ad88ad8ad5/static/files/69-probe-rs.rules"; + sha256 = "sha256-vQMPX3Amttja0u03KWGnPDAVTGM9ekJ+IBTjW+xlJS0="; + }; + + dontUnpack = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -D $src $out/lib/udev/rules.d/69-probe-rs.rules + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://probe.rs/docs/getting-started/probe-setup/#udev-rules"; + description = "Picoprobe udev rules list"; + platforms = platforms.linux; + license = licenses.gpl2Only; + maintainers = with maintainers; [ mglolenstine ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix index 0ddda99bf5..20db1cdd74 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pktgen/default.nix @@ -1,19 +1,40 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config -, dpdk, libbsd, libpcap, lua5_3, numactl, util-linux -, gtk2, which, withGtk ? false +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkg-config +, dpdk +, libbsd +, libpcap +, lua5_3 +, numactl +, util-linux +, gtk2 +, which +, withGtk ? false }: stdenv.mkDerivation rec { pname = "pktgen"; - version = "22.04.1"; + version = "22.07.1"; src = fetchFromGitHub { owner = "pktgen"; repo = "Pktgen-DPDK"; rev = "pktgen-${version}"; - sha256 = "0gbag98i2jq0p2hpvfgc3fiqy2sark1dm72hla4sxmn3gljy3p70"; + sha256 = "sha256-wBLGwVdn3ymUTVv7J/kbQYz4WNIgV246PHg51+FStUo="; }; + patches = [ + (fetchpatch { + # Ealier DPDK deprecated some macros, which were finally removed in >= 22.11 + url = "https://github.com/pktgen/Pktgen-DPDK/commit/089ef94ac04629f7380f5e618443bcacb2cef5ab.patch"; + sha256 = "sha256-ITU/dIfu7QPpdIVYuCuDhDG9rVF+n8i1YYn9bFmQUME="; + }) + ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix index f2720f40f5..393583e086 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { glib polkit python3 # for cli tool - # Duplicate from checkInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved + # Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved umockdev ]; @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 ]; - checkInputs = [ + nativeCheckInputs = [ umockdev dbus ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix index 86f2e124ed..5f03c5faab 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/powerstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.02.27"; + version = "0.03.00"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-P6DhsHnB+ak35JpUfD8Q8XbgMhI1QKKe31B8uMT2ZcY="; + hash = "sha256-eiFzWKY4LrudfjMKDk4clmvCqYOGvWFokn6jEryMYBo="; }; installFlags = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix index c87c337e61..67b839a1bd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix @@ -7,7 +7,7 @@ # `ps` with systemd support is able to properly report different # attributes like unit name, so we want to have it on linux. -, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd # procps is mostly Linux-only. Most commands require a running Linux diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rasdaemon/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rasdaemon/default.nix index cccd91fff8..35201d49b7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rasdaemon/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rasdaemon/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rasdaemon"; - version = "0.6.8"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mchehab"; repo = "rasdaemon"; rev = "v${version}"; - sha256 = "sha256-gcwoc9lIJyqUiCSAHf1U8geLG58CxzjMFYFl8moaA2Q="; + sha256 = "sha256-oLwR+bNgKceVgLTOLYiKHNUkRmLouaQshdp/8UJnfqg="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index 63ab388eb6..3c19db4039 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -3,13 +3,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "raspberrypi-eeprom"; - version = "2022.12.07-138a1"; + version = "2023.01.11-138c0"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; rev = "v${version}"; - hash = "sha256-/Q9zj/Hn/8S7bF1CN6ZCg705VYU+QUagNr4RNgZl+oA="; + hash = "sha256-z3VyqdSkvxAgVmtMI/Is9qYrOeDXlyVLwHSSC2+AxcA="; }; buildInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix index 5a3f9d2d77..0c58ca7b3b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ]; - checkInputs = [ python ]; + nativeCheckInputs = [ python ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix index ef18dda119..38cbabad52 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/roccat-tools/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools to configure ROCCAT devices"; - homepage = "http://roccat.sourceforge.net/"; + homepage = "https://roccat.sourceforge.net/"; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix index f53ed777d0..e50129f1e2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8189es-${kernel.version}-${version}"; - version = "2022-08-30"; + version = "2022-10-30"; src = fetchFromGitHub { owner = "jwrdegoede"; repo = "rtl8189ES_linux"; - rev = "c93cfd712a3acd2ecdeda19a66d269c20f8803f1"; - sha256 = "sha256-bBUxo8lplFwXfsSNf5lz9XCpQ6M0vWelmFoCal95FpI="; + rev = "e58bd86c9d9408c648b1246a0dd76b16856ec172"; + sha256 = "sha256-KKly72N6ACBTB4CSBM6Q/S1wGMTg5NZA3QYslYPNUr8="; }; nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index de5c79a560..80c14a0b38 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, kernel }: let - rev = "37e27f9165300c89607144b646545fac576ec510"; + rev = "ee299797bcd54d5b8c58d2da8576c54cea1a03a2"; in stdenv.mkDerivation rec { pname = "rtl88xxau-aircrack"; @@ -11,15 +11,13 @@ stdenv.mkDerivation rec { owner = "aircrack-ng"; repo = "rtl8812au"; inherit rev; - sha256 = "sha256-TpmpueKAaCe7Nlmv8pMvgMXGVmXVa/1mBwtEoy4JyCY="; + sha256 = "sha256-JUyUOqLMD9nSo6i87K/6Ljp+pWSqSBz/IZiFWu03rQw="; }; buildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; - NIX_CFLAGS_COMPILE="-Wno-error=incompatible-pointer-types"; - prePatch = '' substituteInPlace ./Makefile \ --replace /lib/modules/ "${kernel.dev}/lib/modules/" \ @@ -40,6 +38,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.jethro ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; - broken = kernel.kernelAtLeast "5.18"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix index b533643752..0af52023b2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pciutils, cmake }: stdenv.mkDerivation rec { pname = "ryzenadj"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "FlyGoat"; repo = "RyzenAdj"; rev = "v${version}"; - sha256 = "sha256-tfki+7W2RbqzEHG/Ibton/V5koT89emdQ7aX8WDUzdI="; + sha256 = "sha256-otw2U3Qh6NR6lJU1ldMR6Y5ia4Qk5tHAe/oY0YxJQUg="; }; nativeBuildInputs = [ pciutils cmake ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sasutils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sasutils/default.nix index fd1a6f0b04..743a3ed955 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sasutils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sasutils/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "sasutils"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "stanford-rc"; repo = pname; - rev = "v${version}"; - sha256 = "0kh5pcc2shdmrvqqi2y1zamzsfvk56pqgwqgqhjfz4r6yfpm04wl"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-cPCmmJkhr4+STVHa7e3LZGZFd8KPkECMAVurhuG8H1s="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/setools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/setools/default.nix index 9d547d2007..35a0355c0b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/setools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/setools/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ enum34 libselinux networkx ] ++ optionals withGraphics [ pyqt5 ]; - checkInputs = [ tox checkpolicy ]; + nativeCheckInputs = [ tox checkpolicy ]; preCheck = '' export CHECKPOLICY=${checkpolicy}/bin/checkpolicy ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/psw/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/psw/default.nix index ba2d0967e4..4a5e50d9c6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/psw/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/psw/default.nix @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { # NixOS module which is based on those files without relying on them. Still, it # is helpful to have properly patched versions for non-NixOS distributions. postFixup = '' - header "Fixing aesmd.service" + echo "Fixing aesmd.service" substituteInPlace $out/lib/systemd/system/aesmd.service \ --replace '@aesm_folder@' \ "$out/aesm" \ @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { --replace "/bin/kill" \ "${coreutils}/bin/kill" - header "Fixing remount-dev-exec.service" + echo "Fixing remount-dev-exec.service" substituteInPlace $out/lib/systemd/system/remount-dev-exec.service \ --replace '/bin/mount' \ "${util-linux}/bin/mount" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/default.nix index 5213dc1e4f..053aaecbcb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { }; in '' - header "Setting up IPP crypto build artifacts" + echo "Setting up IPP crypto build artifacts" pushd 'external/ippcp_internal' @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { ./linux/installer/bin/sgx_linux_x64_sdk_${version}.bin -prefix $installDir installDir=$installDir/sgxsdk - header "Move files created by installer" + echo "Move files created by installer" mkdir -p $out/bin pushd $out @@ -206,15 +206,15 @@ stdenv.mkDerivation rec { preFixup = '' - header "Strip sgxsdk prefix" + echo "Strip sgxsdk prefix" for path in "$out/share/bin/environment" "$out/bin/sgx-gdb"; do substituteInPlace $path --replace "$TMPDIR/sgxsdk" "$out" done - header "Fixing pkg-config files" + echo "Fixing pkg-config files" sed -i "s|prefix=.*|prefix=$out|g" $out/lib/pkgconfig/*.pc - header "Fixing SGX_SDK default in samples" + echo "Fixing SGX_SDK default in samples" substituteInPlace $out/share/SampleCode/LocalAttestation/buildenv.mk \ --replace '/opt/intel/sgxsdk' "$out" for file in $out/share/SampleCode/*/Makefile; do @@ -222,12 +222,12 @@ stdenv.mkDerivation rec { --replace '/opt/intel/sgxsdk' "$out" done - header "Fixing BINUTILS_DIR in buildenv.mk" + echo "Fixing BINUTILS_DIR in buildenv.mk" substituteInPlace $out/share/bin/buildenv.mk \ --replace 'BINUTILS_DIR ?= /usr/local/bin' \ 'BINUTILS_DIR ?= ${BINUTILS_DIR}' - header "Fixing GDB path in bin/sgx-gdb" + echo "Fixing GDB path in bin/sgx-gdb" substituteInPlace $out/bin/sgx-gdb --replace '/usr/local/bin/gdb' '${gdb}/bin/gdb' ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix index efd2078d99..e9ee3c518f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "sssd"; - version = "2.8.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "SSSD"; repo = pname; rev = version; - sha256 = "sha256-TbeofUQAQNM/Nxzgl8GP2+Y4iR7bVXm4dQaPkYMSdqc="; + sha256 = "sha256-nEMfwOvWd3FRk+1RS1NPT+LcfWi4lDLCGYqH7KuPw7o="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix index 21f232d0c2..a8579a50fb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sysdig/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config , luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc -, libyamlcpp, nlohmann_json, re2 +, yaml-cpp, nlohmann_json, re2 }: -with lib; let # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake libsRev = "0.9.1"; @@ -51,10 +50,10 @@ stdenv.mkDerivation rec { re2 protobuf grpc - libyamlcpp + yaml-cpp jsoncpp nlohmann_json - ] ++ optionals (kernel != null) kernel.moduleBuildDependencies; + ] ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -82,7 +81,7 @@ stdenv.mkDerivation rec { "-DUSE_BUNDLED_TBB=OFF" "-DUSE_BUNDLED_RE2=OFF" "-DCREATE_TEST_TARGETS=OFF" - ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; + ] ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF"; # needed since luajit-2.1.0-beta3 NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))"; @@ -93,7 +92,7 @@ stdenv.mkDerivation rec { exit 1 fi cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -labsl_synchronization") - '' + optionalString (kernel != null) '' + '' + lib.optionalString (kernel != null) '' export INSTALL_MOD_PATH="$out" export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ''; @@ -106,7 +105,7 @@ stdenv.mkDerivation rec { rmdir $out/etc/bash_completion.d rmdir $out/etc '' - + optionalString (kernel != null) '' + + lib.optionalString (kernel != null) '' make install_driver kernel_dev=${kernel.dev} kernel_dev=''${kernel_dev#/nix/store/} @@ -121,7 +120,7 @@ stdenv.mkDerivation rec { ''; - meta = { + meta = with lib; { description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; license = with licenses; [ asl20 gpl2 mit ]; maintainers = [maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sysfsutils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sysfsutils/default.nix index b5f067fffd..113ba7939a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sysfsutils/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://linux-diag.sourceforge.net/Sysfsutils.html"; + homepage = "https://linux-diag.sourceforge.net/Sysfsutils.html"; longDescription = '' These are a set of utilites built upon sysfs, a new virtual diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch new file mode 100644 index 0000000000..c64fdd8d34 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-tpm2_context_init-fix-driver-name-checking.patch @@ -0,0 +1,44 @@ +From 236e9281cb158be3191c500524fbc5f397a25e03 Mon Sep 17 00:00:00 2001 +From: Nick Cao +Date: Sun, 15 Jan 2023 20:15:55 +0800 +Subject: [PATCH] tpm2_context_init: fix driver name checking + +https://github.com/systemd/systemd/commit/542dbc623e introduced +additional checks for tpm2 driver names, namely ensuring the driver +name, when concated with "libtss2-tcti-" and ".so.0", generates a valid +filename (with no '/' inside). + +For example, if the driver is name "device", the line + fn = strjoina("libtss2-tcti-", driver, ".so.0") +would yield "libtss2-tcti-device.so.0", passing the check. And the +filename is then passed to dlopen for loading the driver. + +Our current approach for systemd to correctly locate these dynamically +loaded libraries is to patch the filenames to include their absolute +path. Thus the line mentioned above is patched into + fn = strjoina("/nix/store/xxxxxxx-tpm2-tss-3.2.0/lib/libtss2-tcti-", driver, ".so.0") +yielding "/nix/store/xxxxxxx-tpm2-tss-3.2.0/lib/libtss2-tcti-device.so.0", +tripping the check. + +This patch relaxes the check to also accept absolute paths, by replacing +filename_is_valid with path_is_valid. +--- + src/shared/tpm2-util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c +index ba8dfb041d..7de5d5fc77 100644 +--- a/src/shared/tpm2-util.c ++++ b/src/shared/tpm2-util.c +@@ -192,7 +192,7 @@ int tpm2_context_init(const char *device, struct tpm2_context *ret) { + fn = strjoina("libtss2-tcti-", driver, ".so.0"); + + /* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */ +- if (!filename_is_valid(fn)) ++ if (!path_is_valid(fn)) + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "TPM2 driver name '%s' not valid, refusing.", driver); + + dl = dlopen(fn, RTLD_NOW); +-- +2.39.0 + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 4799cdb06b..e871d6618c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -93,6 +93,7 @@ , withHwdb ? true , withImportd ? !stdenv.hostPlatform.isMusl , withLibBPF ? lib.versionAtLeast buildPackages.llvmPackages.clang.version "10.0" + && stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6" # assumes hard floats && !stdenv.hostPlatform.isMips64 # see https://github.com/NixOS/nixpkgs/pull/194149#issuecomment-1266642211 , withLocaled ? true , withLogind ? true @@ -174,6 +175,7 @@ stdenv.mkDerivation { ./0016-pkg-config-derive-prefix-from-prefix.patch ./0017-inherit-systemd-environment-when-calling-generators.patch ./0018-core-don-t-taint-on-unmerged-usr.patch + ./0019-tpm2_context_init-fix-driver-name-checking.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { @@ -714,6 +716,7 @@ stdenv.mkDerivation { description = "A system and service manager for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; # https://github.com/systemd/systemd/issues/20600#issuecomment-912338965 broken = stdenv.hostPlatform.isStatic; priority = 10; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix index 0aff1bdd78..6b349e7065 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,18 +1,19 @@ { lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }: stdenv.mkDerivation rec { pname = "trace-cmd"; - version = "3.1.2"; + version = "3.1.6"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; + url = "https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; rev = "trace-cmd-v${version}"; - sha256 = "sha256-wxrMEE7ZgMHM59Rv6Gk3f0zdpULuXLnY0UY797YF1a0="; + sha256 = "sha256-qjfeomeExjsx/6XrUaGm5szbL7XVlekGd4Hsuncv8NY="; }; # Don't build and install html documentation postPatch = '' sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' \ Documentation{,/trace-cmd,/libtracecmd}/Makefile + patchShebangs check-manpages.sh ''; nativeBuildInputs = [ asciidoc libxslt pkg-config xmlto docbook_xsl docbook_xml_dtd_45 sourceHighlight ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tunctl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tunctl/default.nix index 646e3702fe..e71e349a25 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tunctl/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tunctl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://tunctl.sourceforge.net/"; + homepage = "https://tunctl.sourceforge.net/"; description = "Utility to set up and maintain TUN/TAP network interfaces"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix index 688a743fa9..0b7739012e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/uhk-agent/default.nix @@ -1,11 +1,11 @@ { appimageTools, lib, fetchurl, polkit, udev }: let pname = "uhk-agent"; - version = "1.5.17"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-auOoTTRmkXVDDvcmRFzQIStNlbai8bTBLb/KUjk6EAc="; + sha256 = "sha256-NhDHwQeh+zbA7XykriSMaygNm1SorMd+yy/m6sPgAhg="; }; appimageContents = appimageTools.extract { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix index 575ab514cc..9973b1ac5a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix @@ -69,13 +69,13 @@ stdenv.mkDerivation rec { libusb1 udev systemd - # Duplicate from checkInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved + # Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved umockdev ] ++ lib.optionals useIMobileDevice [ libimobiledevice ]; - checkInputs = [ + nativeCheckInputs = [ python3.pkgs.dbus-python python3.pkgs.python-dbusmock python3.pkgs.pygobject3 diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix index 8df231c961..eeecc655ae 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix @@ -6,7 +6,7 @@ , ncurses , pamSupport ? true , pam -, systemdSupport ? stdenv.isLinux && !stdenv.hostPlatform.isStatic +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , nlsSupport ? true , translateManpages ? true diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/virtio_vmmci/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/virtio_vmmci/default.nix index ccf462702f..d18818a10d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/virtio_vmmci/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "virtio_vmmci"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "voutilad"; repo = "virtio_vmmci"; rev = "${version}"; - sha256 = "104xnpcy5kb4y7ipy1fx1v6byddzs63bv2dqjy3yl23n764fsy43"; + hash = "sha256-ZHslYYZFjM3wp0W5J3/WwCtQ2wDzT1jNc26Z/giTC8g="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/vmm_clock/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/vmm_clock/default.nix index 853e7765ee..1a10df62d4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/vmm_clock/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/vmm_clock/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "vmm_clock"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "voutilad"; repo = "vmm_clock"; rev = "${version}"; - sha256 = "0hg7ywznh6v11fywsz6f7w298bxph0wwm046zqaqncjvr4aizla4"; + hash = "sha256-8z/N/dbkeFd40sH7jatNmSS62B88tC0jVgNljhxslOo="; }; hardeningDisable = [ "pic" "format" ]; @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = kernel.kernelOlder "4.19"; description = "Experimental implementation of a kvmclock-derived clocksource for Linux guests under OpenBSD's hypervisor"; homepage = "https://github.com/voutilad/vmm_clock"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/waydroid/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/waydroid/default.nix index efa21cfb26..8955bcfa51 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/waydroid/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/waydroid/default.nix @@ -4,12 +4,15 @@ , dnsmasq , gawk , getent +, gobject-introspection +, gtk3 , kmod , lxc , iproute2 , nftables , util-linux , which +, wrapGAppsHook , xclip }: @@ -25,6 +28,15 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-0GBob9BUwiE5cFGdK8AdwsTjTOdc+AIWqUGN/gFfOqI="; }; + buildInputs = [ + gtk3 + ]; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + propagatedBuildInputs = with python3Packages; [ gbinder-python pyclip @@ -35,9 +47,14 @@ python3Packages.buildPythonApplication rec { dontUsePipInstall = true; dontUseSetuptoolsCheck = true; dontWrapPythonPrograms = true; + dontWrapGApps = true; installPhase = '' make install PREFIX=$out USE_SYSTEMD=0 USE_NFTABLES=1 + ''; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") wrapProgram $out/lib/waydroid/data/scripts/waydroid-net.sh \ --prefix PATH ":" ${lib.makeBinPath [ dnsmasq getent iproute2 nftables ]} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix index 2d954d83ec..ba4fe8356c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, openssl, pkg-config, libnl , nixosTests, wpa_supplicant_gui -, dbusSupport ? true, dbus +, dbusSupport ? !stdenv.hostPlatform.isStatic, dbus , withReadline ? true, readline -, withPcsclite ? true, pcsclite +, withPcsclite ? !stdenv.hostPlatform.isStatic, pcsclite , readOnlyModeSSIDs ? false }: @@ -73,6 +73,15 @@ stdenv.mkDerivation rec { CONFIG_CTRL_IFACE_DBUS=y CONFIG_CTRL_IFACE_DBUS_NEW=y CONFIG_CTRL_IFACE_DBUS_INTRO=y + '' + # Upstream uses conditionals based on ifdef, so opposite of =y is + # not =n, as one may expect, but undefine. + # + # This config is sourced into makefile. + + optionalString (!dbusSupport) '' + undefine CONFIG_CTRL_IFACE_DBUS + undefine CONFIG_CTRL_IFACE_DBUS_NEW + undefine CONFIG_CTRL_IFACE_DBUS_INTRO '' + (if withReadline then '' CONFIG_READLINE=y '' else '' @@ -104,13 +113,15 @@ stdenv.mkDerivation rec { mkdir -p $out/share/man/man5 $out/share/man/man8 cp -v "doc/docbook/"*.5 $out/share/man/man5/ cp -v "doc/docbook/"*.8 $out/share/man/man8/ - + '' + + lib.optionalString dbusSupport '' mkdir -p $out/share/dbus-1/system.d $out/share/dbus-1/system-services $out/etc/systemd/system cp -v "dbus/"*service $out/share/dbus-1/system-services sed -e "s@/sbin/wpa_supplicant@$out&@" -i "$out/share/dbus-1/system-services/"* cp -v dbus/dbus-wpa_supplicant.conf $out/share/dbus-1/system.d cp -v "systemd/"*.service $out/etc/systemd/system - + '' + + '' rm $out/share/man/man8/wpa_priv.8 install -Dm444 wpa_supplicant.conf $out/share/doc/wpa_supplicant/wpa_supplicant.conf.example ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zenpower/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zenpower/default.nix index 1ba01a1c88..7a4facebce 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zenpower/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zenpower/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, kernel, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, kernel, fetchFromGitea }: stdenv.mkDerivation rec { pname = "zenpower"; - version = "unstable-2022-04-13"; + version = "unstable-2022-11-04"; - src = fetchFromGitHub { - owner = "Ta180m"; + src = fetchFromGitea { + domain = "git.exozy.me"; + owner = "a"; repo = "zenpower3"; - rev = "c36a86c64b802e9b90b5166caee6a8e8eddaeb56"; - sha256 = "1i9ap7xgab421f3c68mcmad25xs4h8pfz0g0f9yzg7hxpmb0npxi"; + rev = "c176fdb0d5bcba6ba2aba99ea36812e40f47751f"; + sha256 = "sha256-d2WH8Zv7F0phZmEKcDiaak9On+Mo9bAFhMulT/N5FWI="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index af13f85602..f3fa6a1198 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_6_0 ? pkgs.linuxKernel.packages.linux_6_0 +, linuxPackages_6_1 ? pkgs.linuxKernel.packages.linux_6_1 }: let @@ -222,28 +222,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.1"; - latestCompatibleLinuxPackages = linuxPackages_6_0; + kernelCompatible = kernel.kernelOlder "6.2"; + latestCompatibleLinuxPackages = linuxPackages_6_1; # this package should point to the latest release. - version = "2.1.7"; + version = "2.1.9"; - sha256 = "sha256-vLm6RE11nqOCoYXne79JU3nUQnVEUNbwrULwFfghWcI="; + sha256 = "RT2ijcXhdw5rbz1niDjrqg6G/uOjyrJiTlS4qijiWqc="; }; zfsUnstable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelOlder "6.1"; - latestCompatibleLinuxPackages = linuxPackages_6_0; + kernelCompatible = kernel.kernelOlder "6.2"; + latestCompatibleLinuxPackages = linuxPackages_6_1; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the # zfs--staging branch, because this is tested by the OpenZFS # maintainers. - version = "2.1.8-staging-2023-01-10"; - rev = "0156253d29a303bdcca3e535958e754d8f086e33"; + version = "2.1.10-staging-2023-01-24"; + rev = "92e0d9d183ce6752cd52f7277c8321d81df9ffee"; - sha256 = "sha256-2+vymBesmNLB3fuaCwQOojEzn3aYqtxIo35MvlwOoNw="; + sha256 = "RT2ijcXhdw5rbz1niDjrqg6G/uOjyrJiTlS4qijiWqc="; isUnstable = true; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix b/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix index 08c9f223ef..c449e46a99 100644 --- a/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation { ''; doCheck = stdenv.hostPlatform.isLinux; - checkInputs = [ util-linux qemu ]; + nativeCheckInputs = [ util-linux qemu ]; checkPhase = '' runHook preCheck patchShebangs tests diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix index b7b75ca397..a54b5a23cd 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix @@ -1,23 +1,23 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-ViWbvpGU6mk9N8Nstn0urZrcd8JIPs9Ok9806+vUvy0="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-ZhezLVn4PHPAnKCjlR9zI4zt9eJZYIUUODjS01M7q1E="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-ixfeTi2Y44Om7RCKZOw3oJX+FiwTT+s7MSSqowyNKUU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-Vfu/mCR1rMBtYMsm/l5cfIwBnNNeJ7G0pC42rLdqWOk="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-EZzZ8Z6N+wctI/ncLjIAvFgQN1YWOnywhihxF+C6MOs="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-1pgGKUE9hHFGPNAOYNEM0VTYBDdmcrXyJjcT9ymyyiM="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-xU5PxscqBEGNCgA241UbhJcxlNXpCxbFeU7bfmSqf7I="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-ApCBjbhfoGYm0rmjQ8U1zA/VHNJgC1kBlk5DvmQ6wTc="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-ajhvvxYwttEaCQXL4WaDcjzk8g0krhIXJv5VHEEdfqg="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.21/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-qC7BrBhI9berbuIVIQ6yOo74eHRsoneVRJMx1K/Ljds="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_arm64.tar.gz"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix index 34bbe8655c..867ba69077 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.21"; + version = "0.107.23"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index dc47265ce4..e1ff2e14cf 100644 --- a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.11.6"; + version = "3.11.7"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-gwLr5oXviZdgNxUpEezqNT+0n6Blt6RlHMe4+OZjFDc="; + hash = "sha256-m1O/k/w9WLSRpKADo79DU+vf4z41l6nfJpIwpY1dGgA="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; diff --git a/third_party/nixpkgs/pkgs/servers/ankisyncd/default.nix b/third_party/nixpkgs/pkgs/servers/ankisyncd/default.nix index 598483575c..45a4366950 100644 --- a/third_party/nixpkgs/pkgs/servers/ankisyncd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ankisyncd/default.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec { --add-flags "$out/share/ankisyncctl.py" ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest webtest ]; diff --git a/third_party/nixpkgs/pkgs/servers/asterisk/default.nix b/third_party/nixpkgs/pkgs/servers/asterisk/default.nix index 36927f4f6d..3b345e994e 100644 --- a/third_party/nixpkgs/pkgs/servers/asterisk/default.nix +++ b/third_party/nixpkgs/pkgs/servers/asterisk/default.nix @@ -9,23 +9,23 @@ }: let - # remove when upgrading to pjsip >2.12.1 + # remove when upgrading to pjsip >2.13 pjsip_patches = [ - (fetchpatch { - name = "0150-CVE-2022-31031.patch"; - url = "https://github.com/pjsip/pjproject/commit/450baca94f475345542c6953832650c390889202.patch"; - sha256 = "sha256-30kHrmB51UIw4x/J6/CD+vPKf/gBYDCcFoUpwEWkDMY="; - }) - (fetchpatch { - name = "0151-CVE-2022-39244.patch"; - url = "https://github.com/pjsip/pjproject/commit/c4d34984ec92b3d5252a7d5cddd85a1d3a8001ae.patch"; - sha256 = "sha256-hTUMh6bYAizn6GF+sRV1vjKVxSf9pnI+eQdPOqsdJI4="; - }) (fetchpatch { name = "0152-CVE-2022-39269.patch"; url = "https://github.com/pjsip/pjproject/commit/d2acb9af4e27b5ba75d658690406cec9c274c5cc.patch"; sha256 = "sha256-bKE/MrRAqN1FqD2ubhxIOOf5MgvZluHHeVXPjbR12iQ="; }) + (fetchpatch { + name = "pjsip-2.12.1-CVE-2022-23537.patch"; + url = "https://raw.githubusercontent.com/NixOS/nixpkgs/ca2b44568eb0ffbd0b5a22eb70feb6dbdcda8e9c/pkgs/applications/networking/pjsip/1.12.1-CVE-2022-23537.patch"; + sha256 = "sha256-KNSnHt0/o1qJk4r2z5bxbYxKAa7WBtzGOhRXkru3VK4="; + }) + (fetchpatch { + name = "pjsip-2.12.1-CVE-2022-23547.patch"; + url = "https://raw.githubusercontent.com/NixOS/nixpkgs/ca2b44568eb0ffbd0b5a22eb70feb6dbdcda8e9c/pkgs/applications/networking/pjsip/1.12.1-CVE-2022-23547.patch"; + sha256 = "sha256-0iEr/Z4UQpWsTXYWVYzWWk7MQDOFnTQ1BBYpynGLTVQ="; + }) ]; common = {version, sha256, externals}: stdenv.mkDerivation { inherit version; diff --git a/third_party/nixpkgs/pkgs/servers/asterisk/versions.json b/third_party/nixpkgs/pkgs/servers/asterisk/versions.json index 7e6943a682..b1a6319a51 100644 --- a/third_party/nixpkgs/pkgs/servers/asterisk/versions.json +++ b/third_party/nixpkgs/pkgs/servers/asterisk/versions.json @@ -1,18 +1,18 @@ { "asterisk_16": { - "sha256": "406a91290e18d25a6fc23ae6b9c56b1fb2bd70216e336c74cf9c26b908c89c3d", - "version": "16.29.0" + "sha256": "f8448e8784df7fac019e459bf7c82529d80afe64ae97d73d40e6aa0e4fb39724", + "version": "16.30.0" }, "asterisk_18": { - "sha256": "a963dafeba0e7e1051a1ac56964999c111dbcdb25a47010bc1f772bf8edbed75", - "version": "18.15.0" + "sha256": "2d280794ae7505ed3dfc58b3190774cb491aa74c339fbde1a11740e6be79b466", + "version": "18.16.0" }, "asterisk_19": { - "sha256": "832a967c5a040b0768c0e8df1646762f7304019fcf7f2e065a8b4828fa4092b7", - "version": "19.7.0" + "sha256": "f0c56d1f8e39e0427455edfe25d24ff088c756bdc32dd1278c9f7a320815cbaa", + "version": "19.8.0" }, "asterisk_20": { - "sha256": "949022c20dc6da65b456e1b1b5b42a7901bb41fc9ce20920891739e7220d72eb", - "version": "20.0.0" + "sha256": "4364dc762652e2fd4d3e7dc8428c83550ebae090b8a0e9d4820583e081778883", + "version": "20.1.0" } } diff --git a/third_party/nixpkgs/pkgs/servers/baserow/default.nix b/third_party/nixpkgs/pkgs/servers/baserow/default.nix index a0470f0d27..b64592d989 100644 --- a/third_party/nixpkgs/pkgs/servers/baserow/default.nix +++ b/third_party/nixpkgs/pkgs/servers/baserow/default.nix @@ -103,7 +103,7 @@ with python.pkgs; buildPythonApplication rec { --prefix DJANGO_SETTINGS_MODULE : "baserow.config.settings.base" ''; - checkInputs = [ + nativeCheckInputs = [ baserow_premium boto3 freezegun diff --git a/third_party/nixpkgs/pkgs/servers/bird/default.nix b/third_party/nixpkgs/pkgs/servers/bird/default.nix index 03bbafce8d..467e3ffe70 100644 --- a/third_party/nixpkgs/pkgs/servers/bird/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bird/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bird"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz"; - hash = "sha256-YKe4O2e50InSp0WhH93RJGH2MavHtkW2wIWt+Qs/VdY="; + hash = "sha256-PsRiojfQbR9EVdbsAKQvCxaGBh/JiOXImoQdAd11O1M="; }; nativeBuildInputs = [ flex bison ]; diff --git a/third_party/nixpkgs/pkgs/servers/code-server/default.nix b/third_party/nixpkgs/pkgs/servers/code-server/default.nix index 44edf3be7a..05808d605d 100644 --- a/third_party/nixpkgs/pkgs/servers/code-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/code-server/default.nix @@ -11,12 +11,25 @@ let yarn' = yarn.override { inherit nodejs; }; defaultYarnOpts = [ ]; + esbuild' = esbuild.override { + buildGoModule = args: buildGoModule (args // rec { + version = "0.16.17"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + }; + # replaces esbuild's download script with a binary from nixpkgs patchEsbuild = path : version : '' mkdir -p ${path}/node_modules/esbuild/bin jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json - sed -i 's/${version}/${esbuild.version}/g' ${path}/node_modules/esbuild/lib/main.js - ln -s -f ${esbuild}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild + sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js + ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild ''; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix b/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix index 61c9d40c14..aa01d31571 100644 --- a/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix +++ b/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "confluent-platform"; - version = "7.2.1"; + version = "7.3.0"; src = fetchurl { url = "https://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}.tar.gz"; - sha256 = "sha256-vflWZjW8RwaDOwEFy8GHRfcmsHcRKxs8WwFfT66SIM4="; + sha256 = "sha256-j120gSIky0CHNgzaVnodMAniecRX0RpU6+il86nxdrQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix index dab2d0ba45..cc2fa4be27 100644 --- a/third_party/nixpkgs/pkgs/servers/consul/default.nix +++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.14.3"; + version = "1.14.4"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-zTsFLBd+7G+8HT8EGLSQaMhFfh/7s1tfu2gZtIMbkDs="; + sha256 = "sha256-aPJcb7nIjNIT5Bt/On+KFHHA2bNBO4y7HDFpsjhh8j0="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256-tekrveDmUq6qYafRMm7knxp9+FevaDbu4DZusO6KDtA="; + vendorHash = "sha256-g7Pi/wOjClwcuqeHQjhqBtnORArx1G4Znqvfl0bf3V4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/dendrite/default.nix b/third_party/nixpkgs/pkgs/servers/dendrite/default.nix index 519f3e8abb..6f459e7ad2 100644 --- a/third_party/nixpkgs/pkgs/servers/dendrite/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dendrite/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.10.8"; + version = "0.11.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - sha256 = "sha256-D+hZWcywOCynGxMlJtsr5YaGxwRVGODNYO8jZROsGX8="; + sha256 = "sha256-EJUHpV+ZsMMSMsJGhF0Atblksg5rgI3a2qcRxLyZP38="; }; - vendorSha256 = "sha256-mNvie0PP0758AndWQ629oY4/aFGwiG358NhwYHSdxEU="; + vendorHash = "sha256-Ygd5wC4j0kAbEMMVct5WXZvkcYSqqK8d7ZZ9CDU1RHU="; subPackages = [ # The server as a monolith: https://matrix-org.github.io/dendrite/installation/install/monolith @@ -34,7 +34,7 @@ buildGoModule rec { # "cmd/dendritejs-pinecone" ]; - checkInputs = [ + nativeCheckInputs = [ postgresqlTestHook postgresql ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix index 7a7a6de5da..9934a4710d 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.10"; + version = "9.18.11"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9BWpL+tiVotQhUoGPLIx4lc1H4ZyGG0KsDGkmz3iysY="; + sha256 = "sha256-j/M1KBIjDLy9pC34fK2WH5QWPT2kV8XkvvgFf9XfIVg="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; 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 addb4e2db5..aee5768930 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-resolver/default.nix @@ -3,7 +3,7 @@ , runCommand, pkg-config, meson, ninja, makeWrapper # build+runtime deps. , knot-dns, luajitPackages, libuv, gnutls, lmdb -, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle +, jemalloc, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle # test-only deps. , cmocka, which, cacert , extraFeatures ? false /* catch-all if defaults aren't enough */ @@ -17,11 +17,11 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.5.3"; + version = "5.6.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "a38f57c68b7d237d662784d8406e6098aad66a148f44dcf498d1e9664c5fed2d"; + sha256 = "0c82ae937b685dc477fb3176098e3dc106c898b7cd83553e5bc54dccb83c80d7"; }; outputs = [ "out" "dev" ]; @@ -63,7 +63,7 @@ unwrapped = stdenv.mkDerivation rec { # http://knot-resolver.readthedocs.io/en/latest/build.html#requirements buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ] ++ optionals stdenv.isLinux [ /*lib*/systemd libcap_ng ] - ++ [ nghttp2 ] + ++ [ jemalloc nghttp2 ] ## optional dependencies; TODO: dnstap ; @@ -71,6 +71,7 @@ unwrapped = stdenv.mkDerivation rec { "-Dkeyfile_default=${dns-root-data}/root.ds" "-Droot_hints=${dns-root-data}/root.hints" "-Dinstall_kresd_conf=disabled" # not really useful; examples are inside share/doc/ + "-Dmalloc=jemalloc" "--default-library=static" # not used by anyone ] ++ optional doInstallCheck "-Dunit_tests=enabled" @@ -87,7 +88,7 @@ unwrapped = stdenv.mkDerivation rec { ''; doInstallCheck = with stdenv; hostPlatform == buildPlatform; - installCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ]; + nativeInstallCheckInputs = [ cmocka which cacert lua.cqueues lua.basexx lua.http ]; installCheckPhase = '' meson test --print-errorlogs ''; diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix index 566f2ab015..a41581d934 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.8.0"; + version = "4.8.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "zLkBehp4jpXpSOeyQO+NtTropQe5FfJgGI7zQ/f2i9w="; + sha256 = "17A0RwCSV+US8B/MRsvbnIWbZyocmyP684LocHZbDw0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/pdns/default.nix index a4bcd8744e..72e1bfaf46 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/pdns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/pdns/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, nixosTests -, boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd +, boost, yaml-cpp, libsodium, sqlite, protobuf, openssl, systemd , mariadb-connector-c, postgresql, lua, openldap, geoip, curl, unixODBC, lmdb, tinycdb }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ boost mariadb-connector-c postgresql lua openldap sqlite protobuf geoip - libyamlcpp libsodium curl unixODBC openssl systemd lmdb tinycdb + yaml-cpp libsodium curl unixODBC openssl systemd lmdb tinycdb ]; # Configure phase requires 64-bit time_t even on 32-bit platforms. diff --git a/third_party/nixpkgs/pkgs/servers/dns/trust-dns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/trust-dns/default.nix new file mode 100644 index 0000000000..de21bdf252 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/dns/trust-dns/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, openssl +, pkg-config +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "trust-dns"; + version = "0.22.0"; + + src = fetchFromGitHub { + owner = "bluejekyll"; + repo = "trust-dns"; + rev = "v${version}"; + sha256 = "sha256-b9tK1JbTwB3ZuRPh0wb3cOFj9dMW7URXIaFzUq0Yipw="; + }; + cargoHash = "sha256-mpobdeTRWJzIEmhwtcM6UE66qRD5ot/0yLeQM6Tec+0="; + + buildInputs = [ openssl ]; + nativeBuildInputs = [ pkg-config ]; + + # tests expect internet connectivity to query real nameservers like 8.8.8.8 + doCheck = false; + + meta = with lib; { + description = "A Rust based DNS client, server, and resolver"; + homepage = "https://trust-dns.org/"; + maintainers = with maintainers; [ colinsane ]; + platforms = platforms.linux; + license = with licenses; [ asl20 mit ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix b/third_party/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix index 8fa65600e9..cdef822ee7 100644 --- a/third_party/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/elasticmq-server-bin/default.nix @@ -3,11 +3,11 @@ let elasticmq-server = stdenv.mkDerivation rec { pname = "elasticmq-server"; - version = "1.3.9"; + version = "1.3.14"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${pname}-${version}.jar"; - sha256 = "sha256-+l7QX/2HrcPuAJ3kHPAKx1yWtF5mkODzoFjYIPxc6oU="; + sha256 = "sha256-diTfRYV51d9QYx1E6ZbSSaM6qDIaqVPum9qsBagIcec="; }; # don't do anything? diff --git a/third_party/nixpkgs/pkgs/servers/eris-go/default.nix b/third_party/nixpkgs/pkgs/servers/eris-go/default.nix index 554aecfacb..3dbc3994e6 100644 --- a/third_party/nixpkgs/pkgs/servers/eris-go/default.nix +++ b/third_party/nixpkgs/pkgs/servers/eris-go/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "eris-go"; - version = "20230114"; + version = "20230123"; src = fetchFromGitea { domain = "codeberg.org"; owner = "eris"; repo = pname; rev = version; - hash = "sha256-cJvSIeS9fKUJP5p7ZTH7Wi+UcBXeCS32Twhv6jBT+9Q="; + hash = "sha256-jdeh5lhbu2hxVNdnU0GiMsdXRi8004Xgu2/tgFhqPao="; }; - vendorHash = "sha256-DDV7LUnGnf24qQ2I9I4MDUx87s1+yDhisVz/Jw4XU6k="; + vendorHash = "sha256-mLyPaX5rDw0rR4PXtzpLMOrsYwTH3Y+COcrvwH7/qdo="; postInstall = "ln -s $out/bin/eris-get $out/bin/eris-put"; # eris-get is a multicall binary diff --git a/third_party/nixpkgs/pkgs/servers/frr/default.nix b/third_party/nixpkgs/pkgs/servers/frr/default.nix index 06f8c914ca..efba7962a5 100644 --- a/third_party/nixpkgs/pkgs/servers/frr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/frr/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ nettools python3.pkgs.pytest ]; diff --git a/third_party/nixpkgs/pkgs/servers/gemini/gmnisrv/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/gmnisrv/default.nix index 81e1c17467..d37a7247ec 100644 --- a/third_party/nixpkgs/pkgs/servers/gemini/gmnisrv/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gemini/gmnisrv/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-V9HXXYQIo3zeqZjJEn+dhemNg6AU+ee3FRmBmXgLuYQ="; }; + NIX_CFLAGS_COMPILE = [ + "-Wno-error=deprecated-declarations" + ]; + postPatch = '' substituteInPlace config.sh \ --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config" diff --git a/third_party/nixpkgs/pkgs/servers/gerbera/default.nix b/third_party/nixpkgs/pkgs/servers/gerbera/default.nix index 5f6c8797b0..b62237866b 100644 --- a/third_party/nixpkgs/pkgs/servers/gerbera/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gerbera/default.nix @@ -65,13 +65,13 @@ let in stdenv.mkDerivation rec { pname = "gerbera"; - version = "1.11.0"; + version = "1.12.1"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; rev = "v${version}"; - sha256 = "sha256-pikzgbm962C7yFM67Z/LayLf4mpLV4HfqZJlBfebL8U="; + sha256 = "sha256-j5J0u0zIjHY2kP5P8IzN2h+QQSCwsel/iTspad6V48s="; }; postPatch = lib.optionalString enableMysql '' diff --git a/third_party/nixpkgs/pkgs/servers/gopher/gofish/default.nix b/third_party/nixpkgs/pkgs/servers/gopher/gofish/default.nix index db3bcb47ec..d346c13729 100644 --- a/third_party/nixpkgs/pkgs/servers/gopher/gofish/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gopher/gofish/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A lightweight Gopher server"; - homepage = "http://gofish.sourceforge.net/"; + homepage = "https://gofish.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/servers/haste-server/default.nix b/third_party/nixpkgs/pkgs/servers/haste-server/default.nix index de1747ac28..cc445312e6 100644 --- a/third_party/nixpkgs/pkgs/servers/haste-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/haste-server/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "haste-server"; - version = "20919c946602b8151157f647e475e30687a43727"; + version = "ccc5049b07e9f90ec19fc2a88e5056367c53e202"; src = fetchFromGitHub { owner = "toptal"; repo = "haste-server"; rev = version; - hash = "sha256-IPGsddPRu4/jT1NsUNOwUjSL3+ikGzMR3X3ohY66uAk="; + hash = "sha256-ODFHB2QwfLPxfjFsHrblSeiqLc9nPo7EOPGQ3AoqzSQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/haste-server/node-deps.nix b/third_party/nixpkgs/pkgs/servers/haste-server/node-deps.nix index 863f58ef2d..36a5d6fd39 100644 --- a/third_party/nixpkgs/pkgs/servers/haste-server/node-deps.nix +++ b/third_party/nixpkgs/pkgs/servers/haste-server/node-deps.nix @@ -49,13 +49,13 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; - "anymatch-3.1.2" = { + "anymatch-3.1.3" = { name = "anymatch"; packageName = "anymatch"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"; - sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"; + sha512 = "KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw=="; }; }; "argparse-2.0.1" = { @@ -67,13 +67,13 @@ let sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; }; }; - "async-3.2.4" = { + "async-2.6.4" = { name = "async"; packageName = "async"; - version = "3.2.4"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz"; - sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; + url = "https://registry.npmjs.org/async/-/async-2.6.4.tgz"; + sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; }; }; "async-cache-1.1.0" = { @@ -670,6 +670,15 @@ let 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=="; + }; + }; "log-symbols-4.0.0" = { name = "log-symbols"; packageName = "log-symbols"; @@ -1237,13 +1246,13 @@ let sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; }; }; - "winston-2.4.6" = { + "winston-2.4.7" = { name = "winston"; packageName = "winston"; - version = "2.4.6"; + version = "2.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.4.6.tgz"; - sha512 = "J5Zu4p0tojLde8mIOyDSsmLmcP8I3Z6wtwpTDHx1+hGcdhxcJaAmG4CFtagkb+NiN1M9Ek4b42pzMWqfc9jm8w=="; + url = "https://registry.npmjs.org/winston/-/winston-2.4.7.tgz"; + sha512 = "vLB4BqzCKDnnZH9PHGoS2ycawueX4HLqENXQitvFHczhgW2vFpSOn31LZtVr1KU8YTw7DS4tM+cqyovxo8taVg=="; }; }; "workerpool-6.1.0" = { @@ -1341,15 +1350,15 @@ let name = "haste"; packageName = "haste"; version = "0.1.0"; - src = ../../../../../../../../../nix/store/ksl6h7h03ks119z1skfipjh4irc8x80c-source; + src = ../../../../../../../../../nix/store/zmi5rwpy1kmyj52ymv3yc8ziiypjgrxd-source; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" sources."ansi-colors-4.1.1" sources."ansi-regex-3.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" + sources."anymatch-3.1.3" sources."argparse-2.0.1" - sources."async-3.2.4" + sources."async-2.6.4" sources."async-cache-1.1.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -1430,6 +1439,7 @@ let sources."isstream-0.1.2" sources."js-yaml-4.0.0" sources."locate-path-6.0.0" + sources."lodash-4.17.21" sources."log-symbols-4.0.0" sources."lru-cache-4.1.5" sources."mime-2.6.0" @@ -1495,7 +1505,7 @@ let sources."utils-merge-1.0.1" sources."which-2.0.2" sources."wide-align-1.1.3" - sources."winston-2.4.6" + sources."winston-2.4.7" sources."workerpool-6.1.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ diff --git a/third_party/nixpkgs/pkgs/servers/headphones/default.nix b/third_party/nixpkgs/pkgs/servers/headphones/default.nix index 9ebf04b80b..b3a01cd2f6 100644 --- a/third_party/nixpkgs/pkgs/servers/headphones/default.nix +++ b/third_party/nixpkgs/pkgs/servers/headphones/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "headphones"; - version = "0.6.0-beta.5"; + version = "0.6.0"; format = "other"; src = fetchFromGitHub { owner = "rembo10"; repo = "headphones"; rev = "v${version}"; - sha256 = "1ddqk5ch1dlh895cm99li4gb4a596mvq3d0gah9vrbn6fyhp3b4v"; + sha256 = "0wx0kj9brcd4i9fdc4hmp39cgr27qybya6bp108cfgfv9x7150iw"; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/headscale/default.nix b/third_party/nixpkgs/pkgs/servers/headscale/default.nix index b84632746c..c8a4b99d58 100644 --- a/third_party/nixpkgs/pkgs/servers/headscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/headscale/default.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "headscale"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - hash = "sha256-0viXsBRCiaxBTTKXJngSov5M7toscQUOdXDTr1l0U3I="; + hash = "sha256-/KT3JZ/xYcKRynksWgsPsioCLTSxeQxr6WjRUzYXJcU="; }; - vendorHash = "sha256-SuKT+b8g6xEK15ry2IAmpS/vwDG+zJqK9nfsWpHNXuU="; + vendorHash = "sha256-8p5NFxXKaZPsW4B6NMzfi0pqfVroIahSgA0fukvB3JI="; ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"]; diff --git a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix b/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix index c38a8ee80f..1371bac15d 100644 --- a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix @@ -4,17 +4,18 @@ let python = python3.override { packageOverrides = self: super: { mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { - version = "0.16.3"; - src = oldAttrs.src.override { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-OpHLh5pCzGooQ5yxAa0+85m/szAafV+l+OfipQcfLtU="; + version = "0.16.10"; + src = fetchFromGitHub { + owner = "mautrix"; + repo = "python"; + rev = "v${version}"; + hash = "sha256-YQsQ7M+mHcRdGUZp+mo46AlBmKSdmlgRdGieEG0Hu9k="; }; }); }; }; - -in python.pkgs.buildPythonApplication rec { +in +python.pkgs.buildPythonApplication rec { pname = "heisenbridge"; version = "1.13.1"; @@ -30,14 +31,13 @@ in python.pkgs.buildPythonApplication rec { ''; propagatedBuildInputs = with python.pkgs; [ - aiohttp irc + ruamel-yaml mautrix python-socks - pyyaml ]; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/cli.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/cli.nix index e5ce6d9744..32f17178fb 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/cli.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/cli.nix @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { # $out/bin/hass-cli completion zsh > "$out/share/zsh/site-functions/_hass-cli" #''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook requests-mock ]; 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 cb7490c78f..1d1e2a94ae 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,12 +2,12 @@ # Do not edit! { - version = "2023.1.5"; + version = "2023.2.0"; components = { "3_day_blinds" = ps: with ps; [ ]; "abode" = ps: with ps; [ - abodepy + jaraco-abode ]; "accuweather" = ps: with ps; [ accuweather @@ -57,7 +57,10 @@ airthings-cloud ]; "airthings_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly airthings-ble bleak-retry-connector bleak @@ -65,13 +68,16 @@ bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "airtouch4" = ps: with ps; [ airtouch4pyapi @@ -99,10 +105,6 @@ pyturbojpeg aiohttp-cors ]; - "almond" = ps: with ps; [ - aiohttp-cors - pyalmond - ]; "alpha_vantage" = ps: with ps; [ alpha-vantage ]; @@ -148,6 +150,8 @@ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ ]; # missing inputs: anthemav + "anwb_energie" = ps: with ps; [ + ]; "apache_kafka" = ps: with ps; [ aiokafka ]; @@ -183,7 +187,10 @@ "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc "aranet" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly aranet4 bleak-retry-connector bleak @@ -191,13 +198,16 @@ bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "arcam_fmj" = ps: with ps; [ arcam-fmj @@ -332,7 +342,10 @@ "bloomsky" = ps: with ps; [ ]; "bluemaestro" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluemaestro-ble @@ -340,13 +353,16 @@ bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "blueprint" = ps: with ps; [ ]; @@ -369,21 +385,49 @@ pyudev sqlalchemy ]; - "bluetooth_le_tracker" = ps: with ps; [ + "bluetooth_adapters" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf + ]; + "bluetooth_le_tracker" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnvhash + home-assistant-frontend + ifaddr + janus + pillow + pyserial + pyudev + sqlalchemy + zeroconf ]; "bluetooth_tracker" = ps: with ps; [ bt-proximity @@ -435,7 +479,10 @@ btsmarthub_devicelist ]; "bthome" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters @@ -443,13 +490,16 @@ bluetooth-data-tools bthome-ble dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "bticino" = ps: with ps; [ ]; @@ -557,6 +607,8 @@ ]; "conversation" = ps: with ps; [ aiohttp-cors + hassil + home-assistant-intents ]; "coolmaster" = ps: with ps; [ pycoolmasternet-async @@ -631,7 +683,9 @@ dbus-fast fnvhash hass-nabucasa + hassil home-assistant-frontend + home-assistant-intents ifaddr janus pillow @@ -650,8 +704,8 @@ ]; "demo" = ps: with ps; [ aiohttp-cors - fnvhash - sqlalchemy + hassil + home-assistant-intents ]; "denon" = ps: with ps; [ ]; @@ -871,11 +925,15 @@ ifaddr sqlalchemy ]; + "energie_vanons" = ps: with ps; [ + ]; "energy" = ps: with ps; [ aiohttp-cors fnvhash sqlalchemy ]; + "energyzero" = ps: with ps; [ + ]; # missing inputs: energyzero "enigma2" = ps: with ps; [ openwebifpy ]; @@ -903,7 +961,10 @@ "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter "eq3btsmart" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters @@ -911,13 +972,16 @@ bluetooth-data-tools construct dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; # missing inputs: python-eq3bt "escea" = ps: with ps; [ pescea @@ -931,6 +995,7 @@ bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend ifaddr @@ -945,6 +1010,28 @@ ]; # missing inputs: python-etherscan-api "eufy" = ps: with ps; [ ]; # missing inputs: lakeside + "eufylife_ble" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnvhash + home-assistant-frontend + ifaddr + janus + pillow + pyserial + pyudev + sqlalchemy + zeroconf + ]; # missing inputs: eufylife_ble_client "everlights" = ps: with ps; [ pyeverlights ]; @@ -1008,6 +1095,8 @@ "fints" = ps: with ps; [ fints ]; + "fire_tv" = ps: with ps; [ + ]; "fireservicerota" = ps: with ps; [ pyfireservicerota ]; @@ -1025,21 +1114,27 @@ fixerio ]; "fjaraskupan" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fjaraskupan fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "fleetgo" = ps: with ps; [ ritassist @@ -1233,13 +1328,20 @@ "google_assistant_sdk" = ps: with ps; [ aiohttp-cors fnvhash + gassist-text sqlalchemy - ]; # missing inputs: gassist-text + ]; "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; "google_domains" = ps: with ps; [ ]; + "google_mail" = ps: with ps; [ + aiohttp-cors + fnvhash + google-api-python-client + sqlalchemy + ]; "google_maps" = ps: with ps; [ locationsharinglib ]; @@ -1261,21 +1363,27 @@ "google_wifi" = ps: with ps; [ ]; "govee_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash govee-ble home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "gpsd" = ps: with ps; [ gps3 @@ -1477,14 +1585,18 @@ zeroconf ]; "homekit_controller" = ps: with ps; [ + aioesphomeapi aiohomekit aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend ifaddr @@ -1508,7 +1620,7 @@ pyhomeworks ]; "honeywell" = ps: with ps; [ - somecomfort + aiosomecomfort ]; "horizon" = ps: with ps; [ ]; # missing inputs: horimote @@ -1559,21 +1671,27 @@ iaqualink ]; "ibeacon" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend ibeacon-ble + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "icloud" = ps: with ps; [ pyicloud @@ -1601,6 +1719,7 @@ pillow ]; "imap" = ps: with ps; [ + aiohttp-cors aioimaplib ]; "imap_email_content" = ps: with ps; [ @@ -1613,21 +1732,27 @@ influxdb ]; "inkbird" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr inkbird-ble janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "input_boolean" = ps: with ps; [ ]; @@ -1740,21 +1865,27 @@ getmac ]; "kegtron" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus kegtron-ble pillow pyserial pyudev sqlalchemy + zeroconf ]; "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput @@ -1764,24 +1895,34 @@ ]; "keymitt_ble" = ps: with ps; [ pymicrobot + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "kira" = ps: with ps; [ pykira ]; + "kitchen_sink" = ps: with ps; [ + fnvhash + sqlalchemy + ]; "kiwi" = ps: with ps; [ kiwiki-client ]; @@ -1800,7 +1941,8 @@ konnected ]; "kostal_plenticore" = ps: with ps; [ - ]; # missing inputs: kostal_plenticore + pykoplenti + ]; "kraken" = ps: with ps; [ krakenex pykrakenapi @@ -1844,22 +1986,50 @@ "lcn" = ps: with ps; [ pypck ]; - "led_ble" = ps: with ps; [ + "ld2410_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr + janus + pillow + pyserial + pyudev + sqlalchemy + zeroconf + ]; # missing inputs: ld2410-ble + "led_ble" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnvhash + home-assistant-frontend + ifaddr janus led-ble pillow pyserial pyudev sqlalchemy + zeroconf ]; "legrand" = ps: with ps; [ ]; @@ -2051,20 +2221,26 @@ "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate "melnor" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; # missing inputs: melnor-bluetooth "meraki" = ps: with ps; [ aiohttp-cors @@ -2108,6 +2284,8 @@ ]; "miflora" = ps: with ps; [ ]; + "mijndomein_energie" = ps: with ps; [ + ]; "mikrotik" = ps: with ps; [ librouteros ]; @@ -2130,21 +2308,27 @@ "mjpeg" = ps: with ps; [ ]; "moat" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus moat-ble pillow pyserial pyudev sqlalchemy + zeroconf ]; "mobile_app" = ps: with ps; [ pynacl @@ -2152,6 +2336,8 @@ aiohttp-cors fnvhash hass-nabucasa + hassil + home-assistant-intents pillow sqlalchemy ]; @@ -2179,6 +2365,28 @@ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; + "mopeka" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnvhash + home-assistant-frontend + ifaddr + janus + pillow + pyserial + pyudev + sqlalchemy + zeroconf + ]; # missing inputs: mopeka_iot_ble "motion_blinds" = ps: with ps; [ aiohttp-cors fnvhash @@ -2456,9 +2664,13 @@ "open_meteo" = ps: with ps; [ open-meteo ]; - "openalpr_cloud" = ps: with ps; [ + "openai_conversation" = ps: with ps; [ + aiohttp-cors + hassil + home-assistant-intents + openai ]; - "openalpr_local" = ps: with ps; [ + "openalpr_cloud" = ps: with ps; [ ]; "opencv" = ps: with ps; [ numpy @@ -2501,21 +2713,27 @@ pyoppleio ]; "oralb" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus oralb-ble pillow pyserial pyudev sqlalchemy + zeroconf ]; "oru" = ps: with ps; [ ]; # missing inputs: oru @@ -2524,6 +2742,14 @@ ]; "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify + "otbr" = ps: with ps; [ + aiohttp-cors + fnvhash + home-assistant-frontend + janus + pillow + sqlalchemy + ]; # missing inputs: python-otbr-api "otp" = ps: with ps; [ pyotp ]; @@ -2702,21 +2928,27 @@ "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent "qingping" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev qingping-ble sqlalchemy + zeroconf ]; "qld_bushfire" = ps: with ps; [ georss-qld-bushfire-alert-client @@ -2812,6 +3044,7 @@ renault-api ]; "reolink" = ps: with ps; [ + aiohttp-cors reolink-aio ]; "repairs" = ps: with ps; [ @@ -2895,8 +3128,9 @@ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound - "ruuvitag_ble" = ps: with ps; [ + "ruuvi_gateway" = ps: with ps; [ aiohttp-cors + aioruuvigateway bleak-retry-connector bleak bluetooth-adapters @@ -2909,9 +3143,33 @@ pillow pyserial pyudev - ruuvitag-ble sqlalchemy ]; + "ruuvitag_ble" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnvhash + home-assistant-frontend + ifaddr + janus + pillow + pyserial + pyudev + ruuvitag-ble + sqlalchemy + zeroconf + ]; + "rympro" = ps: with ps; [ + ]; # missing inputs: pyrympro "sabnzbd" = ps: with ps; [ pysabnzbd ]; @@ -2989,20 +3247,26 @@ pysensibo ]; "sensirion_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; # missing inputs: sensirion-ble "sensor" = ps: with ps; [ fnvhash @@ -3011,38 +3275,50 @@ "sensorblue" = ps: with ps; [ ]; "sensorpro" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sensorpro-ble sqlalchemy + zeroconf ]; "sensorpush" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sensorpush-ble sqlalchemy + zeroconf ]; "sentry" = ps: with ps; [ sentry-sdk @@ -3067,6 +3343,9 @@ "seventeentrack" = ps: with ps; [ py17track ]; + "sfr_box" = ps: with ps; [ + sfrbox-api + ]; "sharkiq" = ps: with ps; [ sharkiq ]; @@ -3198,21 +3477,27 @@ pysnmplib ]; "snooz" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pysnooz pyudev sqlalchemy + zeroconf ]; "solaredge" = ps: with ps; [ solaredge @@ -3301,6 +3586,8 @@ ]; "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank + "starlink" = ps: with ps; [ + ]; # missing inputs: starlink-grpc-core "startca" = ps: with ps; [ xmltodict ]; @@ -3328,6 +3615,8 @@ "stookalert" = ps: with ps; [ stookalert ]; + "stookwijzer" = ps: with ps; [ + ]; # missing inputs: stookwijzer "stream" = ps: with ps; [ pyturbojpeg aiohttp-cors @@ -3371,20 +3660,26 @@ ]; "switchbot" = ps: with ps; [ pyswitchbot + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy + zeroconf ]; "switcher_kis" = ps: with ps; [ aioswitcher @@ -3490,40 +3785,52 @@ "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac "thermobeacon" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy thermobeacon-ble + zeroconf ]; "thermoplus" = ps: with ps; [ ]; "thermopro" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy thermopro-ble + zeroconf ]; "thermoworks_smoke" = ps: with ps; [ stringcase @@ -3536,6 +3843,8 @@ ]; # missing inputs: pythinkingcleaner "thomson" = ps: with ps; [ ]; + "thread" = ps: with ps; [ + ]; "threshold" = ps: with ps; [ ]; "tibber" = ps: with ps; [ @@ -3549,21 +3858,27 @@ pytile ]; "tilt_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy tilt-ble + zeroconf ]; "time_date" = ps: with ps; [ ]; @@ -3575,7 +3890,7 @@ "tod" = ps: with ps; [ ]; "todoist" = ps: with ps; [ - todoist + todoist-api-python ]; "tolo" = ps: with ps; [ tololib @@ -3936,21 +4251,27 @@ zeroconf ]; "xiaomi_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy xiaomi-ble + zeroconf ]; "xiaomi_miio" = ps: with ps; [ construct @@ -3969,21 +4290,27 @@ yalesmartalarmclient ]; "yalexs_ble" = ps: with ps; [ + aioesphomeapi aiohttp-cors + aioruuvigateway + aioshelly bleak-retry-connector bleak bluetooth-adapters bluetooth-auto-recovery bluetooth-data-tools dbus-fast + esphome-dashboard-api fnvhash home-assistant-frontend + ifaddr janus pillow pyserial pyudev sqlalchemy yalexs-ble + zeroconf ]; "yamaha" = ps: with ps; [ rxv @@ -4048,6 +4375,8 @@ "zestimate" = ps: with ps; [ xmltodict ]; + "zeversolar" = ps: with ps; [ + ]; # missing inputs: zeversolar "zha" = ps: with ps; [ aiohttp-cors bellows @@ -4122,7 +4451,6 @@ "alarmdecoder" "alert" "alexa" - "almond" "amberelectric" "ambiclimate" "ambient_station" @@ -4162,6 +4490,7 @@ "bluemaestro" "blueprint" "bluetooth" + "bluetooth_adapters" "bluetooth_le_tracker" "bmw_connected_drive" "bond" @@ -4312,7 +4641,9 @@ "goodwe" "google" "google_assistant" + "google_assistant_sdk" "google_domains" + "google_mail" "google_pubsub" "google_sheets" "google_translate" @@ -4370,6 +4701,7 @@ "ign_sismologia" "image_processing" "image_upload" + "imap" "imap_email_content" "influxdb" "inkbird" @@ -4401,10 +4733,12 @@ "kegtron" "keymitt_ble" "kira" + "kitchen_sink" "kmtronic" "knx" "kodi" "konnected" + "kostal_plenticore" "kraken" "kulersky" "lametric" @@ -4517,6 +4851,7 @@ "onewire" "onvif" "open_meteo" + "openai_conversation" "openalpr_cloud" "openerz" "openexchangerates" @@ -4598,6 +4933,7 @@ "rss_feed_template" "rtsp_to_webrtc" "ruckus_unleashed" + "ruuvi_gateway" "ruuvitag_ble" "sabnzbd" "safe_mode" @@ -4619,6 +4955,7 @@ "sentry" "senz" "seventeentrack" + "sfr_box" "sharkiq" "shell_command" "shelly" @@ -4699,6 +5036,7 @@ "text" "thermobeacon" "thermopro" + "thread" "threshold" "tibber" "tile" diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index f1380c801d..83607eb7f9 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -78,22 +78,6 @@ let ]; }); - caldav = super.caldav.overridePythonAttrs (old: rec { - version = "0.9.1"; - src = fetchFromGitHub { - owner = "python-caldav"; - repo = "caldav"; - rev = "v${version}"; - hash = "sha256-Gil0v4pGyp5+TnYPjb8Vk0xTqnQKaeD8Ko/ZWhvkbUk="; - }; - postPatch = '' - substituteInPlace setup.py \ - --replace ", 'xandikos<0.2.4'" "" \ - --replace ", 'radicale'" "" - ''; - checkInputs = old.checkInputs ++ [ self.nose ]; - }); - dsmr-parser = super.dsmr-parser.overridePythonAttrs (oldAttrs: rec { version = "0.33"; src = fetchFromGitHub { @@ -114,15 +98,6 @@ let }; }); - icalendar = super.icalendar.overridePythonAttrs (oldAttrs: rec { - version = "4.1.0"; - src = self.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-l0i3wC78xD5Y0GFa4JdqxPJl6Q2t7ptPiE3imQXBs5U="; - }; - }); - # Pinned due to API changes in 10.0 mcstatus = super.mcstatus.overridePythonAttrs (oldAttrs: rec { version = "9.3.0"; @@ -176,27 +151,6 @@ let }; }); - pymodbus = super.pymodbus.overridePythonAttrs (oldAttrs: rec { - version = "2.5.3"; - src = fetchFromGitHub { - owner = "riptideio"; - repo = "pymodbus"; - rev= "refs/tags/v${version}"; - hash = "sha256-pf1TU/imBqNVYdG4XX8fnma8O8kQHuOHu6DT3E/PUk4="; - }; - }); - - # Pinned due to API changes in 1.0.24 - pysensibo = super.pysensibo.overridePythonAttrs (oldAttrs: rec { - version = "1.0.22"; - src = fetchFromGitHub { - owner = "andrey-git"; - repo = "pysensibo"; - rev = "refs/tags/${version}"; - hash = "sha256-AUcdKcdoYCg8OgUcFoLLpNK5GQMTg89XCR5CkTfNkcc="; - }; - }); - python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -206,6 +160,16 @@ let }; }); + pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { + version = "9.0.1"; + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = "pytradfri"; + rev = "refs/tags/${version}"; + hash = "sha256-xOdTzG0bF5p1QpkXv2btwrVugQRjSwdAj8bXcC0IoQg="; + }; + }); + python-telegram-bot = super.python-telegram-bot.overridePythonAttrs (oldAttrs: rec { version = "13.15"; src = fetchFromGitHub { @@ -235,25 +199,6 @@ let doCheck = false; }); - pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { - version = "9.0.0"; - src = fetchFromGitHub { - owner = "home-assistant-libs"; - repo = "pytradfri"; - rev = "refs/tags/${version}"; - hash = "sha256-12ol+2CnoPfkxmDGJJAkoafHGpQuWC4lh0N7lSvx2DE="; - }; - }); - - pysoma = super.pysoma.overridePythonAttrs (oldAttrs: rec { - version = "0.0.10"; - src = super.fetchPypi { - pname = "pysoma"; - inherit version; - hash = "sha256-sU1qHbAjdIUu0etjate8+U1zvunbw3ddBtDVUU10CuE="; - }; - }); - # Pinned due to API changes in 0.3.0 tailscale = super.tailscale.overridePythonAttrs (oldAttrs: rec { version = "0.2.0"; @@ -297,8 +242,9 @@ let }; }); - # home-assistant-frontend does not exist in python3.pkgs + # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; + home-assistant-intents = self.callPackage ./intents.nix { }; }) ]; @@ -325,7 +271,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.1.5"; + hassVersion = "2023.2.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -333,7 +279,7 @@ in python.pkgs.buildPythonApplication rec { format = "pyproject"; # check REQUIRED_PYTHON_VER in homeassistant/const.py - disabled = python.pythonOlder "3.9"; + disabled = python.pythonOlder "3.10"; # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; @@ -343,7 +289,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-gqWkj90Vw+Pne0Iseet1Jz0Eh3YpUiqspGltvU5Pxro="; + hash = "sha256-tW1tVPJ50DIGIuxJP9nq4+Tw4fiPA+kINSclW7JkJmE="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -367,6 +313,7 @@ in python.pkgs.buildPythonApplication rec { "ifaddr" "orjson" "PyJWT" + "pyOpenSSL" "requests" "typing-extensions" "yarl" @@ -417,7 +364,7 @@ in python.pkgs.buildPythonApplication rec { # upstream only tests on Linux, so do we. doCheck = stdenv.isLinux; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ # test infrastructure (selectively from requirement_test.txt) freezegun pytest-asyncio @@ -496,6 +443,7 @@ in python.pkgs.buildPythonApplication rec { getPackages python supportedComponentsWithTests; + intents = python.pkgs.home-assistant-intents; tests = { nixos = nixosTests.home-assistant; components = callPackage ./tests.nix { }; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 5be1d96b4c..59661f357f 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230110.0"; + version = "20230201.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-axtDtkIsTFWV8qtVvpYL4aDE5jbTdX4Qo5V+9taWuNo="; + hash = "sha256-CG4I3YI1swiAV02+NXvi9n87dXrTJFlMUcOnB9ebmWk="; }; # there is nothing to strip in this package diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/intents.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/intents.nix new file mode 100644 index 0000000000..7d46432f3a --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/intents.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools + +# build +, hassil +, jinja2 +, pyyaml +, regex +, voluptuous +, python + +# tests +, pytest-xdist +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "home-assistant-intents"; + version = "2023.1.31"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "home-assistant"; + repo = "intents"; + rev = "refs/tags/${version}"; + hash = "sha256-buq/SLXDFP0xvIb2yGiHQzuL7HKvc7bxxdkhq4KHpvM="; + }; + + sourceRoot = "source/package"; + + nativeBuildInputs = [ + hassil + jinja2 + pyyaml + regex + setuptools + voluptuous + ]; + + postInstall = '' + pushd .. + # https://github.com/home-assistant/intents/blob/main/script/package#L18 + ${python.interpreter} -m script.intentfest merged_output $out/${python.sitePackages}/home_assistant_intents/data + popd + ''; + + checkInputs = [ + pytest-xdist + pytestCheckHook + ]; + + pytestFlagsArray = [ + "../tests" + ]; + + meta = with lib; { + description = "Intents to be used with Home Assistant"; + homepage = "https://github.com/home-assistant/intents"; + license = licenses.cc-by-40; + maintainers = teams.home-assistant.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix index 9b8c044320..75b63ec99a 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/tests.nix @@ -34,11 +34,6 @@ let }; extraDisabledTestPaths = { - tado = [ - # tado/test_{climate,water_heater}.py: Tries to connect to my.tado.com - "tests/components/tado/test_climate.py" - "tests/components/tado/test_water_heater.py" - ]; }; extraDisabledTests = { @@ -46,21 +41,9 @@ let # homeassistant.components.roku.media_player:media_player.py:428 Media type music is not supported with format None (mime: audio/x-matroska) "test_services_play_media_audio" ]; - rfxtrx = [ - # bytearrray mismatch - "test_rfy_cover" - ]; - zha = [ - # 'manual_pick_radio_type' == 'choose_serial_port' - "test_options_flow_migration_reset_old_adapter" - ]; }; extraPytestFlagsArray = { - asuswrt = [ - # Sandbox network limitations, fails with unexpected error - "--deselect tests/components/asuswrt/test_config_flow.py::test_on_connect_failed" - ]; dnsip = [ # AssertionError: assert == "--deselect tests/components/dnsip/test_config_flow.py::test_options_flow" @@ -69,6 +52,9 @@ let # Flaky: AssertionError: assert '0.0' == '12.0' "--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed" ]; + logbook = [ + "--deselect tests/components/logbook/test_websocket_api.py::test_recorder_is_far_behind " + ]; modem_callerid = [ # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" @@ -77,20 +63,6 @@ let # "TypeError: object Mock can't be used in 'await' expression "--deselect tests/components/unifiprotect/test_repairs.py::test_ea_warning_fix" ]; - skybell = [ - # Sandbox network limitations: Cannot connect to host cloud.myskybell.com:443 - "--deselect tests/components/skybell/test_config_flow.py::test_flow_user_unknown_error" - ]; - stream = [ - # Tries to write to /example and gets "Permission denied" - "--deselect tests/components/stream/test_recorder.py::test_record_lookback" - "--deselect tests/components/stream/test_recorder.py::test_recorder_log" - "--deselect tests/components/stream/test_worker.py::test_get_image" - ]; - zha = [ - # AssertionError: assert 'manual_pick_radio_type' == 'choose_serial_port' - "--deselect tests/components/zha/test_config_flow.py::test_options_flow_restarts_running_zha_if_cancelled" - ]; }; in lib.listToAttrs (map (component: lib.nameValuePair component ( home-assistant.overridePythonAttrs (old: { @@ -100,7 +72,7 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( dontBuild = true; dontInstall = true; - checkInputs = old.checkInputs + nativeCheckInputs = old.nativeCheckInputs ++ home-assistant.getPackages component home-assistant.python.pkgs ++ extraCheckInputs.${component} or [ ]; @@ -121,9 +93,6 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( meta = old.meta // { broken = lib.elem component [ - # all tests are skipped - # https://github.com/home-assistant/core/blob/dev/tests/components/homeassistant_hardware/test_silabs_multiprotocol_addon.py#L23 - "homeassistant_hardware" ]; # upstream only tests on Linux, so do we. platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix b/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix index 1b312218ae..a65de7cf22 100644 --- a/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.33.0-96sse42"; + version = "4.34.0-100sse42"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc36/${pname}-${version}.fc36.x86_64.rpm"; - hash = "sha256-4gPK31XMd5JUp2+il1Qa7r0EaXVGEvKoYLNGSD2dLUs="; + hash = "sha256-MCRZ0XKi6pztVTuPQpPEn6wHsOwtSxR0Px9r12jnC9U="; }; unpackPhase = '' @@ -76,14 +76,6 @@ stdenv.mkDerivation rec { mkdir -p $out/etc cp -rv ./etc/hqplayer $out/etc/ - # udev rules - mkdir -p $out/etc/udev - cp -rv ./etc/udev/rules.d $out/etc/udev/ - - # kernel module cfgs - mkdir -p $out/etc - cp -rv ./etc/modules-load.d $out/etc/ - # systemd service file mkdir -p $out/lib/systemd cp -rv ./usr/lib/systemd/system $out/lib/systemd/ diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix index ec8b3e5c6f..fa20e46055 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.54"; + version = "2.4.55"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "sha256-6zl/7u/MryVPjUXeN2jZ1o6Oc4UcSa/VtxdtHs+Aw0A="; + sha256 = "sha256-Eda6GeNsC5PKYuR+b/wtLyiElCaUvODyPznHG9xfaaw="; }; # FIXME: -dev depends on -doc diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix index 1b7a7c31d4..2f427d170f 100644 --- a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin libintl; meta = with lib; { - homepage = "http://modpython.org/"; + homepage = "https://modpython.org/"; description = "An Apache module that embeds the Python interpreter within the server"; platforms = platforms.unix; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/servers/http/bozohttpd/default.nix b/third_party/nixpkgs/pkgs/servers/http/bozohttpd/default.nix index b236e1f262..8cb7be7f71 100644 --- a/third_party/nixpkgs/pkgs/servers/http/bozohttpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/bozohttpd/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { makeFlags = [ "LDADD=$(_LDADD)" ]; doCheck = true; - checkInputs = [ inetutils wget ]; + nativeCheckInputs = [ inetutils wget ]; checkFlags = optional (!cgiSupport) "CGITESTS="; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/http/dave/default.nix b/third_party/nixpkgs/pkgs/servers/http/dave/default.nix index f7052789d3..492e4989d7 100644 --- a/third_party/nixpkgs/pkgs/servers/http/dave/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/dave/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoPackage, fetchFromGitHub, mage }: +{ lib, buildGoModule, fetchFromGitHub, mage }: -buildGoPackage rec { +buildGoModule rec { pname = "dave"; version = "0.4.0"; @@ -8,20 +8,26 @@ buildGoPackage rec { owner = "micromata"; repo = "dave"; rev = "v${version}"; - sha256 = "sha256-wvsW4EwMWAgEV+LPeMhHL4AsuyS5TDMmpD9D4F1nVM4="; + hash = "sha256-wvsW4EwMWAgEV+LPeMhHL4AsuyS5TDMmpD9D4F1nVM4="; }; - goPackagePath = "github.com/micromata/dave"; + deleteVendor = true; + vendorHash = "sha256-iyq2DGdbdfJIRNkGAIKTk1LLDydpVX3juQFaG6H5vJQ="; + + patches = [ + # Add Go Modules support: + # - Based on https://github.com/micromata/dave/commit/46ae146dd2e95d57be35fa01885ea2c55fd8c279. + # - Bump golang.org/x/sys for Darwin. + ./go-modules.patch + ]; subPackages = [ "cmd/dave" "cmd/davecli" ]; - ldflags = - [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; meta = with lib; { homepage = "https://github.com/micromata/dave"; - description = - "A totally simple and very easy to configure stand alone webdav server"; + description = "A totally simple and very easy to configure stand alone webdav server"; license = licenses.asl20; maintainers = with maintainers; [ lunik1 ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/http/dave/go-modules.patch b/third_party/nixpkgs/pkgs/servers/http/dave/go-modules.patch new file mode 100644 index 0000000000..1090adb6f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/http/dave/go-modules.patch @@ -0,0 +1,562 @@ +From 95b36ebc39e931ab033b199f8c243c2da489f25c Mon Sep 17 00:00:00 2001 +From: Christian Claus +Date: Tue, 27 Apr 2021 22:20:50 +0200 +Subject: [PATCH 1/2] add go modules file + +--- + go.mod | 30 +++++ + go.sum | 338 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 368 insertions(+) + create mode 100644 go.mod + create mode 100644 go.sum + +diff --git a/go.mod b/go.mod +new file mode 100644 +index 0000000..3a17483 +--- /dev/null ++++ b/go.mod +@@ -0,0 +1,30 @@ ++module github.com/micromata/dave ++ ++go 1.12 ++ ++require ( ++ github.com/fsnotify/fsnotify v1.4.9 ++ github.com/hashicorp/hcl v1.0.0 ++ github.com/inconshreveable/mousetrap v1.0.0 ++ github.com/konsorten/go-windows-terminal-sequences v1.0.3 ++ github.com/magefile/mage v1.10.0 ++ github.com/magiconair/properties v1.8.2 ++ github.com/mitchellh/mapstructure v1.3.3 ++ github.com/pelletier/go-toml v1.8.0 ++ github.com/pkg/errors v0.9.1 ++ github.com/sirupsen/logrus v1.6.0 ++ github.com/spf13/afero v1.3.4 ++ github.com/spf13/cast v1.3.1 ++ github.com/spf13/cobra v1.0.0 ++ github.com/spf13/jwalterweatherman v1.1.0 ++ github.com/spf13/pflag v1.0.5 ++ github.com/spf13/viper v1.7.1 ++ github.com/stretchr/objx v0.1.1 // indirect ++ github.com/subosito/gotenv v1.2.0 ++ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a ++ golang.org/x/net v0.0.0-20200822124328-c89045814202 ++ golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 ++ golang.org/x/text v0.3.3 ++ gopkg.in/ini.v1 v1.60.1 ++ gopkg.in/yaml.v2 v2.3.0 ++) +diff --git a/go.sum b/go.sum +new file mode 100644 +index 0000000..0164408 +--- /dev/null ++++ b/go.sum +@@ -0,0 +1,338 @@ ++cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= ++cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= ++cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= ++cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= ++cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= ++cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= ++cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= ++cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= ++cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= ++cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= ++cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= ++cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= ++dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= ++github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= ++github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= ++github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= ++github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= ++github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= ++github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= ++github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= ++github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= ++github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= ++github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= ++github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= ++github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= ++github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= ++github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= ++github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= ++github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= ++github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= ++github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= ++github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= ++github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= ++github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= ++github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= ++github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= ++github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= ++github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= ++github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= ++github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= ++github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= ++github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= ++github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= ++github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= ++github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= ++github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= ++github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= ++github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= ++github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= ++github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= ++github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= ++github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= ++github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= ++github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= ++github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= ++github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= ++github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= ++github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= ++github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= ++github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= ++github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= ++github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= ++github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= ++github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= ++github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= ++github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= ++github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= ++github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= ++github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= ++github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= ++github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= ++github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= ++github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= ++github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= ++github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= ++github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= ++github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= ++github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= ++github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= ++github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= ++github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= ++github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= ++github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= ++github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= ++github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= ++github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= ++github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= ++github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= ++github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= ++github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= ++github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= ++github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= ++github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= ++github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= ++github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= ++github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= ++github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= ++github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= ++github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= ++github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= ++github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= ++github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= ++github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= ++github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= ++github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= ++github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= ++github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= ++github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= ++github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= ++github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= ++github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= ++github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= ++github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= ++github.com/magiconair/properties v1.8.2 h1:znVR8Q4g7/WlcvsxLBRWvo+vtFJUAbDn3w+Yak2xVMI= ++github.com/magiconair/properties v1.8.2/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= ++github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= ++github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= ++github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= ++github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= ++github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= ++github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= ++github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= ++github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= ++github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= ++github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= ++github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= ++github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= ++github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8= ++github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= ++github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= ++github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= ++github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= ++github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= ++github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= ++github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= ++github.com/pelletier/go-toml v1.8.0 h1:Keo9qb7iRJs2voHvunFtuuYFsbWeOBh8/P9v/kVMFtw= ++github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs= ++github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= ++github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= ++github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= ++github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= ++github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= ++github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= ++github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= ++github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= ++github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= ++github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= ++github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= ++github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= ++github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= ++github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= ++github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= ++github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= ++github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= ++github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= ++github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= ++github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= ++github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= ++github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= ++github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= ++github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= ++github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= ++github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= ++github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= ++github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= ++github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= ++github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= ++github.com/spf13/afero v1.3.4 h1:8q6vk3hthlpb2SouZcnBVKboxWQWMDNF38bwholZrJc= ++github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= ++github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= ++github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= ++github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= ++github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= ++github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= ++github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= ++github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= ++github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= ++github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= ++github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= ++github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= ++github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= ++github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= ++github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= ++github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= ++github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= ++github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= ++github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= ++github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= ++github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= ++github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= ++github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= ++github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= ++github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= ++github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= ++go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= ++go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= ++go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= ++go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= ++go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= ++go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= ++golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= ++golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= ++golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= ++golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= ++golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= ++golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= ++golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= ++golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM= ++golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= ++golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= ++golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= ++golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= ++golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= ++golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= ++golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= ++golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= ++golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= ++golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= ++golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= ++golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= ++golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= ++golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= ++golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= ++golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= ++golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= ++golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= ++golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= ++golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= ++golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= ++golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= ++golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= ++golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= ++golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= ++golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= ++golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= ++golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= ++golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= ++golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= ++golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= ++golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 h1:AvbQYmiaaaza3cW3QXRyPo5kYgpFIzOAfeAAN7m3qQ4= ++golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= ++golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= ++golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= ++golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= ++golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= ++golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= ++golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= ++golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ++golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= ++golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= ++golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= ++golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= ++golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= ++golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= ++golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= ++golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= ++golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= ++google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= ++google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= ++google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= ++google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= ++google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= ++google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= ++google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= ++google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= ++google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= ++google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= ++google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= ++google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= ++google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= ++google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= ++google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= ++google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= ++google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= ++google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= ++google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= ++gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= ++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= ++gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= ++gopkg.in/ini.v1 v1.60.1 h1:P5y5shSkb0CFe44qEeMBgn8JLow09MP17jlJHanke5g= ++gopkg.in/ini.v1 v1.60.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= ++gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= ++gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= ++gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= ++gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= ++honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= ++honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= ++honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= ++honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= ++rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +-- +2.39.0 + + +From cb3ef7b52fcd3e78b218b67420cb93e97a8e03ce Mon Sep 17 00:00:00 2001 +From: Aaron Jheng +Date: Fri, 27 Jan 2023 01:42:53 +0000 +Subject: [PATCH 2/2] Bump golang.org/x/sys + +--- + go.mod | 36 +++++++++++++++++++----------------- + go.sum | 16 ++++++++++++++++ + 2 files changed, 35 insertions(+), 17 deletions(-) + +diff --git a/go.mod b/go.mod +index 3a17483..c957ff4 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,30 +1,32 @@ + module github.com/micromata/dave + +-go 1.12 ++go 1.18 + + require ( + github.com/fsnotify/fsnotify v1.4.9 +- github.com/hashicorp/hcl v1.0.0 +- github.com/inconshreveable/mousetrap v1.0.0 +- github.com/konsorten/go-windows-terminal-sequences v1.0.3 + github.com/magefile/mage v1.10.0 +- github.com/magiconair/properties v1.8.2 +- github.com/mitchellh/mapstructure v1.3.3 +- github.com/pelletier/go-toml v1.8.0 + github.com/pkg/errors v0.9.1 + github.com/sirupsen/logrus v1.6.0 +- github.com/spf13/afero v1.3.4 +- github.com/spf13/cast v1.3.1 + github.com/spf13/cobra v1.0.0 +- github.com/spf13/jwalterweatherman v1.1.0 +- github.com/spf13/pflag v1.0.5 + github.com/spf13/viper v1.7.1 +- github.com/stretchr/objx v0.1.1 // indirect +- github.com/subosito/gotenv v1.2.0 + golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a + golang.org/x/net v0.0.0-20200822124328-c89045814202 +- golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 +- golang.org/x/text v0.3.3 +- gopkg.in/ini.v1 v1.60.1 +- gopkg.in/yaml.v2 v2.3.0 ++) ++ ++require ( ++ github.com/hashicorp/hcl v1.0.0 // indirect ++ github.com/inconshreveable/mousetrap v1.0.0 // indirect ++ github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect ++ github.com/magiconair/properties v1.8.2 // indirect ++ github.com/mitchellh/mapstructure v1.3.3 // indirect ++ github.com/pelletier/go-toml v1.8.0 // indirect ++ github.com/spf13/afero v1.3.4 // indirect ++ github.com/spf13/cast v1.3.1 // indirect ++ github.com/spf13/jwalterweatherman v1.1.0 // indirect ++ github.com/spf13/pflag v1.0.5 // indirect ++ github.com/subosito/gotenv v1.2.0 // indirect ++ golang.org/x/sys v0.4.0 // indirect ++ golang.org/x/text v0.3.3 // indirect ++ gopkg.in/ini.v1 v1.60.1 // indirect ++ gopkg.in/yaml.v2 v2.3.0 // indirect + ) +diff --git a/go.sum b/go.sum +index 0164408..0f997b9 100644 +--- a/go.sum ++++ b/go.sum +@@ -11,6 +11,7 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl + cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= + cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= + dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= ++github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= + github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= + github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= + github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +@@ -35,6 +36,7 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7 + github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= + github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= + github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= ++github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= + github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= + github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +@@ -68,6 +70,7 @@ github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OI + github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= + github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= + github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= ++github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= + github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= + github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= + github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +@@ -95,21 +98,27 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO + github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= + github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= + github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= ++github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= + github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= + github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= + github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= + github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= ++github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= + github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= + github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= + github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= + github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= + github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= ++github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= + github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= + github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= + github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= ++github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= + github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= + github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= ++github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= + github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= ++github.com/magefile/mage v1.10.0 h1:3HiXzCUY12kh9bIuyXShaVe529fJfyqoVM42o/uom2g= + github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= + github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= + github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +@@ -142,6 +151,7 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE + github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= + github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= + github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= ++github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= + github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= + github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= + github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +@@ -162,7 +172,9 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV + github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= + github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= + github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= ++github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= + github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= ++github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= + github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= + github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= + github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +@@ -187,6 +199,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ + github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= + github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= + github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= ++github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= + github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= + github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= + github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +@@ -270,6 +283,8 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w + golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8 h1:AvbQYmiaaaza3cW3QXRyPo5kYgpFIzOAfeAAN7m3qQ4= + golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= ++golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +@@ -319,6 +334,7 @@ google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij + google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= + gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= ++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= + gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +-- +2.39.0 + diff --git a/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix b/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix index af0926ded0..2cb6e6cfdd 100644 --- a/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { sed -i "s:/usr/bin/file:${file}/bin/file:g" configure ''; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; doCheck = true; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix b/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix index 681c7ca7a8..278f0b4c52 100644 --- a/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix @@ -32,8 +32,8 @@ let pname = "hylafaxplus"; - version = "7.0.6"; - hash = "sha512-0faeEwF/XQE/85zwUMOnrGzvGanuWRDr53SnrgbX0i/SHjHelzSEd2TK6plVOfV4w8RY7Ox7lSO1gjqEEzfZyw=="; + version = "7.0.7"; + hash = "sha512-nUvt+M0HBYN+MsGskuuDt1j0nI5Dk8MbfK/OVxP2FCDby3eiDg0eDtcpIxlOe4o0klko07zDRIb06zqh8ABuKA=="; configSite = substituteAll { name = "${pname}-config.site"; @@ -72,16 +72,6 @@ stdenv.mkDerivation { patches = [ # adjust configure check to work with libtiff > 4.1 ./libtiff-4.patch - # fix missing exports in libtiff 4.5+ - # https://gitlab.com/libtiff/libtiff/-/issues/504 - # can probably be dropped with next hylafaxplus release - (fetchurl { - name = "hylafaxplus-7.0.6-tiff-4.5.0.patch"; - url = "https://dev.gentoo.org/~sam/distfiles/net-misc/hylafaxplus/hylafaxplus-7.0.6-tiff-4.5.0.patch.xz"; - downloadToTemp = true; - postFetch = ''xz -d < $downloadedFile > $out''; - hash = "sha256-koZvvzlgZHcANVaYdewnuLARz2TTeyDZRjm0EYWzsmk="; - }) ]; # Note that `configure` (and maybe `faxsetup`) are looking # for a couple of standard binaries in the `PATH` and diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch b/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch index c890f317e5..e00d94b5a9 100644 --- a/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch +++ b/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch @@ -5,7 +5,7 @@ https://bugs.gentoo.org/706154 echo '#define TIFFSTRIPBYTECOUNTS uint32_t' echo '#define TIFFVERSION TIFF_VERSION' echo '#define TIFFHEADER TIFFHeader';; -- 4.[01234]) tiff_runlen_t="uint32_t" +- 4.[012345]) tiff_runlen_t="uint32_t" + 4.[0-9]) tiff_runlen_t="uint32_t" tiff_offset_t="uint64_t" echo '#define TIFFSTRIPBYTECOUNTS uint64_t' diff --git a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix index 68064cbc3d..7d2be47d14 100644 --- a/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/imgproxy/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.13.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-dPGqiNGUI5WwqT65DvY6JXv9/1lc1NZlJbMWUYGgfYY="; + sha256 = "sha256-4P8Q8VM2+O4Du2u+LFmqGQYw8qvEuBGq2nz9FxvGQhE="; rev = "v${version}"; }; @@ -26,6 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Fast and secure on-the-fly image processing server written in Go"; homepage = "https://imgproxy.net"; + changelog = "https://github.com/imgproxy/imgproxy/blob/master/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ paluh ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/invidious/versions.json b/third_party/nixpkgs/pkgs/servers/invidious/versions.json index 005627dd7e..bb6063fdaf 100644 --- a/third_party/nixpkgs/pkgs/servers/invidious/versions.json +++ b/third_party/nixpkgs/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "05258d56bdc3f4de1f0da0c0dbd2d540f68cbdd5", - "sha256": "sha256-5vA9LCtHgXj7Pn5U/oLDKnwR/ZNtayl2QBA9jkzs98E=", - "version": "unstable-2023-01-10" + "rev": "3b8e6c6040fe341fe4b9fc16cdbd3aea697dfad3", + "sha256": "sha256-gESGo8zRJtGJZrZEkW0OS/O65ZwVzpDA3jmyLCV0RpI=", + "version": "unstable-2023-01-26" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", diff --git a/third_party/nixpkgs/pkgs/servers/isso/default.nix b/third_party/nixpkgs/pkgs/servers/isso/default.nix index 46942669ac..459ca2c713 100644 --- a/third_party/nixpkgs/pkgs/servers/isso/default.nix +++ b/third_party/nixpkgs/pkgs/servers/isso/default.nix @@ -47,7 +47,7 @@ with python3Packages; buildPythonApplication rec { make js ''; - checkInputs = [ + nativeCheckInputs = [ pytest pytest-cov ]; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index e739b1e8e9..ba6e1cdcc7 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.2608"; + version = "0.20.2782"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-VR3/TmSpdSSnY9C+aTY1s3fawZgg7Ecf+k2kuuj1/roGKGApVHMaBQOc2p7j9fA6v6YEFSb8Mkoq5I1fi6y4xg=="; + hash = "sha512-qBstaZfBts2EfYVt+iU9QqIEVRfPIqt122NAMlS42yoV7iLqeXfK989Wm6FoYtTvvgtNpVJ9rLPNMSSH3AX3TQ=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; @@ -28,7 +28,7 @@ buildDotnetModule rec { runtimeDeps = [ openssl ]; doCheck = !(stdenv.isDarwin && stdenv.isAarch64); # mono is not available on aarch64-darwin - checkInputs = [ mono ]; + nativeCheckInputs = [ mono ]; testProjectFile = "src/Jackett.Test/Jackett.Test.csproj"; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix index 1943d107ad..b7973a8e1d 100644 --- a/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.8.8"; # ensure that jellyfin-web has matching version + version = "10.8.9"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - sha256 = "3+JwcHZGENX9PgHdtRmzffi6p2p68Ngs3WOiEwAY8zU="; + sha256 = "kvtC9qtVuewR9W6sq963/tNgZbWSpygpBqcXnHuvX0Q="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/disable-warnings.patch b/third_party/nixpkgs/pkgs/servers/jellyfin/disable-warnings.patch index 0127513b5e..1e13f77d0f 100644 --- a/third_party/nixpkgs/pkgs/servers/jellyfin/disable-warnings.patch +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/disable-warnings.patch @@ -1,8 +1,8 @@ diff --git a/jellyfin.ruleset b/jellyfin.ruleset -index 5ac5f4923..88621857b 100644 +index 1c834de82..bf70fef1e 100644 --- a/jellyfin.ruleset +++ b/jellyfin.ruleset -@@ -54,6 +54,31 @@ +@@ -54,6 +54,33 @@ @@ -31,6 +31,8 @@ index 5ac5f4923..88621857b 100644 + + + ++ ++ diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/node-deps.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/node-deps.nix index 73c65f0037..ceb5319718 100644 --- a/third_party/nixpkgs/pkgs/servers/jellyfin/node-deps.nix +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/node-deps.nix @@ -11817,8 +11817,8 @@ let args = { name = "jellyfin-web"; packageName = "jellyfin-web"; - version = "10.8.8"; - src = ../../../../../../../nix/store/bbsfbkaiq91gnf5ffcyh4gl8r9mqlyc4-source; + version = "10.8.9"; + src = ../../../../../../../nix/store/yvn7h8hrydjxiw23fhqj5ya6yilj0d57-source; dependencies = [ sources."@ampproject/remapping-2.1.2" (sources."@apideck/better-ajv-errors-0.3.3" // { diff --git a/third_party/nixpkgs/pkgs/servers/jellyfin/web.nix b/third_party/nixpkgs/pkgs/servers/jellyfin/web.nix index bf7c4d25d2..7dbab6683f 100644 --- a/third_party/nixpkgs/pkgs/servers/jellyfin/web.nix +++ b/third_party/nixpkgs/pkgs/servers/jellyfin/web.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "jellyfin-web"; - version = "10.8.8"; + version = "10.8.9"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - sha256 = "pIoMpNxRtIvs6bhFEoSlFU8aHZ2CBbHnZaA/FVAkGOI="; + sha256 = "hHZ8HVf8fidd5VPs06kB3/BHBHFxoV3fVObBesqfRJo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/kapowbang/default.nix b/third_party/nixpkgs/pkgs/servers/kapowbang/default.nix index 81536ab143..7027d8a50c 100644 --- a/third_party/nixpkgs/pkgs/servers/kapowbang/default.nix +++ b/third_party/nixpkgs/pkgs/servers/kapowbang/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kapowbang"; - version = "0.7.0"; + version = "0.7.1"; subPackages = [ "." ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "BBVA"; repo = "kapow"; rev = "v${version}"; - sha256 = "sha256-0ftdc3ol1g0WnZgicXl46Xpph4cUYk/G/eeu+9JnPyA="; + sha256 = "sha256-HUZ1Uf8Z2YbYvqKEUHckKAZ5q+C83zafi3UjemqHFM4="; }; - vendorSha256 = "sha256-41Jk3aTe4EA5dwkriEo48QNJg2k3T/R/8i8XWcURcG8="; + vendorHash = "sha256-vvC9l/6b7AIEmCMVdeKMyi9ThIcAzjtV+uaQ4oSJZuU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/komga/default.nix b/third_party/nixpkgs/pkgs/servers/komga/default.nix index bc4c3ac486..e1db293f64 100644 --- a/third_party/nixpkgs/pkgs/servers/komga/default.nix +++ b/third_party/nixpkgs/pkgs/servers/komga/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "0.158.0"; + version = "0.161.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/v${version}/${pname}-${version}.jar"; - sha256 = "sha256-WySZFoi1ifSuvlKrbgvd0WXzib6cSiOcGZ2cSSIQZTc="; + sha256 = "sha256-TZ/TxX9OgDGx8zD2mI8cTDPZSqBjkYN3Uy+W9MXbJOI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/krill/default.nix b/third_party/nixpkgs/pkgs/servers/krill/default.nix index 3eed49ff5e..e9562a082a 100644 --- a/third_party/nixpkgs/pkgs/servers/krill/default.nix +++ b/third_party/nixpkgs/pkgs/servers/krill/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "krill"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-U74x6zEQS/3JjzIeYlosqISZoZM7cOMcheJKtRYnPyo="; + hash = "sha256-JDLY+TjhPgOieVgvzFCDygzXwMCca/fJNZPfx4WNeO0="; }; - cargoSha256 = "sha256-CH97R9VGT7SFdJs6kWDIdOaV5Q6FtOPZ1tKcmI+zRgE="; + cargoHash = "sha256-2kQcTiOqculnDbd4MKBJXNn03d5Ppm+DliIEh8YV2pU="; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix b/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix index ad857703ba..4478c59433 100644 --- a/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ldap/389/default.nix @@ -26,8 +26,7 @@ , python3 , rustPlatform , openssl -, systemd -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , zlib , rsync , withCockpit ? true diff --git a/third_party/nixpkgs/pkgs/servers/libreddit/default.nix b/third_party/nixpkgs/pkgs/servers/libreddit/default.nix index 60c073e3a8..2a3586f29e 100644 --- a/third_party/nixpkgs/pkgs/servers/libreddit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "libreddit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3Q/Vl126EMRSNdStpZqFEkA0Kjzu6BeyBhokTQrrQXE="; + hash = "sha256-kiiZxS5ttUZ1FdF/N9sO6GO13Wmij8DwsNa8p+ZTk0k="; }; - cargoSha256 = "sha256-TA0Rsya3vx6N/iAWpRmB7Byz7AIR0sdfk3kJ8wgvWHY="; + cargoSha256 = "sha256-0XBJ1tlVO2+iK9O2CDVZxDwFXW8T23j2lSbqpnW3fis="; buildInputs = lib.optionals stdenv.isDarwin [ Security diff --git a/third_party/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix index c5ad8414cd..128a9ae8ff 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/dkimproxy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SMTP-proxy that signs and/or verifies emails"; - homepage = "http://dkimproxy.sourceforge.net/"; + homepage = "https://dkimproxy.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.ekleog ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/servers/mail/dspam/default.nix b/third_party/nixpkgs/pkgs/servers/mail/dspam/default.nix index 31f149f1dd..852de800a6 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/dspam/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/dspam/default.nix @@ -117,7 +117,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://dspam.sourceforge.net/"; + homepage = "https://dspam.sourceforge.net/"; description = "Community Driven Antispam Filter"; license = licenses.agpl3Plus; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/servers/mail/listmonk/stuffbin.nix b/third_party/nixpkgs/pkgs/servers/mail/listmonk/stuffbin.nix index 92c9785e27..442307fad6 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/listmonk/stuffbin.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/listmonk/stuffbin.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "stuffbin"; version = "1.1.0"; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; src = fetchFromGitHub { owner = "knadh"; diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix index 7f22161787..c551043459 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { # listed as dependencies in setup.py. To use these, they should be # dependencies of the Django Python environment, but not of # HyperKitty so they're not included for people who don't need them. - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 elasticsearch mock diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/mailman-hyperkitty.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/mailman-hyperkitty.nix index 39f9b5ec37..a60c5c07a5 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/mailman-hyperkitty.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/mailman-hyperkitty.nix @@ -6,14 +6,14 @@ with python3.pkgs; buildPythonPackage rec { pname = "mailman-hyperkitty"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EQBx1KX3z/Wv3QAHOi+s/ihLOjpiupIQBYyE6IPbJto="; + sha256 = "sha256-+Nad+8bMtYKJbUCpppRXqhB1zdbvvFXTTHlwJLQLzDg="; }; propagatedBuildInputs = [ @@ -22,7 +22,7 @@ buildPythonPackage rec { zope_interface ]; - checkInputs = [ + nativeCheckInputs = [ mock nose2 ]; diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix index bd4425e5ef..ddd7d4991f 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/postorius.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ django-mailman3 readme_renderer ]; - checkInputs = [ beautifulsoup4 vcrpy mock ]; + nativeCheckInputs = [ beautifulsoup4 vcrpy mock ]; # Tries to connect to database. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/mail/petidomo/default.nix b/third_party/nixpkgs/pkgs/servers/mail/petidomo/default.nix index 447e643c5c..64d9ef99bd 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/petidomo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/petidomo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = "http://petidomo.sourceforge.net/"; + homepage = "https://petidomo.sourceforge.net/"; description = "A simple and easy to administer mailing list server"; license = lib.licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix b/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix index 1093e8a8d1..56380ed4b6 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.7.3"; + version = "3.7.4"; src = fetchurl { url = "http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/${pname}-${version}.tar.gz"; - hash = "sha256-0i89N+91YT1dVztW/FHvCX8sDQsOQHkjcR9xwftykRs="; + hash = "sha256-TBN6IwNEjyWZODaDfe6uh/rF1NA68Rrejpvq2AYyhkU="; }; nativeBuildInputs = [ makeWrapper m4 ]; @@ -53,9 +53,6 @@ in stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/postfix/raw/2f9d42453e67ebc43f786d98262a249037f80a77/f/postfix-3.6.2-glibc-234-build-fix.patch"; sha256 = "sha256-xRUL5gaoIt6HagGlhsGwvwrAfYvzMgydsltYMWvl9BI="; }) - - # linux-6 compatibility - ./linux-6.patch ]; postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -104,7 +101,11 @@ in stdenv.mkDerivation rec { --prefix PATH ":" ${lib.makeBinPath [ coreutils findutils gnugrep gawk gnused ]} ''; - passthru.tests = { inherit (nixosTests) postfix postfix-raise-smtpd-tls-security-level; }; + passthru = { + tests = { inherit (nixosTests) postfix postfix-raise-smtpd-tls-security-level; }; + + updateScript = ./update.sh; + }; meta = with lib; { homepage = "http://www.postfix.org/"; diff --git a/third_party/nixpkgs/pkgs/servers/mail/postfix/linux-6.patch b/third_party/nixpkgs/pkgs/servers/mail/postfix/linux-6.patch deleted file mode 100644 index ee9a3be740..0000000000 --- a/third_party/nixpkgs/pkgs/servers/mail/postfix/linux-6.patch +++ /dev/null @@ -1,26 +0,0 @@ -Extracted fix from postfix-3.8-20221006 snapshot: - https://github.com/vdukhovni/postfix/commit/b65530350fa4a7eee40946160fd80c3e1e0b63e5 ---- a/makedefs -+++ b/makedefs -@@ -627,7 +627,8 @@ EOF - : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} - : ${PLUGIN_LD="${CC-gcc} -shared"} - ;; -- Linux.[345].*) SYSTYPE=LINUX$RELEASE_MAJOR -+ Linux.[3456].*) -+ SYSTYPE=LINUX$RELEASE_MAJOR - case "$CCARGS" in - *-DNO_DB*) ;; - *-DHAS_DB*) ;; ---- a/src/util/sys_defs.h -+++ b/src/util/sys_defs.h -@@ -751,7 +751,8 @@ extern int initgroups(const char *, int); - /* - * LINUX. - */ --#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) -+#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) \ -+ || defined(LINUX6) - #define SUPPORTED - #define UINT32_TYPE unsigned int - #define UINT16_TYPE unsigned short diff --git a/third_party/nixpkgs/pkgs/servers/mail/postfix/update.sh b/third_party/nixpkgs/pkgs/servers/mail/postfix/update.sh new file mode 100755 index 0000000000..eacb548bc0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mail/postfix/update.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl pcre common-updater-scripts + +set -eu -o pipefail + +# Expect the text in format of 'Source code |' +# Stable release goes first. +new_version="$(curl -s http://cdn.postfix.johnriley.me/mirrors/postfix-release/index.html | + pcregrep -o1 '"official/postfix-([0-9.]+)[.]tar[.]gz">' | head -n1)" +update-source-version postfix "$new_version" diff --git a/third_party/nixpkgs/pkgs/servers/mail/public-inbox/default.nix b/third_party/nixpkgs/pkgs/servers/mail/public-inbox/default.nix index 8ffbab1eac..a70ef432fc 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/public-inbox/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/public-inbox/default.nix @@ -116,7 +116,7 @@ buildPerlPackage rec { ]; doCheck = !stdenv.isDarwin; - checkInputs = [ + nativeCheckInputs = [ MailIMAPClient curl git diff --git a/third_party/nixpkgs/pkgs/servers/mastodon/default.nix b/third_party/nixpkgs/pkgs/servers/mastodon/default.nix index 50050acf40..d0bb07c738 100644 --- a/third_party/nixpkgs/pkgs/servers/mastodon/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mastodon/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv, nixosTests , yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript , fetchYarnDeps, fixup_yarn_lock +, brotli # Allow building a fork or custom version of Mastodon: , pname ? "mastodon" @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-fuU92fydoazSXBHwA+DG//gRgWVYQ1M3m2oNS2iwv4I="; }; - nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby ]; + nativeBuildInputs = [ fixup_yarn_lock nodejs-slim yarn mastodonGems mastodonGems.wrappedRuby brotli ]; RAILS_ENV = "production"; NODE_ENV = "production"; @@ -69,6 +70,17 @@ stdenv.mkDerivation rec { rails assets:precompile yarn cache clean --offline rm -rf ~/node_modules/.cache + + # Create missing static gzip and brotli files + gzip -9 -n -c ~/public/assets/500.html > ~/public/assets/500.html.gz + gzip -9 -n -c ~/public/packs/report.html > ~/public/packs/report.html.gz + find ~/public/assets -maxdepth 1 -type f -name ".*.json" | while read file; do + gzip -9 -n -c $file > $file.gz + done + brotli --best -f ~/public/packs/report.html -o ~/public/packs/report.html.br + find ~/public/assets -type f -regextype posix-extended -iregex '.*\.(css|js|json|html)' | while read file; do + brotli --best -f $file -o $file.br + done ''; installPhase = '' @@ -95,6 +107,22 @@ stdenv.mkDerivation rec { fi done + # Create missing static gzip and brotli files + find public -maxdepth 1 -type f -regextype posix-extended -iregex '.*\.(css|js|svg|txt|xml)' | while read file; do + gzip -9 -n -c $file > $file.gz + brotli --best -f $file -o $file.br + done + find public/emoji -type f -name "*.svg" | while read file; do + gzip -9 -n -c $file > $file.gz + brotli --best -f $file -o $file.br + done + ln -s assets/500.html.gz public/500.html.gz + ln -s assets/500.html.br public/500.html.br + ln -s packs/sw.js.gz public/sw.js.gz + ln -s packs/sw.js.br public/sw.js.br + ln -s packs/sw.js.map.gz public/sw.js.map.gz + ln -s packs/sw.js.map.br public/sw.js.map.br + rm -rf log ln -s /var/log/mastodon log ln -s /tmp tmp diff --git a/third_party/nixpkgs/pkgs/servers/matrix-conduit/cargo-11192-workaround.patch b/third_party/nixpkgs/pkgs/servers/matrix-conduit/cargo-11192-workaround.patch new file mode 100644 index 0000000000..1a71b210de --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/matrix-conduit/cargo-11192-workaround.patch @@ -0,0 +1,259 @@ +diff --git ruma-appservice-api/Cargo.toml ruma-appservice-api/Cargo.toml +index b48852c8..8641bc42 100644 +--- ruma-appservice-api/Cargo.toml ++++ ruma-appservice-api/Cargo.toml +@@ -23,11 +23,11 @@ unstable-msc2409 = [] + unstable-msc3202 = [] + + [dependencies] +-js_int = { workspace = true, features = ["serde"] } ++js_int = { version = "0.2.2", features = ["serde"] } + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] } +-serde = { workspace = true } +-serde_json = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } ++serde_json = { version = "1.0.87" } + + [dev-dependencies] +-assert_matches = { workspace = true } ++assert_matches = { version = "1.5.0" } + serde_yaml = "0.9.14" +diff --git ruma-client-api/Cargo.toml ruma-client-api/Cargo.toml +index ddd2e44b..5756c055 100644 +--- ruma-client-api/Cargo.toml ++++ ruma-client-api/Cargo.toml +@@ -31,16 +31,16 @@ client = [] + server = [] + + [dependencies] +-assign = { workspace = true } ++assign = { version = "1.1.1" } + bytes = "1.0.1" +-http = { workspace = true } +-js_int = { workspace = true, features = ["serde"] } ++http = { version = "0.2.8" } ++js_int = { version = "0.2.2", features = ["serde"] } + js_option = "0.1.1" +-maplit = { workspace = true } ++maplit = { version = "1.0.2" } + percent-encoding = "2.1.0" + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] } +-serde = { workspace = true } +-serde_json = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } ++serde_json = { version = "1.0.87" } + + [dev-dependencies] +-assert_matches = { workspace = true } ++assert_matches = { version = "1.5.0" } +diff --git ruma-common/Cargo.toml ruma-common/Cargo.toml +index 83f22461..4ba11cfb 100644 +--- ruma-common/Cargo.toml ++++ ruma-common/Cargo.toml +@@ -48,15 +48,15 @@ unstable-sanitize = ["dep:html5ever", "dep:phf"] + unstable-unspecified = [] + + [dependencies] +-base64 = { workspace = true } ++base64 = { version = "0.20.0" } + bytes = "1.0.1" + form_urlencoded = "1.0.0" + getrandom = { version = "0.2.6", optional = true } + html5ever = { version = "0.25.2", optional = true } +-http = { workspace = true, optional = true } ++http = { version = "0.2.8", optional = true } + indexmap = { version = "1.9.1", features = ["serde"] } + itoa = "1.0.1" +-js_int = { workspace = true, features = ["serde"] } ++js_int = { version = "0.2.2", features = ["serde"] } + js_option = "0.1.0" + konst = { version = "0.2.19", features = ["rust_1_64", "alloc"] } + percent-encoding = "2.1.0" +@@ -66,25 +66,25 @@ rand = { version = "0.8.3", optional = true } + regex = { version = "1.5.6", default-features = false, features = ["std", "perf"] } + ruma-identifiers-validation = { version = "0.9.0", path = "../ruma-identifiers-validation", default-features = false } + ruma-macros = { version = "0.10.5", path = "../ruma-macros" } +-serde = { workspace = true } +-serde_json = { workspace = true, features = ["raw_value"] } +-thiserror = { workspace = true } +-tracing = { workspace = true, features = ["attributes"] } ++serde = { version = "1.0.147", features = ["derive"] } ++serde_json = { version = "1.0.87", features = ["raw_value"] } ++thiserror = { version = "1.0.37" } ++tracing = { version = "0.1.37", default-features = false, features = ["std", "attributes"] } + url = "2.2.2" + uuid = { version = "1.0.0", optional = true, features = ["v4"] } + wildmatch = "2.0.0" + + # dev-dependencies can't be optional, so this is a regular dependency +-criterion = { workspace = true, optional = true } ++criterion = { version = "0.4.0", optional = true } + + [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies] + js-sys = { version = "0.3", optional = true } + + [dev-dependencies] +-assert_matches = { workspace = true } +-assign = { workspace = true } +-http = { workspace = true } +-maplit = { workspace = true } ++assert_matches = { version = "1.5.0" } ++assign = { version = "1.1.1" } ++http = { version = "0.2.8" } ++maplit = { version = "1.0.2" } + trybuild = "1.0.71" + + [[bench]] +diff --git ruma-federation-api/Cargo.toml ruma-federation-api/Cargo.toml +index 380d1ed3..a4508a80 100644 +--- ruma-federation-api/Cargo.toml ++++ ruma-federation-api/Cargo.toml +@@ -26,11 +26,11 @@ unstable-msc3723 = [] + unstable-unspecified = [] + + [dependencies] +-js_int = { workspace = true, features = ["serde"] } ++js_int = { version = "0.2.2", features = ["serde"] } + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] } +-serde = { workspace = true } +-serde_json = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } ++serde_json = { version = "1.0.87" } + + [dev-dependencies] +-assert_matches = { workspace = true } +-http = { workspace = true } ++assert_matches = { version = "1.5.0" } ++http = { version = "0.2.8" } +diff --git ruma-identifiers-validation/Cargo.toml ruma-identifiers-validation/Cargo.toml +index cd79ba78..28a9cd9e 100644 +--- ruma-identifiers-validation/Cargo.toml ++++ ruma-identifiers-validation/Cargo.toml +@@ -15,5 +15,5 @@ all-features = true + compat = [] + + [dependencies] +-js_int = { workspace = true } +-thiserror = { workspace = true } ++js_int = { version = "0.2.2" } ++thiserror = { version = "1.0.37" } +diff --git ruma-identity-service-api/Cargo.toml ruma-identity-service-api/Cargo.toml +index 9dd4bc14..6edf1170 100644 +--- ruma-identity-service-api/Cargo.toml ++++ ruma-identity-service-api/Cargo.toml +@@ -19,9 +19,9 @@ client = [] + server = [] + + [dependencies] +-js_int = { workspace = true, features = ["serde"] } ++js_int = { version = "0.2.2", features = ["serde"] } + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api"] } +-serde = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } + + [dev-dependencies] +-serde_json = { workspace = true } ++serde_json = { version = "1.0.87" } +diff --git ruma-macros/Cargo.toml ruma-macros/Cargo.toml +index 70a6a7a6..e86c0631 100644 +--- ruma-macros/Cargo.toml ++++ ruma-macros/Cargo.toml +@@ -23,6 +23,6 @@ proc-macro-crate = "1.0.0" + proc-macro2 = "1.0.24" + quote = "1.0.8" + ruma-identifiers-validation = { version = "0.9.0", path = "../ruma-identifiers-validation", default-features = false } +-serde = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } + syn = { version = "1.0.57", features = ["extra-traits", "full", "visit"] } + toml = "0.5.9" +diff --git ruma-push-gateway-api/Cargo.toml ruma-push-gateway-api/Cargo.toml +index 5d589828..e08144ce 100644 +--- ruma-push-gateway-api/Cargo.toml ++++ ruma-push-gateway-api/Cargo.toml +@@ -20,7 +20,7 @@ client = [] + server = [] + + [dependencies] +-js_int = { workspace = true, features = ["serde"] } ++js_int = { version = "0.2.2", features = ["serde"] } + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["api", "events"] } +-serde = { workspace = true } +-serde_json = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } ++serde_json = { version = "1.0.87" } +diff --git ruma-signatures/Cargo.toml ruma-signatures/Cargo.toml +index dd1c9951..d06bffd9 100644 +--- ruma-signatures/Cargo.toml ++++ ruma-signatures/Cargo.toml +@@ -18,16 +18,16 @@ ring-compat = ["dep:subslice"] + unstable-exhaustive-types = [] + + [dependencies] +-base64 = { workspace = true } ++base64 = { version = "0.20.0" } + ed25519-dalek = "1.0.1" + pkcs8 = { version = "0.9.0", features = ["alloc"] } + # because dalek uses an older version of rand_core + rand = { version = "0.7", features = ["getrandom"] } + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["canonical-json"] } +-serde_json = { workspace = true } ++serde_json = { version = "1.0.87" } + sha2 = "0.9.5" + subslice = { version = "0.2.3", optional = true } +-thiserror = { workspace = true } ++thiserror = { version = "1.0.37" } + + [dev-dependencies] +-assert_matches = { workspace = true } ++assert_matches = { version = "1.5.0" } +diff --git ruma-state-res/Cargo.toml ruma-state-res/Cargo.toml +index d23556f1..ec6088bc 100644 +--- ruma-state-res/Cargo.toml ++++ ruma-state-res/Cargo.toml +@@ -19,18 +19,18 @@ unstable-exhaustive-types = [] + + [dependencies] + itertools = "0.10.0" +-js_int = { workspace = true } ++js_int = { version = "0.2.2" } + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["events"] } +-serde = { workspace = true } +-serde_json = { workspace = true } +-thiserror = { workspace = true } +-tracing = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } ++serde_json = { version = "1.0.87" } ++thiserror = { version = "1.0.37" } ++tracing = { version = "0.1.37", default-features = false, features = ["std"] } + + # dev-dependencies can't be optional, so this is a regular dependency +-criterion = { workspace = true, optional = true } ++criterion = { version = "0.4.0", optional = true } + + [dev-dependencies] +-maplit = { workspace = true } ++maplit = { version = "1.0.2" } + rand = "0.8.3" + ruma-common = { version = "0.10.5", path = "../ruma-common", features = ["unstable-pdu"] } + tracing-subscriber = "0.3.16" +diff --git ruma/Cargo.toml ruma/Cargo.toml +index 0b62cff1..05ce9990 100644 +--- ruma/Cargo.toml ++++ ruma/Cargo.toml +@@ -191,8 +191,8 @@ __ci = [ + ] + + [dependencies] +-assign = { workspace = true } +-js_int = { workspace = true } ++assign = { version = "1.1.1" } ++js_int = { version = "0.2.2" } + js_option = "0.1.1" + + ruma-common = { version = "0.10.5", path = "../ruma-common" } +@@ -208,4 +208,4 @@ ruma-identity-service-api = { version = "0.6.0", path = "../ruma-identity-servic + ruma-push-gateway-api = { version = "0.6.0", path = "../ruma-push-gateway-api", optional = true } + + [dev-dependencies] +-serde = { workspace = true } ++serde = { version = "1.0.147", features = ["derive"] } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix index 20de61bbc8..5f8fe6a2cc 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-conduit/default.nix @@ -1,17 +1,26 @@ -{ lib, rustPlatform, fetchFromGitLab, stdenv, darwin, nixosTests }: +{ lib, rustPlatform, fetchFromGitLab, stdenv, darwin, nixosTests, rocksdb_6_23 }: rustPlatform.buildRustPackage rec { pname = "matrix-conduit"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitLab { owner = "famedly"; repo = "conduit"; rev = "v${version}"; - sha256 = "sha256-QTXDIvGz12ZxsWmPiMiJ8mBUWoJ2wnaeTZdXcwBh35o="; + sha256 = "sha256-GSCpmn6XRbmnfH31R9c6QW3/pez9KHPjI99dR+ln0P4="; }; - cargoSha256 = "sha256-vE44I8lQ5VAfZB4WKLRv/xudoZJaFJGTT/UuumTePBU="; + # https://github.com/rust-lang/cargo/issues/11192 + # https://github.com/ruma/ruma/issues/1441 + postPatch = '' + pushd $cargoDepsCopy + patch -p0 < ${./cargo-11192-workaround.patch} + for p in ruma*; do echo '{"files":{},"package":null}' > $p/.cargo-checksum.json; done + popd + ''; + + cargoSha256 = "sha256-WFoupcuaG7f7KYBn/uzbOzlHHLurOyvm5e1lEcinxC8="; nativeBuildInputs = [ rustPlatform.bindgenHook @@ -21,6 +30,9 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; + ROCKSDB_INCLUDE_DIR = "${rocksdb_6_23}/include"; + ROCKSDB_LIB_DIR = "${rocksdb_6_23}/lib"; + # tests failed on x86_64-darwin with SIGILL: illegal instruction doCheck = !(stdenv.isx86_64 && stdenv.isDarwin); diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index a8a4d9550f..0c42373dd2 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub, python3, openssl, rustPlatform -, enableSystemd ? stdenv.isLinux, nixosTests +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform python3.pkgs.systemd +, nixosTests , enableRedis ? true , callPackage }: @@ -11,20 +12,20 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.75.0"; + version = "1.76.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-cfvekrZRLbdsUqkkPF8hz9B4qsum1kpIL0aCnJf3HYg="; + hash = "sha256-kPc6T8yLe1TDxPKLnK/TcU+RUxAVIq8qsr5JQXCXyjM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-oyXgHqOrMKs+mYGAI4Wn+fuVQWsQJIkPwCY4t+cUlQ4="; + hash = "sha256-tXtnVYH9uWu0nHHx53PgML92NWl3qcAcnFKhiijvQBc="; }; postPatch = '' @@ -83,7 +84,7 @@ buildPythonApplication rec { ] ++ lib.optional enableSystemd systemd ++ lib.optionals enableRedis [ hiredis txredisapi ]; - checkInputs = [ mock parameterized openssl ]; + nativeCheckInputs = [ mock parameterized openssl ]; doCheck = !stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/ldap3.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/ldap3.nix index 394c0f5e58..0f816164cb 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/ldap3.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/ldap3.nix @@ -13,5 +13,5 @@ buildPythonPackage rec { # ldaptor is not ready for py3 yet doCheck = !isPy3k; - checkInputs = [ ldaptor mock ]; + nativeCheckInputs = [ ldaptor mock ]; } diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix index 776a88833e..3fe9c33e8e 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/synadm.nix @@ -4,12 +4,12 @@ with python3Packages; buildPythonApplication rec { pname = "synadm"; - version = "0.37.1"; + version = "0.38"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6RlgPiYxbnTGJBpNIM1dzAuGTbvydnXkfywSsI0G/oc="; + sha256 = "sha256-l1KRUnjzj1/MEb1nxV6hMaxi15q7baG+iiK2yatZYRc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix b/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix index b4e4e87fb7..11920c3e8b 100644 --- a/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matterbridge/default.nix @@ -11,6 +11,8 @@ buildGoModule rec { sha256 = "sha256-VqVrAmbKTfDhcvgayEE1wUeFBSTGczBrntIJQ5/uWzM="; }; + subPackages = [ "." ]; + vendorSha256 = null; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix b/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix index bc78495a50..f46eba6f60 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix +++ b/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "matterircd"; - version = "0.25.1"; + version = "0.26.1"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "sha256-qglr0QN0ca6waxhwEFgYP9RHvTJ4YVn90vl+crcktao="; + sha256 = "sha256-yC5b3OEylIOS4lWz+ZiHHy3ShLjkaNzDt4dX1E87iR0="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix index e8eb6a8b86..017501ded0 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-facebook/default.nix @@ -1,9 +1,9 @@ -{ enableSystemd ? stdenv.isLinux +{ lib +, stdenv , fetchFromGitHub , fetchpatch -, lib , python3 -, stdenv +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform python3.pkgs.systemd }: python3.pkgs.buildPythonPackage rec { diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix index db1f7c6d1f..7438966345 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-googlechat/default.nix @@ -1,17 +1,19 @@ -{ fetchFromGitHub, fetchpatch +{ fetchFromGitHub +, fetchpatch , lib , python3 -, protobuf3_20 -, enableE2be ? true, enableMetrics ? true, enableSqlite ? true +, enableE2be ? true +, enableMetrics ? true +, enableSqlite ? true }: python3.pkgs.buildPythonApplication rec { pname = "mautrix-googlechat"; - version = "0.4.0"; + version = "unstable-2023-01-25"; src = fetchFromGitHub { owner = "mautrix"; repo = "googlechat"; - rev = "v${version}"; - sha256 = "sha256-UVWYT0HTOUEkBG0n6KNhCSSO/2PAF1rIvCaw478z+q0="; + rev = "e2eb528745466468f059c506c22e500e0cd832aa"; + sha256 = "sha256-FNlEHzuy89RuFUwZPmVA+4AmpQHGD+18BguGC6qBdBM="; }; patches = [ @@ -24,13 +26,6 @@ }) ]; - doCheck = false; - - postPatch = '' - sed -i requirements.txt \ - -e 's/asyncpg>=.*/asyncpg/' - ''; - baseConfigPath = "share/mautrix-googlechat/example-config.yaml"; postInstall = '' rm $out/example-config.yaml @@ -43,8 +38,12 @@ pycryptodome unpaddedbase64 ]; - metrics = [ prometheus-client ]; - sqlite = [ aiosqlite ]; + metrics = [ + prometheus-client + ]; + sqlite = [ + aiosqlite + ]; }; propagatedBuildInputs = with python3.pkgs; [ @@ -54,14 +53,14 @@ ruamel-yaml CommonMark python-magic - (protobuf.override { - protobuf = protobuf3_20; - }) + protobuf3 mautrix ] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be ++ lib.optionals enableMetrics passthru.optional-dependencies.metrics ++ lib.optionals enableSqlite passthru.optional-dependencies.sqlite; + doCheck = false; + meta = with lib; { homepage = "https://github.com/mautrix/googlechat"; description = "A Matrix-Google Chat puppeting bridge"; diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix index 5322947642..8ff6f1d366 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix @@ -2,15 +2,29 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-signal"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; rev = "refs/tags/v${version}"; - sha256 = "sha256-WcyBv7b1JxiZJSqxgAUUgTa5Q/aNzU9SfXfdXKVuuXQ="; + sha256 = "sha256-UbetU1n9zD/mVFaJc9FECDq/Zell1TI/aYPsGXGB8Js="; }; + postPatch = '' + # the version mangling in mautrix_signal/get_version.py interacts badly with pythonRelaxDepsHook + substituteInPlace setup.py \ + --replace 'version=version' 'version="${version}"' + ''; + + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "mautrix" + ]; + propagatedBuildInputs = with python3.pkgs; [ CommonMark aiohttp @@ -31,12 +45,6 @@ python3.pkgs.buildPythonPackage rec { doCheck = false; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "asyncpg>=0.20,<0.26" "asyncpg>=0.20" \ - --replace "mautrix>=0.16.0,<0.17" "mautrix>=0.16.0" - ''; - postInstall = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix index 468df32bbd..2284a677b6 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix @@ -9,28 +9,31 @@ let python = python3.override { packageOverrides = self: super: { tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { - version = "1.27.0a1"; + version = "1.27.0a7"; pname = "tulir-telethon"; src = super.fetchPypi { inherit pname version; - sha256 = "sha256-tABAY4UlTyMK1ZafIFawegjBAtcnq3HMNbE1L6WaT3E="; + sha256 = "sha256-w4WILvLvJBKf3Nlj0omTCDDD4z+b0XFlCplQ/IHwIPs="; }; doCheck = false; }); }; }; -in python.pkgs.buildPythonPackage rec { +in +python.pkgs.buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.12.2"; + version = "unstable-2023-01-28"; disabled = python.pythonOlder "3.8"; src = fetchFromGitHub { owner = "mautrix"; repo = "telegram"; - rev = "v${version}"; - sha256 = "sha256-htCk0VLr6GfXbpYWF/2bmpko7gSVlkH6HwDjOMhW8is="; + rev = "f12abbe03846fd5897d58572ab24b70a58b337d2"; + sha256 = "sha256-5ZZ85FOmTO26q2zhAIsF7mTlN4BLNLW2dQF+0culkUM="; }; + format = "setuptools"; + patches = [ ./0001-Re-add-entrypoint.patch ]; propagatedBuildInputs = with python.pkgs; ([ @@ -43,19 +46,24 @@ in python.pkgs.buildPythonPackage rec { tulir-telethon asyncpg Mako - # optional + # speedups cryptg - cchardet aiodns brotli + # qr_login pillow qrcode + # formattednumbers phonenumbers + # metrics prometheus-client + # sqlite aiosqlite ] ++ lib.optionals withHQthumbnails [ + # hq_thumbnails moviepy ] ++ lib.optionals withE2BE [ + # e2be python-olm pycryptodome unpaddedbase64 diff --git a/third_party/nixpkgs/pkgs/servers/mbusd/default.nix b/third_party/nixpkgs/pkgs/servers/mbusd/default.nix new file mode 100644 index 0000000000..7db22dab8e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/mbusd/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: + +stdenv.mkDerivation rec { + pname = "mbusd"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "3cky"; + repo = "mbusd"; + rev = "v${version}"; + hash = "sha256-vYYaJKcnREng+2UsDIZ28hvANkQCHVixQIxo82m7MQs="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + meta = with lib; { + description = "Modbus TCP to Modbus RTU (RS-232/485) gateway"; + homepage = "https://github.com/3cky/mbusd"; + changelog = "https://github.com/3cky/mbusd/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/memcached/default.nix b/third_party/nixpkgs/pkgs/servers/memcached/default.nix index 9d83d12f3e..83721ed601 100644 --- a/third_party/nixpkgs/pkgs/servers/memcached/default.nix +++ b/third_party/nixpkgs/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.17"; + version = "1.6.18"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-IFXjc2E9j8IVKa/58K3OPiO5zgG6BHjTDnlB2fK9EiQ="; + sha256 = "sha256-y91quIEGSaxdkvzQ/LDKkx2Knb0K2MxXW0ciLu3WQVg="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/metabase/default.nix b/third_party/nixpkgs/pkgs/servers/metabase/default.nix index 42efd0e115..78eea7364a 100644 --- a/third_party/nixpkgs/pkgs/servers/metabase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.45.1"; + version = "0.45.2.1"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-FfX/+SIJWnSSqTf0yH0xCDWbBdXbzVSoQESHCO5oQ4s="; + hash = "sha256-m891fWpY0W100MFyYtiL6fcZPrEW34cdo+61dj7cJvM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix index 8e657e1edc..5e24e5e9a8 100644 --- a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix +++ b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.41"; + version = "2.0.42"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = "v2"; rev = version; - sha256 = "sha256-NhxzpNtRzLE9bVWIGSHwnok7RjqRp8Uan9uCvdigAyk="; + sha256 = "sha256-2ywaQubE/DZCTIX6a3vh1VH+/lfoe9gRzkqih8ULU8Q="; }; - vendorSha256 = "sha256-906gMXI6zEIIcXvT/ZqAM+5F0GVHbipUtdrPO6+32KQ="; + vendorSha256 = "sha256-KtYFjNqUIYgAwIkEhQwg5OdjIluyENeZ6Qo5TGKzA/s="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index c513f0e860..46167ebc9a 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-12-12T19-27-27Z"; + version = "2023-01-25T00-19-54Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-gHtWLCmjzaN1+7x5w9QKjF1pGNZB9mIun2KnvQyVnE4="; + sha256 = "sha256-1vXi9BnjTCH7B/I7tkfvm2AZtLK7a0GcMsW9gud8U/4="; }; - vendorSha256 = "sha256-0ryxdAdixnUbp3kj5KN2CB4t153azfYML75T4ROMoHw="; + vendorHash = "sha256-NGuslbHh0tDPQp+zvKnylLkssMglhgesLX5VT2BjDo8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/mir/default.nix b/third_party/nixpkgs/pkgs/servers/mir/default.nix index 03d9f85f43..7d629ddb68 100644 --- a/third_party/nixpkgs/pkgs/servers/mir/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mir/default.nix @@ -23,7 +23,7 @@ , libxcb , libxkbcommon , libxmlxx -, libyamlcpp +, yaml-cpp , lttng-ust , mesa , nettle @@ -49,38 +49,30 @@ in stdenv.mkDerivation rec { pname = "mir"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "MirServer"; repo = "mir"; rev = "v${version}"; - hash = "sha256-103PJZEoSgtSbDGCanD2/XdpX6DXXx678GmghdZI7H4="; + hash = "sha256-HQmcYnmzeJCsgMoM/y70PCF+3umZh0xJS5S0wFODlmo="; }; patches = [ - # These four patches fix various path concatenation problems and missing GNUInstallDirs variable uses that affect + # Fixes various path concatenation problems and missing GNUInstallDirs variable uses that affect # install locations and generated pkg-config files - # Remove when MirServer/mir/pull/2786 merged & a version > 2.11.0 has the fixes + # Remove when a version > 2.12.0 has the fixes (fetchpatch { - name = "0001-mir-Better-pkg-config-path-concatenations.patch"; - url = "https://github.com/MirServer/mir/pull/2786/commits/a322be08002ae7b2682d3ca7037c314ce900d3c7.patch"; - hash = "sha256-6nScVan3eefXZb+0T9TvCjRQt+rCMj27sukpdGMVJzY="; + name = "0001-mir-Better-install-path-concatenations-and-more-GNUInstallDirs-variables.patch"; + url = "https://github.com/MirServer/mir/commit/58c4ca628748278b1eb7a3721ad9a0c3590e28f2.patch"; + hash = "sha256-+FNVlApaVzA94cy4awulLwTtggD07xACbvjII/RxyRM="; }) + # Fixes doc building + # Remove when a version > 2.12.0 has the fix (fetchpatch { - name = "0002-mir-Improve-mirtest-pkg-config.patch"; - url = "https://github.com/MirServer/mir/pull/2786/commits/7a739fde27f5f5eff0ec33f766a807c3ff462663.patch"; - hash = "sha256-C2cDN4R0C4654Km27PJwKrNiFi/d0iz9/rcABS6eRVI="; - }) - (fetchpatch { - name = "0003-mir-Fix-GNUInstallDirs-variable-concatenations-in-CMake.patch"; - url = "https://github.com/MirServer/mir/pull/2786/commits/543e1ec0162f95611b282d33a2e81a642dc75374.patch"; - hash = "sha256-nxgj8tTfSqjRxqi67hAuWM9d604TAwhNjUXwGDAEW6A="; - }) - (fetchpatch { - name = "0004-mir-More-GNUInstallDirs-variables-less-FULL.patch"; - url = "https://github.com/MirServer/mir/pull/2786/commits/0cb0a1d5e3ac4aca25ca2ebacdcb984d7ff3a66a.patch"; - hash = "sha256-rnDvr8ul/GgajHYbpale+szNE6VDgENRY6PnBhfGMN8="; + name = "0002-mir-better-removal-of-existing-docs.patch"; + url = "https://github.com/MirServer/mir/commit/04892531c988201f0219ce140f27d7ff60eeebd5.patch"; + hash = "sha256-LyGgaIoe6mk4IQxBo6Xk5SmIBtTXOXAOA1xAgsdhcLY="; }) ]; @@ -100,16 +92,6 @@ stdenv.mkDerivation rec { --replace 'LD_PRELOAD=libumockdev-preload.so.0' 'LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0' done - # Patch in which tests we want to skip - substituteInPlace cmake/MirCommon.cmake \ - --replace 'set(test_exclusion_filter)' 'set(test_exclusion_filter "${lib.strings.concatStringsSep ":" [ - # These all fail in the same way: GDK_BACKEND expected to have "wayland", actually has "wayland,x11". - # They succeed when run interactively, don't know how to fix them. - "ExternalClient.empty_override_does_nothing" - "ExternalClient.strange_override_does_nothing" - "ExternalClient.another_strange_override_does_nothing" - ]}")' - # Fix Xwayland default substituteInPlace src/miral/x11_support.cpp \ --replace '/usr/bin/Xwayland' '${xwayland}/bin/Xwayland' @@ -124,10 +106,6 @@ stdenv.mkDerivation rec { substituteInPlace cmake/Doxygen.cmake \ --replace '"date"' '"date" "--date=@'"$SOURCE_DATE_EPOCH"'"' \ --replace "\''${CMAKE_INSTALL_PREFIX}/share/doc/mir-doc" "\''${CMAKE_INSTALL_DOCDIR}" - - # Not installed on Mir HEAD anymore, hence not part of the MirServer/mir/pull/2786 patches - substituteInPlace examples/miral-kiosk/CMakeLists.txt \ - --replace "\''${CMAKE_INSTALL_PREFIX}/bin" "\''${CMAKE_INSTALL_BINDIR}" ''; strictDeps = true; @@ -158,7 +136,7 @@ stdenv.mkDerivation rec { libxcb libxkbcommon libxmlxx - libyamlcpp + yaml-cpp lttng-ust mesa nettle @@ -174,7 +152,7 @@ stdenv.mkDerivation rec { wlcs ]; - checkInputs = [ + nativeCheckInputs = [ dbus ]; @@ -183,8 +161,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DMIR_PLATFORM='gbm-kms;x11;eglstream-kms;wayland'" "-DMIR_ENABLE_TESTS=${if doCheck then "ON" else "OFF"}" - # Eventually renamed to MIR_SIGBUS_HANDLER_ENVIRONMENT_BROKEN - "-DMIR_BAD_BUFFER_TEST_ENVIRONMENT_BROKEN=ON" + # BadBufferTest.test_truncated_shm_file *doesn't* throw an error as the test expected, mark as such + # https://github.com/MirServer/mir/pull/1947#issuecomment-811810872 + "-DMIR_SIGBUS_HANDLER_ENVIRONMENT_BROKEN=ON" + "-DMIR_EXCLUDE_TESTS=${lib.strings.concatStringsSep ";" [ + ]}" # These get built but don't get executed by default, yet they get installed when tests are enabled "-DMIR_BUILD_PERFORMANCE_TESTS=OFF" "-DMIR_BUILD_PLATFORM_TEST_HARNESS=OFF" @@ -193,9 +174,13 @@ stdenv.mkDerivation rec { inherit doCheck; preCheck = '' - export XDG_RUNTIME_DIR=$TMPDIR + # Needs to be exactly /tmp so some failing tests don't get run, don't know why they fail yet + # https://github.com/MirServer/mir/issues/2801 + export XDG_RUNTIME_DIR=/tmp ''; + checkTarget = "ptest"; + outputs = [ "out" "dev" "doc" ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/servers/mirrorbits/default.nix b/third_party/nixpkgs/pkgs/servers/mirrorbits/default.nix index 759ac94e56..b85be770e7 100644 --- a/third_party/nixpkgs/pkgs/servers/mirrorbits/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mirrorbits/default.nix @@ -1,42 +1,41 @@ -{ lib, buildGoPackage, fetchFromGitHub, fetchpatch -, pkg-config, zlib, geoip }: +{ lib +, buildGoModule +, fetchFromGitHub +, fetchpatch +, pkg-config +, zlib +, geoip +}: -buildGoPackage rec { +buildGoModule rec { pname = "mirrorbits"; - version = "0.4"; - rev = "v${version}"; + version = "0.5.1"; src = fetchFromGitHub { - inherit rev; owner = "etix"; repo = "mirrorbits"; - sha256 = "11f9wczajba147qk5j73pxjrvlxkgr598sjvgjn2b8nxm49g2pan"; + rev = "v${version}"; + hash = "sha256-Ta3+Y3P74cvx09Z4rB5ObgBZtfF4grVgyeZ57yFPlGM="; }; + vendorHash = null; + patches = [ + # Add Go Modules support (fetchpatch { - url = "https://github.com/etix/mirrorbits/commit/03a4e02214bdb7bb60240ddf25b887ccac5fb118.patch"; - sha256 = "08332cfxmp2nsfdj2ymg3lxkav8h44f6cf2h6g9jkn03mkliblm5"; + url = "https://github.com/etix/mirrorbits/commit/955a8b2e1aacea1cae06396a64afbb531ceb36d4.patch"; + hash = "sha256-KJgj3ynnjjiXG5qsUmzBiMjGEwfvM/9Ap+ZgUdhclik="; }) ]; - postPatch = '' - rm -rf testing - ''; - - # Fix build with go >=1.12 - preBuild = '' - sed -i s/"_Ctype_struct_GeoIPRecordTag"/"C.struct_GeoIPRecordTag"/ ./go/src/github.com/etix/geoip/geoip.go - ''; - - goPackagePath = "github.com/etix/mirrorbits"; - deleteVendor = true; - goDeps = ./deps.nix; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib geoip ]; - meta = { + subPackages = [ "." ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { description = "geographical download redirector for distributing files efficiently across a set of mirrors"; homepage = "https://github.com/etix/mirrorbits"; longDescription = '' @@ -47,8 +46,8 @@ buildGoPackage rec { the distribution of large-scale Open-Source projects with a lot of traffic. ''; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fpletz ]; - platforms = lib.platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mirrorbits/deps.nix b/third_party/nixpkgs/pkgs/servers/mirrorbits/deps.nix deleted file mode 100644 index 3736541266..0000000000 --- a/third_party/nixpkgs/pkgs/servers/mirrorbits/deps.nix +++ /dev/null @@ -1,66 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/etix/geoip"; - fetch = { - type = "git"; - url = "https://github.com/etix/geoip"; - rev = "db8457352061099b2a1840c712b3223900216588"; - sha256 = "1768237bngcjgw0s8wba0f4nw1xahg28cq2nd6vrbmhavd1ppim9"; - }; - } - { - goPackagePath = "github.com/etix/goftp"; - fetch = { - type = "git"; - url = "https://github.com/etix/goftp"; - rev = "0c13163a1028e83f0f1cce113dddd3900e935bc7"; - sha256 = "15kwk57yk63j28d1lwrykc9nr7ickqgk2fpw4g0b0404b95l101k"; - }; - } - { - goPackagePath = "github.com/garyburd/redigo"; - fetch = { - type = "git"; - url = "https://github.com/garyburd/redigo"; - rev = "70e1b1943d4fc9c56791abaa6f4d1e727b9ab925"; - sha256 = "1nw22r0vagmayjg51rz55yi9ppkd60ya0nzmp113mcz25vhxa0d0"; - }; - } - { - goPackagePath = "github.com/op/go-logging"; - fetch = { - type = "git"; - url = "https://github.com/op/go-logging"; - rev = "970db520ece77730c7e4724c61121037378659d9"; - sha256 = "1cpna2x5l071z1vrnk7zipdkka8dzwsjyx7m79xk0lr08rip0kcj"; - }; - } - { - goPackagePath = "github.com/youtube/vitess"; - fetch = { - type = "git"; - url = "https://github.com/youtube/vitess"; - rev = "6cf14dbf97f28eebd37dc2bc36374852946336a8"; - sha256 = "1g76q84wipyprn05brpjxf8xri87293r7nyf647crjy5d9k950lz"; - }; - } - { - goPackagePath = "gopkg.in/tylerb/graceful.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/tylerb/graceful.v1"; - rev = "4654dfbb6ad53cb5e27f37d99b02e16c1872fbbb"; - sha256 = "1qspbrzr3h6c89v75c99avn7iizkfnjh901wp650vyy0j3p6ydnd"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; - sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix index bf1bc6fa34..ac778cd6d5 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, systemd, nixosTests }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, systemd, nixosTests }: buildGoModule rec { pname = "grafana-agent"; @@ -38,7 +38,7 @@ buildGoModule rec { # uses go-systemd, which uses libsystemd headers # https://github.com/coreos/go-systemd/issues/351 - NIX_CFLAGS_COMPILE = [ "-I${lib.getDev systemd}/include" ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isLinux [ "-I${lib.getDev systemd}/include" ]; # tries to access /sys: https://github.com/grafana/agent/issues/333 preBuild = '' @@ -48,7 +48,7 @@ buildGoModule rec { # go-systemd uses libsystemd under the hood, which does dlopen(libsystemd) at # runtime. # Add to RUNPATH so it can be found. - postFixup = '' + postFixup = lib.optionalString stdenv.isLinux '' patchelf \ --set-rpath "${lib.makeLibraryPath [ (lib.getLib systemd) ]}:$(patchelf --print-rpath $out/bin/agent)" \ $out/bin/agent @@ -61,6 +61,5 @@ buildGoModule rec { license = licenses.asl20; homepage = "https://grafana.com/products/cloud"; maintainers = with maintainers; [ flokli ]; - platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 56a6f1e1a0..952a9f94ce 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -12,13 +12,13 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.6.1"; + version = "3.6.3"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - sha256 = "sha256-x+kGouF/7ltKdYfNO2EI8F4FKWYClcyigcUVfZlud00="; + sha256 = "sha256-5oER0KMhBBu8AiawxHNoYIV+farcLBjB8HpO+1UluSY="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 02f0ed567b..71377d55b7 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 = "9.3.1"; + version = "9.3.6"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-XZsR6h7qG2EYKv0Zr/ZjDf4WqF16khqFzYIF3ekQ08c="; + sha256 = "sha256-7t30AvGtCyU02fOYWHYcMWgcnmkepUpZzUMR4NjIlvw="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-7LIcSPxvueQYxeofzmtvvlnSboeo+TOF6xVA+g+oHqE="; + sha256 = "sha256-jRUPrb6ocqux4SrMm/Hw/2DuG7sj2jKhSln16ynjHwM="; }; - vendorSha256 = "sha256-oV440W9r6b74JaY8Ej2OEIPpxhdUmjq77RJOoJb6Upw="; + vendorSha256 = "sha256-uGJ3D14qAvDkBUIlNxF1pCHMDYeuUoM8tPWfoEvA5o4="; nativeBuildInputs = [ wire ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix index 1ffbe6004b..59425cfcf6 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison patchelf ]; doCheck = true; - checkInputs = [ tzdata ]; # legacytimeperiod/dst needs this + nativeCheckInputs = [ tzdata ]; # legacytimeperiod/dst needs this postFixup = '' rm -r $out/etc/logrotate.d $out/etc/sysconfig $out/lib/icinga2/prepare-dirs diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix index d614f699d1..1ce82c1331 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/lcdproc/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Client/server suite for controlling a wide variety of LCD devices"; - homepage = "http://lcdproc.org/"; + homepage = "https://lcdproc.org/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 871f2b0c40..58d795793f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -8,20 +8,16 @@ }: buildGoModule rec { - version = "2.6.1"; + version = "2.7.1"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "sha256-6g0tzI6ZW+wwbPrNTdj0t2H0/M8+M9ioJl6iPL0mAtY="; + sha256 = "sha256-k/HfFeVQBubKMYERhgXKN0Pma1oj9xz1wxlHIjikAzo="; }; - patches = [ - ./go119.patch - ]; - vendorSha256 = null; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/loki/go119.patch b/third_party/nixpkgs/pkgs/servers/monitoring/loki/go119.patch deleted file mode 100644 index d67c0f1f60..0000000000 --- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/go119.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/go.mod b/go.mod -index f6b5af8bb..3b0598d16 100644 ---- a/go.mod -+++ b/go.mod -@@ -265,7 +265,7 @@ require ( - go.uber.org/multierr v1.7.0 // indirect - go.uber.org/zap v1.19.1 // indirect - go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect -- go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect -+ go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect - golang.org/x/mod v0.5.1 // indirect - golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect -diff --git a/go.sum b/go.sum -index bf4a83f17..1b52f1793 100644 ---- a/go.sum -+++ b/go.sum -@@ -2028,8 +2028,9 @@ go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= - go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= - go4.org/intern v0.0.0-20211027215823-ae77deb06f29 h1:UXLjNohABv4S58tHmeuIZDO6e3mHpW2Dx33gaNt03LE= - go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA= --go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 h1:Tx9kY6yUkLge/pFG7IEMwDZy6CS2ajFc9TvQdPCW0uA= - go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= -+go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4= -+go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= - golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20180505025534-4ec37c66abab/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= - golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -@@ -2345,11 +2346,9 @@ golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7w - golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= --golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= - golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -diff --git a/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go b/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go -index 01377f77e..da4d943f6 100644 ---- a/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go -+++ b/vendor/go4.org/unsafe/assume-no-moving-gc/untested.go -@@ -2,8 +2,8 @@ - // Use of this source code is governed by a BSD-style - // license that can be found in the LICENSE file. - --//go:build go1.19 --// +build go1.19 -+//go:build go1.20 -+// +build go1.20 - - package assume_no_moving_gc - -diff --git a/vendor/modules.txt b/vendor/modules.txt -index 7bef3766d..0cde8aac9 100644 ---- a/vendor/modules.txt -+++ b/vendor/modules.txt -@@ -1178,7 +1178,7 @@ go.uber.org/zap/zapgrpc - # go4.org/intern v0.0.0-20211027215823-ae77deb06f29 - ## explicit; go 1.13 - go4.org/intern --# go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 -+# go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 - ## explicit; go 1.11 - go4.org/unsafe/assume-no-moving-gc - # golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix index cae036926f..70ac2f3ab9 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.73.1"; + version = "0.74.1"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zbzTKMvadp9+KbHm2utJM84MPb80+zjR8hUHHTtzSdc="; + sha256 = "sha256-c1CywtgvVORkDewFB9iz99aUT5gFi5vXWddGZGLFu7o="; }; nativeBuildInputs = [ makeWrapper ]; - checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; + nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorSha256 = "sha256-GuaBdqiqKUhYySYlJlJIR1NhUx7LuCqcUSXfLTkIvQI="; + vendorHash = "sha256-281Qz57n5qAOoqLofTFv5UcLs0xVz8iyV9yxDdsuljE="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index bd1a5f2758..a734c65433 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.57.0"; + version = "2.58.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-N+VkdVeJ6UdRPFUFmIpZoL/Mc8MkTd+hAPjha5pimt8="; + hash = "sha256-nQE3UMZcIR063JuZkTN49imDYQGGnNzE1yaeR4k4mWY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix index fb2d9c5f4e..9904147420 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_systemd.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { find test -name "*.py" -execdir sed -i "s@./check_systemd.py@$out/bin/check_systemd@" '{}' ";" export PATH=$PATH:$out/bin ''; - checkInputs = [ python3Packages.pytestCheckHook ]; + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; meta = with lib; { description = "Nagios / Icinga monitoring plugin to check systemd for failed units"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index 031da1c684..5f951f308d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -6,14 +6,14 @@ buildGoModule rec { pname = "artifactory_exporter"; - version = "1.10.0"; + version = "1.11.0"; rev = "v${version}"; src = fetchFromGitHub { owner = "peimanja"; repo = pname; rev = rev; - hash = "sha256-Yzdh9xpgPLbN9J5oBvrrPuVMTq2F3mpE544sAo7gmng="; + hash = "sha256-dUAIPS2o+uvCGX32AgknynT0Mzzbq/7SeNmKN0Xc69o="; }; vendorHash = "sha256-5yzBKgjJCv4tgdBS6XmZUq1ebbka0LOuv6BARWO7kQg="; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index 2d2439b4c2..ade935f16d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.40.3"; + version = "2.41.0"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - sha256 = "sha256-dvMts9uJNLSp8Qho+yKMLPTy/1c2RgfeEn3UQLIZNc4="; + sha256 = "sha256-0EFeAuhQUu+4TCoHsWHTbWTGJLjS37POacP1K42sGqI="; }; in buildGoModule rec { @@ -45,10 +45,10 @@ buildGoModule rec { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "sha256-Jg8loH0Sji1MmDXUnMtvLTHjNGmkrzZApxvpe2+OqtU="; + sha256 = "sha256-J3KDN02m639bUGrnUrqeCLferrqIHaJ2VEBjIqfm/GY="; }; - vendorSha256 = "sha256-aRVoEgP84ITQ1D0PsFVJUKH/Uin7s80iQCwzgrfpjoM="; + vendorSha256 = "sha256-4Of1euBp5Lka6Bb2UJYUQuRa7t2/B1HaXCWSOqCASYw="; excludedPackages = [ "documentation/prometheus-mixin" ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index 9e622b69d8..f1044ca4f8 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { ] ++ uvicorn.optional-dependencies.standard; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ aiohttp pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/kthxbye.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/kthxbye.nix index ab7812081f..897a58926d 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/kthxbye.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/kthxbye.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kthxbye"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub rec { owner = "prymitive"; repo = "kthxbye"; rev = "v${version}"; - hash = "sha256-N1MzutjzLk9MnE1b7dKRsiS7LL4Nb61+NpmjTBPGohI="; + hash = "sha256-B6AgD79q0kA67iC9pIfv8PH8xejx2srpRccdds1GsZo="; }; - vendorHash = "sha256-PtINxblqX/wxJyN42mS+hmwMy0lCd6FcQgmBnxTUdcc="; + vendorHash = "sha256-BS9+2w18tvrgmPzRMP0XyUlyPAR9AJMLXUd3GYEJr8E="; buildPhase = '' make -j$NIX_BUILD_CORES diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix index afe28b690f..44d86af895 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "redis_exporter"; - version = "1.45.0"; + version = "1.46.0"; src = fetchFromGitHub { owner = "oliver006"; repo = "redis_exporter"; rev = "v${version}"; - sha256 = "sha256-5KiqVrhb/yEaxgLJ3SB/WHNOfCbPzfJcgdPZ2kuNFEY="; + sha256 = "sha256-5OZ4DuGIVMw0Yvd4JC+dbX01RAUAZHmROzl+7Pd6+tc="; }; - vendorSha256 = "sha256-SBag82QLLPeGowt10edaAnUWI36i71Ps0pdixiAXVB8="; + vendorHash = "sha256-p6C/j1591cmPtIvBH1022YRkfBo07KQ8fqUwJ5YIUn8="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/shelly-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/shelly-exporter.nix new file mode 100644 index 0000000000..ee8002e661 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/shelly-exporter.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "shelly_exporter"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "aexel90"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-L0TuBDq5eEahQvzqd1WuvmXuQbbblCM+Nvj15IybnVo="; + }; + + vendorSha256 = "sha256-BCrge2xLT4b4wpYA+zcsH64a/nfV8+HeZF7L49p2gEw="; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) shelly; }; + + meta = with lib; { + description = "Shelly humidity sensor exporter for prometheus"; + homepage = "https://github.com/aexel90/shelly_exporter"; + license = licenses.asl20; + maintainers = with maintainers; [drupol]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index 2a1368bfcb..f9d9ce499b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec { pyyaml ]); - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ unittestCheckHook pytz ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/zfs-exporter.nix index 8f0be0901e..488d3e22e6 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/zfs-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/zfs-exporter.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zfs_exporter"; - version = "2.2.5"; + version = "2.2.7"; src = fetchFromGitHub { owner = "pdf"; repo = pname; rev = "v" + version; - hash = "sha256-FY3P2wmNWyr7mImc1PJs1G2Ae8rZvDzq0kRZfiRTzyc="; + hash = "sha256-bc9bmGrRGhm58JzrVLLJBUc1zaGXqz2fqx+ZphidFbc="; }; - vendorSha256 = "sha256-jQiw3HlqWcsjdadDdovCsDMBB3rnWtacfbtzDb5rc9c="; + vendorHash = "sha256-jQiw3HlqWcsjdadDdovCsDMBB3rnWtacfbtzDb5rc9c="; postInstall = '' install -Dm444 -t $out/share/doc/${pname} *.md diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/unpoller/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/unpoller/default.nix index a49fef47f5..9cd912865e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/unpoller/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.4.1"; + version = "2.7.11"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-t4f7iAIOg19n1aKG0tQy/GHNXdVAEnaRyTXMZY+1IUw="; + hash = "sha256-/tGmMeHrurKTaRQLHusOkjISuxrrT/JjUCimEL7zoIk="; }; - vendorHash = "sha256-GUzMu3ltdmFCKKWi9Hlr39rNe5uPnZpwQfhVAHtbeiw="; + vendorHash = "sha256-ZwJCqL8vU38k8pfNmKGIhJSgMwxQuzBBfl6IduQrQEw="; ldflags = [ "-w" "-s" diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix index 83d8e1a9d5..943ee9ce15 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/default.nix @@ -4,16 +4,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uptime-kuma"; - version = "1.19.2"; + version = "1.19.6"; src = fetchFromGitHub { owner = "louislam"; repo = "uptime-kuma"; rev = finalAttrs.version; - sha256 = "yWQ3O3sCW6YKpE8BKgJjrKmLD9NyccaqyzQOXlSCC8I="; + sha256 = "sha256-Hk0me4VPP8vKp4IhzQKjjhM2BWLGSHnN7JiDJu2WlE8="; }; - uiSha256 = "sha256-aaQB1S8PmWU7brncRwEHG5bWEcyxD3amaq7Z6vpP92o="; + uiSha256 = "sha256-oeXklGxAPsUoLRT6DAVRgWm0kvKbLFW4IBc0Rh3j5V4="; patches = [ # Fixes the permissions of the database being not set correctly @@ -21,13 +21,6 @@ stdenv.mkDerivation (finalAttrs: { ./fix-database-permissions.patch ]; - postPatch = '' - substituteInPlace server/ping-lite.js \ - --replace "/bin/ping" "${iputils}/bin/ping" \ - --replace "/sbin/ping6" "${iputils}/bin/ping" \ - --replace "/sbin/ping" "${iputils}/bin/ping" - ''; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/node-packages.nix b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/node-packages.nix index 41dfb46aa6..d840c3968b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/node-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/node-packages.nix @@ -112,13 +112,13 @@ let sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; }; }; - "@azure/msal-browser-2.32.0" = { + "@azure/msal-browser-2.32.1" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.32.0"; + version = "2.32.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.0.tgz"; - sha512 = "uDP0vNmIefM6+RjILGKu+zOiN+VGnEvxRfUIV5hOWOWLLkG7kcDPYG/v/EJMoG+R5DYW9jXA5nvZT76t5HdEAQ=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.1.tgz"; + sha512 = "2G3B12ZEIpiimi6/Yqq7KLk4ud1zZWoHvVd2kJ2VthN1HjMsZjdMUxeHkwMWaQ6RzO6mv9rZiuKmRX64xkXW9g=="; }; }; "@azure/msal-common-7.6.0" = { @@ -130,31 +130,40 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-common-9.0.0" = { + "@azure/msal-common-9.0.1" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.0.tgz"; - sha512 = "uiFiFKVNTsRpmKio5bcObTuHcaHHZB2GEsjJJN8rbJNmzoYuZzNioOoK+J0QK0jEasRBgAoR5A8hSty2iKRzIg=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.1.tgz"; + sha512 = "eNNHIW/cwPTZDWs9KtYgb1X6gtQ+cC+FGX2YN+t4AUVsBdUbqlMTnUs6/c/VBxC2AAGIhgLREuNnO3F66AN2zQ=="; }; }; - "@azure/msal-node-1.14.4" = { + "@azure/msal-common-9.0.2" = { + name = "_at_azure_slash_msal-common"; + packageName = "@azure/msal-common"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.2.tgz"; + sha512 = "qzwxuF8kZAp+rNUactMCgJh8fblq9D4lSqrrIxMDzLjgSZtjN32ix7r/HBe8QdOr76II9SVVPcMkX4sPzPfQ7w=="; + }; + }; + "@azure/msal-node-1.14.6" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.14.4"; + version = "1.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.4.tgz"; - sha512 = "j9GzZu5mTLWtuJ+cYN6e67UNymIS5OysblrOzH8lakt9XxH0GCPYjuqbOEKTP84r+Rbj3io+TuW1KS+0Xxuj/g=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz"; + sha512 = "em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA=="; }; }; - "@babel/runtime-7.20.1" = { + "@babel/runtime-7.20.7" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.20.1"; + version = "7.20.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.1.tgz"; - sha512 = "mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz"; + sha512 = "UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ=="; }; }; "@breejs/later-4.1.0" = { @@ -175,22 +184,31 @@ let sha512 = "H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog=="; }; }; - "@grpc/proto-loader-0.7.3" = { + "@grpc/proto-loader-0.7.4" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.3.tgz"; - sha512 = "5dAvoZwna2Py3Ef96Ux9jIkp3iZ62TUsV00p3wVBPNX5K178UbNi8Q7gQVqwXT1Yq9RejIGG9G2IPEo93T6RcA=="; + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.4.tgz"; + sha512 = "MnWjkGwqQ3W8fx94/c1CwqLsNmHHv2t0CFn+9++6+cDphC1lolpg9M2OU0iebIjK//pBNX9e94ho+gjx6vz39w=="; }; }; - "@js-joda/core-5.4.2" = { + "@js-joda/core-5.5.1" = { name = "_at_js-joda_slash_core"; packageName = "@js-joda/core"; - version = "5.4.2"; + version = "5.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@js-joda/core/-/core-5.4.2.tgz"; - sha512 = "QIDIZ9a0NfDStgD47VaTgwiPjlw1p4QPLwjOB/9+/DqIztoQopPNNAd+HdtQMHgE+ibP3dJacd8/TVL/A1RaaA=="; + url = "https://registry.npmjs.org/@js-joda/core/-/core-5.5.1.tgz"; + sha512 = "oTFmkyv5MhgkHdZhoe5lwRoKW0t4njPvK3g7ODvK/prkoC5bwylKcyQJMsmjvgHBXoy4u5iLnB5yQ7AljouHAA=="; + }; + }; + "@louislam/ping-0.4.2-mod.1" = { + name = "_at_louislam_slash_ping"; + packageName = "@louislam/ping"; + version = "0.4.2-mod.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@louislam/ping/-/ping-0.4.2-mod.1.tgz"; + sha512 = "KkRDo8qcF9kzzR0Hh8Iqz+XNnzKOdobUquP7UyBYrjxAB1jNT3qO0gvAZeDUknF28LXBPSzkiVlf1NG+tb/iyQ=="; }; }; "@louislam/sqlite3-15.1.2" = { @@ -382,13 +400,13 @@ let sha512 = "h7BcvPUogWbKCzBR2lY4oqaZbO3jXZksexYJVFvkrFeLgbZjQkU4x8pRq6eg2MHXQhY0McQdqmmsxRWlVAHooA=="; }; }; - "@types/cors-2.8.12" = { + "@types/cors-2.8.13" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.12"; + version = "2.8.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz"; - sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz"; + sha512 = "RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA=="; }; }; "@types/es-aggregate-error-1.0.2" = { @@ -400,22 +418,22 @@ let sha512 = "erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA=="; }; }; - "@types/express-4.17.14" = { + "@types/express-4.17.15" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.14"; + version = "4.17.15"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz"; - sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.15.tgz"; + sha512 = "Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ=="; }; }; - "@types/express-serve-static-core-4.17.31" = { + "@types/express-serve-static-core-4.17.32" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.31"; + version = "4.17.32"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz"; - sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.32.tgz"; + sha512 = "aI5h/VOkxOF2Z1saPy0Zsxs5avets/iaiAJYznQFm5By/pamU31xWKL//epiF4OfUA2qTOc9PV6tCUjhO8wlZA=="; }; }; "@types/http-assert-1.5.3" = { @@ -463,13 +481,13 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.190" = { + "@types/lodash-4.14.191" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.190"; + version = "4.14.191"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.190.tgz"; - sha512 = "5iJ3FBJBvQHQ8sFhEhJfjUP+G+LalhavTkYyrAYqz5MEJG+erSv0k9KJLb6q7++17Lafk1scaTIFXcMJlwK8Mw=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.191.tgz"; + sha512 = "BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ=="; }; }; "@types/long-4.0.2" = { @@ -490,22 +508,22 @@ let sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; }; }; - "@types/node-14.18.33" = { + "@types/node-14.18.36" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.18.33"; + version = "14.18.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.18.33.tgz"; - sha512 = "qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.18.36.tgz"; + sha512 = "FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ=="; }; }; - "@types/node-18.11.9" = { + "@types/node-18.11.18" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.11.9"; + version = "18.11.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz"; - sha512 = "CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz"; + sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; }; }; "@types/qs-6.9.7" = { @@ -1093,13 +1111,13 @@ let sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; - "colorette-2.0.16" = { + "colorette-2.0.19" = { name = "colorette"; packageName = "colorette"; - version = "2.0.16"; + version = "2.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz"; - sha512 = "hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g=="; + url = "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz"; + sha512 = "3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="; }; }; "combine-errors-3.0.3" = { @@ -1129,15 +1147,6 @@ let sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; }; }; - "commander-7.2.0" = { - name = "commander"; - packageName = "commander"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"; - sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; - }; - }; "commander-9.4.1" = { name = "commander"; packageName = "commander"; @@ -1147,6 +1156,15 @@ let sha512 = "5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw=="; }; }; + "commander-9.5.0" = { + name = "commander"; + packageName = "commander"; + version = "9.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz"; + sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ=="; + }; + }; "commist-1.1.0" = { name = "commist"; packageName = "commist"; @@ -1327,13 +1345,13 @@ let sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; }; }; - "dayjs-1.11.6" = { + "dayjs-1.11.7" = { name = "dayjs"; packageName = "dayjs"; - version = "1.11.6"; + version = "1.11.7"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.6.tgz"; - sha512 = "zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz"; + sha512 = "+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="; }; }; "debug-2.6.9" = { @@ -1354,15 +1372,6 @@ let sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; - "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-4.3.4" = { name = "debug"; packageName = "debug"; @@ -1597,13 +1606,13 @@ let sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; }; }; - "es-abstract-1.20.4" = { + "es-abstract-1.20.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.20.4"; + version = "1.20.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.4.tgz"; - sha512 = "0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz"; + sha512 = "7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ=="; }; }; "es-aggregate-error-1.0.9" = { @@ -1885,6 +1894,15 @@ let sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; }; }; + "get-package-type-0.1.0" = { + name = "get-package-type"; + packageName = "get-package-type"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz"; + sha512 = "pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q=="; + }; + }; "get-symbol-description-1.0.0" = { name = "get-symbol-description"; packageName = "get-symbol-description"; @@ -1894,13 +1912,13 @@ let sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; }; }; - "getopts-2.2.5" = { + "getopts-2.3.0" = { name = "getopts"; packageName = "getopts"; - version = "2.2.5"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/getopts/-/getopts-2.2.5.tgz"; - sha512 = "9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA=="; + url = "https://registry.npmjs.org/getopts/-/getopts-2.3.0.tgz"; + sha512 = "5eDf9fuSXwxBL6q5HX+dhDj+dslFGWzU5thZ9kNKUkcPtaPdatmUFKwHFrLb/uf/WpA4BHET+AX3Scl56cAjpA=="; }; }; "getpass-0.1.7" = { @@ -1930,6 +1948,15 @@ let sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; }; }; + "gopd-1.0.1" = { + name = "gopd"; + packageName = "gopd"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"; + sha512 = "d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="; + }; + }; "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; @@ -2047,13 +2074,13 @@ let sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; }; - "http-graceful-shutdown-3.1.11" = { + "http-graceful-shutdown-3.1.12" = { name = "http-graceful-shutdown"; packageName = "http-graceful-shutdown"; - version = "3.1.11"; + version = "3.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/http-graceful-shutdown/-/http-graceful-shutdown-3.1.11.tgz"; - sha512 = "tfOwKDZA8kJqDNBK2ur+o55HbhDHoflvDCDgjbmm5eAn0RhqhdlUjVygj8e258B5nn5kNsEFOl7DbXLskKrgGA=="; + url = "https://registry.npmjs.org/http-graceful-shutdown/-/http-graceful-shutdown-3.1.12.tgz"; + sha512 = "z3mH1HUwRESrauPjvjH5QuH2Ce4uLlWonPFgZnwAyxIFYROxIMcNNWwNltN+s8fHF/aGlsfQDOICHLXsabK43w=="; }; }; "http-proxy-agent-5.0.0" = { @@ -2137,13 +2164,13 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "internal-slot-1.0.3" = { + "internal-slot-1.0.4" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz"; + sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; }; }; "interpret-2.2.0" = { @@ -2506,13 +2533,13 @@ let sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; - "jsonwebtoken-8.5.1" = { + "jsonwebtoken-9.0.0" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; - version = "8.5.1"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz"; - sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w=="; + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz"; + sha512 = "tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw=="; }; }; "jsprim-1.4.2" = { @@ -2578,13 +2605,13 @@ let sha512 = "UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A=="; }; }; - "knex-0.95.15" = { + "knex-2.4.0" = { name = "knex"; packageName = "knex"; - version = "0.95.15"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/knex/-/knex-0.95.15.tgz"; - sha512 = "Loq6WgHaWlmL2bfZGWPsy4l8xw4pOE+tmLGkPG0auBppxpI0UcK+GYCycJcqz9W54f2LiGewkCVLBm3Wq4ur/w=="; + url = "https://registry.npmjs.org/knex/-/knex-2.4.0.tgz"; + sha512 = "i0GWwqYp1Hs2yvc2rlDO6nzzkLhwdyOZKRdsMTB8ZxOs2IXQyL5rBjSbS1krowCh6V65T4X9CJaKtuIfkaPGSA=="; }; }; "leven-2.1.0" = { @@ -2695,69 +2722,6 @@ let sha512 = "z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="; }; }; - "lodash.includes-4.3.0" = { - name = "lodash.includes"; - packageName = "lodash.includes"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz"; - sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; - }; - }; - "lodash.isboolean-3.0.3" = { - name = "lodash.isboolean"; - packageName = "lodash.isboolean"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; - sha512 = "Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="; - }; - }; - "lodash.isinteger-4.0.4" = { - name = "lodash.isinteger"; - packageName = "lodash.isinteger"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"; - sha512 = "DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="; - }; - }; - "lodash.isnumber-3.0.3" = { - name = "lodash.isnumber"; - packageName = "lodash.isnumber"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz"; - sha512 = "QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="; - }; - }; - "lodash.isplainobject-4.0.6" = { - name = "lodash.isplainobject"; - packageName = "lodash.isplainobject"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha512 = "oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="; - }; - }; - "lodash.isstring-4.0.1" = { - name = "lodash.isstring"; - packageName = "lodash.isstring"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="; - }; - }; - "lodash.once-4.1.1" = { - name = "lodash.once"; - packageName = "lodash.once"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; - sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; - }; - }; "lodash.uniqby-4.5.0" = { name = "lodash.uniqby"; packageName = "lodash.uniqby"; @@ -2884,13 +2848,22 @@ let sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; }; }; - "minipass-3.3.4" = { + "minipass-3.3.6" = { name = "minipass"; packageName = "minipass"; - version = "3.3.4"; + version = "3.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz"; - sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz"; + sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; + }; + }; + "minipass-4.0.0" = { + name = "minipass"; + packageName = "minipass"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-4.0.0.tgz"; + sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; }; }; "minizlib-2.1.2" = { @@ -3541,6 +3514,15 @@ let 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"; + sha512 = "kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="; + }; + }; "qs-6.5.3" = { name = "qs"; packageName = "qs"; @@ -3604,22 +3586,22 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; - "rechoir-0.7.0" = { + "rechoir-0.8.0" = { name = "rechoir"; packageName = "rechoir"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz"; - sha512 = "ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q=="; + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz"; + sha512 = "/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ=="; }; }; - "redbean-node-0.1.4" = { + "redbean-node-0.2.0" = { name = "redbean-node"; packageName = "redbean-node"; - version = "0.1.4"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/redbean-node/-/redbean-node-0.1.4.tgz"; - sha512 = "c1U6wnTeWS0c44tn9hkJWzjGgckLNJ8sN1E2bxnnnQsULOfvEVFLf8dLMjqhyyMrZ1L1mp8UvV4OfhRtH/ZrgQ=="; + url = "https://registry.npmjs.org/redbean-node/-/redbean-node-0.2.0.tgz"; + sha512 = "bHbNgVpkLOn7i/kvfvGDVGzfDgvf20qVRm4EvQV9tD2V2nhcegYUITzAF3XSL2XVirrb5vmWy85vxM44faBnYw=="; }; }; "regenerator-runtime-0.13.11" = { @@ -3748,15 +3730,6 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "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"; @@ -4054,13 +4027,13 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "tar-6.1.12" = { + "tar-6.1.13" = { name = "tar"; packageName = "tar"; - version = "6.1.12"; + version = "6.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.12.tgz"; - sha512 = "jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz"; + sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; }; }; "tarn-3.0.2" = { @@ -4216,6 +4189,15 @@ let sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; + "underscore-1.13.6" = { + name = "underscore"; + packageName = "underscore"; + version = "1.13.6"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz"; + sha512 = "+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A=="; + }; + }; "unpipe-1.0.0" = { name = "unpipe"; packageName = "unpipe"; @@ -4445,7 +4427,7 @@ let args = { name = "uptime-kuma"; packageName = "uptime-kuma"; - version = "1.19.2"; + version = "1.19.6"; src = ./.; dependencies = [ sources."@azure/abort-controller-1.1.0" @@ -4465,26 +4447,29 @@ let }) sources."@azure/keyvault-keys-4.6.0" sources."@azure/logger-1.0.3" - (sources."@azure/msal-browser-2.32.0" // { + (sources."@azure/msal-browser-2.32.1" // { dependencies = [ - sources."@azure/msal-common-9.0.0" + sources."@azure/msal-common-9.0.1" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.14.4" // { + (sources."@azure/msal-node-1.14.6" // { dependencies = [ - sources."@azure/msal-common-9.0.0" + sources."@azure/msal-common-9.0.2" ]; }) - sources."@babel/runtime-7.20.1" + sources."@babel/runtime-7.20.7" sources."@breejs/later-4.1.0" sources."@grpc/grpc-js-1.7.3" - sources."@grpc/proto-loader-0.7.3" - sources."@js-joda/core-5.4.2" + sources."@grpc/proto-loader-0.7.4" + sources."@js-joda/core-5.5.1" + sources."@louislam/ping-0.4.2-mod.1" sources."@louislam/sqlite3-15.1.2" (sources."@mapbox/node-pre-gyp-1.0.10" // { dependencies = [ + sources."lru-cache-6.0.0" sources."semver-7.3.8" + sources."yallist-4.0.0" ]; }) sources."@protobufjs/aspromise-1.1.2" @@ -4506,19 +4491,19 @@ let sources."@types/content-disposition-0.5.5" sources."@types/cookie-0.4.1" sources."@types/cookies-0.7.7" - sources."@types/cors-2.8.12" + sources."@types/cors-2.8.13" sources."@types/es-aggregate-error-1.0.2" - sources."@types/express-4.17.14" - sources."@types/express-serve-static-core-4.17.31" + sources."@types/express-4.17.15" + sources."@types/express-serve-static-core-4.17.32" sources."@types/http-assert-1.5.3" sources."@types/http-errors-2.0.1" sources."@types/keygrip-1.0.2" sources."@types/koa-2.13.5" sources."@types/koa-compose-3.2.5" - sources."@types/lodash-4.14.190" + sources."@types/lodash-4.14.191" sources."@types/long-4.0.2" sources."@types/mime-3.0.1" - sources."@types/node-18.11.9" + sources."@types/node-18.11.18" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/serve-static-1.15.0" @@ -4585,6 +4570,7 @@ let sources."cliui-7.0.4" sources."code-point-at-1.1.0" sources."color-support-1.1.3" + sources."colorette-2.0.19" sources."combine-errors-3.0.3" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" @@ -4626,7 +4612,7 @@ let sources."css-what-6.1.0" sources."custom-error-instance-2.1.1" sources."dashdash-1.14.1" - sources."dayjs-1.11.6" + sources."dayjs-1.11.7" (sources."debug-4.3.4" // { dependencies = [ sources."ms-2.1.2" @@ -4665,7 +4651,7 @@ let sources."engine.io-parser-5.0.4" sources."entities-4.4.0" sources."env-paths-2.2.1" - sources."es-abstract-1.20.4" + sources."es-abstract-1.20.5" sources."es-aggregate-error-1.0.9" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -4698,7 +4684,12 @@ let sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-minipass-2.1.0" + (sources."fs-minipass-2.1.0" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" @@ -4707,11 +4698,13 @@ let sources."generate-function-2.3.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.3" + sources."get-package-type-0.1.0" sources."get-symbol-description-1.0.0" - sources."getopts-2.2.5" + sources."getopts-2.3.0" sources."getpass-0.1.7" sources."glob-7.2.3" sources."globalthis-1.0.3" + sources."gopd-1.0.1" sources."graceful-fs-4.2.10" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -4725,7 +4718,7 @@ let sources."hoek-6.1.3" sources."htmlparser2-8.0.1" sources."http-errors-1.8.1" - sources."http-graceful-shutdown-3.1.11" + sources."http-graceful-shutdown-3.1.12" sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."human-interval-2.0.1" @@ -4733,7 +4726,7 @@ let sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-slot-1.0.3" + sources."internal-slot-1.0.4" sources."interpret-2.2.0" sources."ip-2.0.0" sources."ipaddr.js-1.9.1" @@ -4776,21 +4769,20 @@ let sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - (sources."jsonwebtoken-8.5.1" // { + (sources."jsonwebtoken-9.0.0" // { dependencies = [ - sources."semver-5.7.1" + sources."lru-cache-6.0.0" + sources."semver-7.3.8" + sources."yallist-4.0.0" ]; }) sources."just-performance-4.3.0" sources."jwa-1.4.1" sources."jws-3.2.2" sources."jwt-decode-3.1.2" - (sources."knex-0.95.15" // { + (sources."knex-2.4.0" // { dependencies = [ - sources."colorette-2.0.16" - sources."commander-7.2.0" - sources."debug-4.3.2" - sources."ms-2.1.2" + sources."commander-9.5.0" sources."resolve-from-5.0.0" ]; }) @@ -4805,16 +4797,8 @@ let sources."lodash._stringtopath-4.8.0" sources."lodash.camelcase-4.3.0" sources."lodash.get-4.4.2" - sources."lodash.includes-4.3.0" - sources."lodash.isboolean-3.0.3" - sources."lodash.isinteger-4.0.4" - sources."lodash.isnumber-3.0.3" - sources."lodash.isplainobject-4.0.6" - sources."lodash.isstring-4.0.1" - sources."lodash.once-4.1.1" sources."lodash.uniqby-4.5.0" sources."long-4.0.0" - sources."lru-cache-6.0.0" sources."make-dir-3.1.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -4824,12 +4808,23 @@ let sources."mime-types-2.1.35" sources."minimatch-3.1.2" sources."minimist-1.2.7" - sources."minipass-3.3.4" - sources."minizlib-2.1.2" + (sources."minipass-4.0.0" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) + (sources."minizlib-2.1.2" // { + dependencies = [ + sources."minipass-3.3.6" + sources."yallist-4.0.0" + ]; + }) sources."mkdirp-1.0.4" (sources."mqtt-4.3.7" // { dependencies = [ + sources."lru-cache-6.0.0" sources."mqtt-packet-6.10.0" + sources."yallist-4.0.0" ]; }) sources."ms-2.1.3" @@ -4838,7 +4833,12 @@ let sources."commander-9.4.1" ]; }) - sources."mysql2-2.3.3" + (sources."mysql2-2.3.3" // { + dependencies = [ + sources."lru-cache-6.0.0" + sources."yallist-4.0.0" + ]; + }) (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -4865,12 +4865,14 @@ let sources."are-we-there-yet-1.1.7" sources."gauge-2.7.4" sources."is-fullwidth-code-point-1.0.0" + sources."lru-cache-6.0.0" sources."npmlog-4.1.2" sources."readable-stream-2.3.7" sources."semver-7.3.8" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" + sources."yallist-4.0.0" ]; }) sources."node-radius-client-1.0.0" @@ -4938,6 +4940,7 @@ let sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" + sources."q-1.5.1" sources."qs-6.5.3" sources."radius-1.1.4" sources."range-parser-1.2.1" @@ -4948,10 +4951,10 @@ let ]; }) sources."readable-stream-3.6.0" - sources."rechoir-0.7.0" - (sources."redbean-node-0.1.4" // { + sources."rechoir-0.8.0" + (sources."redbean-node-0.2.0" // { dependencies = [ - sources."@types/node-14.18.33" + sources."@types/node-14.18.36" ]; }) sources."regenerator-runtime-0.13.11" @@ -5013,7 +5016,11 @@ let }) sources."strip-ansi-6.0.1" sources."supports-preserve-symlinks-flag-1.0.0" - sources."tar-6.1.12" + (sources."tar-6.1.13" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) sources."tarn-3.0.2" sources."tcp-ping-0.1.1" sources."tdigest-0.1.2" @@ -5035,6 +5042,7 @@ let sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."unbox-primitive-1.0.2" + sources."underscore-1.13.6" sources."unpipe-1.0.0" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" @@ -5057,7 +5065,6 @@ let sources."xmlhttprequest-ssl-2.0.0" sources."xtend-4.0.2" sources."y18n-5.0.8" - sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" sources."yup-0.32.9" diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/package.json b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/package.json index 18ae4770fa..55c8c436ee 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/package.json +++ b/third_party/nixpkgs/pkgs/servers/monitoring/uptime-kuma/package.json @@ -1,6 +1,6 @@ { "name": "uptime-kuma", - "version": "1.19.2", + "version": "1.19.6", "license": "MIT", "repository": { "type": "git", @@ -31,6 +31,7 @@ "build-docker": "npm run build && npm run build-docker-debian && npm run build-docker-alpine", "build-docker-alpine-base": "docker buildx build -f docker/alpine-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-alpine . --push", "build-docker-debian-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-debian . --push", + "build-docker-builder-go": "docker buildx build -f docker/builder-go.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:builder-go . --push", "build-docker-alpine": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:$VERSION-alpine --target release . --push", "build-docker-debian": "node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:$VERSION-debian --target release . --push", "build-docker-nightly": "npm run build && docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push", @@ -38,7 +39,7 @@ "build-docker-nightly-amd64": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain", "build-docker-pr-test": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64 -t louislam/uptime-kuma:pr-test --target pr-test . --push", "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg VERSION --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain", - "setup": "git checkout 1.19.2 && npm ci --production && npm run download-dist", + "setup": "git checkout 1.19.6 && npm ci --production && npm run download-dist", "download-dist": "node extra/download-dist.js", "mark-as-nightly": "node extra/mark-as-nightly.js", "reset-password": "node extra/reset-password.js", @@ -60,11 +61,13 @@ "start-pr-test": "node extra/checkout-pr.js && npm install && npm run dev", "cy:test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --e2e", "cy:run": "npx cypress run --browser chrome --headless --config-file ./config/cypress.config.js", + "cy:run:unit": "npx cypress run --browser chrome --headless --config-file ./config/cypress.frontend.config.js", "cypress-open": "concurrently -k -r \"node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/\" \"cypress open --config-file ./config/cypress.config.js\"", "build-healthcheck-armv7": "cross-env GOOS=linux GOARCH=arm GOARM=7 go build -x -o ./extra/healthcheck-armv7 ./extra/healthcheck.go" }, "dependencies": { "@grpc/grpc-js": "~1.7.3", + "@louislam/ping": "~0.4.2-mod.1", "@louislam/sqlite3": "15.1.2", "args-parser": "~1.3.0", "axios": "~0.27.0", @@ -90,7 +93,7 @@ "https-proxy-agent": "~5.0.1", "iconv-lite": "~0.6.3", "jsesc": "~3.0.2", - "jsonwebtoken": "~8.5.1", + "jsonwebtoken": "~9.0.0", "jwt-decode": "~3.1.2", "limiter": "~2.1.0", "mqtt": "~4.3.7", @@ -106,7 +109,7 @@ "prom-client": "~13.2.0", "prometheus-api-metrics": "~3.2.1", "protobufjs": "~7.1.1", - "redbean-node": "0.1.4", + "redbean-node": "~0.2.0", "socket.io": "~4.5.3", "socket.io-client": "~4.5.3", "socks-proxy-agent": "6.1.1", diff --git a/third_party/nixpkgs/pkgs/servers/mpd/default.nix b/third_party/nixpkgs/pkgs/servers/mpd/default.nix index 44d8185b06..d1d94b3a82 100644 --- a/third_party/nixpkgs/pkgs/servers/mpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mpd/default.nix @@ -116,13 +116,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.11"; + version = "0.23.12"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-vgLH4kOluK9cOmTrvpBfR87Iunn0EzH9GmiUvsjsG4I="; + sha256 = "sha256-BnEtSkZjUBK0flVttOrjkT4RCQh9F7+MDZGm2+MMrX8="; }; buildInputs = [ @@ -156,7 +156,7 @@ let # Otherwise, the meson log says: # # Program zip found: NO - checkInputs = [ zip ]; + nativeCheckInputs = [ zip ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix b/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix index 0c574e5997..f241f48ac5 100644 --- a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix @@ -10,7 +10,7 @@ , libuv , libwebsockets , openssl -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , fetchpatch }: diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index 391644379e..29edb77fab 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -2,17 +2,18 @@ let generic = { - version, sha256, + version, hash, eol ? false, extraVulnerabilities ? [] }: let major = lib.versions.major version; + prerelease = builtins.length (lib.versions.splitVersion version) > 3; in stdenv.mkDerivation rec { pname = "nextcloud"; inherit version; src = fetchurl { - url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; - inherit sha256; + url = "https://download.nextcloud.com/server/${if prerelease then "prereleases" else "release"}/${pname}-${version}.tar.bz2"; + inherit hash; }; patches = [ (./patches + "/v${major}/0001-Setup-remove-custom-dbuser-creation-behavior.patch") ]; @@ -51,14 +52,19 @@ in { nextcloud24 = generic { version = "24.0.9"; - sha256 = "580a3384c9c09aefb8e9b41553d21a6e20001799549dbd25b31dea211d97dd1e"; + hash = "sha256-WAozhMnAmu+46bQVU9IabiAAF5lUnb0lsx3qIR2X3R4="; }; nextcloud25 = generic { version = "25.0.3"; - sha256 = "4b2b1423736ef92469096fe24f61c24cad87a34e07c1c7a81b385d3ea25c00ec"; + hash = "sha256-SysUI3Nu+SRpCW/iT2HCTK2Ho04HwceoGzhdPqJcAOw="; }; - # tip: get the sha with: - # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' + nextcloud26 = generic { + version = "26.0.0beta1"; + hash = "sha256-EfSfn0KjQzciHa3VcrDhGC/aZUw/KDjihXs+qVIcYX0="; + }; + + # tip: get hash with: + # nix hash to-sri --type sha256 $(curl https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256 | cut -d' ' -f1) } diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/24.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/24.json index 0b775a81e8..7b45c83af8 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/24.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/24.json @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "0qv3c7wmf9j74562xbjvhk6kbpna6ansiw3724dh4w8j5sldqysd", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.3/contacts-v4.2.3.tar.gz", - "version": "4.2.3", + "sha256": "1996f97w74slmh7ihv8p1lxl32rri5nnzp90mbb1imclpgac2i63", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v4.2.4/contacts-v4.2.4.tar.gz", + "version": "4.2.4", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -110,9 +110,9 @@ ] }, "news": { - "sha256": "0pnriarr2iqci2v2hn6vpvszf4m4pkcxsd2i13bp7n1zqkg6swd7", - "url": "https://github.com/nextcloud/news/releases/download/20.0.0/news.tar.gz", - "version": "20.0.0", + "sha256": "0iz1yrl7h60yhc1d1gkalkzc5vlj8sq6lff0ggns6a6qpsdpn9c5", + "url": "https://github.com/nextcloud/news/releases/download/20.0.1/news.tar.gz", + "version": "20.0.1", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -140,9 +140,9 @@ ] }, "polls": { - "sha256": "b6ef0e8b34cdb5169341e30340bc9cefaa1254a1a6020e951f86e828f8591a11", - "url": "https://github.com/nextcloud/polls/releases/download/v3.8.3/polls.tar.gz", - "version": "3.8.3", + "sha256": "0qdm0hnljkv0df1s929awyjj1gsp3d6xv9llr52cxv66kkfx086y", + "url": "https://github.com/nextcloud/polls/releases/download/v3.8.4/polls.tar.gz", + "version": "3.8.4", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -160,9 +160,9 @@ ] }, "spreed": { - "sha256": "0frilxny4mvp34fxw0k8al3r5apy3q6vq7z35jkph3vaq1889m9k", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v14.0.7/spreed-v14.0.7.tar.gz", - "version": "14.0.7", + "sha256": "0c5b46g5vi8fsjcd2r0wqza7iqyvbgznwww5zcyajf29a32950c6", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v14.0.8/spreed-v14.0.8.tar.gz", + "version": "14.0.8", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json index 98ab7ebe3e..e6051ccb13 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/25.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "04g1xm3q46j7harxr0n56r7kkkqjxvah7xijddyq5fj7icr6qf5d", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.2.1/calendar-v4.2.1.tar.gz", - "version": "4.2.1", + "sha256": "0yqpfp5nbzd7zar2rbcx3bhfgjxrp1sy6a57fdagndfi4y0r56hq", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.2.2/calendar-v4.2.2.tar.gz", + "version": "4.2.2", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "097a71if6kkc7nphfc8b6llqlsskjwp1vg83134hzgfscvllvaj8", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.0.2/contacts-v5.0.2.tar.gz", - "version": "5.0.2", + "sha256": "181lycyz4v7v1yir6ylmblgha625sn23nf3661g3izq1whi0wgr9", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.0.3/contacts-v5.0.3.tar.gz", + "version": "5.0.3", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -90,9 +90,9 @@ ] }, "news": { - "sha256": "0pnriarr2iqci2v2hn6vpvszf4m4pkcxsd2i13bp7n1zqkg6swd7", - "url": "https://github.com/nextcloud/news/releases/download/20.0.0/news.tar.gz", - "version": "20.0.0", + "sha256": "0iz1yrl7h60yhc1d1gkalkzc5vlj8sq6lff0ggns6a6qpsdpn9c5", + "url": "https://github.com/nextcloud/news/releases/download/20.0.1/news.tar.gz", + "version": "20.0.1", "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)", "homepage": "https://github.com/nextcloud/news", "licenses": [ @@ -120,9 +120,9 @@ ] }, "polls": { - "sha256": "1amywiw91acp4g90wazmqmnw51s7z6rf27bdrzxrcqryd8igsniq", - "url": "https://github.com/nextcloud/polls/releases/download/v4.1.0-beta4/polls.tar.gz", - "version": "4.1.0-beta4", + "sha256": "0mqc9zmxrm98byy6v13si3hwii8hx85998c4kv91vk6ad0sfxjhb", + "url": "https://github.com/nextcloud/polls/releases/download/v4.1.2/polls.tar.gz", + "version": "4.1.2", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -140,9 +140,9 @@ ] }, "spreed": { - "sha256": "1w5v866lkd0skv666vhz75zwalr2w83shrhdvv354kill9k53awh", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.2/spreed-v15.0.2.tar.gz", - "version": "15.0.2", + "sha256": "07nh7nlz8di69ms1156fklj29526i3phlvki5vf2mxnlcz8ihg27", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v15.0.3/spreed-v15.0.3.tar.gz", + "version": "15.0.3", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json new file mode 100644 index 0000000000..e3a075c7c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/packages/26.json @@ -0,0 +1,62 @@ +{ + "calendar": { + "sha256": "0yqpfp5nbzd7zar2rbcx3bhfgjxrp1sy6a57fdagndfi4y0r56hq", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.2.2/calendar-v4.2.2.tar.gz", + "version": "4.2.2", + "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", + "homepage": "https://github.com/nextcloud/calendar/", + "licenses": [ + "agpl" + ] + }, + "files_texteditor": { + "sha256": "0rmk14iw34pd81snp3lm01k07wm5j2nh9spcd4j0m43l20b7kxss", + "url": "https://github.com/nextcloud-releases/files_texteditor/releases/download/v2.15.0/files_texteditor.tar.gz", + "version": "2.15.0", + "description": "This application enables Nextcloud users to open, save and edit text files in the web browser. If enabled, an entry called \"Text file\" in the \"New\" button menu at the top of the web browser appears. When clicked, a new text file opens in the browser and the file can be saved into the current Nextcloud directory. Further, when a text file is clicked in the web browser, it will be opened and editable. If the privileges allow, a user can also edit shared files and save these changes back into the web browser.\nMore information is available in the text editor documentation.", + "homepage": "https://github.com/nextcloud/files_texteditor", + "licenses": [ + "agpl" + ] + }, + "mail": { + "sha256": "", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v2.2.2/mail-v2.2.2.tar.gz", + "version": "2.2.2", + "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!", + "homepage": "https://github.com/nextcloud/mail#readme", + "licenses": [ + "agpl" + ] + }, + "notes": { + "sha256": "1jcgv3awr45jq3n3qv851qlpbdl2plixba0iq2s54dmhciypdckl", + "url": "https://github.com/nextcloud/notes/releases/download/v4.6.0/notes.tar.gz", + "version": "4.6.0", + "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/stefan-niedermann/nextcloud-notes), [iOS](https://github.com/owncloud/notes-iOS-App) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", + "homepage": "https://github.com/nextcloud/notes", + "licenses": [ + "agpl" + ] + }, + "tasks": { + "sha256": "0jm13d6nm7cfsw27yfiq1il9xjlh0qrq8xby2yz9dmggn7lk1dx5", + "url": "https://github.com/nextcloud/tasks/releases/download/v0.14.5/tasks.tar.gz", + "version": "0.14.5", + "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.", + "homepage": "https://github.com/nextcloud/tasks/", + "licenses": [ + "agpl" + ] + }, + "unsplash": { + "sha256": "17qqn6kwpvkq21c92jyy3pfvjaj5xms1hr07fnn39zxg0nmwjdd8", + "url": "https://github.com/nextcloud/unsplash/releases/download/v2.1.1/unsplash.tar.gz", + "version": "2.1.1", + "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", + "homepage": "https://github.com/nextcloud/unsplash/", + "licenses": [ + "agpl" + ] + } +} diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/patches/v26/0001-Setup-remove-custom-dbuser-creation-behavior.patch b/third_party/nixpkgs/pkgs/servers/nextcloud/patches/v26/0001-Setup-remove-custom-dbuser-creation-behavior.patch new file mode 100644 index 0000000000..28af5ec765 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/patches/v26/0001-Setup-remove-custom-dbuser-creation-behavior.patch @@ -0,0 +1,149 @@ +From fc3e14155b3c4300b691ab46579830e725457a54 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Sat, 10 Sep 2022 15:18:05 +0200 +Subject: [PATCH] Setup: remove custom dbuser creation behavior + +Both PostgreSQL and MySQL can be authenticated against from Nextcloud by +supplying a database password. Now, during setup the following things +happen: + +* When using postgres and the db user has elevated permissions, a new + unprivileged db user is created and the settings `dbuser`/`dbpass` are + altered in `config.php`. + +* When using MySQL, the password is **always** regenerated since + 24.0.5/23.0.9[1]. + +I consider both cases problematic: the reason why people do configuration +management is to have it as single source of truth! So, IMHO any +application that silently alters config and thus causes deployed +nodes to diverge from the configuration is harmful for that. + +I guess it was sheer luck that it worked for so long in NixOS because +nobody has apparently used password authentication with a privileged +user to operate Nextcloud (which is a good thing in fact). + +[1] https://github.com/nextcloud/server/pull/33513 +--- + lib/private/Setup/MySQL.php | 53 -------------------------------- + lib/private/Setup/PostgreSQL.php | 37 ---------------------- + 2 files changed, 90 deletions(-) + +diff --git a/lib/private/Setup/MySQL.php b/lib/private/Setup/MySQL.php +index e3004c269bc..bc958e84e44 100644 +--- a/lib/private/Setup/MySQL.php ++++ b/lib/private/Setup/MySQL.php +@@ -141,62 +141,6 @@ + $rootUser = $this->dbUser; + $rootPassword = $this->dbPassword; + +- //create a random password so we don't need to store the admin password in the config file +- $saveSymbols = str_replace(['\"', '\\', '\'', '`'], '', ISecureRandom::CHAR_SYMBOLS); +- $password = $this->random->generate(22, ISecureRandom::CHAR_ALPHANUMERIC . $saveSymbols) +- . $this->random->generate(2, ISecureRandom::CHAR_UPPER) +- . $this->random->generate(2, ISecureRandom::CHAR_LOWER) +- . $this->random->generate(2, ISecureRandom::CHAR_DIGITS) +- . $this->random->generate(2, $saveSymbols) +- ; +- $this->dbPassword = str_shuffle($password); +- +- try { +- //user already specified in config +- $oldUser = $this->config->getValue('dbuser', false); +- +- //we don't have a dbuser specified in config +- if ($this->dbUser !== $oldUser) { +- //add prefix to the admin username to prevent collisions +- $adminUser = substr('oc_' . $username, 0, 16); +- +- $i = 1; +- while (true) { +- //this should be enough to check for admin rights in mysql +- $query = 'SELECT user FROM mysql.user WHERE user=?'; +- $result = $connection->executeQuery($query, [$adminUser]); +- +- //current dbuser has admin rights +- $data = $result->fetchAll(); +- $result->closeCursor(); +- //new dbuser does not exist +- if (count($data) === 0) { +- //use the admin login data for the new database user +- $this->dbUser = $adminUser; +- $this->createDBUser($connection); +- +- break; +- } else { +- //repeat with different username +- $length = strlen((string)$i); +- $adminUser = substr('oc_' . $username, 0, 16 - $length) . $i; +- $i++; +- } +- } +- } else { +- // Reuse existing password if a database config is already present +- $this->dbPassword = $rootPassword; +- } +- } catch (\Exception $ex) { +- $this->logger->info('Can not create a new MySQL user, will continue with the provided user.', [ +- 'exception' => $ex, +- 'app' => 'mysql.setup', +- ]); +- // Restore the original credentials +- $this->dbUser = $rootUser; +- $this->dbPassword = $rootPassword; +- } +- + $this->config->setValues([ + 'dbuser' => $this->dbUser, + 'dbpassword' => $this->dbPassword, +diff --git a/lib/private/Setup/PostgreSQL.php b/lib/private/Setup/PostgreSQL.php +index af816c7ad04..e49e5508e15 100644 +--- a/lib/private/Setup/PostgreSQL.php ++++ b/lib/private/Setup/PostgreSQL.php +@@ -45,43 +45,6 @@ class PostgreSQL extends AbstractDatabase { + $connection = $this->connect([ + 'dbname' => 'postgres' + ]); +- //check for roles creation rights in postgresql +- $builder = $connection->getQueryBuilder(); +- $builder->automaticTablePrefix(false); +- $query = $builder +- ->select('rolname') +- ->from('pg_roles') +- ->where($builder->expr()->eq('rolcreaterole', new Literal('TRUE'))) +- ->andWhere($builder->expr()->eq('rolname', $builder->createNamedParameter($this->dbUser))); +- +- try { +- $result = $query->execute(); +- $canCreateRoles = $result->rowCount() > 0; +- } catch (DatabaseException $e) { +- $canCreateRoles = false; +- } +- +- if ($canCreateRoles) { +- $connectionMainDatabase = $this->connect(); +- //use the admin login data for the new database user +- +- //add prefix to the postgresql user name to prevent collisions +- $this->dbUser = 'oc_' . strtolower($username); +- //create a new password so we don't need to store the admin config in the config file +- $this->dbPassword = \OC::$server->getSecureRandom()->generate(30, ISecureRandom::CHAR_ALPHANUMERIC); +- +- $this->createDBUser($connection); +- +- // Go to the main database and grant create on the public schema +- // The code below is implemented to make installing possible with PostgreSQL version 15: +- // https://www.postgresql.org/docs/release/15.0/ +- // From the release notes: For new databases having no need to defend against insider threats, granting CREATE permission will yield the behavior of prior releases +- // Therefore we assume that the database is only used by one user/service which is Nextcloud +- // Additional services should get installed in a separate database in order to stay secure +- // Also see https://www.postgresql.org/docs/15/ddl-schemas.html#DDL-SCHEMAS-PATTERNS +- $connectionMainDatabase->executeQuery('GRANT CREATE ON SCHEMA public TO ' . addslashes($this->dbUser)); +- $connectionMainDatabase->close(); +- } + + $this->config->setValues([ + 'dbuser' => $this->dbUser, +-- +2.38.1 + diff --git a/third_party/nixpkgs/pkgs/servers/nfd/default.nix b/third_party/nixpkgs/pkgs/servers/nfd/default.nix index 08309213aa..58c4dd4293 100644 --- a/third_party/nixpkgs/pkgs/servers/nfd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nfd/default.nix @@ -10,7 +10,7 @@ , systemd , wafHook , websocketpp -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , withWebSocket ? true }: diff --git a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix index 2ac109cb0d..560853b5d9 100644 --- a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "sha256-9Hn1teHo5sHJLYQYM+nAIwq7Gckxl1TCTk/GxLME1qo="; + sha256 = "sha256-MafP6kl3SmtT2/vLPDwy8U7+tE6hUBr/lWmiAcjsQNU="; }; preConfigure = "cd src"; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix index 738f110403..cd30a12fb3 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-jena"; - version = "4.6.1"; + version = "4.7.0"; src = fetchurl { url = "https://dlcdn.apache.org/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "sha256-XCExqN0S5aIeLUNkAXjBHPW/fvj+MxQP3GEOP9gSdLE="; + sha256 = "sha256-3tJRJ9UHsOYfWvwPZHp+hkRZxb0RODchJjQMAZ3lkuY="; }; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/servers/nosql/arangodb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/arangodb/default.nix index 9b2ac7a556..68d3ce9f10 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/arangodb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/arangodb/default.nix @@ -1,5 +1,5 @@ { - # gcc 11.2 suggested on 3.10.0. + # gcc 11.2 suggested on 3.10.3. # gcc 11.3.0 unsupported yet, investigate gcc support when upgrading # See https://github.com/arangodb/arangodb/issues/17454 gcc10Stdenv @@ -32,13 +32,13 @@ in gcc10Stdenv.mkDerivation rec { pname = "arangodb"; - version = "3.10.0"; + version = "3.10.3"; src = fetchFromGitHub { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "0vjdiarfnvpfl4hnqgr7jigxgq3b3zhx88n8liv1zqa1nlvykfrb"; + sha256 = "sha256-Jp2rvapTe0CtyYfh1YLJ5eUngh8V+BCUQ/OgH3nE2Ro="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/4.json b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/4.json index fd0a4be8f4..cf13954ad8 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/4.json +++ b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/4.json @@ -1,4 +1,4 @@ { - "version": "4.0.7", - "sha256": "03k7mvm5im4lahl8wfafk5ljxd95b6zsmskip4kcpzqi6naf6s4s" + "version": "4.1.0", + "sha256": "1bh7srvdah5jvs9wrs0z9s341ix8895z0jvci2bv4bp3m7s6xzg4" } diff --git a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix index 6a6aa65395..45bea6fed4 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/cassandra/generic.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, python2 +, python , makeWrapper , gawk , bash @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { fi done - wrapProgram $out/bin/cqlsh --prefix PATH : ${python2}/bin + wrapProgram $out/bin/cqlsh --prefix PATH : ${python}/bin runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix index a253e6d7fb..10febf0fd5 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix @@ -7,7 +7,7 @@ , pcre-cpp , snappy , zlib -, libyamlcpp +, yaml-cpp , sasl , openssl , libpcap @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { curl gperftools libpcap - libyamlcpp + yaml-cpp openssl pcre-cpp variants.python diff --git a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix index b34c18a08b..0bba23e7e3 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchurl, lua, pkg-config, nixosTests , tcl, which, ps, getconf -, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd # dependency ordering is broken at the moment when building with openssl , tlsSupport ? !stdenv.hostPlatform.isStatic, openssl }: stdenv.mkDerivation rec { pname = "redis"; - version = "7.0.7"; + version = "7.0.8"; src = fetchurl { url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; - hash = "sha256-jTJ9foh9G7MI/Deq9xegv3n1gSnjc5Bpqu6uiJVaxYY="; + hash = "sha256-BqM55JEwZ4Pc9VuX8VpdvL3AHMvebcIwJ8R1yrc16RQ="; }; nativeBuildInputs = [ pkg-config ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # darwin currently lacks a pure `pgrep` which is extensively used here doCheck = !stdenv.isDarwin; - checkInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]; + nativeCheckInputs = [ which tcl ps ] ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ]; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/servers/nzbhydra2/default.nix b/third_party/nixpkgs/pkgs/servers/nzbhydra2/default.nix index 375224dfdc..fa6234a34e 100644 --- a/third_party/nixpkgs/pkgs/servers/nzbhydra2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nzbhydra2/default.nix @@ -1,16 +1,23 @@ -{ lib, stdenv, fetchzip, makeWrapper, jre, python3, unzip }: - +{ + lib, + stdenv, + fetchzip, + makeWrapper, + jre, + python3, + unzip, +}: stdenv.mkDerivation rec { pname = "nzbhydra2"; - version = "3.14.2"; + version = "4.7.6"; src = fetchzip { url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-linux.zip"; - sha512 = "sha512-wC2GhCjkRt/rmLAhe6nDCdF4PsfBpOo0T4BOSdw4wlBr7eCfo4Cibt9VvK6DNLuDk7EGkUfxvw9HI9sbRJlpCw=="; + hash = "sha512-vc+VInEnh00bASxcEwSjJcsa0QJHmtRzSz30uW60wGmA24tlaJYSk42N5KpGFbkQkOkb2ijHmKGxPogSa4izRQ=="; stripRoot = false; }; - nativeBuildInputs = [ jre makeWrapper unzip ]; + nativeBuildInputs = [jre makeWrapper unzip]; installPhase = '' runHook preInstall @@ -30,7 +37,7 @@ stdenv.mkDerivation rec { description = "Usenet meta search"; homepage = "https://github.com/theotherp/nzbhydra2"; license = licenses.asl20; - maintainers = with maintainers; [ jamiemagee ]; + maintainers = with maintainers; [jamiemagee]; platforms = with platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix b/third_party/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix index 51417fce26..517d288b8f 100644 --- a/third_party/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix @@ -15,11 +15,11 @@ let # var/www/onlyoffice/documentserver/server/DocService/docservice onlyoffice-documentserver = stdenv.mkDerivation rec { pname = "onlyoffice-documentserver"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}/onlyoffice-documentserver_amd64.deb"; - sha256 = "sha256-4MJLvc2ExIAwGnEkBvMJSINp+7SxOyhtKnNNA9QVxMk="; + sha256 = "sha256-PBea6VYJkjBf19AQ702OtLsHJ230Sc3e3K9HAccL0BM="; }; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix b/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix index e4f558c790..e6e7130e3f 100644 --- a/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, runCommand +{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand , cacert, moreutils, jq, git, pkg-config, yarn, python3 , esbuild, nodejs-16_x-openssl_1_1, libsecret, xorg, ripgrep , AppKit, Cocoa, Security, cctools }: @@ -17,12 +17,25 @@ let aarch64-darwin = "darwin-arm64"; }.${system} or (throw "Unsupported system ${system}"); + esbuild' = esbuild.override { + buildGoModule = args: buildGoModule (args // rec { + version = "0.16.17"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + }; + # replaces esbuild's download script with a binary from nixpkgs patchEsbuild = path : version : '' mkdir -p ${path}/node_modules/esbuild/bin jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json - sed -i 's/${version}/${esbuild.version}/g' ${path}/node_modules/esbuild/lib/main.js - ln -s -f ${esbuild}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild + sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js + ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild ''; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix b/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix index 05d2a97a0e..edf7255e22 100644 --- a/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pinnwand/default.nix @@ -32,7 +32,7 @@ with python3.pkgs; buildPythonApplication rec { tornado ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index c7d1ec7f36..3cee78f571 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.30.1.6562-915986d62"; + version = "1.30.2.6563-3d4dc0cce"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "sha256-fUt8fh4jeZiUbDoc8ivuSpx0Hf4ShYYcfJUJjU+GCxQ="; + sha256 = "0sz6xc484flh1cnlrvwin7x34bl118yy2mwj034f8p9ngiy5hrkw"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "sha256-ho/r/ouaFsdCH0xcFuy4TWamu0c/ZBZDJO6cYQK/pW0="; + sha256 = "0ymxfy3s9nygv9syiy2bdwmjfqg8m4i5n8c37z1ib6393iwj8mgi"; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix index 2aa25521b3..357da52928 100644 --- a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-px4rpVTOuQh7QuqqxiVqmB+iYrUdk82TE7MJSaGZLYw="; + sha256 = "sha256-Ptp01SnVqQ+qFxX4Qsoyw9bkw+inm9gMSRqtmAcFlVE="; }; - vendorHash = "sha256-D8nFoTggxYNj7ZSY1rvA4YSJHbB7wwpPSu1g+S3c1C0="; + vendorHash = "sha256-8NBudXcU3cjSbo6qpGZVLtbrLedzwijwrbiTgC+OMcU="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/third_party/nixpkgs/pkgs/servers/postfixadmin/default.nix b/third_party/nixpkgs/pkgs/servers/postfixadmin/default.nix index cd60f3d9da..be879fa030 100644 --- a/third_party/nixpkgs/pkgs/servers/postfixadmin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/postfixadmin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "postfixadmin"; - version = "3.3.11"; + version = "3.3.13"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-jOO0AVcCmBxHLaWQOwvt7OFKAcAYPTVHTdQz1ZaYIqE="; + sha256 = "sha256-46bc34goAcRvaiyW7z0AvIcd8n61TL6vgLQ+y7nNKBQ="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix index 15b98ca035..6dde194f92 100644 --- a/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/prowlarr/default.nix @@ -16,14 +16,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-r5A7KkzugTXwLejaQuKW/EhV99e8gqj8kmgliNMi/xU="; - arm64-linux_hash = "sha256-HdtUSMHteFDdp0yZYFC4EHK2S3cr6dEXklyTp5bqHYQ="; - x64-osx_hash = "sha256-GyHiBiz5LoT+DGxcC0v7OXvdUwaLyrczda/aUkABnrs="; + x64-linux_hash = "sha256-0JeZaHaAJ0Z+wcEPGA8yidiKsU/lxEgC6BGpFEzjO0A="; + arm64-linux_hash = "sha256-/N8SY0JS3yX2MARb7MN68CWEZQ8mIXM5zmg96r8hVsw="; + x64-osx_hash = "sha256-kcD6ATOGYJULk6g+v4uISDtnzr0c1y2BntIt3MWUR0Q="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "1.0.1.2210"; + version = "1.1.2.2453"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix b/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix index 11c56b9254..57977ebf40 100644 --- a/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pulseaudio/default.nix @@ -9,7 +9,7 @@ , x11Support ? false -, useSystemd ? stdenv.isLinux +, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , # Whether to support the JACK sound system as a backend. jackaudioSupport ? false diff --git a/third_party/nixpkgs/pkgs/servers/radicale/2.x.nix b/third_party/nixpkgs/pkgs/servers/radicale/2.x.nix index a739d993e7..737582d763 100644 --- a/third_party/nixpkgs/pkgs/servers/radicale/2.x.nix +++ b/third_party/nixpkgs/pkgs/servers/radicale/2.x.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-runner pytest ]; diff --git a/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix b/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix index 0d980a6c3f..1827c30be9 100644 --- a/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix +++ b/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pytz # https://github.com/Kozea/Radicale/issues/816 ] ++ passlib.optional-dependencies.bcrypt; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook waitress ]; diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix index 84b63d5984..e2a265c0f5 100644 --- a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix +++ b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchzip }: let - version = "22.3.5"; + version = "22.3.11"; platform = if stdenv.isLinux then "linux" else "darwin"; arch = if stdenv.isAarch64 then "arm" else "amd"; sha256s = { - darwin.amd = "sha256-AXk3aP1SGiHTfHTCBRTagX0DAVmdcVVIkxWaTnZxB8g="; - darwin.arm = "sha256-pvOVvNc8lZ2d2fVZVYWvumVWYpnLORNY/3o1t4BN2N4="; - linux.amd = "sha256-wsUuSCstYucjMpFsqssPGEhm3zCrAdE9Mldtkypbthg="; - linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8="; + darwin.amd = "sha256-kwAKxFg7BSNInvsQvFqgtpq8EEwSnmDeDyaF5b8L8SQ="; + darwin.arm = "sha256-kH5Ii672SeAIiRcWuAO3oVJVSBWp+r78RmTiR3BaDbg="; + linux.amd = "sha256-EKgkRKBrM4+X2YGoP2LpWRHL+fdHu44LYwCZ+O+c5ZY="; + linux.arm = "sha256-9b4oerRXjUVUYoswJWtnMBJSQDoCKClf673VjDQFUAw="; }; in stdenv.mkDerivation rec { pname = "redpanda"; diff --git a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix b/third_party/nixpkgs/pkgs/servers/roon-server/default.nix index 8cd89c2afc..067f9b48d5 100644 --- a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roon-server/default.nix @@ -15,7 +15,7 @@ , stdenv }: let - version = "2.0-1182"; + version = "2.0-1202"; urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; in stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-2mo45+cbOyej5stJ8DFobvqECTTMLandcoPFnD4nY7s="; + hash = "sha256-YeBzXnw/BpJDUJ7fUf7TH0zQcpCjUm9peB7zPO2ZsYI="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix index 18856c5567..288aa6f4e7 100644 --- a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-JAnM3+LkZfCGy5/BjIjf4Kr2zMI5JFZJdQYSCZIWlLo="; + sha256 = "sha256-RsL2ujS8t+V+R8sDS/M45fx9zO3dqSEqLvO9MUbZe+0="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix index 09412c8858..0ff710ae63 100644 --- a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-hYO/MMZBb9YczvIq4mn1XE9rhnaTg9t35by/GHtvdJQ="; + hash = "sha256-dg+Xl3yHiWJPV+3iFcMVCPHOpHo0+pFiJv+ZVXDAK6k="; }; - vendorHash = "sha256-Q1zeKGu20kOpjqdLCB7stuWBqi/2EyWK7vMRAYUCJKg="; + vendorHash = "sha256-KvG0+wxe0D+TxQmxaskTa228zUlOxCZE9rGqMYkdwzM="; # Tests need docker doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/scylladb/default.nix b/third_party/nixpkgs/pkgs/servers/scylladb/default.nix index d44885360f..ef55409d28 100644 --- a/third_party/nixpkgs/pkgs/servers/scylladb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/scylladb/default.nix @@ -19,7 +19,7 @@ protobuf, cryptopp, libxfs, - libyamlcpp, + yaml-cpp, libsystemtap, lksctp-tools, lz4, @@ -64,7 +64,7 @@ gcc8Stdenv.mkDerivation { protobuf cryptopp libxfs - libyamlcpp + yaml-cpp libsystemtap lksctp-tools lz4 diff --git a/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix b/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix index 6af33c31db..a55967920f 100644 --- a/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sftpgo/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; rev = "refs/tags/v${version}"; - hash = "sha256-bI4IiYzVorocITkip+Xev3t7vGeMVmqCZn7oR1mAPpI="; + hash = "sha256-cSA7ndpIV3VvIZTBa9NCIlJn57EtT1qxrB0UsMENUS0="; }; - vendorHash = "sha256-+i6jUImDMrsDnIPjIp8uM2BR1IYMqWG1OmvA2w/AfVQ="; + vendorHash = "sha256-C45KA+9tdj+fR3DUBLdG2dGzT59zuAJczpKVoiAZ7lg="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix index 8a092447c0..dbfe0f22bf 100644 --- a/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix +++ b/third_party/nixpkgs/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.25.47"; + version = "0.25.60"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "sha256-CnAJ2qpE+k8TvBD06WbZWOvlF740Xgx/Q0JWf3rJcWI="; + sha256 = "sha256-5I6hJgUN2BdHc80RrcmWWxdq0iz6rcO4aX16CDtwu/g="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix b/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix index 0940d1a0ec..e59b9d73d5 100644 --- a/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix @@ -1,21 +1,30 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, stdenv +, darwin +}: rustPlatform.buildRustPackage rec { pname = "simple-http-server"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "TheWaWaR"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9wssSegekRBUXxpru5WGGu6BLX6BFEgV0QliNJToRFg="; + sha256 = "sha256-b+z3rio+kg1Z0B4pqhTlCTtzXgAeCAhinSa9dkIwcaY="; }; - cargoSha256 = "sha256-P8Zr5KTjXD0qHkf6QfyfN39PjokpZUfywhzVjIO5rE8="; + cargoSha256 = "sha256-teBqgQloI/13F7K/+EBKFcHWqcK1wJrNUu5LO8nwQbo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/skydns/default.nix b/third_party/nixpkgs/pkgs/servers/skydns/default.nix index e6f35124a6..be9e815b9e 100644 --- a/third_party/nixpkgs/pkgs/servers/skydns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/skydns/default.nix @@ -1,22 +1,34 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "skydns"; - version = "2.5.3a"; - rev = version; - - goPackagePath = "github.com/skynetservices/skydns"; + version = "unstable-2019-10-15"; src = fetchFromGitHub { - inherit rev; owner = "skynetservices"; repo = "skydns"; - sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7"; + rev = "94b2ea0d8bfa43395656ea94d4a6235bdda47129"; + hash = "sha256-OWLJmGx21UoWwrm6YNbPYdj3OgEZz7C+xccnkMOZ71g="; }; - goDeps = ./deps.nix; + vendorHash = "sha256-J3+DACU9JuazGCZZrfKxHukG5M+nb+WbV3eTG8EaT/w="; - meta = { + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/skynetservices/skydns/commit/37be34cd64a3037a6d5a3b3dbb673f391e9d7eb1.patch"; + hash = "sha256-JziYREg3vw8NMIPd8Zv8An7XUj+U6dvgRcaZph0DLPg="; + }) + ]; + + subPackages = [ "." ]; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "A distributed service for announcement and discovery of services"; + homepage = "https://github.com/skynetservices/skydns"; license = lib.licenses.mit; + maintainers = with maintainers; [ aaronjheng ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/skydns/deps.nix b/third_party/nixpkgs/pkgs/servers/skydns/deps.nix deleted file mode 100644 index a4f4eb1204..0000000000 --- a/third_party/nixpkgs/pkgs/servers/skydns/deps.nix +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "59b73b37c1e45995477aae817e4a653c89a858db"; - sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1"; - sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; - sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "40456948a47496dc22168e6af39297a2f8fbf38c"; - sha256 = "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; - } - { - goPackagePath = "github.com/coreos/go-etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-etcd"; - rev = "9847b93751a5fbaf227b893d172cee0104ac6427"; - sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; - sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; - }; - } - { - goPackagePath = "github.com/stathat/go"; - fetch = { - type = "git"; - url = "https://github.com/stathat/go"; - rev = "91dfa3a59c5b233fef9a346a1460f6e2bc889d93"; - sha256 = "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; - sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; - sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; - sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; - }; - } - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "hg"; - url = "bitbucket.org/ww/goautoneg"; - rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix index a87cba2cc3..eb83103976 100644 --- a/third_party/nixpkgs/pkgs/servers/snappymail/default.nix +++ b/third_party/nixpkgs/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.24.5"; + version = "2.25.0"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-LqipclpQe2eDWNgapdEpgqzAh1jz4uyJHEQem0Z9g4w="; + sha256 = "sha256-obPWI6tvZx8HEWvNUw9euJav1ncbBYtXwY7SgEurkdQ="; }; sourceRoot = "snappymail"; diff --git a/third_party/nixpkgs/pkgs/servers/spicedb/default.nix b/third_party/nixpkgs/pkgs/servers/spicedb/default.nix index 0f5a700f71..b3d898dde6 100644 --- a/third_party/nixpkgs/pkgs/servers/spicedb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.15.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-ecwLiIqmRgJqzr3BvXnlD+wYcA0IfurK6q57t2G8/I4="; + hash = "sha256-v30F6JhLmPLuYVyegjMPOjUKQ51xxrNfYMqaEPmRuwI="; }; - vendorHash = "sha256-5UiW7a/3PQrVsHhLWs9Odo16IeGil6YMdiUU12h6ohk="; + vendorHash = "sha256-TMwijafZ5ILTr9ZA5CG5uFFIZe6EmnLAL2zD25l/1gs="; subPackages = [ "cmd/spicedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix b/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix index efb672da5f..982242a0e7 100644 --- a/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix +++ b/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "0.7.5"; + version = "0.8.0"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-Q12zM9GgQQBykFLZ3nwdkl8Nk/0nbXaOJzXzO8wSOXY="; + hash = "sha256-/tYQqS0l5Z/yeNd6GJHONtD3YeQ7nvvWcilBAahDDPA="; }; - vendorHash = "sha256-AEU8yTG+n+JOSB7Cnmf+mztm/1c5vuarSqVr3hC/14g="; + vendorHash = "sha256-3JQgtWaPi2e9lSXF+3IIXDptQXjFJOBsMPfisEea8kE="; meta = with lib; { description = "Command line for managing SpiceDB"; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mssql/jdbc/jtds.nix b/third_party/nixpkgs/pkgs/servers/sql/mssql/jdbc/jtds.nix index e67cc1b0ec..71561409c7 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mssql/jdbc/jtds.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mssql/jdbc/jtds.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Pure Java (type 4) JDBC 3.0 driver for Microsoft SQL Server"; - homepage = "http://jtds.sourceforge.net/"; + homepage = "https://jtds.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.unix; }; 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 98563bda6c..2958cebfc9 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 @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "8.0.31"; + version = "8.0.32"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Z7uMunWyjpXH95SFY/AfuEUo/LsaNduoOdTORP4Bm6o="; + sha256 = "sha256-Hw2SojeJgkRxbdWB95k1bgc8LaY8Oy5KAeEDLL7VDig="; }; nativeBuildInputs = [ bison cmake pkg-config ] diff --git a/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix b/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix index 6eaaa4a736..23c165ab54 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix @@ -41,7 +41,7 @@ pythonPackages.buildPythonApplication rec { ydiff ]; - checkInputs = with pythonPackages; [ + nativeCheckInputs = with pythonPackages; [ flake8 mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgaudit.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgaudit.nix new file mode 100644 index 0000000000..c5e536363f --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgaudit.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, libkrb5, openssl, postgresql }: + +stdenv.mkDerivation rec { + pname = "pgaudit"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "pgaudit"; + repo = "pgaudit"; + rev = version; + hash = "sha256-8pShPr4HJaJQPjW1iPJIpj3CutTx8Tgr+rOqoXtgCcw="; + }; + + buildInputs = [ libkrb5 openssl postgresql ]; + + makeFlags = [ "USE_PGXS=1" ]; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; + + meta = with lib; { + description = "Open Source PostgreSQL Audit Logging"; + homepage = "https://github.com/pgaudit/pgaudit"; + maintainers = with maintainers; [ idontgetoutmuch ]; + platforms = postgresql.meta.platforms; + license = licenses.postgresql; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix index 77137d4447..8eb0cb7f42 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "pgvector"; repo = "pgvector"; rev = "v${version}"; - sha256 = "sha256-I+MIQjZNsKHLsiCtvip73fA2LYPR7PVFgTBNtn+CtFE="; + hash = "sha256-bOckX7zvHhgJDDhoAm+VZVIeVIf2hG/3oWZWuTtnZPo="; }; buildInputs = [ postgresql ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 4c5b006099..14078659ae 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.2.6"; + version = "2.3.0"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - hash = "sha256-8HFyIzJ1iF3K2vTlibFallvkMKjFTJ2DO64fORToD8E="; + hash = "sha256-zl7AF+1hj6UFnf9sKO40ZTzm7edKguUYFqaT5/qf8Ic="; }; buildInputs = [ postgresql ]; 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 52a3ff1b68..7c9e8fa695 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -1,14 +1,19 @@ { lib, stdenv, fetchFromGitHub, cmake, postgresql, openssl, libkrb5 }: # # To enable on NixOS: -# config.services.postgresql = { -# extraPlugins = [ pkgs.timescaledb ]; -# extraConfig = "shared_preload_libraries = 'timescaledb'"; +# config.services.postgresql = let +# # The postgresql pkgs has to be taken from the +# # postgresql package used, so the extensions +# # are built for the correct postgresql version. +# postgresqlPackages = config.services.postgresql.package.pkgs; +# in { +# extraPlugins = with postgresqlPackages; [ timescaledb ]; +# settings.shared_preload_libraries = "timescaledb"; # } stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.9.1"; + version = "2.9.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -17,7 +22,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-fvVSxDiGZAewyuQ2vZDb0I6tmlDXl6trjZp8+qDBtb8="; + sha256 = "sha256-3n3nqAVow8nIocXPsgCZcNkV+jr/G5/CmnSUfj2WMWo="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix index 80065bde4b..2bf9db061a 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/packages.nix @@ -24,6 +24,8 @@ self: super: { pg_similarity = super.callPackage ./ext/pg_similarity.nix { }; + pgaudit = super.callPackage ./ext/pgaudit.nix { }; + pgroonga = super.callPackage ./ext/pgroonga.nix { }; pgvector = super.callPackage ./ext/pgvector.nix { }; diff --git a/third_party/nixpkgs/pkgs/servers/squid/default.nix b/third_party/nixpkgs/pkgs/servers/squid/default.nix index 362a7432ff..4b7ce81b45 100644 --- a/third_party/nixpkgs/pkgs/servers/squid/default.nix +++ b/third_party/nixpkgs/pkgs/servers/squid/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "--enable-linux-netfilter"; doCheck = true; - checkInputs = [ cppunit ]; + nativeCheckInputs = [ cppunit ]; preCheck = '' # tests attempt to copy around "/bin/true" to make some things # no-ops but this doesn't work if our "true" is a multi-call diff --git a/third_party/nixpkgs/pkgs/servers/stayrtr/default.nix b/third_party/nixpkgs/pkgs/servers/stayrtr/default.nix index a168cf5b1e..0193f3ede5 100644 --- a/third_party/nixpkgs/pkgs/servers/stayrtr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/stayrtr/default.nix @@ -7,15 +7,15 @@ buildGoModule rec { pname = "stayrtr"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "bgp"; repo = "stayrtr"; rev = "v${version}"; - sha256 = "10ndb8p7znnjycwg56m63gzqf9zc6lq9mcvz4n48j0c4il5xyn8x"; + sha256 = "sha256-oRFBvue5Tcgty1GgsZGb/CMHmKM0mIc5vWOMsL/0IfI="; }; - vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; + vendorHash = "sha256-VomrmyNa5I6AVSpw5sg0e4b7w/JlFQINBYm+eh1FoNw="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index 7bb559efa4..b936fd3162 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "tailscale"; - version = "1.34.2"; + version = "1.36.0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-uFr7swB7AQLvjDg+1KBCQuoLkDw454+gVe+6/iD74LM="; + sha256 = "sha256-hNyEABs/GdfOx6vLTVBgbOzkbFvEDYZ0y1y0a0mIsfA="; }; - vendorSha256 = "sha256-//qhvzZzaAqfcj4HZIy6ZkGyfAwtRdf7ARaXI+trTe0="; + vendorSha256 = "sha256-Jy3kjUA8qLhcw9XLw4Xo1zhD+IWZrDNM79TsbnKpx/g="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/tarantool/default.nix b/third_party/nixpkgs/pkgs/servers/tarantool/default.nix index a676213555..bdb36a7f10 100644 --- a/third_party/nixpkgs/pkgs/servers/tarantool/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tarantool/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { c-ares ]; - checkInputs = [ gbenchmark ]; + nativeCheckInputs = [ gbenchmark ]; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/servers/teleport/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/default.nix index 8cc67a1ff6..9025c9151b 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/default.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/default.nix @@ -23,13 +23,13 @@ let owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - hash = "sha256-F5v3/eKPLhSxW7FImTbE+QMtfn8w5WVTrxMWhgNr3YA="; + hash = "sha256-dr+tmWVO7yXRLTvJZoFZzayRWETa8wC/aZ7S/vh8qyk="; }; - version = "10.3.1"; + version = "11.2.3"; rdpClient = rustPlatform.buildRustPackage rec { pname = "teleport-rdpclient"; - cargoHash = "sha256-Xmabjoq1NXxXemeR06Gg8R/HwdSE+rsxxX645pQ3SuI="; + cargoHash = "sha256-8NTzX9HeGg9U3bmiZHXHTcKnbJk55YfY2bkjilEyg0g="; inherit version src; buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; @@ -40,7 +40,7 @@ let # https://github.com/NixOS/nixpkgs/issues/161570 , # buildRustPackage sets strictDeps = true; - checkInputs = buildInputs; + nativeCheckInputs = buildInputs; OPENSSL_NO_VENDOR = "1"; @@ -53,16 +53,16 @@ let webassets = fetchFromGitHub { owner = "gravitational"; repo = "webassets"; - # Submodule rev from https://github.com/gravitational/teleport/tree/v10.3.1 - rev = "6710dcd0dc19ad101bac3259c463ef940f2ab1f3"; - hash = "sha256-A13FSpgJODmhugAwy4kqiDw4Rihr//DhQX/bjwaeo2A="; + # Submodule rev from https://github.com/gravitational/teleport/tree/v11.2.3 + rev = "cbddcfda9d5ccba11f02ee61bd305c1f600ee6b0"; + hash = "sha256-XPcQaMyf6kEj5RDRKjNO5b+n1zj/TpBHcDnGhYVUbts="; }; in buildGoModule rec { pname = "teleport"; inherit src version; - vendorHash = "sha256-2Zrd3CbZvxns9lNVtwaaor1mi97IhPc+MRJhj3rU760="; + vendorHash = "sha256-rWdRVOaPPK2oXK6fXka4FtuxEkaQf4igm7xlg0wauMs="; subPackages = [ "tool/tbot" "tool/tctl" "tool/teleport" "tool/tsh" ]; tags = [ "libfido2" "webassets_embed" ] diff --git a/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeymarker/default.nix b/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeymarker/default.nix index ab059b518e..86da469e34 100644 --- a/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeymarker/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeymarker/default.nix @@ -1,13 +1,15 @@ -{ lib, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchFromGitHub }: import ./versions.nix ({version, sha256}: buildGoModule { pname = "honeymarker"; inherit version; vendorSha256 = "sha256-ZuDobjC/nizZ7G0o/zVTQmDfDjcdBhfPcmkhgwFc7VU="; - src = fetchurl { - url = "https://github.com/honeycombio/honeymarker/archive/refs/tags/v${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeymarker"; + rev = "v${version}"; + hash = sha256; }; inherit (buildGoModule.go) GOOS GOARCH; diff --git a/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix b/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix index c7fde50e15..60e6a537e4 100644 --- a/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix +++ b/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeymarker/versions.nix @@ -1,6 +1,6 @@ generic: { v0_2_1 = generic { version = "0.2.1"; - sha256 = "0gp427bsc1y7k6j1sqgl8r3kng5b0qhmqd4bpfb9139ivmp2sykk"; + sha256 = "sha256-tiwX94CRvXnUYpiux94XhOj2abn1Uc+wjcDOmw79ab4="; }; } diff --git a/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeytail/default.nix b/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeytail/default.nix index cbe901f285..b5c21ed1d9 100644 --- a/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeytail/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeytail/default.nix @@ -1,13 +1,15 @@ -{ lib, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchFromGitHub }: import ./versions.nix ({version, sha256}: buildGoModule { pname = "honeytail"; inherit version; vendorSha256 = "sha256-LtiiLGLjhbfT49A6Fw5CbSbnmTHMxtcUssr+ayCVrvY="; - src = fetchurl { - url = "https://github.com/honeycombio/honeytail/archive/refs/tags/v${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeytail"; + rev = "v${version}"; + hash = sha256; }; inherit (buildGoModule.go) GOOS GOARCH; diff --git a/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeytail/versions.nix b/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeytail/versions.nix index 370d645ab6..295cc7c635 100644 --- a/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeytail/versions.nix +++ b/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeytail/versions.nix @@ -1,6 +1,6 @@ generic: { v1_6_0 = generic { version = "1.6.0"; - sha256 = "039svpvqjck7s3rq86s29xgcyxl1wr0zj90s3jsyp058zk1dgwdy"; + sha256 = "sha256-S0hIgNNzF1eNe+XJs+PT7EUIl5oJCXu+B/zQago4sf8="; }; } diff --git a/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeyvent/default.nix b/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeyvent/default.nix index 839b8ec053..e1009c35a8 100644 --- a/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeyvent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeyvent/default.nix @@ -1,13 +1,15 @@ -{ lib, buildGoModule, fetchurl }: +{ lib, buildGoModule, fetchFromGitHub }: import ./versions.nix ({version, sha256}: buildGoModule { pname = "honeyvent"; inherit version; vendorSha256 = null; - src = fetchurl { - url = "https://github.com/honeycombio/honeyvent/archive/refs/tags/v${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "honeycombio"; + repo = "honeyvent"; + rev = "v${version}"; + hash = sha256; }; inherit (buildGoModule.go) GOOS GOARCH; diff --git a/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix b/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix index 831de6c933..1bf2443aa1 100644 --- a/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix +++ b/third_party/nixpkgs/pkgs/servers/tracing/honeycomb/honeyvent/versions.nix @@ -1,6 +1,6 @@ generic: { v1_1_0 = generic { version = "1.1.0"; - sha256 = "0ar2m25ngdd1wk7d70j2781wbrvhjhf9cj9qvp24jjrhqng6hvn7"; + sha256 = "sha256-yFQEOshjaH6fRCQ7IZChANI9guZlTXk35p1NzQvxUdI="; }; } diff --git a/third_party/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix b/third_party/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix index 2bd4cf3248..8d2f4f42af 100644 --- a/third_party/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tt-rss/theme-feedly/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tt-rss-theme-feedly"; - version = "2.10.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "levito"; repo = "tt-rss-feedly-theme"; rev = "v${version}"; - sha256 = "sha256-a8IZZbTlVU8Cu1F/HwEnsUW3eRqaTnKuJ166WJIw9/A="; + sha256 = "sha256-sHKht4EXKIibk+McMR+fKv7eZFJsGgZWhfxlLssA/Sw="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/ttyd/default.nix b/third_party/nixpkgs/pkgs/servers/ttyd/default.nix index 999f92c49f..d11f51a8d8 100644 --- a/third_party/nixpkgs/pkgs/servers/ttyd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ttyd/default.nix @@ -7,12 +7,12 @@ with builtins; stdenv.mkDerivation rec { pname = "ttyd"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "tsl0922"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-M1tRZ2CXU9XYClj4DdNLGdCXtQDgAoBpuLKvRsbDkMA="; + sha256 = "sha256-zwKK8TPEATAgJwHh04hurzU3NrhyHA70qkf5kXW1yQc="; }; nativeBuildInputs = [ pkg-config cmake xxd ]; diff --git a/third_party/nixpkgs/pkgs/servers/uftp/default.nix b/third_party/nixpkgs/pkgs/servers/uftp/default.nix index 480857cc8a..65447ecb74 100644 --- a/third_party/nixpkgs/pkgs/servers/uftp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/uftp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Encrypted UDP based FTP with multicast"; - homepage = "http://uftp-multicast.sourceforge.net/"; + homepage = "https://uftp-multicast.sourceforge.net/"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.fadenb ]; platforms = with lib.platforms; linux ++ darwin; diff --git a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix index 01fa28d5d4..0a9ff0bcc1 100644 --- a/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/uwsgi/default.nix @@ -3,7 +3,7 @@ # plugins: list of strings, eg. [ "python2" "python3" ] , plugins ? [] , pam, withPAM ? stdenv.isLinux -, systemd, withSystemd ? stdenv.isLinux +, systemd, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , libcap, withCap ? stdenv.isLinux , python2, python3, ncurses , ruby, php diff --git a/third_party/nixpkgs/pkgs/servers/uxplay/default.nix b/third_party/nixpkgs/pkgs/servers/uxplay/default.nix index 789f3ba8d6..76aa73c0b0 100644 --- a/third_party/nixpkgs/pkgs/servers/uxplay/default.nix +++ b/third_party/nixpkgs/pkgs/servers/uxplay/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "uxplay"; - version = "1.61.1"; + version = "1.62"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${version}"; - sha256 = "sha256-eLTIpRmKewBghUYFot8I3iTeiI6wlU7WNs8/X3w+U80="; + sha256 = "sha256-+IO+ITSa5LSFdCaU28B/MMBl4a+35957VlNxIQK5IqU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/varnish/default.nix b/third_party/nixpkgs/pkgs/servers/varnish/default.nix index 68d43313db..0014ad3259 100644 --- a/third_party/nixpkgs/pkgs/servers/varnish/default.nix +++ b/third_party/nixpkgs/pkgs/servers/varnish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pcre, pcre2, jemalloc, libxslt, groff, ncurses, pkg-config, readline, libedit +{ lib, stdenv, fetchurl, fetchpatch, pcre, pcre2, jemalloc, libunwind, libxslt, groff, ncurses, pkg-config, readline, libedit , coreutils, python3, makeWrapper, nixosTests }: let @@ -18,6 +18,7 @@ let ] ++ lib.optional (lib.versionOlder version "7") pcre ++ lib.optional (lib.versionAtLeast version "7") pcre2 + ++ lib.optional stdenv.hostPlatform.isDarwin libunwind ++ lib.optional stdenv.hostPlatform.isLinux jemalloc; buildFlags = [ "localstatedir=/var/spool" ]; @@ -41,7 +42,6 @@ let }; meta = with lib; { - broken = stdenv.isDarwin; description = "Web application accelerator also known as a caching HTTP reverse proxy"; homepage = "https://www.varnish-cache.org"; license = licenses.bsd2; diff --git a/third_party/nixpkgs/pkgs/servers/vouch-proxy/default.nix b/third_party/nixpkgs/pkgs/servers/vouch-proxy/default.nix index 9ef0e17f95..535ef7192d 100644 --- a/third_party/nixpkgs/pkgs/servers/vouch-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/vouch-proxy/default.nix @@ -1,20 +1,24 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "vouch-proxy"; - version = "0.37.3"; + version = "0.39.0"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; - rev = "v${version}"; - sha256 = "sha256-zXt1Xo6xq1g1putx4q6z7SEXK4lNGRgRnNPXajL5Znw="; + rev = "refs/tags/v${version}"; + hash = "sha256-q4tylXW219jzWrdzOQxewRh1advYEouEKiNJvvnIp9U="; }; - vendorSha256 = "sha256-E1x1QTagXkL4NQ7REDuTHpUaadiz72e3jMLPVquSSV4="; + vendorHash = "sha256-IUjIGht/oQiWKHfbW7nJaybKpKs179mOkpLIwAb8/hk="; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X main.version=${version}" ]; @@ -25,8 +29,9 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/vouch/vouch-proxy"; description = "An SSO and OAuth / OIDC login solution for NGINX using the auth_request module"; + changelog = "https://github.com/vouch/vouch-proxy/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ leona erictapen ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix index ac09e53258..cb7d703b5c 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/changedetection-io/default.nix @@ -83,7 +83,7 @@ py.pkgs.buildPythonApplication rec { # tests can currently not be run in one pytest invocation and without docker doCheck = false; - checkInputs = with py.pkgs; [ + nativeCheckInputs = with py.pkgs; [ pytest-flask pytestCheckHook ]; 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 0712a06863..4ddb8995b6 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 @@ -18,6 +18,7 @@ in discourse-oauth2-basic = callPackage ./discourse-oauth2-basic {}; discourse-openid-connect = callPackage ./discourse-openid-connect {}; discourse-prometheus = callPackage ./discourse-prometheus {}; + discourse-reactions = callPackage ./discourse-reactions {}; discourse-saved-searches = callPackage ./discourse-saved-searches {}; discourse-solved = callPackage ./discourse-solved {}; discourse-spoiler-alert = callPackage ./discourse-spoiler-alert {}; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix new file mode 100644 index 0000000000..ac48f83ae9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix @@ -0,0 +1,17 @@ +{ lib, mkDiscoursePlugin, fetchFromGitHub }: + +mkDiscoursePlugin { + name = "discourse-reactions"; + src = fetchFromGitHub { + owner = "discourse"; + repo = "discourse-reactions"; + rev = "3afaabc8e430dfe655be4efbbcb20ab7f0c7c8d3"; + sha256 = "sha256-CdrInrPFDpvYW7j0epIeAFUoPGTbmMOGdm2DpkIQBbs="; + }; + meta = with lib; { + homepage = "https://github.com/discourse/discourse-reactions"; + maintainers = with maintainers; [ bbenno ]; + license = licenses.mit; + description = "Allows users to react to a post from a choice of emojis, rather than only the like heart"; + }; +} 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 aa0ddbd60e..2c5c8f4b44 100755 --- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py +++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/update.py @@ -294,8 +294,9 @@ def update_plugins(): {'name': 'discourse-ldap-auth', 'owner': 'jonmbake'}, {'name': 'discourse-math'}, {'name': 'discourse-migratepassword', 'owner': 'discoursehosting'}, - {'name': 'discourse-prometheus'}, {'name': 'discourse-openid-connect'}, + {'name': 'discourse-prometheus'}, + {'name': 'discourse-reactions'}, {'name': 'discourse-saved-searches'}, {'name': 'discourse-solved'}, {'name': 'discourse-spoiler-alert'}, diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix index b292ef34bc..d8dc1e940b 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix @@ -13,14 +13,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "healthchecks"; - version = "2.5"; + version = "2.6.1"; format = "other"; src = fetchFromGitHub { owner = "healthchecks"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-luwFY1iBtFL+Ye7nP68eIgqlpvMUKnxwdNxkBI7pX/c="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-m6QN0FsuNY81iZYAXf7OaPJ6WCJhDSpF52H5k7SqwRY="; }; propagatedBuildInputs = with py.pkgs; [ 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 02bb13f5f7..726552f309 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 ? [ ], nixosTests }: let - version = "4.0.5"; + version = "4.1.1"; versionParts = lib.take 2 (lib.splitVersion version); # 4.2 -> 402, 3.11 -> 311 @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "sha256-m4LyAg/C/ZV3nBD4gNFNjwI6glg7ZAH2nSGg0mU2DsI="; + sha256 = "sha256-w6N/jFYieL+yJXlDr1/9AATChSqiatx+aJl0XSOSL0s="; }; phpConfig = writeText "config.php" '' diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/default.nix index dd60980e32..8b6e77ec0f 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/default.nix @@ -32,19 +32,15 @@ let in py.pkgs.buildPythonApplication rec { pname = "peering-manager"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-vrRMdqEpsps4ZKgunMhznJr/TQ9+WVMNYFu76ZU7iMI="; + sha256 = "sha256-mXva4c5Rtjq/jFJl3yGGlVrggzGJ3awN0+xoDnDWBSA="; }; - patches = [ - ./redis-unix-sock.patch - ]; - format = "other"; propagatedBuildInputs = with py.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch b/third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch deleted file mode 100644 index 5db0d0dd01..0000000000 --- a/third_party/nixpkgs/pkgs/servers/web-apps/peering-manager/redis-unix-sock.patch +++ /dev/null @@ -1,47 +0,0 @@ -commit 1e64a7f6ca456249305f6a3c90f9acf84af194db -Author: Yureka -Date: Tue Nov 29 14:03:08 2022 +0100 - - support unix sockets for redis connections - -diff --git a/peering_manager/settings.py b/peering_manager/settings.py -index 739d6ff..b5edf4d 100644 ---- a/peering_manager/settings.py -+++ b/peering_manager/settings.py -@@ -270,6 +270,7 @@ TASKS_REDIS_PASSWORD = TASKS_REDIS.get("PASSWORD", "") - TASKS_REDIS_DATABASE = TASKS_REDIS.get("DATABASE", 0) - TASKS_REDIS_DEFAULT_TIMEOUT = TASKS_REDIS.get("DEFAULT_TIMEOUT", 300) - TASKS_REDIS_SSL = TASKS_REDIS.get("SSL", False) -+TASKS_REDIS_UNIX_SOCKET_PATH = TASKS_REDIS.get("UNIX_SOCKET_PATH", "") - if "DEFAULT_TIMEOUT" in TASKS_REDIS: - warnings.warn( - "DEFAULT_TIMEOUT is no longer supported under REDIS configuration. Set RQ_DEFAULT_TIMEOUT instead." -@@ -294,6 +295,7 @@ CACHING_REDIS_PASSWORD = CACHING_REDIS.get("PASSWORD", "") - CACHING_REDIS_DATABASE = CACHING_REDIS.get("DATABASE", 0) - CACHING_REDIS_DEFAULT_TIMEOUT = CACHING_REDIS.get("DEFAULT_TIMEOUT", 300) - CACHING_REDIS_SSL = CACHING_REDIS.get("SSL", False) -+CACHING_REDIS_UNIX_SOCKET_PATH = CACHING_REDIS.get("UNIX_SOCKET_PATH", "") - - if CACHING_REDIS_USING_SENTINEL: - CACHEOPS_SENTINEL = { -@@ -301,6 +303,8 @@ if CACHING_REDIS_USING_SENTINEL: - "service_name": CACHING_REDIS_SENTINEL_SERVICE, - "db": CACHING_REDIS_DATABASE, - } -+elif CACHING_REDIS_UNIX_SOCKET_PATH != "": -+ CACHEOPS_REDIS = f"unix://{CACHING_REDIS_UNIX_SOCKET_PATH}?db={CACHING_REDIS_DATABASE}" - else: - REDIS_CACHE_CON_STRING = "rediss://" if CACHING_REDIS_SSL else "redis://" - if CACHING_REDIS_PASSWORD: -@@ -334,6 +338,11 @@ if TASKS_REDIS_USING_SENTINEL: - "SOCKET_TIMEOUT": None, - "CONNECTION_KWARGS": {"socket_connect_timeout": TASKS_REDIS_DEFAULT_TIMEOUT}, - } -+elif TASKS_REDIS_UNIX_SOCKET_PATH != "": -+ RQ_PARAMS = { -+ "UNIX_SOCKET_PATH": TASKS_REDIS_UNIX_SOCKET_PATH, -+ "DB": TASKS_REDIS_DATABASE, -+ } - else: - RQ_PARAMS = { - "HOST": TASKS_REDIS_HOST, diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/default.nix index cd89da9430..e7756e4bb3 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/default.nix @@ -1,20 +1,24 @@ -{ lib, buildGoPackage, fetchFromSourcehut, nixosTests }: +{ lib, buildGoModule, fetchFromSourcehut, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "phylactery"; version = "0.1.2"; - goPackagePath = "git.sr.ht/~cnx/phylactery"; - src = fetchFromSourcehut { owner = "~cnx"; repo = pname; rev = version; - sha256 = "sha256-HQN6wJ/4YeuQaDcNgdHj0RgYnn2NxXGRfxybmv60EdQ="; + hash = "sha256-HQN6wJ/4YeuQaDcNgdHj0RgYnn2NxXGRfxybmv60EdQ="; }; - # Upstream repo doesn't provide any test. - doCheck = false; + vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + preBuild = '' + cp ${./go.mod} go.mod + ''; + + ldflags = [ "-s" "-w" ]; + passthru.tests.phylactery = nixosTests.phylactery; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/go.mod b/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/go.mod new file mode 100644 index 0000000000..4ec9652e23 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/go.mod @@ -0,0 +1,3 @@ +module git.sr.ht/~cnx/phylactery + +go 1.18 diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/shiori/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/shiori/default.nix index 5d13813237..90d238f323 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/shiori/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/shiori/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "shiori"; - version = "1.5.3"; + version = "1.5.4"; - vendorSha256 = "sha256-vyBb8jNpXgpiktbn2lphL2wAeKmvjJLxV8ZrHoUSNYY="; + vendorHash = "sha256-8aiaG2ry/XXsosbrLBmwnjbwIhbKMdM6WHae07MG7WI="; doCheck = false; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "go-shiori"; repo = pname; rev = "v${version}"; - sha256 = "sha256-razBb/flqwyFG4SPWhSapDO1sB5DYzyjYGx8ABFg/I8="; + sha256 = "sha256-QZTYhRz65VLs3Ytv0k8ptfeQ/36M2VBXFaD9zhQXDh8="; }; passthru.tests = { 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 d5a422606a..93cb0e1bbb 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix @@ -5,13 +5,13 @@ , libwbxml }: gnustep.stdenv.mkDerivation rec { pname = "SOGo"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOGo-${version}"; - hash = "sha256-3Xy0y1sdixy4gXhzhP9mfWeaDmOVJty+X95xCyxayPE="; + hash = "sha256-lHUEV5yYLs3oc8Arl3KX8G/OEAoLmS7pRLCGsRAJAr4="; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix index 955eac2c6c..4fb9c43380 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix @@ -16,7 +16,7 @@ let pname = "wallabag"; - version = "2.5.2"; + version = "2.5.3"; in stdenv.mkDerivation { inherit pname version; @@ -27,7 +27,7 @@ stdenv.mkDerivation { "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz" "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz" ]; - hash = "sha256-Q989SorGPm3KBuQhGAinYU6HGIa9RrhtRPvwGALU6jk="; + hash = "sha256-a30z9rdXcfc2eVuShEobgDWWHr9TfMwq9WwaWdrI3QU="; }; patches = [ @@ -45,8 +45,12 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' + runHook preInstall + mkdir $out cp -R * $out/ + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/generic.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/generic.nix index e15640c882..d2d97dab35 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/generic.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/generic.nix @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + # remove non-essential plugins and themes + rm -r wp-content/{plugins,themes} + mkdir wp-content/plugins + cat << EOF > wp-content/plugins/index.php + 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 +# 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 +, 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 +, depsTargetTarget ? [] # 1 -> 1 +, depsTargetTargetPropagated ? [] # 1 -> 1 -, checkInputs ? [] -, installCheckInputs ? [] +, checkInputs ? [] +, installCheckInputs ? [] +, nativeCheckInputs ? [] +, nativeInstallCheckInputs ? [] # Configure Phase , configureFlags ? [] @@ -206,6 +208,14 @@ then abort ("mkDerivation was called with unsupported hardening flags: " + lib.g else let doCheck = doCheck'; doInstallCheck = doInstallCheck'; + buildInputs' = buildInputs + ++ lib.optionals doCheck checkInputs + ++ lib.optionals doInstallCheck installCheckInputs; + nativeBuildInputs' = 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 nativeCheckInputs + ++ lib.optionals doInstallCheck nativeInstallCheckInputs; outputs = outputs'; @@ -215,16 +225,12 @@ else let dependencies = map (map lib.chooseDevOutputs) [ [ (map (drv: drv.__spliced.buildBuild or drv) (checkDependencyList "depsBuildBuild" depsBuildBuild)) - (map (drv: drv.__spliced.buildHost or drv) (checkDependencyList "nativeBuildInputs" 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.buildHost or drv) (checkDependencyList "nativeBuildInputs" nativeBuildInputs')) (map (drv: drv.__spliced.buildTarget or drv) (checkDependencyList "depsBuildTarget" depsBuildTarget)) ] [ (map (drv: drv.__spliced.hostHost or drv) (checkDependencyList "depsHostHost" depsHostHost)) - (map (drv: drv.__spliced.hostTarget or drv) (checkDependencyList "buildInputs" buildInputs)) + (map (drv: drv.__spliced.hostTarget or drv) (checkDependencyList "buildInputs" buildInputs')) ] [ (map (drv: drv.__spliced.targetTarget or drv) (checkDependencyList "depsTargetTarget" depsTargetTarget)) @@ -271,6 +277,7 @@ else let (removeAttrs attrs (["meta" "passthru" "pos" "checkInputs" "installCheckInputs" + "nativeCheckInputs" "nativeInstallCheckInputs" "__darwinAllowLocalNetworking" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"] diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh index b07420bb41..b1b982ecdf 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh +++ b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh @@ -1,4 +1,5 @@ # shellcheck shell=bash +# shellcheck disable=1090,2154,2123,2034,2178,2048,2068,1091 __nixpkgs_setup_set_original=$- set -eu set -o pipefail @@ -32,7 +33,7 @@ if [ -n "$__structuredAttrs" ]; then export NIX_ATTRS_JSON_FILE="$NIX_BUILD_TOP/.attrs.json" export NIX_ATTRS_SH_FILE="$NIX_BUILD_TOP/.attrs.sh" else - : ${outputs:=out} + : "${outputs:=out}" fi getAllOutputNames() { @@ -125,11 +126,6 @@ _eval() { ###################################################################### # Logging. -# Obsolete. -stopNest() { true; } -header() { echo "$1"; } -closeNest() { true; } - # Prints a command such that all word splits are unambiguous. We need # to split the command in three parts because the middle format string # will be, and must be, repeated for each argument. The first argument @@ -210,8 +206,8 @@ addToSearchPath() { # syntax when they switch to setting __structuredAttrs = true. prependToVar() { local -n nameref="$1" + local useArray type - useArray= if [ -n "$__structuredAttrs" ]; then useArray=true else @@ -243,8 +239,8 @@ prependToVar() { # Same as above appendToVar() { local -n nameref="$1" + local useArray type - useArray= if [ -n "$__structuredAttrs" ]; then useArray=true else @@ -398,7 +394,7 @@ fi # implementation uses zip archive and zip does not support dates going back to # 1970. export SOURCE_DATE_EPOCH -: ${SOURCE_DATE_EPOCH:=315532800} +: "${SOURCE_DATE_EPOCH:=315532800}" # Wildcard expansions that don't match should expand to an empty list. @@ -448,7 +444,6 @@ runHook addInputsHook # Package accumulators -# shellcheck disable=SC2034 declare -a pkgsBuildBuild pkgsBuildHost pkgsBuildTarget declare -a pkgsHostHost pkgsHostTarget declare -a pkgsTargetTarget @@ -473,7 +468,6 @@ declare -a pkgTargetHookVars=(envTargetTargetHook) declare -a pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars) # those variables are declared here, since where and if they are used varies -# shellcheck disable=SC2034 declare -a preFixupHooks fixupOutputHooks preConfigureHooks postFixupHooks postUnpackHooks unpackCmdHooks # Add env hooks for all sorts of deps with the specified host offset. @@ -521,7 +515,7 @@ findInputs() { local -r targetOffset="$3" # Sanity check - (( hostOffset <= targetOffset )) || exit -1 + (( hostOffset <= targetOffset )) || exit 1 local varVar="${pkgAccumVarVars[hostOffset + 1]}" local varRef="$varVar[$((targetOffset - hostOffset))]" @@ -610,12 +604,12 @@ findInputs() { # in each list must be store paths, and therefore space-free. # Make sure all are at least defined as empty -: ${depsBuildBuild=} ${depsBuildBuildPropagated=} -: ${nativeBuildInputs=} ${propagatedNativeBuildInputs=} ${defaultNativeBuildInputs=} -: ${depsBuildTarget=} ${depsBuildTargetPropagated=} -: ${depsHostHost=} ${depsHostHostPropagated=} -: ${buildInputs=} ${propagatedBuildInputs=} ${defaultBuildInputs=} -: ${depsTargetTarget=} ${depsTargetTargetPropagated=} +: "${depsBuildBuild=}" "${depsBuildBuildPropagated=}" +: "${nativeBuildInputs=}" "${propagatedNativeBuildInputs=}" "${defaultNativeBuildInputs=}" +: "${depsBuildTarget=}" "${depsBuildTargetPropagated=}" +: "${depsHostHost=}" "${depsHostHostPropagated=}" +: "${buildInputs=}" "${propagatedBuildInputs=}" "${defaultBuildInputs=}" +: "${depsTargetTarget=}" "${depsTargetTargetPropagated=}" for pkg in ${depsBuildBuild[@]} ${depsBuildBuildPropagated[@]}; do findInputs "$pkg" -1 -1 @@ -650,7 +644,7 @@ activatePackage() { local -r targetOffset="$3" # Sanity check - (( hostOffset <= targetOffset )) || exit -1 + (( hostOffset <= targetOffset )) || exit 1 if [ -f "$pkg" ]; then source "$pkg" @@ -798,10 +792,6 @@ unset _HOST_PATH unset _XDG_DATA_DIRS -# Make GNU Make produce nested output. -export NIX_INDENT_MAKE=1 - - # Normalize the NIX_BUILD_CORES variable. The value might be 0, which # means that we're supposed to try and auto-detect the number of # available CPU cores at run-time. @@ -888,7 +878,7 @@ substituteStream() { # fail loudly if provided with a binary (containing null bytes) consumeEntire() { # read returns non-0 on EOF, so we want read to fail - if IFS='' read -r -d '' $1 ; then + if IFS='' read -r -d '' "$1" ; then echo "consumeEntire(): ERROR: Input null bytes, won't process" >&2 return 1 fi @@ -1033,7 +1023,7 @@ _defaultUnpack() { unpackFile() { curSrc="$1" - header "unpacking source archive $curSrc" 3 + echo "unpacking source archive $curSrc" if ! runOneHook unpackCmd "$curSrc"; then echo "do not know how to unpack source archive $curSrc" exit 1 @@ -1079,7 +1069,7 @@ unpackPhase() { # Find the source directory. # set to empty if unset - : ${sourceRoot=} + : "${sourceRoot=}" if [ -n "${setSourceRoot:-}" ]; then runOneHook setSourceRoot @@ -1130,7 +1120,7 @@ patchPhase() { fi for i in "${patchesArray[@]}"; do - header "applying patch $i" 3 + echo "applying patch $i" local uncompress=cat case "$i" in *.gz) @@ -1183,7 +1173,7 @@ configurePhase() { runHook preConfigure # set to empty if unset - : ${configureScript=} + : "${configureScript=}" if [[ -z "$configureScript" && -x ./configure ]]; then configureScript=./configure @@ -1253,7 +1243,7 @@ buildPhase() { runHook preBuild if [[ -z "${makeFlags-}" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then - echo "no Makefile, doing nothing" + echo "no Makefile or custom buildPhase, doing nothing" else foundMakefile=1 @@ -1323,6 +1313,15 @@ checkPhase() { installPhase() { runHook preInstall + # Dont reuse 'foundMakefile' set in buildPhase, a makefile may have been created in buildPhase + if [[ -z "${makeFlags-}" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then + echo "no Makefile or custom installPhase, doing nothing" + runHook postInstall + return + else + foundMakefile=1 + fi + if [ -n "$prefix" ]; then mkdir -p "$prefix" fi @@ -1436,7 +1435,7 @@ installCheckPhase() { echo "no Makefile or custom installCheckPhase, doing nothing" #TODO(@oxij): should flagsArray influence make -n? elif [[ -z "${installCheckTarget:-}" ]] \ - && ! make -n ${makefile:+-f $makefile} ${installCheckTarget:-installcheck} >/dev/null 2>&1; then + && ! make -n ${makefile:+-f $makefile} "${installCheckTarget:-installcheck}" >/dev/null 2>&1; then echo "no installcheck target in ${makefile:-Makefile}, doing nothing" else # Old bash empty array hack @@ -1485,15 +1484,15 @@ distPhase() { showPhaseHeader() { local phase="$1" case "$phase" in - unpackPhase) header "unpacking sources";; - patchPhase) header "patching sources";; - configurePhase) header "configuring";; - buildPhase) header "building";; - checkPhase) header "running tests";; - installPhase) header "installing";; - fixupPhase) header "post-installation fixup";; - installCheckPhase) header "running install tests";; - *) header "$phase";; + unpackPhase) echo "unpacking sources";; + patchPhase) echo "patching sources";; + configurePhase) echo "configuring";; + buildPhase) echo "building";; + checkPhase) echo "running tests";; + installPhase) echo "installing";; + fixupPhase) echo "post-installation fixup";; + installCheckPhase) echo "running install tests";; + *) echo "$phase";; esac } @@ -1503,19 +1502,23 @@ showPhaseFooter() { local startTime="$2" local endTime="$3" local delta=$(( endTime - startTime )) - (( $delta < 30 )) && return + (( delta < 30 )) && return local H=$((delta/3600)) local M=$((delta%3600/60)) local S=$((delta%60)) echo -n "$phase completed in " - (( $H > 0 )) && echo -n "$H hours " - (( $M > 0 )) && echo -n "$M minutes " + (( H > 0 )) && echo -n "$H hours " + (( M > 0 )) && echo -n "$M minutes " echo "$S seconds" } genericBuild() { + # variable used by our gzip wrapper to add -n. + # gzip is in common-path.nix and is added to nix-shell but we only want to change its behaviour in nix builds. do not move to a setupHook in gzip. + export GZIP_NO_TIMESTAMPS=1 + if [ -f "${buildCommandPath:-}" ]; then source "$buildCommandPath" return @@ -1548,7 +1551,7 @@ genericBuild() { if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then continue; fi if [[ -n $NIX_LOG_FD ]]; then - echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&$NIX_LOG_FD + echo "@nix { \"action\": \"setPhase\", \"phase\": \"$curPhase\" }" >&"$NIX_LOG_FD" fi showPhaseHeader "$curPhase" diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh b/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh index f394869ea9..5b5677eef1 100644 --- a/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh +++ b/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-tools/scripts/unpack-bootstrap-tools.sh @@ -17,6 +17,15 @@ else LD_BINARY=$out/lib/ld-*so.? fi +# path to version-specific libraries, like libstdc++.so +LIBSTDCXX_SO_DIR=$(echo $out/lib/gcc/*/*) + +# Move version-specific libraries out to avoid library mix when we +# upgrade gcc. +# TODO(trofi): update bootstrap tarball script and tarballs to put them +# into expected location directly. +LD_LIBRARY_PATH=$out/lib $LD_BINARY $out/bin/mv $out/lib/libstdc++.* $LIBSTDCXX_SO_DIR/ + # On x86_64, ld-linux-x86-64.so.2 barfs on patchelf'ed programs. So # use a copy of patchelf. LD_LIBRARY_PATH=$out/lib $LD_BINARY $out/bin/cp $out/bin/patchelf . @@ -25,8 +34,8 @@ for i in $out/bin/* $out/libexec/gcc/*/*/*; do if [ -L "$i" ]; then continue; fi if [ -z "${i##*/liblto*}" ]; then continue; fi echo patching "$i" - LD_LIBRARY_PATH=$out/lib $LD_BINARY \ - ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i" + LD_LIBRARY_PATH=$out/lib:$LIBSTDCXX_SO_DIR $LD_BINARY \ + ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib:$LIBSTDCXX_SO_DIR --force-rpath "$i" done for i in $out/lib/librt-*.so $out/lib/libpcre*; do diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix index 870fb04c38..5c7dfcceec 100644 --- a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix @@ -296,7 +296,7 @@ in overrides = self: super: { inherit (prevStage) - ccWrapperStdenv + ccWrapperStdenv gettext gcc-unwrapped coreutils gnugrep perl gnum4 bison; dejagnu = super.dejagnu.overrideAttrs (a: { doCheck = false; } ); @@ -332,7 +332,8 @@ in # and that can fail to load. Therefore we upgrade `ld` to use newer libc; # apparently the interpreter needs to match libc, too. bintools = self.stdenvNoCC.mkDerivation { - inherit (prevStage.bintools.bintools) name; + pname = prevStage.bintools.bintools.pname + "-patchelfed-ld"; + inherit (prevStage.bintools.bintools) version; enableParallelBuilding = true; dontUnpack = true; dontBuild = true; @@ -369,7 +370,7 @@ in overrides = self: super: rec { inherit (prevStage) ccWrapperStdenv - binutils coreutils gnugrep + binutils coreutils gnugrep gettext perl patchelf linuxHeaders gnum4 bison libidn2 libunistring; ${localSystem.libc} = getLibc prevStage; gcc-unwrapped = diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix b/third_party/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix index e98ba0c085..3aa7f6a3df 100644 --- a/third_party/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/third_party/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -115,7 +115,7 @@ in with pkgs; rec { cp ${gawk.out}/bin/gawk $out/bin cp -d ${gawk.out}/bin/awk $out/bin cp ${tarMinimal.out}/bin/tar $out/bin - cp ${gzip.out}/bin/gzip $out/bin + cp ${gzip.out}/bin/.gzip-wrapped $out/bin/gzip cp ${bzip2.bin}/bin/bzip2 $out/bin cp -d ${gnumake.out}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin @@ -272,16 +272,17 @@ in with pkgs; rec { gcc --version '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' - ldlinux=$(echo ${bootstrapTools}/lib/${builtins.unsafeDiscardStringContext /* only basename */ (builtins.baseNameOf binutils.dynamicLinker)}) - export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}" - export CC="gcc -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib" - export CXX="g++ -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib" + rtld=$(echo ${bootstrapTools}/lib/${builtins.unsafeDiscardStringContext /* only basename */ (builtins.baseNameOf binutils.dynamicLinker)}) + libc_includes=${bootstrapTools}/include-glibc '' + lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - ldmusl=$(echo ${bootstrapTools}/lib/ld-musl*.so.?) - export CPP="cpp -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools}" - export CC="gcc -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib" - export CXX="g++ -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib" + rtld=$(echo ${bootstrapTools}/lib/ld-musl*.so.?) + libc_includes=${bootstrapTools}/include-libc '' + '' + # path to version-specific libraries, like libstdc++.so + cxx_libs=$(echo ${bootstrapTools}/lib/gcc/*/*) + export CPP="cpp -idirafter $libc_includes -B${bootstrapTools}" + export CC="gcc -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs" + export CXX="g++ -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs" echo '#include ' >> foo.c echo '#include ' >> foo.c diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix index 818001018b..39039c5950 100644 --- a/third_party/nixpkgs/pkgs/test/default.nix +++ b/third_party/nixpkgs/pkgs/test/default.nix @@ -51,6 +51,8 @@ with pkgs; php = recurseIntoAttrs (callPackages ./php {}); + pkg-config = recurseIntoAttrs (callPackage ../top-level/pkg-config/tests.nix { }); + rustCustomSysroot = callPackage ./rust-sysroot {}; buildRustCrate = callPackage ../build-support/rust/build-rust-crate/test { }; importCargoLock = callPackage ../build-support/rust/test/import-cargo-lock { }; diff --git a/third_party/nixpkgs/pkgs/test/stdenv/default.nix b/third_party/nixpkgs/pkgs/test/stdenv/default.nix index 5ff18298f2..bad6eb7ba7 100644 --- a/third_party/nixpkgs/pkgs/test/stdenv/default.nix +++ b/third_party/nixpkgs/pkgs/test/stdenv/default.nix @@ -4,7 +4,8 @@ { stdenv , pkgs , lib -, +, runCommand +, testers }: let @@ -99,6 +100,25 @@ in # tests for hooks in `stdenv.defaultNativeBuildInputs` hooks = lib.recurseIntoAttrs (import ./hooks.nix { stdenv = bootStdenv; pkgs = earlyPkgs; }); + outputs-no-out = runCommand "outputs-no-out-assert" { + result = testers.testBuildFailure (stdenv.mkDerivation { + NIX_DEBUG = 1; + name = "outputs-no-out"; + outputs = ["foo"]; + buildPhase = ":"; + installPhase = '' + touch $foo + ''; + }); + + # Assumption: the first output* variable to be configured is + # _overrideFirst outputDev "dev" "out" + expectedMsg = "_assignFirst: could not find a non-empty variable to assign to outputDev. The following variables were all unset or empty: dev out."; + } '' + grep -F "$expectedMsg" $result/testBuildFailure.log >/dev/null + touch $out + ''; + test-env-attrset = testEnvAttrset { name = "test-env-attrset"; stdenv' = bootStdenv; }; # Test compatibility with derivations using `env` as a regular variable. diff --git a/third_party/nixpkgs/pkgs/tools/X11/alttab/default.nix b/third_party/nixpkgs/pkgs/tools/X11/alttab/default.nix index 80b87cb277..9f71ba2fc8 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/alttab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/alttab/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ coreutils procps python3Packages.xvfbwrapper diff --git a/third_party/nixpkgs/pkgs/tools/X11/imwheel/default.nix b/third_party/nixpkgs/pkgs/tools/X11/imwheel/default.nix index 7aa8a6cba6..79fbe65af1 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/imwheel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/imwheel/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://imwheel.sourceforge.net/"; + homepage = "https://imwheel.sourceforge.net/"; description = "Mouse wheel configuration tool for XFree86/Xorg"; maintainers = with maintainers; [ jhillyerd ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xlayoutdisplay/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xlayoutdisplay/default.nix index 590d71b8f4..593b40a2ad 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xlayoutdisplay/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xlayoutdisplay/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = with xorg; [ libX11 libXrandr libXcursor boost ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; doCheck = true; checkTarget = "gtest"; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xosview2/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xosview2/default.nix index 653698c052..bd4234bae1 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xosview2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xosview2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libX11 ]; meta = with lib; { - homepage = "http://xosview.sourceforge.net/index.html"; + homepage = "https://xosview.sourceforge.net/index.html"; description = "Lightweight graphical operating system monitor"; longDescription = '' xosview is a lightweight program that gathers information from your diff --git a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix index 05a36726c0..2f793e3180 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix @@ -36,8 +36,6 @@ , xorgserver }: -with lib; - let inherit (python3.pkgs) cython buildPythonApplication; @@ -206,7 +204,7 @@ in buildPythonApplication rec { updateScript = ./update.sh; }; - meta = { + meta = with lib; { homepage = "https://xpra.org/"; downloadPage = "https://xpra.org/src/"; description = "Persistent remote applications for X"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix index aa1c77ef68..efbbe49a5b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-google-auth/default.nix @@ -46,7 +46,7 @@ buildPythonApplication rec { tzlocal ] ++ lib.optional withU2F python-u2flib-host; - checkInputs = [ + nativeCheckInputs = [ mock nose ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index 80a9aec563..a1aa06b4a6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "aws-vault"; - version = "6.6.1"; + version = "6.6.2"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oItDA7PWI6EzEyG9QYb8N1Zttm8yHwMSgpUDV2C5ae0="; + sha256 = "sha256-BijZpk0vograOGlyuK7Wpsv8Y5DJvHUoTJVCex7VTTo="; }; - vendorSha256 = "sha256-zC4v9TlKHGCYRWX0ZWAVdCM7yw9eaAZ/4ZIZ38sM4S0="; + vendorHash = "sha256-zC4v9TlKHGCYRWX0ZWAVdCM7yw9eaAZ/4ZIZ38sM4S0="; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix index 81ee4f449c..6eb8485524 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -25,14 +25,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.9.13"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.9.19"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - hash = "sha256-XI2cgyqdy1e/+khyu1QPwekkGRAZLn10yfHO3J528IA="; + hash = "sha256-0Z4jTN9+bsurCYqJcYqG0r0ed3gWG9PDgT5J/+stiPE="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ with py.pkgs; buildPythonApplication rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ jsonschema mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/tools/admin/awslimitchecker/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awslimitchecker/default.nix index 54cf599422..0a67e5a4e4 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awslimitchecker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awslimitchecker/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { versionfinder ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ freezegun onetimepass pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/tools/admin/awslogs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awslogs/default.nix index 2f60e414d7..af8f427fe2 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awslogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awslogs/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { jmespath ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index 6960f4ddb3..189ae296fa 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.37.0"; + version = "2.44.1"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-Y1P+cTOK7NbV7k9rg38vE7EPuZQo88IQW3IYYou8ZOI="; + hash = "sha256-QcY08YxwGywFCXy3PslEzc5qZd62y4XAcuIC9Udp6Cc="; }; # put packages that needs to be overridden in the py package scope diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index 410748c952..b1411531ab 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -31,6 +31,7 @@ let argcomplete azure-common azure-cli-telemetry + azure-data-tables azure-mgmt-core azure-mgmt-resource colorama @@ -47,6 +48,7 @@ let psutil pygments pyjwt + pymysql pyopenssl pyperclip pysocks @@ -62,7 +64,7 @@ let --replace "cryptography>=3.2,<3.4" "cryptography" \ --replace "msal-extensions>=0.3.1,<0.4" "msal-extensions" ''; - checkInputs = with self; [ pytest ]; + nativeCheckInputs = with self; [ pytest ]; doCheck = stdenv.isLinux; # ignore tests that does network call, or assume powershell checkPhase = '' @@ -83,23 +85,18 @@ let azure-cli-telemetry = buildAzureCliPackage { pname = "azure-cli-telemetry"; - version = "1.0.4"; # might be wrong, but doesn't really matter + version = "1.0.8"; # might be wrong, but doesn't really matter inherit src; sourceRoot = "${src.name}/src/azure-cli-telemetry"; propagatedBuildInputs = with super; [ applicationinsights + knack portalocker ]; - # upstream doesn't update this requirement probably because they use pip - postPatch = '' - substituteInPlace setup.py \ - --replace "portalocker~=1.6" "portalocker" - ''; - - checkInputs = [ py.pkgs.pytest ]; + nativeCheckInputs = [ py.pkgs.pytest ]; # ignore flaky test checkPhase = '' cd azure @@ -111,14 +108,17 @@ let antlr4 = super.pkgs.antlr4_9; }); - azure-batch = overrideAzureMgmtPackage super.azure-batch "12.0.0" "zip" - "sha256-GpseF4mEp79JWvZ7zOUfDbHkqKlXr7KeM1VKFKlnTes="; + azure-batch = overrideAzureMgmtPackage super.azure-batch "13.0.0" "zip" + "sha256-6Sld5wQE0nbtoN0iU9djl0Oavl2PGMH8oZnEm41q4wo="; + + azure-data-tables = overrideAzureMgmtPackage super.azure-data-tables "12.4.0" "zip" + "sha256-3V/I3pHi+JCO+kxkyn9jz4OzBoqbpCYpjeO1QTnpZlw="; azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "3.0.0" "zip" "9262f54ed387eb083d8dae66d32a8df35647319b902bd498cdc376f50a12d154"; - azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "16.1.0" "zip" - "sha256-9J0VQ3uAsi4kuEe9UG4xpcEV1Sc+nkjECgVfzG7j5jk="; + azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "17.0.0" "zip" + "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo="; azure-mgmt-batchai = overrideAzureMgmtPackage super.azure-mgmt-batchai "7.0.0b1" "zip" "sha256-mT6vvjWbq0RWQidugR229E8JeVEiobPD3XA/nDM3I6Y="; @@ -126,8 +126,8 @@ let azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip" "d4f5c5a4188a456fe1eb32b6c45f55ca2069c74be41eb76921840b39f2f5c07f"; - azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.3.0" "zip" - "f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1"; + azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "2.0.0b3" "zip" + "sha256-XZGQOeMw8usyQ1tl8j57fZ3uqLshomHY9jO/rbpQOvM="; azure-mgmt-extendedlocation = overrideAzureMgmtPackage super.azure-mgmt-extendedlocation "1.0.0b2" "zip" "sha256-mjfH35T81JQ97jVgElWmZ8P5MwXVxZQv/QJKNLS3T8A="; @@ -135,26 +135,26 @@ let azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "1.1.0b2" "zip" "sha256-e+I5MdbbX7WhxHCj1Ery3z2WUrJtpWGD1bhLbqReb58="; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.0.0" "zip" - "bdc479b3bbcac423943d63e746a81dd5fc80b46a4dbb4393e760016e3fa4f74a"; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "10.2.0b5" "zip" + "sha256-YaokPCleAiwM893QFU+tbhL+8UngvGGshdeEBDCVTu4="; - azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.0.0" "zip" - "sha256-p9MTfVxGD1CsLUQGHWCnC08nedTKhEt3QZtXJeZeCb4="; + azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.1.0" "zip" + "sha256-2DeOemVpkjeI/hUdG04IuHU2h3cmk3oG4kr1wIDvdbM="; - azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "5.0.0" "zip" - "sha256-BciA3sFyja5xo9yS3WVglC73y8gTfw8UejdEzbD4HYE="; + azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "5.1.0b1" "zip" + "sha256-4djPfDzj9ql5WFn5fafLZWRKbofvb1Y7j05S77ly75s="; azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "21.1.0b1" "zip" "sha256-oiC5k+Mg9KJn940jMxG4AB9Pom+t/DWRA5KRv8HO0HI="; - azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "2.1.0b2" "zip" - "sha256-/w+kI/tSNo0vW5ZFcMjRGPPrmNwZbFLKbKVkblZQ6FY="; + azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "2.2.0" "zip" + "sha256-R2COS22pCtFp3oV98LLn/X2LkPOVUCasEONhFIhEdBQ="; - azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.1.0" "zip" - "sha256-FXS834v5uDGiEGcQMIv9iaHxhfcW9uY3VmX7l91Tfj4="; + azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.3.0" "zip" + "sha256-v1pTNPH0ujRm4VMt95Uw6d07lF8bgM3XIa3NJIbNLFI="; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "27.0.0" "zip" - "sha256-n+MQJ0ZeQ/hyS2G8CrNCtoxbvcfrIXmn4LXB/V6JXT0="; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "29.0.0" "zip" + "sha256-wkRmH/3MMxeTZr7KQMZQbjPHs2GSxAjJFZlSp75pUPI="; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; @@ -162,11 +162,11 @@ let azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "9.1.0" "zip" "sha256-IhZLDFkTize8SLptR2v2NRUrxCjctCC1IaFLjCXHl60="; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "19.1.0" "zip" - "sha256-t06Cesxvjk31aDxkX2Yj0VzFubWbiAc26LzNTIgVEqs="; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "21.1.0" "zip" + "sha256-5EOythXO7spLzzlqDWrwcdkkJAMH9W8OBv96rYaWxAY="; - azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "7.0.0b2" "zip" - "sha256-hVvYW9gkfTVMwis3IdD0JXYDxdKcyyzIFx3hNk7VMLI="; + azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "8.0.0" "zip" + "sha256-/6ySVfCjr1YiiZIZJElrd1EfirV+TJvE/FvKs7UhoKo="; azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "1.0.0" "zip" "04090062bc1e8f00c2f45315a3bceb0fb3b3479ec1474d71b88342e13499b087"; @@ -174,14 +174,14 @@ let azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; - azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "9.0.0" "zip" - "aecbb69ecb010126c03668ca7c9a2be8e965568f5b560f0e7b5bc152b157b510"; + azure-mgmt-eventgrid = overrideAzureMgmtPackage super.azure-mgmt-eventgrid "10.2.0b2" "zip" + "sha256-QcHY1wCwQyVOEdUi06/wEa4dqJH5Ccd33gJ1Sju0qZA="; - azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.0.0" "zip" - "634e398de9a23e712aa27a4a59f9ea5d5091d1dfcfed5ac977230918872c4430"; + azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "1.1.0" "zip" + "sha256-2EWfTsl5y3Sw4P8d5X7TKxYmO4PagUTNv/SFKdjY2Ss="; - azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.2.0" "zip" - "sha256-nsAeVhs5N8bpwYenmRwJmqF/IAqz/ulSoYIeOU5l0eM="; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.3.0" "zip" + "sha256-ml+koj52l5o0toAcnsGtsw0tGnO5F/LKq56ovzdmx/A="; azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "1.1.0" "zip" "sha256-04OoJuff93L62G6IozpmHpEaUbHHHD6nKlkMHVoJvJ4="; @@ -195,8 +195,8 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "1397ksrd61jv7400mgn8sqngp6ahir55fyq9n5k69wk88169qm2r"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "7.0.0" "zip" - "sha256-ziaddG+6MoPG18OYZyQ9HRx8nfGsz2UbWPC1pWacKto="; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "9.0.1" "zip" + "sha256-PYRMOWaJUXrRgqW3+pLBY+L6HvU1WlPvaatFe4O7RY8="; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; @@ -204,8 +204,8 @@ let azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "13.0.0b4" "zip" "sha256-Jm1t7v5vyFjNNM/evVaEI9sXJKNwJk6XAXuJSRSnKHk="; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "20.0.0" "zip" - "sha256-mnjPyCAJ+rlNgZ4umSYjfVVVg83EobZYY/zupyDjdoY="; + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "21.0.1" "zip" + "sha256-7PduPg0JK4f/3q/b5pq58TjqVk+Iu+vxa+aJKDnScy8="; azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip" "384e17f76a68b700a4f988478945c3a9721711c0400725afdfcb63cf84e85f0e"; @@ -223,24 +223,24 @@ let "sha256-TI7l8sSQ2QUgPqiE3Cu/F67Wna+KHbQS3fuIjOb95ZM="; azure-mgmt-msi = super.azure-mgmt-msi.overridePythonAttrs (old: rec { - version = "6.0.1"; + version = "6.1.0"; src = old.src.override { inherit version; - sha256 = "sha256-PPkQmUoBkJ8Su7h9G2/t8dVy/PT3uCYZjlf70fnY2vU="; + sha256 = "sha256-lS8da3Al1z1pMLDBf6ZtWc1UFUVgkN1qpKTxt4VXdlQ="; }; }); azure-mgmt-privatedns = overrideAzureMgmtPackage super.azure-mgmt-privatedns "1.0.0" "zip" "b60f16e43f7b291582c5f57bae1b083096d8303e9d9958e2c29227a55cc27c45"; - azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "6.1.0" "zip" - "c26635089276515b0488fcf014aab50a0446f54800c6e0e5583cc493ac8d738f"; + azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "7.0.0" "zip" + "sha256-WvyNgfiliEt6qawqy8Le8eifhxusMkoZbf6YcyY1SBA="; azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.1.0" "zip" "sha256-Tq8h3fvajxIG2QjtCyHCQDE2deBDioxLLaQQek/O24U="; - azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "13.1.0" "zip" - "ece913e5fc7f157e945809e557443f79ff7691cabca4bbc5ecb266352f843179"; + azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "14.1.0" "zip" + "sha256-LO92Wc2+VvsEKiOjVSHXw2o3D69NQlL58m+YqWl6+ig="; azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "2.0.0" "zip" "sha256-5vXdXiRubnzPk4uTFeNHR6rwiHSGbeUREX9eW1pqC3E="; @@ -248,20 +248,20 @@ let azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "8.0.0" "zip" "a96d50c88507233a293e757202deead980c67808f432b8e897c4df1ca088da7e"; - azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "2.0.0b1" "zip" - "sha256-8Ksa08w8EeZEKXIk2AQ4zHCmfvTDwzV/k9I67CVusIQ="; + azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "3.0.0" "zip" + "sha256-vLp874V/awKi2Yr+sH+YcbFij6M9iGGrE4fnMufbP4Q="; - azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "1.0.0b2" "zip" - "sha256-FTxY8qoihHG4OZuKT3sRRlKfORbIoqDqug9Ko+6S9dw="; + azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "1.1.0" "zip" + "sha256-lUNIDyP5W+8aIX7manfMqaO2IJJm/+2O+Buv+Bh4EZE="; - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b1" "zip" - "sha256-dYk3stvQHN/VEZS8OBCp0IbG8g6iIHpMrLxCWWg7Id8="; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "4.0.0b6" "zip" + "sha256-1/0VGMW9yZsilJ0yNjhFzVO7WbJlB4yJmDL/RxpQLKc="; - azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b2" "zip" - "sha256-zqsLufjUmOl1Zxu8QhYzsEKYgoS+m8GTpRydl7jvXMk="; + azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b4" "zip" + "sha256-IB/ihVFm8WrJ2ZZfALp167Sq4u0cvIq1hllNriJxaz0="; - azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b2" "zip" - "sha256-/BAxKDttp/tS/X45y8X4KBm5qxtNuVXhrc5qB3A+wRE="; + azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b5" "zip" + "sha256-5E6Yf1GgNyNVjd+SeFDbhDxnOA6fOAG6oojxtCP4m+k="; azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "10.0.0" "zip" "5cee70f97fe3a093c3cb70c2a190c2df936b772e94a09ef7e3deb1ed177c9f32"; @@ -269,20 +269,20 @@ let azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip" "1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr"; - azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "10.0.0" "zip" - "0856574ef4b73bbbc62834051061e2081400aba7e3715e10ef5181d639e86a0b"; + azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "10.1.0" "zip" + "sha256-MZqhSBkwypvEefhoEWEPsBUFidWYD7qAX6edcBDDSSA="; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.3.0" "zip" - "54156422e618b686d52232a7989594b240bd18afd0fa381e12e4772ed4ab5ea8"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "10.1.0" "zip" + "sha256-DpO+6FvsNwjjcz2ImhHpColHVNpPUMgCtEMrfUzfAaA="; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "12.0.0" "zip" "sha256-t8PuIYkjS0r1Gs4pJJJ8X9cz8950imQtbVBABnyMnd0="; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "8.2.0" "zip" - "f2bcdbcf0b9fdc2df0df9eccb77cb489091d3c670ed53cba77e5ffd734e9539b"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "10.0.0" "zip" + "sha256-HjejK28Em5AeoQ20o4fucnXTlAwADF/SEpVfHn9anZk="; - azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "3.0.0" "zip" - "91ddb7333bf2b9541a53864cc8d2501e3694a03a9c0e41cbfae3348558675ce6"; + azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "5.0.0" "zip" + "sha256-eL9KJowxTF7hZJQQQCNJZ7l+rKPFM8wP5vEigt3ZFGE="; azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip" "fc408b37315fe84781b519124f8cb1b8ac10b2f4241e439d0d3e25fd6ca18d7b"; @@ -293,23 +293,23 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.61.0" "zip" "0xfvx2dvfj3fbz4ngn860ipi4v6gxqajyjc8x92r8knhmniyxk7m"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "20.0.0" "zip" - "sha256-buR2tWIv9vWVTt7m6w2N1CezIXAihVrfHshjPKBM3uI="; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "21.0.0" "zip" + "sha256-brE+7s+JGVsrX0e+Bnnj8niI79e9ITLux+vLznXLE3c="; - azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "7.1.0" "zip" - "d8ae7905fb7d3e24822daa20aa7bc5014f41aa18b48ea2d0161e997fc11a3d36"; + azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "8.1.0" "zip" + "sha256-R8Narn7eC7j59tDjsgbk9lF0PcOgOwSnzoMp3Qu0rmg="; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip" "de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913"; - azure-mgmt-servicelinker = overrideAzureMgmtPackage super.azure-mgmt-servicelinker "1.0.0" "zip" - "sha256-lAjgwEa2TJDEUU8pwfwkU8EyA1bhLkcAv++I6WHb7Xs="; + azure-mgmt-servicelinker = overrideAzureMgmtPackage super.azure-mgmt-servicelinker "1.2.0b1" "zip" + "sha256-RK1Q51Q0wAG55oKrFmv65/2AUKl+gRdp27t/EcuMONk="; azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "9.0.0" "zip" "41ebdc69c0d1f81d25dd30438c14fff4331f66639f55805b918b9649eaffe78a"; - azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.9.0" "tar.gz" - "sha256-7uq8uRZ3MXI1Gy+DmMkRVNV7uZPw6j8r9KfhS8d+tCY="; + azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "1.0.0" "tar.gz" + "sha256-x5v3e3/poSm+JMt0SWI1lcM6YAUcP+o2Sn8TluXOyIg="; azure-appconfiguration = super.azure-appconfiguration.overrideAttrs(oldAttrs: rec { version = "1.1.1"; @@ -352,13 +352,16 @@ let }); azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec { - version = "0.12.0"; + version = "0.14.0"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-IfQWsITuThzh+TRgv99JTtcDFY3gMq5PjALkN4mJEZo="; + hash = "sha256-Q1gGq7EZ/JvYjD7y0mp3kEy15QKZI84UQTdlIBoQLMs="; extension = "zip"; }; + propagatedBuildInputs = with super; oldAttrs.propagatedBuildInputs ++ [ + azure-mgmt-core + ]; }); azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec { @@ -418,12 +421,12 @@ let }); azure-keyvault-keys = super.azure-keyvault-keys.overridePythonAttrs(oldAttrs: rec { - version = "4.5.1"; + version = "4.8.0b2"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; extension = "zip"; - sha256 = "sha256-2ojnH+ySoU+1jOyIaKv366BAGI3Nzjac4QUK3RllhvY="; + hash = "sha256-VUwQJAwpZIQ8fzBUjUX0ui2yaVkDK7p0fwmnz373XbY="; }; }); @@ -477,12 +480,12 @@ let }); msal = super.msal.overridePythonAttrs(oldAttrs: rec { - version = "1.18.0b1"; + version = "1.20.0"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-kiYDjzX756uulLFr4gCuLnXgmAi+s2WDCGmvkQFC8Ow="; + hash = "sha256-eDRM1MkdYTSlk7Xj5FVB5mbje3R/+KYxbDZo3R5qtrI="; }; }); @@ -506,22 +509,22 @@ let }); knack = super.knack.overridePythonAttrs(oldAttrs: rec { - version = "0.9.0"; + version = "0.10.1"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "7fcab17585c0236885eaef311c01a1e626d84c982aabcac81703afda3f89c81f"; + hash = "sha256-xXKBKCl+bSaXkQhc+Wwv/fzvWM+DxjSly5LrA7KSmDg="; }; }); argcomplete = super.argcomplete.overridePythonAttrs(oldAttrs: rec { - version = "1.8.0"; + version = "2.0.0"; src = super.fetchPypi { inherit (oldAttrs) pname; inherit version; - sha256 = "sha256-SreailmO/AgRBGv3dnj4VkMnbokAzWT5xPEPEQ4QEb0="; + hash = "sha256-Y3KteMidZiA1EBQYriU2aERbORdVz+lOpS8bnSJCWyA="; }; }); diff --git a/third_party/nixpkgs/pkgs/tools/admin/berglas/default.nix b/third_party/nixpkgs/pkgs/tools/admin/berglas/default.nix index bf86a5c02e..f82aebacec 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/berglas/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/berglas/default.nix @@ -27,16 +27,16 @@ in buildGoModule rec { pname = "berglas"; - version = "0.6.2"; + version = "1.0.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aLsrrK+z080qn7L2zggA8yD+QqLaSRJLTjWQnFKFogQ="; + sha256 = "sha256-A4TUVNsiWODH8jJzV4AYchIQjDWXysJbFPYQ5W63T08="; }; - vendorSha256 = "sha256-HjZT0jezJzoEvXuzrjoTv/zSex+xDuGoP1h82CIlX14="; + vendorSha256 = "sha256-jJuwfP0zJ70r62IFTPsXBCAEKDcuBwHsBR24jGx/IqY="; postPatch = skipTestsCommand; diff --git a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix index ee17b39f70..bfdbc45507 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "clair"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - hash = "sha256-4S9r8ez67bmhjEMp3w2xJVgkFN12B+pcyYVLc5P2Il0="; + hash = "sha256-Dl1wwK4OSv/nvhT7bH6qOdX4/qL3xFdmz5qiYaEm59Y="; }; - vendorSha256 = "sha256-Ly0U13C3WaGHRlu5Lj5MtdnTStTAJb4NUQpCY+7PeT0="; + vendorHash = "sha256-NqEpJHBZfzUQJ+H8CQBDdb37nlwA+JuXhZzfCAyO0Co="; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix index 96afae58b1..dee610f3b6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OTt9sJuLv+fY2OTK4FGl15/YmxnPRqGXNnKYl9TtHxE="; + sha256 = "sha256-Lhg3ZOCv5FlMh2FI92s8OR1XugkX0occv0ku7MKhL+8="; }; - vendorSha256 = "sha256-dH39ZpATq5Oafr7Guc+zYUhjlAgiwpc5HKHWlMm4buU="; + vendorHash = "sha256-rxnVNAgLOVBshm6tKOfqspOy+rQP7M22+Q3HnWBVjr8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 361ad07858..e3b2ae74ca 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.125.0"; + version = "0.127.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-3hyhb1/vWIKFSw6rmdiszux+WFeMvUE79NkzyazClEg="; + sha256 = "sha256-WCkVCND3c8HYLi0UrgF3zoEykIs1/D7HgeblZETvU4M="; }; - vendorHash = "sha256-PufNlNG3Ixkq1OPnEeod8BvWF1Ee0AdpzJIxsvLPOA4="; + vendorHash = "sha256-FBKwWApiIs0y0IZqJOJwzdBq1ihaPv8mqqSTO42ggi0="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix b/third_party/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix index 576df67ad5..87ad72ea47 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -49,7 +49,7 @@ in python.pkgs.buildPythonApplication rec { six ]; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/gam/default.nix b/third_party/nixpkgs/pkgs/tools/admin/gam/default.nix index 191785dd03..1b90de1d46 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/gam/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/gam/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "gam"; - version = "6.22"; + version = "6.25"; format = "other"; src = fetchFromGitHub { owner = "GAM-team"; repo = "gam"; - rev = "v${version}"; - sha256 = "sha256-G/S1Rrm+suiy1CTTFLcBGt/QhARL7puHgR65nCxodH0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/VmBFMjCkd1xhudlcjYGGv+6tgEsyY/xqQoGdupJvOg="; }; sourceRoot = "source/src"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix index 4a57b99e2b..72d293de21 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -97,7 +97,7 @@ let in mkComponent { - name = component.id; + pname = component.id; version = component.version.version_string; src = if lib.hasAttrByPath [ "data" "source" ] component @@ -120,7 +120,7 @@ let # Make a google-cloud-sdk component mkComponent = - { name + { pname , version # Source tarball, if any , src ? "" @@ -135,7 +135,7 @@ let # The snapshot corresponding to this component , snapshot }: stdenv.mkDerivation { - inherit name version snapshot; + inherit pname version snapshot; src = if src != "" then builtins.fetchurl @@ -143,7 +143,7 @@ let url = src; inherit sha256; } else ""; - phases = [ "installPhase" "fixupPhase" ]; + dontUnpack = true; installPhase = '' mkdir -p $out/google-cloud-sdk/.install @@ -159,7 +159,7 @@ let fi # Write the snapshot file to the `.install` folder - cp $snapshotPath $out/google-cloud-sdk/.install/${name}.snapshot.json + cp $snapshotPath $out/google-cloud-sdk/.install/${pname}.snapshot.json ''; passthru = { dependencies = filterForSystem dependencies; diff --git a/third_party/nixpkgs/pkgs/tools/admin/infra/default.nix b/third_party/nixpkgs/pkgs/tools/admin/infra/default.nix index 7c852ac35e..be2c8401ef 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/infra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/infra/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "infra"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "infrahq"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4sExRKq4J94cQYqjxaXCKa2aEeptCG+TTvrDOrJfBUg="; + sha256 = "sha256-uz4wimhOfeHSL949m+biIhjfDwwEGnTiJWaz/r3Rsko="; }; - vendorSha256 = "sha256-afbQQsluZjgliNxSOGcTS1DJwj7en5NpxtuzCDAyv98="; + vendorHash = "sha256-qbmaebQcD3cN+tbmzzJbry0AXz2LZFMoqbcBwGGrRo4="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix b/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix index 86ec25ac2e..805ba5d3d5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { wcwidth ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pexpect ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix b/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix index 71f88a9b23..88621f2365 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kics"; - version = "1.6.7"; + version = "1.6.8"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - sha256 = "sha256-VtQauOf3FavXULFeWWw3aThHZAFMuwuI/FYr0dtZc0A="; + sha256 = "sha256-s2M763M4Hoy8gjgkHT69pCUCsWepmt0zEyXYpGzYTn0="; }; - vendorHash = "sha256-0Y4+tG54McwcRVuHXJBfs6Zg1fJBffeDs7JYInqfXe0="; + vendorHash = "sha256-JWdc0BN0GRw79uhb2uubSG1bnZlTHTVrmS0Jft1ZNh8="; subPackages = [ "cmd/console" ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix index c060f600d3..4faebec280 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lexicon/default.nix @@ -39,7 +39,7 @@ buildPythonApplication rec { zeep ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-xdist diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix index 45e12177ae..a0db37fba5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -32,14 +32,14 @@ buildGoModule rec { pname = "lxd"; - version = "5.9"; + version = "5.10"; src = fetchurl { urls = [ "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" "https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" ]; - sha256 = "sha256-okz3++PlUno03tp+jpLxfAWlFJhyOCH2mxRtHo5YEX8="; + hash = "sha256-sYJkPr/tE22xJEjKX7fMjOLQ9zBDm52UjqbVLrm39zU="; }; vendorSha256 = null; @@ -104,7 +104,7 @@ buildGoModule rec { homepage = "https://linuxcontainers.org/lxd/"; changelog = "https://github.com/lxc/lxd/releases/tag/lxd-${version}"; license = licenses.asl20; - maintainers = with maintainers; [ marsam ]; + maintainers = with maintainers; [ marsam adamcstephens ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/default.nix b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/default.nix index d8e0d9e2a7..f87c649b3d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/default.nix @@ -1,11 +1,11 @@ { lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs-16_x, jq, dos2unix }: yarn2nix-moretea.mkYarnPackage { - version = "1.1.0"; + version = "1.1.2"; src = fetchzip { - url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.0.tgz"; - sha256 = "1g7wgph35h8vi44yn4niv1jq2d8v9xrwps9k4bfjyd6470gg2sfc"; + url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.2.tgz"; + sha256 = "0fhmvh10wlf17fwxdclra06z1bq5bg6n53smzwni1v1h4967hhk3"; }; patches = [ ./fix-js-include-paths.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/package.json b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/package.json index 851165c6cd..44e37f8f1b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/package.json +++ b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "1.1.0", + "version": "1.1.2", "keywords": [ "Remote Device Management", "Remote Device Monitoring", @@ -98,7 +98,7 @@ "aedes": "0.39.0", "mysql": "*", "@mysql/xdevapi": "*", - "mongodb": "4.9.1", + "mongodb": "4.12.1", "saslprep": "*", "pg": "8.7.1", "pgtools": "0.3.2", diff --git a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.lock b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.lock index b463dbfce5..5735c798bb 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.lock +++ b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.lock @@ -10,10 +10,756 @@ "@jridgewell/gen-mapping" "^0.1.0" "@jridgewell/trace-mapping" "^0.3.9" +"@aws-crypto/ie11-detection@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz#9c39f4a5558196636031a933ec1b4792de959d6a" + integrity sha512-5XDMQY98gMAf/WRTic5G++jfmS/VLM0rwpiOpaainKi4L0nqWMSB1SzsrEG5rjFZGYN6ZAefO+/Yta2dFM0kMw== + dependencies: + tslib "^1.11.1" + +"@aws-crypto/sha256-browser@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz#741c9024df55ec59b51e5b1f5d806a4852699fb5" + integrity sha512-rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A== + dependencies: + "@aws-crypto/ie11-detection" "^2.0.0" + "@aws-crypto/sha256-js" "^2.0.0" + "@aws-crypto/supports-web-crypto" "^2.0.0" + "@aws-crypto/util" "^2.0.0" + "@aws-sdk/types" "^3.1.0" + "@aws-sdk/util-locate-window" "^3.0.0" + "@aws-sdk/util-utf8-browser" "^3.0.0" + tslib "^1.11.1" + +"@aws-crypto/sha256-js@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz#f1f936039bdebd0b9e2dd834d65afdc2aac4efcb" + integrity sha512-VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig== + dependencies: + "@aws-crypto/util" "^2.0.0" + "@aws-sdk/types" "^3.1.0" + tslib "^1.11.1" + +"@aws-crypto/sha256-js@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.2.tgz#c81e5d378b8a74ff1671b58632779986e50f4c99" + integrity sha512-iXLdKH19qPmIC73fVCrHWCSYjN/sxaAvZ3jNNyw6FclmHyjLKg0f69WlC9KTnyElxCR5MO9SKaG00VwlJwyAkQ== + dependencies: + "@aws-crypto/util" "^2.0.2" + "@aws-sdk/types" "^3.110.0" + tslib "^1.11.1" + +"@aws-crypto/supports-web-crypto@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.2.tgz#9f02aafad8789cac9c0ab5faaebb1ab8aa841338" + integrity sha512-6mbSsLHwZ99CTOOswvCRP3C+VCWnzBf+1SnbWxzzJ9lR0mA0JnY2JEAhp8rqmTE0GPFy88rrM27ffgp62oErMQ== + dependencies: + tslib "^1.11.1" + +"@aws-crypto/util@^2.0.0", "@aws-crypto/util@^2.0.2": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-2.0.2.tgz#adf5ff5dfbc7713082f897f1d01e551ce0edb9c0" + integrity sha512-Lgu5v/0e/BcrZ5m/IWqzPUf3UYFTy/PpeED+uc9SWUR1iZQL8XXbGQg10UfllwwBryO3hFF5dizK+78aoXC1eA== + dependencies: + "@aws-sdk/types" "^3.110.0" + "@aws-sdk/util-utf8-browser" "^3.0.0" + tslib "^1.11.1" + +"@aws-sdk/abort-controller@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/abort-controller/-/abort-controller-3.226.0.tgz#3adffb8ee5af57ddb154e8544a8eeec76ad32271" + integrity sha512-cJVzr1xxPBd08voknXvR0RLgtZKGKt6WyDpH/BaPCu3rfSqWCDZKzwqe940eqosjmKrxC6pUZNKASIqHOQ8xxQ== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/client-cognito-identity@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.236.0.tgz#bec1a6625d1b34b0014a8ded15d70557643ee7e9" + integrity sha512-lWGuTVA+q3h1KS3nxTWeRGOfsuQ+GNwq5IxFJ8ko441mpwo5A2t6u25Z+G6t5Eh+q4EcoxMX64HYA+cu91lr7g== + dependencies: + "@aws-crypto/sha256-browser" "2.0.0" + "@aws-crypto/sha256-js" "2.0.0" + "@aws-sdk/client-sts" "3.236.0" + "@aws-sdk/config-resolver" "3.234.0" + "@aws-sdk/credential-provider-node" "3.236.0" + "@aws-sdk/fetch-http-handler" "3.226.0" + "@aws-sdk/hash-node" "3.226.0" + "@aws-sdk/invalid-dependency" "3.226.0" + "@aws-sdk/middleware-content-length" "3.226.0" + "@aws-sdk/middleware-endpoint" "3.226.0" + "@aws-sdk/middleware-host-header" "3.226.0" + "@aws-sdk/middleware-logger" "3.226.0" + "@aws-sdk/middleware-recursion-detection" "3.226.0" + "@aws-sdk/middleware-retry" "3.235.0" + "@aws-sdk/middleware-serde" "3.226.0" + "@aws-sdk/middleware-signing" "3.226.0" + "@aws-sdk/middleware-stack" "3.226.0" + "@aws-sdk/middleware-user-agent" "3.226.0" + "@aws-sdk/node-config-provider" "3.226.0" + "@aws-sdk/node-http-handler" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/smithy-client" "3.234.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/url-parser" "3.226.0" + "@aws-sdk/util-base64" "3.208.0" + "@aws-sdk/util-body-length-browser" "3.188.0" + "@aws-sdk/util-body-length-node" "3.208.0" + "@aws-sdk/util-defaults-mode-browser" "3.234.0" + "@aws-sdk/util-defaults-mode-node" "3.234.0" + "@aws-sdk/util-endpoints" "3.226.0" + "@aws-sdk/util-retry" "3.229.0" + "@aws-sdk/util-user-agent-browser" "3.226.0" + "@aws-sdk/util-user-agent-node" "3.226.0" + "@aws-sdk/util-utf8-browser" "3.188.0" + "@aws-sdk/util-utf8-node" "3.208.0" + tslib "^2.3.1" + +"@aws-sdk/client-sso-oidc@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.236.0.tgz#501cc3f69bdfc1b538b3b89d1166bc80dd86a461" + integrity sha512-9TuigSXGafVto+GjKsVkhNLlnSgNWzRL5/ClZ5lY3dWrcDEJGZjFwwRB3ICerFQJBdDfsYwjNjJPhYEHzdyBfQ== + dependencies: + "@aws-crypto/sha256-browser" "2.0.0" + "@aws-crypto/sha256-js" "2.0.0" + "@aws-sdk/config-resolver" "3.234.0" + "@aws-sdk/fetch-http-handler" "3.226.0" + "@aws-sdk/hash-node" "3.226.0" + "@aws-sdk/invalid-dependency" "3.226.0" + "@aws-sdk/middleware-content-length" "3.226.0" + "@aws-sdk/middleware-endpoint" "3.226.0" + "@aws-sdk/middleware-host-header" "3.226.0" + "@aws-sdk/middleware-logger" "3.226.0" + "@aws-sdk/middleware-recursion-detection" "3.226.0" + "@aws-sdk/middleware-retry" "3.235.0" + "@aws-sdk/middleware-serde" "3.226.0" + "@aws-sdk/middleware-stack" "3.226.0" + "@aws-sdk/middleware-user-agent" "3.226.0" + "@aws-sdk/node-config-provider" "3.226.0" + "@aws-sdk/node-http-handler" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/smithy-client" "3.234.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/url-parser" "3.226.0" + "@aws-sdk/util-base64" "3.208.0" + "@aws-sdk/util-body-length-browser" "3.188.0" + "@aws-sdk/util-body-length-node" "3.208.0" + "@aws-sdk/util-defaults-mode-browser" "3.234.0" + "@aws-sdk/util-defaults-mode-node" "3.234.0" + "@aws-sdk/util-endpoints" "3.226.0" + "@aws-sdk/util-retry" "3.229.0" + "@aws-sdk/util-user-agent-browser" "3.226.0" + "@aws-sdk/util-user-agent-node" "3.226.0" + "@aws-sdk/util-utf8-browser" "3.188.0" + "@aws-sdk/util-utf8-node" "3.208.0" + tslib "^2.3.1" + +"@aws-sdk/client-sso@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.236.0.tgz#eba16f73abb9639bfdafeeb64d5c9771db2a4cc9" + integrity sha512-2E/XHiVSRI+L2SlVscmV/+z4A2iWF6BTUjVBFBGMmsailvGDV6XKPFocTBsHI64G25/SYkhMdELvjn5jHLKBGQ== + dependencies: + "@aws-crypto/sha256-browser" "2.0.0" + "@aws-crypto/sha256-js" "2.0.0" + "@aws-sdk/config-resolver" "3.234.0" + "@aws-sdk/fetch-http-handler" "3.226.0" + "@aws-sdk/hash-node" "3.226.0" + "@aws-sdk/invalid-dependency" "3.226.0" + "@aws-sdk/middleware-content-length" "3.226.0" + "@aws-sdk/middleware-endpoint" "3.226.0" + "@aws-sdk/middleware-host-header" "3.226.0" + "@aws-sdk/middleware-logger" "3.226.0" + "@aws-sdk/middleware-recursion-detection" "3.226.0" + "@aws-sdk/middleware-retry" "3.235.0" + "@aws-sdk/middleware-serde" "3.226.0" + "@aws-sdk/middleware-stack" "3.226.0" + "@aws-sdk/middleware-user-agent" "3.226.0" + "@aws-sdk/node-config-provider" "3.226.0" + "@aws-sdk/node-http-handler" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/smithy-client" "3.234.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/url-parser" "3.226.0" + "@aws-sdk/util-base64" "3.208.0" + "@aws-sdk/util-body-length-browser" "3.188.0" + "@aws-sdk/util-body-length-node" "3.208.0" + "@aws-sdk/util-defaults-mode-browser" "3.234.0" + "@aws-sdk/util-defaults-mode-node" "3.234.0" + "@aws-sdk/util-endpoints" "3.226.0" + "@aws-sdk/util-retry" "3.229.0" + "@aws-sdk/util-user-agent-browser" "3.226.0" + "@aws-sdk/util-user-agent-node" "3.226.0" + "@aws-sdk/util-utf8-browser" "3.188.0" + "@aws-sdk/util-utf8-node" "3.208.0" + tslib "^2.3.1" + +"@aws-sdk/client-sts@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.236.0.tgz#8f3d793d627edf72ae80ffc50e7982b6cbcfd3f7" + integrity sha512-ruEALU0oPwsA8xZ/HBCoUO9rsyhPyalj20GMGpzVaNcf1dr1jMTThDQvQvvjAHjY3W56mI7ApxjK+D+gok55aw== + dependencies: + "@aws-crypto/sha256-browser" "2.0.0" + "@aws-crypto/sha256-js" "2.0.0" + "@aws-sdk/config-resolver" "3.234.0" + "@aws-sdk/credential-provider-node" "3.236.0" + "@aws-sdk/fetch-http-handler" "3.226.0" + "@aws-sdk/hash-node" "3.226.0" + "@aws-sdk/invalid-dependency" "3.226.0" + "@aws-sdk/middleware-content-length" "3.226.0" + "@aws-sdk/middleware-endpoint" "3.226.0" + "@aws-sdk/middleware-host-header" "3.226.0" + "@aws-sdk/middleware-logger" "3.226.0" + "@aws-sdk/middleware-recursion-detection" "3.226.0" + "@aws-sdk/middleware-retry" "3.235.0" + "@aws-sdk/middleware-sdk-sts" "3.226.0" + "@aws-sdk/middleware-serde" "3.226.0" + "@aws-sdk/middleware-signing" "3.226.0" + "@aws-sdk/middleware-stack" "3.226.0" + "@aws-sdk/middleware-user-agent" "3.226.0" + "@aws-sdk/node-config-provider" "3.226.0" + "@aws-sdk/node-http-handler" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/smithy-client" "3.234.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/url-parser" "3.226.0" + "@aws-sdk/util-base64" "3.208.0" + "@aws-sdk/util-body-length-browser" "3.188.0" + "@aws-sdk/util-body-length-node" "3.208.0" + "@aws-sdk/util-defaults-mode-browser" "3.234.0" + "@aws-sdk/util-defaults-mode-node" "3.234.0" + "@aws-sdk/util-endpoints" "3.226.0" + "@aws-sdk/util-retry" "3.229.0" + "@aws-sdk/util-user-agent-browser" "3.226.0" + "@aws-sdk/util-user-agent-node" "3.226.0" + "@aws-sdk/util-utf8-browser" "3.188.0" + "@aws-sdk/util-utf8-node" "3.208.0" + fast-xml-parser "4.0.11" + tslib "^2.3.1" + +"@aws-sdk/config-resolver@3.234.0": + version "3.234.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/config-resolver/-/config-resolver-3.234.0.tgz#29d8936b713b7ee59b26b335d4f6715d644fc089" + integrity sha512-uZxy4wzllfvgCQxVc+Iqhde0NGAnfmV2hWR6ejadJaAFTuYNvQiRg9IqJy3pkyDPqXySiJ8Bom5PoJfgn55J/A== + dependencies: + "@aws-sdk/signature-v4" "3.226.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/util-config-provider" "3.208.0" + "@aws-sdk/util-middleware" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-cognito-identity@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.236.0.tgz#7936ce9a7ceaeff9045d85b3e69af9865c467bfc" + integrity sha512-PDsUZ7gmSCwraDDYnmoSkmrA1tpmvDBDjNPUVe6E+/8tDw3SWiL2efGR6r8ajFh9m+6jF6B8Wy+YB3u3yjAjWQ== + dependencies: + "@aws-sdk/client-cognito-identity" "3.236.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-env@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.226.0.tgz#0bcb89a9abc166b3a48f5c255b9fcabc4cb80daf" + integrity sha512-sd8uK1ojbXxaZXlthzw/VXZwCPUtU3PjObOfr3Evj7MPIM2IH8h29foOlggx939MdLQGboJf9gKvLlvKDWtJRA== + dependencies: + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-imds@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.226.0.tgz#0a4558449eb261412b0490ea1c3242eb91659759" + integrity sha512-//z/COQm2AjYFI1Lb0wKHTQSrvLFTyuKLFQGPJsKS7DPoxGOCKB7hmYerlbl01IDoCxTdyL//TyyPxbZEOQD5Q== + dependencies: + "@aws-sdk/node-config-provider" "3.226.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/url-parser" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-ini@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.236.0.tgz#10270be0de0cd34b1a82187248ade3779ff02005" + integrity sha512-W5vMEauWgFCzvf4Hks6ToU5dhbN87gyijmwp/l9AkKKvuJ25LkveAhk8xz3bydJThHdgWNEuBMyfmlVWmdybIg== + dependencies: + "@aws-sdk/credential-provider-env" "3.226.0" + "@aws-sdk/credential-provider-imds" "3.226.0" + "@aws-sdk/credential-provider-process" "3.226.0" + "@aws-sdk/credential-provider-sso" "3.236.0" + "@aws-sdk/credential-provider-web-identity" "3.226.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/shared-ini-file-loader" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-node@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.236.0.tgz#288f10f65c8b94d8f20f431e77febbe6c285ab42" + integrity sha512-ktRPwmqw2P4dDzs/nJYTnuesSYqpDUEtqm2KSCKNT/fobzgfsrESLk3a7TY4l6N3muxQtKwguIa9Lulhe82+wg== + dependencies: + "@aws-sdk/credential-provider-env" "3.226.0" + "@aws-sdk/credential-provider-imds" "3.226.0" + "@aws-sdk/credential-provider-ini" "3.236.0" + "@aws-sdk/credential-provider-process" "3.226.0" + "@aws-sdk/credential-provider-sso" "3.236.0" + "@aws-sdk/credential-provider-web-identity" "3.226.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/shared-ini-file-loader" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-process@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.226.0.tgz#bcd73a6d31d1b3181917d56e54aacbee242b077f" + integrity sha512-iUDMdnrTvbvaCFhWwqyXrhvQ9+ojPqPqXhwZtY1X/Qaz+73S9gXBPJHZaZb2Ke0yKE1Ql3bJbKvmmxC/qLQMng== + dependencies: + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/shared-ini-file-loader" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-sso@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.236.0.tgz#98deadb0b689546bd5e93fc73dc6d6c87fe1c562" + integrity sha512-HLeVsFHd8QLQwhjwhdlBhXOFIa33mzqmxOqe2Qr4FVD5IR1/G4zLpSWSwtYjpvWRZs2oWSg6XI7vSyeQttPmHg== + dependencies: + "@aws-sdk/client-sso" "3.236.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/shared-ini-file-loader" "3.226.0" + "@aws-sdk/token-providers" "3.236.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-provider-web-identity@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.226.0.tgz#2b7d20f93a40e2243c7e3857f54b103d19a946fb" + integrity sha512-CCpv847rLB0SFOHz2igvUMFAzeT2fD3YnY4C8jltuJoEkn0ITn1Hlgt13nTJ5BUuvyti2mvyXZHmNzhMIMrIlw== + dependencies: + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/credential-providers@^3.186.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.236.0.tgz#52c6f0e5baa1f0eab1f39171b47102806809d504" + integrity sha512-z7RU5E9xlk6KX16jJxByn8xa8mv8pPZoqAPkavCsFJS6pOYTtQJYYdjrUK/2EmOmbPpc62P6mqVP7qTVQKgafw== + dependencies: + "@aws-sdk/client-cognito-identity" "3.236.0" + "@aws-sdk/client-sso" "3.236.0" + "@aws-sdk/client-sts" "3.236.0" + "@aws-sdk/credential-provider-cognito-identity" "3.236.0" + "@aws-sdk/credential-provider-env" "3.226.0" + "@aws-sdk/credential-provider-imds" "3.226.0" + "@aws-sdk/credential-provider-ini" "3.236.0" + "@aws-sdk/credential-provider-node" "3.236.0" + "@aws-sdk/credential-provider-process" "3.226.0" + "@aws-sdk/credential-provider-sso" "3.236.0" + "@aws-sdk/credential-provider-web-identity" "3.226.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/shared-ini-file-loader" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/fetch-http-handler@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.226.0.tgz#350f78fc18fe9cb0a889ef4870838a8fcfa8855c" + integrity sha512-JewZPMNEBXfi1xVnRa7pVtK/zgZD8/lQ/YnD8pq79WuMa2cwyhDtr8oqCoqsPW+WJT5ScXoMtuHxN78l8eKWgg== + dependencies: + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/querystring-builder" "3.226.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/util-base64" "3.208.0" + tslib "^2.3.1" + +"@aws-sdk/hash-node@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/hash-node/-/hash-node-3.226.0.tgz#252d98bcbb1e13c8f26d9d416db03cf8cceac185" + integrity sha512-MdlJhJ9/Espwd0+gUXdZRsHuostB2WxEVAszWxobP0FTT9PnicqnfK7ExmW+DUAc0ywxtEbR3e0UND65rlSTVw== + dependencies: + "@aws-sdk/types" "3.226.0" + "@aws-sdk/util-buffer-from" "3.208.0" + tslib "^2.3.1" + +"@aws-sdk/invalid-dependency@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/invalid-dependency/-/invalid-dependency-3.226.0.tgz#74586f60859ed1813985e3d642066cc46d2e9d40" + integrity sha512-QXOYFmap8g9QzRjumcRCIo2GEZkdCwd7ePQW0OABWPhKHzlJ74vvBxywjU3s39EEBEluWXtZ7Iufg6GxZM4ifw== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/is-array-buffer@3.201.0": + version "3.201.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/is-array-buffer/-/is-array-buffer-3.201.0.tgz#06e557adc284fac2f26071c2944ae01f61b95854" + integrity sha512-UPez5qLh3dNgt0DYnPD/q0mVJY84rA17QE26hVNOW3fAji8W2wrwrxdacWOxyXvlxWsVRcKmr+lay1MDqpAMfg== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/middleware-content-length@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-content-length/-/middleware-content-length-3.226.0.tgz#6cc952049f6e3cdc3a3778c9dce9f2aee942b5fe" + integrity sha512-ksUzlHJN2JMuyavjA46a4sctvnrnITqt2tbGGWWrAuXY1mel2j+VbgnmJUiwHKUO6bTFBBeft5Vd1TSOb4JmiA== + dependencies: + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-endpoint@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.226.0.tgz#d776480be4b5a9534c2805b7425be05497f840b7" + integrity sha512-EvLFafjtUxTT0AC9p3aBQu1/fjhWdIeK58jIXaNFONfZ3F8QbEYUPuF/SqZvJM6cWfOO9qwYKkRDbCSTYhprIg== + dependencies: + "@aws-sdk/middleware-serde" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/signature-v4" "3.226.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/url-parser" "3.226.0" + "@aws-sdk/util-config-provider" "3.208.0" + "@aws-sdk/util-middleware" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-host-header@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.226.0.tgz#1e1ecb034929e0dbc532ae501fd93781438f9a24" + integrity sha512-haVkWVh6BUPwKgWwkL6sDvTkcZWvJjv8AgC8jiQuSl8GLZdzHTB8Qhi3IsfFta9HAuoLjxheWBE5Z/L0UrfhLA== + dependencies: + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-logger@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.226.0.tgz#37fd0e62f555befd526b03748c3aab60dcefecf3" + integrity sha512-m9gtLrrYnpN6yckcQ09rV7ExWOLMuq8mMPF/K3DbL/YL0TuILu9i2T1W+JuxSX+K9FMG2HrLAKivE/kMLr55xA== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-recursion-detection@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.226.0.tgz#e149b9138e94d2fa70e7752ba6b1ccb537009706" + integrity sha512-mwRbdKEUeuNH5TEkyZ5FWxp6bL2UC1WbY+LDv6YjHxmSMKpAoOueEdtU34PqDOLrpXXxIGHDFmjeGeMfktyEcA== + dependencies: + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-retry@3.235.0": + version "3.235.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-retry/-/middleware-retry-3.235.0.tgz#c0d938db85a771812204ed5e981eaf5eef6b580b" + integrity sha512-50WHbJGpD3SNp9763MAlHqIhXil++JdQbKejNpHg7HsJne/ao3ub+fDOfx//mMBjpzBV25BGd5UlfL6blrClSg== + dependencies: + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/service-error-classification" "3.229.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/util-middleware" "3.226.0" + "@aws-sdk/util-retry" "3.229.0" + tslib "^2.3.1" + uuid "^8.3.2" + +"@aws-sdk/middleware-sdk-sts@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.226.0.tgz#e8a8cf42bba8963259546120cde1e408628863f9" + integrity sha512-NN9T/qoSD1kZvAT+VLny3NnlqgylYQcsgV3rvi/8lYzw/G/2s8VS6sm/VTWGGZhx08wZRv20MWzYu3bftcyqUg== + dependencies: + "@aws-sdk/middleware-signing" "3.226.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/signature-v4" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-serde@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-serde/-/middleware-serde-3.226.0.tgz#c837ef33b34bec2af19a1c177a0c02a1ae20da5e" + integrity sha512-nPuOOAkSfx9TxzdKFx0X2bDlinOxGrqD7iof926K/AEflxGD1DBdcaDdjlYlPDW2CVE8LV/rAgbYuLxh/E/1VA== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-signing@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.226.0.tgz#ebb1d142ac2767466f2e464bb7dba9837143b4d1" + integrity sha512-E6HmtPcl+IjYDDzi1xI2HpCbBq2avNWcjvCriMZWuTAtRVpnA6XDDGW5GY85IfS3A8G8vuWqEVPr8JcYUcjfew== + dependencies: + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/signature-v4" "3.226.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/util-middleware" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/middleware-stack@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-stack/-/middleware-stack-3.226.0.tgz#b0408370270188103987c457c758f9cf7651754f" + integrity sha512-85wF29LvPvpoed60fZGDYLwv1Zpd/cM0C22WSSFPw1SSJeqO4gtFYyCg2squfT3KI6kF43IIkOCJ+L7GtryPug== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/middleware-user-agent@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.226.0.tgz#26653189f3e8da86514f77688a80d0ad445c0799" + integrity sha512-N1WnfzCW1Y5yWhVAphf8OPGTe8Df3vmV7/LdsoQfmpkCZgLZeK2o0xITkUQhRj1mbw7yp8tVFLFV3R2lMurdAQ== + dependencies: + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/node-config-provider@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/node-config-provider/-/node-config-provider-3.226.0.tgz#a9e21512ef824142bb928a0b2f85b39a75b8964d" + integrity sha512-B8lQDqiRk7X5izFEUMXmi8CZLOKCTWQJU9HQf3ako+sF0gexo4nHN3jhoRWyLtcgC5S3on/2jxpAcqtm7kuY3w== + dependencies: + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/shared-ini-file-loader" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/node-http-handler@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/node-http-handler/-/node-http-handler-3.226.0.tgz#373886e949d214a99a3521bd6c141fa17b0e89fe" + integrity sha512-xQCddnZNMiPmjr3W7HYM+f5ir4VfxgJh37eqZwX6EZmyItFpNNeVzKUgA920ka1VPz/ZUYB+2OFGiX3LCLkkaA== + dependencies: + "@aws-sdk/abort-controller" "3.226.0" + "@aws-sdk/protocol-http" "3.226.0" + "@aws-sdk/querystring-builder" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/property-provider@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/property-provider/-/property-provider-3.226.0.tgz#ef0ff37c319dc37a52f08fa7544f861308a3bbd8" + integrity sha512-TsljjG+Sg0LmdgfiAlWohluWKnxB/k8xenjeozZfzOr5bHmNHtdbWv6BtNvD/R83hw7SFXxbJHlD5H4u9p2NFg== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/protocol-http@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/protocol-http/-/protocol-http-3.226.0.tgz#0af7bdc331508e556b722aad0cb78eefa93466e3" + integrity sha512-zWkVqiTA9RXL6y0hhfZc9bcU4DX2NI6Hw9IhQmSPeM59mdbPjJlY4bLlMr5YxywqO3yQ/ylNoAfrEzrDjlOSRg== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/querystring-builder@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/querystring-builder/-/querystring-builder-3.226.0.tgz#11cd751abeac66f1f9349225454bac3e39808926" + integrity sha512-LVurypuNeotO4lmirKXRC4NYrZRAyMJXuwO0f2a5ZAUJCjauwYrifKue6yCfU7bls7gut7nfcR6B99WBYpHs3g== + dependencies: + "@aws-sdk/types" "3.226.0" + "@aws-sdk/util-uri-escape" "3.201.0" + tslib "^2.3.1" + +"@aws-sdk/querystring-parser@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/querystring-parser/-/querystring-parser-3.226.0.tgz#ba6a26727c98d46c95180e6cdc463039c5e4740d" + integrity sha512-FzB+VrQ47KAFxiPt2YXrKZ8AOLZQqGTLCKHzx4bjxGmwgsjV8yIbtJiJhZLMcUQV4LtGeIY9ixIqQhGvnZHE4A== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/service-error-classification@3.229.0": + version "3.229.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/service-error-classification/-/service-error-classification-3.229.0.tgz#768f1eb92775ca2cc99c6451a2303a0008a28fc1" + integrity sha512-dnzWWQ0/NoWMUZ5C0DW3dPm0wC1O76Y/SpKbuJzWPkx1EYy6r8p32Ly4D9vUzrKDbRGf48YHIF2kOkBmu21CLg== + +"@aws-sdk/shared-ini-file-loader@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.226.0.tgz#d0ade86834b1803ce4b9dcab459e57e0376fd6cf" + integrity sha512-661VQefsARxVyyV2FX9V61V+nNgImk7aN2hYlFKla6BCwZfMng+dEtD0xVGyg1PfRw0qvEv5LQyxMVgHcUSevA== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/signature-v4@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4/-/signature-v4-3.226.0.tgz#100390b5c5b55a9b0abd05b06fceb36cfa0ecf98" + integrity sha512-/R5q5agdPd7HJB68XMzpxrNPk158EHUvkFkuRu5Qf3kkkHebEzWEBlWoVpUe6ss4rP9Tqcue6xPuaftEmhjpYw== + dependencies: + "@aws-sdk/is-array-buffer" "3.201.0" + "@aws-sdk/types" "3.226.0" + "@aws-sdk/util-hex-encoding" "3.201.0" + "@aws-sdk/util-middleware" "3.226.0" + "@aws-sdk/util-uri-escape" "3.201.0" + tslib "^2.3.1" + +"@aws-sdk/smithy-client@3.234.0": + version "3.234.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/smithy-client/-/smithy-client-3.234.0.tgz#8f0021e021f0e52730ed0a8f271f839eb63bc374" + integrity sha512-8AtR/k4vsFvjXeQbIzq/Wy7Nbk48Ou0wUEeVYPHWHPSU8QamFWORkOwmKtKMfHAyZvmqiAPeQqHFkq+UJhWyyQ== + dependencies: + "@aws-sdk/middleware-stack" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/token-providers@3.236.0": + version "3.236.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.236.0.tgz#c98ad2abad2a3686dbe849d680572f11ce965605" + integrity sha512-gmHuWuQgl6+2UfdbOvtsns/byZQnPGjyQ88/SlKgnX2EcDd31ENb8wRa9gfIEwvx6rTB2ve1NAhuliydB9AomQ== + dependencies: + "@aws-sdk/client-sso-oidc" "3.236.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/shared-ini-file-loader" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/types@3.226.0", "@aws-sdk/types@^3.1.0", "@aws-sdk/types@^3.110.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.226.0.tgz#3dba2ba223fbb8ac1ebc84de0e036ce69a81d469" + integrity sha512-MmmNHrWeO4man7wpOwrAhXlevqtOV9ZLcH4RhnG5LmRce0RFOApx24HoKENfFCcOyCm5LQBlsXCqi0dZWDWU0A== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/url-parser@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/url-parser/-/url-parser-3.226.0.tgz#f53d1f868b27fe74aca091a799f2af56237b15a2" + integrity sha512-p5RLE0QWyP0OcTOLmFcLdVgUcUEzmEfmdrnOxyNzomcYb0p3vUagA5zfa1HVK2azsQJFBv28GfvMnba9bGhObg== + dependencies: + "@aws-sdk/querystring-parser" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/util-base64@3.208.0": + version "3.208.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-base64/-/util-base64-3.208.0.tgz#36b430e5396251f761590f7c2f0c5c12193f353c" + integrity sha512-PQniZph5A6N7uuEOQi+1hnMz/FSOK/8kMFyFO+4DgA1dZ5pcKcn5wiFwHkcTb/BsgVqQa3Jx0VHNnvhlS8JyTg== + dependencies: + "@aws-sdk/util-buffer-from" "3.208.0" + tslib "^2.3.1" + +"@aws-sdk/util-body-length-browser@3.188.0": + version "3.188.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.188.0.tgz#e1d949318c10a621b38575a9ef01e39f9857ddb0" + integrity sha512-8VpnwFWXhnZ/iRSl9mTf+VKOX9wDE8QtN4bj9pBfxwf90H1X7E8T6NkiZD3k+HubYf2J94e7DbeHs7fuCPW5Qg== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-body-length-node@3.208.0": + version "3.208.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-body-length-node/-/util-body-length-node-3.208.0.tgz#baabd1fa1206ff2bd4ce3785122d86eb3258dd20" + integrity sha512-3zj50e5g7t/MQf53SsuuSf0hEELzMtD8RX8C76f12OSRo2Bca4FLLYHe0TZbxcfQHom8/hOaeZEyTyMogMglqg== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-buffer-from@3.208.0": + version "3.208.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-buffer-from/-/util-buffer-from-3.208.0.tgz#285e86f6dc9030148a4147d65239e75cb254a1b0" + integrity sha512-7L0XUixNEFcLUGPeBF35enCvB9Xl+K6SQsmbrPk1P3mlV9mguWSDQqbOBwY1Ir0OVbD6H/ZOQU7hI/9RtRI0Zw== + dependencies: + "@aws-sdk/is-array-buffer" "3.201.0" + tslib "^2.3.1" + +"@aws-sdk/util-config-provider@3.208.0": + version "3.208.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-config-provider/-/util-config-provider-3.208.0.tgz#c485fd83fbac051337e5f6be60ea3f9fa61c0139" + integrity sha512-DSRqwrERUsT34ug+anlMBIFooBEGwM8GejC7q00Y/9IPrQy50KnG5PW2NiTjuLKNi7pdEOlwTSEocJE15eDZIg== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-defaults-mode-browser@3.234.0": + version "3.234.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.234.0.tgz#1151f0beabdb46c1aaca42a1ad0714b8e686acaa" + integrity sha512-IHMKXjTbOD8XMz5+2oCOsVP94BYb9YyjXdns0aAXr2NAo7k2+RCzXQ2DebJXppGda1F6opFutoKwyVSN0cmbMw== + dependencies: + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/types" "3.226.0" + bowser "^2.11.0" + tslib "^2.3.1" + +"@aws-sdk/util-defaults-mode-node@3.234.0": + version "3.234.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.234.0.tgz#0607f1dc7a4dc896dfcaf377522535ca9ffba7a9" + integrity sha512-UGjQ+OjBYYhxFVtUY+jtr0ZZgzZh6OHtYwRhFt8IHewJXFCfZTyfsbX20szBj5y1S4HRIUJ7cwBLIytTqMbI5w== + dependencies: + "@aws-sdk/config-resolver" "3.234.0" + "@aws-sdk/credential-provider-imds" "3.226.0" + "@aws-sdk/node-config-provider" "3.226.0" + "@aws-sdk/property-provider" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/util-endpoints@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.226.0.tgz#3728b2e30f6f757ae862a0b7cf3991e75f252c3f" + integrity sha512-iqOkac/zLmyPBUJd7SLN0PeZMkOmlGgD5PHmmekTClOkce2eUjK9SNX1PzL73aXPoPTyhg9QGLH8uEZEQ8YUzg== + dependencies: + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/util-hex-encoding@3.201.0": + version "3.201.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.201.0.tgz#21d7ec319240ee68c33d938e71cb79830bea315d" + integrity sha512-7t1vR1pVxKx0motd3X9rI3m/xNp78p3sHtP5yo4NP4ARpxyJ0fokBomY8ScaH2D/B+U5o9ARxldJUdMqyBlJcA== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-locate-window@^3.0.0": + version "3.208.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.208.0.tgz#0f598fc238a1256e4bcb64d01459f03a922dd4c3" + integrity sha512-iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-middleware@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-middleware/-/util-middleware-3.226.0.tgz#7069ae96e2e00f6bb82c722e073922fb2b051ca2" + integrity sha512-B96CQnwX4gRvQdaQkdUtqvDPkrptV5+va6FVeJOocU/DbSYMAScLxtR3peMS8cnlOT6nL1Eoa42OI9AfZz1VwQ== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-retry@3.229.0": + version "3.229.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-retry/-/util-retry-3.229.0.tgz#17aad47b067e81acf644d5c2c0f2325f2d8faf4f" + integrity sha512-0zKTqi0P1inD0LzIMuXRIYYQ/8c1lWMg/cfiqUcIAF1TpatlpZuN7umU0ierpBFud7S+zDgg0oemh+Nj8xliJw== + dependencies: + "@aws-sdk/service-error-classification" "3.229.0" + tslib "^2.3.1" + +"@aws-sdk/util-uri-escape@3.201.0": + version "3.201.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-uri-escape/-/util-uri-escape-3.201.0.tgz#5e708d4cde001a4558ee616f889ceacfadd2ab03" + integrity sha512-TeTWbGx4LU2c5rx0obHeDFeO9HvwYwQtMh1yniBz00pQb6Qt6YVOETVQikRZ+XRQwEyCg/dA375UplIpiy54mA== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-user-agent-browser@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.226.0.tgz#164bb2da8d6353133784e47f0a0ae463bc9ebb73" + integrity sha512-PhBIu2h6sPJPcv2I7ELfFizdl5pNiL4LfxrasMCYXQkJvVnoXztHA1x+CQbXIdtZOIlpjC+6BjDcE0uhnpvfcA== + dependencies: + "@aws-sdk/types" "3.226.0" + bowser "^2.11.0" + tslib "^2.3.1" + +"@aws-sdk/util-user-agent-node@3.226.0": + version "3.226.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.226.0.tgz#7569460b9efc6bbd5295275c51357e480ff469c2" + integrity sha512-othPc5Dz/pkYkxH+nZPhc1Al0HndQT8zHD4e9h+EZ+8lkd8n+IsnLfTS/mSJWrfiC6UlNRVw55cItstmJyMe/A== + dependencies: + "@aws-sdk/node-config-provider" "3.226.0" + "@aws-sdk/types" "3.226.0" + tslib "^2.3.1" + +"@aws-sdk/util-utf8-browser@3.188.0", "@aws-sdk/util-utf8-browser@^3.0.0": + version "3.188.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.188.0.tgz#484762bd600401350e148277731d6744a4a92225" + integrity sha512-jt627x0+jE+Ydr9NwkFstg3cUvgWh56qdaqAMDsqgRlKD21md/6G226z/Qxl7lb1VEW2LlmCx43ai/37Qwcj2Q== + dependencies: + tslib "^2.3.1" + +"@aws-sdk/util-utf8-node@3.208.0": + version "3.208.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-node/-/util-utf8-node-3.208.0.tgz#eba17de0f92f87b98481c2e2d0ceaa05c7994d67" + integrity sha512-jKY87Acv0yWBdFxx6bveagy5FYjz+dtV8IPT7ay1E2WPWH1czoIdMAkc8tSInK31T6CRnHWkLZ1qYwCbgRfERQ== + dependencies: + "@aws-sdk/util-buffer-from" "3.208.0" + tslib "^2.3.1" + "@babel/cli@^7.16.0": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.19.3.tgz#55914ed388e658e0b924b3a95da1296267e278e2" - integrity sha512-643/TybmaCAe101m2tSVHi9UKpETXP9c/Ff4mD2tAwkdP6esKIfaauZFc67vGEM6r9fekbEGid+sZhbEnSe3dg== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.20.7.tgz#8fc12e85c744a1a617680eacb488fab1fcd35b7c" + integrity sha512-WylgcELHB66WwQqItxNILsMlaTd8/SO6SgTTjMp4uCI7P4QyH1r3nqgFmO3BfM4AtfniHgFMH3EpYFj/zynBkQ== dependencies: "@jridgewell/trace-mapping" "^0.3.8" commander "^4.0.1" @@ -33,38 +779,38 @@ dependencies: "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.20.0": +"@babel/compat-data@^7.20.5": version "7.20.5" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733" integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g== "@babel/core@^7.16.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113" - integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz#37072f951bd4d28315445f66e0ec9f6ae0c8c35f" + integrity sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.5" - "@babel/helper-compilation-targets" "^7.20.0" - "@babel/helper-module-transforms" "^7.20.2" - "@babel/helpers" "^7.20.5" - "@babel/parser" "^7.20.5" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.5" - "@babel/types" "^7.20.5" + "@babel/generator" "^7.20.7" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-module-transforms" "^7.20.7" + "@babel/helpers" "^7.20.7" + "@babel/parser" "^7.20.7" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.1" semver "^6.3.0" -"@babel/generator@^7.20.5", "@babel/generator@^7.4.0": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95" - integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA== +"@babel/generator@^7.20.7", "@babel/generator@^7.4.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a" + integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw== dependencies: - "@babel/types" "^7.20.5" + "@babel/types" "^7.20.7" "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" @@ -75,14 +821,15 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-compilation-targets@^7.20.0": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a" - integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ== +"@babel/helper-compilation-targets@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" + integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== dependencies: - "@babel/compat-data" "^7.20.0" + "@babel/compat-data" "^7.20.5" "@babel/helper-validator-option" "^7.18.6" browserslist "^4.21.3" + lru-cache "^5.1.1" semver "^6.3.0" "@babel/helper-environment-visitor@^7.18.9": @@ -112,21 +859,21 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-module-transforms@^7.20.2": - version "7.20.2" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712" - integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA== +"@babel/helper-module-transforms@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz#7a6c9a1155bef55e914af574153069c9d9470c43" + integrity sha512-FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA== dependencies: "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-module-imports" "^7.18.6" "@babel/helper-simple-access" "^7.20.2" "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-validator-identifier" "^7.19.1" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.1" - "@babel/types" "^7.20.2" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.19.0": +"@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2": version "7.20.2" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== @@ -160,14 +907,14 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== -"@babel/helpers@^7.20.5": - version "7.20.6" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763" - integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w== +"@babel/helpers@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce" + integrity sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA== dependencies: - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.20.5" - "@babel/types" "^7.20.5" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" "@babel/highlight@^7.18.6": version "7.18.6" @@ -179,9 +926,9 @@ js-tokens "^4.0.0" "@babel/node@^7.16.5": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.20.5.tgz#5afdc32f4e195019b6c566f418ad630a9ee42695" - integrity sha512-ElSr40UtumWE4fYYF1xfLP2C6b9nfS/rswK7YYpLo9HDGEXGXEAWZaGCxIirxGIDyoV0rbl6jV1LyFMQ6ZOQSA== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.20.7.tgz#609be7f841893e24931b7910263babfde84040a9" + integrity sha512-AQt3gVcP+fpFuoFn4FmIW/+5JovvEoA9og4Y1LrRw0pv3jkl4tujZMMy3X/3ugjLrEy3k1aNywo3JIl3g+jVXQ== dependencies: "@babel/register" "^7.18.9" commander "^4.0.1" @@ -190,10 +937,10 @@ regenerator-runtime "^0.13.11" v8flags "^3.1.1" -"@babel/parser@^7.18.10", "@babel/parser@^7.20.5", "@babel/parser@^7.4.3": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8" - integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA== +"@babel/parser@^7.20.7", "@babel/parser@^7.4.3": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b" + integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg== "@babel/plugin-syntax-jsx@^7.18.6": version "7.18.6" @@ -203,15 +950,15 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-react-jsx@^7.16.5": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz#b3cbb7c3a00b92ec8ae1027910e331ba5c500eb9" - integrity sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg== + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.7.tgz#025d85a1935fd7e19dfdcb1b1d4df34d4da484f7" + integrity sha512-Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.19.0" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-jsx" "^7.18.6" - "@babel/types" "^7.19.0" + "@babel/types" "^7.20.7" "@babel/register@^7.18.9": version "7.18.9" @@ -224,35 +971,35 @@ pirates "^4.0.5" source-map-support "^0.5.16" -"@babel/template@^7.18.10", "@babel/template@^7.4.0": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" - integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== +"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.4.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" + integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.18.10" - "@babel/types" "^7.18.10" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5", "@babel/traverse@^7.4.3": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133" - integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ== +"@babel/traverse@^7.20.7", "@babel/traverse@^7.4.3": + version "7.20.8" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.8.tgz#e3a23eb04af24f8bbe8a8ba3eef6155b77df0b08" + integrity sha512-/RNkaYDeCy4MjyV70+QkSHhxbvj2JO/5Ft2Pa880qJOG8tWrqcT/wXUuCCv43yogfqPzHL77Xu101KQPf4clnQ== dependencies: "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.5" + "@babel/generator" "^7.20.7" "@babel/helper-environment-visitor" "^7.18.9" "@babel/helper-function-name" "^7.19.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.20.5" - "@babel/types" "^7.20.5" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.4.0": - version "7.20.5" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84" - integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg== +"@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7", "@babel/types@^7.4.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" + integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== dependencies: "@babel/helper-string-parser" "^7.19.4" "@babel/helper-validator-identifier" "^7.19.1" @@ -306,15 +1053,15 @@ integrity sha512-ylt2NyZ77bJbRij4h9u/wVy7qYw/aDqQLWnadjvDqW/WoWCxrsX6M3CIw9GVP5xcGCDxsrKj5e0r5evuFYwrKg== "@discordjs/rest@^1.3.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@discordjs/rest/-/rest-1.4.0.tgz#ceaff2a63680c5a0d8c43b85c8a2b023413d4080" - integrity sha512-k3Ip7ffFSAfp7Mu4H/3BEXFvFz+JsbXRrRtpeBMnSp1LefhtlZWJE6xdXzNlblktKNQltnRwY+z0NZrGQdxAMw== + version "1.5.0" + resolved "https://registry.yarnpkg.com/@discordjs/rest/-/rest-1.5.0.tgz#dc15474ab98cf6f31291bf61bbc72bcf4f30cea2" + integrity sha512-lXgNFqHnbmzp5u81W0+frdXN6Etf4EUi8FAPcWpSykKd8hmlWh1xy6BmE0bsJypU1pxohaA8lQCgp70NUI3uzA== dependencies: "@discordjs/collection" "^1.3.0" "@discordjs/util" "^0.1.0" "@sapphire/async-queue" "^1.5.0" "@sapphire/snowflake" "^3.2.2" - discord-api-types "^0.37.20" + discord-api-types "^0.37.23" file-type "^18.0.0" tslib "^2.4.1" undici "^5.13.0" @@ -427,17 +1174,17 @@ integrity sha512-JkLdIsP8fPAdh9ZZjrbHWR/+mZj0wvKS5ICibcLrRI1j84UmLMshx5n9QmL8b95d4onJ2xxiyugTgSAX7AalmA== "@sapphire/shapeshift@^3.7.1": - version "3.7.1" - resolved "https://registry.yarnpkg.com/@sapphire/shapeshift/-/shapeshift-3.7.1.tgz#11f6b7bedc5bc980a1de57bd98ea2566d679d39f" - integrity sha512-JmYN/0GW49Vl8Hi4PwrsDBNjcuCylH78vWYolVys74LRIzilAAMINxx4RHQOdvYoz+ceJKVp4+zBbQ5kuIFOLw== + version "3.8.1" + resolved "https://registry.yarnpkg.com/@sapphire/shapeshift/-/shapeshift-3.8.1.tgz#b98dc6a7180f9b38219267917b2e6fa33f9ec656" + integrity sha512-xG1oXXBhCjPKbxrRTlox9ddaZTvVpOhYLmKmApD/vIWOV1xEYXnpoFs68zHIZBGbqztq6FrUPNPerIrO1Hqeaw== dependencies: fast-deep-equal "^3.1.3" - lodash.uniqwith "^4.5.0" + lodash "^4.17.21" "@sapphire/snowflake@^3.2.2": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.2.2.tgz#faacdc1b5f7c43145a71eddba917de2b707ef780" - integrity sha512-ula2O0kpSZtX9rKXNeQMrHwNd7E4jPDJYUXmEGTFdMRfyfMw+FPyh04oKMjAiDuOi64bYgVkOV3MjK+loImFhQ== + version "3.3.0" + resolved "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.3.0.tgz#247413e4d7924a9f508c6a5c8d427e4105ac0fe6" + integrity sha512-Hec5N6zEkZuZFLybVKyLFLlcSgYmR6C1/+9NkIhxPwOf6tgX52ndJCSz8ADejmbrNE0VuNCNkpzhRZzenEC9vA== "@sendgrid/client@^7.7.0": version "7.7.0" @@ -490,14 +1237,14 @@ "@types/node" "*" "@types/node@*": - version "18.11.9" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4" - integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg== + version "18.11.17" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz#5c009e1d9c38f4a2a9d45c0b0c493fe6cdb4bcb5" + integrity sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng== "@types/node@^14.14.14": - version "14.18.33" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.33.tgz#8c29a0036771569662e4635790ffa9e057db379b" - integrity sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg== + version "14.18.35" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.35.tgz#879c4659cb7b3fe515844f029c75079c941bb65c" + integrity sha512-2ATO8pfhG1kDvw4Lc4C0GXIMSQFFJBCo/R1fSgTwmUlq5oy95LXyjDQinsRVgQY6gp6ghh3H91wk9ES5/5C+Tw== "@types/node@^17.0.45": version "17.0.45" @@ -995,17 +1742,19 @@ accepts@~1.3.5, accepts@~1.3.8: mime-types "~2.1.34" negotiator "0.6.3" -acebase-core@^1.24.0: - version "1.24.0" - resolved "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.24.0.tgz#3b6d057f8cd1bb5af434bf240dec0f39f76f0ed9" - integrity sha512-tHFVHJZDVVZSqXsuRvI/CMbcbQtulPHH/Ng6RRdfB+fPCk5tC+DrHa/X0nDfx4fzyQLVLFqp/sFErzowJwhHQw== +acebase-core@^1.25.0: + version "1.25.0" + resolved "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.25.0.tgz#afc95a26b9e1521cabc5de871ea9f186805de836" + integrity sha512-d7Bh0tcYYCcdKLYu7lDYPhDOIZQObUwGiMg4mcMfsdWWdlfQyQqQMLkYVRqVH1OdHHXEx/BoqtH1oHkEBqgRZg== + optionalDependencies: + rxjs ">= 5.x <= 7.x" acebase@*: - version "1.26.2" - resolved "https://registry.yarnpkg.com/acebase/-/acebase-1.26.2.tgz#e8acc525bfcf9cef47049c551c4e5d5e31b04197" - integrity sha512-ClN81mYAkePS2v6ux4eXoFzOCJSA8H/rIIsbr3Qttnd/6/j6G8ooGqsxTqaWwYIdPYeAIaCJsyAqyB4Q59mUhA== + version "1.27.0" + resolved "https://registry.yarnpkg.com/acebase/-/acebase-1.27.0.tgz#ac47105fe85c3019bef79b563771ebfae4719275" + integrity sha512-bnd8NhMrBg3jgbLRtMVRE9yahhSVm6mPGiwQis/gtpBORvJamlNbwQvv+xd6wA+K2SClvv23TkyLhBe7WLBqzA== dependencies: - acebase-core "^1.24.0" + acebase-core "^1.25.0" unidecode "^0.1.8" acme-client@4.2.5: @@ -2079,9 +2828,9 @@ bignumber.js@9.0.0: integrity sha512-t/OYhhJ2SD+YGBQcjY8GzzDHEk9f3nerxjtfa6tlMXfe7frs/WozhvCNoGvpM0P3bNf3Gq5ZRMlGr5f3r4/N8A== bignumber.js@^9.0.0, bignumber.js@^9.0.1: - version "9.1.0" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.0.tgz#8d340146107fe3a6cb8d40699643c302e8773b62" - integrity sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A== + version "9.1.1" + resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.1.tgz#c4df7dc496bd849d4c9464344c1aa74228b4dac6" + integrity sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig== binary-extensions@^1.0.0: version "1.13.1" @@ -2167,6 +2916,11 @@ boom@0.4.x: dependencies: hoek "0.9.x" +bowser@^2.11.0: + version "2.11.0" + resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz#5ca3c35757a7aa5771500c70a73a9f91ef420a8f" + integrity sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA== + brace-expansion@^1.0.0, brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -2411,9 +3165,9 @@ camelcase@^5.0.0: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== caniuse-lite@^1.0.30001400: - version "1.0.30001434" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz#ec1ec1cfb0a93a34a0600d37903853030520a4e5" - integrity sha512-aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA== + version "1.0.30001441" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz#987437b266260b640a23cd18fbddb509d7f69f3e" + integrity sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg== caseless@~0.12.0: version "0.12.0" @@ -3075,9 +3829,9 @@ dateformat@~3.0.3: integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== dayjs@^1.8.29: - version "1.11.6" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.6.tgz#2e79a226314ec3ec904e3ee1dd5a4f5e5b1c7afb" - integrity sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ== + version "1.11.7" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" + integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== ddata@~0.1.25: version "0.1.28" @@ -3120,14 +3874,14 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.2.0: integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== decimal.js@^10.4.2: - version "10.4.2" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e" - integrity sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA== + version "10.4.3" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" + integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og== + version "0.2.2" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" + integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== deep-extend@~0.4.1: version "0.4.2" @@ -3252,10 +4006,10 @@ dir_cache@^1.0.1: minify-js "0.0.2" utils-igor "^1.0.4" -discord-api-types@^0.37.12, discord-api-types@^0.37.20: - version "0.37.20" - resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.20.tgz#f23894e3e6b894abb5431ff6c4aa52471360377c" - integrity sha512-uAO+55E11rMkYR36/paE1vKN8c2bZa1mgrIaiQIBgIZRKZTDIGOZB+8I5eMRPFJcGxrg16riUu+0aTu2JQEPew== +discord-api-types@^0.37.12, discord-api-types@^0.37.20, discord-api-types@^0.37.23: + version "0.37.24" + resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.24.tgz#f3ee0ad6b2b70925b5225f9beac6e24bc4de6e46" + integrity sha512-1+Fb4huJCihdbkJLcq2p7nBmtlmAryNwjefT8wwJnL8c7bc7WA87Oaa5mbLe96QvZyfwnwRCDX40H0HhcVV50g== discord.js@14.6.0: version "14.6.0" @@ -3426,9 +4180,9 @@ error-ex@^1.2.0, error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.19.0, es-abstract@^1.20.4: - version "1.20.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861" - integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA== + version "1.20.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.5.tgz#e6dc99177be37cacda5988e692c3fa8b218e95d2" + integrity sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -3436,6 +4190,7 @@ es-abstract@^1.19.0, es-abstract@^1.20.4: function.prototype.name "^1.1.5" get-intrinsic "^1.1.3" get-symbol-description "^1.0.0" + gopd "^1.0.1" has "^1.0.3" has-property-descriptors "^1.0.0" has-symbols "^1.0.3" @@ -3451,8 +4206,8 @@ es-abstract@^1.19.0, es-abstract@^1.20.4: object.assign "^4.1.4" regexp.prototype.flags "^1.4.3" safe-regex-test "^1.0.0" - string.prototype.trimend "^1.0.5" - string.prototype.trimstart "^1.0.5" + string.prototype.trimend "^1.0.6" + string.prototype.trimstart "^1.0.6" unbox-primitive "^1.0.2" es-array-method-boxes-properly@^1.0.0: @@ -3740,6 +4495,13 @@ fast-text-encoding@^1.0.0: resolved "https://registry.yarnpkg.com/fast-text-encoding/-/fast-text-encoding-1.0.6.tgz#0aa25f7f638222e3396d72bf936afcf1d42d6867" integrity sha512-VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w== +fast-xml-parser@4.0.11: + version "4.0.11" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.0.11.tgz#42332a9aca544520631c8919e6ea871c0185a985" + integrity sha512-4aUg3aNRR/WjQAcpceODG1C3x3lFANXRo8+1biqfieHmg9pyMt7qB4lQV/Ta6sJCTbA5vfD8fnA8S54JATiFUA== + dependencies: + strnum "^1.0.5" + fast-xml-parser@^3.19.0: version "3.21.1" resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz#152a1d51d445380f7046b304672dd55d15c9e736" @@ -4146,9 +4908,9 @@ gaxios@^5.0.0, gaxios@^5.0.1: node-fetch "^2.6.7" gcp-metadata@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.0.1.tgz#8d1e785ee7fad554bc2a80c1f930c9a9518d2b00" - integrity sha512-jiRJ+Fk7e8FH68Z6TLaqwea307OktJpDjmYnU7/li6ziwvVvU2RlrCyQo5vkdeP94chm0kcSCOOszvmuaioq3g== + version "5.1.0" + resolved "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.1.0.tgz#105768fd493ab6ff9606e0d77cdf0a4d9c1a0180" + integrity sha512-QVjouEXvNVG/nde6VZDXXFTB02xQdztaumkWCHUff58qsdCS05/8OPh68fQ2QnArfAzZTwfEc979FHSHsU8EWg== dependencies: gaxios "^5.0.0" json-bigint "^1.0.0" @@ -4168,7 +4930,7 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== @@ -4327,9 +5089,9 @@ google-protobuf@3.19.4: integrity sha512-OIPNCxsG2lkIvf+P5FNfJ/Km95CsXOBecS9ZcAU6m2Rq3svc0Apl9nB3GMDNKfQ9asNv4KjyAqGwPQFrVle3Yg== googleapis-common@^6.0.0: - version "6.0.3" - resolved "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-6.0.3.tgz#c11cdef91b272a13eb689b143f83a038fb2c403d" - integrity sha512-Xyb4FsQ6PQDu4tAE/M/ev4yzZhFe2Gc7+rKmuCX2ZGk1ajBKbafsGlVYpmzGqQOT93BRDe8DiTmQb6YSkbICrA== + version "6.0.4" + resolved "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-6.0.4.tgz#bd968bef2a478bcd3db51b27655502a11eaf8bf4" + integrity sha512-m4ErxGE8unR1z0VajT6AYk3s6a9gIMM6EkDZfkPnES8joeOlEtFEJeF8IyZkb0tjPXkktUfYrE4b3Li1DNyOwA== dependencies: extend "^3.0.2" gaxios "^5.0.1" @@ -4339,13 +5101,20 @@ googleapis-common@^6.0.0: uuid "^9.0.0" googleapis@*: - version "109.0.1" - resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-109.0.1.tgz#e4b160c9aff12acfd8ce0b4617f5192b7b8c01b3" - integrity sha512-x286OtNu0ngzxfGz2XgRs4aMhrwutRCkCE12dh2M1jIZOpOndB7ELFXEhmtxaJ7z3257flKIbiiCJZeBO+ze/Q== + version "110.0.0" + resolved "https://registry.yarnpkg.com/googleapis/-/googleapis-110.0.0.tgz#73e59ff0c64658924c71229ef8884da60ac9aeec" + integrity sha512-k6de3PGsdFEBULMiFwPYCKOBljDTDvHD3YGe/OFqe8Ot0lYQPL8QV1qjxjrPWiE/Ftf0Ar2v4DNES66jLfSO7w== dependencies: google-auth-library "^8.0.2" googleapis-common "^6.0.0" +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.6, graceful-fs@^4.2.8: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" @@ -4888,11 +5657,11 @@ inquirer@^0.12.0: through "^2.3.6" internal-slot@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" - integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + version "1.0.4" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3" + integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ== dependencies: - get-intrinsic "^1.1.0" + get-intrinsic "^1.1.3" has "^1.0.3" side-channel "^1.0.4" @@ -5543,9 +6312,9 @@ json5@^0.5.1: integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw== json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== + version "2.2.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab" + integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== jsonwebtoken@^8.5.1: version "8.5.1" @@ -5862,11 +6631,6 @@ lodash.union@^4.6.0: resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" integrity sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw== -lodash.uniqwith@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.uniqwith/-/lodash.uniqwith-4.5.0.tgz#7a0cbf65f43b5928625a9d4d0dc54b18cadc7ef3" - integrity sha512-7lYL8bLopMoy4CTICbxygAUq6CdRJ36vFc80DucPueUee+d5NBRxz3FdT9Pes/HEx5mPoT9jwnsEJWz1N7uq7Q== - lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.6.1, lodash@~4.17.19, lodash@~4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -5908,6 +6672,13 @@ lru-cache@^4.0.1: pseudomap "^1.0.2" yallist "^2.1.2" +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -6170,9 +6941,9 @@ minimatch@^2.0.1: brace-expansion "^1.0.0" minimatch@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" - integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== + version "5.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz#0939d7d6f0898acbd1508abe534d1929368a8fff" + integrity sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg== dependencies: brace-expansion "^2.0.1" @@ -6239,6 +7010,13 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: dependencies: yallist "^4.0.0" +minipass@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.0.tgz#7cebb0f9fa7d56f0c5b17853cbe28838a8dbbd3b" + integrity sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw== + dependencies: + yallist "^4.0.0" + minizlib@^2.0.0, minizlib@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -6280,9 +7058,9 @@ modern-syslog@*: nan "^2.13.2" moment-timezone@^0.5.38: - version "0.5.39" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.39.tgz#342625a3b98810f04c8f4ea917e448d3525e600b" - integrity sha512-hoB6suq4ISDj7BDgctiOy6zljBsdYT0++0ZzZm9rtxIvJhIbQ3nmbgSWe7dNFGurl6/7b1OUkHlmN9JWgXVz7w== + version "0.5.40" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.40.tgz#c148f5149fd91dd3e29bf481abc8830ecba16b89" + integrity sha512-tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg== dependencies: moment ">= 2.9.0" @@ -6291,7 +7069,7 @@ moment-timezone@^0.5.38: resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== -mongodb-connection-string-url@^2.5.3: +mongodb-connection-string-url@^2.5.4: version "2.6.0" resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz#57901bf352372abdde812c81be47b75c6b2ec5cf" integrity sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ== @@ -6299,16 +7077,16 @@ mongodb-connection-string-url@^2.5.3: "@types/whatwg-url" "^8.2.1" whatwg-url "^11.0.0" -mongodb@4.9.1: - version "4.9.1" - resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.9.1.tgz#0c769448228bcf9a6aa7d16daa3625b48312479e" - integrity sha512-ZhgI/qBf84fD7sI4waZBoLBNJYPQN5IOC++SBCiPiyhzpNKOxN/fi0tBHvH2dEC42HXtNEbFB0zmNz4+oVtorQ== +mongodb@4.12.1: + version "4.12.1" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.12.1.tgz#224eb39b8784af835b515aa687c6010cecaabb1a" + integrity sha512-koT87tecZmxPKtxRQD8hCKfn+ockEL2xBiUvx3isQGI6mFmagWt4f4AyCE9J4sKepnLhMacoCTQQA6SLAI2L6w== dependencies: bson "^4.7.0" - denque "^2.1.0" - mongodb-connection-string-url "^2.5.3" - socks "^2.7.0" + mongodb-connection-string-url "^2.5.4" + socks "^2.7.1" optionalDependencies: + "@aws-sdk/credential-providers" "^3.186.0" saslprep "^1.0.3" mongodb@^3.3.2: @@ -6524,9 +7302,9 @@ node-pushover@*: httpreq "*" node-releases@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" - integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== + version "2.0.8" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae" + integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A== node-sspi@*: version "0.2.10" @@ -7361,9 +8139,9 @@ pkg-dir@^3.0.0: find-up "^3.0.0" plivo@*: - version "4.35.0" - resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.35.0.tgz#134552f0482cb96fbcb485bcdc09f66857a293af" - integrity sha512-E8GYcGWEUdUYEt+625UGPuUDXmlQQ/2MtwUt3OEy2DTaOhVbuZH8KC6O98Qq4sPsW3dRAgbYzeeBWGPRkmJ3xg== + version "4.36.0" + resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.36.0.tgz#d6e3fa06bc5c42a04a74d71e8e989b8f2dab5309" + integrity sha512-jhd61SkiMXkWDZc+NFNqD5yheyQSl2dpdcLzpOx2u/ddUV1PX+nGwZ+gEp1wZ2B4V/l/qwVk8QHcXRN+VtT+Gg== dependencies: "@types/node" "^14.14.14" axios "^0.21.1" @@ -8050,6 +8828,13 @@ rx-lite@^3.1.2: resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" integrity sha512-1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ== +"rxjs@>= 5.x <= 7.x": + version "7.8.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" + integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== + dependencies: + tslib "^2.1.0" + safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -8310,7 +9095,7 @@ socks-proxy-agent@^6.0.0: debug "^4.3.3" socks "^2.6.2" -socks@^2.6.2, socks@^2.7.0: +socks@^2.6.2, socks@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== @@ -8443,9 +9228,9 @@ sprintf-js@~1.0.2: integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== sqlite3@*: - version "5.1.2" - resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.2.tgz#f50d5b1482b6972fb650daf6f718e6507c6cfb0f" - integrity sha512-D0Reg6pRWAFXFUnZKsszCI67tthFD8fGPewRddDCX6w4cYwz3MbvuwRICbL+YQjBAh9zbw+lJ/V9oC8nG5j6eg== + version "5.1.4" + resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.4.tgz#35f83d368963168b324ad2f0fffce09f3b8723a7" + integrity sha512-i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA== dependencies: "@mapbox/node-pre-gyp" "^1.0.0" node-addon-api "^4.2.0" @@ -8591,7 +9376,7 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string.prototype.trimend@^1.0.5: +string.prototype.trimend@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== @@ -8600,7 +9385,7 @@ string.prototype.trimend@^1.0.5: define-properties "^1.1.4" es-abstract "^1.20.4" -string.prototype.trimstart@^1.0.5: +string.prototype.trimstart@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== @@ -8661,7 +9446,7 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== -strnum@^1.0.4: +strnum@^1.0.4, strnum@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.5.tgz#5c4e829fe15ad4ff0d20c3db5ac97b73c9b072db" integrity sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA== @@ -8751,21 +9536,21 @@ tar-stream@^2.2.0: readable-stream "^3.1.1" tar@^6.0.2, tar@^6.1.11, tar@^6.1.2: - version "6.1.12" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz#3b742fb05669b55671fb769ab67a7791ea1a62e6" - integrity sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw== + version "6.1.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" + integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^3.0.0" + minipass "^4.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" telegram@*: - version "2.14.7" - resolved "https://registry.yarnpkg.com/telegram/-/telegram-2.14.7.tgz#9591b5a7406cc9224a57b69dc70eb987718a62bd" - integrity sha512-4qY+M4UHwb4xATCXpnMsBwJCMqETiH97jvnd6D8NnMbJlOC4Br049381xx3oHRc5ifTBxXuD64b7jgIR52rWtQ== + version "2.15.2" + resolved "https://registry.yarnpkg.com/telegram/-/telegram-2.15.2.tgz#e716af7a23f0acd203c03e00c7d8051df642b4f2" + integrity sha512-+/vmEImjDtkOEiiPyGThIyzBVgpCfDNz2suwXtl5z/b0xK6SWqV4edX3c1BZgK4/JrIyydrCAxLQpKlG61/uzw== dependencies: "@cryptography/aes" "^0.1.1" async-mutex "^0.3.0" @@ -8985,7 +9770,12 @@ ts-mixer@^6.0.2: resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.2.tgz#3e4e4bb8daffb24435f6980b15204cb5b287e016" integrity sha512-zvHx3VM83m2WYCE8XL99uaM7mFwYSkjR2OZti98fabHrwkjsCvgwChda5xctein3xGOyaQhtTeDq/1H/GNvF3A== -tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1: +tslib@^1.11.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== + +tslib@^2.1.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== @@ -9023,9 +9813,9 @@ tweetnacl@^1.0.1: integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== twilio@*: - version "3.83.3" - resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.83.3.tgz#5aec258aa433efa515c4302cb41ed35d72f2ac8f" - integrity sha512-uyYPXUmKIvpq54DGcq0elT0t2PLhDSwD7svu18SabiFSD6rmouws8gr9CZRix45IYSnIxTmOSr3i4vWR74/hQw== + version "3.84.0" + resolved "https://registry.yarnpkg.com/twilio/-/twilio-3.84.0.tgz#57e035a7034e4c278cdd03d3e88c05f507b9d84e" + integrity sha512-XL+RR1SdfGExC51cE22unM/r7lEFzfDYUA3FecHEe5cLF+LzxmZGB9O9BXfqZu/sZ5YlGeltJfMA5j3TRLzhLw== dependencies: axios "^0.26.1" dayjs "^1.8.29" @@ -9142,9 +9932,9 @@ underscore@~1.8.3: integrity sha512-5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg== undici@^5.11.0, undici@^5.13.0: - version "5.13.0" - resolved "https://registry.yarnpkg.com/undici/-/undici-5.13.0.tgz#56772fba89d8b25e39bddc8c26a438bd73ea69bb" - integrity sha512-UDZKtwb2k7KRsK4SdXWG7ErXiL7yTGgLWvk2AXO1JMjgjh404nFo6tWSCM2xMpJwMPx3J8i/vfqEh1zOqvj82Q== + version "5.14.0" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.14.0.tgz#1169d0cdee06a4ffdd30810f6228d57998884d00" + integrity sha512-yJlHYw6yXPPsuOH0x2Ib1Km61vu4hLiRRQoafs+WUgX1vO64vgnxiCEN9dpIrhZyHFsai3F0AEj4P9zy19enEQ== dependencies: busboy "^1.6.0" @@ -9312,6 +10102,11 @@ uuid@^3.0.1, uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + uuid@^9.0.0: version "9.0.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" @@ -9754,6 +10549,11 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== +yallist@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" diff --git a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix index fa8f40dfbd..a259fc9e39 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix @@ -10,11 +10,539 @@ }; } { - name = "_babel_cli___cli_7.19.3.tgz"; + name = "_aws_crypto_ie11_detection___ie11_detection_2.0.2.tgz"; path = fetchurl { - name = "_babel_cli___cli_7.19.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/cli/-/cli-7.19.3.tgz"; - sha512 = "643/TybmaCAe101m2tSVHi9UKpETXP9c/Ff4mD2tAwkdP6esKIfaauZFc67vGEM6r9fekbEGid+sZhbEnSe3dg=="; + name = "_aws_crypto_ie11_detection___ie11_detection_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/ie11-detection/-/ie11-detection-2.0.2.tgz"; + sha512 = "5XDMQY98gMAf/WRTic5G++jfmS/VLM0rwpiOpaainKi4L0nqWMSB1SzsrEG5rjFZGYN6ZAefO+/Yta2dFM0kMw=="; + }; + } + { + name = "_aws_crypto_sha256_browser___sha256_browser_2.0.0.tgz"; + path = fetchurl { + name = "_aws_crypto_sha256_browser___sha256_browser_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-2.0.0.tgz"; + sha512 = "rYXOQ8BFOaqMEHJrLHul/25ckWH6GTJtdLSajhlqGMx0PmSueAuvboCuZCTqEKlxR8CQOwRarxYMZZSYlhRA1A=="; + }; + } + { + name = "_aws_crypto_sha256_js___sha256_js_2.0.0.tgz"; + path = fetchurl { + name = "_aws_crypto_sha256_js___sha256_js_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.0.tgz"; + sha512 = "VZY+mCY4Nmrs5WGfitmNqXzaE873fcIZDu54cbaDaaamsaTOP1DBImV9F4pICc3EHjQXujyE8jig+PFCaew9ig=="; + }; + } + { + name = "_aws_crypto_sha256_js___sha256_js_2.0.2.tgz"; + path = fetchurl { + name = "_aws_crypto_sha256_js___sha256_js_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-2.0.2.tgz"; + sha512 = "iXLdKH19qPmIC73fVCrHWCSYjN/sxaAvZ3jNNyw6FclmHyjLKg0f69WlC9KTnyElxCR5MO9SKaG00VwlJwyAkQ=="; + }; + } + { + name = "_aws_crypto_supports_web_crypto___supports_web_crypto_2.0.2.tgz"; + path = fetchurl { + name = "_aws_crypto_supports_web_crypto___supports_web_crypto_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-2.0.2.tgz"; + sha512 = "6mbSsLHwZ99CTOOswvCRP3C+VCWnzBf+1SnbWxzzJ9lR0mA0JnY2JEAhp8rqmTE0GPFy88rrM27ffgp62oErMQ=="; + }; + } + { + name = "_aws_crypto_util___util_2.0.2.tgz"; + path = fetchurl { + name = "_aws_crypto_util___util_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@aws-crypto/util/-/util-2.0.2.tgz"; + sha512 = "Lgu5v/0e/BcrZ5m/IWqzPUf3UYFTy/PpeED+uc9SWUR1iZQL8XXbGQg10UfllwwBryO3hFF5dizK+78aoXC1eA=="; + }; + } + { + name = "_aws_sdk_abort_controller___abort_controller_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_abort_controller___abort_controller_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/abort-controller/-/abort-controller-3.226.0.tgz"; + sha512 = "cJVzr1xxPBd08voknXvR0RLgtZKGKt6WyDpH/BaPCu3rfSqWCDZKzwqe940eqosjmKrxC6pUZNKASIqHOQ8xxQ=="; + }; + } + { + name = "_aws_sdk_client_cognito_identity___client_cognito_identity_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_client_cognito_identity___client_cognito_identity_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.236.0.tgz"; + sha512 = "lWGuTVA+q3h1KS3nxTWeRGOfsuQ+GNwq5IxFJ8ko441mpwo5A2t6u25Z+G6t5Eh+q4EcoxMX64HYA+cu91lr7g=="; + }; + } + { + name = "_aws_sdk_client_sso_oidc___client_sso_oidc_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_client_sso_oidc___client_sso_oidc_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.236.0.tgz"; + sha512 = "9TuigSXGafVto+GjKsVkhNLlnSgNWzRL5/ClZ5lY3dWrcDEJGZjFwwRB3ICerFQJBdDfsYwjNjJPhYEHzdyBfQ=="; + }; + } + { + name = "_aws_sdk_client_sso___client_sso_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_client_sso___client_sso_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.236.0.tgz"; + sha512 = "2E/XHiVSRI+L2SlVscmV/+z4A2iWF6BTUjVBFBGMmsailvGDV6XKPFocTBsHI64G25/SYkhMdELvjn5jHLKBGQ=="; + }; + } + { + name = "_aws_sdk_client_sts___client_sts_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_client_sts___client_sts_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.236.0.tgz"; + sha512 = "ruEALU0oPwsA8xZ/HBCoUO9rsyhPyalj20GMGpzVaNcf1dr1jMTThDQvQvvjAHjY3W56mI7ApxjK+D+gok55aw=="; + }; + } + { + name = "_aws_sdk_config_resolver___config_resolver_3.234.0.tgz"; + path = fetchurl { + name = "_aws_sdk_config_resolver___config_resolver_3.234.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/config-resolver/-/config-resolver-3.234.0.tgz"; + sha512 = "uZxy4wzllfvgCQxVc+Iqhde0NGAnfmV2hWR6ejadJaAFTuYNvQiRg9IqJy3pkyDPqXySiJ8Bom5PoJfgn55J/A=="; + }; + } + { + name = "_aws_sdk_credential_provider_cognito_identity___credential_provider_cognito_identity_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_cognito_identity___credential_provider_cognito_identity_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.236.0.tgz"; + sha512 = "PDsUZ7gmSCwraDDYnmoSkmrA1tpmvDBDjNPUVe6E+/8tDw3SWiL2efGR6r8ajFh9m+6jF6B8Wy+YB3u3yjAjWQ=="; + }; + } + { + name = "_aws_sdk_credential_provider_env___credential_provider_env_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_env___credential_provider_env_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.226.0.tgz"; + sha512 = "sd8uK1ojbXxaZXlthzw/VXZwCPUtU3PjObOfr3Evj7MPIM2IH8h29foOlggx939MdLQGboJf9gKvLlvKDWtJRA=="; + }; + } + { + name = "_aws_sdk_credential_provider_imds___credential_provider_imds_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_imds___credential_provider_imds_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.226.0.tgz"; + sha512 = "//z/COQm2AjYFI1Lb0wKHTQSrvLFTyuKLFQGPJsKS7DPoxGOCKB7hmYerlbl01IDoCxTdyL//TyyPxbZEOQD5Q=="; + }; + } + { + name = "_aws_sdk_credential_provider_ini___credential_provider_ini_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_ini___credential_provider_ini_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.236.0.tgz"; + sha512 = "W5vMEauWgFCzvf4Hks6ToU5dhbN87gyijmwp/l9AkKKvuJ25LkveAhk8xz3bydJThHdgWNEuBMyfmlVWmdybIg=="; + }; + } + { + name = "_aws_sdk_credential_provider_node___credential_provider_node_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_node___credential_provider_node_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.236.0.tgz"; + sha512 = "ktRPwmqw2P4dDzs/nJYTnuesSYqpDUEtqm2KSCKNT/fobzgfsrESLk3a7TY4l6N3muxQtKwguIa9Lulhe82+wg=="; + }; + } + { + name = "_aws_sdk_credential_provider_process___credential_provider_process_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_process___credential_provider_process_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.226.0.tgz"; + sha512 = "iUDMdnrTvbvaCFhWwqyXrhvQ9+ojPqPqXhwZtY1X/Qaz+73S9gXBPJHZaZb2Ke0yKE1Ql3bJbKvmmxC/qLQMng=="; + }; + } + { + name = "_aws_sdk_credential_provider_sso___credential_provider_sso_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_sso___credential_provider_sso_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.236.0.tgz"; + sha512 = "HLeVsFHd8QLQwhjwhdlBhXOFIa33mzqmxOqe2Qr4FVD5IR1/G4zLpSWSwtYjpvWRZs2oWSg6XI7vSyeQttPmHg=="; + }; + } + { + name = "_aws_sdk_credential_provider_web_identity___credential_provider_web_identity_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_provider_web_identity___credential_provider_web_identity_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.226.0.tgz"; + sha512 = "CCpv847rLB0SFOHz2igvUMFAzeT2fD3YnY4C8jltuJoEkn0ITn1Hlgt13nTJ5BUuvyti2mvyXZHmNzhMIMrIlw=="; + }; + } + { + name = "_aws_sdk_credential_providers___credential_providers_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_credential_providers___credential_providers_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.236.0.tgz"; + sha512 = "z7RU5E9xlk6KX16jJxByn8xa8mv8pPZoqAPkavCsFJS6pOYTtQJYYdjrUK/2EmOmbPpc62P6mqVP7qTVQKgafw=="; + }; + } + { + name = "_aws_sdk_fetch_http_handler___fetch_http_handler_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_fetch_http_handler___fetch_http_handler_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.226.0.tgz"; + sha512 = "JewZPMNEBXfi1xVnRa7pVtK/zgZD8/lQ/YnD8pq79WuMa2cwyhDtr8oqCoqsPW+WJT5ScXoMtuHxN78l8eKWgg=="; + }; + } + { + name = "_aws_sdk_hash_node___hash_node_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_hash_node___hash_node_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/hash-node/-/hash-node-3.226.0.tgz"; + sha512 = "MdlJhJ9/Espwd0+gUXdZRsHuostB2WxEVAszWxobP0FTT9PnicqnfK7ExmW+DUAc0ywxtEbR3e0UND65rlSTVw=="; + }; + } + { + name = "_aws_sdk_invalid_dependency___invalid_dependency_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_invalid_dependency___invalid_dependency_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/invalid-dependency/-/invalid-dependency-3.226.0.tgz"; + sha512 = "QXOYFmap8g9QzRjumcRCIo2GEZkdCwd7ePQW0OABWPhKHzlJ74vvBxywjU3s39EEBEluWXtZ7Iufg6GxZM4ifw=="; + }; + } + { + name = "_aws_sdk_is_array_buffer___is_array_buffer_3.201.0.tgz"; + path = fetchurl { + name = "_aws_sdk_is_array_buffer___is_array_buffer_3.201.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/is-array-buffer/-/is-array-buffer-3.201.0.tgz"; + sha512 = "UPez5qLh3dNgt0DYnPD/q0mVJY84rA17QE26hVNOW3fAji8W2wrwrxdacWOxyXvlxWsVRcKmr+lay1MDqpAMfg=="; + }; + } + { + name = "_aws_sdk_middleware_content_length___middleware_content_length_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_content_length___middleware_content_length_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-content-length/-/middleware-content-length-3.226.0.tgz"; + sha512 = "ksUzlHJN2JMuyavjA46a4sctvnrnITqt2tbGGWWrAuXY1mel2j+VbgnmJUiwHKUO6bTFBBeft5Vd1TSOb4JmiA=="; + }; + } + { + name = "_aws_sdk_middleware_endpoint___middleware_endpoint_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_endpoint___middleware_endpoint_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.226.0.tgz"; + sha512 = "EvLFafjtUxTT0AC9p3aBQu1/fjhWdIeK58jIXaNFONfZ3F8QbEYUPuF/SqZvJM6cWfOO9qwYKkRDbCSTYhprIg=="; + }; + } + { + name = "_aws_sdk_middleware_host_header___middleware_host_header_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_host_header___middleware_host_header_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.226.0.tgz"; + sha512 = "haVkWVh6BUPwKgWwkL6sDvTkcZWvJjv8AgC8jiQuSl8GLZdzHTB8Qhi3IsfFta9HAuoLjxheWBE5Z/L0UrfhLA=="; + }; + } + { + name = "_aws_sdk_middleware_logger___middleware_logger_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_logger___middleware_logger_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.226.0.tgz"; + sha512 = "m9gtLrrYnpN6yckcQ09rV7ExWOLMuq8mMPF/K3DbL/YL0TuILu9i2T1W+JuxSX+K9FMG2HrLAKivE/kMLr55xA=="; + }; + } + { + name = "_aws_sdk_middleware_recursion_detection___middleware_recursion_detection_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_recursion_detection___middleware_recursion_detection_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.226.0.tgz"; + sha512 = "mwRbdKEUeuNH5TEkyZ5FWxp6bL2UC1WbY+LDv6YjHxmSMKpAoOueEdtU34PqDOLrpXXxIGHDFmjeGeMfktyEcA=="; + }; + } + { + name = "_aws_sdk_middleware_retry___middleware_retry_3.235.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_retry___middleware_retry_3.235.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-retry/-/middleware-retry-3.235.0.tgz"; + sha512 = "50WHbJGpD3SNp9763MAlHqIhXil++JdQbKejNpHg7HsJne/ao3ub+fDOfx//mMBjpzBV25BGd5UlfL6blrClSg=="; + }; + } + { + name = "_aws_sdk_middleware_sdk_sts___middleware_sdk_sts_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_sdk_sts___middleware_sdk_sts_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.226.0.tgz"; + sha512 = "NN9T/qoSD1kZvAT+VLny3NnlqgylYQcsgV3rvi/8lYzw/G/2s8VS6sm/VTWGGZhx08wZRv20MWzYu3bftcyqUg=="; + }; + } + { + name = "_aws_sdk_middleware_serde___middleware_serde_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_serde___middleware_serde_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-serde/-/middleware-serde-3.226.0.tgz"; + sha512 = "nPuOOAkSfx9TxzdKFx0X2bDlinOxGrqD7iof926K/AEflxGD1DBdcaDdjlYlPDW2CVE8LV/rAgbYuLxh/E/1VA=="; + }; + } + { + name = "_aws_sdk_middleware_signing___middleware_signing_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_signing___middleware_signing_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.226.0.tgz"; + sha512 = "E6HmtPcl+IjYDDzi1xI2HpCbBq2avNWcjvCriMZWuTAtRVpnA6XDDGW5GY85IfS3A8G8vuWqEVPr8JcYUcjfew=="; + }; + } + { + name = "_aws_sdk_middleware_stack___middleware_stack_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_stack___middleware_stack_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-stack/-/middleware-stack-3.226.0.tgz"; + sha512 = "85wF29LvPvpoed60fZGDYLwv1Zpd/cM0C22WSSFPw1SSJeqO4gtFYyCg2squfT3KI6kF43IIkOCJ+L7GtryPug=="; + }; + } + { + name = "_aws_sdk_middleware_user_agent___middleware_user_agent_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_middleware_user_agent___middleware_user_agent_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.226.0.tgz"; + sha512 = "N1WnfzCW1Y5yWhVAphf8OPGTe8Df3vmV7/LdsoQfmpkCZgLZeK2o0xITkUQhRj1mbw7yp8tVFLFV3R2lMurdAQ=="; + }; + } + { + name = "_aws_sdk_node_config_provider___node_config_provider_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_node_config_provider___node_config_provider_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/node-config-provider/-/node-config-provider-3.226.0.tgz"; + sha512 = "B8lQDqiRk7X5izFEUMXmi8CZLOKCTWQJU9HQf3ako+sF0gexo4nHN3jhoRWyLtcgC5S3on/2jxpAcqtm7kuY3w=="; + }; + } + { + name = "_aws_sdk_node_http_handler___node_http_handler_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_node_http_handler___node_http_handler_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/node-http-handler/-/node-http-handler-3.226.0.tgz"; + sha512 = "xQCddnZNMiPmjr3W7HYM+f5ir4VfxgJh37eqZwX6EZmyItFpNNeVzKUgA920ka1VPz/ZUYB+2OFGiX3LCLkkaA=="; + }; + } + { + name = "_aws_sdk_property_provider___property_provider_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_property_provider___property_provider_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/property-provider/-/property-provider-3.226.0.tgz"; + sha512 = "TsljjG+Sg0LmdgfiAlWohluWKnxB/k8xenjeozZfzOr5bHmNHtdbWv6BtNvD/R83hw7SFXxbJHlD5H4u9p2NFg=="; + }; + } + { + name = "_aws_sdk_protocol_http___protocol_http_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_protocol_http___protocol_http_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/protocol-http/-/protocol-http-3.226.0.tgz"; + sha512 = "zWkVqiTA9RXL6y0hhfZc9bcU4DX2NI6Hw9IhQmSPeM59mdbPjJlY4bLlMr5YxywqO3yQ/ylNoAfrEzrDjlOSRg=="; + }; + } + { + name = "_aws_sdk_querystring_builder___querystring_builder_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_querystring_builder___querystring_builder_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/querystring-builder/-/querystring-builder-3.226.0.tgz"; + sha512 = "LVurypuNeotO4lmirKXRC4NYrZRAyMJXuwO0f2a5ZAUJCjauwYrifKue6yCfU7bls7gut7nfcR6B99WBYpHs3g=="; + }; + } + { + name = "_aws_sdk_querystring_parser___querystring_parser_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_querystring_parser___querystring_parser_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/querystring-parser/-/querystring-parser-3.226.0.tgz"; + sha512 = "FzB+VrQ47KAFxiPt2YXrKZ8AOLZQqGTLCKHzx4bjxGmwgsjV8yIbtJiJhZLMcUQV4LtGeIY9ixIqQhGvnZHE4A=="; + }; + } + { + name = "_aws_sdk_service_error_classification___service_error_classification_3.229.0.tgz"; + path = fetchurl { + name = "_aws_sdk_service_error_classification___service_error_classification_3.229.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/service-error-classification/-/service-error-classification-3.229.0.tgz"; + sha512 = "dnzWWQ0/NoWMUZ5C0DW3dPm0wC1O76Y/SpKbuJzWPkx1EYy6r8p32Ly4D9vUzrKDbRGf48YHIF2kOkBmu21CLg=="; + }; + } + { + name = "_aws_sdk_shared_ini_file_loader___shared_ini_file_loader_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_shared_ini_file_loader___shared_ini_file_loader_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.226.0.tgz"; + sha512 = "661VQefsARxVyyV2FX9V61V+nNgImk7aN2hYlFKla6BCwZfMng+dEtD0xVGyg1PfRw0qvEv5LQyxMVgHcUSevA=="; + }; + } + { + name = "_aws_sdk_signature_v4___signature_v4_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_signature_v4___signature_v4_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/signature-v4/-/signature-v4-3.226.0.tgz"; + sha512 = "/R5q5agdPd7HJB68XMzpxrNPk158EHUvkFkuRu5Qf3kkkHebEzWEBlWoVpUe6ss4rP9Tqcue6xPuaftEmhjpYw=="; + }; + } + { + name = "_aws_sdk_smithy_client___smithy_client_3.234.0.tgz"; + path = fetchurl { + name = "_aws_sdk_smithy_client___smithy_client_3.234.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/smithy-client/-/smithy-client-3.234.0.tgz"; + sha512 = "8AtR/k4vsFvjXeQbIzq/Wy7Nbk48Ou0wUEeVYPHWHPSU8QamFWORkOwmKtKMfHAyZvmqiAPeQqHFkq+UJhWyyQ=="; + }; + } + { + name = "_aws_sdk_token_providers___token_providers_3.236.0.tgz"; + path = fetchurl { + name = "_aws_sdk_token_providers___token_providers_3.236.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.236.0.tgz"; + sha512 = "gmHuWuQgl6+2UfdbOvtsns/byZQnPGjyQ88/SlKgnX2EcDd31ENb8wRa9gfIEwvx6rTB2ve1NAhuliydB9AomQ=="; + }; + } + { + name = "_aws_sdk_types___types_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_types___types_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.226.0.tgz"; + sha512 = "MmmNHrWeO4man7wpOwrAhXlevqtOV9ZLcH4RhnG5LmRce0RFOApx24HoKENfFCcOyCm5LQBlsXCqi0dZWDWU0A=="; + }; + } + { + name = "_aws_sdk_url_parser___url_parser_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_url_parser___url_parser_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/url-parser/-/url-parser-3.226.0.tgz"; + sha512 = "p5RLE0QWyP0OcTOLmFcLdVgUcUEzmEfmdrnOxyNzomcYb0p3vUagA5zfa1HVK2azsQJFBv28GfvMnba9bGhObg=="; + }; + } + { + name = "_aws_sdk_util_base64___util_base64_3.208.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_base64___util_base64_3.208.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-base64/-/util-base64-3.208.0.tgz"; + sha512 = "PQniZph5A6N7uuEOQi+1hnMz/FSOK/8kMFyFO+4DgA1dZ5pcKcn5wiFwHkcTb/BsgVqQa3Jx0VHNnvhlS8JyTg=="; + }; + } + { + name = "_aws_sdk_util_body_length_browser___util_body_length_browser_3.188.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_body_length_browser___util_body_length_browser_3.188.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.188.0.tgz"; + sha512 = "8VpnwFWXhnZ/iRSl9mTf+VKOX9wDE8QtN4bj9pBfxwf90H1X7E8T6NkiZD3k+HubYf2J94e7DbeHs7fuCPW5Qg=="; + }; + } + { + name = "_aws_sdk_util_body_length_node___util_body_length_node_3.208.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_body_length_node___util_body_length_node_3.208.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-body-length-node/-/util-body-length-node-3.208.0.tgz"; + sha512 = "3zj50e5g7t/MQf53SsuuSf0hEELzMtD8RX8C76f12OSRo2Bca4FLLYHe0TZbxcfQHom8/hOaeZEyTyMogMglqg=="; + }; + } + { + name = "_aws_sdk_util_buffer_from___util_buffer_from_3.208.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_buffer_from___util_buffer_from_3.208.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-buffer-from/-/util-buffer-from-3.208.0.tgz"; + sha512 = "7L0XUixNEFcLUGPeBF35enCvB9Xl+K6SQsmbrPk1P3mlV9mguWSDQqbOBwY1Ir0OVbD6H/ZOQU7hI/9RtRI0Zw=="; + }; + } + { + name = "_aws_sdk_util_config_provider___util_config_provider_3.208.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_config_provider___util_config_provider_3.208.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-config-provider/-/util-config-provider-3.208.0.tgz"; + sha512 = "DSRqwrERUsT34ug+anlMBIFooBEGwM8GejC7q00Y/9IPrQy50KnG5PW2NiTjuLKNi7pdEOlwTSEocJE15eDZIg=="; + }; + } + { + name = "_aws_sdk_util_defaults_mode_browser___util_defaults_mode_browser_3.234.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_defaults_mode_browser___util_defaults_mode_browser_3.234.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.234.0.tgz"; + sha512 = "IHMKXjTbOD8XMz5+2oCOsVP94BYb9YyjXdns0aAXr2NAo7k2+RCzXQ2DebJXppGda1F6opFutoKwyVSN0cmbMw=="; + }; + } + { + name = "_aws_sdk_util_defaults_mode_node___util_defaults_mode_node_3.234.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_defaults_mode_node___util_defaults_mode_node_3.234.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.234.0.tgz"; + sha512 = "UGjQ+OjBYYhxFVtUY+jtr0ZZgzZh6OHtYwRhFt8IHewJXFCfZTyfsbX20szBj5y1S4HRIUJ7cwBLIytTqMbI5w=="; + }; + } + { + name = "_aws_sdk_util_endpoints___util_endpoints_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_endpoints___util_endpoints_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.226.0.tgz"; + sha512 = "iqOkac/zLmyPBUJd7SLN0PeZMkOmlGgD5PHmmekTClOkce2eUjK9SNX1PzL73aXPoPTyhg9QGLH8uEZEQ8YUzg=="; + }; + } + { + name = "_aws_sdk_util_hex_encoding___util_hex_encoding_3.201.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_hex_encoding___util_hex_encoding_3.201.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.201.0.tgz"; + sha512 = "7t1vR1pVxKx0motd3X9rI3m/xNp78p3sHtP5yo4NP4ARpxyJ0fokBomY8ScaH2D/B+U5o9ARxldJUdMqyBlJcA=="; + }; + } + { + name = "_aws_sdk_util_locate_window___util_locate_window_3.208.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_locate_window___util_locate_window_3.208.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.208.0.tgz"; + sha512 = "iua1A2+P7JJEDHVgvXrRJSvsnzG7stYSGQnBVphIUlemwl6nN5D+QrgbjECtrbxRz8asYFHSzhdhECqN+tFiBg=="; + }; + } + { + name = "_aws_sdk_util_middleware___util_middleware_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_middleware___util_middleware_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-middleware/-/util-middleware-3.226.0.tgz"; + sha512 = "B96CQnwX4gRvQdaQkdUtqvDPkrptV5+va6FVeJOocU/DbSYMAScLxtR3peMS8cnlOT6nL1Eoa42OI9AfZz1VwQ=="; + }; + } + { + name = "_aws_sdk_util_retry___util_retry_3.229.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_retry___util_retry_3.229.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-retry/-/util-retry-3.229.0.tgz"; + sha512 = "0zKTqi0P1inD0LzIMuXRIYYQ/8c1lWMg/cfiqUcIAF1TpatlpZuN7umU0ierpBFud7S+zDgg0oemh+Nj8xliJw=="; + }; + } + { + name = "_aws_sdk_util_uri_escape___util_uri_escape_3.201.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_uri_escape___util_uri_escape_3.201.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-uri-escape/-/util-uri-escape-3.201.0.tgz"; + sha512 = "TeTWbGx4LU2c5rx0obHeDFeO9HvwYwQtMh1yniBz00pQb6Qt6YVOETVQikRZ+XRQwEyCg/dA375UplIpiy54mA=="; + }; + } + { + name = "_aws_sdk_util_user_agent_browser___util_user_agent_browser_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_user_agent_browser___util_user_agent_browser_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.226.0.tgz"; + sha512 = "PhBIu2h6sPJPcv2I7ELfFizdl5pNiL4LfxrasMCYXQkJvVnoXztHA1x+CQbXIdtZOIlpjC+6BjDcE0uhnpvfcA=="; + }; + } + { + name = "_aws_sdk_util_user_agent_node___util_user_agent_node_3.226.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_user_agent_node___util_user_agent_node_3.226.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.226.0.tgz"; + sha512 = "othPc5Dz/pkYkxH+nZPhc1Al0HndQT8zHD4e9h+EZ+8lkd8n+IsnLfTS/mSJWrfiC6UlNRVw55cItstmJyMe/A=="; + }; + } + { + name = "_aws_sdk_util_utf8_browser___util_utf8_browser_3.188.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_utf8_browser___util_utf8_browser_3.188.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.188.0.tgz"; + sha512 = "jt627x0+jE+Ydr9NwkFstg3cUvgWh56qdaqAMDsqgRlKD21md/6G226z/Qxl7lb1VEW2LlmCx43ai/37Qwcj2Q=="; + }; + } + { + name = "_aws_sdk_util_utf8_node___util_utf8_node_3.208.0.tgz"; + path = fetchurl { + name = "_aws_sdk_util_utf8_node___util_utf8_node_3.208.0.tgz"; + url = "https://registry.yarnpkg.com/@aws-sdk/util-utf8-node/-/util-utf8-node-3.208.0.tgz"; + sha512 = "jKY87Acv0yWBdFxx6bveagy5FYjz+dtV8IPT7ay1E2WPWH1czoIdMAkc8tSInK31T6CRnHWkLZ1qYwCbgRfERQ=="; + }; + } + { + name = "_babel_cli___cli_7.20.7.tgz"; + path = fetchurl { + name = "_babel_cli___cli_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/cli/-/cli-7.20.7.tgz"; + sha512 = "WylgcELHB66WwQqItxNILsMlaTd8/SO6SgTTjMp4uCI7P4QyH1r3nqgFmO3BfM4AtfniHgFMH3EpYFj/zynBkQ=="; }; } { @@ -34,19 +562,19 @@ }; } { - name = "_babel_core___core_7.20.5.tgz"; + name = "_babel_core___core_7.20.7.tgz"; path = fetchurl { - name = "_babel_core___core_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz"; - sha512 = "UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ=="; + name = "_babel_core___core_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz"; + sha512 = "t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw=="; }; } { - name = "_babel_generator___generator_7.20.5.tgz"; + name = "_babel_generator___generator_7.20.7.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz"; - sha512 = "jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA=="; + name = "_babel_generator___generator_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz"; + sha512 = "7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw=="; }; } { @@ -58,11 +586,11 @@ }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.0.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.7.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz"; - sha512 = "0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ=="; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz"; + sha512 = "4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ=="; }; } { @@ -98,11 +626,11 @@ }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.20.2.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.20.7.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.20.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz"; - sha512 = "zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA=="; + name = "_babel_helper_module_transforms___helper_module_transforms_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.7.tgz"; + sha512 = "FNdu7r67fqMUSVuQpFQGE6BPdhJIhitoxhGzDbAXNcA07uoVG37fOiMk3OSV8rEICuyG6t8LGkd9EE64qIEoIA=="; }; } { @@ -154,11 +682,11 @@ }; } { - name = "_babel_helpers___helpers_7.20.6.tgz"; + name = "_babel_helpers___helpers_7.20.7.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.20.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz"; - sha512 = "Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w=="; + name = "_babel_helpers___helpers_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz"; + sha512 = "PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA=="; }; } { @@ -170,19 +698,19 @@ }; } { - name = "_babel_node___node_7.20.5.tgz"; + name = "_babel_node___node_7.20.7.tgz"; path = fetchurl { - name = "_babel_node___node_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/node/-/node-7.20.5.tgz"; - sha512 = "ElSr40UtumWE4fYYF1xfLP2C6b9nfS/rswK7YYpLo9HDGEXGXEAWZaGCxIirxGIDyoV0rbl6jV1LyFMQ6ZOQSA=="; + name = "_babel_node___node_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/node/-/node-7.20.7.tgz"; + sha512 = "AQt3gVcP+fpFuoFn4FmIW/+5JovvEoA9og4Y1LrRw0pv3jkl4tujZMMy3X/3ugjLrEy3k1aNywo3JIl3g+jVXQ=="; }; } { - name = "_babel_parser___parser_7.20.5.tgz"; + name = "_babel_parser___parser_7.20.7.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz"; - sha512 = "r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA=="; + name = "_babel_parser___parser_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz"; + sha512 = "T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg=="; }; } { @@ -194,11 +722,11 @@ }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.19.0.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.20.7.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.19.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz"; - sha512 = "UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg=="; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.20.7.tgz"; + sha512 = "Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ=="; }; } { @@ -210,27 +738,27 @@ }; } { - name = "_babel_template___template_7.18.10.tgz"; + name = "_babel_template___template_7.20.7.tgz"; path = fetchurl { - name = "_babel_template___template_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz"; - sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; + name = "_babel_template___template_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz"; + sha512 = "8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw=="; }; } { - name = "_babel_traverse___traverse_7.20.5.tgz"; + name = "_babel_traverse___traverse_7.20.8.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz"; - sha512 = "WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ=="; + name = "_babel_traverse___traverse_7.20.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.8.tgz"; + sha512 = "/RNkaYDeCy4MjyV70+QkSHhxbvj2JO/5Ft2Pa880qJOG8tWrqcT/wXUuCCv43yogfqPzHL77Xu101KQPf4clnQ=="; }; } { - name = "_babel_types___types_7.20.5.tgz"; + name = "_babel_types___types_7.20.7.tgz"; path = fetchurl { - name = "_babel_types___types_7.20.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz"; - sha512 = "c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg=="; + name = "_babel_types___types_7.20.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz"; + sha512 = "69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg=="; }; } { @@ -282,11 +810,11 @@ }; } { - name = "_discordjs_rest___rest_1.4.0.tgz"; + name = "_discordjs_rest___rest_1.5.0.tgz"; path = fetchurl { - name = "_discordjs_rest___rest_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/@discordjs/rest/-/rest-1.4.0.tgz"; - sha512 = "k3Ip7ffFSAfp7Mu4H/3BEXFvFz+JsbXRrRtpeBMnSp1LefhtlZWJE6xdXzNlblktKNQltnRwY+z0NZrGQdxAMw=="; + name = "_discordjs_rest___rest_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/@discordjs/rest/-/rest-1.5.0.tgz"; + sha512 = "lXgNFqHnbmzp5u81W0+frdXN6Etf4EUi8FAPcWpSykKd8hmlWh1xy6BmE0bsJypU1pxohaA8lQCgp70NUI3uzA=="; }; } { @@ -410,19 +938,19 @@ }; } { - name = "_sapphire_shapeshift___shapeshift_3.7.1.tgz"; + name = "_sapphire_shapeshift___shapeshift_3.8.1.tgz"; path = fetchurl { - name = "_sapphire_shapeshift___shapeshift_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/@sapphire/shapeshift/-/shapeshift-3.7.1.tgz"; - sha512 = "JmYN/0GW49Vl8Hi4PwrsDBNjcuCylH78vWYolVys74LRIzilAAMINxx4RHQOdvYoz+ceJKVp4+zBbQ5kuIFOLw=="; + name = "_sapphire_shapeshift___shapeshift_3.8.1.tgz"; + url = "https://registry.yarnpkg.com/@sapphire/shapeshift/-/shapeshift-3.8.1.tgz"; + sha512 = "xG1oXXBhCjPKbxrRTlox9ddaZTvVpOhYLmKmApD/vIWOV1xEYXnpoFs68zHIZBGbqztq6FrUPNPerIrO1Hqeaw=="; }; } { - name = "_sapphire_snowflake___snowflake_3.2.2.tgz"; + name = "_sapphire_snowflake___snowflake_3.3.0.tgz"; path = fetchurl { - name = "_sapphire_snowflake___snowflake_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.2.2.tgz"; - sha512 = "ula2O0kpSZtX9rKXNeQMrHwNd7E4jPDJYUXmEGTFdMRfyfMw+FPyh04oKMjAiDuOi64bYgVkOV3MjK+loImFhQ=="; + name = "_sapphire_snowflake___snowflake_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.3.0.tgz"; + sha512 = "Hec5N6zEkZuZFLybVKyLFLlcSgYmR6C1/+9NkIhxPwOf6tgX52ndJCSz8ADejmbrNE0VuNCNkpzhRZzenEC9vA=="; }; } { @@ -490,19 +1018,19 @@ }; } { - name = "_types_node___node_18.11.9.tgz"; + name = "_types_node___node_18.11.17.tgz"; path = fetchurl { - name = "_types_node___node_18.11.9.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz"; - sha512 = "CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg=="; + name = "_types_node___node_18.11.17.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.17.tgz"; + sha512 = "HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng=="; }; } { - name = "_types_node___node_14.18.33.tgz"; + name = "_types_node___node_14.18.35.tgz"; path = fetchurl { - name = "_types_node___node_14.18.33.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.33.tgz"; - sha512 = "qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg=="; + name = "_types_node___node_14.18.35.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.35.tgz"; + sha512 = "2ATO8pfhG1kDvw4Lc4C0GXIMSQFFJBCo/R1fSgTwmUlq5oy95LXyjDQinsRVgQY6gp6ghh3H91wk9ES5/5C+Tw=="; }; } { @@ -1010,19 +1538,19 @@ }; } { - name = "acebase_core___acebase_core_1.24.0.tgz"; + name = "acebase_core___acebase_core_1.25.0.tgz"; path = fetchurl { - name = "acebase_core___acebase_core_1.24.0.tgz"; - url = "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.24.0.tgz"; - sha512 = "tHFVHJZDVVZSqXsuRvI/CMbcbQtulPHH/Ng6RRdfB+fPCk5tC+DrHa/X0nDfx4fzyQLVLFqp/sFErzowJwhHQw=="; + name = "acebase_core___acebase_core_1.25.0.tgz"; + url = "https://registry.yarnpkg.com/acebase-core/-/acebase-core-1.25.0.tgz"; + sha512 = "d7Bh0tcYYCcdKLYu7lDYPhDOIZQObUwGiMg4mcMfsdWWdlfQyQqQMLkYVRqVH1OdHHXEx/BoqtH1oHkEBqgRZg=="; }; } { - name = "acebase___acebase_1.26.2.tgz"; + name = "acebase___acebase_1.27.0.tgz"; path = fetchurl { - name = "acebase___acebase_1.26.2.tgz"; - url = "https://registry.yarnpkg.com/acebase/-/acebase-1.26.2.tgz"; - sha512 = "ClN81mYAkePS2v6ux4eXoFzOCJSA8H/rIIsbr3Qttnd/6/j6G8ooGqsxTqaWwYIdPYeAIaCJsyAqyB4Q59mUhA=="; + name = "acebase___acebase_1.27.0.tgz"; + url = "https://registry.yarnpkg.com/acebase/-/acebase-1.27.0.tgz"; + sha512 = "bnd8NhMrBg3jgbLRtMVRE9yahhSVm6mPGiwQis/gtpBORvJamlNbwQvv+xd6wA+K2SClvv23TkyLhBe7WLBqzA=="; }; } { @@ -2090,11 +2618,11 @@ }; } { - name = "bignumber.js___bignumber.js_9.1.0.tgz"; + name = "bignumber.js___bignumber.js_9.1.1.tgz"; path = fetchurl { - name = "bignumber.js___bignumber.js_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.0.tgz"; - sha512 = "4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A=="; + name = "bignumber.js___bignumber.js_9.1.1.tgz"; + url = "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.1.tgz"; + sha512 = "pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="; }; } { @@ -2193,6 +2721,14 @@ sha512 = "OvfN8y1oAxxphzkl2SnCS+ztV/uVKTATtgLjWYg/7KwcNyf3rzpHxNQJZCKtsZd4+MteKczhWbSjtEX4bGgU9g=="; }; } + { + name = "bowser___bowser_2.11.0.tgz"; + path = fetchurl { + name = "bowser___bowser_2.11.0.tgz"; + url = "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz"; + sha512 = "AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA=="; + }; + } { name = "brace_expansion___brace_expansion_1.1.11.tgz"; path = fetchurl { @@ -2442,11 +2978,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001434.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001434.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz"; - sha512 = "aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA=="; + name = "caniuse_lite___caniuse_lite_1.0.30001441.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz"; + sha512 = "OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg=="; }; } { @@ -3146,11 +3682,11 @@ }; } { - name = "dayjs___dayjs_1.11.6.tgz"; + name = "dayjs___dayjs_1.11.7.tgz"; path = fetchurl { - name = "dayjs___dayjs_1.11.6.tgz"; - url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.6.tgz"; - sha512 = "zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ=="; + name = "dayjs___dayjs_1.11.7.tgz"; + url = "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz"; + sha512 = "+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="; }; } { @@ -3194,19 +3730,19 @@ }; } { - name = "decimal.js___decimal.js_10.4.2.tgz"; + name = "decimal.js___decimal.js_10.4.3.tgz"; path = fetchurl { - name = "decimal.js___decimal.js_10.4.2.tgz"; - url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz"; - sha512 = "ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA=="; + name = "decimal.js___decimal.js_10.4.3.tgz"; + url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz"; + sha512 = "VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA=="; }; } { - name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + name = "decode_uri_component___decode_uri_component_0.2.2.tgz"; path = fetchurl { - name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha512 = "hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="; + name = "decode_uri_component___decode_uri_component_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz"; + sha512 = "FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="; }; } { @@ -3378,11 +3914,11 @@ }; } { - name = "discord_api_types___discord_api_types_0.37.20.tgz"; + name = "discord_api_types___discord_api_types_0.37.24.tgz"; path = fetchurl { - name = "discord_api_types___discord_api_types_0.37.20.tgz"; - url = "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.20.tgz"; - sha512 = "uAO+55E11rMkYR36/paE1vKN8c2bZa1mgrIaiQIBgIZRKZTDIGOZB+8I5eMRPFJcGxrg16riUu+0aTu2JQEPew=="; + name = "discord_api_types___discord_api_types_0.37.24.tgz"; + url = "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.24.tgz"; + sha512 = "1+Fb4huJCihdbkJLcq2p7nBmtlmAryNwjefT8wwJnL8c7bc7WA87Oaa5mbLe96QvZyfwnwRCDX40H0HhcVV50g=="; }; } { @@ -3570,11 +4106,11 @@ }; } { - name = "es_abstract___es_abstract_1.20.4.tgz"; + name = "es_abstract___es_abstract_1.20.5.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.20.4.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz"; - sha512 = "0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA=="; + name = "es_abstract___es_abstract_1.20.5.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.5.tgz"; + sha512 = "7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ=="; }; } { @@ -3881,6 +4417,14 @@ sha512 = "VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w=="; }; } + { + name = "fast_xml_parser___fast_xml_parser_4.0.11.tgz"; + path = fetchurl { + name = "fast_xml_parser___fast_xml_parser_4.0.11.tgz"; + url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.0.11.tgz"; + sha512 = "4aUg3aNRR/WjQAcpceODG1C3x3lFANXRo8+1biqfieHmg9pyMt7qB4lQV/Ta6sJCTbA5vfD8fnA8S54JATiFUA=="; + }; + } { name = "fast_xml_parser___fast_xml_parser_3.21.1.tgz"; path = fetchurl { @@ -4314,11 +4858,11 @@ }; } { - name = "gcp_metadata___gcp_metadata_5.0.1.tgz"; + name = "gcp_metadata___gcp_metadata_5.1.0.tgz"; path = fetchurl { - name = "gcp_metadata___gcp_metadata_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.0.1.tgz"; - sha512 = "jiRJ+Fk7e8FH68Z6TLaqwea307OktJpDjmYnU7/li6ziwvVvU2RlrCyQo5vkdeP94chm0kcSCOOszvmuaioq3g=="; + name = "gcp_metadata___gcp_metadata_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/gcp-metadata/-/gcp-metadata-5.1.0.tgz"; + sha512 = "QVjouEXvNVG/nde6VZDXXFTB02xQdztaumkWCHUff58qsdCS05/8OPh68fQ2QnArfAzZTwfEc979FHSHsU8EWg=="; }; } { @@ -4498,19 +5042,27 @@ }; } { - name = "googleapis_common___googleapis_common_6.0.3.tgz"; + name = "googleapis_common___googleapis_common_6.0.4.tgz"; path = fetchurl { - name = "googleapis_common___googleapis_common_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-6.0.3.tgz"; - sha512 = "Xyb4FsQ6PQDu4tAE/M/ev4yzZhFe2Gc7+rKmuCX2ZGk1ajBKbafsGlVYpmzGqQOT93BRDe8DiTmQb6YSkbICrA=="; + name = "googleapis_common___googleapis_common_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/googleapis-common/-/googleapis-common-6.0.4.tgz"; + sha512 = "m4ErxGE8unR1z0VajT6AYk3s6a9gIMM6EkDZfkPnES8joeOlEtFEJeF8IyZkb0tjPXkktUfYrE4b3Li1DNyOwA=="; }; } { - name = "googleapis___googleapis_109.0.1.tgz"; + name = "googleapis___googleapis_110.0.0.tgz"; path = fetchurl { - name = "googleapis___googleapis_109.0.1.tgz"; - url = "https://registry.yarnpkg.com/googleapis/-/googleapis-109.0.1.tgz"; - sha512 = "x286OtNu0ngzxfGz2XgRs4aMhrwutRCkCE12dh2M1jIZOpOndB7ELFXEhmtxaJ7z3257flKIbiiCJZeBO+ze/Q=="; + name = "googleapis___googleapis_110.0.0.tgz"; + url = "https://registry.yarnpkg.com/googleapis/-/googleapis-110.0.0.tgz"; + sha512 = "k6de3PGsdFEBULMiFwPYCKOBljDTDvHD3YGe/OFqe8Ot0lYQPL8QV1qjxjrPWiE/Ftf0Ar2v4DNES66jLfSO7w=="; + }; + } + { + name = "gopd___gopd_1.0.1.tgz"; + path = fetchurl { + name = "gopd___gopd_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz"; + sha512 = "d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="; }; } { @@ -5090,11 +5642,11 @@ }; } { - name = "internal_slot___internal_slot_1.0.3.tgz"; + name = "internal_slot___internal_slot_1.0.4.tgz"; path = fetchurl { - name = "internal_slot___internal_slot_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + name = "internal_slot___internal_slot_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz"; + sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; }; } { @@ -5842,11 +6394,11 @@ }; } { - name = "json5___json5_2.2.1.tgz"; + name = "json5___json5_2.2.2.tgz"; path = fetchurl { - name = "json5___json5_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + name = "json5___json5_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz"; + sha512 = "46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ=="; }; } { @@ -6209,14 +6761,6 @@ sha512 = "c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw=="; }; } - { - name = "lodash.uniqwith___lodash.uniqwith_4.5.0.tgz"; - path = fetchurl { - name = "lodash.uniqwith___lodash.uniqwith_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.uniqwith/-/lodash.uniqwith-4.5.0.tgz"; - sha512 = "7lYL8bLopMoy4CTICbxygAUq6CdRJ36vFc80DucPueUee+d5NBRxz3FdT9Pes/HEx5mPoT9jwnsEJWz1N7uq7Q=="; - }; - } { name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { @@ -6265,6 +6809,14 @@ sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; } + { + name = "lru_cache___lru_cache_5.1.1.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + } { name = "lru_cache___lru_cache_6.0.0.tgz"; path = fetchurl { @@ -6530,11 +7082,11 @@ }; } { - name = "minimatch___minimatch_5.1.0.tgz"; + name = "minimatch___minimatch_5.1.2.tgz"; path = fetchurl { - name = "minimatch___minimatch_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz"; - sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; + name = "minimatch___minimatch_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.2.tgz"; + sha512 = "bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg=="; }; } { @@ -6609,6 +7161,14 @@ sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; }; } + { + name = "minipass___minipass_4.0.0.tgz"; + path = fetchurl { + name = "minipass___minipass_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-4.0.0.tgz"; + sha512 = "g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw=="; + }; + } { name = "minizlib___minizlib_2.1.2.tgz"; path = fetchurl { @@ -6658,11 +7218,11 @@ }; } { - name = "moment_timezone___moment_timezone_0.5.39.tgz"; + name = "moment_timezone___moment_timezone_0.5.40.tgz"; path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.39.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.39.tgz"; - sha512 = "hoB6suq4ISDj7BDgctiOy6zljBsdYT0++0ZzZm9rtxIvJhIbQ3nmbgSWe7dNFGurl6/7b1OUkHlmN9JWgXVz7w=="; + name = "moment_timezone___moment_timezone_0.5.40.tgz"; + url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.40.tgz"; + sha512 = "tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg=="; }; } { @@ -6682,11 +7242,11 @@ }; } { - name = "mongodb___mongodb_4.9.1.tgz"; + name = "mongodb___mongodb_4.12.1.tgz"; path = fetchurl { - name = "mongodb___mongodb_4.9.1.tgz"; - url = "https://registry.yarnpkg.com/mongodb/-/mongodb-4.9.1.tgz"; - sha512 = "ZhgI/qBf84fD7sI4waZBoLBNJYPQN5IOC++SBCiPiyhzpNKOxN/fi0tBHvH2dEC42HXtNEbFB0zmNz4+oVtorQ=="; + name = "mongodb___mongodb_4.12.1.tgz"; + url = "https://registry.yarnpkg.com/mongodb/-/mongodb-4.12.1.tgz"; + sha512 = "koT87tecZmxPKtxRQD8hCKfn+ockEL2xBiUvx3isQGI6mFmagWt4f4AyCE9J4sKepnLhMacoCTQQA6SLAI2L6w=="; }; } { @@ -6922,11 +7482,11 @@ }; } { - name = "node_releases___node_releases_2.0.6.tgz"; + name = "node_releases___node_releases_2.0.8.tgz"; path = fetchurl { - name = "node_releases___node_releases_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz"; - sha512 = "PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="; + name = "node_releases___node_releases_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz"; + sha512 = "dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A=="; }; } { @@ -7866,11 +8426,11 @@ }; } { - name = "plivo___plivo_4.35.0.tgz"; + name = "plivo___plivo_4.36.0.tgz"; path = fetchurl { - name = "plivo___plivo_4.35.0.tgz"; - url = "https://registry.yarnpkg.com/plivo/-/plivo-4.35.0.tgz"; - sha512 = "E8GYcGWEUdUYEt+625UGPuUDXmlQQ/2MtwUt3OEy2DTaOhVbuZH8KC6O98Qq4sPsW3dRAgbYzeeBWGPRkmJ3xg=="; + name = "plivo___plivo_4.36.0.tgz"; + url = "https://registry.yarnpkg.com/plivo/-/plivo-4.36.0.tgz"; + sha512 = "jhd61SkiMXkWDZc+NFNqD5yheyQSl2dpdcLzpOx2u/ddUV1PX+nGwZ+gEp1wZ2B4V/l/qwVk8QHcXRN+VtT+Gg=="; }; } { @@ -8641,6 +9201,14 @@ sha512 = "1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ=="; }; } + { + name = "rxjs___rxjs_7.8.0.tgz"; + path = fetchurl { + name = "rxjs___rxjs_7.8.0.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz"; + sha512 = "F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg=="; + }; + } { name = "safe_buffer___safe_buffer_5.1.2.tgz"; path = fetchurl { @@ -9090,11 +9658,11 @@ }; } { - name = "sqlite3___sqlite3_5.1.2.tgz"; + name = "sqlite3___sqlite3_5.1.4.tgz"; path = fetchurl { - name = "sqlite3___sqlite3_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.2.tgz"; - sha512 = "D0Reg6pRWAFXFUnZKsszCI67tthFD8fGPewRddDCX6w4cYwz3MbvuwRICbL+YQjBAh9zbw+lJ/V9oC8nG5j6eg=="; + name = "sqlite3___sqlite3_5.1.4.tgz"; + url = "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.1.4.tgz"; + sha512 = "i0UlWAzPlzX3B5XP2cYuhWQJsTtlMD6obOa1PgeEQ4DHEXUuyJkgv50I3isqZAP5oFc2T8OFvakmDh2W6I+YpA=="; }; } { @@ -9442,19 +10010,19 @@ }; } { - name = "tar___tar_6.1.12.tgz"; + name = "tar___tar_6.1.13.tgz"; path = fetchurl { - name = "tar___tar_6.1.12.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz"; - sha512 = "jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw=="; + name = "tar___tar_6.1.13.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz"; + sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; }; } { - name = "telegram___telegram_2.14.7.tgz"; + name = "telegram___telegram_2.15.2.tgz"; path = fetchurl { - name = "telegram___telegram_2.14.7.tgz"; - url = "https://registry.yarnpkg.com/telegram/-/telegram-2.14.7.tgz"; - sha512 = "4qY+M4UHwb4xATCXpnMsBwJCMqETiH97jvnd6D8NnMbJlOC4Br049381xx3oHRc5ifTBxXuD64b7jgIR52rWtQ=="; + name = "telegram___telegram_2.15.2.tgz"; + url = "https://registry.yarnpkg.com/telegram/-/telegram-2.15.2.tgz"; + sha512 = "+/vmEImjDtkOEiiPyGThIyzBVgpCfDNz2suwXtl5z/b0xK6SWqV4edX3c1BZgK4/JrIyydrCAxLQpKlG61/uzw=="; }; } { @@ -9697,6 +10265,14 @@ sha512 = "zvHx3VM83m2WYCE8XL99uaM7mFwYSkjR2OZti98fabHrwkjsCvgwChda5xctein3xGOyaQhtTeDq/1H/GNvF3A=="; }; } + { + name = "tslib___tslib_1.14.1.tgz"; + path = fetchurl { + name = "tslib___tslib_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; + }; + } { name = "tslib___tslib_2.4.1.tgz"; path = fetchurl { @@ -9754,11 +10330,11 @@ }; } { - name = "twilio___twilio_3.83.3.tgz"; + name = "twilio___twilio_3.84.0.tgz"; path = fetchurl { - name = "twilio___twilio_3.83.3.tgz"; - url = "https://registry.yarnpkg.com/twilio/-/twilio-3.83.3.tgz"; - sha512 = "uyYPXUmKIvpq54DGcq0elT0t2PLhDSwD7svu18SabiFSD6rmouws8gr9CZRix45IYSnIxTmOSr3i4vWR74/hQw=="; + name = "twilio___twilio_3.84.0.tgz"; + url = "https://registry.yarnpkg.com/twilio/-/twilio-3.84.0.tgz"; + sha512 = "XL+RR1SdfGExC51cE22unM/r7lEFzfDYUA3FecHEe5cLF+LzxmZGB9O9BXfqZu/sZ5YlGeltJfMA5j3TRLzhLw=="; }; } { @@ -9890,11 +10466,11 @@ }; } { - name = "undici___undici_5.13.0.tgz"; + name = "undici___undici_5.14.0.tgz"; path = fetchurl { - name = "undici___undici_5.13.0.tgz"; - url = "https://registry.yarnpkg.com/undici/-/undici-5.13.0.tgz"; - sha512 = "UDZKtwb2k7KRsK4SdXWG7ErXiL7yTGgLWvk2AXO1JMjgjh404nFo6tWSCM2xMpJwMPx3J8i/vfqEh1zOqvj82Q=="; + name = "undici___undici_5.14.0.tgz"; + url = "https://registry.yarnpkg.com/undici/-/undici-5.14.0.tgz"; + sha512 = "yJlHYw6yXPPsuOH0x2Ib1Km61vu4hLiRRQoafs+WUgX1vO64vgnxiCEN9dpIrhZyHFsai3F0AEj4P9zy19enEQ=="; }; } { @@ -10105,6 +10681,14 @@ sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; } + { + name = "uuid___uuid_8.3.2.tgz"; + path = fetchurl { + name = "uuid___uuid_8.3.2.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz"; + sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; + }; + } { name = "uuid___uuid_9.0.0.tgz"; path = fetchurl { @@ -10617,6 +11201,14 @@ sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; }; } + { + name = "yallist___yallist_3.1.1.tgz"; + path = fetchurl { + name = "yallist___yallist_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + } { name = "yallist___yallist_4.0.0.tgz"; path = fetchurl { diff --git a/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix index a068ce7dc9..bf1ad3cfe4 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/mycli/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { sqlparse ]; - checkInputs = [ pytest glibcLocales ]; + nativeCheckInputs = [ pytest glibcLocales ]; checkPhase = '' export HOME=. diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix index d5c6932c44..0d0b63711d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix @@ -97,7 +97,7 @@ let version = "4.1.5"; src = oldAttrs.src.override { inherit version; - sha256 = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM="; + hash = "sha256-98jKcHDv/+mls7QVWeGvGcmoYOGCspxM7w5/2RjJxoM="; }; propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ final.pythonPackages.flask_mail diff --git a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix index efdfae8268..99eedf9991 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JVxlfwCA+EetV4QYB6uEKe1yWt3sCvMPZwyIr6Td7Bw="; + sha256 = "sha256-PTUATmnpJGeY0Ushf7sAapsZ51VC2IdnKMzYJX5+h9A="; }; - cargoSha256 = "sha256-uUxwQIQTzQkKgR4F4sf4J1G2LaXiGbIvA6VM55zLK2E="; + cargoHash = "sha256-jxGdozSEIop2jBL4lK3ZcEuuR7P8qDoQD/Lrl4yaBN0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix index b492c8901a..c27cbcb35d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,60 +1,60 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.49.0"; + version = "3.53.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.49.0-linux-x64.tar.gz"; - sha256 = "1wz24hhxjhyl0gsv166k0661gckc4xzpgxns99vsd2hgrj0ccsnr"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.53.1-linux-x64.tar.gz"; + sha256 = "1fayslha6815y1jl9w9c2igd8hpc8z0wsw9nssjp545lpqq5c3d1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-amd64.tar.gz"; - sha256 = "0g3s60yscxrwzbq40zii0mnh2z9yggz0wc2kg9yrfzybrmsmx8z3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-linux-amd64.tar.gz"; + sha256 = "0c5rw7nk9sw2mcccq0a9apy0rfsd14jkg6wqivf0vc0c5frwhgqi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-linux-amd64.tar.gz"; - sha256 = "0yprg3mgb7zik6s2hhh1jj7kyic9ihipr698vspgdjxa3ya4nvij"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.1.0-linux-amd64.tar.gz"; + sha256 = "1x0vv5b61achyysm5inffi9dh2nry7qkr62iqjml4n7qb9f3dcxd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-linux-amd64.tar.gz"; - sha256 = "1hbjni74gqyfsp4amn1mimz53v89fhrmpq3aa46a6mgvv47215ks"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.29.0-linux-amd64.tar.gz"; + sha256 = "1ldizdak0x139sz4h0f7xbfiycywdi386a0gjgmxwm3fjnpkr0hh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.9.0-linux-amd64.tar.gz"; - sha256 = "15qs31vpip7dbzmhaa2rh6439qdd9b88dblkilwr3rypwiwdsdvy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-linux-amd64.tar.gz"; + sha256 = "0vis19vj9xj8hrx4a3a6d50ixhkldb2fzg0nkh4azad69pj0jjjl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-linux-amd64.tar.gz"; - sha256 = "1rp0kdsrljlyzp58zrzvs8ifygrlz3qz6wqi1cxmf482gn1ck3xg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-linux-amd64.tar.gz"; + sha256 = "01zjsw7f9r2andc6am09qhs2gy9189i3bvkdyxmv6bkh7907z8pg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.23.0-linux-amd64.tar.gz"; - sha256 = "05w5ryi3wsqnnsswpjd2x0dsfaqcd7wx32q67p8p8gh49r3xayhb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.28.0-linux-amd64.tar.gz"; + sha256 = "1xk7a0ivmhjxscb275yilg4wxypsmrpfafws6ab49ibyrg06j7z3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.27.0-linux-amd64.tar.gz"; - sha256 = "1n7i5y7baxb7wlr16z664ykd9v3rjm0c0ds5fa8zjqg198hi5lkm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-linux-amd64.tar.gz"; + sha256 = "1chrpjsbracndk4mfcck3shvjk4s82x6wlb71q9vrmijw1kll5ac"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.32.0-linux-amd64.tar.gz"; - sha256 = "1fah3b9xp14qmwywnd08j1hmpcqjnyhzv9qwvsn5pxgdl9k6kk5c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.34.0-linux-amd64.tar.gz"; + sha256 = "0i3w5rzgkdy9qz12h0l6hhm9hdg0k8vkrv15fvr8k0vvfmk898kc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-amd64.tar.gz"; - sha256 = "12sxvvjzf9761cag1kah7sdvjg98mi05jrfy0g06xf7lghlyxpcr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-linux-amd64.tar.gz"; + sha256 = "13fffl50is67mzgj9910a7zw2mhq9k53qbdwsj1g5j4jq8r2p0xs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.13.0-linux-amd64.tar.gz"; - sha256 = "10ssqnd4njspvj9s8450hiiya9p6pkxpvhlzk6fws1mc3x6w8hdv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-linux-amd64.tar.gz"; + sha256 = "0rx4324vibzklg5gldphfdkc42fafshqkw9ifxr5qf0yxlfffj62"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-linux-amd64.tar.gz"; sha256 = "1nk8aprac0bcw5lx75plwg07hlx1jmbbscima0j5g36gkw6lhln2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.12.0-linux-amd64.tar.gz"; - sha256 = "0nzk6qw2wmab39441sx1fs0ywhy41c118i9sbvqr1rn7rgd1p956"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-linux-amd64.tar.gz"; + sha256 = "0cyrrxd2iyrf8zbvn46vbi6ayg93l284y66lwcggdqh3snj3gc7y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-linux-amd64.tar.gz"; @@ -69,16 +69,16 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.1.0-linux-amd64.tar.gz"; - sha256 = "1w8sclkkzaj88kzx3g4lxg490v5hawv68j6y7a10a11v69qjv6lb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.0.0-linux-amd64.tar.gz"; + sha256 = "15mygp5kbj3z868dfz3w00srm88qn6i38dgfsclhs2flj9h989wh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.45.0-linux-amd64.tar.gz"; - sha256 = "1p9jkanm30wvqhy19dl4qm89xyldks2a8dvxpbpm1nqn1ilppicy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.48.0-linux-amd64.tar.gz"; + sha256 = "0jvq074a2nycn5b146zc7c08h1b9rvjnfdhc78jjs69knbxinnkr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.1.0-linux-amd64.tar.gz"; - sha256 = "02qlpxndk8p5slpvn2cq7mkj8k8w5zwn5n66cbnb6rh5c43jcwx5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-linux-amd64.tar.gz"; + sha256 = "0yx03k6pipcyxa2ibmyq4a7kpsiy1j3ycfzg8ijdww6i2sh9z5z4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-linux-amd64.tar.gz"; @@ -89,20 +89,20 @@ sha256 = "1mm6b8pik79axixyca6vi1vcmwcwpksli3pf26a7q3cxn7qlillb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-linux-amd64.tar.gz"; - sha256 = "09i6lh9wfsfpa5jkj2nb80f3gvmpg3m3flfgfcc794khlrikqmib"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-linux-amd64.tar.gz"; + sha256 = "113yrv1yr0lzwslayhzhsyrrfk3vrddicbbbd0fs56pgks2r66ik"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.0-linux-amd64.tar.gz"; - sha256 = "04akrli4cg21w3rhsj7vsgjhn5saal0ikk5jbdw58d4bc28vicji"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-linux-amd64.tar.gz"; + sha256 = "1xx1i59c08p2vkclq5z5brlzp6hyk7qyi09xvx49159gqidzxlv7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-amd64.tar.gz"; sha256 = "0cndpj0fiqy90sv6r5zvd2kcs5xbk84w8619lwgi0n03isylilc0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-linux-amd64.tar.gz"; - sha256 = "01lvr1zzm0xl5larfz44wfxssi2k5kh6mn8mpif89vj0s3z0zxyq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-amd64.tar.gz"; + sha256 = "02ma55cxc8hhcc9lybaz4dn7842jmq5cf01wyjd1xnrchzcska1q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-linux-amd64.tar.gz"; @@ -117,32 +117,32 @@ sha256 = "1cdz32s7bfri7n81gviyg3gh1l6pz95fp6alwrsn797adl3qq3s7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-linux-amd64.tar.gz"; - sha256 = "0vxspn9rjb928ax4755086kil6j3616ga5zn3d6xrwm9cvmal0kb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.10.0-linux-amd64.tar.gz"; + sha256 = "1fhynzw38l7agc4wm8c92n7ig3gnl7gskzq697hq8dk4r7xl2179"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-linux-amd64.tar.gz"; - sha256 = "1i43wmldn3q0jshfa07rldbn7rhyg5r536dzwnfmp47dvk6jhzyl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-linux-amd64.tar.gz"; + sha256 = "1nxa130a46icjqd7vr466klg445xl3611185vn7s4h7vcm2h30s9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-amd64.tar.gz"; - sha256 = "0rdvz6ibk41dhyfsqblfj56ib5hrr6vsx0z9kgzz5qamyjd1580h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.23.0-linux-amd64.tar.gz"; + sha256 = "111pddfcqr20g4dnq4jbks9ds04admywp3sj09yx44ld36psj2rl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-linux-amd64.tar.gz"; - sha256 = "1xf1xikal6fp381pxb7xnq37vx3ica81452xckgpsdn0b2dybxlz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-linux-amd64.tar.gz"; + sha256 = "08ydgbcssw7v58j24a2km15ww2hdkvmz27013iabig22c88is0w1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-linux-amd64.tar.gz"; - sha256 = "08wlq27x0ca3x0k9aw9cbpm43f0mn4xsgpxyzfyvbn1hjmcbf388"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-linux-amd64.tar.gz"; + sha256 = "1x0s7k6wplami10qfk8i4qf5cqfzn3pa601yn30hhq0k16g5vm65"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.1-linux-amd64.tar.gz"; - sha256 = "1yq72jgvarbh754a1ym9b8jk40jmk25ly78cw2wj31a96rxv1qp9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.8.0-linux-amd64.tar.gz"; + sha256 = "0ay5rlvp17jbjkf8ig6k6i35cy0rgg8gng77ldh83r6cjca15l5v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.2-linux-amd64.tar.gz"; - sha256 = "1y05aaj5nw5aqg7bv3sn4hkiq7d5grnsh4dw5v6yr3s564hl0lbl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-linux-amd64.tar.gz"; + sha256 = "1k9q3b06fy61bvfgr76f22v7q0qaxrb8msm25k77h0x9di48mn1c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-linux-amd64.tar.gz"; @@ -163,56 +163,56 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.49.0-darwin-x64.tar.gz"; - sha256 = "1sp4q9n2kfiw3sj30k6kcya6jvj52bjim6dy0bz7z23ibrn50psm"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.53.1-darwin-x64.tar.gz"; + sha256 = "18v8zhd4yck5s71s00plkdja54fjg82xcx8rkg79jyhvqj3ll2hr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-amd64.tar.gz"; - sha256 = "0f62xfma1d299625ydj3f95anz47l41dyasq9vpvsi1cqii6h4a1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-darwin-amd64.tar.gz"; + sha256 = "1l26w106lrhy3gn3x1x3hc8gackxzm7ipvx37vqxmb2xhraq952z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-darwin-amd64.tar.gz"; - sha256 = "08d4d4rnqdx2c18ji6lm5bflskxfh7r918hickpyg3bvswgmg7kg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.1.0-darwin-amd64.tar.gz"; + sha256 = "1p06n6g4a6mhlfkw38v3xdbci40y4yhin61bw32nqyfg9j1gj87l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-darwin-amd64.tar.gz"; - sha256 = "127b62pznybyp4scv1avwpw4ni540496yki0h0k4blm5gnrvr600"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.29.0-darwin-amd64.tar.gz"; + sha256 = "13rnilz34bnlggc4gxkl0pw38j8h45ndbgxjljzr8szwm4q8kssm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.9.0-darwin-amd64.tar.gz"; - sha256 = "1iw5xzgyfjr6j9dmhvmbnfhw8q4x94af5jb3jzzhbfjnsrbricwb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-darwin-amd64.tar.gz"; + sha256 = "1jlzny3wns6rr4h620m5wp11fn4v8ycpg8kizpqyl2iccsxxmva0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-darwin-amd64.tar.gz"; - sha256 = "1ss0si046ikx60l94121vfd80h2axcbddiak3pnwq3cikabyw8r7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-darwin-amd64.tar.gz"; + sha256 = "0ypm2xknhz09cmzj57d5r8axn4jscb8r8z9sqx88y3fsh14s3j6d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.23.0-darwin-amd64.tar.gz"; - sha256 = "16vkcr4iilv4lz0sz9hsj9s6yp7lvkaivx8890xs3ckkhqpi778f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.28.0-darwin-amd64.tar.gz"; + sha256 = "0vy36yyms38d1vqj9fh4zrb9l0hpsdwjazfx7995v4wjkhyiczfg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.27.0-darwin-amd64.tar.gz"; - sha256 = "002f5gbjrmhkrvj73r7fv3ccfflfry143mp9rcf9rwhmsfgz5r2f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-darwin-amd64.tar.gz"; + sha256 = "0q14jp0n42m53lhcvl2j7klzgq0s085nhgvcpi85kn9j0gn58n9v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.32.0-darwin-amd64.tar.gz"; - sha256 = "0rymhyr4a16s0xsw07g45mslfsq2l1rav27vlp8b4k1kshja2g13"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.34.0-darwin-amd64.tar.gz"; + sha256 = "1g1bf25d240rfr25v1d6srsfqfxgm9dmzpaf29dipd5ym4cy5v87"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-amd64.tar.gz"; - sha256 = "026i7hxa80b7mipw792anv1wplmz2w23irfy26bsh77an36hk46y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-darwin-amd64.tar.gz"; + sha256 = "0f7v1x363gr46q3ls90zq79wzbg2qwgcbrj2203g9pzly6x399p9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.13.0-darwin-amd64.tar.gz"; - sha256 = "1nhgf3qwvhxl2akl3y7spwirb34cbch7fvz5rjbb0f8680r59sd3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-darwin-amd64.tar.gz"; + sha256 = "0kn3hzaycks3w2b1sbc0yzw4xis3gh6pgzmarc8zmdnlnlhzw7my"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-darwin-amd64.tar.gz"; sha256 = "0jh6v9skyxf4ljiqc5070c1r8gkgaic6wy7w7264c1xfrnwsy31g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.12.0-darwin-amd64.tar.gz"; - sha256 = "107dk7vn5i61pwf57538ih5liqb3w22q34rs2rrvw41gifyk83wg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-darwin-amd64.tar.gz"; + sha256 = "1dz6vi3c067f51p3ya43hahc82w9r3ywhxdxmbnjc1sk7py1pbi4"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-darwin-amd64.tar.gz"; @@ -227,16 +227,16 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.1.0-darwin-amd64.tar.gz"; - sha256 = "015wqmygcagx3abwwisf5iyi6xaakw2wxs2nc4clis9q0g6dnw3y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.0.0-darwin-amd64.tar.gz"; + sha256 = "0dzxv7qkk68bxw9p5xbmb40sqqnbf8dckpk352f5802x78wxhaf5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.45.0-darwin-amd64.tar.gz"; - sha256 = "0jdjfzc5abl01z8n07vcb3vk82x87rhpmkrk9ra7i57p8f5rhyfr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.48.0-darwin-amd64.tar.gz"; + sha256 = "04y1a4w9ki6fil6jxb7ljarf9hcjkavhw9wla1pz403y6wyvrp5r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.1.0-darwin-amd64.tar.gz"; - sha256 = "03a3lbmr737aql53wjavbh474g4cwxil6dvs47d71akp9mbn38f6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-darwin-amd64.tar.gz"; + sha256 = "1ivwh2wbhg9fl678292zx1vbb0l4kgnp8xxlx6zkx4gjs24fmls1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-darwin-amd64.tar.gz"; @@ -247,20 +247,20 @@ sha256 = "1cbvk8xxsgg0hzw1kc6f0mn77ws3aw1zrvmx67mgjjab2ljz6aks"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-darwin-amd64.tar.gz"; - sha256 = "1jp9cfw8jj1wms73b5d1xhkmnylly061fxilxzvnpd49glam7da6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-darwin-amd64.tar.gz"; + sha256 = "069hl04cwjvd9hy6sm2wv225r1fmmf7z04p8qiy6kmck588c19lx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.0-darwin-amd64.tar.gz"; - sha256 = "08a135hg0xkfcx9dvfgxxyl2gp87aybq3np53ni85rwbja297zqn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-darwin-amd64.tar.gz"; + sha256 = "1sgfc3f5h82zlqbgl29p9jffr125yypfh6hjfnpqjpy25mlxcpz8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-amd64.tar.gz"; sha256 = "1vl28h3vjxlcl86s8c74qx34wfxwx5rc0ba26zjjv0q91pklmlh8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-darwin-amd64.tar.gz"; - sha256 = "1ga3gb8b7ik070gah73jwjd9l26rfzk2a0a5zdxw0jf7qlmwirf6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-amd64.tar.gz"; + sha256 = "07sav5r6z3xlx953jyv3b3wq7q6nv3sbh44fx753yqfh7ahagpn5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-darwin-amd64.tar.gz"; @@ -275,32 +275,32 @@ sha256 = "1p79wp1sk5ka9xisjmmrv9s7aw6dghp22lkiz15vzrqwifm6nxmb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-darwin-amd64.tar.gz"; - sha256 = "0086l2ch5wdhdilwipln9clq09lnj2njgpp2wn8mxvd69xjccsz0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.10.0-darwin-amd64.tar.gz"; + sha256 = "15gpjmak6xp3fwa6rp3whl0aah7m1fmdvpy9icnjxagmd4ixpf1r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-darwin-amd64.tar.gz"; - sha256 = "1a7mq8qw17g4f6zfgdnym77q7j8dc1iigxcwmnz46d07mjq34d0h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-darwin-amd64.tar.gz"; + sha256 = "0is852yq285vs2n79qdq20jn9y0f981a622gfq8c0l7hkjqc97dz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-amd64.tar.gz"; - sha256 = "1p27dsar8jl7krqz2vrzics45g8s85l4xx3216207x2hq7qbdfb5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.23.0-darwin-amd64.tar.gz"; + sha256 = "07c986zq340iil42kd46yd7hijffq6kyyv83chr3k6bjj5kki1wx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-darwin-amd64.tar.gz"; - sha256 = "08nr4qwilg4l3rrjndpr5r9k7fccdqlfzgh0i2np7hk3d5g5nar7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-darwin-amd64.tar.gz"; + sha256 = "01qxkbfqyyqmqcz7h4vn779ncc9p72q6b77lyyijrav1s9jbd54s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-darwin-amd64.tar.gz"; - sha256 = "1f1wfj5vwa13d5rz2kfg9p3l12p0nl6vgyc6wiad2j5cmk9rmzd8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-darwin-amd64.tar.gz"; + sha256 = "0mg35il3xdr43y5fq7420dal7a2nmg542v7njm71m98rdw2jlnnq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.1-darwin-amd64.tar.gz"; - sha256 = "0g1kh5zkkr9m1k5qmmmkay089j0yqbz9qap6k7gii1k601mm09sf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.8.0-darwin-amd64.tar.gz"; + sha256 = "1nywayf1c6amhjik0091fdxmr74b5pp4pcpxpnqwss04q7l7qcz3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.2-darwin-amd64.tar.gz"; - sha256 = "1pxvsxk0w4q9fqrf3q4a93ah4plhwsdwy9sapwwmh2nld489y5ld"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-darwin-amd64.tar.gz"; + sha256 = "0j7ydd39gp86srlk3319hniy9wikjyp4zc0gnxxq641dddnpscdw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-darwin-amd64.tar.gz"; @@ -321,56 +321,56 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.49.0-linux-arm64.tar.gz"; - sha256 = "1jrn74dp61kv4dppf0aav4fwjc9nzyhn8xss1z5l6xklls4sm7gv"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.53.1-linux-arm64.tar.gz"; + sha256 = "1937vk1k9iwlb2hn020grzlzzks0y94v0y20xz85f9ydnj14wp3l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-arm64.tar.gz"; - sha256 = "10gmwqfhvz1yp0ld69w01fmjnfw907pa0pmzjndm3p9fwqjrr2nd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-linux-arm64.tar.gz"; + sha256 = "0a0gy3im1ymjqn1pfc1ds8rikp0zsn3msc7g3zrvqlqkypih5fmy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-linux-arm64.tar.gz"; - sha256 = "014rlaw7acyz2rsmnv2mq9as6z9c9aa4s03qbfkk95sqyf6xvlqc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.1.0-linux-arm64.tar.gz"; + sha256 = "0scpn0mz4ljqwb473j1xk39z0cmjv87lmnd3s9fm5rijqcinjw6y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-linux-arm64.tar.gz"; - sha256 = "1qrg5sq8fqyn9vq92xmdx0pql7hy4dhha3lxjp5ka386bf6jmamc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.29.0-linux-arm64.tar.gz"; + sha256 = "059wgdaj1k87r9lrh60jhdyh5q10li72q9jshw4bid57l78gpfxz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.9.0-linux-arm64.tar.gz"; - sha256 = "1yqqnc03hv79l1px8qxppwf8n3shdcd8jd46q1xm9f9fm7bkxd9i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-linux-arm64.tar.gz"; + sha256 = "1wviw5iijiq7666kx0c51ka32qv6cr4l2mbmpfg4mp8yq5hlz7cc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-linux-arm64.tar.gz"; - sha256 = "1r8rq9m2rayylspz38x8wqj7d9nlks3ynr5ifdiqf10a5xchcw96"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-linux-arm64.tar.gz"; + sha256 = "0m773l7289rqpkyzmfbdsg4v6m531p8mp4mjhr6px5amii7875qz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.23.0-linux-arm64.tar.gz"; - sha256 = "105dz76dx9zscmhsb02iykj98lrbjavlkl65a6885crjvr48dwg5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.28.0-linux-arm64.tar.gz"; + sha256 = "0dwn1v64lsqnx7l0fx6lk719d11ykqv61maiwk144w3fi5ijdpv2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.27.0-linux-arm64.tar.gz"; - sha256 = "0jjvmsaa3g6mf905d6sv3rgl78vylvpmbb9pzx1ymyainx8pd1df"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-linux-arm64.tar.gz"; + sha256 = "0ma2n41nz916qr5l2nbmc4h9bz90fk6p9gnqqk5pzgwqxvw55jlh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.32.0-linux-arm64.tar.gz"; - sha256 = "1fyhmcmnzbghhj8q0p4zsfqh69g9arfwgipakq5qrcmcpw9kij6f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.34.0-linux-arm64.tar.gz"; + sha256 = "1pyzmfg0k58l409wflx78ngpvspj5b38pi9janvh7xcajkcj4mfb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-arm64.tar.gz"; - sha256 = "1bxrh89hkw9b0g20d4apwhswl1dxb4v4nn5rkkkjd91ykin5idp2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-linux-arm64.tar.gz"; + sha256 = "1m1f2fn5y7ybhzds5hlp545pxk3p1mli7vadr95227bws88fnzcl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.13.0-linux-arm64.tar.gz"; - sha256 = "0fzgwyqn55n4x6v36dzjvkw4xj4z27vpzm70bfnc5b0arq67hddl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-linux-arm64.tar.gz"; + sha256 = "1rvpvdf7mcxqc0srp2dkca1nmwnbjvzmpfg6lbg0yxpk6ajxmjll"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-linux-arm64.tar.gz"; sha256 = "1hd08gd2v3wl81amvcf821vzmmh7agw8cspnl6fqc7g69agn1l12"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.12.0-linux-arm64.tar.gz"; - sha256 = "09igkbcxpvblbcwcg1p35z6n5nnrlwmk1q9b0xmikrh5sagayrxy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-linux-arm64.tar.gz"; + sha256 = "14qpxps76y1jc995l9h1m3nwbkna0fsa6hm32m11qw9c4clk7npd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-linux-arm64.tar.gz"; @@ -385,16 +385,16 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.1.0-linux-arm64.tar.gz"; - sha256 = "1j4qp9pf9iy7hzq5pvj2ysk149s5012bi03il2qz3qcz2ga983p7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.0.0-linux-arm64.tar.gz"; + sha256 = "1ad76i2avaaxfhq5bvhdmp3wy2c0zs959i3i1hsda2qdw5c91rjr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.45.0-linux-arm64.tar.gz"; - sha256 = "1vrr17vc0n0f60w898c9s77car0yq39srhh0xb23lpi2v37ina8m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.48.0-linux-arm64.tar.gz"; + sha256 = "13n58572khs758wb091vj3nkrix2kdvjnxkaqwl2ssz669mzys9r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.1.0-linux-arm64.tar.gz"; - sha256 = "1zpqpja1264w5gvr20g15vccdv44rc8mcair0w78gx32anxnxwfy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-linux-arm64.tar.gz"; + sha256 = "0pxlcmkrbvdni46kml02vqx22syzdp512zb1cvagnnlkdb00azdg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-linux-arm64.tar.gz"; @@ -405,20 +405,20 @@ sha256 = "16q5kspbl882sa115lfcb8h8sx1i6lhm14xyzsfkmhznqny3lbv8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-linux-arm64.tar.gz"; - sha256 = "0gis39k5kgdxl0i4afy78hkcmwpzm1shh4x713p7dg6h8w0afdmi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-linux-arm64.tar.gz"; + sha256 = "0b8zaqcmlbdl5p38xjk0j7pgd6cy5mf1wc25g6rxflbikx9k43v9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.0-linux-arm64.tar.gz"; - sha256 = "1w43js5nxzwah046y54a1h72cqz6n701sns8zppssgzidr2cqvjv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-linux-arm64.tar.gz"; + sha256 = "1cv9y65n4fh3308r2y61n7k6h5531kk9a14qfbix1dmiv9zkg2jc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-arm64.tar.gz"; sha256 = "1wkswrjh31m8smlwwl50n7z4pfg7gs0lkis2bqiwlyma2zqdqggr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-linux-arm64.tar.gz"; - sha256 = "0s2qma2cl69ghvkjapvsgfrry6c1icbm6rxglqfdg6da1lrabx40"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-linux-arm64.tar.gz"; + sha256 = "0073vppvkfqz02jwanycy49ria8in7bpikhkqjz84imrprj9l9ic"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-linux-arm64.tar.gz"; @@ -433,32 +433,32 @@ sha256 = "1knyj2djz077c38kls5gyjn0v83qif8qddgji488mr8k8nf4k6lg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-linux-arm64.tar.gz"; - sha256 = "1djc9ar4x6rmi49grl4nxhycc2fbfvk9h1g2xnzl67adxh2cbgj9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.10.0-linux-arm64.tar.gz"; + sha256 = "08j20ikmfdlgwcrv9csb3fj36cvay0s90yzv0r7p2ma22ganvznj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-linux-arm64.tar.gz"; - sha256 = "0rwvp6v00iybqlnf52n3a1afvpvr3vvvsxql9jsv4n2wxn4w1bhb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-linux-arm64.tar.gz"; + sha256 = "0r7zm66p47f0b0f3x219s36mvinwij8jyjqi5jafbvzbrmwfrnmk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-linux-arm64.tar.gz"; - sha256 = "0nn7xj38injiwla8vss4nj25r53ddj0p0mplwqrk1r92l2vcihix"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.23.0-linux-arm64.tar.gz"; + sha256 = "07g8c67mrk2c6zps9d1751y6clb1p883dv6yq5rn2ladsmxh9bxp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-linux-arm64.tar.gz"; - sha256 = "0p82fkch37zr53vl6wk2i1c8aplv8nk5hypjgzhjcg64a7ahlsv3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-linux-arm64.tar.gz"; + sha256 = "0bj92iyhsc62dlr6nx93h3wqf0d2rb7bqlwy52lyrmww2cv4wvw6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-linux-arm64.tar.gz"; - sha256 = "0d82rsr1aqkpvv0vaz3d11dwqnyww2na0vx7dqjxw5zf34z78h87"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-linux-arm64.tar.gz"; + sha256 = "05xhgy6n4msxvi72a898g4bas7aqxdvj5a4vf1mjf80f55m8hc8k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.1-linux-arm64.tar.gz"; - sha256 = "11n751m4z2gjslvf28xazhq123yfqyyhshni97ad5ki23i1v785l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.8.0-linux-arm64.tar.gz"; + sha256 = "1r8d77mamkzdaq2c9gqbvywfaa7z5wsbaxpimsd3sdkr8x49j753"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.2-linux-arm64.tar.gz"; - sha256 = "0h80hzx69bl61zbh25lqjsjvffc2b7l1nf6dlny5vnb4yk17wfxi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-linux-arm64.tar.gz"; + sha256 = "1vrshbjdvn01jm38dq91v38q1m30nvx8siyk2ppx5b3zp5kgdlfl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-linux-arm64.tar.gz"; @@ -479,56 +479,56 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.49.0-darwin-arm64.tar.gz"; - sha256 = "0ykpgk3ngczzyv8vnwya937p51q463xm0pr69vdannc8jpn7w7ds"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.53.1-darwin-arm64.tar.gz"; + sha256 = "09b0kk8fmydpc65ysh9drc5ci5pg6md221j45bl9x1011389l9pr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-arm64.tar.gz"; - sha256 = "1v6dwsjbqmg9qnlhf5jl98r5c171xnsp3fnyfkg2h8874scg2gpp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.5.0-darwin-arm64.tar.gz"; + sha256 = "1g8adp2q0r4fvaahyx0jqgqvp972h1kjzxrvlfw5012z76qnar47"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.1.1-darwin-arm64.tar.gz"; - sha256 = "19l5b3grxf0ckxpmjn7x8158bkzv8329adj7m4gi09d9sx6wwsxw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v4.1.0-darwin-arm64.tar.gz"; + sha256 = "0xqwgc89wgfz8sd0yl6w2qqxlb2hraqdap162sa7gafz6hydfjdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.28.0-darwin-arm64.tar.gz"; - sha256 = "10wjnyrwrmg1qjsqlizf9g85wadss3nxmdsh87cjvdbkfb3crp3b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.29.0-darwin-arm64.tar.gz"; + sha256 = "1lrb07xzvm2qzrc463pxm18gpn0ql5ww2gc9wkk4l10qf59blij0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.9.0-darwin-arm64.tar.gz"; - sha256 = "0g882459cqbxcl9ml7mdc4s4xx6kg7srk56n0x7ypj3k0j7hjbd0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.11.0-darwin-arm64.tar.gz"; + sha256 = "1giprh33bxkvm3kb0c8hw9kxrjvrsjvvh3l8rq15iv8s11zzmq6l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-darwin-arm64.tar.gz"; - sha256 = "0dvcbni3s6gpcizgdilsjnks7z3srvdmzqlcdd61dzv0j5jkfshp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.15.0-darwin-arm64.tar.gz"; + sha256 = "02v0p3ksv0rlz1fk216fr1q3smnxw3fvzpbd9bichsmp8hids4gq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.23.0-darwin-arm64.tar.gz"; - sha256 = "096hmgpfx5hq8m4b7m3zxym2szvrdyhy041wqg6v5rzhhm23ra6n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.28.0-darwin-arm64.tar.gz"; + sha256 = "0hbq6gfrl6i3hsqizdhab86w38dr79lgq5q85y8z2dqwpk9vqbdi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.27.0-darwin-arm64.tar.gz"; - sha256 = "015s2sskdgifx22p66zzga3qzsqvh87anfb9429akm4h8wflz3rn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.32.0-darwin-arm64.tar.gz"; + sha256 = "00afm28jahxf631sf40vk8fdhsh7v0bdh0bhw3ivhy9hzrkzvww5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.32.0-darwin-arm64.tar.gz"; - sha256 = "1zagcsbn1blja0g8yk5bp7l20dhrpg8f84q2xck1py7yi0dgb8si"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.34.0-darwin-arm64.tar.gz"; + sha256 = "0lysjbslc5cxybwgjhrm8rjnbqmnjb5ncsl9k1p3wkv7bmawkyvz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-arm64.tar.gz"; - sha256 = "030fyfj5yd4p0f7ffwdsqvkjwxihz96vgy2qqibhyyv3p6ymdpym"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.6.0-darwin-arm64.tar.gz"; + sha256 = "01jcrbvhyapbzhm1z4gbpi38vah69inx70mr96mmsfmn7zs95l0p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.13.0-darwin-arm64.tar.gz"; - sha256 = "0qy88ngn3z716r2rjramgj11fggh86zcpcx0cfldmwjn2hkyhqab"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.15.0-darwin-arm64.tar.gz"; + sha256 = "1z12mpwsls2h8662wnvg4npnqmh643cwa57z24n6y1i0wlzimq58"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-darwin-arm64.tar.gz"; sha256 = "1ss8dak6lk03s391914wxs1y20h4k0khqab7k15lajvl6jm13809"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.12.0-darwin-arm64.tar.gz"; - sha256 = "12c617m97ba2l9v2vz0li4w0gh3gcjspkhxh4zg2wpiiiyxghr3j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.14.0-darwin-arm64.tar.gz"; + sha256 = "0g1n0vkr1lqny1rgb1pgmsvyr2rc0jsj4j6m0ibgcps6j3g9h207"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.16.0-darwin-arm64.tar.gz"; @@ -543,16 +543,16 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.1.0-darwin-arm64.tar.gz"; - sha256 = "0vdrj3w6w9qw823fwr1i8j3gqirknvx5yiinp8sglsx9xb6p9q5i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v6.0.0-darwin-arm64.tar.gz"; + sha256 = "0ssvm9dwpiisk1n93a522bcc5ijfqz2c25b1qgjsmlgd93phias4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.45.0-darwin-arm64.tar.gz"; - sha256 = "17r1fprf7gbymmwyw2vqalj6x34iqhqx0jvrcm5g93qwgcimhi5g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.48.0-darwin-arm64.tar.gz"; + sha256 = "01g98gv3wb467p9ghkjxlcndbxjdmd0rk95adi85mk14cfv2ppfp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.1.0-darwin-arm64.tar.gz"; - sha256 = "06y4ciy227kfck89av48dbnhd4mfac9gycgiqxn7nfsq8klabf2d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.3.0-darwin-arm64.tar.gz"; + sha256 = "12ksqg1mrqwl2bwn8308l5k5vmxy1xc2makphwrpfd6sq0rsp1jg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.9.0-darwin-arm64.tar.gz"; @@ -563,20 +563,20 @@ sha256 = "1m1w4qds6jbmpw4xwy87bgf8d4nzv8kj29mdnfqbf3hssvzk2zc6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.1-darwin-arm64.tar.gz"; - sha256 = "1679zpv2r3i2acjmx2a6i7dc47p73gf3jw1k1aclasd5cyjf46jf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.2-darwin-arm64.tar.gz"; + sha256 = "09ri5bp9hvq9db1hpgjxjzd9i2fkmr7fry2fdjx6gv1j2djcvryq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.0-darwin-arm64.tar.gz"; - sha256 = "1m2p7xhfw8lxmdc9s16bq501ssyw7gyxmci1ci4grnk11id5a2x2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.23.1-darwin-arm64.tar.gz"; + sha256 = "1a38gi1y1vwvgxhid070hsl7la8wnwxzs8473hm1w12lq9kymh0p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-arm64.tar.gz"; sha256 = "0x883w9nvvxdsm0knxzzfnnv0lbbysbs04ym681qxzy9pi7ijhj3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.0-darwin-arm64.tar.gz"; - sha256 = "05pjh1xlg82v8vfzkcnn6krnjkd5njfgrfy392vfqcp235z569s6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.4.1-darwin-arm64.tar.gz"; + sha256 = "0z0ands2dp6jjy9rbb9rmijlp56m4mrw79f8513kj6nqp1dyalr1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.1.0-darwin-arm64.tar.gz"; @@ -591,32 +591,32 @@ sha256 = "1cl9qj041z8fgc95vgsx7y0f5jxyjr8cjb5ain4gl501v4s88hn9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.2-darwin-arm64.tar.gz"; - sha256 = "1j6c83xvcanyzp1q8zwa952dplvvi0f4psfdscpplbsgzmq5v54n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.10.0-darwin-arm64.tar.gz"; + sha256 = "1l0ykg6v6h70197163h5cn1di1ycacrn7j3s23yrphqfdq3xfi4g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.14.0-darwin-arm64.tar.gz"; - sha256 = "07kj6rz7dh08n74zfjprjnzjcrizcmy8rfbnvfi9qkavh0mgcxvv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.15.0-darwin-arm64.tar.gz"; + sha256 = "1vzyn88xw94b2kgd0gmvsjz1k7bjvmf9gyynnn2xsmzzs6jmhl1d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.22.0-darwin-arm64.tar.gz"; - sha256 = "149isdz4fs052z1r7jfhx1mq18j8s4wrfgvbabil3wchfkgcqr8f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.23.0-darwin-arm64.tar.gz"; + sha256 = "0gxazn3b65j3wib18pig0a900is05lph38xq06ih80njzb84ajyg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.10.0-darwin-arm64.tar.gz"; - sha256 = "1y1hb4s9214a5nlm0byzm0w4n1c190w57b0q4grl064hnw6490v1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.11.0-darwin-arm64.tar.gz"; + sha256 = "07p28832jrndwcmmp1whky2dp218jhc070cm12frypn06ipy0n9q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.11.0-darwin-arm64.tar.gz"; - sha256 = "0nhmi6m22xlxbxq6scknj3025wpmmf32vly5k7dpzjai695n48s7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.12.0-darwin-arm64.tar.gz"; + sha256 = "1k4yvbmhpaf244bwv94swz7nvp07pllica40q2kcgz9aynb9zljy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.1-darwin-arm64.tar.gz"; - sha256 = "0yyr5dv612ar8c12w74zwp0n1v77lry548fs6b0d20cc3a6d10gb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.8.0-darwin-arm64.tar.gz"; + sha256 = "0r3yrdhsqvwrmpnajqiyyrjnnfazawkwwx6yf6371g4n6zqxqy4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.2-darwin-arm64.tar.gz"; - sha256 = "0ss4q1l4x0jwagcqcjkb65ksrfai8j4lb3xdbbfk58yxcmk5wwr3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.8.0-darwin-arm64.tar.gz"; + sha256 = "0hh9m53pc07mfpi2zl1hzqg58fh0i6vbm0s9vppxvn2nnl5bd0wy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-darwin-arm64.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/default.nix index 71c61d7a05..9f2f7bd6c7 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper, installShellFiles }: -with lib; - let data = import ./data.nix {}; in stdenv.mkDerivation { @@ -16,7 +14,7 @@ in stdenv.mkDerivation { installPhase = '' install -D -t $out/bin/ * - '' + optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" '' + '' installShellCompletion --cmd pulumi \ @@ -25,9 +23,9 @@ in stdenv.mkDerivation { --zsh <($out/bin/pulumi completion zsh) ''; - nativeBuildInputs = [ installShellFiles ] ++ optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; - meta = { + meta = with lib; { homepage = "https://pulumi.io/"; description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/update.sh b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/update.sh index 4fdf3d97d3..fb583e5ad1 100755 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/update.sh +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-bin/update.sh @@ -3,8 +3,8 @@ # shellcheck shell=bash # Bash 3 compatible for Darwin -if [ -z "${GITHUB_TOKEN}" ]; then - echo >&2 "usage: GITHUB_TOKEN=… ./update.sh" +if [ -z "${GITHUB_TOKEN}" ] || [ $# -ne 1 ]; then + echo >&2 "usage: GITHUB_TOKEN=… ./update.sh pulumi-version" exit 1 fi @@ -12,7 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.49.0" +VERSION=$1 # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix index 932c9392c2..5dcd156d55 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-azure-native.nix @@ -4,10 +4,10 @@ mkPulumiPackage rec { owner = "pulumi"; repo = "pulumi-azure-native"; - version = "1.85.0"; + version = "1.92.0"; rev = "v${version}"; - hash = "sha256-12JjDHYCxx/eQBIGpMO9FnjYFu54QT80zvivDYiHWjM="; - vendorHash = "sha256-RhZBvFjleVxskFcuNZcjcq9Hc+bLfBL9PsZg5rIPJ3Y="; + hash = "sha256-eSHD7ckiHJJoqJFeSlwxl063QRRTtiWdpu1m9OVRhoA="; + vendorHash = "sha256-DI92fCe8HPwjERkBVlOebZpvCreq9850OeERDkiayz8="; cmdGen = "pulumi-gen-azure-native"; cmdRes = "pulumi-resource-azure-native"; extraLdflags = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix index c599d6e0a9..c5cad8f202 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix @@ -22,7 +22,7 @@ buildGoModule rec { "-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=${version}" ]; - checkInputs = [ + nativeCheckInputs = [ nodejs ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix index 2f0810b04b..e63e311fab 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix @@ -33,7 +33,7 @@ buildGoModule rec { "-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=${version}" ]; - checkInputs = [ + nativeCheckInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix index e95a265ebd..0e8fc32925 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -14,21 +14,23 @@ buildGoModule rec { pname = "pulumi"; - version = "3.49.0"; + version = "3.53.1"; # Used in pulumi-language packages, which inherit this prop - sdkVendorHash = "sha256-gM3VpX6r/BScUyvk/XefAfbx0qYzdzSBGaWZN+89BS8="; + sdkVendorHash = "sha256-y45TlQF8jJeDLeKEI+ZMcEQqwUIrHPjgTaz1QkjTlEI="; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-WO+bTkTIAyaXl3nYwsMUTdovsYibivfGsKz6A7wj2zM="; + hash = "sha256-5+NwhrALKqyaX6uj1d3Dp3CXWif5/mkL1QgT4pN29bw="; + # Some tests rely on checkout directory name + name = "pulumi"; }; - vendorSha256 = "sha256-q7ZusTYD8l2RyiwP/Wf6dP6AoosWEwpaylbdhfE5cUA="; + vendorSha256 = "sha256-GoRPXbgQqix8FQxQx5oxzeV3+Rfzc02GniGnJS5HJWE="; - sourceRoot = "source/pkg"; + sourceRoot = "${src.name}/pkg"; nativeBuildInputs = [ installShellFiles ]; @@ -51,7 +53,7 @@ buildGoModule rec { "TestPendingDeleteOrder" ]; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix index 5354feea8c..cb3614eaf2 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.48.4"; + version = "0.48.5"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-NAdY4JdUWDnawKl9D6Z4DXQP6ibn+4jHap08p0vu3Mc="; + hash = "sha256-umgOIjOzx8qUCcZfM3nGYeYDmqmA2ayy2lGAS+nSU2s="; }; vendorHash = "sha256-6/TT3/98wBH9oMbPOzgvwN2nxj4RSbL2vxSMFlM5sgo="; diff --git a/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix index b570d7134e..9c4a215dba 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-Sh7K0PgjX2/vio2E8/qdiP+WC2SoGpS9oU4UizV+sOs="; + sha256 = "sha256-Xy4arniOrCln58swFExd0ZoU6wymKYFinReMs7YudeY="; }; - vendorHash = "sha256-sYvq502huyCxI4zpPLfPVyyKqTclrfxL9idCGW4Xops="; + vendorHash = "sha256-BNiF90jovSyCcRGfv6Kya4fLpqV2VF2Qa3QqdyQio5c="; ldflags = [ "-w" diff --git a/third_party/nixpkgs/pkgs/tools/admin/simp_le/default.nix b/third_party/nixpkgs/pkgs/tools/admin/simp_le/default.nix index 88b0e61477..51e2fe98b0 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/simp_le/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/simp_le/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ acme setuptools-scm josepy idna ]; - checkInputs = with python3Packages; [ mock ]; + nativeCheckInputs = with python3Packages; [ mock ]; meta = with lib; { homepage = "https://github.com/zenhack/simp_le"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix index d882890bba..e7d13b20b6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.62.3"; + version = "0.69.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rDj/yerLY7EN/jeAh/xaUX04LqGqijajSZLFhjiyuSg="; + hash = "sha256-nwS5Oar8ck9StNJtbnZoRv3/v/fYKq/RXVl7CPWBfGY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorSha256 = "sha256-MUNXMdzLVgbFtVo1CRCnZfpZl8Ze2R98mx7Y9QreLRw="; + vendorHash = "sha256-5erZB2CoXVfIK0jYEe0HmdZaeLKLAqOiKi8QAQQFVKU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix b/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix index 724301854b..e493398617 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix @@ -23,8 +23,6 @@ , nixosTests }: -with lib; - stdenv.mkDerivation rec { version = "1.12.0"; pname = "tigervnc"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/tightvnc/default.nix b/third_party/nixpkgs/pkgs/tools/admin/tightvnc/default.nix index 3c8f56a650..5bc86f94c2 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/tightvnc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/tightvnc/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = { license = lib.licenses.gpl2Plus; - homepage = "http://vnc-tight.sourceforge.net/"; + homepage = "https://vnc-tight.sourceforge.net/"; description = "Improved version of VNC"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/archivers/s-tar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/s-tar/default.nix index dd3fb84628..8983032226 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/s-tar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/s-tar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { The way star acts may be modified by additional options. Note that unpacking tar archives may be a security risk because star may overwrite existing files. ''; - homepage = "http://cdrtools.sourceforge.net/private/star.html"; + homepage = "https://cdrtools.sourceforge.net/private/star.html"; license = lib.licenses.cddl; maintainers = [ lib.maintainers.wucke13 ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix index 41c8f384e4..74f1bcfe9b 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "6.2.1"; + version = "6.2.5"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - hash = "sha256-XMj33tJi0nwp0B56EZ0v0j7dpCdxGCBFTy62ZwRKiQA="; + hash = "sha256-mjl0QQ0dNA45mN0qb5j6776DjK1VYmbnFK37Doz5N3w="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix index e7f22ad0ff..f61bc9df66 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix @@ -51,6 +51,15 @@ stdenv.mkDerivation rec { ]; sha256 = "1h00djdvgjhwfb60wl4qrxbyfsbbnn1qw6l2hkldnif4m8f8r1zj"; }) + (fetchurl { + urls = [ + # original link (will be dead eventually): + "https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch" + + "https://web.archive.org/web/20230106200319/https://sources.debian.org/data/main/u/unzip/6.0-27/debian/patches/28-cve-2022-0529-and-cve-2022-0530.patch" + ]; + sha256 = "sha256-on79jElQ+z2ULWAq14RpluAqr9d6itHiZwDkKubBzTc="; + }) ] ++ lib.optional enableNLS (fetchurl { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/unzip/files/unzip-6.0-natspec.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix index 8862ad8030..3a3223728a 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/xarchiver/default.nix @@ -2,14 +2,14 @@ coreutils, zip, unzip, p7zip, unar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "0.5.4.19"; + version = "0.5.4.20"; pname = "xarchiver"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; rev = version; - sha256 = "sha256-YCfjOGbjjv4ntNDK3E49hYCVYDhMsRBJ7zsHt8hqQ7Y="; + sha256 = "sha256-OzcfIFYaWez2B1lmAYvhm+knuYbyMu2ohs+kGEVG7K0="; }; nativeBuildInputs = [ intltool pkg-config makeWrapper wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index 78acccf084..fce137cf3b 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://abc.sourceforge.net/abcMIDI/"; + homepage = "https://abc.sourceforge.net/abcMIDI/"; downloadPage = "https://ifdo.ca/~seymour/runabc/top.html"; license = licenses.gpl2Plus; description = "Utilities for converting between abc and MIDI"; diff --git a/third_party/nixpkgs/pkgs/tools/audio/asap/default.nix b/third_party/nixpkgs/pkgs/tools/audio/asap/default.nix index 5ce3a80bd7..820ff72c42 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/asap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/asap/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://asap.sourceforge.net/"; + homepage = "https://asap.sourceforge.net/"; mainProgram = "asap-sdl"; description = "Another Slight Atari Player"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix b/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix index 15981b0fc6..adf80f4c09 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/audiowaveform/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "audiowaveform"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "bbc"; repo = "audiowaveform"; rev = version; - sha256 = "sha256-ZkkGRohcydi2C1S7J0+yGWsqK7ivxQmFuq1NGNiPPNY="; + sha256 = "sha256-Q0SPTBk2102AmmJftYprPWbYcAqgfeoOYWH6x2mqByA="; }; nativeBuildInputs = [ cmake gtest ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix index f26881d91c..4cfef4657e 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix @@ -119,7 +119,7 @@ python3Packages.buildPythonApplication rec { "--prefix PATH : ${lib.makeBinPath pluginWrapperBins}" ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytest mock rarfile diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix index 635854d457..95740e2d4e 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ beets ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook mock ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix index 623ca2fcf1..f2d65eb897 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/copyartifacts.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication { pytestFlagsArray = [ "-r fEs" ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook beets six diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/extrafiles.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/extrafiles.nix index 7cd4c76d50..80c51dcde5 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/extrafiles.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/plugins/extrafiles.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication { propagatedBuildInputs = with python3Packages; [ mediafile ]; - checkInputs = [ + nativeCheckInputs = [ python3Packages.pytestCheckHook beets ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/dsp/default.nix b/third_party/nixpkgs/pkgs/tools/audio/dsp/default.nix index 01b1ed107b..57990199df 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/dsp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/dsp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "bmc0"; repo = "dsp"; rev = "v${version}"; - sha256 = "sha256-S1pzVQ/ceNsx0vGmzdDWw2TjPVLiRgzR4edFblWsekY="; + hash = "sha256-S1pzVQ/ceNsx0vGmzdDWw2TjPVLiRgzR4edFblWsekY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/larynx/default.nix b/third_party/nixpkgs/pkgs/tools/audio/larynx/default.nix index 34c5843634..2bc55a731a 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/larynx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/larynx/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , espeak-ng , onnxruntime , pcaudiolib @@ -32,7 +32,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/audio/midicsv/default.nix b/third_party/nixpkgs/pkgs/tools/audio/midicsv/default.nix index 698205a2b0..673503d51d 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/midicsv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/midicsv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.1"; src = fetchurl { - url = "http://www.fourmilab.ch/webtools/midicsv/midicsv-${version}.tar.gz"; + url = "https://www.fourmilab.ch/webtools/midicsv/midicsv-${version}.tar.gz"; sha256 = "1vvhk2nf9ilfw0wchmxy8l13hbw9cnpz079nsx5srsy4nnd78nkw"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Losslessly translate MIDI to CSV and back"; - homepage = "http://www.fourmilab.ch/webtools/midicsv/"; + homepage = "https://www.fourmilab.ch/webtools/midicsv/"; license = licenses.publicDomain; maintainers = with maintainers; [ orivej ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/audio/pw-volume/default.nix b/third_party/nixpkgs/pkgs/tools/audio/pw-volume/default.nix new file mode 100644 index 0000000000..ddd9f4aa1a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/pw-volume/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, fetchurl +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "pw-volume"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "smasher164"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-u7Ct9Kfwld/h3b6hUZdfHNuDGE4NA3MwrmgUj4g64lw="; + }; + + cargoPatches = [ + (fetchurl { + # update Cargo.lock + url = "https://github.com/smasher164/pw-volume/commit/be104eaaeb84def26b392cc44bb1e7b880bef0fc.patch"; + sha256 = "sha256-gssRcKpqxSAvW+2kJzIAR/soIQ3xg6LDZ7OeXds4ulY="; + }) + ]; + + cargoSha256 = "sha256-Vzd5ZbbzJh2QqiOrBOszsNqLwxM+mm2lbGd5JtKZzEM="; + + meta = with lib; { + description = "Basic interface to PipeWire volume controls"; + homepage = "https://github.com/smasher164/pw-volume"; + license = licenses.mit; + maintainers = with maintainers; [ astro ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix b/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix index 02628bf74e..c76dd693ad 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/spotdl/default.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { platformdirs ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pytest-mock pytest-vcr diff --git a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix index 9b3bce6f44..d943e43b76 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/tts/default.nix @@ -1,6 +1,7 @@ { lib , python3 , fetchFromGitHub +, fetchpatch , espeak-ng }: @@ -24,7 +25,7 @@ let src = super.fetchPypi { pname = "librosa"; inherit version; - sha256 = "c53d05e768ae4a3e553ae21c2e5015293e5efbfd5c12d497f1104cb519cca6b3"; + hash = "sha256-xT0F52iuSj5VOuIcLlAVKT5e+/1cEtSX8RBMtRnMprM="; }; }); }; @@ -32,16 +33,29 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.9.0"; + version = "0.10.2"; format = "pyproject"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; - rev = "v${version}"; - sha256 = "sha256-p4I583Rs/4eig7cnOcJjri2ugOLAeF2nvPIvMZrN1Ss="; + rev = "refs/tags/v${version}"; + hash = "sha256-IcuRhsURgEYIuS7ldZtxAy4Z/XNDehTGsOfYW+DhScg="; }; + patches = [ + # Use packaging.version for version comparisons + (fetchpatch { + url = "https://github.com/coqui-ai/TTS/commit/77a9ef8ac97ea1b0f7f8d8287dba69a74fdf22ce.patch"; + hash = "sha256-zWJmINyxw2efhR9KIVkDPHao5703zlpCKwdzOh/1APY="; + }) + # Fix espeak version detection logic + (fetchpatch { + url = "https://github.com/coqui-ai/TTS/commit/0031df0143b069d7db59ba04d1adfafcc1a92f47.patch"; + hash = "sha256-6cL9YqWrB+0QomINpA9BxdYmEDpXF03udGEchydQmBA="; + }) + ]; + postPatch = let relaxedConstraints = [ "cython" @@ -51,7 +65,6 @@ python.pkgs.buildPythonApplication rec { "mecab-python3" "numba" "numpy" - "umap-learn" "unidic-lite" ]; in '' @@ -60,10 +73,13 @@ python.pkgs.buildPythonApplication rec { ''-e 's/${package}.*[<>=]+.*/${package}/g' \'' ) relaxedConstraints)} requirements.txt + # only used for notebooks and visualization + sed -r -i -e '/umap-learn/d' requirements.txt ''; nativeBuildInputs = with python.pkgs; [ cython + packaging ]; propagatedBuildInputs = with python.pkgs; [ @@ -82,6 +98,7 @@ python.pkgs.buildPythonApplication rec { mecab-python3 nltk numba + packaging pandas pypinyin pysbd @@ -92,7 +109,6 @@ python.pkgs.buildPythonApplication rec { torchaudio-bin tqdm trainer - umap-learn unidic-lite webrtcvad ]; @@ -106,7 +122,7 @@ python.pkgs.buildPythonApplication rec { ) ''; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ espeak-ng pytestCheckHook ]; @@ -134,6 +150,8 @@ python.pkgs.buildPythonApplication rec { "test_run_all_models" "test_synthesize" "test_voice_conversion" + "test_multi_speaker_multi_lingual_model" + "test_single_speaker_model" # Mismatch between phonemes "test_text_to_ids_phonemes_with_eos_bos_and_blank" # Takes too long @@ -151,6 +169,7 @@ python.pkgs.buildPythonApplication rec { "tests/tts_tests/test_glow_tts_d-vectors_train.py" "tests/tts_tests/test_glow_tts_speaker_emb_train.py" "tests/tts_tests/test_glow_tts_train.py" + "tests/tts_tests/test_overflow_train.py" "tests/tts_tests/test_speedy_speech_train.py" "tests/tts_tests/test_tacotron2_d-vectors_train.py" "tests/tts_tests/test_tacotron2_speaker_emb_train.py" diff --git a/third_party/nixpkgs/pkgs/tools/audio/vgmtools/default.nix b/third_party/nixpkgs/pkgs/tools/audio/vgmtools/default.nix index 9571e11606..e0a14a8212 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/vgmtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/vgmtools/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vgmtools"; - version = "unstable-2022-12-30"; + version = "unstable-2023-01-27"; src = fetchFromGitHub { owner = "vgmrips"; repo = "vgmtools"; - rev = "6c2c21dfc871f8cb9c33a77fe7db01419b6ad97d"; - sha256 = "qe8cHGf8X7JjjoiRQ/S3q/WhyvgrMEwsCo7QoQkmg5w="; + rev = "fc55484b5902191e5467e6044bb90c1c74a0c938"; + sha256 = "Ho0yYoe1TIlVxMauz/harP1xSw42wdcklj/O6fA+VEk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/backup/autorestic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/autorestic/default.nix index fdd59a4713..7bc9805117 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/autorestic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/autorestic/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "autorestic"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Yg/R3f84nSLrfHA20Jtq28ldSK/y4c7rVm4GN4+DlDY="; + sha256 = "sha256-gf2sqMI8dG7+sVSqe2f5oG7vqQ9UDKAqPUS+MPVB7SI="; }; - vendorSha256 = "sha256-eB24vCElnnk3EMKniCblmeRsFk0BQ0wFeBf0B8OPanE="; + vendorHash = "sha256-eB24vCElnnk3EMKniCblmeRsFk0BQ0wFeBf0B8OPanE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix b/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix index 1bd9cbd685..c5621ed759 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/bacula/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bacula"; - version = "11.0.6"; + version = "13.0.1"; src = fetchurl { url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; - sha256 = "sha256-AZWgi81PV4rkqc4Nkff4ZzHGNNVrgQU0ci1yGyqe7Lc="; + sha256 = "sha256-1jhI1pWsFcHM/BF4knUzFLy5IyqFLEDjLMqIwOkYl4o="; }; # libtool.m4 only matches macOS 10.* diff --git a/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix index 8489922f6c..f9dcc51752 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/borgbackup/default.nix @@ -81,7 +81,7 @@ python3.pkgs.buildPythonApplication rec { --zsh scripts/shell_completions/zsh/_borg ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ e2fsprogs py python-dateutil diff --git a/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix index bd41dd4854..dc77b5de40 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-0o2tKg7BfhkNt/k8XdZ1agaSJxKO5OxB5aaRgV9IPeU="; }; - checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; + nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; # - test_borgmatic_version_matches_news_version # The file NEWS not available on the pypi source, and this test is useless diff --git a/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix index 072166f7a5..86e598ff60 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/bup/default.nix @@ -7,8 +7,6 @@ assert par2Support -> par2cmdline != null; let version = "0.32"; in -with lib; - stdenv.mkDerivation { pname = "bup"; inherit version; @@ -31,7 +29,7 @@ stdenv.mkDerivation { postPatch = '' patchShebangs . substituteInPlace Makefile --replace "-Werror" "" - '' + optionalString par2Support '' + '' + lib.optionalString par2Support '' substituteInPlace cmd/fsck-cmd.py --replace "'par2'" "'${par2cmdline}/bin/par2'" ''; @@ -49,7 +47,7 @@ stdenv.mkDerivation { --prefix PATH : ${git}/bin ''; - meta = { + meta = with lib; { homepage = "https://github.com/bup/bup"; description = "Efficient file backup system based on the git packfile format"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/tools/backup/dedup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/dedup/default.nix index db7d24b7d8..15daab4751 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/dedup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/dedup/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ coreutils gawk ]; + nativeCheckInputs = [ coreutils gawk ]; checkTarget = "test"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix index d6ab926c0c..cac9ae411d 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix @@ -78,7 +78,7 @@ pythonPackages.buildPythonApplication rec { future ]; - checkInputs = [ + nativeCheckInputs = [ gnupg # Add 'gpg' to PATH. gnutar # Add 'tar' to PATH. librsync # Add 'rdiff' to PATH. diff --git a/third_party/nixpkgs/pkgs/tools/backup/gamerbackup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/gamerbackup/default.nix index dcdaafb4e5..a6e6246bb3 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/gamerbackup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/gamerbackup/default.nix @@ -15,7 +15,7 @@ buildGoModule { nativeBuildInputs = [ makeWrapper ]; - checkInputs = [ lepton ]; + nativeCheckInputs = [ lepton ]; postFixup = '' wrapProgram $out/bin/gb --prefix PATH : ${lib.makeBinPath [ lepton ]} diff --git a/third_party/nixpkgs/pkgs/tools/backup/gphotos-sync/default.nix b/third_party/nixpkgs/pkgs/tools/backup/gphotos-sync/default.nix index cdcc824c53..c4464d3b76 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/gphotos-sync/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/gphotos-sync/default.nix @@ -59,7 +59,7 @@ py.pkgs.buildPythonApplication rec { ffmpeg ]; - checkInputs = with py.pkgs; [ + nativeCheckInputs = with py.pkgs; [ mock pytestCheckHook setuptools-scm diff --git a/third_party/nixpkgs/pkgs/tools/backup/httrack/default.nix b/third_party/nixpkgs/pkgs/tools/backup/httrack/default.nix index a01565c43a..8ac3bf7404 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/httrack/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/httrack/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl"; }; - buildInputs = [ zlib openssl ] ++ lib.optional stdenv.isDarwin libiconv; + buildInputs = [ libiconv openssl zlib ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/backup/luckybackup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/luckybackup/default.nix index a8f88e88b0..61c0c186fe 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/luckybackup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/luckybackup/default.nix @@ -3,7 +3,6 @@ , rsync, ssh }: -with lib; mkDerivation rec { pname = "luckybackup"; version = "0.5.0"; @@ -26,7 +25,7 @@ mkDerivation rec { done ''; - meta = { + meta = with lib; { description = "A powerful, fast and reliable backup & sync tool"; longDescription = '' luckyBackup is an application for data back-up and synchronization @@ -37,7 +36,7 @@ mkDerivation rec { before proceeding in any data manipulation), reliable and fully customizable. ''; - homepage = "http://luckybackup.sourceforge.net/"; + homepage = "https://luckybackup.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix b/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix index ccf74e46ae..b5a694482c 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/partclone/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "partclone"; - version = "0.3.21"; + version = "0.3.22"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; rev = version; - sha256 = "sha256-QAvZzu63TSj/kRYd60q2lpxU92xTV8T8jXdtZvrxX+I="; + sha256 = "sha256-NSIWuzgv3dQ2Kpl1HOoghrOaKztDjZs8NjF9k41kZQY="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix b/third_party/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix index e6bdca7c92..d8ab7956ad 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "pgbackrest"; - version = "2.43"; + version = "2.44"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; rev = "release/${version}"; - sha256 = "sha256-JZHE68d8fzqr0kI35TxoVB3Frt/v22xkZexfzhkqzBU="; + sha256 = "sha256-N56HUW1JZNvaqzU01xaZ8BsFA2KW4z8ixulPngYCIY0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix index 44683fa388..7175602519 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-qWVmsW16eQM7d+HoHR2qE7GpcC5HK7TIhhx6J2glKpA="; + hash = "sha256-KdPslVJHH+xdUuFfmLZumP2lHzkDrrAvpDaj38SuP8o="; }; patches = [ @@ -17,7 +17,7 @@ buildGoModule rec { ./0001-Skip-testing-restore-with-permission-failure.patch ]; - vendorHash = "sha256-zhLFMvp97mQclaLwH4Hl8jFNMmoYrf8AtVv49RDq7lM="; + vendorHash = "sha256-oetaCiXWEBUEf382l4sjO0SCPxkoh+bMTgIf/qJTQms="; subPackages = [ "cmd/restic" ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/rotate-backups/default.nix b/third_party/nixpkgs/pkgs/tools/backup/rotate-backups/default.nix index 405fc6c395..d64b0dee50 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/rotate-backups/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/rotate-backups/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { update-dotdee ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix b/third_party/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix index 7a903288c6..57883c4f68 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rsnapshot"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { url = "https://rsnapshot.org/downloads/rsnapshot-${version}.tar.gz"; - sha256 = "sha256-wct8t0jFqWVsOGNivfbCZ5WXN3JKu1Bfv56UCp2YhXk="; + sha256 = "sha256-ELdeAcolUR6CZqrNSVUxl1rRqK1VYha2pXx20CizgkI="; }; propagatedBuildInputs = [perl openssh rsync logger]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix b/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix index 8bd51d613d..53836da125 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/s3ql/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-7N09b7JwMPliuyv2fEy1gQYaFCMSSvajOBPhNL3DQsg="; }; - checkInputs = [ which ] ++ (with python3Packages; [ cython pytest pytest-trio ]); + nativeCheckInputs = [ which ] ++ (with python3Packages; [ cython pytest pytest-trio ]); propagatedBuildInputs = with python3Packages; [ sqlite apsw pycrypto requests defusedxml dugong google-auth google-auth-oauthlib trio pyfuse3 diff --git a/third_party/nixpkgs/pkgs/tools/backup/tarsnapper/default.nix b/third_party/nixpkgs/pkgs/tools/backup/tarsnapper/default.nix index d793017ad8..447057448f 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/tarsnapper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/tarsnapper/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { pexpect ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ nose ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/tsm-client/default.nix b/third_party/nixpkgs/pkgs/tools/backup/tsm-client/default.nix index ef94eee242..03bd629240 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/tsm-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/tsm-client/default.nix @@ -159,16 +159,6 @@ let ln --symbolic --force --no-target-directory "$out/$(cut -b 7- <<< "$target")" "$link" done ''; - - # since 7b9fd5d1c9802131ca0a01ff08a3ff64379d2df4 - # autopatchelf misses to add $out/lib to rpath; - # we have to call autopatchelf manually as it would - # run too late and overwrite our rpath otherwise - dontAutoPatchelf = true; - postFixup = '' - autoPatchelf $out - patchelf --add-rpath $out/lib $out/lib/* - ''; }; binPath = lib.makeBinPath ([ acl gnugrep procps ] diff --git a/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix b/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix index fa2f69bb3e..60a3d1b901 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/zfs-replicate/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "b2cb9d4670a6e12d14a446c10d857862e91af6e4526f607e08b41bde89953bb8"; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis mypy pytest diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix index e10c82d720..da87a7b89e 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -9,8 +9,6 @@ # TODO: aptxSupport }: -with lib; - stdenv.mkDerivation rec { pname = "bluez-alsa"; version = "4.0.0"; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { alsa-lib bluez glib sbc dbus readline libbsd ncurses ] - ++ optional aacSupport fdk_aac; + ++ lib.optional aacSupport fdk_aac; configureFlags = [ "--with-alsaplugindir=${placeholder "out"}/lib/alsa-lib" @@ -36,9 +34,9 @@ stdenv.mkDerivation rec { "--enable-rfcomm" "--enable-hcitop" ] - ++ optional aacSupport "--enable-aac"; + ++ lib.optional aacSupport "--enable-aac"; - meta = { + meta = with lib; { description = "Bluez 5 Bluetooth Audio ALSA Backend"; longDescription = '' Bluez-ALSA (BlueALSA) is an ALSA backend for Bluez 5 audio interface. diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix index c9d49cfd43..0fa67bbd93 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; - homepage = "http://cdrdao.sourceforge.net/"; + homepage = "https://cdrdao.sourceforge.net/"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrtools/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrtools/default.nix index f49826b99b..fa90ceb616 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/cdrtools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; # parallel building fails on some linux machines meta = with lib; { - homepage = "http://cdrtools.sourceforge.net/private/cdrecord.html"; + homepage = "https://cdrtools.sourceforge.net/private/cdrecord.html"; description = "Highly portable CD/DVD/BluRay command line recording software"; license = with licenses; [ cddl gpl2 lgpl21 ]; platforms = with platforms; linux ++ darwin; diff --git a/third_party/nixpkgs/pkgs/tools/compression/advancecomp/default.nix b/third_party/nixpkgs/pkgs/tools/compression/advancecomp/default.nix index 1ed5939746..32bae24a6c 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/advancecomp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/advancecomp/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "advancecomp"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "amadvance"; repo = "advancecomp"; rev = "v${version}"; - hash = "sha256-nl1t1XbyCDYH7jKdIRSIXfXuRCj5N+5noC86VpbpWu4="; + hash = "sha256-dlVTMd8sm84M8JZsCfVR/s4jXMQWmrVj7xwUVDsehQY="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/compression/crabz/default.nix b/third_party/nixpkgs/pkgs/tools/compression/crabz/default.nix index 67c4cffbc3..b68d3af1a8 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/crabz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/crabz/default.nix @@ -2,42 +2,23 @@ , rustPlatform , fetchFromGitHub , cmake -, stdenv -, libiconv -, CoreFoundation -, Security }: rustPlatform.buildRustPackage rec { pname = "crabz"; - version = "0.7.5"; + version = "0.8.1"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9PZbrdgHX7zOftecvsyVjYUkBlFEt20lYtLSkFcb8dg="; + sha256 = "sha256-w/e0NFmBsYNEECT+2zHEm/UUpp5LxPYr0BdKikT2o1M="; }; - cargoSha256 = "sha256-tT6RCL5pOAMZw7cQr0BCAde9Y/1FeBBLXF6uXfM1I0A="; + cargoSha256 = "sha256-9VOJeRvyudZSCaUZ1J9gHMEoWXEnEhCZPxvfYGRKzj0="; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ - libiconv - CoreFoundation - Security - ]; - - # link System as a dylib instead of a framework on macos - postPatch = lib.optionalString stdenv.isDarwin '' - core_affinity=../$(stripHash $cargoDeps)/core_affinity - oldHash=$(sha256sum $core_affinity/src/lib.rs | cut -d " " -f 1) - substituteInPlace $core_affinity/src/lib.rs --replace framework dylib - substituteInPlace $core_affinity/.cargo-checksum.json \ - --replace $oldHash $(sha256sum $core_affinity/src/lib.rs | cut -d " " -f 1) - ''; - meta = with lib; { description = "A cross platform, fast, compression and decompression tool"; homepage = "https://github.com/sstadick/crabz"; diff --git a/third_party/nixpkgs/pkgs/tools/compression/gzip/default.nix b/third_party/nixpkgs/pkgs/tools/compression/gzip/default.nix index 771188a98c..24f81d99da 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/gzip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/gzip/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl +, makeWrapper , xz -, writeText }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ xz.bin ]; + nativeBuildInputs = [ xz.bin makeWrapper ]; makeFlags = [ "SHELL=/bin/sh" @@ -40,12 +40,13 @@ stdenv.mkDerivation rec { preFixup = '' sed -i '1{;/#!\/bin\/sh/aPATH="'$out'/bin:$PATH" }' $out/bin/* - ''; - - # set GZIP env variable to "-n" to stop gzip from adding timestamps + '' + # run gzip with "-n" when $GZIP_NO_TIMESTAMPS (set by stdenv's setup.sh) is set to stop gzip from adding timestamps # to archive headers: https://github.com/NixOS/nixpkgs/issues/86348 - setupHook = writeText "setup-hook" '' - export GZIP="-n" + # if changing so that there's no longer a .gzip-wrapped then update copy in make-bootstrap-tools.nix + + '' + wrapProgram $out/bin/gzip \ + --add-flags "\''${GZIP_NO_TIMESTAMPS:+-n}" ''; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/compression/lzip/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lzip/default.nix index 7fa7b4e35c..b41b3c843d 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/lzip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/lzip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, texinfo }: +{ lib, stdenv, fetchurl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or @@ -10,8 +10,6 @@ stdenv.mkDerivation rec { version = "1.23"; outputs = [ "out" "man" "info" ]; - nativeBuildInputs = [ texinfo ]; - src = fetchurl { url = "mirror://savannah/lzip/${pname}-${version}.tar.gz"; sha256 = "sha256-R5LAR93xXvKdVbqOaKGiHgy3aS2H7N9yBEGYZFgvKA0="; diff --git a/third_party/nixpkgs/pkgs/tools/compression/lziprecover/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lziprecover/default.nix index e322a19059..38840a0709 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/lziprecover/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/lziprecover/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ lzip ]; + nativeCheckInputs = [ lzip ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/compression/xz/default.nix b/third_party/nixpkgs/pkgs/tools/compression/xz/default.nix index 59f1901bd9..d49cc314b4 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/xz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/xz/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "xz"; - version = "5.4.0"; + version = "5.4.1"; src = fetchurl { url = "https://tukaani.org/xz/xz-${version}.tar.bz2"; - sha256 = "eV6gSUxm1QmwUt3DbcY71jTln/Kg85wWo7VkTdAdh+Y="; + sha256 = "3Rcqy1OGemgBL5TBc4lAGy8nShqlro+Ey/uLfjg+qNM="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix index 5c04a943c1..6a489779cb 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { mkdir -p build_ && cd $_ ''; - checkInputs = [ file ]; + nativeCheckInputs = [ file ]; inherit doCheck; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix index b4fc7f1e4f..eea423b897 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/avfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "http://avf.sourceforge.net/"; + homepage = "https://avf.sourceforge.net/"; description = "Virtual filesystem that allows browsing of compressed files"; platforms = lib.platforms.unix; license = lib.licenses.gpl2Only; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix index 30ffb2dd43..eb54f08a3a 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; - checkInputs = [ valgrind ]; + nativeCheckInputs = [ valgrind ]; preCheck = lib.optionalString fuseSupport '' rm tests/test_fuse.py diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix index 663aecfcbb..eedbdcc222 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.8.2"; + version = "0.8.7"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-IHHlxF/7U7C+wO6YicesZPFV6BSBmdkPWaZn7awplNk="; + sha256 = "sha256-hVunxgc/aUapQYe6k3hKdkC+2Jw0x1HjI/kl/fJdWUo="; }; propagatedBuildInputs = [ docopt anytree ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph-csi/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph-csi/default.nix index f3f66d7b08..05a2ac8d30 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph-csi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph-csi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ceph-csi"; - version = "3.7.1"; + version = "3.7.2"; nativeBuildInputs = [ go ]; buildInputs = [ ceph ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "ceph"; repo = "ceph-csi"; rev = "v${version}"; - sha256 = "sha256-VlOKN2PjHM0MdDz6t/AAjcFx4F15+7p3+25tLkRQH1Q="; + sha256 = "sha256-8RbuM+lXkwO5Z1H+SKDGHyNNYYC8VVG9feX46SHC/Q0="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index be7d0dfb34..d9ec176220 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -98,7 +98,7 @@ let sourceRoot = "ceph-${version}/src/python-common"; - checkInputs = [ python.pkgs.pytest ]; + nativeCheckInputs = [ python.pkgs.pytest ]; propagatedBuildInputs = with python.pkgs; [ pyyaml six ]; meta = getMeta "Ceph common module for code shared by manager modules"; @@ -113,8 +113,10 @@ let }; ceph-python-env = python.withPackages (ps: [ + # Check .requires files below https://github.com/ceph/ceph/tree/main/debian for dependencies ps.sphinx ps.flask + ps.routes ps.cython ps.setuptools ps.virtualenv diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix index 69dab5554e..47e58e1a59 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/cryfs/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost175 curl fuse openssl range-v3 spdlog ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; - #checkInputs = [ gtest ]; + #nativeCheckInputs = [ gtest ]; cmakeFlags = [ "-DDEPENDENCY_CONFIG='../cmake-utils/DependenciesFromLocalSystem.cmake'" diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch b/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch index 0e31725936..0f8741ca28 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch +++ b/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/0002-Make-sure-that-the-setuid-wrapped-umount-is-invoked.patch @@ -1,42 +1,26 @@ -From 56873cf29974ff0dfc1ba1afb7022ce49e300835 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Wed, 11 Nov 2020 11:58:25 +0100 -Subject: [PATCH 2/2] Make sure that the setuid-wrapped `umount` is invoked - ---- - src/dav_fuse.c | 2 +- - src/umount_davfs.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - diff --git a/src/dav_fuse.c b/src/dav_fuse.c -index 734bc1f..4501433 100644 +index 6311428..1b1698d 100644 --- a/src/dav_fuse.c +++ b/src/dav_fuse.c -@@ -187,7 +187,7 @@ dav_fuse_loop(int device, char *mpoint, size_t bufsize, time_t idle_time, - unmounting = 1; +@@ -189,7 +189,7 @@ dav_fuse_loop(int device, char *mpoint, size_t bufsize, time_t idle_time, pid_t pid = fork(); if (pid == 0) { + #if defined(__linux__) - execl("/bin/umount", "umount", "-il", mountpoint, NULL); + execl("@wrapperDir@/umount", "umount", "-il", mountpoint, NULL); - _exit(EXIT_FAILURE); - } - } + #elif defined(__FreeBSD__) + execl("/sbin/umount", "umount", "-v", mountpoint, NULL); + #endif diff --git a/src/umount_davfs.c b/src/umount_davfs.c -index b7019c3..75e3b4b 100644 +index 6a82fd2..93958be 100644 --- a/src/umount_davfs.c +++ b/src/umount_davfs.c -@@ -122,9 +122,9 @@ main(int argc, char *argv[]) +@@ -50,7 +50,7 @@ + #endif - char *umount_command = NULL; - if (mpoint) { -- umount_command = ne_concat("umount -i '", mpoint, "'", NULL); -+ umount_command = ne_concat("@wrapperDir@/umount -i '", mpoint, "'", NULL); - } else { -- umount_command = ne_concat("umount -i '", argv[optind], "'", NULL); -+ umount_command = ne_concat("@wrapperDir@/umount -i '", argv[optind], "'", NULL); - error(0, 0, - _("\n" - " can't evaluate PID file name;\n" --- -2.28.0 - + #if defined(__linux__) +-#define UMOUNT_CMD "umount -i" ++#define UMOUNT_CMD "@wrapperDir@/umount -i" + #elif defined(__FreeBSD__) + #define UMOUNT_CMD "umount" + #endif diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix index ab9609635c..1efef2d9b5 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchurl , fetchpatch +, autoreconfHook , neon , procps , substituteAll @@ -10,17 +11,22 @@ stdenv.mkDerivation rec { pname = "davfs2"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { url = "mirror://savannah/davfs2/davfs2-${version}.tar.gz"; - sha256 = "sha256-zj65SOzlgqUck0zLDMcOZZg5FycXyv8XP2ml4q+QxcA="; + sha256 = "sha256-JR23Wic4DMoTMLG5cXAMXl3MDJDlpHYiKF8BQO3+Oi8="; }; + nativeBuildInputs = [ + autoreconfHook + ]; + buildInputs = [ neon zlib ]; patches = [ ./fix-sysconfdir.patch + ./disable-suid.patch (substituteAll { src = ./0001-umount_davfs-substitute-ps-command.patch; ps = "${procps}/bin/ps"; @@ -33,11 +39,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" ]; - makeFlags = [ - "sbindir=$(out)/sbin" - "ssbindir=$(out)/sbin" - ]; - meta = { homepage = "https://savannah.nongnu.org/projects/davfs2"; description = "Mount WebDAV shares like a typical filesystem"; @@ -52,5 +53,6 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ fgaz ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/disable-suid.patch b/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/disable-suid.patch new file mode 100644 index 0000000000..074e08d157 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/disable-suid.patch @@ -0,0 +1,9 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index bbde353..bcbed04 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -54,4 +54,3 @@ LIBS += @LIBICONV@ + endif + + install-exec-hook: +- chmod u+s $(DESTDIR)$(sbindir)/mount.davfs; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch b/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch index f71248a28f..7094a93a9f 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch +++ b/third_party/nixpkgs/pkgs/tools/filesystems/davfs2/fix-sysconfdir.patch @@ -1,19 +1,20 @@ -diff -ubr davfs2-1.4.7-orig/etc/Makefile.am davfs2-1.4.7/etc/Makefile.am ---- davfs2-1.4.7-orig/etc/Makefile.am 2013-02-21 11:45:00.185763558 +0100 -+++ davfs2-1.4.7/etc/Makefile.am 2013-02-21 11:53:05.423197775 +0100 -@@ -24,17 +24,17 @@ +diff --git a/etc/Makefile.am b/etc/Makefile.am +index 5a01282..6a40921 100644 +--- a/etc/Makefile.am ++++ b/etc/Makefile.am +@@ -24,17 +24,17 @@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@ install-data-local: $(dist_pkgdata_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir) -- $(INSTALL_DATA) -b davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf -- $(INSTALL_DATA) -b -m 600 secrets $(DESTDIR)$(pkgsysconfdir)/secrets +- $(INSTALL_DATA) -b $(srcdir)/davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf +- $(INSTALL_DATA) -b -m 600 $(srcdir)/secrets $(DESTDIR)$(pkgsysconfdir)/secrets - $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs - $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs/private - chmod 700 $(DESTDIR)$(pkgsysconfdir)/certs/private + $(mkinstalldirs) $(out)$(pkgsysconfdir) -+ $(INSTALL_DATA) -b davfs2.conf $(out)$(pkgsysconfdir)/davfs2.conf -+ $(INSTALL_DATA) -b -m 600 secrets $(out)$(pkgsysconfdir)/secrets ++ $(INSTALL_DATA) -b $(srcdir)/davfs2.conf $(out)$(pkgsysconfdir)/davfs2.conf ++ $(INSTALL_DATA) -b -m 600 $(srcdir)/secrets $(out)$(pkgsysconfdir)/secrets + $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs + $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs/private + chmod 700 $(out)$(pkgsysconfdir)/certs/private @@ -27,34 +28,3 @@ diff -ubr davfs2-1.4.7-orig/etc/Makefile.am davfs2-1.4.7/etc/Makefile.am + echo " rm -f $(out)$(pkgsysconfdir)/$$f"; \ + rm -f $(out)$(pkgsysconfdir)/$$f; \ done -diff -ubr davfs2-1.4.7-orig/etc/Makefile.in davfs2-1.4.7/etc/Makefile.in ---- davfs2-1.4.7-orig/etc/Makefile.in 2013-02-21 11:45:00.185763558 +0100 -+++ davfs2-1.4.7/etc/Makefile.in 2013-02-21 11:53:27.241207128 +0100 -@@ -408,19 +408,19 @@ - - install-data-local: $(dist_pkgdata_DATA) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir) -- $(INSTALL_DATA) -b davfs2.conf $(DESTDIR)$(pkgsysconfdir)/davfs2.conf -- $(INSTALL_DATA) -b -m 600 secrets $(DESTDIR)$(pkgsysconfdir)/secrets -- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs -- $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)/certs/private -- chmod 700 $(DESTDIR)$(pkgsysconfdir)/certs/private -+ $(mkinstalldirs) $(out)$(pkgsysconfdir) -+ $(INSTALL_DATA) -b davfs2.conf $(out)$(pkgsysconfdir)/davfs2.conf -+ $(INSTALL_DATA) -b -m 600 secrets $(out)$(pkgsysconfdir)/secrets -+ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs -+ $(mkinstalldirs) $(out)$(pkgsysconfdir)/certs/private -+ chmod 700 $(out)$(pkgsysconfdir)/certs/private - - uninstall-local: - @$(NORMAL_UNINSTALL) - @list='$(dist_pkgdata_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " rm -f $(DESTDIR)$(pkgsysconfdir)/$$f"; \ -- rm -f $(DESTDIR)$(pkgsysconfdir)/$$f; \ -+ echo " rm -f $(out)$(pkgsysconfdir)/$$f"; \ -+ rm -f $(out)$(pkgsysconfdir)/$$f; \ - done - - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/djmount/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/djmount/default.nix index b53656a069..bf1f7ba55d 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/djmount/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/djmount/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fcommon"; meta = { - homepage = "http://djmount.sourceforge.net/"; + homepage = "https://djmount.sourceforge.net/"; description = "UPnP AV client, mounts as a Linux filesystem the media content of compatible UPnP AV devices"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.jagajaga ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix index e15b4ad1f6..cbc00b52bd 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dosfstools/default.nix @@ -12,12 +12,16 @@ stdenv.mkDerivation rec { }; patches = [ - # macOS build fixes backported from master + # macOS and FreeBSD build fixes backported from master # TODO: remove on the next release (fetchpatch { url = "https://github.com/dosfstools/dosfstools/commit/77ffb87e8272760b3bb2dec8f722103b0effb801.patch"; sha256 = "sha256-xHxIs3faHK/sK3vAVoG8JcTe4zAV+ZtkozWIIFBvPWI="; }) + (fetchpatch { + url = "https://github.com/dosfstools/dosfstools/commit/2d3125c4a74895eae1f66b93287031d340324524.patch"; + sha256 = "nlIuRDsNjk23MKZL9cZ05odOfTXvsyQaKcv/xEr4c+U="; + }) ]; nativeBuildInputs = [ autoreconfHook pkg-config ] @@ -31,13 +35,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-compat-symlinks" ]; - checkInputs = [ xxd ]; + nativeCheckInputs = [ xxd ]; doCheck = true; meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; homepage = "https://github.com/dosfstools/dosfstools"; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + platforms = lib.platforms.unix; license = lib.licenses.gpl3; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix index 3427a5a688..1ffe03601d 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; # this fails inside of the sandbox due to missing access # to the FUSE device GTEST_FILTER = "-tools.everything"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix index 0958bb2955..2287221452 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { "--enable-libuuid --disable-e2initrd-helper" ]; - checkInputs = [ buildPackages.perl ]; + nativeCheckInputs = [ buildPackages.perl ]; doCheck = true; postInstall = '' @@ -86,8 +86,8 @@ stdenv.mkDerivation rec { ''; }; meta = with lib; { - homepage = "http://e2fsprogs.sourceforge.net/"; - changelog = "http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#${version}"; + homepage = "https://e2fsprogs.sourceforge.net/"; + changelog = "https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#${version}"; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; license = with licenses; [ gpl2Plus diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/eiciel/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/eiciel/default.nix index bfec1dcf09..dff1700d73 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/eiciel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/eiciel/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "eiciel"; - version = "0.10.0-rc2"; + version = "0.10.0"; outputs = [ "out" "nautilusExtension" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "rofirrim"; repo = "eiciel"; rev = version; - sha256 = "+MXoT6J4tKuFaSvUTcM15cKWLUnS0kYgBfqH+5lz6KY="; + sha256 = "0lhnrxhbg80pqjy9f8yiqi7x48rb6m2cmkffv25ssjynsmdnar0s"; }; nativeBuildInputs = [ @@ -46,11 +46,6 @@ stdenv.mkDerivation rec { "-Dnautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-4" ]; - postPatch = '' - # https://github.com/rofirrim/eiciel/pull/9 - substituteInPlace meson.build --replace "compiler.find_library('libacl')" "compiler.find_library('acl')" - ''; - meta = with lib; { description = "Graphical editor for ACLs and extended attributes"; homepage = "https://rofi.roger-ferrer.org/eiciel/"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix index 9917bf8d96..ed9fa6df96 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ext4magic/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { It's much more effective and works much better than extundelete. ''; - homepage = "http://ext4magic.sourceforge.net/ext4magic_en.html"; + homepage = "https://ext4magic.sourceforge.net/ext4magic_en.html"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.rkoe ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix index 5992fd6a78..276f6139b7 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/extundelete/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Utility that can recover deleted files from an ext3 or ext4 partition"; - homepage = "http://extundelete.sourceforge.net/"; + homepage = "https://extundelete.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix index d01ebce489..2ca135704e 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix @@ -14,12 +14,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-mm+JoGQLt4LYL/I6eAyfCuw9++RoLAqO2hV+CBBkLq0="; }; - buildInputs = [ help2man ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ help2man libiconv ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "LD=${stdenv.cc.targetPrefix}cc" + + "UNAME_O=${stdenv.hostPlatform.uname.system}" + "UNAME_S=${stdenv.hostPlatform.uname.system}" ]; # make install target is broken (DESTDIR usage is insane) @@ -35,7 +37,7 @@ stdenv.mkDerivation rec { homepage = "http://fatsort.sourceforge.net/"; description = "Sorts FAT partition table, for devices that don't do sorting of files"; maintainers = [ maintainers.kovirobi ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix index c0cd784aed..02fa3de810 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix @@ -5,33 +5,28 @@ buildGoModule rec { pname = "gcsfuse"; - version = "0.41.10"; + version = "0.41.12"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; - rev = "refs/tags/v${version}"; - hash = "sha256-rtBqXC1CTkbKDP6pzkRQ7GnM5f4xt6eUMW3n9wZu0hc="; + rev = "v${version}"; + hash = "sha256-s28vtcNodc5IL8SnZLTgSQBTPUf0FiIAv3TxZXMDuYE="; }; - vendorSha256 = null; + vendorHash = null; - subPackages = [ - "." - "tools/mount_gcsfuse" - ]; + subPackages = [ "." "tools/mount_gcsfuse" ]; - ldflags = [ - "-s" - "-w" - "-X main.gcsfuseVersion=${version}" - ]; + ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ]; preCheck = - let skippedTests = [ - "Test_Main" - "TestFlags" - ]; in + let + skippedTests = [ + "Test_Main" + "TestFlags" + ]; + in '' # Disable flaky tests buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") @@ -42,7 +37,7 @@ buildGoModule rec { ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse ''; - meta = with lib;{ + meta = with lib; { description = "A user-space file system for interacting with Google Cloud Storage"; homepage = "https://cloud.google.com/storage/docs/gcs-fuse"; changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix index 205d84791e..3427ce54a1 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/genromfs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://romfs.sourceforge.net/"; + homepage = "https://romfs.sourceforge.net/"; description = "Tool for creating romfs file system images"; license = licenses.gpl2; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gfs2-utils/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gfs2-utils/default.nix index 3f68888776..6c33edbbfc 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gfs2-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gfs2-utils/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; buildInputs = [ bzip2 ncurses util-linux zlib ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; doCheck = true; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix index b5b1256a9b..f49f555983 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gitfs/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { 'from pygit2 import RemoteCallbacks' ''; - checkInputs = with python3Packages; [ pytest pytest-cov mock ]; + nativeCheckInputs = with python3Packages; [ pytest pytest-cov mock ]; propagatedBuildInputs = with python3Packages; [ atomiclong fusepy pygit2 six ]; checkPhase = "py.test"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix index a544fd7b8b..115928e497 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "hanwen"; repo = "go-mtpfs"; rev = "v${version}"; - sha256 = "sha256-HVfB8/MImgZZLx4tcrlYOfQjpAdHMHshEaSsd+n758w="; + hash = "sha256-HVfB8/MImgZZLx4tcrlYOfQjpAdHMHshEaSsd+n758w="; }; - vendorSha256 = "sha256-OrAEvD2rF0Y0bvCD9TUv/E429lASsvC3uK3qNvbg734="; + vendorHash = "sha256-OrAEvD2rF0Y0bvCD9TUv/E429lASsvC3uK3qNvbg734="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix index 877d95c5b3..cb3cbe5d7f 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/hfsprogs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, libbsd }: +{ lib, stdenv, fetchurl, fetchFromGitHub, openssl, libbsd }: stdenv.mkDerivation rec { version = "332.25"; @@ -8,9 +8,12 @@ stdenv.mkDerivation rec { url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/hfsprogs_${version}-11.debian.tar.gz"; sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c"; }) - (fetchurl { - url = "https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-${version}.tar.gz"; - sha256 = "74c9aeca899ed7f4bf155c65fc45bf0f250c0f6d57360ea953b1d536d9aa45e6"; + (fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "diskdev_cmds"; + rev = "diskdev_cmds-${version}"; + hash = "sha256-cycPGPx2Gbjn4FKGKuQKJkh+dWGbJfy6C+LTz8rrs0A="; + name = sourceRoot; }) ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix index a19333f1cc..6da75887d5 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.19.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "sha256-0diHZFD4+glTdGWWJk/5amr0mDsvKV5OibKGQNtitIk="; + sha256 = "sha256-FgVXl986PPaX/6TX7MaXPd+NJ3M94fNGa1hFWUDRP8w="; }; - cargoSha256 = "sha256-Rg1wmDLmkDC25meZIe94WZ3Wp8a93VAqRJXjmaE6k18="; + cargoHash = "sha256-uWKSO2odvBeFUcZPGcsEki0PdNVtbVv5g3Dnkxgw2Io="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix index 24233a8441..f7a42f192e 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/httpfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE-based HTTP filesystem for Linux"; - homepage = "http://httpfs.sourceforge.net/"; + homepage = "https://httpfs.sourceforge.net/"; license = lib.licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix index 3a0d0ab2f6..2cc6f69bb0 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mhddfs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.1.39"; src = fetchurl { - url = "http://mhddfs.uvw.ru/downloads/mhddfs_${version}.tar.gz"; + url = "https://mhddfs.uvw.ru/downloads/mhddfs_${version}.tar.gz"; sha256 = "14ggmh91vv69fp2qpz0nxp0hprlw2wsijss2k2485hb0ci4cabvh"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://mhddfs.uvw.ru/"; + homepage = "https://mhddfs.uvw.ru/"; description = "Combines a several mount points into the single one"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.makefu ]; 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 7f9bd4e61d..ecb9d18fd6 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.4"; + version = "1.2.0"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "06pnr3ilywqxch942l8xdg7k053xrqjkkziivx9h89bvy5j7hgvg"; + sha256 = "sha256-1zYHYJXVhJdWQKeM0VVM4VzL3r3XPXebfR7IAEgyt+c="; }; nativeBuildInputs = [ doxygen graphviz pkg-config perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix index 1b4033ea69..dba2a474cc 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/squashfuse/default.nix @@ -1,8 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool, fuse, pkg-config, lz4, xz, zlib, lzo, zstd }: -with lib; - stdenv.mkDerivation rec { pname = "squashfuse"; @@ -22,7 +20,7 @@ stdenv.mkDerivation rec { description = "FUSE filesystem to mount squashfs archives"; homepage = "https://github.com/vasi/squashfuse"; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; license = "BSD-2-Clause"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/common.nix b/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/common.nix index 187efa1604..262c081e35 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/common.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/sshfs-fuse/common.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson pkg-config ninja docutils makeWrapper ]; buildInputs = [ fuse glib ]; - checkInputs = [ which python3Packages.pytest ]; + nativeCheckInputs = [ which python3Packages.pytest ]; NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.system == "i686-linux") diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix index c3051fb161..cf60c13f0f 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/stratis-cli/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "stratis-cli"; - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "v${version}"; - hash = "sha256-S0daUi0rhelip2pwcAP3WGey8BbeMa/7AgSrFfuB+cM="; + hash = "sha256-IfvI8DVjm68SewHtQbhGGU1oku4eZnF7cRyeVPB/Ctk="; }; propagatedBuildInputs = with python3Packages; [ @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { packaging ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix index c1456d9477..7e0c30ebf1 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/stratisd/default.nix @@ -5,6 +5,7 @@ , pkg-config , asciidoc , ncurses +, glibc , dbus , cryptsetup , util-linux @@ -24,18 +25,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.4.4"; + version = "3.5.0"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "v${version}"; - hash = "sha256-6VrbouYNB2iOndnDBfww8gT4eFgfP+HWcfep+N1nErI="; + hash = "sha256-1x6zVWFr4WNpYGVz/UGlP+lycVF2cbWJoiAmiXWzGT8="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-C3nkHQt+w0OYbExDfEpFE0Et6ILJqMNRPXCEWiURf3A="; + hash = "sha256-emsmdQY2od8XVjNY/rt0BbNsVy2XKtLpe8ydZGRil+Q="; }; postPatch = '' @@ -61,6 +62,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + glibc + glibc.static dbus cryptsetup util-linux @@ -81,7 +84,7 @@ stdenv.mkDerivation rec { ]); makeFlags = [ "PREFIX=${placeholder "out"}" "INSTALL=install" ]; - buildFlags = [ "build" "build-min" "docs/stratisd.8" ]; + buildFlags = [ "build-all" ]; doCheck = true; checkTarget = "test"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/stuffbin/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/stuffbin/default.nix index 92c9785e27..442307fad6 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/stuffbin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/stuffbin/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "stuffbin"; version = "1.1.0"; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; src = fetchFromGitHub { owner = "knadh"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix index 0512a8407d..cd6cbe5e79 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/svnfs/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE filesystem for accessing Subversion repositories"; - homepage = "http://www.jmadden.eu/index.php/svnfs/"; + homepage = "https://www.jmadden.eu/index.php/svnfs/"; license = lib.licenses.gpl2Only; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/games/er-patcher/default.nix b/third_party/nixpkgs/pkgs/tools/games/er-patcher/default.nix index 1eaad03a32..4440277b66 100644 --- a/third_party/nixpkgs/pkgs/tools/games/er-patcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/er-patcher/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "er-patcher"; - version = "1.06-2"; + version = "1.06-3"; src = fetchFromGitHub { owner = "gurrgur"; repo = "er-patcher"; rev = "v${version}"; - sha256 = "sha256-rFIuswn55FNVmBoDfIpG2cKxybNDaTwOeIUFFoncGF0="; + sha256 = "sha256-w/5cXxY4ua5Xo1BSz3MYRV+SdvVGFAx53KMIORS1uWE="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/games/gamemode/default.nix b/third_party/nixpkgs/pkgs/tools/games/gamemode/default.nix index e2aeea8377..230ccb2ed5 100644 --- a/third_party/nixpkgs/pkgs/tools/games/gamemode/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/gamemode/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ appstream ]; diff --git a/third_party/nixpkgs/pkgs/tools/games/opentracker/default.nix b/third_party/nixpkgs/pkgs/tools/games/opentracker/default.nix index 8140b34c1e..6bb5fc8ff2 100644 --- a/third_party/nixpkgs/pkgs/tools/games/opentracker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/opentracker/default.nix @@ -1,38 +1,43 @@ -{ lib -, stdenv -, buildDotnetModule -, fetchFromGitHub -, autoPatchelfHook -, wrapGAppsHook -, dotnetCorePackages -, fontconfig -, gtk3 -, openssl -, libX11 -, libXi -, xinput +{ + lib, + stdenv, + buildDotnetModule, + fetchFromGitHub, + autoPatchelfHook, + wrapGAppsHook, + dotnetCorePackages, + fontconfig, + gtk3, + libunwind, + openssl, + xinput, + xorg, }: - buildDotnetModule rec { pname = "opentracker"; - version = "1.8.2"; + version = "1.8.5"; src = fetchFromGitHub { owner = "trippsc2"; repo = pname; - rev = version; - sha256 = "0nsmyb1wd86465iri9jxl3jp74gxkscvnmr3687ddbia3dv4fz0z"; + rev = "refs/tags/${version}"; + hash = "sha512-nWkPgVYdnBJibyJRdLPe3O3RioDPbzumSritRejmr4CeiPb7aUTON7HjivcV/GKor1guEYu+TJ+QxYrqO/eppg=="; }; - dotnet-runtime = dotnetCorePackages.runtime_3_1; - dotnet-sdk = dotnetCorePackages.sdk_3_1; + patches = [./remove-project.patch]; + + dotnet-runtime = dotnetCorePackages.runtime_6_0; nugetDeps = ./deps.nix; projectFile = "OpenTracker.sln"; - executables = [ "OpenTracker" ]; + executables = ["OpenTracker"]; doCheck = true; + disabledTests = [ + "OpenTracker.UnitTests.Models.Nodes.Factories.SLightWorldConnectionFactoryTests.GetNodeConnections_ShouldReturnExpectedValue" + "OpenTracker.UnitTests.Models.Sections.Factories.ItemSectionFactoryTests.GetItemSection_ShouldReturnExpected" + ]; nativeBuildInputs = [ autoPatchelfHook @@ -43,17 +48,27 @@ buildDotnetModule rec { stdenv.cc.cc.lib fontconfig gtk3 + libunwind ]; - runtimeDeps = [ - gtk3 - openssl - libX11 - libXi - xinput - ]; + runtimeDeps = + [ + gtk3 + openssl + xinput + ] + ++ (with xorg; [ + libICE + libSM + libX11 + libXi + ]); - autoPatchelfIgnoreMissingDeps = [ "libc.musl-x86_64.so.1" ]; # Attempts to patchelf unneeded SOs + # Attempts to patchelf unneeded SOs + autoPatchelfIgnoreMissingDeps = [ + "libc.musl-x86_64.so.1" + "libintl.so.8" + ]; meta = with lib; { description = "A tracking application for A Link to the Past Randomizer"; @@ -65,8 +80,8 @@ buildDotnetModule rec { binaryNativeCode ]; license = licenses.mit; - maintainers = [ maintainers.ivar ]; + maintainers = [maintainers.ivar]; mainProgram = "OpenTracker"; - platforms = [ "x86_64-linux" ]; + platforms = ["x86_64-linux"]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/games/opentracker/deps.nix b/third_party/nixpkgs/pkgs/tools/games/opentracker/deps.nix index fd7e7b3c27..b6185c4c34 100644 --- a/third_party/nixpkgs/pkgs/tools/games/opentracker/deps.nix +++ b/third_party/nixpkgs/pkgs/tools/games/opentracker/deps.nix @@ -2,65 +2,66 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Autofac"; version = "6.0.0"; sha256 = "1faz8j3caqh4f2w4bcicz5x67f63f6463jikg89sr9qmqbv778hn"; }) - (fetchNuGet { pname = "Autofac"; version = "6.1.0"; sha256 = "0g1iic7y19rm536dzsllabw7phbgb6wzghhpfmdxz7yp7zrfjk15"; }) - (fetchNuGet { pname = "Autofac.Extras.Moq"; version = "6.0.0"; sha256 = "1jbdzwr712iq11s3i24a4b7g6025djkmf40fcrfiqkihvdrfprcw"; }) - (fetchNuGet { pname = "Avalonia"; version = "0.10.0"; sha256 = "0wf8nqdj0xi6drzw676vm5ac2kaxcd76af4y1cirfw4j7lxvs344"; }) + (fetchNuGet { pname = "Autofac"; version = "6.3.0"; sha256 = "0zg0lsqzb8hh7l97mfd2z3fxdab86sbmxkaprzi41v0hs1x3jd9b"; }) + (fetchNuGet { pname = "Avalonia"; version = "0.10.12"; sha256 = "1hb6v8sm7gd8aswdv0slnk8cvvxs5ac82knc3pzvxj0js2n4lnv2"; }) (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.0"; sha256 = "0yry5kwbp03lznv2zay39p2ry2jsdf7s1syjzf93dd64pgl5bwpk"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.0"; sha256 = "1vwaxxnzcgkdrxvrkjcxpc9c839pxmm6ajq83xiqzn5f4vvx29di"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.0"; sha256 = "1fw6bbbm7g1w4s6hyskkx7p59i3p965bly8p50dmfs31ls01jfrx"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.0"; sha256 = "08z3vybk474yxaipd7nqqr9xycgprggcri4lp61ns3p3fj599ydp"; }) - (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.0"; sha256 = "05wdf7gc5v03gia29srq44g49ijqg45vygargm087m2s63i134jk"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.0"; sha256 = "1kfzn349rllp7ngydvxqn84hmgxrkbgf7mgrqwcagq809f73mzyp"; }) - (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "0.10.0"; sha256 = "0azkwfi72gy7158fpfs6i0iixixy00zfkgsh939pfzy7fkz5pq8m"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.0"; sha256 = "0527966nmjdhzdq6dwhjhyc79kmy56ymhxsmrp344jn43d67kmnr"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.0"; sha256 = "1d5w7pl1xx9l250mhdq3jnpy5zl77j8n3ccjjxfg8sc7rnyd2fx9"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.0"; sha256 = "0lyfmhh0q1dzzb5blp76phj894wl6ab0kn1pcprxqvj94dcwric8"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.0"; sha256 = "0asja6g20c6wzxmvx0knkdk6f5fbrx99n82zcrj4y2irhmmzjhxy"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Behaviors"; version = "0.10.0"; sha256 = "10g6i9y00a13cy3y889y3z8i5p5arpif53q3xx9k6k0qzcq6zq51"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactions"; version = "0.10.0"; sha256 = "0s1mha3m912lmzaw87a841807fcx150vmhwcbfb8mnhqf6qgdwjy"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactions.DragAndDrop"; version = "0.10.0"; sha256 = "1hi9ii7r6xr6avac0a2fs1fq9x34iw23hn1qmnzskbj6jz1pzsbj"; }) - (fetchNuGet { pname = "Avalonia.Xaml.Interactivity"; version = "0.10.0"; sha256 = "0nqpxbn390g98vyhvp4rvbchxlrcc8vkjjkakgz15crk1irf941b"; }) - (fetchNuGet { pname = "Castle.Core"; version = "4.0.0"; sha256 = "10zq7mb1gvm946grw7fxa5dh1xwccqmk5jmwx6pqn7kbjp9frkpy"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.12"; sha256 = "1r8qi0kgd9rqbacnriy5sa684d12vxi45a6n2a4w7ydxr97zv5nm"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.12"; sha256 = "17ng7vvmynnmll7fb8zkjlhcn0ksg7p4v6kw207yq72acgvyn96g"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.12"; sha256 = "17skzs05iv5ljgnqm36zrbhrh3x20xf5hgni543i02zffj2015ki"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.12"; sha256 = "00920pdiv8wlpym0s80nz8lfmw515ikrr5f2a6sr4kmjwfd9cffj"; }) + (fetchNuGet { pname = "Avalonia.Markup.Xaml.Loader"; version = "0.10.12"; sha256 = "18glwqn4a8p3rz5zsp1xyrm5xwv853056nykf7mdcv1lglh74fsm"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.12"; sha256 = "1j6gxg0n55923rbw2p7z6yh27i81xrzpqarb268d3hd6hgjycwc1"; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "0.10.12"; sha256 = "04ga7f8bmz3bqp4dsc4fzrphfq61zf62hlz4nbazf1igx0jzdygy"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.12"; sha256 = "0ghrb8yf4qahwlpa2appk7q0m0n01q0s65nx1xj1plpi4jr6vvw2"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.12"; sha256 = "1qj0sw4780za3p6hbwvx1p3b6px3s5vp3ml3vvyak1bajvifz969"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.12"; sha256 = "1af174qca95gxf04zhxm716mi1dazfz7k3995i1nyaz7hygs3p04"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.12"; sha256 = "1jjg4lhg0a95laffwm7imgs92q06whrfkaszm7svgfv1ryazv71q"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Behaviors"; version = "0.10.12"; sha256 = "0j897knwxpl6sss8v2wrhy4bw4nw4jqc04n8b8d4s76jaqcr3z2h"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactions"; version = "0.10.12"; sha256 = "0nyqg66sg7garc2k729k3dqixbb3asvsjd2kxympfx9q6xyz6vrh"; }) + (fetchNuGet { pname = "Avalonia.Xaml.Interactivity"; version = "0.10.12"; sha256 = "13qbmz39bf29wvq82b1irci8y50fjhhj563cdwd235nm633sixqb"; }) + (fetchNuGet { pname = "Castle.Core"; version = "4.4.1"; sha256 = "13dja1jxl5zwhi0ghkgvgmqdrixn57f9hk52jy5vpaaakzr550r7"; }) + (fetchNuGet { pname = "Citrus.Avalonia"; version = "1.6.1"; sha256 = "1hl98dmgmm6ml5gl70v7vg577n7vn6bjxaq82sgnql5g623pg18x"; }) (fetchNuGet { pname = "DotNet.Bundle"; version = "0.9.13"; sha256 = "0awzvk62hgszm9b8ar87y862aj8nlm77d7hgfmp84mxny0ag03jl"; }) - (fetchNuGet { pname = "DynamicData"; version = "7.1.1"; sha256 = "14xcqkw87zbjljy1pb727kwq5a4dfmsf5vg99fq0xxb71q828nvh"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.6.1.7"; sha256 = "0xm4dr6cs5n1ywbbpp1jrxfk8rn1iy61kdm29kb6bqj1q0gv8zyv"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.6.1.7"; sha256 = "1slackrhcwsjn3f6sa0nlrcynzmx5pbqv8j33l9w6z9w7ssq4wkn"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2020.3.0"; sha256 = "04xlfqnfg3069f014q8f0vx7y70m8nldbf9fia4b50bp3rry2lv2"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.2"; sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.9.0"; sha256 = "1x6l6kn8iv5gk1545nxs2gwzkb8gj4sb9kryai132l7yg9afjqik"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.9.0"; sha256 = "0crb9x5rhija8y7b0iya9axcvinz2hv3bgf80bvz7kv6zpbpszkz"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.9.0"; sha256 = "0hrihj0q96vjlbfvkq9l4maqdf6rqdznr7cpj82iw51n8kbzj8s3"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "5.0.3"; sha256 = "1l0zg9wl8yapjq9g2d979zhsmdkr8kfybmxnl7kvgkgldf114fbg"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.9.0"; sha256 = "0kds9i8bla540787qchbzayrg50ai40pxyai2vihc1m2l39h4mdf"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.9.1"; sha256 = "18isx8w4kwnlk6hq5ay8i4lgzwhx0zg9brayfdk2lakagvv6yyaf"; }) + (fetchNuGet { pname = "DynamicData"; version = "7.4.11"; sha256 = "1vrrwkmqrdzr4ncjihfzik5ykmy1234iyp2q5qk8spz6y0gwq2h8"; }) + (fetchNuGet { pname = "DynamicData"; version = "7.4.9"; sha256 = "0ssgh42fi5m6xyw36f4km04ls9nq4w8cpbck8gh7g8n3ixz05rrw"; }) + (fetchNuGet { pname = "ExpectedObjects"; version = "3.5.4"; sha256 = "1mklg6dx8biaaf9jxp09rddsw66l42r4fpsgnmm6szn6fj2n888k"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; sha256 = "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; sha256 = "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; sha256 = "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; sha256 = "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.3.0"; sha256 = "01ssylllbwpana2w3iybi533zlvcsbhzjc8kr0g4kg307kjbfn8v"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.0.1"; sha256 = "0axjv1nhk1z9d4c51d9yxdp09l8yqqnqaifhqcwnxnv0r4y5cka9"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.0.1"; sha256 = "1h6jfifg7pw2vacpdds4v4jqnaydg9b108irf315wzx6rh8yv9cb"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "4.0.1"; sha256 = "0ncbld51ja7hp6p2cabw0dx4km2syiz0z58al62h21cpbjfnls5p"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "6.0.0"; sha256 = "06zy947m5lrbwb684g42ijb07r5jsqycvfnphc6cqfdrfnzqv6k9"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "4.0.1"; sha256 = "0zhrlk30js7dp6i76zd7zilaxq26gwsl3pk85p919039786sqs9p"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.0.0"; sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.1"; sha256 = "1761mvkp5mwhw150fvazdhh4ybvxpvx05g9znf8n1fqx832wxrw5"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.0.0"; sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.1"; sha256 = "12ilya3x6g5frbwmh41mwygax9v8vrycq3vnzhv3r258jwv69974"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "6.0.1"; sha256 = "13v33cm88px9wymlxidzgy2ljaq33h1xna3lgdggmy7w4bbdkddh"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.1"; sha256 = "1igpx7ldxqx9fkrbhakd2bybc0dgpvj86zr30vpfj31ncm6lp4id"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.1"; sha256 = "1frx5r7l0jd3j6my4s2qas13fkljgfn87a84xk8l7sisafpfsvzp"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.0.0"; sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.0.0"; sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "5.0.0"; sha256 = "0sja4ba0mrvdamn0r9mhq38b9dxi08yb3c1hzh29n1z6ws1hlrcq"; }) - (fetchNuGet { pname = "Moq"; version = "4.7.0"; sha256 = "1y1lzg7scrzl5x8cxsbrgkpg79mf3v0ylnpgjw8q6hib2rhsi8ff"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.3"; sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "NSubstitute"; version = "4.3.0"; sha256 = "026kx6fab9r1a0m8p9hlznp73qhh44k4i0352szvchsis6vlj9gm"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) - (fetchNuGet { pname = "Packaging.Targets"; version = "0.1.155"; sha256 = "0iija7gskcbrj8qgj5lqxqsfpz8k58fbvjnix6rccpzgvb16dkhy"; }) - (fetchNuGet { pname = "ReactiveUI"; version = "12.1.1"; sha256 = "1mwv9fi2zazp9ddwci9xfzrmi4pyp8n69r8ilc4lp5lvr1c6chih"; }) - (fetchNuGet { pname = "ReactiveUI"; version = "13.2.2"; sha256 = "1f9jh3d8lblqpva4iy5c6qvnya3cc0fp6mva3f9z3q7ll8v4h62h"; }) + (fetchNuGet { pname = "Packaging.Targets"; version = "0.1.220"; sha256 = "0ci4jkkqk70vwzf2sgc44a8dap70afp6yhvj967shy7anffxb511"; }) + (fetchNuGet { pname = "ReactiveUI"; version = "13.2.10"; sha256 = "0x4pk45wipzsjzkv23as8l0sdds665l9404gaix8c0z2n24s76gg"; }) + (fetchNuGet { pname = "ReactiveUI"; version = "17.1.17"; sha256 = "1v0w88mk8bh68lcj968q61zyx6l07himild605c2xi5lb6a42z71"; }) (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) @@ -75,46 +76,44 @@ (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "4.1.0"; sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; }) - (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0-dev-00909"; sha256 = "1rz1zzyamnl8g4ccscaaij2bkhpd4md4sr9k28i0zwvij4kpj22z"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.80.2"; sha256 = "17n0f4gfxz69fzd7zmgimbxfja15vq902arap2rqjr1hxp8sck7g"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.80.2"; sha256 = "1951b7rpisaymb37j846jq01pjd05l4fjlnf56blh33ihxyj2jzi"; }) + (fetchNuGet { pname = "Serilog.Sinks.Debug"; version = "2.0.0"; sha256 = "1i7j870l47gan3gpnnlzkccn5lbm7518cnkp25a3g5gp9l0dbwpw"; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.0-preview.178"; sha256 = "062g14s6b2bixanpwihj3asm3jwvfw15mhvzqv6901afrlgzx4nk"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.0-preview.178"; sha256 = "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.0-preview.178"; sha256 = "14p95nxccs6yq4rn2h9zbb60k0232k6349zdpy31jcfr6gc99cgi"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.0-preview.178"; sha256 = "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0-preview.178"; sha256 = "0ficil702lv3fvwpngbqh5l85i05l5jafzyh4jprzshr2qbnd8nl"; }) (fetchNuGet { pname = "Splat"; version = "10.0.1"; sha256 = "18fzrn7xwjzxj4v3drs8djd3yf14bnq5n9n8vdnwfa1zk5jqpsb9"; }) - (fetchNuGet { pname = "Splat"; version = "9.6.1"; sha256 = "1sd3gbcv21vwl3spcpmy4d7nzcs0x6m72qj8qfbv4dvgpvbv5sdy"; }) - (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) + (fetchNuGet { pname = "Splat"; version = "14.1.17"; sha256 = "1akhj04sbxhhfj6zdlr5c0sh696747b0x46g3ayv4yl15kwq6pz5"; }) (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.0.1"; sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.0.1"; sha256 = "1wbv7y686p5x169rnaim7sln67ivmv6r57falrnx8aap9y33mam9"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.0.1"; sha256 = "0v4qpmqlzyfad2kswxxj2frnaqqhz9201c3yn8fmmarx5vlzg52z"; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) + (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.1.0"; sha256 = "0wb5mnaag0w4fnyc40x19j8v2vshxp266razw64bcqfyj1whb1q0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.1.0"; sha256 = "178cva9p1cs043h5n2fry5xkzr3wc9n0hwbxa8m3ymld9m6wcv0y"; }) - (fetchNuGet { pname = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) + (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) + (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.7.1"; sha256 = "1mivaifniyrqwlnvzsfaxzrh2sd981bwzs3cbvs5wi7jjzbcqr4p"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "5.0.1"; sha256 = "0mzw44wsm87vpslb9sn7rirxynpq9m3b00l7gl0q71m8shfh66qs"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.0"; sha256 = "0rrihs9lnb1h6x4h0hn6kgfnh58qq7hx8qq99gh6fayx4dcnx3s5"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.0.0"; sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; }) - (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) + (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "5.0.1"; sha256 = "14h722wq58k1wmgxmpws91xc7kh8109ijw0hcxjq9qkbhbi6pwmb"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) @@ -128,7 +127,6 @@ (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Linq.Queryable"; version = "4.0.1"; sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) @@ -162,6 +160,7 @@ (fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) @@ -182,7 +181,7 @@ (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) @@ -200,10 +199,9 @@ (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.0.1"; sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; }) - (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.0.11"; sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; }) - (fetchNuGet { pname = "ThemeEditor.Controls.ColorPicker"; version = "0.10.0"; sha256 = "0sib6cf2xkss48rm3shbwr57rbzz7d2zq0fvjp0hwsa1mb985p2b"; }) - (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.1"; sha256 = "095vinsbb9pbphbhh7x7rxvs8a3b9w1nnz7gxn9bw5is01qnhgdm"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) + (fetchNuGet { pname = "ThemeEditor.Controls.ColorPicker"; version = "0.10.12"; sha256 = "17kh28fkywqmz5yams8wzr50ihkv52y24gk8bz9fxl6kfzmgk0ky"; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.10.1"; sha256 = "1wafa009cjj1rziias2n00ap0g8kdg2iig5sjlrxj2kld24lgbli"; }) (fetchNuGet { pname = "WebSocketSharp-netstandard"; version = "1.0.1"; sha256 = "0q89wiqpli72333zsa04d1vzq9xj0583hn5mih9sdd84myksz5b0"; }) (fetchNuGet { pname = "xunit"; version = "2.4.1"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; }) (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) diff --git a/third_party/nixpkgs/pkgs/tools/games/opentracker/remove-project.patch b/third_party/nixpkgs/pkgs/tools/games/opentracker/remove-project.patch new file mode 100644 index 0000000000..22a2068512 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/games/opentracker/remove-project.patch @@ -0,0 +1,14 @@ +diff --git a/OpenTracker.sln b/OpenTracker.sln +index 0a8c438..77124e1 100644 +--- a/OpenTracker.sln ++++ b/OpenTracker.sln +@@ -4,9 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 + VisualStudioVersion = 16.0.29806.167 + MinimumVisualStudioVersion = 10.0.40219.1 + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracker", "OpenTracker\OpenTracker.csproj", "{9D32A24F-7FF0-4632-B663-5AD2D64A6C87}" +- ProjectSection(ProjectDependencies) = postProject +- {732A9A56-32B4-4149-B3A5-F2A4F48293D3} = {732A9A56-32B4-4149-B3A5-F2A4F48293D3} +- EndProjectSection + EndProject + Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenTracker.Models", "OpenTracker.Models\OpenTracker.Models.csproj", "{5DB05A1F-56E3-4035-8898-5CFB22DB3568}" + EndProject diff --git a/third_party/nixpkgs/pkgs/tools/games/pokefinder/default.nix b/third_party/nixpkgs/pkgs/tools/games/pokefinder/default.nix index 547b0c47bc..176cdc76ee 100644 --- a/third_party/nixpkgs/pkgs/tools/games/pokefinder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/pokefinder/default.nix @@ -26,8 +26,11 @@ stdenv.mkDerivation rec { patchShebangs Source/Core/Resources/ ''; - installPhase = '' + installPhase = lib.optionalString (!stdenv.isDarwin) '' install -D Source/Forms/PokeFinder $out/bin/PokeFinder + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -R Source/Forms/PokeFinder.app $out/Applications ''; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix b/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix index 039e46f719..56e94807fe 100644 --- a/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "scarab"; - version = "1.19.0.0"; + version = "1.20.0.0"; src = fetchFromGitHub { owner = "fifty-six"; repo = pname; rev = "v${version}"; - sha256 = "10pmzy7nhcam0686kpn64cgar59shzzy5k7j3vrgmnm27zgkr22v"; + sha256 = "sha256-VfXIxir4SaELuF2QpqbVzTvlkYxwERa0ddGEn1OAh04="; }; nugetDeps = ./deps.nix; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix index b9402e2306..13e8705f76 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 @@ stdenvNoCC.mkDerivation rec { pname = "agi"; - version = "3.0.1"; + version = "3.2.1"; src = fetchzip { url = "https://github.com/google/agi/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-793lOJL1/wqETkWfiksnLY3Lmxx500fw4PIzT9ZQqQs="; + sha256 = "sha256-wguQERJ5Zvcodk7QMtloCwI4qYmatmHCFhgArbS07EA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix index b9d30adf39..310045cd23 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix @@ -31,13 +31,13 @@ with rec { stdenv.mkDerivation rec { pname = "astc-encoder"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-zE0rXCmRz3z1P1wLm8aO7iQ/Yf1TJeEZqz9fB0Shsz4="; + sha256 = "sha256-FIskGHamKYYUtYmgwh7dS+bs2UPWIyBiviPkDAbVY+0="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix index 5b3431a919..4cf5970c5a 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://enblend.sourceforge.net/"; + homepage = "https://enblend.sourceforge.net/"; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gfxreconstruct/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gfxreconstruct/default.nix index 9dfd0def4a..2c486b4753 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gfxreconstruct/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gfxreconstruct/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gfxreconstruct"; - version = "0.9.16.1"; + version = "0.9.17"; src = fetchFromGitHub { owner = "LunarG"; repo = "gfxreconstruct"; rev = "v${version}"; - hash = "sha256-6yUWXIJlfwaPT1SDVjSfO7Sj10DcpOLAbzASC4dLS1E="; + hash = "sha256-CkZxxMoV2cqyh4ck81ODPxTYuSeQ8Q33a/4lL7UOfIY="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gifsicle/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gifsicle/default.nix index b200f487b2..c21d51dce6 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gifsicle/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gifsicle/default.nix @@ -3,8 +3,6 @@ , static ? stdenv.hostPlatform.isStatic }: -with lib; - stdenv.mkDerivation rec { pname = "gifsicle"; version = "1.93"; @@ -14,11 +12,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-kvZweXMr9MHaCH5q4JBSBYRuWsd3ulyqZtEqc6qUNEc="; }; - buildInputs = optionals gifview [ xorgproto libXt libX11 ]; + buildInputs = lib.optionals gifview [ xorgproto libXt libX11 ]; - configureFlags = optional (!gifview) "--disable-gifview"; + configureFlags = lib.optional (!gifview) "--disable-gifview"; - LDFLAGS = optionalString static "-static"; + LDFLAGS = lib.optionalString static "-static"; doCheck = true; checkPhase = '' @@ -29,7 +27,7 @@ stdenv.mkDerivation rec { description = "Command-line tool for creating, editing, and getting information about GIF images and animations"; homepage = "https://www.lcdf.org/gifsicle/"; license = lib.licenses.gpl2; - platforms = platforms.all; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ zimbatm ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix index 7751ecdf25..5723d40141 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.8.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-KAm4ng+FIMmhHAxoFNNVo48GVbW3c+raX6Hcab+KCf8="; + sha256 = "sha256-JJSAU9z3JOlvfW6AW/P/KrjhOcD0ax8TmqgqM48rlAo="; }; - cargoSha256 = "sha256-xbE1Olf0lh6o4kF9ubZhdnTbZsJcd5TvLf7P1nWLf9Q="; + cargoHash = "sha256-UV2iQFbeGvJs8kEowYRNv8DxEGwaIWL1/3A2oUCcauw="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/glmark2/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/glmark2/default.nix index 9615b57e0c..5503e9eb38 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/glmark2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/glmark2/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "glmark2"; - version = "2021.12"; + version = "2023.01"; src = fetchFromGitHub { owner = "glmark2"; repo = "glmark2"; rev = version; - sha256 = "sha256-S6KkazkG+kdx02MPwrYvCFWSOtM6t5xT0OTE9PLCzas="; + sha256 = "sha256-WCvc5GqrAdpIKQ4LVqwO6ZGbzBgLCl49NxiGJynIjSQ="; }; nativeBuildInputs = [ pkg-config wafHook makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix index a937ea5178..f67021f384 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix @@ -2,7 +2,6 @@ , mkDerivation , variant ? "standalone" , fetchFromGitHub -, fetchpatch , cmake , pkg-config , ninja @@ -15,7 +14,6 @@ , libtiff , libpng , curl -, krita ? null , gimp ? null , gmic , cimg @@ -39,13 +37,6 @@ let description = "GIMP plugin for the G'MIC image processing framework"; }; - krita = { - extraDeps = [ - krita - ]; - description = "Krita plugin for the G'MIC image processing framework"; - }; - standalone = { description = "Versatile front-end to the image processing framework G'MIC"; }; @@ -59,13 +50,13 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps mkDerivation rec { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.1.6"; + version = "3.2.0"; src = fetchFromGitHub { owner = "c-koi"; repo = "gmic-qt"; rev = "v.${version}"; - sha256 = "sha256-/5wDHvJSMgEheg8YV4W40wUiHz25emIoFnGdfO8i92g="; + sha256 = "sha256-I5XC7zbDyBPFj4zul9rshoyeVV0hRQQ3aZQzEvYrgdc="; }; nativeBuildInputs = [ @@ -95,15 +86,6 @@ mkDerivation rec { "-DENABLE_SYSTEM_GMIC:BOOL=ON" ]; - patches = [ - # NOTE: this should be removed when a new version is released. - (fetchpatch { - name = "fix_filter_translation_scripts.patch"; - url = "https://github.com/c-koi/gmic-qt/commit/ccb9f29eda239d0c80663593cd90a6548c935b39.patch"; - sha256 = "sha256-OzuJ6yGuDJweQ+1uin/pmJqZV79bN9E1Zuo+0iciwzg="; - }) - ]; - postPatch = '' patchShebangs \ translations/filters/csv2ts.sh \ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix index 8f66d054cd..6e811e1aa3 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gmic/default.nix @@ -25,15 +25,15 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "3.1.6"; + version = "3.2.0"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchFromGitHub { owner = "dtschump"; repo = "gmic"; - rev = "326ea9b7dc320b3624fe660d7b7d81669ca12e6d"; - sha256 = "RRCzYMN/IXViiUNnacJV3DNpku3hIHQkHbIrtixExT0="; + rev = "v.${version}"; + hash = "sha256-lrIlzxXWqv046G5uRkBQnjvysaIcv+iDKxjuUEJWqcs="; }; # TODO: build this from source @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { gmic_stdlib = fetchurl { name = "gmic_stdlib.h"; url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h"; - sha256 = "adObp8s+2TWaS+X/bQSphWRK6o85h+DGwlIDol6XN/4="; + hash = "sha256-kWHzA1Dk7F4IROq/gk+RJllry3BABMbssJxhkQ6Cp2M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix index f4d9e5b3c9..09050275fe 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "gromit-mpx"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; rev = version; - sha256 = "sha256-2inmcKSdvHs7WaU095liH12Og9ezsNSs2qygltWOclw="; + sha256 = "sha256-nbSyWcccu07FZbvOESFhlnuxgTNgJ+/6ujVQvEyQGGo="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix index 30848d7d0d..6c0e827a84 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/imgurbash2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgurbash2"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "ram-on"; repo = "imgurbash2"; rev = version; - sha256 = "10zs6p17psl1vq5vpkfkf9nrlmibk6v1ds3yxbf1rip1zaqlwxg6"; + sha256 = "sha256-7J3LquzcYX0wBR6kshz7VuPv/TftTzKFdWcgsML2DnI="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/default.nix index d1acce2d7f..bbaed09684 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/ldgallery/viewer/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkgs, pandoc, CoreServices }: -with lib; - let # Note for maintainers: # * keep version in sync with the ldgallery compiler @@ -21,13 +19,13 @@ let nodePkg = nodePackages.package.override { src = "${sourcePkg}/viewer"; postInstall = "npm run build"; - buildInputs = optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; }; in # making sure that the source and the node package are in sync -assert versions.majorMinor nodePkg.version == removePrefix "v" sourcePkg.rev; +assert lib.versions.majorMinor nodePkg.version == lib.removePrefix "v" sourcePkg.rev; stdenv.mkDerivation { pname = nodePkg.packageName; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix index ad75d6667d..c0c7706310 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.0.2"; + version = "11.1.0"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4468"; - sha256 = "EW96q9DsM1lQ3QZAmp0hZhQ6icsZFDGa3wYmjCQmBRE="; + rev = "4489"; + sha256 = "00qagNgNZ+9sedBme0WmJfedF4WST8EFeqUJ5Wx3yEQ="; }; nativeBuildInputs = [ @@ -118,7 +118,7 @@ stdenv.mkDerivation { passthru.updateScript = ./update.sh; meta = { - homepage = "http://netpbm.sourceforge.net/"; + homepage = "https://netpbm.sourceforge.net/"; description = "Toolkit for manipulation of graphic images"; license = lib.licenses.free; # http://netpbm.svn.code.sourceforge.net/p/netpbm/code/trunk/doc/copyright_summary platforms = with lib.platforms; linux ++ darwin; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/nifskope/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/nifskope/default.nix index 508aec8186..f74b720ea9 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/nifskope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/nifskope/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://niftools.sourceforge.net/wiki/NifSkope"; + homepage = "https://niftools.sourceforge.net/wiki/NifSkope"; description = "A tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files"; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/optipng/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/optipng/default.nix index 65ebd8ddbd..3e9127a9a9 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/optipng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/optipng/default.nix @@ -4,8 +4,6 @@ # This package comes with its own copy of zlib, libpng and pngxtern -with lib; - stdenv.mkDerivation rec { pname = "optipng"; version = "0.7.7"; @@ -17,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng ]; - LDFLAGS = optional static "-static"; + LDFLAGS = lib.optional static "-static"; # Workaround for crash in cexcept.h. See # https://github.com/NixOS/nixpkgs/issues/28106 preConfigure = '' @@ -36,7 +34,7 @@ stdenv.mkDerivation rec { '' else null; meta = with lib; { - homepage = "http://optipng.sourceforge.net/"; + homepage = "https://optipng.sourceforge.net/"; description = "A PNG optimizer"; license = licenses.zlib; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix index 2bc40f1cc7..f02a056c35 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pfstools/default.nix @@ -39,7 +39,7 @@ mkDerivation rec { patches = [ ./glut.patch ./threads.patch ./pfstools.patch ./pfsalign.patch ]; meta = with lib; { - homepage = "http://pfstools.sourceforge.net/"; + homepage = "https://pfstools.sourceforge.net/"; description = "Toolkit for manipulation of HDR images"; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pgf/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pgf/default.nix index 7cac5a8e21..a2adb7ee61 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pgf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pgf/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchurl, autoconf, automake, libtool, dos2unix, libpgf, freeimage, doxygen }: -with lib; stdenv.mkDerivation rec { pname = "pgf"; version = "6.14.12"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix index c8c1bd8d95..aed3d485c4 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix @@ -1,16 +1,17 @@ { lib , stdenv -, fetchurl +, fetchfossil }: stdenv.mkDerivation { pname = "pikchr"; # To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk - version = "unstable-2022-06-20"; + version = "unstable-2022-12-07"; - src = fetchurl { - url = "https://pikchr.org/home/tarball/d9ee756594b6eb64/pikchr.tar.gz"; - sha256 = "sha256-ML+gymFrBay1kly7NYsxo0I1qNMoZPzNI3ClBTrWlHw="; + src = fetchfossil { + url = "https://pikchr.org/home"; + rev = "21ca6b843d65c404"; + sha256 = "sha256-fp06GqpLa/szRCS54KJ+SkT602oWvK3KyDFFjTmpNfI="; }; # can't open generated html files diff --git a/third_party/nixpkgs/pkgs/tools/graphics/ploticus/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/ploticus/default.nix index f315dc9a63..3ee17eb630 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/ploticus/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/ploticus/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Use gd from Nixpkgs instead of the vendored one. # This is required for non-ASCII fonts to work: - # http://ploticus.sourceforge.net/doc/fonts.html + # https://ploticus.sourceforge.net/doc/fonts.html ./use-gd-package.patch ]; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; - homepage = "http://ploticus.sourceforge.net/"; + homepage = "https://ploticus.sourceforge.net/"; platforms = with platforms; linux ++ darwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pngnq/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pngnq/default.nix index 81f33c65af..57b83cbf9e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pngnq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pngnq/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://pngnq.sourceforge.net/"; + homepage = "https://pngnq.sourceforge.net/"; description = "A PNG quantizer"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/sanjuuni/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/sanjuuni/default.nix index bccb336b70..a0b2accb6b 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/sanjuuni/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/sanjuuni/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "sanjuuni"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "MCJack123"; repo = "sanjuuni"; rev = version; - sha256 = "sha256-WWDbPwiU4YD8XCMuqLWEGinpHkq2FNJZsz3GyVqjDHQ="; + sha256 = "sha256-8IbdLXWUtT2VN6Eu1b8x4DnyI8JOd/12t0XDa6o3N+A="; }; nativeBuildInputs = [ @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/MCJack123/sanjuuni"; description = "A command-line tool that converts images and videos into a format that can be displayed in ComputerCraft"; + changelog = "https://github.com/MCJack123/sanjuuni/releases/tag/${version}"; maintainers = [ maintainers.tomodachi94 ]; license = licenses.gpl2Plus; broken = stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/sic-image-cli/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/sic-image-cli/default.nix index f9667719c8..e3fbcf4388 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/sic-image-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/sic-image-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sic-image-cli"; - version = "0.20.1"; + version = "0.21.1"; src = fetchFromGitHub { owner = "foresterre"; repo = "sic"; rev = "v${version}"; - sha256 = "sha256-VSBOmE5xdAS15z/KgQ54KfxM2/plEKtpmjOB+T9kLt4="; + sha256 = "sha256-JSBvHbqGTwjiKRPuomXtFLgu77ZB4bOlV/JgzIxaWC0="; }; - cargoSha256 = "sha256-hkK22c7Z/Wj8ebQkjcdK7H6dms6MI9Sm9yrpqfCCxGA="; + cargoSha256 = "sha256-HWnYBLxiz7Kd5rmgTFeIG8XtiRzhRKuo/vunJRPLdWU="; nativeBuildInputs = [ installShellFiles nasm ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/sng/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/sng/default.nix index cec0b21cce..8ebfd96782 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/sng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/sng/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Minilanguage designed to represent the entire contents of a PNG file in an editable form"; - homepage = "http://sng.sourceforge.net/"; + homepage = "https://sng.sourceforge.net/"; license = licenses.zlib; maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix index 0c5b936093..4a75e28deb 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/spirv-cross/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "MoltenVK-1.1.5"; + version = "1.3.236.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; - rev = version; - sha256 = "/t6hAlGY3+bddWg5ERFbqeU4/MAjq+/AEVv1Jy2C0HA="; + rev = "sdk-${finalAttrs.version}"; + hash = "sha256-zx/fjDKgteWizC3O1bL4WSwwPNw2/2m0xCnCiOttgAo="; }; nativeBuildInputs = [ cmake python3 ]; @@ -21,4 +21,4 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ Flakebi ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix index ba96d72163..39492eefb8 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "vulkan-caps-viewer"; - version = "3.27"; + version = "3.28"; src = fetchFromGitHub { owner = "SaschaWillems"; repo = "VulkanCapsViewer"; rev = version; - hash = "sha256-B/FBX63JnBdshNLVMPA0qGnm0c/RGilIahX3VjJnpkI="; + hash = "sha256-gy0gFbPZAwQJHqJvk7WrbZ5y2I+9BGv9VaCoOW1QPek="; # Note: this derivation strictly requires vulkan-header to be the same it was developed against. # To help us, they've put it in a git-submodule. # The result will work with any vulkan-loader version. @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { qmakeFlags = [ "DEFINES+=wayland" "CONFIG+=release" - ] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ]; + ] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; @@ -51,10 +51,11 @@ stdenv.mkDerivation rec { Client application to display hardware implementation details for GPUs supporting the Vulkan API by Khronos. The hardware reports can be submitted to a public online database that allows comparing different devices, browsing available features, extensions, formats, etc. ''; - homepage = "https://vulkan.gpuinfo.org/"; - platforms = platforms.unix; - license = licenses.gpl2Only; + homepage = "https://vulkan.gpuinfo.org/"; + platforms = platforms.unix; + license = licenses.gpl2Only; maintainers = with maintainers; [ pedrohlc ]; + changelog = "https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/${version}"; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix new file mode 100644 index 0000000000..a5581e7d6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/default.nix @@ -0,0 +1,147 @@ +{ lib, stdenv +, fetchFromGitHub +, fetchurl +, cmake +, libdrm +, libglvnd +, libffi +, libpng +, libX11 +, libXau +, libXdmcp +, libxcb +, makeWrapper +, ninja +, pkg-config +, python3 +, vulkan-loader +, wayland +, wayland-protocols +, zlib +}: +let + renderdoc = fetchurl { + url = "https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h"; + hash = "sha256-57XwqlsbDq3GOhxiTAyn9a8TOqhX1qQnGw7z0L22ho4="; + }; + + # The build system expects all these dependencies inside the external folder and + # does not search for system-wide installations. + # It also expects the version specified in the repository, which can be incompatible + # with the version in nixpkgs (e.g. for SPIRV-Headers), so we don't want to patch in our packages. + amber = fetchFromGitHub { + owner = "google"; + repo = "amber"; + rev = "8b145a6c89dcdb4ec28173339dd176fb7b6f43ed"; + hash = "sha256-+xFYlUs13khT6r475eJJ+XS875h2sb+YbJ8ZN4MOSAA="; + }; + jsoncpp = fetchFromGitHub { + owner = "open-source-parsers"; + repo = "jsoncpp"; + rev = "9059f5cad030ba11d37818847443a53918c327b1"; + hash = "sha256-m0tz8w8HbtDitx3Qkn3Rxj/XhASiJVkThdeBxIwv3WI="; + }; + glslang = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "22d39cd684d136a81778cc17a0226ffad40d1cee"; + hash = "sha256-6LplxN7HOMK1NfeD32P5JAMpCBlouttxLEOT/XTVpLw="; + }; + spirv-tools = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "b930e734ea198b7aabbbf04ee1562cf6f57962f0"; + hash = "sha256-NWpFSRoxtYWi+hLUt9gpw0YScM3shcUwv9yUmbivRb0="; + }; + spirv-headers = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "36c0c1596225e728bd49abb7ef56a3953e7ed468"; + hash = "sha256-t1UMJnYONWOtOxc9zUgxr901QFNvqkgurjpFA8UzhYc="; + }; + vulkan-docs = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-Docs"; + rev = "135da3a538263ef0d194cab25e2bb091119bdc42"; + hash = "sha256-VZ8JxIuOEG7IjsVcsJOcC+EQeZbd16/+czLcO9t7dY4="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "vulkan-cts"; + version = "1.3.4.1"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "VK-GL-CTS"; + rev = "${finalAttrs.pname}-${finalAttrs.version}"; + hash = "sha256-XUFlYdudyRqa6iupB8N5QkUpumasyLLQEWcr4M4uP1g="; + }; + + outputs = [ "out" "lib" ]; + + prePatch = '' + mkdir -p external/renderdoc/src external/spirv-headers external/vulkan-docs + + cp -r ${renderdoc} external/renderdoc/src/renderdoc_app.h + + cp -r ${amber} external/amber/src + cp -r ${jsoncpp} external/jsoncpp/src + cp -r ${glslang} external/glslang/src + cp -r ${spirv-tools} external/spirv-tools/src + cp -r ${spirv-headers} external/spirv-headers/src + cp -r ${vulkan-docs} external/vulkan-docs/src + chmod u+w -R external + ''; + + buildInputs = [ + libdrm + libffi + libglvnd + libpng + libX11 + libXau + libXdmcp + libxcb + spirv-headers + spirv-tools + wayland + wayland-protocols + zlib + ]; + + nativeBuildInputs = [ + cmake + glslang + makeWrapper + ninja + pkg-config + python3 + ]; + + # Fix cts cmake not coping with absolute install dirs + cmakeFlags = [ + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + ]; + + postInstall = '' + mv $out $lib + + mkdir -p $out/bin $out/archive-dir + cp -a external/vulkancts/modules/vulkan/deqp-vk external/vulkancts/modules/vulkan/deqp-vksc $out/bin/ + cp -a external/vulkancts/modules/vulkan/vulkan $out/archive-dir/ + cp -a external/vulkancts/modules/vulkan/vk-default $out/ + + wrapProgram $out/bin/deqp-vk \ + --add-flags '--deqp-vk-library-path=${vulkan-loader}/lib/libvulkan.so' \ + --add-flags "--deqp-archive-dir=$out/archive-dir" + ''; + + meta = with lib; { + description = "Khronos Vulkan Conformance Tests"; + homepage = "https://github.com/KhronosGroup/VK-GL-CTS/blob/main/external/vulkancts/README.md"; + license = licenses.asl20; + maintainers = with maintainers; [ Flakebi ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch b/third_party/nixpkgs/pkgs/tools/graphics/wallutils/000-add-nixos-dirs-to-default-wallpapers.patch similarity index 100% rename from third_party/nixpkgs/pkgs/tools/graphics/wallutils/lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch rename to third_party/nixpkgs/pkgs/tools/graphics/wallutils/000-add-nixos-dirs-to-default-wallpapers.patch diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wallutils/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/wallutils/default.nix index 67c325eb26..6479dba249 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/wallutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/wallutils/default.nix @@ -1,45 +1,58 @@ { lib , buildGoModule , fetchFromGitHub -, pkg-config -, wayland , libX11 -, xbitmaps , libXcursor , libXmu , libXpm , libheif +, pkg-config +, wayland +, xbitmaps }: buildGoModule rec { pname = "wallutils"; - version = "5.12.4"; + version = "5.12.5"; src = fetchFromGitHub { owner = "xyproto"; repo = "wallutils"; rev = version; - sha256 = "sha256-NODG4Lw/7X1aoT+dDSWxWEbDX6EAQzzDJPwsWOLaJEM="; + hash = "sha256-qC+AF+NFXSrUZAYaiFPwvfZtsAGhKE4XFDOUcfXUAbM="; }; vendorSha256 = null; - patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ]; + patches = [ + ./000-add-nixos-dirs-to-default-wallpapers.patch + ]; excludedPackages = [ "./pkg/event/cmd" # Development tools ]; - ldflags = [ "-s" "-w" ]; + nativeBuildInputs = [ + pkg-config + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm libheif ]; + buildInputs = [ + libX11 + libXcursor + libXmu + libXpm + libheif + wayland + xbitmaps + ]; + + ldflags = [ "-s" "-w" ]; preCheck = let skippedTests = [ - "TestClosest" # Requiring Wayland or X. - "TestNewSimpleEvent" # Blocking + "TestClosest" # Requiring Wayland or X "TestEveryMinute" # Blocking + "TestNewSimpleEvent" # Blocking ]; in '' export XDG_RUNTIME_DIR=`mktemp -d` @@ -47,11 +60,12 @@ buildGoModule rec { buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") ''; - meta = with lib; { + meta = { description = "Utilities for handling monitors, resolutions, and (timed) wallpapers"; inherit (src.meta) homepage; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.AndersonTorres ]; + inherit (wayland.meta) platforms; + badPlatforms = lib.platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix index 460d45c1ea..745640bfa2 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wgpu-utils"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "gfx-rs"; repo = "wgpu"; rev = "v${version}"; - hash = "sha256-jHjV2A949m/KyAkkdaP00d5j+V96jRQah4LKs8LcYQk="; + hash = "sha256-Yfq85stS1FWahrwv+8hEFSAGr2eZHJ+/cuNYfIFRi3c="; }; - cargoHash = "sha256-XbEgcPLL3UZ4zdV90AEFI8RlkZAMuLXznlkBcAG/0l8="; + cargoHash = "sha256-R8x3QfVWyEyz7o9Jzh+XgQKYF8HZMAPwbq847j2LfqY="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index 42c02fe003..65363b2627 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -30,5 +30,8 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ sifmelcara ]; + # this package is deprecated, please use fcitx5 instead. + # and it cannot be built with the new version of librime + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 4636eedc56..2137bd1c93 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.11"; + version = "1.4.17"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-y9cWQ6Z7sxGCdRgWRoKPGH3TDWyrzCwXDEx0pfTjgyM="; + sha256 = "sha256-s+CYVJjeOuD5SYme+cDVTl1N8pKJJ4CNT6QQXjIqLQI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index aa45805806..97beeadc48 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ibus-table"; - version = "1.16.11"; + version = "1.16.13"; src = fetchFromGitHub { owner = "kaio"; repo = "ibus-table"; rev = version; - sha256 = "sha256-lojHn6esoE5MLyPZ/U70+6o0X2D8EH+R69dgQo+59t4="; + sha256 = "sha256-hkSUmxBC7n2VTEVfI7rLgdo//xh0iZHxnAmjOayrJu0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index d8181142c0..e90b694997 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.19.10"; + version = "2.20.0"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - sha256 = "Ie3cQ1YC+LB5I5LtKyJ0RO+dyjFbVsemW110t3gPmCM="; + hash = "sha256-evKCKPddQ4yRgI0NDOk6iEkS4910cYhLTvicLxJEbxE="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix index 4037868518..e3403e334b 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus/default.nix @@ -34,8 +34,6 @@ , nixosTests }: -with lib; - let python3Runtime = python3.withPackages (ps: with ps; [ pygobject3 ]); python3BuildEnv = python3.buildEnv.override { @@ -88,10 +86,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-memconf" - (enableFeature (dconf != null) "dconf") - (enableFeature (libnotify != null) "libnotify") - (enableFeature withWayland "wayland") - (enableFeature enableUI "ui") + (lib.enableFeature (dconf != null) "dconf") + (lib.enableFeature (libnotify != null) "libnotify") + (lib.enableFeature withWayland "wayland") + (lib.enableFeature enableUI "ui") "--enable-gtk4" "--enable-install-tests" "--with-unicode-emoji-dir=${unicode-emoji}/share/unicode/emoji" @@ -133,7 +131,7 @@ stdenv.mkDerivation rec { isocodes json-glib libnotify - ] ++ optionals withWayland [ + ] ++ lib.optionals withWayland [ libxkbcommon wayland ]; @@ -165,7 +163,7 @@ stdenv.mkDerivation rec { }; }; - meta = { + meta = with lib; { homepage = "https://github.com/ibus/ibus"; description = "Intelligent Input Bus, input method framework"; license = licenses.lgpl21Plus; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix index 9137b83455..c694160768 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/input-remapper/default.nix @@ -60,7 +60,7 @@ in ''; doCheck = withDoCheck; - checkInputs = [ + nativeCheckInputs = [ psutil ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/default.nix index 5d5bd7bdfc..843584a7d4 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, cmake, libyamlcpp, +{ lib, stdenv, fetchFromGitLab, pkg-config, cmake, yaml-cpp, libevdev, udev, boost }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libevdev udev libyamlcpp boost ]; + buildInputs = [ libevdev udev yaml-cpp boost ]; meta = { description = "A minimal composable infrastructure on top of libudev and libevdev"; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix index 9824a46d43..f8caefa608 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitLab, pkg-config, libyamlcpp, libevdev }: +{ stdenv, lib, fetchFromGitLab, pkg-config, yaml-cpp, libevdev }: stdenv.mkDerivation rec { pname = "dual-function-keys"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libevdev libyamlcpp ]; + buildInputs = [ libevdev yaml-cpp ]; prePatch = '' substituteInPlace config.mk --replace \ diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix index 68a91d2bfc..fc69d47a14 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/kime/default.nix @@ -2,32 +2,34 @@ , withWayland ? true , withIndicator ? true, dbus, libdbusmenu , withXim ? true, xorg, cairo -, withGtk2 ? true, gtk2 , withGtk3 ? true, gtk3 +, withGtk4 ? true, gtk4 , withQt5 ? true, qt5 +, withQt6 ? false, qt6 }: let - cmake_args = lib.optionals withGtk2 ["-DENABLE_GTK2=ON"] - ++ lib.optionals withGtk3 ["-DENABLE_GTK3=ON"] - ++ lib.optionals withQt5 ["-DENABLE_QT5=ON"]; + cmake_args = lib.optionals withGtk3 ["-DENABLE_GTK3=ON"] + ++ lib.optionals withGtk4 ["-DENABLE_GTK4=ON"] + ++ lib.optionals withQt5 ["-DENABLE_QT5=ON"] + ++ lib.optionals withQt6 ["-DENABLE_QT6=ON"]; optFlag = w: (if w then "1" else "0"); in stdenv.mkDerivation rec { pname = "kime"; - version = "2.5.6"; + version = "3.0.2"; src = fetchFromGitHub { owner = "Riey"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r5luI6B4IjNTbh2tzpqabokgwkmbyXrA61+F2HDEWuo="; + sha256 = "sha256-qLQ6DmV7KHhdXWR5KtO52cmXBm818zKJVj4nxsR14dc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sha256 = "sha256-GvBnNPY51RPt+I73oet5tB/EE2UsEPKbelJZkSY3xNw="; + sha256 = "sha256-/o9b7YvrpV+IujkllFWAz6Mg4CbS9BInF8antfZ0Vsw="; }; # Replace autostart path @@ -68,6 +70,7 @@ stdenv.mkDerivation rec { export KIME_ICON_DIR=share/icons export KIME_LIB_DIR=lib export KIME_QT5_DIR=lib/qt-${qt5.qtbase.version} + export KIME_QT6_DIR=lib/qt-${qt6.qtbase.version} bash scripts/install.sh "$out" runHook postInstall ''; @@ -84,9 +87,10 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals withIndicator [ dbus libdbusmenu ] ++ lib.optionals withXim [ xorg.libxcb cairo ] - ++ lib.optionals withGtk2 [ gtk2 ] ++ lib.optionals withGtk3 [ gtk3 ] - ++ lib.optionals withQt5 [ qt5.qtbase ]; + ++ lib.optionals withGtk4 [ gtk4 ] + ++ lib.optionals withQt5 [ qt5.qtbase ] + ++ lib.optionals withQt6 [ qt6.qtbase ]; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/lisgd/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/lisgd/default.nix index 66ce5b04cd..f04964fbb8 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/lisgd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/lisgd/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "lisgd"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromSourcehut { owner = "~mil"; repo = "lisgd"; rev = version; - hash = "sha256-VH+wZyVnfPqFxRwITU/LzkOAexFKm39LlcFxzhjRMdY="; + hash = "sha256-3kmGpgZpCH7CkN+d1+5ygXOi8E0Ojcgw6Fbd0T9z7z0="; }; inherit patches; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index f20e2899f1..bb974fbc8b 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildPackages, libiconv, skktools }: +{ lib, stdenv, fetchurl, buildPackages, iconv, skktools }: let # kana to kanji @@ -25,15 +25,13 @@ let url = "https://raw.githubusercontent.com/skk-dev/dict/8b35d07a7d2044d48b063d2774d9f9d00bb7cb48/SKK-JISYO.assoc"; sha256 = "1smcbyv6srrhnpl7ic9nqds9nz3g2dgqngmhzkrdlwmvcpvakp1v"; }; - - iconvBin = if stdenv.isDarwin then libiconv else buildPackages.stdenv.cc.libc; in stdenv.mkDerivation { pname = "skk-dicts-unstable"; version = "2020-03-24"; srcs = [ small medium large edict assoc ]; - nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv; + nativeBuildInputs = [ iconv skktools ]; strictDeps = true; @@ -51,8 +49,7 @@ stdenv.mkDerivation { for src in $srcs; do dst=$out/share/$(dictname $src) echo ";;; -*- coding: utf-8 -*-" > $dst # libskk requires this on the first line - ${lib.getBin iconvBin}/bin/iconv \ - -f EUC-JP -t UTF-8 $src | skkdic-expr2 >> $dst + iconv -f EUC-JP -t UTF-8 $src | skkdic-expr2 >> $dst done # combine .L .edict and .assoc for convenience diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/uim/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/uim/default.nix index e1daecbd10..cbc978821a 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/uim/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/uim/default.nix @@ -18,8 +18,6 @@ , withMisc ? false, libeb ? null }: -with lib; - assert withGtk2 -> gtk2 != null; assert withGtk3 -> gtk3 != null; @@ -59,18 +57,18 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses m17n_lib m17n_db expat ] - ++ optional withAnthy anthy - ++ optional withGtk2 gtk2 - ++ optional withGtk3 gtk3 - ++ optional withQt4 qt4 - ++ optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ] - ++ optional withLibnotify libnotify - ++ optional withSqlite sqlite - ++ optionals withNetworking [ + ++ lib.optional withAnthy anthy + ++ lib.optional withGtk2 gtk2 + ++ lib.optional withGtk3 gtk3 + ++ lib.optional withQt4 qt4 + ++ lib.optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ] + ++ lib.optional withLibnotify libnotify + ++ lib.optional withSqlite sqlite + ++ lib.optionals withNetworking [ curl openssl ] - ++ optional withFFI libffi - ++ optional withMisc libeb; + ++ lib.optional withFFI libffi + ++ lib.optional withMisc libeb; prePatch = '' patchShebangs *.sh */*.sh */*/*.sh @@ -113,25 +111,25 @@ stdenv.mkDerivation rec { "--with-xft" "--with-expat=${expat.dev}" ] - ++ optional withAnthy "--with-anthy-utf8" - ++ optional withGtk2 "--with-gtk2" - ++ optional withGtk3 "--with-gtk3" - ++ optionals withQt4 [ + ++ lib.optional withAnthy "--with-anthy-utf8" + ++ lib.optional withGtk2 "--with-gtk2" + ++ lib.optional withGtk3 "--with-gtk3" + ++ lib.optionals withQt4 [ "--with-qt4" "--with-qt4-immodule" ] - ++ optionals withQt5 [ + ++ lib.optionals withQt5 [ "--with-qt5" "--with-qt5-immodule" ] - ++ optional withLibnotify "--enable-notify=libnotify" - ++ optional withSqlite "--with-sqlite3" - ++ optionals withNetworking [ + ++ lib.optional withLibnotify "--enable-notify=libnotify" + ++ lib.optional withSqlite "--with-sqlite3" + ++ lib.optionals withNetworking [ "--with-curl" "--with-openssl-dir=${openssl.dev}" ] - ++ optional withFFI "--with-ffi" - ++ optional withMisc "--with-eb"; + ++ lib.optional withFFI "--with-ffi" + ++ lib.optional withMisc "--with-eb"; # TODO: things in `./configure --help`, but not in nixpkgs #--with-canna Use Canna [default=no] diff --git a/third_party/nixpkgs/pkgs/tools/misc/addlicense/default.nix b/third_party/nixpkgs/pkgs/tools/misc/addlicense/default.nix index a01ae0de08..0ea6beadea 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/addlicense/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/addlicense/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "addlicense"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "google"; repo = "addlicense"; rev = "v${version}"; - sha256 = "sha256-Vi+U0b9tTJitStZr1wSotr82Y2gA4IjvHLAa+rwGH/g="; + sha256 = "sha256-YMMHj6wctKtJi/rrcMIrLmNw/uvO6wCwokgYRQxcsFw="; }; - vendorSha256 = "sha256-2mncc21ecpv17Xp8PA9GIodoaCxNBacbbya/shU8T9Y="; + vendorHash = "sha256-2mncc21ecpv17Xp8PA9GIodoaCxNBacbbya/shU8T9Y="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/android-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/android-tools/default.nix index f8ab129f78..18d7bf02ed 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/android-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/android-tools/default.nix @@ -9,21 +9,13 @@ in stdenv.mkDerivation rec { pname = "android-tools"; - version = "33.0.3p1"; + version = "33.0.3p2"; src = fetchurl { url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; - hash = "sha256-viBHzyVgUWdK9a60u/7SdpiVEvgNEZHihkyRkGH5Ydg="; + hash = "sha256-a/a1LXOJ55/JK2PMIGRR7kL8T32naddpIhk+mNdfVgQ="; }; - patches = [ - (fetchpatch { - name = "add-macos-platform.patch"; - url = "https://github.com/nmeum/android-tools/commit/a1ab35b31525966e0f0770047cd82accb36d025b.patch"; - hash = "sha256-6O3ekDf0qPdzcfINFF8Ae4XOYgnQWTBhvu9SCFSHkXY="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config perl go ]; buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; propagatedBuildInputs = [ pythonEnv ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/asciinema/default.nix b/third_party/nixpkgs/pkgs/tools/misc/asciinema/default.nix index e025b0ffc5..5cca96a455 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/asciinema/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/asciinema/default.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { --replace "python3" "${python3Packages.python}/bin/python" ''; - checkInputs = [ + nativeCheckInputs = [ glibcLocales python3Packages.nose ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/asdf-vm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/asdf-vm/default.nix index 5c6b94191c..17e3dc37a5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/asdf-vm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/asdf-vm/default.nix @@ -37,13 +37,13 @@ ${asdfReshimFile} ''; in stdenv.mkDerivation rec { pname = "asdf-vm"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "asdf-vm"; repo = "asdf"; rev = "v${version}"; - sha256 = "sha256-0dO+IYLhiWe83iaP2CHj7D4o7UVqQemZBPW+6vu+RQY="; + sha256 = "sha256-SCMDf+yEJNDIeF2EqGkgfA+xJek1OmMysxolBdIEnUM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/askalono/default.nix b/third_party/nixpkgs/pkgs/tools/misc/askalono/default.nix new file mode 100644 index 0000000000..35d0bf5ff2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/askalono/default.nix @@ -0,0 +1,25 @@ +{ lib +, rustPlatform +, fetchCrate +}: + +rustPlatform.buildRustPackage rec { + pname = "askalono"; + version = "0.4.6"; + + src = fetchCrate { + pname = "askalono-cli"; + inherit version; + hash = "sha256-7l5bHSsmuMoHbbOI3TAYFeHwD3Y62JvfrrXZa08V3+U="; + }; + + cargoHash = "sha256-OkN8V37GApJvremRJlWG3HSpWgMC17Ge8JMTiQVoc/g="; + + meta = with lib; { + description = "A tool to detect open source licenses from texts"; + homepage = "https://github.com/jpeddicord/askalono"; + changelog = "https://github.com/jpeddicord/askalono/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix index 1f22401a41..8a364c50fe 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/autorandr/default.nix @@ -4,14 +4,15 @@ , fetchFromGitHub , systemd , xrandr -, installShellFiles }: +, installShellFiles +, desktop-file-utils }: python3.pkgs.buildPythonApplication rec { pname = "autorandr"; - version = "1.13"; + version = "1.13.3"; format = "other"; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles desktop-file-utils ]; propagatedBuildInputs = [ python3Packages.packaging ]; buildPhase = '' @@ -58,8 +59,8 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "phillipberndt"; repo = "autorandr"; - rev = version; - sha256 = "sha256-pTWwDKBCZV3wkX/VHuWrwMFgUAMDvik11y+ysKiN3HU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-3zWYOOVYpj+s7VKagnbI55MNshM5WtbCFD6q9tRCzes="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix b/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix index 8e14983883..bed3776633 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix @@ -1,24 +1,25 @@ -{ fetchFromGitHub -, lib +{ lib +, fetchFromGitHub , stdenv , python3Packages }: + python3Packages.buildPythonApplication rec { pname = "barman"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = pname; rev = "refs/tags/release/${version}"; - sha256 = "sha256-4mbu3Z48jZQqRft4vkz/x4a7kAOiTrQfnyQpXl3MJn0="; + hash = "sha256-K5y5C+K/fMhgOcSsCMaIgY6ce9UUPszoyumsfNHKjBo="; }; patches = [ ./unwrap-subprocess.patch ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ mock python-snappy google-cloud-storage @@ -45,6 +46,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "https://www.pgbarman.org/"; description = "Backup and Recovery Manager for PostgreSQL"; + changelog = "https://github.com/EnterpriseDB/barman/blob/release/${version}/NEWS"; maintainers = with maintainers; [ freezeboy ]; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix index d076cd1026..791c6dbb05 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat-extras/default.nix @@ -55,7 +55,7 @@ let # Run the library tests as they don't have external dependencies doCheck = true; - checkInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); + nativeCheckInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); checkPhase = '' runHook preCheck # test list repeats suites. Unique them @@ -112,7 +112,7 @@ let dontBuild = true; # we've already built doCheck = true; - checkInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); + nativeCheckInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); checkPhase = '' runHook preCheck bash ./test.sh --compiled --suite ${name} diff --git a/third_party/nixpkgs/pkgs/tools/misc/bbe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bbe/default.nix index 5cd7326d7b..1b734a83d3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bbe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bbe/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A sed-like editor for binary files"; - homepage = "http://bbe-.sourceforge.net/"; + homepage = "https://bbe-.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.hhm ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bepasty/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bepasty/default.nix index 69a784ec4c..cd2cac7684 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bepasty/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bepasty/default.nix @@ -43,7 +43,7 @@ in with python.pkgs; buildPythonPackage rec { sha256 = "1y3smw9620w2ia4zfsl2svb9j7mkfgc8z1bzjffyk1w5vryhwikh"; }; - checkInputs = [ + nativeCheckInputs = [ pytest selenium ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/blflash/default.nix b/third_party/nixpkgs/pkgs/tools/misc/blflash/default.nix index d8c1aec35a..8cb5d6fcba 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/blflash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/blflash/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "blflash"; - version = "0.3.3"; + version = "0.3.5"; src = fetchFromGitHub { owner = "spacemeowx2"; repo = "blflash"; rev = "v${version}"; - sha256 = "sha256-hPScmivtugtZm848Itzg4Tb9rppZny+rKi3IBuUxxQY="; + sha256 = "sha256-lv5bUbq5AnZVeR8V0A4pamY9ZIQAhLmvZEr+CRMPcj0="; }; - cargoSha256 = "sha256-/y3R8B2TOf8jeB9tcewoA9EGN6kj/EPMTjU6rfTF5Vc="; + cargoSha256 = "sha256-NRBW2rGrtEmmxONTpCM1D+o5HtnLjp175Sq9+aCp7ZE="; meta = with lib; { description = "An bl602 serial flasher written in Rust"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/brltty/default.nix b/third_party/nixpkgs/pkgs/tools/misc/brltty/default.nix index fef13a8937..5838c24172 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/brltty/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/brltty/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, python3, bluez , tcl, acl, kmod, coreutils, shadow, util-linux, udev , alsaSupport ? stdenv.isLinux, alsa-lib -, systemdSupport ? stdenv.isLinux, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/tools/misc/brotab/default.nix b/third_party/nixpkgs/pkgs/tools/misc/brotab/default.nix index 45a3b24ff0..85b630c9d6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/brotab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/brotab/default.nix @@ -25,7 +25,7 @@ python.pkgs.buildPythonApplication rec { --replace "requests==2.24.0" "requests>=2.24.0" ''; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix b/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix index 34d05852a7..71656745ac 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, boost, cmake, extra-cmake-modules, kparts, kpmcore, kirigami2 -, kservice, libatasmart, libxcb, libyamlcpp, libpwquality, parted, polkit-qt, python +, kservice, libatasmart, libxcb, yaml-cpp, libpwquality, parted, polkit-qt, python , qtbase, qtquickcontrols, qtsvg, qttools, qtwebengine, util-linux, tzdata , ckbcomp, xkeyboard_config, mkDerivation , nixos-extensions ? false @@ -43,7 +43,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ boost kparts.dev kpmcore.out kservice.dev kirigami2 - libatasmart libxcb libyamlcpp libpwquality parted polkit-qt python + libatasmart libxcb yaml-cpp libpwquality parted polkit-qt python qtbase qtquickcontrols qtsvg qttools qtwebengine.dev util-linux ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/catimg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/catimg/default.nix index 3f94a559e6..6230b21c38 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/catimg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/catimg/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake } : -with lib; - stdenv.mkDerivation rec { pname = "catimg"; version = "2.7.0"; @@ -15,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - meta = { + meta = with lib; { license = licenses.mit; homepage = "https://github.com/posva/catimg"; description = "Insanely fast image printing in your terminal"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix index 679b575a3d..20c4221a08 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.8.8"; + version = "0.9.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-wqpVqf4E5Zz8oKjl7XNjAH05wA++MOL9EnHL/YwsSYw="; + sha256 = "sha256-wELV3Jp11Iv3G//VOAosL5QDnbNTyEAvq9hmLWDdPBU="; }; - vendorSha256 = "sha256-tmq55wCQ10WkP+Cp3Ak6mttwL1wxqIAvpn6tsluhI34="; + vendorHash = "sha256-XFJGw76Fz9tzknWuzc1aw1uJ34UQfFLe1WUVtPGbn64="; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; # The test suite insists on downloading a binary release of Terraform from diff --git a/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix index 55b83f7de3..75ff4467d7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chafa/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "1.12.3"; + version = "1.12.4"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "sha256-Aejm3VR4f69jDdG16vud2sj/9jQ8n5f34oed1SGEcXo="; + sha256 = "sha256-rW3QHf7T3mXWxTCcUPriu+iZohbwGNxWRmquXdSMPQk="; }; nativeBuildInputs = [ autoconf diff --git a/third_party/nixpkgs/pkgs/tools/misc/changelogger/default.nix b/third_party/nixpkgs/pkgs/tools/misc/changelogger/default.nix index c659aa5435..ce7a37c7cc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/changelogger/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/changelogger/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "changelogger"; - version = "0.5.3"; + version = "0.6.0"; src = fetchFromGitHub { owner = "MarkusFreitag"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AP5cuXAuh5LX6FTsku38Zh1Y4SVaa4l5XEBTMZnYr6g="; + sha256 = "sha256-g3d4BEVMQGBEKx+YVPjPrypWQNtEun/pSRgAsJY/RT4="; }; - vendorSha256 = "sha256-RmLSuLZdYpA557xN7fkPZm5ektxvRHil1E2u1qR7EO0="; + vendorHash = "sha256-E6J+0tZriskBnXdhQOQA240c3z+laXM5honoREjHPfM="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index 0c5f59824b..84ed3aaa6f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.29.2"; + version = "2.29.4"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-dbs1NMgLACbpjKBU3u+Sqczv2PgoLTH7mMIyAcHkMZQ="; + hash = "sha256-pvSKLWek/nCVjlfvYQIefvTt+VMmNYs58/4bPQQdfNU="; }; - vendorHash = "sha256-0heLEQFKxKxeNZGBd3GcTsOfhmDyxZRynVrAkF6vHvk="; + vendorHash = "sha256-hGYcfERYxSEg+j9EDDGYVar69HoApSqxWH8IWwHaOKs="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/claws/default.nix b/third_party/nixpkgs/pkgs/tools/misc/claws/default.nix index 7c2cfecf27..7c9a35f1eb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/claws/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/claws/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { rev = version; owner = "thehowl"; repo = pname; - sha256 = "sha256-3zzUBeYfu9x3vRGX1DionLnAs1e44tFj8Z1dpVwjdCg="; + hash = "sha256-3zzUBeYfu9x3vRGX1DionLnAs1e44tFj8Z1dpVwjdCg="; }; - vendorSha256 = "sha256-FP+3Rw5IdCahhx9giQrpepMMtF1pWcyjNglrlu9ju0Q="; + vendorHash = "sha256-FP+3Rw5IdCahhx9giQrpepMMtF1pWcyjNglrlu9ju0Q="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/clini/default.nix b/third_party/nixpkgs/pkgs/tools/misc/clini/default.nix new file mode 100644 index 0000000000..751cb31470 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/clini/default.nix @@ -0,0 +1,20 @@ +{ fetchCrate, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "clini"; + version = "0.1.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-+HnoYFRG7GGef5lV4CUsUzqPzFUzXDajprLu25SCMQo="; + }; + + cargoHash = "sha256-hOPj3c3WIISRqP/9Kpc/Yh9Z/wfAkHQ/731+BkWElIQ="; + + meta = with lib; { + description = "A simple tool to do basic modification of ini files"; + homepage = "https://github.com/domgreen/clini"; + license = licenses.mit; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix index 4fdb8ce7ab..0a6a3178ec 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.GitSha=${src.rev}" ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; preCheck = '' pushd test/binaries/ diff --git a/third_party/nixpkgs/pkgs/tools/misc/compdb/default.nix b/third_party/nixpkgs/pkgs/tools/misc/compdb/default.nix new file mode 100644 index 0000000000..c6d6d75283 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/compdb/default.nix @@ -0,0 +1,23 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "compdb"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "Sarcasm"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-nFAgTrup6V5oE+LP4UWDOCgTVCv2v9HbQbkGW+oDnTg="; + }; + + meta = with lib; { + description = "Command line tool to manipulate compilation databases"; + license = licenses.mit; + homepage = "https://github.com/Sarcasm/compdb"; + maintainers = [ maintainers.detegr ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/completely/Gemfile b/third_party/nixpkgs/pkgs/tools/misc/completely/Gemfile new file mode 100644 index 0000000000..bfae929203 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/completely/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'completely' diff --git a/third_party/nixpkgs/pkgs/tools/misc/completely/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/misc/completely/Gemfile.lock new file mode 100644 index 0000000000..656c96cbc4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/completely/Gemfile.lock @@ -0,0 +1,20 @@ +GEM + remote: https://rubygems.org/ + specs: + colsole (0.8.2) + completely (0.5.2) + colsole (~> 0.6) + mister_bin (~> 0.7.2) + docopt (0.6.1) + mister_bin (0.7.3) + colsole (~> 0.7) + docopt (~> 0.6) + +PLATFORMS + ruby + +DEPENDENCIES + completely + +BUNDLED WITH + 2.4.5 diff --git a/third_party/nixpkgs/pkgs/tools/misc/completely/default.nix b/third_party/nixpkgs/pkgs/tools/misc/completely/default.nix new file mode 100644 index 0000000000..7e0129f6d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/completely/default.nix @@ -0,0 +1,21 @@ +{ lib +, bundlerApp +, bundlerUpdateScript +}: + +bundlerApp { + pname = "completely"; + + gemdir = ./.; + exes = [ "completely" ]; + + passthru.updateScript = bundlerUpdateScript "completely"; + + meta = with lib; { + description = "Generate bash completion scripts using a simple configuration file"; + homepage = "https://github.com/DannyBen/completely"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/completely/gemset.nix b/third_party/nixpkgs/pkgs/tools/misc/completely/gemset.nix new file mode 100644 index 0000000000..a078a113f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/completely/gemset.nix @@ -0,0 +1,44 @@ +{ + colsole = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l29sxy4p9jbvcihckxfsyqx98b8xwzd3hjqvdh1zxw8nv5walnp"; + type = "gem"; + }; + version = "0.8.2"; + }; + completely = { + dependencies = ["colsole" "mister_bin"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0w7cmmsp9m42c8w4j03kr98zy7x7yszw3qsm3ww600dmc0d0xd2b"; + type = "gem"; + }; + version = "0.5.2"; + }; + docopt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rvlfbb7kzyagncm4zdpcjwrh682zamgf5rcf5qmj0bd6znkgy3k"; + type = "gem"; + }; + version = "0.6.1"; + }; + mister_bin = { + dependencies = ["colsole" "docopt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f51zs9wjpslhdadp8yfx4ij0jj1ya92cbzqlfd2wfr19wdr2jgd"; + type = "gem"; + }; + version = "0.7.3"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/convimg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/convimg/default.nix index e82eb04196..dd73cced3b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/convimg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/convimg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "convimg"; - version = "8.10.2"; + version = "9.0"; src = fetchFromGitHub { owner = "mateoconlechuga"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mXwgTltYSBgBm2z1gDRCFqJbRoEuDbQAIoDlr2Kjmi0="; + sha256 = "sha256-AfluBLuD//EJplzzIQymyRsmPQMFjVk33HO+Vwv8Wzo="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/copier/default.nix b/third_party/nixpkgs/pkgs/tools/misc/copier/default.nix new file mode 100644 index 0000000000..55d1ea6693 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/copier/default.nix @@ -0,0 +1,51 @@ +{ lib, git, python3, fetchFromGitHub }: + +python3.pkgs.buildPythonApplication rec { + pname = "copier"; + version = "7.0.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "copier-org"; + repo = "copier"; + rev = "v${version}"; + sha256 = "sha256-8lTvyyKfAkvnUvw3e+r9C/49QASR8Zeokm509jxGK2g="; + }; + + POETRY_DYNAMIC_VERSIONING_BYPASS = version; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + python3.pkgs.poetry-dynamic-versioning + ]; + + propagatedBuildInputs = with python3.pkgs; [ + colorama + dunamai + iteration-utilities + jinja2 + jinja2-ansible-filters + mkdocs-material + mkdocs-mermaid2-plugin + mkdocstrings + packaging + pathspec + plumbum + pydantic + pygments + pyyaml + pyyaml-include + questionary + ]; + + makeWrapperArgs = [ + "--suffix PATH : ${lib.makeBinPath [ git ] }" + ]; + + meta = with lib; { + description = "Library and command-line utility for rendering projects templates"; + homepage = "https://copier.readthedocs.io"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/coreboot-configurator/default.nix b/third_party/nixpkgs/pkgs/tools/misc/coreboot-configurator/default.nix index 923b7d55ca..7e0a6d0c70 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/coreboot-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/coreboot-configurator/default.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, libyamlcpp +, yaml-cpp , nvramtool , qtbase , qtsvg @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ inkscape meson ninja pkg-config wrapQtAppsHook ]; - buildInputs = [ libyamlcpp qtbase qtsvg ]; + buildInputs = [ yaml-cpp qtbase qtsvg ]; postPatch = '' substituteInPlace src/application/*.cpp \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix b/third_party/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix index 736cc1c3dc..d0f891fe54 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix @@ -37,7 +37,7 @@ in with python.pkgs; buildPythonApplication rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cunit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cunit/default.nix index e287306dfb..77af6497a5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cunit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cunit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { with a flexible variety of user interfaces. ''; - homepage = "http://cunit.sourceforge.net/"; + homepage = "https://cunit.sourceforge.net/"; license = lib.licenses.lgpl2; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix b/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix index 67ceb8fc37..a81e078cdb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { gtk4 ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dbacl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dbacl/default.nix index eb2b445d06..6a2700f482 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dbacl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dbacl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://dbacl.sourceforge.net/"; + homepage = "https://dbacl.sourceforge.net/"; longDescription = "a digramic Bayesian classifier for text recognition."; maintainers = []; license = lib.licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix index 7bf751652d..898f7aefab 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , autoreconfHook , pkg-config , glib @@ -15,11 +15,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "1.3.2"; + version = "1.4.1"; - src = fetchurl { - url = "http://www.ddcutil.com/tarballs/${pname}-${version}.tar.gz"; - sha256 = "sha256-vZI7OquGjZ0koArdOWKkfFtfRzCvtXm8lGFCUklloEI="; + src = fetchFromGitHub { + owner = "rockowitz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-y3mubdInYa4gpxhdw2JcRhnhd12O7jNq/oF3qoP82LU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix index af3e907c04..597eced414 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, meson, ninja, glib, libintl }: -with lib; - stdenv.mkDerivation rec { pname = "desktop-file-utils"; version = "0.26"; @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = { + meta = with lib; { homepage = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"; description = "Command line utilities for working with .desktop files"; platforms = platforms.linux ++ platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/tools/misc/detox/default.nix b/third_party/nixpkgs/pkgs/tools/misc/detox/default.nix index 774ba885b4..bf289ff8c7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/detox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/detox/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://detox.sourceforge.net/"; + homepage = "https://detox.sourceforge.net/"; description = "Utility designed to clean up filenames"; longDescription = '' Detox is a utility designed to clean up filenames. It replaces diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 1df7ef832b..6e9a057af0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles +{ lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles, fetchpatch , abootimg, acl, apksigcopier, apksigner, apktool, binutils-unwrapped-all-targets, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, html2text, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R @@ -11,17 +11,22 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "229"; + version = "233"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-IyTBwlVqOIXERdjvZPTwxhIBPOn8Dt7QbvfBazj5J/A="; + sha256 = "sha256-A2GYnhdjkzSFnMsy99FmckiOsbRdymAdtjp55hyFLp4="; }; outputs = [ "out" "man" ]; patches = [ ./ignore_links.patch + # test_text_proper_indentation requires file >= 5.44 + (fetchpatch { + url = "https://salsa.debian.org/reproducible-builds/diffoscope/-/commit/9fdb78ec0bbc69f1980499dfdcbf6f1dd5e55cc8.patch"; + sha256 = "sha256-F0N3L9yymj2NjeIKtSnOEDsxPe+ZTb0m/M4f8LPRHg0="; + }) ]; postPatch = '' @@ -54,7 +59,12 @@ python3Packages.buildPythonApplication rec { hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans ] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer-six ])); - checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; + + pytestFlagsArray = [ + # always show more information when tests fail + "-vv" + ]; postInstall = '' make -C doc diff --git a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix index a6b598a9cb..b4b16198fc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { make install PREFIX=$out ''; - checkInputs = [ fish zsh ]; + nativeCheckInputs = [ fish zsh ]; checkPhase = '' export HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/tools/misc/discocss/default.nix b/third_party/nixpkgs/pkgs/tools/misc/discocss/default.nix index e010541c71..a9e3d124c8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/discocss/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/discocss/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "discocss"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "mlvzk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Qp1EixARxEnpNM+Yhn00anR0Ll4aFmkeaGtNju/iWlY="; + sha256 = "sha256-of7OMgbuwebnFmbefGD1/dOhyTX1Hy7TccnWSRCweW0="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix index af9972ca5f..24611490c6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; passthru = { updateScript = nix-update-script { }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dsq/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dsq/default.nix index 66cfdce990..66d5544de8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dsq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dsq/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { ldflags = [ "-X" "main.Version=${version}" ]; - checkInputs = [ python3 curl jq p7zip ]; + nativeCheckInputs = [ python3 curl jq p7zip ]; preCheck = '' substituteInPlace scripts/test.py \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/dtach/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dtach/default.nix index f036ba9ea3..0e0d4ddd07 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dtach/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dtach/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://dtach.sourceforge.net/"; + homepage = "https://dtach.sourceforge.net/"; description = "A program that emulates the detach feature of screen"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix index bd4452263a..b6a17a38b5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix @@ -1,14 +1,14 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, AppKit }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, AppKit, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-+YcHiW4kR4JeIY6zv1WJ97dCIakvtbn8+b9tLFH+aLE="; + sha256 = "sha256-g1i003nBbTYIuKG4ZCQSoI8gINTVc8BKRoO3UOeHOGE="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -16,12 +16,19 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-yKj9CBoEC6UJf4L+XO2qi69//45lSqblMe8ofnLctEw="; + cargoHash = "sha256-jtQ/nkD5XMD2rsq550XsRK416wOCR3OuhgGPeuC3jzc="; + + nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; doCheck = false; + postInstall = '' + installManPage man-page/dust.1 + installShellCompletion completions/dust.{bash,fish} --zsh completions/_dust + ''; + meta = with lib; { description = "du + rust = dust. Like du but more intuitive"; homepage = "https://github.com/bootandy/dust"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/easeprobe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/easeprobe/default.nix index 1bc8dec1ee..b0f85d7fc1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/easeprobe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/easeprobe/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "easeprobe"; - version = "1.9.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "megaease"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iw24TuK5nbHabzRdaJ8X/MzRPNP35M8RjhKnZZXjVfA="; + sha256 = "sha256-y9R2OgK+slQUvUMS3E6aX8WVCQ1fSMAruGKggxYRniA="; }; - vendorSha256 = "sha256-bfqP57YS2KD6CuFytJyWYCFl0Cx/JJgc1CeW13yBUoo="; + vendorSha256 = "sha256-ZfqBSPnIm2GHPREowHmEEPnOovYjoarxrkPeYmZBkIc="; subPackages = [ "cmd/easeprobe" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/edir/default.nix b/third_party/nixpkgs/pkgs/tools/misc/edir/default.nix index 7cd621be76..8bfeae8586 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/edir/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/edir/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "edir"; - version = "2.7.3"; + version = "2.16"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "06nsy9ikljc437368l38hsw75whacn3j6jwmdgg766q61pnifhkp"; + sha256 = "ro1GZkJ6xDZcMRaWTAW/a2qhFbZAxsduvGO3C4sOI+A="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/envsubst/default.nix b/third_party/nixpkgs/pkgs/tools/misc/envsubst/default.nix index 5ecae8dbcb..9f7c80d328 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/envsubst/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/envsubst/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0zkgjdlw3d5xh7g45bzxqspxr61ljdli8ng4a1k1gk0dls4sva8n"; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; postInstall = '' install -Dm444 -t $out/share/doc/${pname} LICENSE *.md diff --git a/third_party/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix b/third_party/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix index 516c9e4261..bb9279687b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/eot-utilities/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; meta = { - homepage = "http://www.w3.org/Tools/eot-utils/"; + homepage = "https://www.w3.org/Tools/eot-utils/"; description = "Create Embedded Open Type from OpenType or TrueType font"; license = lib.licenses.w3c; maintainers = with lib.maintainers; [ leenaars ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index 9aaf184890..848a1c1dbb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -1,4 +1,5 @@ { lib +, callPackage , python3 , fetchFromGitHub , platformio @@ -13,16 +14,16 @@ let }; }; in -with python.pkgs; buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2022.12.3"; + version = "2022.12.8"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9yyfcygEmnOcaooSg9bmGGOP2aph0i6d/Ot4nGlTPw4="; + hash = "sha256-VKxCdejQGWLYeNOxa1PCwhdrLilnsYD9UBqj8Sen+OM="; }; postPatch = '' @@ -42,7 +43,7 @@ with python.pkgs; buildPythonApplication rec { # They have validation functions like: # - validate_cryptography_installed # - validate_pillow_installed - propagatedBuildInputs = [ + propagatedBuildInputs = with python.pkgs; [ aioesphomeapi click colorama @@ -71,12 +72,11 @@ with python.pkgs; buildPythonApplication rec { "--set ESPHOME_USE_SUBPROCESS ''" ]; - checkInputs = [ + nativeCheckInputs = with python.pkgs; [ hypothesis mock pytest-asyncio pytest-mock - pytest-sugar pytestCheckHook ]; @@ -92,7 +92,7 @@ with python.pkgs; buildPythonApplication rec { ''; passthru = { - dashboard = esphome-dashboard; + dashboard = python.pkgs.esphome-dashboard; updateScript = callPackage ./update.nix {}; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/update.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/update.nix index ea41376620..6b05162f39 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/update.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/update.nix @@ -1,12 +1,23 @@ { writeShellScript , lib +, curl +, jq , git +, gnugrep +, gnused , nix-update }: writeShellScript "update-esphome" '' - PATH=${lib.makeBinPath [ git nix-update ]} + PATH=${lib.makeBinPath [ curl gnugrep gnused jq git nix-update ]} - nix-update esphome.dashboard - nix-update esphome + LATEST=$(curl https://api.github.com/repos/esphome/esphome/releases/latest | jq -r '.name') + echo "Latest version: $LATEST" + + DASHBOARD_VERSION=$(curl https://raw.githubusercontent.com/esphome/esphome/$LATEST/requirements.txt | \ + grep "esphome-dashboard==" | sed "s/.*=//") + echo "Dashboard version: $DASHBOARD_VERSION" + + nix-update esphome.dashboard --version $DASHBOARD_VERSION + nix-update esphome --version $LATEST '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/esptool/3.nix b/third_party/nixpkgs/pkgs/tools/misc/esptool/3.nix index cc6744b274..48131338c5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esptool/3.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esptool/3.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { done ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pyelftools ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/esptool/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esptool/default.nix index 5feed7aa4a..a62e266874 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esptool/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esptool/default.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { reedsolo ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pyelftools pytest ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix b/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix index 45f45e89e8..bd876371ae 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/expect/default.nix @@ -38,7 +38,7 @@ tcl.mkTclDerivation rec { meta = with lib; { description = "A tool for automating interactive applications"; - homepage = "http://expect.sourceforge.net/"; + homepage = "https://expect.sourceforge.net/"; license = licenses.publicDomain; platforms = platforms.unix; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix index c226ad329d..6309483dd8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.29.1"; + version = "0.29.3"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-spWfZx2br7gSLS0xaUBvMgvA326ISh16i/s0K3m1HCI="; + sha256 = "sha256-dz7Mxi5KIZYw0oLic50hNT6rWbQpfiBE4hlZsxNfKsA="; }; - cargoSha256 = "sha256-qwjwauM2ejeMEbajVD8Deuhl/qMcB7MsvjR2CYGaF+M="; + cargoHash = "sha256-I9pd+Q3b++ujynfpZq88lqPSUOc/SXWpNzR/CwtNEPA="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit diff --git a/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix b/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix index b7318c119d..50f51cfd71 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,11 +1,11 @@ { lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; - version = "5.13.1"; + version = "5.13.3"; src = fetchurl { name = "${pname}-${version}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - hash = "sha256-+rHktjZd6P4JGYRhEXdZYVI64XMYc7cBGojAQNd8Mq8="; + hash = "sha256-kDw9+Llqvq4NgN89Cw/HwEqYlv42wLbho1eHjI6wVSQ="; }; udevRules = fetchurl { diff --git a/third_party/nixpkgs/pkgs/tools/misc/frei/default.nix b/third_party/nixpkgs/pkgs/tools/misc/frei/default.nix index 62a3c1f061..22e6276464 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/frei/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/frei/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-9CV6B7fRHXl73uI2JRv3RiaFczLHHBOd7/8UoCAwK6w="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; meta = with lib; { description = "Modern replacement for free"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix index 9774896320..f892250195 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { dosfstools ]; - checkInputs = [ + nativeCheckInputs = [ which xdelta ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix index 6a29151a51..fa6df2cebf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,6 @@ , lib , buildGoModule , fetchFromGitHub -, writeText , writeShellScriptBin , runtimeShell , installShellFiles @@ -25,13 +24,13 @@ let in buildGoModule rec { pname = "fzf"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - hash = "sha256-1PKu8l4Mx17CpePUE0JEnLPNsUdJ0KvW6Lx6VZM27kI="; + hash = "sha256-m+tKNz7tUWkm/Vg9DhcfZyaBgZh+Mcf0mRfc5/SW2Os="; }; vendorHash = "sha256-MsMwBBualAwJzCrv/WNBJakv6LcKZYsDUqkNmivUMOQ="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gazelle-origin/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gazelle-origin/default.nix new file mode 100644 index 0000000000..800904e909 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/gazelle-origin/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, bencoder +, pyyaml +, requests +, setuptools +}: +buildPythonApplication rec { + pname = "gazelle-origin"; + version = "3.0.0"; + format = "setuptools"; + + src = fetchFromGitHub { + repo = pname; + # Use the spinfast319 fork, since it seems that upstream + # at is inactive + owner = "spinfast319"; + rev = version; + hash = "sha256-+yMKnfG2f+A1/MxSBFLaHfpCgI2m968iXqt+2QanM/c="; + }; + + propagatedBuildInputs = [ + bencoder + pyyaml + requests + ]; + + pythonImportsCheck = [ "gazelleorigin" ]; + + meta = with lib; { + description = "Tool for generating origin files using the API of Gazelle-based torrent trackers"; + homepage = "https://github.com/spinfast319/gazelle-origin"; + # TODO license is unspecified in the upstream, as well as the fork + license = licenses.unfree; + maintainers = with maintainers; [ somasis ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/getoptions/default.nix b/third_party/nixpkgs/pkgs/tools/misc/getoptions/default.nix index 364cf2aca8..e3ee684d4d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/getoptions/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/getoptions/default.nix @@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec { doCheck = true; - checkInputs = [ shellcheck shellspec busybox-sandbox-shell ksh mksh yash zsh ]; + nativeCheckInputs = [ shellcheck shellspec busybox-sandbox-shell ksh mksh yash zsh ]; preCheck = '' sed -i '/shellspec -s posh/d' Makefile diff --git a/third_party/nixpkgs/pkgs/tools/misc/gh-actions-cache/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gh-actions-cache/default.nix new file mode 100644 index 0000000000..4c80d032ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/gh-actions-cache/default.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "gh-actions-cache"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "actions"; + repo = "gh-actions-cache"; + rev = "v${version}"; + hash = "sha256-5iCj6z4HCMVFeplb3dGP/V60z6zMUnUPVBMnPi4yU1Q="; + }; + + vendorHash = "sha256-i9akQ0IjH9NItjYvMWLiGnFQrfZhA7SOvPZiUvdtDrk="; + + ldflags = [ + "-s" + "-w" + ]; + + # Tests need network + doCheck = false; + + meta = { + description = "gh extension to manage GitHub Actions caches"; + homepage = "https://github.com/actions/gh-actions-cache"; + changelog = "https://github.com/actions/gh-actions-cache/releases/tag/${src.rev}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ amesgen ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix index bbb1b8b964..73a81acd65 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gif-for-cli/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication { sha256 = "Bl5o492BUAn1KsscnlMIXCzJuy7xWUsdnxIKZKaRM3M="; }; - checkInputs = [ python3Packages.coverage ]; + nativeCheckInputs = [ python3Packages.coverage ]; buildInputs = [ zlib libjpeg ]; propagatedBuildInputs = with python3Packages; [ ffmpeg pillow requests x256 ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gigalixir/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gigalixir/default.nix index c3710ca944..708e9ad814 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gigalixir/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gigalixir/default.nix @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { stripe ]; - checkInputs = [ + nativeCheckInputs = [ git ] ++ (with python3.pkgs; [ httpretty diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index ad7704d5d4..cb53f45173 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kA+7kAFAAZngbub2gHoiqEcSkcbxv0DPqbAT3MDBHtI="; + sha256 = "sha256-JVvkASYNp6GSCEIWfZwZ1rtOkUCutccOWCkt47rmgyE="; }; - vendorSha256 = "sha256-v3ZF2WDp4EmHA8RnP39o21cy9+n4cKkKZ0gSowv4nvk="; + vendorSha256 = "sha256-jFItDgmjjKbmTpOn32V1K3AmYyYCrc5RqMAH/X+VWTM="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index 8c625df390..ca12c1f258 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -13,7 +13,6 @@ , kbdcompSupport ? false, ckbcomp }: -with lib; let pcSystems = { i686-linux.target = "i386"; @@ -40,8 +39,8 @@ let riscv64-linux.target = "riscv64"; }; - canEfi = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild); - inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); + canEfi = lib.any (system: stdenv.hostPlatform.system == system) (lib.mapAttrsToList (name: _: name) efiSystemsBuild); + inPCSystems = lib.any (system: stdenv.hostPlatform.system == system) (lib.mapAttrsToList (name: _: name) pcSystems); version = "2.06"; @@ -330,8 +329,8 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison flex python3 pkg-config gettext freetype autoreconfHook ]; buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool bash ] - ++ optional doCheck qemu - ++ optional zfsSupport zfs; + ++ lib.optional doCheck qemu + ++ lib.optional zfsSupport zfs; strictDeps = true; @@ -369,7 +368,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-grub-mount" # dep of os-prober - ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # grub doesn't do cross-compilation as usual and tries to use unprefixed # tools to target the host. Provide toolchain information explicitly for # cross builds. @@ -380,9 +379,9 @@ stdenv.mkDerivation rec { "TARGET_OBJCOPY=${stdenv.cc.targetPrefix}objcopy" "TARGET_RANLIB=${stdenv.cc.targetPrefix}ranlib" "TARGET_STRIP=${stdenv.cc.targetPrefix}strip" - ] ++ optional zfsSupport "--enable-libzfs" - ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}" "--program-prefix=" ] - ++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"]; + ] ++ lib.optional zfsSupport "--enable-libzfs" + ++ lib.optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}" "--program-prefix=" ] + ++ lib.optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.hostPlatform.system}.target}"]; # save target that grub is compiled for grubTarget = if efiSupport diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix index d6aba81240..b6883e5708 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grub/pvgrub_image/default.nix @@ -1,11 +1,13 @@ { lib, stdenv, grub2_xen }: -with lib; let efiSystemsBuild = { i686-linux.target = "i386"; x86_64-linux.target = "x86_64"; + armv7l-linux.target = "arm"; aarch64-linux.target = "aarch64"; + riscv32-linux.target = "riscv32"; + riscv64-linux.target = "riscv64"; }; in ( diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/trusted.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/trusted.nix index 4947949ac5..2d07932dab 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grub/trusted.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grub/trusted.nix @@ -18,14 +18,13 @@ , for_HP_laptop ? false }: -with lib; let pcSystems = { i686-linux.target = "i386"; x86_64-linux.target = "i386"; }; - inPCSystems = any (system: stdenv.hostPlatform.system == system) (mapAttrsToList (name: _: name) pcSystems); + inPCSystems = lib.any (system: stdenv.hostPlatform.system == system) (lib.mapAttrsToList (name: _: name) pcSystems); version = if for_HP_laptop then "1.2.1" else "1.2.0"; @@ -59,7 +58,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autogen flex bison python2 autoconf automake ]; buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] - ++ optional doCheck qemu; + ++ lib.optional doCheck qemu; hardeningDisable = [ "stackprotector" "pic" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix index e52ae44a83..a1c163f678 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,18 +1,22 @@ { fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome }: stdenv.mkDerivation rec { - version="1.1.3"; pname = "gsmartcontrol"; + version = "1.1.4"; src = fetchurl { - url = "mirror://sourceforge/gsmartcontrol/gsmartcontrol-${version}.tar.bz2"; - sha256 = "1a8j7dkml9zvgpk83xcdajfz7g6mmpmm5k86dl5sjc24zb7n4kxn"; + url = "https://github.com/ashaduri/gsmartcontrol/releases/download/v${version}/gsmartcontrol-${version}.tar.bz2"; + sha256 = "sha256-/ECfK4qEzEC7ED1sgkAbnUwBgtWjsiPJOVnHrWYZGEc="; }; patches = [ ./fix-paths.patch ]; + postPatch = '' + substituteInPlace data/org.gsmartcontrol.policy --replace "/usr/sbin" $out/bin + ''; + nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ]; buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ]; @@ -35,7 +39,7 @@ stdenv.mkDerivation rec { It allows you to inspect the drive's SMART data to determine its health, as well as run various tests on it. ''; - homepage = "https://gsmartcontrol.sourceforge.io/"; + homepage = "https://gsmartcontrol.shaduri.dev/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [qknight]; platforms = with lib.platforms; linux; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gsmartcontrol/fix-paths.patch b/third_party/nixpkgs/pkgs/tools/misc/gsmartcontrol/fix-paths.patch index 905b63bee0..b8ec19eb25 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gsmartcontrol/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/tools/misc/gsmartcontrol/fix-paths.patch @@ -1,14 +1,3 @@ -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -475,6 +475,7 @@ - - - AC_CONFIG_FILES([ data/gsmartcontrol.desktop data/gsmartcontrol.appdata.xml \ -+ data/org.gsmartcontrol.policy \ - data/nsis/distribution.txt data/nsis/gsmartcontrol.nsi \ - debian.dist/changelog \ - src/gsc_winres.rc src/gsmartcontrol.exe.manifest \ diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in --- a/data/gsmartcontrol-root.in +++ b/data/gsmartcontrol-root.in @@ -30,20 +19,6 @@ diff --git a/data/gsmartcontrol-root.in b/data/gsmartcontrol-root.in export PATH="$EXTRA_PATHS:$PATH" -diff --git a/data/org.gsmartcontrol.policy b/data/org.gsmartcontrol.policy.in -rename from data/org.gsmartcontrol.policy -rename to data/org.gsmartcontrol.policy.in ---- a/data/org.gsmartcontrol.policy -+++ b/data/org.gsmartcontrol.policy.in -@@ -12,7 +12,7 @@ - auth_admin - auth_admin - -- /usr/sbin/gsmartcontrol -+ @prefix@/bin/gsmartcontrol - true - - diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am diff --git a/third_party/nixpkgs/pkgs/tools/misc/gti/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gti/default.nix index 21089caf02..0246421e7f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gti/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +}: stdenv.mkDerivation rec { pname = "gti"; @@ -15,10 +19,16 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace 'CC=cc' 'CC=${stdenv.cc.targetPrefix}cc' ''; + nativeBuildInputs = [ + installShellFiles + ]; + installPhase = '' - mkdir -p $out/bin $out/share/man/man6 - cp gti $out/bin - cp gti.6 $out/share/man/man6 + install -D gti $out/bin/gti + installManPage gti.6 + installShellCompletion --cmd gti \ + --bash completions/gti.bash \ + --zsh completions/gti.zsh ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/hexd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hexd/default.nix index e3a3f79f32..510de6a8ee 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hexd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hexd/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub }: -with lib; - stdenv.mkDerivation rec { pname = "hexd"; version = "1.1.0"; @@ -15,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with lib; { description = "Colourful, human-friendly hexdump tool"; homepage = "https://github.com/FireyFly/hexd"; maintainers = [ maintainers.FireyFly ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hid-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hid-tools/default.nix index b69dbe4a27..0d31ceea2d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hid-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hid-tools/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonPackage rec { pyudev ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix b/third_party/nixpkgs/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix index 4d00ffb03b..ed7b0ab431 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/iam-policy-json-to-terraform/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "iam-policy-json-to-terraform"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "flosell"; repo = pname; rev = "${version}"; - sha256 = "sha256-O3JlBWT2YVu3mv/BCbs65k7HMF4cRCihd59wZzeoxcI="; + sha256 = "sha256-ovmWZpeHt1L8zNzG7+2BohteSjpYADMivi+AP0Vm8/E="; }; - vendorSha256 = "sha256-IXWt/yFapDamfZClI6gm5vPA5VW2gV2iEq5c/nJXiiA="; + vendorHash = "sha256-1WTc7peTJI3IvHJqznqRz29uQ2NG0CZpAAzlyYymZCQ="; meta = with lib; { description = "Small tool to convert an IAM Policy in JSON format into a Terraform aws_iam_policy_document "; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ink/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ink/default.nix index 8037d54131..87173c9537 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ink/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ink/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { longDescription = '' Ink is a command line tool for checking the ink level of your locally connected printer on a system which runs Linux or FreeBSD. Canon BJNP network printers are supported too. ''; - homepage = "http://ink.sourceforge.net/"; + homepage = "https://ink.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.freebsd; maintainers = with maintainers; [ samb96 ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ipxe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ipxe/default.nix index c495e3455a..65c88eac4e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ipxe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ipxe/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { pname = "ipxe"; - version = "unstable-2022-04-06"; + version = "unstable-2023-01-25"; nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -40,14 +40,24 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "70995397e5bdfd3431e12971aa40630c7014785f"; - sha256 = "SrTNEYk13JXAcJuogm9fZ7CrzJIDRc0aziGdjRNv96I="; + rev = "4bffe0f0d9d0e1496ae5cfb7579e813277c29b0f"; + sha256 = "oDQBJz6KKV72DfhNEXjAZNeolufIUQwhroczCuYnGQA="; }; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' substituteInPlace src/util/genfsimg --replace " syslinux " " true " ''; # calling syslinux on a FAT image isn't going to work + # Workaround '-idirafter' ordering bug in staging-next: + # https://github.com/NixOS/nixpkgs/pull/210004 + # where libc '-idirafter' gets added after user's idirafter and + # breaks. + # TODO(trofi): remove it in staging once fixed in cc-wrapper. + preConfigure = '' + export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] buildPackages.stdenv.hostPlatform.config}=$(< ${buildPackages.stdenv.cc}/nix-support/libc-cflags) + export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] stdenv.hostPlatform.config}=$(< ${stdenv.cc}/nix-support/libc-cflags) + ''; + # not possible due to assembler code hardeningDisable = [ "pic" "stackprotector" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix index 7a8a6aa8a8..3b11dfcb64 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.32.0"; - vendorSha256 = "sha256-nL+2Yc4gI2+SoxoaGlazecsrcVkVh6Ig9sqITSOa5e0="; + version = "2.34.0"; + vendorHash = "sha256-Z0ifACsdSIYevsvRD5KACFSRlvrL1jIJbrzjDFeLbEQ="; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "v${version}"; - sha256 = "sha256-EyDX4OrBAzc5eYR660SrGIG61TRlWnnV/GAtXy7DfEI="; + sha256 = "sha256-SDZzbUh3wbDfzkE/5GgFstDuMYLiM8+MXRZ79jYGoaQ="; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/krunner-translator/default.nix b/third_party/nixpkgs/pkgs/tools/misc/krunner-translator/default.nix new file mode 100644 index 0000000000..c97428b946 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/krunner-translator/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, extra-cmake-modules +, krunner +, kconfigwidgets +, ktextwidgets +, kservice +, ki18n +, translate-shell +, qtbase +, qtdeclarative +, qtlocation +}: + +stdenv.mkDerivation rec { + pname = "krunner-translator"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "naraesk"; + repo = pname; + rev = "v${version}"; + sha256 = "8MusGvNhTxa8Sm8WiSwRaVIfZOeXmgcO4T6H9LqFGLs="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + + dontWrapQtApps = true; + + buildInputs = [ + krunner + kconfigwidgets + ktextwidgets + kservice + ki18n + qtbase + qtdeclarative + qtlocation + ]; + + postPatch = '' + substituteInPlace src/translateShellProcess.cpp --replace "start(\"trans\", arguments);" "start(\"${translate-shell}/bin/trans\", arguments);" + ''; + + meta = with lib; { + description = "A plugin for KRunner which integrates a translator, supports Google Translate, Bing Translator, youdao and Baidu Fanyi"; + homepage = "https://github.com/naraesk/krunner-translator"; + license = licenses.gpl3; + maintainers = with maintainers; [ pongo1231 ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/lbdb/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lbdb/default.nix index 3a7338221b..43dab4772d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lbdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lbdb/default.nix @@ -15,6 +15,7 @@ let perl' = perl.withPackages (p: with p; [ AuthenSASL ConvertASN1 + IOSocketSSL perlldap ]); in diff --git a/third_party/nixpkgs/pkgs/tools/misc/libcpuid/default.nix b/third_party/nixpkgs/pkgs/tools/misc/libcpuid/default.nix index 86706d6dbe..a2c5f13b81 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/libcpuid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/libcpuid/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { - homepage = "http://libcpuid.sourceforge.net/"; + homepage = "https://libcpuid.sourceforge.net/"; description = "A small C library for x86 CPU detection and feature extraction"; changelog = "https://raw.githubusercontent.com/anrieff/libcpuid/master/ChangeLog"; license = licenses.bsd2; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lice/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lice/default.nix index 4cb3f794fd..59b2cef38a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lice/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Print license based on selection and user options"; homepage = "https://github.com/licenses/lice"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/licensor/default.nix b/third_party/nixpkgs/pkgs/tools/misc/licensor/default.nix index 510a169f21..8a81286eeb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/licensor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/licensor/default.nix @@ -17,14 +17,10 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1h66d1brx441bg7vzbqdish4avgmc6h7rrkw2qf1siwmplwqqhw0"; - patches = [ - # Support for 2022, https://github.com/raftario/licensor/pull/68 - (fetchpatch { - name = "support-for-2022.patch"; - url = "https://github.com/raftario/licensor/commit/6b2f248e5ad9e454fe30d71397691e47ac69b19e.patch"; - sha256 = "sha256-kXiY5s2kuU+ibV3RpBoy7y3cmJU+gECBTsmRXWBOTP8="; - }) - ]; + # https://github.com/raftario/licensor/issues/67 + postPatch = '' + sed "/Copyright (c) 2021/s/2021/$(date +%Y)/" -i tests/integration.rs + ''; meta = with lib; { description = "Write licenses to stdout"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/limitcpu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/limitcpu/default.nix index 2d7fb55dcd..75e50d8a78 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/limitcpu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/limitcpu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "limitcpu"; - version = "2.7"; + version = "2.8"; src = fetchurl { url = "mirror://sourceforge/limitcpu/cpulimit-${version}.tar.gz"; - sha256 = "sha256-HeBApPikDf6MegJf6YB1ZzRo+8P8zMvCMbx0AvYuxKA="; + sha256 = "sha256-fjGbCR9QEVTmAFxd+WoEAGbuhtsiAdWDXQq9mOO2t/8="; }; buildFlags = with stdenv; [ ( @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - homepage = "http://limitcpu.sourceforge.net/"; + homepage = "https://limitcpu.sourceforge.net/"; description = "A tool to throttle the CPU usage of programs"; platforms = with platforms; linux ++ freebsd; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/tools/misc/locate-dominating-file/default.nix b/third_party/nixpkgs/pkgs/tools/misc/locate-dominating-file/default.nix new file mode 100644 index 0000000000..7e0d0664b5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/locate-dominating-file/default.nix @@ -0,0 +1,67 @@ +{ bats +, bash +, fetchFromGitHub +, lib +, resholve +, coreutils +, getopt +}: +let + version = "0.0.1"; +in +resholve.mkDerivation { + pname = "locate-dominating-file"; + inherit version; + src = fetchFromGitHub { + owner = "roman"; + repo = "locate-dominating-file"; + rev = "v${version}"; + hash = "sha256-gwh6fAw7BV7VFIkQN02QIhK47uxpYheMk64UeLyp2IY="; + }; + + postPatch = '' + for file in $(find src tests -type f); do + patchShebangs "$file" + done + ''; + + buildInputs = [ getopt coreutils ]; + + checkInputs = [ (bats.withLibraries (p: [ p.bats-support p.bats-assert ])) ]; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + bats -t tests + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp src/locate-dominating-file.sh $out/bin/locate-dominating-file + + runHook postInstall + ''; + + solutions.default = { + scripts = [ "bin/locate-dominating-file" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + coreutils + getopt + ]; + }; + + meta = with lib; { + homepage = "https://github.com/roman/locate-dominating-file"; + description = "Program that looks up in a directory hierarchy for a given filename"; + license = licenses.mit; + maintainers = [ maintainers.roman ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/logstash/6.x.nix b/third_party/nixpkgs/pkgs/tools/misc/logstash/6.x.nix index 4de78cf4cb..ef5d04ee47 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/logstash/6.x.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/logstash/6.x.nix @@ -7,11 +7,9 @@ , jre }: -with lib; - let this = stdenv.mkDerivation rec { version = elk6Version; - pname = "logstash${optionalString (!enableUnfree) "-oss"}"; + pname = "logstash${lib.optionalString (!enableUnfree) "-oss"}"; src = fetchurl { url = "https://artifacts.elastic.co/downloads/logstash/${pname}-${version}.tar.gz"; @@ -63,7 +61,7 @@ let this = stdenv.mkDerivation rec { maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; passthru.tests = - optionalAttrs (!enableUnfree) ( + lib.optionalAttrs (!enableUnfree) ( assert this.drvPath == nixosTests.elk.ELK-6.elkPackages.logstash.drvPath; { elk = nixosTests.elk.ELK-6; diff --git a/third_party/nixpkgs/pkgs/tools/misc/logstash/7.x.nix b/third_party/nixpkgs/pkgs/tools/misc/logstash/7.x.nix index 221c7be83d..cdf810d2a2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/logstash/7.x.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/logstash/7.x.nix @@ -9,12 +9,10 @@ , jre }: -with lib; - let - info = splitString "-" stdenv.hostPlatform.system; - arch = elemAt info 0; - plat = elemAt info 1; + info = lib.splitString "-" stdenv.hostPlatform.system; + arch = lib.elemAt info 0; + plat = lib.elemAt info 1; shas = if enableUnfree then { @@ -29,7 +27,7 @@ let }; this = stdenv.mkDerivation rec { version = elk7Version; - pname = "logstash${optionalString (!enableUnfree) "-oss"}"; + pname = "logstash${lib.optionalString (!enableUnfree) "-oss"}"; src = fetchurl { @@ -79,7 +77,7 @@ let maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; passthru.tests = - optionalAttrs (config.allowUnfree && enableUnfree) ( + lib.optionalAttrs (config.allowUnfree && enableUnfree) ( assert this.drvPath == nixosTests.elk.unfree.ELK-7.elkPackages.logstash.drvPath; { elk = nixosTests.elk.unfree.ELK-7; diff --git a/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix b/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix index 13246255d7..2bdd49f672 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ autoreconfHook groff makeWrapper pkg-config zstd ]; buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) - checkInputs = [ libiconv /* for 'iconv' binary */ ]; + nativeCheckInputs = [ libiconv /* for 'iconv' binary */ ]; patches = [ ./systemwide-man-db-conf.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mandoc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mandoc/default.nix index dc564776d8..96c04c092b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mandoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mandoc/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "regress"; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; preCheck = "patchShebangs --build regress/regress.pl"; passthru.tests = { diff --git a/third_party/nixpkgs/pkgs/tools/misc/massren/default.nix b/third_party/nixpkgs/pkgs/tools/misc/massren/default.nix index 1273e8c63e..885ab1b017 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/massren/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/massren/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "massren"; version = "1.5.6"; @@ -8,10 +8,32 @@ buildGoPackage rec { owner = "laurent22"; repo = "massren"; rev = "v${version}"; - sha256 = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64="; + hash = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64="; }; - goPackagePath = "github.com/laurent22/massren"; + vendorHash = null; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/laurent22/massren/commit/83df215b6e112d1ec375b08d8c44dadc5107155d.patch"; + hash = "sha256-FMTmUrv6zGq11vexUirAuK3H6r78RtoipqyWoh+pzrs="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + + preCheck = + let + skippedTests = [ + # Possible error about github.com/mattn/go-sqlite3 + "Test_guessEditorCommand" + "Test_processFileActions" + ]; + in + '' + buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") + ''; meta = with lib; { description = "Easily rename multiple files using your text editor"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix b/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix index 31f0712dea..a2dae74457 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/memtest86+/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "http://www.memtest.org/"; + homepage = "https://www.memtest.org/"; description = "A tool to detect memory errors"; license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/minicom/default.nix b/third_party/nixpkgs/pkgs/tools/misc/minicom/default.nix index f5d0e5e322..4da38a1a0c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/minicom/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/minicom/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { download. ''; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/moreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/moreutils/default.nix index 1f002136ad..0a7423ec55 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/moreutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/moreutils/default.nix @@ -11,7 +11,6 @@ , darwin }: -with lib; stdenv.mkDerivation rec { pname = "moreutils"; version = "0.67"; @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ makeWrapper perl libxml2 libxslt docbook-xsl docbook_xml_dtd_44 ]; - buildInputs = optional stdenv.isDarwin darwin.cctools; + buildInputs = lib.optional stdenv.isDarwin darwin.cctools; propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ]; @@ -40,7 +39,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ts --prefix PERL5LIB : $PERL5LIB ''; - meta = { + meta = with lib; { description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young"; homepage = "https://joeyh.name/code/moreutils/"; maintainers = with maintainers; [ koral pSub ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ms-sys/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ms-sys/default.nix index 0df6de82bd..c0f807318b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ms-sys/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ms-sys/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program for writing Microsoft-compatible boot records"; - homepage = "http://ms-sys.sourceforge.net/"; + homepage = "https://ms-sys.sourceforge.net/"; license = licenses.gpl2Plus; platforms = with platforms; linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix index b8b5d93c38..d535061cde 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ncdu"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-Xkr49rzYz3rY/T15ANqxMgdFoEUxAenjdPmnf3Ku0UE="; + hash = "sha256-kNkgAk51Ixi0aXds5X4Ds8cC1JMprZglruqzbDur+ZM="; }; XDG_CACHE_HOME="Cache"; # FIXME This should be set in stdenv @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://dev.yorhel.nl/ncdu"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ pSub SuperSandro2000 ]; + maintainers = with maintainers; [ pSub SuperSandro2000 rodrgz ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix index bde0e73453..3e10f18173 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix @@ -26,7 +26,7 @@ in python.pkgs.buildPythonApplication rec { sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv"; }; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ mock ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix index ab2b28c52e..9154c1eabb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nurl/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "nurl"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "nix-community"; repo = "nurl"; rev = "v${version}"; - hash = "sha256-MPgJIO7pHpXeryJZB/u1iBpBhleKfTWkrArW2L0E4EM="; + hash = "sha256-AJHmHTkKHd99GCBlVv2t8Q9kUlCtOcK+ukYzEs5U3S4="; }; - cargoSha256 = "sha256-yMWNFY9exmDyqcU2iT9YFAcknYmtbYJ9VhJqlKg+NF4="; + cargoSha256 = "sha256-0QUuYNzKN8dbGiJq2JxElR39zIlqvHXjPzT1dGc6cRM="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/misc/nvimpager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nvimpager/default.nix index 6e415461c4..4a3887438f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nvimpager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nvimpager/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; doCheck = true; - checkInputs = [ lua51Packages.busted util-linux neovim ]; + nativeCheckInputs = [ lua51Packages.busted util-linux neovim ]; # filter out one test that fails in the sandbox of nix checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix index 934ef186ba..823606395a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch , cmake , installShellFiles , pkg-config @@ -15,36 +14,28 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.14.2"; + version = "2.15.1"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = version; - sha256 = "sha256-LiX91GMJdmhosCZcL3JlzYRieqeQs+YWMAtKTzSBzZY="; + sha256 = "sha256-3wXZBPYths3+Vhtq4W2BTR47V63o0bq++fWLIpWrm7Y="; }; - cargoSha256 = "sha256-D1GVwNpuqoiwJsWAZfTR9qUC1xuHR+O0bq9rxmgkYXk="; + cargoSha256 = "sha256-xBw2OMJMale4MWRyy6v0E0ZE4A98QXLyRu0k7L+9q8k="; cargoPatches = [ # enable pkg-config feature of zstd ./zstd-pkg-config.patch ]; - patches = [ - (fetchpatch { - name = "use-iso-time-for-snapshot-tests"; - url = "https://github.com/o2sh/onefetch/commit/b8b0320d2d271bb10053403092833a26e57134d1.patch"; - hash = "sha256-LnC+UCvSwMePC4jBjrTKnbyypNvHHNevB2v4y+hv8Pc="; - }) - ]; - nativeBuildInputs = [ cmake installShellFiles pkg-config ]; buildInputs = [ zstd ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation libresolv Security ]; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/open-pdf-sign/default.nix b/third_party/nixpkgs/pkgs/tools/misc/open-pdf-sign/default.nix index ca18fb3a04..b791c53b90 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/open-pdf-sign/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/open-pdf-sign/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, nix-update-script }: stdenv.mkDerivation rec { - version = "0.1.2"; + version = "0.1.3"; pname = "open-pdf-sign"; src = fetchurl { url = "https://github.com/open-pdf-sign/open-pdf-sign/releases/download/v${version}/open-pdf-sign.jar"; - sha256 = "sha256-k7ECqrZj7MXbQN5HCcVNcKbLe9LjigQboYs65gf4awA="; + sha256 = "sha256-LW+H4LzXxip2XXZtQs0mBKHpb/Byi5v7QIWdF+X5ulk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix index 42f127836e..67ac3c0f40 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.68.0"; + version = "0.70.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-hb+T4sEYagraqiAHjoy6rp+wFtsyuYmK+biX78TV7cA="; + sha256 = "sha256-r7Pw2zBRwaDMXZ7j8hNT1+a9sSWZpl0+8Y4rtIveoPY="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-WvZzAZtkkzWjE1TBzR4bCUdux6YyZ1VUl15hKRjNPyE="; + vendorHash = "sha256-HyI3ETQQJE6bAhC2W7UfO9yqfoxu8aITcmIJmrOZpbM="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentimestamps-client/default.nix b/third_party/nixpkgs/pkgs/tools/misc/opentimestamps-client/default.nix index 93c1053069..2a5c2c05a0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentimestamps-client/default.nix @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { pysocks ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/oscclip/default.nix b/third_party/nixpkgs/pkgs/tools/misc/oscclip/default.nix index a22490633d..ea715fe934 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/oscclip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/oscclip/default.nix @@ -29,6 +29,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/rumpelsepp/oscclip"; license = licenses.gpl3Only; - maintainers = [ maintainers.traxys ]; + maintainers = with maintainers; [ rumpelsepp traxys ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix b/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix index ece0818303..1e310fb4c1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/osm2pgsql/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-KJkqzvsm0IMaqeKnIbLGeOSJrsLvW+z7lCg6NbuU13g="; + hash = "sha256-v+/pT8HnLoeeYe33v4xUoR5YWD/jHgEG/Q11Trw9X2s="; }; postPatch = '' @@ -35,14 +35,13 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero rapidjson ] + buildInputs = [ expat fmt proj bzip2 zlib boost postgresql libosmium protozero ] ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" - "-DEXTERNAL_RAPIDJSON=ON" "-DEXTERNAL_FMT=ON" ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/page/default.nix b/third_party/nixpkgs/pkgs/tools/misc/page/default.nix index be0a407dca..1468b350f5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/page/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/page/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "page"; - version = "4.4.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "I60R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FNxOWR6An/d3dyCcsfBX7XSwiFlOfdrJ1Tp4qrYrvSk="; + sha256 = "sha256-iK8XRPT/0PG3szIRkHvUIdgJC1XsuBbDKk25RvwSViQ="; }; nativeBuildInputs = [ installShellFiles ]; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { installShellCompletion --zsh $completions_dir/_page ''; - cargoSha256 = "sha256-K2z85YN85JWgv8imQIm6b02tnQEVB6OiwJ2692wH3nw="; + cargoSha256 = "sha256-OZvsZijrIeVxqf58P16Woanf0JsJIENX72n28wMtq14="; meta = with lib; { description = "Use neovim as pager"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pal/default.nix index c37325170a..5456ffdf06 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pal/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = "http://palcal.sourceforge.net/"; + homepage = "https://palcal.sourceforge.net/"; description = "Command-line calendar program that can keep track of events"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [viric]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix b/third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix index acb66e3dca..e1fa8cc0b7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-RIjdNfX4jsMwpgbE1aTzT6bysIFGUi33o5m030fF6mg="; + sha256 = "sha256-bbePMbI1YF0YvakO5vlURdE7UG3pLiuByImYvDq9cRY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix index b39cfda17d..ca7b47efad 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20220322"; + version = "20221222"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-35PM9qn1Ka0hJrcEKu8EhmA+k4x3tAWTnEFwLTik5tg="; + sha256 = "sha256-TakMe+wYqUQxtOPbSd1WP2XPIM6v0kX3zHtC74v4WX8="; }; outputs = [ "out" "man" "doc" ]; @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ perl procps ]; + preInstall = '' + patchShebangs ./src/parallel + ''; + postInstall = '' wrapProgram $out/bin/parallel \ --prefix PATH : "${lib.makeBinPath [ procps perl coreutils ]}" diff --git a/third_party/nixpkgs/pkgs/tools/misc/parquet-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parquet-tools/default.nix index d560c8b848..38a71dd02a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/parquet-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/parquet-tools/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , python3Packages }: @@ -8,36 +7,34 @@ with python3Packages; buildPythonApplication rec { pname = "parquet-tools"; - version = "0.2.9"; - disabled = pythonOlder "3.8"; + version = "0.2.12"; format = "pyproject"; src = fetchFromGitHub { owner = "ktrueda"; repo = "parquet-tools"; - rev = version; - sha256 = "0aw0x7lhagp4dwis09fsizr7zbhdpliav0ns5ll5qny7x4m6rkfy"; + rev = "refs/tags/${version}"; + hash = "sha256-5bK+kW550DgBhcH5INozwGKKjM+xXblmFg2Tu2rnos4="; }; - patches = [ - (fetchpatch { - url = "https://github.com/ktrueda/parquet-tools/commit/1c70a07e1c9f17c8890d23aad3ded5dd6c706cb3.patch"; - sha256 = "08j1prdqj8ksw8gwiyj7ivshk82ahmywbzmywclw52nlnniig0sa"; - }) - ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'thrift = "^0.13.0"' 'thrift = "*"' \ - --replace 'halo = "^0.0.29"' 'halo = "*"' substituteInPlace tests/test_inspect.py \ --replace "parquet-cpp-arrow version 5.0.0" "parquet-cpp-arrow version ${pyarrow.version}" \ --replace "serialized_size: 2222" "serialized_size: 2221" \ --replace "format_version: 1.0" "format_version: 2.6" ''; - nativeBuildInputs = [ poetry-core ]; + pythonRelaxDeps = [ + "halo" + "tabulate" + "thrift" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; propagatedBuildInputs = [ boto3 @@ -49,21 +46,26 @@ buildPythonApplication rec { thrift ]; - checkInputs = [ - pytestCheckHook + nativeCheckInputs = [ moto pytest-mock + pytestCheckHook ]; disabledTests = [ - # these tests try to read python code as parquet and fail + # These tests try to read Python code as parquet and fail "test_local_wildcard" "test_local_and_s3_wildcard_files" ]; + pythonImportsCheck = [ + "parquet_tools" + ]; + meta = with lib; { description = "A CLI tool for parquet files"; homepage = "https://github.com/ktrueda/parquet-tools"; + changelog = "https://github.com/ktrueda/parquet-tools/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/parted/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parted/default.nix index 35c82b630b..f9f62854bb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/parted/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/parted/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # Tests were previously failing due to Hydra running builds as uid 0. # That should hopefully be fixed now. doCheck = !stdenv.hostPlatform.isMusl; /* translation test */ - checkInputs = [ check dosfstools e2fsprogs perl python3 util-linux ]; + nativeCheckInputs = [ check dosfstools e2fsprogs perl python3 util-linux ]; meta = { description = "Create, destroy, resize, check, and copy partitions"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/past-time/default.nix b/third_party/nixpkgs/pkgs/tools/misc/past-time/default.nix index 3604e4ddcb..cc4a400786 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/past-time/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/past-time/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgbadger/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgbadger/default.nix index c7c4fd1f89..b0c4c1ad65 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pgbadger/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pgbadger/default.nix @@ -20,7 +20,7 @@ buildPerlPackage rec { buildInputs = [ PodMarkdown JSONXS TextCSV ]; - checkInputs = [ which bzip2 ]; + nativeCheckInputs = [ which bzip2 ]; meta = { homepage = "https://github.com/darold/pgbadger"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix index 74aa650022..aeb978ec31 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.6.2"; + version = "2.6.5"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-jByxNjz0KwcikOIpyxpswRbH4PFPu7mi9wERLHchPrI="; + sha256 = "sha256-6pt8WjfSt458FIK/cCzEOM9mFruFY6jBnkXoRWIhOr0="; }; - vendorHash = "sha256-LlMBV52CG1uYW7I/e0VwoIIr0wk3ysc5gqrAlFRPsvE="; + vendorHash = "sha256-zUwp7RqaKtxbTzEOhcmGG/+tqtBKs7cm6+sFNCKET08="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix index a6100784a6..529a7db25b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-HiElAPgNeICEVbMBfK6syCoQb5smHhBH1MOuo2swci4="; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; preCheck = '' patchShebangs tests/editors/env-editor.py diff --git a/third_party/nixpkgs/pkgs/tools/misc/pixd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pixd/default.nix index 8152849d9b..2e8f552e1a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pixd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pixd/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub }: -with lib; - stdenv.mkDerivation rec { pname = "pixd"; version = "1.0.0"; @@ -15,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - meta = { + meta = with lib; { description = "Colourful visualization tool for binary files"; homepage = "https://github.com/FireyFly/pixd"; maintainers = [ maintainers.FireyFly ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix index ddbb7708ec..607bc53033 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: let - version = "1.2023.0"; + version = "1.2023.1"; in stdenv.mkDerivation rec { pname = "plantuml-server"; inherit version; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-FYyP6CZb+uarXlGEAPyt6KKvciZ5XsfjilDW0JObpDw="; + sha256 = "sha256-SaUk+gaMCpKF1HR9tpEhbZNmKV70LPHeH/YPsU8WGsU="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pls/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pls/default.nix index 95c775417c..c6d6d2e528 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pls/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pls/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { rich ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ freezegun jsonschema pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix index fe2eb882c1..ab30518ffd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { # Tests depend on sudo doCheck = stdenv.isLinux; - checkInputs = [ pytestCheckHook git openssl ps sudo ]; + nativeCheckInputs = [ pytestCheckHook git openssl ps sudo ]; # Add test dependency in PATH preCheck = "export PYTHONPATH=$PYTHONPATH:${pmb_test}"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix index e694106a0e..8adb5a02f8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pre-commit/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ cargo dotnet-sdk git diff --git a/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix index 6ab2369a82..b2e6deea72 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "profile-sync-daemon"; - version = "6.47"; + version = "6.48"; src = fetchFromGitHub { owner = "graysky2"; repo = "profile-sync-daemon"; rev = "v${version}"; - hash = "sha256-BAr+EvSjSPBKdSX49tEgXOpMK3NB5JZ+cmfuKkyDbGs="; + hash = "sha256-EHzRuE24Bj+lqRiPTCAPEAV4zVMK8iW2cF6OgO1izZw="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/progress/default.nix b/third_party/nixpkgs/pkgs/tools/misc/progress/default.nix index 9feee48417..94eeace1dc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/progress/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/progress/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Xfennec/progress"; description = "Tool that shows the progress of coreutils programs"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix index 3a3ab90d30..f2a2adca4c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.7.1"; + version = "5.7.2"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-4h0W9jw95vOxpseyY7SydiWSFDArAY/ms4+Sk/1esHk="; + sha256 = "sha256-IwkvQ3zKdnZ0lefmRQCxD5aeMw7aFbUzfFQZG7GtXlo="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/psrecord/default.nix b/third_party/nixpkgs/pkgs/tools/misc/psrecord/default.nix index 728314e6e7..2f2b14e487 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/psrecord/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/psrecord/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { psutil matplotlib ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix index 81cb81829a..4c52b9b239 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { argcomplete ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pyfakefs mock ddt diff --git a/third_party/nixpkgs/pkgs/tools/misc/qmake2cmake/default.nix b/third_party/nixpkgs/pkgs/tools/misc/qmake2cmake/default.nix index f9ff0dc6a7..b00d43a193 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/qmake2cmake/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/qmake2cmake/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { sympy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/recutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/recutils/default.nix index 0299cf3821..4bd3ef131c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/recutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/recutils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { curl ]; - checkInputs = [ + nativeCheckInputs = [ bc check ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rig/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rig/default.nix index 5efa92ef15..f21873df15 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rig/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rig/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ]; meta = { - homepage = "http://rig.sourceforge.net/"; + homepage = "https://rig.sourceforge.net/"; description = "Random identity generator"; longDescription = '' RIG (Random Identity Generator) is a free replacement for a shareware diff --git a/third_party/nixpkgs/pkgs/tools/misc/rmate-sh/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rmate-sh/default.nix new file mode 100644 index 0000000000..7fb51344ed --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/rmate-sh/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitHub +, patsh +, hostname +}: + +stdenv.mkDerivation rec { + pname = "rmate"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "aurora"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-fmK6h9bqZ0zO3HWfZvPdYuZ6i/0HZ1CA3FUnkS+E9ns="; + }; + + nativeBuildInputs = [ patsh ]; + + buildPhase = '' + runHook preBuild + + substituteInPlace rmate \ + --replace \ + 'echo "hostname"' \ + 'echo "${hostname}/bin/hostname"' + patsh -f rmate -s ${builtins.storeDir} + + runHook preBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 rmate $out/bin/rmate + + runHook postInstall + ''; + + meta = with lib; { + description = "Remote TextMate 2 implemented as shell script"; + longDescription = '' + TextMate 2 has a nice feature where it is possible to edit + files on a remote server using a helper script called 'rmate', + which feeds the file back to the editor over a reverse tunnel. + This is a rmate implementation in shell! + ''; + homepage = "https://github.com/aurora/rmate"; + platforms = platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/rmlint/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rmlint/default.nix index 8211c5aebc..e3969d01ee 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rmlint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rmlint/default.nix @@ -20,7 +20,6 @@ assert withGui -> !stdenv.isDarwin; -with lib; stdenv.mkDerivation rec { pname = "rmlint"; version = "2.10.1"; @@ -32,6 +31,11 @@ stdenv.mkDerivation rec { sha256 = "15xfkcw1bkfyf3z8kl23k3rlv702m0h7ghqxvhniynvlwbgh6j2x"; }; + patches = [ + # pass through NIX_* environment variables to scons. + ./scons-nix-env.patch + ]; + nativeBuildInputs = [ pkg-config sphinx @@ -57,9 +61,6 @@ stdenv.mkDerivation rec { ]; prePatch = '' - export CFLAGS="$NIX_CFLAGS_COMPILE" - export LDFLAGS="''${NIX_LDFLAGS//-rpath /-Wl,-rpath=}" - # remove sources of nondeterminism substituteInPlace lib/cmdline.c \ --replace "__DATE__" "\"Jan 1 1970\"" \ @@ -68,6 +69,7 @@ stdenv.mkDerivation rec { --replace "gzip -c " "gzip -cn " ''; + # Otherwise tries to access /usr. prefixKey = "--prefix="; sconsFlags = lib.optionals (!withGui) [ "--without-gui" ]; @@ -78,7 +80,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${python3.pkgs.pygobject3}):$(toPythonPath ${python3.pkgs.pycairo})") ''; - meta = { + meta = with lib; { description = "Extremely fast tool to remove duplicates and other lint from your filesystem"; homepage = "https://rmlint.readthedocs.org"; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rmlint/scons-nix-env.patch b/third_party/nixpkgs/pkgs/tools/misc/rmlint/scons-nix-env.patch new file mode 100644 index 0000000000..10ed5698be --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/rmlint/scons-nix-env.patch @@ -0,0 +1,19 @@ +scons does not use os environment by default: + https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html + +nixpkgs' cc-wrapper on the other hand relies on various NIX_* variables +to be passed through like NIX_CFLAGS_COMPILE_BEFORE. +--- a/SConstruct ++++ b/SConstruct +@@ -559,10 +559,7 @@ options = dict( + SHLINKCOMSTR=link_shared_library_message, + LINKCOMSTR=link_program_message, + PREFIX=GetOption('prefix'), +- ENV = dict([ (key, os.environ[key]) +- for key in os.environ +- if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH'] +- ]) ++ ENV = os.environ, + ) + + if ARGUMENTS.get('VERBOSE') == "1": diff --git a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix index 7b9b362d79..3c3b02dd3f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2022.13"; + version = "2023.1"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-3lU+Xmfyjs6AFnf+vE5xMSAntRoNeHBVrOJZLvv1YyY="; + hash = "sha256-JNLp1IHbIRpe3Au2iUsx7x065rirQlzT9bg7CoqHCyg="; }; nativeBuildInputs = [ @@ -114,6 +114,9 @@ stdenv.mkDerivation rec { env NOCONFIGURE=1 ./autogen.sh ''; + # https://github.com/NixOS/nixpkgs/issues/201254 + NIX_LDFLAGS = lib.optionalString (stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU) "-lgcc"; + meta = with lib; { description = "A hybrid image/package system. It uses OSTree as an image format, and uses RPM as a component model"; homepage = "https://coreos.github.io/rpm-ostree/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/setconf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/setconf/default.nix new file mode 100644 index 0000000000..fdb80bfb25 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/setconf/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +}: + +buildPythonApplication rec { + pname = "setconf"; + version = "0.7.7"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "xyproto"; + repo = "setconf"; + rev = version; + hash = "sha256-HYZdDtDlGrT3zssDdMW3559hhC+cPy8qkmM8d9zEa1A="; + }; + + meta = { + homepage = "https://github.com/xyproto/setconf"; + description = "A small utility for changing settings in configuration textfiles"; + changelog = "https://github.com/xyproto/setconf/releases/tag/${version}"; + maintainers = [ lib.maintainers.AndersonTorres ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix index 8a0fdd719d..6ca75c64f5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix @@ -17,13 +17,13 @@ stdenvNoCC.mkDerivation rec { pname = "Sharedown"; - version = "5.0.2"; + version = "5.1.0"; src = fetchFromGitHub { owner = "kylon"; repo = pname; rev = version; - sha256 = "sha256-N5jnjiD3R+uTRgHHocVVxYQ7GzUTz0fZAQGIXzcVTtA="; + sha256 = "sha256-cD+xq2LVaTZGjFj+SleQlNT3sAV6N4nG4RVbH015OOA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock index e9e3d218a3..fc30e71aaf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarn.lock @@ -44,6 +44,11 @@ minimatch "^3.0.4" plist "^3.0.4" +"@fortawesome/fontawesome-free@^6.2.0": + version "6.2.0" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz#ba3510825b332816fe7190f28827f8cb33a298b5" + integrity sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ== + "@malept/cross-spawn-promise@^1.1.0": version "1.1.1" resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" @@ -111,14 +116,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*": - version "18.7.16" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.16.tgz#0eb3cce1e37c79619943d2fd903919fc30850601" - integrity sha512-EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg== + version "18.11.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.3.tgz#78a6d7ec962b596fc2d2ec102c4dd3ef073fea6a" + integrity sha512-fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A== "@types/node@^16.11.26": - version "16.11.58" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.58.tgz#0a3698dee3492617a8d5fe7998d18d7520b63026" - integrity sha512-uMVxJ111wpHzkx/vshZFb6Qni3BOMnlWLq7q9jrwej7Yw/KvjsEbpxCCxw+hLKxexFMc8YmpG8J9tnEe/rKsIg== + version "16.11.68" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.68.tgz#30ee923f4d940793e0380f5ce61c0bd4b7196b6c" + integrity sha512-JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ== "@types/plist@^3.0.1": version "3.0.2" @@ -139,9 +144,9 @@ integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^17.0.1": - version "17.0.12" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz#0745ff3e4872b4ace98616d4b7e37ccbd75f9526" - integrity sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ== + version "17.0.13" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76" + integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg== dependencies: "@types/yargs-parser" "*" @@ -174,13 +179,6 @@ ajv@^6.10.0, ajv@^6.12.0: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-align@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" - integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== - dependencies: - string-width "^4.1.0" - ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -198,10 +196,10 @@ app-builder-bin@4.0.0: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== -app-builder-lib@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.3.3.tgz#78b9dbb0bd8a69842461edd77a3226d0547c5939" - integrity sha512-m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ== +app-builder-lib@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8" + integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" @@ -209,13 +207,13 @@ app-builder-lib@23.3.3: "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chromium-pickle-js "^0.2.0" debug "^4.3.4" ejs "^3.1.7" electron-osx-sign "^0.6.0" - electron-publish "23.3.3" + electron-publish "23.6.0" form-data "^4.0.0" fs-extra "^10.1.0" hosted-git-info "^4.1.0" @@ -282,13 +280,14 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -axios@^0.27.2: - version "0.27.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" - integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== +axios@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35" + integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA== dependencies: - follow-redirects "^1.14.9" + follow-redirects "^1.15.0" form-data "^4.0.0" + proxy-from-env "^1.1.0" balanced-match@^1.0.0: version "1.0.2" @@ -326,24 +325,10 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== -bootstrap@5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.1.tgz#45f97ff05cbe828bad807b014d8425f3aeb8ec3a" - integrity sha512-UQi3v2NpVPEi1n35dmRRzBJFlgvWHYwyem6yHhuT6afYF+sziEt46McRbT//kVXZ7b1YUYEVGdXEH74Nx3xzGA== - -boxen@^5.0.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" - integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== - dependencies: - ansi-align "^3.0.0" - camelcase "^6.2.0" - chalk "^4.1.0" - cli-boxes "^2.2.1" - string-width "^4.2.2" - type-fest "^0.20.2" - widest-line "^3.1.0" - wrap-ansi "^7.0.0" +bootstrap@5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.2.tgz#834e053eed584a65e244d8aa112a6959f56e27a0" + integrity sha512-dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ== brace-expansion@^1.1.7: version "1.1.11" @@ -401,25 +386,25 @@ buffer@^5.1.0, buffer@^5.2.1, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@9.0.3: - version "9.0.3" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz#6c62c493ba2b73c2af92432db4013b5a327f02b2" - integrity sha512-SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA== +builder-util-runtime@9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" + integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== dependencies: debug "^4.3.4" sax "^1.2.4" -builder-util@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.3.3.tgz#449ee57ec1ffc7e59f7a3a8a1a33d25cf5e39e43" - integrity sha512-MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA== +builder-util@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9" + integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ== dependencies: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.6" "@types/fs-extra" "^9.0.11" app-builder-bin "4.0.0" bluebird-lst "^1.0.9" - builder-util-runtime "9.0.3" + builder-util-runtime "9.1.1" chalk "^4.1.1" cross-spawn "^7.0.3" debug "^4.3.4" @@ -445,12 +430,7 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" -camelcase@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== - -chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.2, chalk@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -473,20 +453,10 @@ chromium-pickle-js@^0.2.0: resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - ci-info@^3.2.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.4.0.tgz#b28484fd436cbc267900364f096c9dc185efb251" - integrity sha512-t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug== - -cli-boxes@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" - integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== + version "3.5.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f" + integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw== cli-truncate@^2.1.0: version "2.1.0" @@ -505,13 +475,13 @@ clipboardy@2.3.0: execa "^1.0.0" is-wsl "^2.1.1" -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== dependencies: string-width "^4.2.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" wrap-ansi "^7.0.0" clone-response@^1.0.2: @@ -575,18 +545,6 @@ config-chain@^1.1.11: ini "^1.3.4" proto-list "~1.2.1" -configstore@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" - integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== - dependencies: - dot-prop "^5.2.0" - graceful-fs "^4.1.2" - make-dir "^3.0.0" - unique-string "^2.0.0" - write-file-atomic "^3.0.0" - xdg-basedir "^4.0.0" - core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -626,11 +584,6 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -crypto-random-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" - integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== - debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -692,10 +645,10 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -devtools-protocol@0.0.1036444: - version "0.0.1036444" - resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1036444.tgz#a570d3cdde61527c82f9b03919847b8ac7b1c2b9" - integrity sha512-0y4f/T8H9lsESV9kKP1HDUXgHxCdniFeJh6Erq+FbdOEvp/Ydp9t8kcAAM5gOd17pMrTDlFWntoHtzzeTUWKNw== +devtools-protocol@0.0.1045489: + version "0.0.1045489" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1045489.tgz#f959ad560b05acd72d55644bc3fb8168a83abf28" + integrity sha512-D+PTmWulkuQW4D1NTiCRCFxF7pQPn0hgp4YyX4wAQ6xYXKOadSWPR3ENGDQ47MW/Ewc9v2rpC/UEEGahgBYpSQ== dir-compare@^2.4.0: version "2.4.0" @@ -707,14 +660,14 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.3.3.tgz#b37547f8403c3e9f7c60265a93d902f5b0c395ea" - integrity sha512-ECwAjt+ZWyOvddrkDx1xRD6IVUCZb5SV6vSMHZd+Va3G2sUXHrnglR1cGDKRF4oYRQm8SYVrpLZKbi8npyDcAQ== +dmg-builder@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948" + integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA== dependencies: - app-builder-lib "23.3.3" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" fs-extra "^10.0.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" @@ -735,13 +688,6 @@ dmg-license@^1.0.11: smart-buffer "^4.0.2" verror "^1.10.0" -dot-prop@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" - integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== - dependencies: - is-obj "^2.0.0" - dotenv-expand@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" @@ -764,23 +710,23 @@ ejs@^3.1.7: dependencies: jake "^10.8.5" -electron-builder@^23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.3.3.tgz#88d4e584a99b9e36ca4e8432b1163a1ef877355f" - integrity sha512-mFYYdhoFPKevP6y5uaaF3dusmB2OtQ/HnwwpyOePeU7QDS0SEIAUokQsHUanAiJAZcBqtY7iyLBgX18QybdFFw== +electron-builder@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b" + integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw== dependencies: "@types/yargs" "^17.0.1" - app-builder-lib "23.3.3" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chalk "^4.1.1" - dmg-builder "23.3.3" + dmg-builder "23.6.0" fs-extra "^10.0.0" is-ci "^3.0.0" lazy-val "^1.0.5" read-config-file "6.2.0" - update-notifier "^5.1.0" - yargs "^17.0.1" + simple-update-notifier "^1.0.7" + yargs "^17.5.1" electron-osx-sign@^0.6.0: version "0.6.0" @@ -794,23 +740,23 @@ electron-osx-sign@^0.6.0: minimist "^1.2.0" plist "^3.0.1" -electron-publish@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.3.3.tgz#c4125fbb00620acb854f6e994fd3ab3115662ddd" - integrity sha512-1dX17eE5xVXedTxjC+gjsP74oC0+sIHgqysp0ryTlF9+yfQUyXjBk6kcK+zhtBA2SsHMSglDtM+JPxDD/WpPTQ== +electron-publish@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9" + integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chalk "^4.1.1" fs-extra "^10.0.0" lazy-val "^1.0.5" mime "^2.5.2" -electron@^20.1.2: - version "20.1.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-20.1.3.tgz#8a4e3f6945fa7ed06ba54d0f987737b0e057ceb4" - integrity sha512-DXBHzAwcpCor9MrxG9QA3Zt0sNcQbJ8ZJCYTC6xpuPe5wugBa6RF3hXqDUYdD2yOCUhjLbD3VASWn0+5LdYT3g== +electron@^21.0.1: + version "21.2.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-21.2.0.tgz#8eb65d69b36aa8dac0ee7330eab70181df211c8b" + integrity sha512-oKV4fo8l6jlOZ1cYZ4RpZz02ZxLuBo3SO7DH+FrJ8uDyCirP+eVJ/qlzu23odtNe0P7S/mYAZbC6abZHWoqtLg== dependencies: "@electron/get" "^1.14.1" "@types/node" "^16.11.26" @@ -848,11 +794,6 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-goat@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" - integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== - escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" @@ -921,15 +862,10 @@ filelist@^1.0.1: dependencies: minimatch "^5.0.1" -follow-redirects@^1.14.9: - version "1.15.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5" - integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA== - -font-awesome@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" - integrity sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg== +follow-redirects@^1.15.0: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== form-data@^4.0.0: version "4.0.0" @@ -996,9 +932,9 @@ get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598" - integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA== + version "1.1.3" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" + integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== dependencies: function-bind "^1.1.1" has "^1.0.3" @@ -1047,13 +983,6 @@ global-agent@^3.0.0: semver "^7.3.2" serialize-error "^7.0.1" -global-dirs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" - integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== - dependencies: - ini "2.0.0" - global-tunnel-ng@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" @@ -1088,7 +1017,7 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: +graceful-fs@^4.1.6, graceful-fs@^4.2.0: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -1115,11 +1044,6 @@ has-symbols@^1.0.3: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== -has-yarn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" - integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -1176,16 +1100,6 @@ ieee754@^1.1.13: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A== - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -1199,23 +1113,11 @@ inherits@2, inherits@^2.0.3, inherits@^2.0.4: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" - integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== - ini@^1.3.4, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -is-ci@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" - integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== - dependencies: - ci-info "^2.0.0" - is-ci@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" @@ -1233,39 +1135,11 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-installed-globally@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" - integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== - dependencies: - global-dirs "^3.0.0" - is-path-inside "^3.0.2" - -is-npm@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" - integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== - -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== - -is-path-inside@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== -is-typedarray@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== - is-wsl@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" @@ -1273,11 +1147,6 @@ is-wsl@^2.1.1: dependencies: is-docker "^2.0.0" -is-yarn-global@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" - integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== - isbinaryfile@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" @@ -1368,13 +1237,6 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" -latest-version@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" - integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== - dependencies: - package-json "^6.3.0" - lazy-val@^1.0.4, lazy-val@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" @@ -1402,13 +1264,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -make-dir@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -1465,9 +1320,9 @@ minimatch@^5.0.1: brace-expansion "^2.0.1" minimist@^1.2.0, minimist@^1.2.3: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== minipass@^3.0.0: version "3.3.4" @@ -1515,9 +1370,9 @@ nice-try@^1.0.4: integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== node-abi@^3.3.0: - version "3.24.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.24.0.tgz#b9d03393a49f2c7e147d0c99f180e680c27c1599" - integrity sha512-YPG3Co0luSu6GwOBsmIdGW6Wx0NyNDLg/hriIyDllVsNwnI6UeqaWShxC3lbH4LtEQUgoLP3XR1ndXiDAWvmRw== + version "3.28.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.28.0.tgz#b0df8b317e1c4f2f323756c5fc8ffccc5bca4718" + integrity sha512-fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A== dependencies: semver "^7.3.5" @@ -1580,16 +1435,6 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== -package-json@^6.3.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" - integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== - dependencies: - got "^9.6.0" - registry-auth-token "^4.0.0" - registry-url "^5.0.0" - semver "^6.2.0" - path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -1656,7 +1501,7 @@ proto-list@~1.2.1: resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== -proxy-from-env@1.1.0: +proxy-from-env@1.1.0, proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== @@ -1674,31 +1519,33 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -pupa@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" - integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== - dependencies: - escape-goat "^2.0.0" - -puppeteer@17.1.2: - version "17.1.2" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-17.1.2.tgz#1e8ea8b0eee0e6afc5d95e2db6ae828a51ad63c9" - integrity sha512-xgFOxUl4hRjwQpODZSeJlE/rUzi8OmHtc3T4ir4CRYGzVmaTVHAl8VGpI0ooy752u2DFeMxvQdHmxNnLqPImIg== +puppeteer-core@19.0.0: + version "19.0.0" + resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.0.0.tgz#8d0198550e04c7d5e0847200ba257b2a777dbd3b" + integrity sha512-OljQ9W5M4cBX68vnOAGbcRkVENDHn6lfj6QYoGsnLQsxPAh6ExTQAhHauwdFdQkhYdDExZFWlKArnBONzeHY+g== dependencies: cross-fetch "3.1.5" debug "4.3.4" - devtools-protocol "0.0.1036444" + devtools-protocol "0.0.1045489" extract-zip "2.0.1" https-proxy-agent "5.0.1" - progress "2.0.3" proxy-from-env "1.1.0" rimraf "3.0.2" tar-fs "2.1.1" unbzip2-stream "1.4.3" - ws "8.8.1" + ws "8.9.0" -rc@1.2.8, rc@^1.2.7, rc@^1.2.8: +puppeteer@19.0.0: + version "19.0.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.0.0.tgz#848986e6ecec37b19cd5a7327ad2fcf1f1cb83fd" + integrity sha512-3Ga5IVerQQ2hKU9q7T28RmcUsd8F2kL6cYuPcPCzeclSjmHhGydPBZL/KJKC02sG6J6Wfry85uiWpbkjQ5qBiw== + dependencies: + https-proxy-agent "5.0.1" + progress "2.0.3" + proxy-from-env "1.1.0" + puppeteer-core "19.0.0" + +rc@^1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -1728,20 +1575,6 @@ readable-stream@^3.1.1, readable-stream@^3.4.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" -registry-auth-token@^4.0.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac" - integrity sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg== - dependencies: - rc "1.2.8" - -registry-url@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" - integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== - dependencies: - rc "^1.2.8" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -1800,30 +1633,28 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== -semver-diff@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" - integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== - dependencies: - semver "^6.3.0" - semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: +semver@^6.2.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== +semver@^7.3.2, semver@^7.3.5, semver@^7.3.7: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== dependencies: lru-cache "^6.0.0" +semver@~7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== + serialize-error@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" @@ -1855,7 +1686,7 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -signal-exit@^3.0.0, signal-exit@^3.0.2: +signal-exit@^3.0.0: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== @@ -1874,6 +1705,13 @@ simple-get@^4.0.0: once "^1.3.1" simple-concat "^1.0.0" +simple-update-notifier@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz#7edf75c5bdd04f88828d632f762b2bc32996a9cc" + integrity sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew== + dependencies: + semver "~7.0.0" + slice-ansi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" @@ -1911,7 +1749,7 @@ stat-mode@^1.0.0: resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -2052,18 +1890,6 @@ type-fest@^0.13.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== - dependencies: - is-typedarray "^1.0.0" - unbzip2-stream@1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" @@ -2072,13 +1898,6 @@ unbzip2-stream@1.4.3: buffer "^5.2.1" through "^2.3.8" -unique-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" - integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== - dependencies: - crypto-random-string "^2.0.0" - universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -2089,26 +1908,6 @@ universalify@^2.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== -update-notifier@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" - integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== - dependencies: - boxen "^5.0.0" - chalk "^4.1.0" - configstore "^5.0.1" - has-yarn "^2.1.0" - import-lazy "^2.1.0" - is-ci "^2.0.0" - is-installed-globally "^0.4.0" - is-npm "^5.0.0" - is-yarn-global "^0.3.0" - latest-version "^5.1.0" - pupa "^2.1.1" - semver "^7.3.4" - semver-diff "^3.1.1" - xdg-basedir "^4.0.0" - uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -2169,13 +1968,6 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -widest-line@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" - integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== - dependencies: - string-width "^4.0.0" - wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -2190,25 +1982,10 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== - dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" - -ws@8.8.1: - version "8.8.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0" - integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA== - -xdg-basedir@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" - integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== +ws@8.9.0: + version "8.9.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz#2a994bb67144be1b53fe2d23c53c028adeb7f45e" + integrity sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg== xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: version "15.1.1" @@ -2230,12 +2007,12 @@ yargs-parser@^21.0.0: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@^17.0.1: - version "17.5.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e" - integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA== +yargs@^17.5.1: + version "17.6.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c" + integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g== dependencies: - cliui "^7.0.2" + cliui "^8.0.1" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix index 23daea0448..b22d280d8a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix @@ -33,6 +33,14 @@ sha512 = "7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ=="; }; } + { + name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.0.tgz"; + path = fetchurl { + name = "_fortawesome_fontawesome_free___fontawesome_free_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz"; + sha512 = "CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ=="; + }; + } { name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; path = fetchurl { @@ -114,19 +122,19 @@ }; } { - name = "_types_node___node_18.7.16.tgz"; + name = "_types_node___node_18.11.3.tgz"; path = fetchurl { - name = "_types_node___node_18.7.16.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.7.16.tgz"; - sha512 = "EQHhixfu+mkqHMZl1R2Ovuvn47PUw18azMJOTwSZr9/fhzHNGXAJ0ma0dayRVchprpCj0Kc1K1xKoWaATWF1qg=="; + name = "_types_node___node_18.11.3.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.3.tgz"; + sha512 = "fNjDQzzOsZeKZu5NATgXUPsaFaTxeRgFXoosrHivTl8RGeV733OLawXsGfEk9a8/tySyZUyiZ6E8LcjPFZ2y1A=="; }; } { - name = "_types_node___node_16.11.58.tgz"; + name = "_types_node___node_16.11.68.tgz"; path = fetchurl { - name = "_types_node___node_16.11.58.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.58.tgz"; - sha512 = "uMVxJ111wpHzkx/vshZFb6Qni3BOMnlWLq7q9jrwej7Yw/KvjsEbpxCCxw+hLKxexFMc8YmpG8J9tnEe/rKsIg=="; + name = "_types_node___node_16.11.68.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.68.tgz"; + sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ=="; }; } { @@ -154,11 +162,11 @@ }; } { - name = "_types_yargs___yargs_17.0.12.tgz"; + name = "_types_yargs___yargs_17.0.13.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.12.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz"; - sha512 = "Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ=="; + name = "_types_yargs___yargs_17.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz"; + sha512 = "9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg=="; }; } { @@ -193,14 +201,6 @@ sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; } - { - name = "ansi_align___ansi_align_3.0.1.tgz"; - path = fetchurl { - name = "ansi_align___ansi_align_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz"; - sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; - }; - } { name = "ansi_regex___ansi_regex_5.0.1.tgz"; path = fetchurl { @@ -226,11 +226,11 @@ }; } { - name = "app_builder_lib___app_builder_lib_23.3.3.tgz"; + name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.3.3.tgz"; - sha512 = "m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ=="; + name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz"; + sha512 = "dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA=="; }; } { @@ -306,11 +306,11 @@ }; } { - name = "axios___axios_0.27.2.tgz"; + name = "axios___axios_1.1.3.tgz"; path = fetchurl { - name = "axios___axios_0.27.2.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz"; - sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; + name = "axios___axios_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz"; + sha512 = "00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA=="; }; } { @@ -362,19 +362,11 @@ }; } { - name = "bootstrap___bootstrap_5.2.1.tgz"; + name = "bootstrap___bootstrap_5.2.2.tgz"; path = fetchurl { - name = "bootstrap___bootstrap_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.1.tgz"; - sha512 = "UQi3v2NpVPEi1n35dmRRzBJFlgvWHYwyem6yHhuT6afYF+sziEt46McRbT//kVXZ7b1YUYEVGdXEH74Nx3xzGA=="; - }; - } - { - name = "boxen___boxen_5.1.2.tgz"; - path = fetchurl { - name = "boxen___boxen_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz"; - sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; + name = "bootstrap___bootstrap_5.2.2.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.2.tgz"; + sha512 = "dEtzMTV71n6Fhmbg4fYJzQsw1N29hJKO1js5ackCgIpDcGid2ETMGC6zwSYw09v05Y+oRdQ9loC54zB1La3hHQ=="; }; } { @@ -450,19 +442,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_9.0.3.tgz"; + name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_9.0.3.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz"; - sha512 = "SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA=="; + name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz"; + sha512 = "azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw=="; }; } { - name = "builder_util___builder_util_23.3.3.tgz"; + name = "builder_util___builder_util_23.6.0.tgz"; path = fetchurl { - name = "builder_util___builder_util_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-23.3.3.tgz"; - sha512 = "MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA=="; + name = "builder_util___builder_util_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz"; + sha512 = "QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ=="; }; } { @@ -473,14 +465,6 @@ sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; } - { - name = "camelcase___camelcase_6.3.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz"; - sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; - }; - } { name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { @@ -514,27 +498,11 @@ }; } { - name = "ci_info___ci_info_2.0.0.tgz"; + name = "ci_info___ci_info_3.5.0.tgz"; path = fetchurl { - name = "ci_info___ci_info_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; - }; - } - { - name = "ci_info___ci_info_3.4.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.4.0.tgz"; - sha512 = "t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug=="; - }; - } - { - name = "cli_boxes___cli_boxes_2.2.1.tgz"; - path = fetchurl { - name = "cli_boxes___cli_boxes_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz"; - sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; + name = "ci_info___ci_info_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz"; + sha512 = "yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw=="; }; } { @@ -554,11 +522,11 @@ }; } { - name = "cliui___cliui_7.0.4.tgz"; + name = "cliui___cliui_8.0.1.tgz"; path = fetchurl { - name = "cliui___cliui_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; - sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; + name = "cliui___cliui_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz"; + sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; }; } { @@ -641,14 +609,6 @@ sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; }; } - { - name = "configstore___configstore_5.0.1.tgz"; - path = fetchurl { - name = "configstore___configstore_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; - sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; - }; - } { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { @@ -689,14 +649,6 @@ sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; } - { - name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; - path = fetchurl { - name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; - sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; - }; - } { name = "debug___debug_4.3.4.tgz"; path = fetchurl { @@ -778,11 +730,11 @@ }; } { - name = "devtools_protocol___devtools_protocol_0.0.1036444.tgz"; + name = "devtools_protocol___devtools_protocol_0.0.1045489.tgz"; path = fetchurl { - name = "devtools_protocol___devtools_protocol_0.0.1036444.tgz"; - url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1036444.tgz"; - sha512 = "0y4f/T8H9lsESV9kKP1HDUXgHxCdniFeJh6Erq+FbdOEvp/Ydp9t8kcAAM5gOd17pMrTDlFWntoHtzzeTUWKNw=="; + name = "devtools_protocol___devtools_protocol_0.0.1045489.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1045489.tgz"; + sha512 = "D+PTmWulkuQW4D1NTiCRCFxF7pQPn0hgp4YyX4wAQ6xYXKOadSWPR3ENGDQ47MW/Ewc9v2rpC/UEEGahgBYpSQ=="; }; } { @@ -794,11 +746,11 @@ }; } { - name = "dmg_builder___dmg_builder_23.3.3.tgz"; + name = "dmg_builder___dmg_builder_23.6.0.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.3.3.tgz"; - sha512 = "ECwAjt+ZWyOvddrkDx1xRD6IVUCZb5SV6vSMHZd+Va3G2sUXHrnglR1cGDKRF4oYRQm8SYVrpLZKbi8npyDcAQ=="; + name = "dmg_builder___dmg_builder_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz"; + sha512 = "jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA=="; }; } { @@ -809,14 +761,6 @@ sha512 = "ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q=="; }; } - { - name = "dot_prop___dot_prop_5.3.0.tgz"; - path = fetchurl { - name = "dot_prop___dot_prop_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; - sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; - }; - } { name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; path = fetchurl { @@ -850,11 +794,11 @@ }; } { - name = "electron_builder___electron_builder_23.3.3.tgz"; + name = "electron_builder___electron_builder_23.6.0.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.3.3.tgz"; - sha512 = "mFYYdhoFPKevP6y5uaaF3dusmB2OtQ/HnwwpyOePeU7QDS0SEIAUokQsHUanAiJAZcBqtY7iyLBgX18QybdFFw=="; + name = "electron_builder___electron_builder_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz"; + sha512 = "y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw=="; }; } { @@ -866,19 +810,19 @@ }; } { - name = "electron_publish___electron_publish_23.3.3.tgz"; + name = "electron_publish___electron_publish_23.6.0.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.3.3.tgz"; - sha512 = "1dX17eE5xVXedTxjC+gjsP74oC0+sIHgqysp0ryTlF9+yfQUyXjBk6kcK+zhtBA2SsHMSglDtM+JPxDD/WpPTQ=="; + name = "electron_publish___electron_publish_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz"; + sha512 = "jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg=="; }; } { - name = "electron___electron_20.1.3.tgz"; + name = "electron___electron_21.2.0.tgz"; path = fetchurl { - name = "electron___electron_20.1.3.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-20.1.3.tgz"; - sha512 = "DXBHzAwcpCor9MrxG9QA3Zt0sNcQbJ8ZJCYTC6xpuPe5wugBa6RF3hXqDUYdD2yOCUhjLbD3VASWn0+5LdYT3g=="; + name = "electron___electron_21.2.0.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-21.2.0.tgz"; + sha512 = "oKV4fo8l6jlOZ1cYZ4RpZz02ZxLuBo3SO7DH+FrJ8uDyCirP+eVJ/qlzu23odtNe0P7S/mYAZbC6abZHWoqtLg=="; }; } { @@ -929,14 +873,6 @@ sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; }; } - { - name = "escape_goat___escape_goat_2.1.1.tgz"; - path = fetchurl { - name = "escape_goat___escape_goat_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; - sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; - }; - } { name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; path = fetchurl { @@ -1018,19 +954,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.15.1.tgz"; + name = "follow_redirects___follow_redirects_1.15.2.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.15.1.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz"; - sha512 = "yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="; - }; - } - { - name = "font_awesome___font_awesome_4.7.0.tgz"; - path = fetchurl { - name = "font_awesome___font_awesome_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz"; - sha512 = "U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg=="; + name = "follow_redirects___follow_redirects_1.15.2.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz"; + sha512 = "VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="; }; } { @@ -1106,11 +1034,11 @@ }; } { - name = "get_intrinsic___get_intrinsic_1.1.2.tgz"; + name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz"; - sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; + name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; + sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; }; } { @@ -1153,14 +1081,6 @@ sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; }; } - { - name = "global_dirs___global_dirs_3.0.0.tgz"; - path = fetchurl { - name = "global_dirs___global_dirs_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz"; - sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; - }; - } { name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; path = fetchurl { @@ -1225,14 +1145,6 @@ sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; } - { - name = "has_yarn___has_yarn_2.1.0.tgz"; - path = fetchurl { - name = "has_yarn___has_yarn_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; - sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; - }; - } { name = "has___has_1.0.3.tgz"; path = fetchurl { @@ -1297,22 +1209,6 @@ sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; } - { - name = "import_lazy___import_lazy_2.1.0.tgz"; - path = fetchurl { - name = "import_lazy___import_lazy_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; - sha512 = "m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A=="; - }; - } - { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - path = fetchurl { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - } { name = "inflight___inflight_1.0.6.tgz"; path = fetchurl { @@ -1329,14 +1225,6 @@ sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } - { - name = "ini___ini_2.0.0.tgz"; - path = fetchurl { - name = "ini___ini_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz"; - sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; - }; - } { name = "ini___ini_1.3.8.tgz"; path = fetchurl { @@ -1345,14 +1233,6 @@ sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; } - { - name = "is_ci___is_ci_2.0.0.tgz"; - path = fetchurl { - name = "is_ci___is_ci_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; - sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; - }; - } { name = "is_ci___is_ci_3.0.1.tgz"; path = fetchurl { @@ -1377,38 +1257,6 @@ sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; } - { - name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; - path = fetchurl { - name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; - sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; - }; - } - { - name = "is_npm___is_npm_5.0.0.tgz"; - path = fetchurl { - name = "is_npm___is_npm_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz"; - sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; - }; - } - { - name = "is_obj___is_obj_2.0.0.tgz"; - path = fetchurl { - name = "is_obj___is_obj_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; - sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; - }; - } - { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - path = fetchurl { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; - }; - } { name = "is_stream___is_stream_1.1.0.tgz"; path = fetchurl { @@ -1417,14 +1265,6 @@ sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="; }; } - { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - path = fetchurl { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; - }; - } { name = "is_wsl___is_wsl_2.2.0.tgz"; path = fetchurl { @@ -1433,14 +1273,6 @@ sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; } - { - name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; - path = fetchurl { - name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; - sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; - }; - } { name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; path = fetchurl { @@ -1553,14 +1385,6 @@ sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; } - { - name = "latest_version___latest_version_5.1.0.tgz"; - path = fetchurl { - name = "latest_version___latest_version_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; - sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; - }; - } { name = "lazy_val___lazy_val_1.0.5.tgz"; path = fetchurl { @@ -1601,14 +1425,6 @@ sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } - { - name = "make_dir___make_dir_3.1.0.tgz"; - path = fetchurl { - name = "make_dir___make_dir_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; - sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; - }; - } { name = "matcher___matcher_3.0.0.tgz"; path = fetchurl { @@ -1682,11 +1498,11 @@ }; } { - name = "minimist___minimist_1.2.6.tgz"; + name = "minimist___minimist_1.2.7.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz"; - sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; + name = "minimist___minimist_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz"; + sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; }; } { @@ -1754,11 +1570,11 @@ }; } { - name = "node_abi___node_abi_3.24.0.tgz"; + name = "node_abi___node_abi_3.28.0.tgz"; path = fetchurl { - name = "node_abi___node_abi_3.24.0.tgz"; - url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.24.0.tgz"; - sha512 = "YPG3Co0luSu6GwOBsmIdGW6Wx0NyNDLg/hriIyDllVsNwnI6UeqaWShxC3lbH4LtEQUgoLP3XR1ndXiDAWvmRw=="; + name = "node_abi___node_abi_3.28.0.tgz"; + url = "https://registry.yarnpkg.com/node-abi/-/node-abi-3.28.0.tgz"; + sha512 = "fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A=="; }; } { @@ -1841,14 +1657,6 @@ sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; }; } - { - name = "package_json___package_json_6.5.0.tgz"; - path = fetchurl { - name = "package_json___package_json_6.5.0.tgz"; - url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; - sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; - }; - } { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { @@ -1954,19 +1762,19 @@ }; } { - name = "pupa___pupa_2.1.1.tgz"; + name = "puppeteer_core___puppeteer_core_19.0.0.tgz"; path = fetchurl { - name = "pupa___pupa_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz"; - sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; + name = "puppeteer_core___puppeteer_core_19.0.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.0.0.tgz"; + sha512 = "OljQ9W5M4cBX68vnOAGbcRkVENDHn6lfj6QYoGsnLQsxPAh6ExTQAhHauwdFdQkhYdDExZFWlKArnBONzeHY+g=="; }; } { - name = "puppeteer___puppeteer_17.1.2.tgz"; + name = "puppeteer___puppeteer_19.0.0.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_17.1.2.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-17.1.2.tgz"; - sha512 = "xgFOxUl4hRjwQpODZSeJlE/rUzi8OmHtc3T4ir4CRYGzVmaTVHAl8VGpI0ooy752u2DFeMxvQdHmxNnLqPImIg=="; + name = "puppeteer___puppeteer_19.0.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.0.0.tgz"; + sha512 = "3Ga5IVerQQ2hKU9q7T28RmcUsd8F2kL6cYuPcPCzeclSjmHhGydPBZL/KJKC02sG6J6Wfry85uiWpbkjQ5qBiw=="; }; } { @@ -1993,22 +1801,6 @@ sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; } - { - name = "registry_auth_token___registry_auth_token_4.2.2.tgz"; - path = fetchurl { - name = "registry_auth_token___registry_auth_token_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz"; - sha512 = "PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg=="; - }; - } - { - name = "registry_url___registry_url_5.1.0.tgz"; - path = fetchurl { - name = "registry_url___registry_url_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; - sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; - }; - } { name = "require_directory___require_directory_2.1.1.tgz"; path = fetchurl { @@ -2081,14 +1873,6 @@ sha512 = "YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="; }; } - { - name = "semver_diff___semver_diff_3.1.1.tgz"; - path = fetchurl { - name = "semver_diff___semver_diff_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; - sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; - }; - } { name = "semver___semver_5.7.1.tgz"; path = fetchurl { @@ -2106,11 +1890,19 @@ }; } { - name = "semver___semver_7.3.7.tgz"; + name = "semver___semver_7.3.8.tgz"; path = fetchurl { - name = "semver___semver_7.3.7.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + name = "semver___semver_7.3.8.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; + }; + } + { + name = "semver___semver_7.0.0.tgz"; + path = fetchurl { + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; } { @@ -2177,6 +1969,14 @@ sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; } + { + name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; + path = fetchurl { + name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz"; + sha512 = "BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew=="; + }; + } { name = "slice_ansi___slice_ansi_3.0.0.tgz"; path = fetchurl { @@ -2385,22 +2185,6 @@ sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; }; } - { - name = "type_fest___type_fest_0.20.2.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.20.2.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; - }; - } - { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - path = fetchurl { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; - }; - } { name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; path = fetchurl { @@ -2409,14 +2193,6 @@ sha512 = "mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg=="; }; } - { - name = "unique_string___unique_string_2.0.0.tgz"; - path = fetchurl { - name = "unique_string___unique_string_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; - sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; - }; - } { name = "universalify___universalify_0.1.2.tgz"; path = fetchurl { @@ -2433,14 +2209,6 @@ sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; }; } - { - name = "update_notifier___update_notifier_5.1.0.tgz"; - path = fetchurl { - name = "update_notifier___update_notifier_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz"; - sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; - }; - } { name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { @@ -2513,14 +2281,6 @@ sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; } - { - name = "widest_line___widest_line_3.1.0.tgz"; - path = fetchurl { - name = "widest_line___widest_line_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; - sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; - }; - } { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; path = fetchurl { @@ -2538,27 +2298,11 @@ }; } { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; + name = "ws___ws_8.9.0.tgz"; path = fetchurl { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; - sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; - }; - } - { - name = "ws___ws_8.8.1.tgz"; - path = fetchurl { - name = "ws___ws_8.8.1.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz"; - sha512 = "bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA=="; - }; - } - { - name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; - path = fetchurl { - name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; - sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; + name = "ws___ws_8.9.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz"; + sha512 = "Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg=="; }; } { @@ -2594,11 +2338,11 @@ }; } { - name = "yargs___yargs_17.5.1.tgz"; + name = "yargs___yargs_17.6.0.tgz"; path = fetchurl { - name = "yargs___yargs_17.5.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz"; - sha512 = "t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA=="; + name = "yargs___yargs_17.6.0.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz"; + sha512 = "8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g=="; }; } { diff --git a/third_party/nixpkgs/pkgs/tools/misc/smc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/smc/default.nix index d58ff3fa8e..f3db213c84 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/smc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/smc/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { SMC can also generate GraphViz state diagrams from the input file. ''; - homepage = "http://smc.sourceforge.net/"; + homepage = "https://smc.sourceforge.net/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mpl11; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix index 3688957af7..5280943e99 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-hs0ImaozKH6QcUfts+oseUqecg7bGX5cx50ixnNamW8="; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; preCheck = '' HOME=$TMPDIR diff --git a/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix index 893d9e390b..68d5eeaba2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pythonPaths = [ cryptography pyyaml requests ]; buildInputs = [ python perl python-dateutil setuptools ] ++ pythonPaths; nativeBuildInputs = [ gitMinimal zip makeWrapper ]; - checkInputs = [ nose pytest mock requests-mock ]; + nativeCheckInputs = [ nose pytest mock requests-mock ]; postPatch = '' substituteInPlace scripts/run-tests.sh \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix b/third_party/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix index 8c5a3b7e94..730290f8cf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { unidecode ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ blinker flask flask-testing diff --git a/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix index 8014461b54..6b41e80ae9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tbls/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.57.1"; + version = "1.60.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-tFUkI+QNvvlorg2xk0obeFdEVKxv0T1rXr3tZUP0sGE="; + hash = "sha256-5/YAJl01ARralsBEV6ZJqcYfMMudCmcQcdQD1jn1I+M="; }; - vendorHash = "sha256-E44gUzA9FW1TM0wfjVEmF5w/bgBrockluNIDkA7/hnU="; + vendorHash = "sha256-AeaTAjo1wRl7Ymg/fyoijaa9UXf9SiNR447WJtZeN5o="; CGO_CFLAGS = [ "-Wno-format-security" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tcat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tcat/default.nix index 350405ee4b..3556eb232c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tcat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tcat/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1szzfz5xsx9l8gjikfncgp86hydzpvsi0y5zvikd621xkp7g7l21"; }; - vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = null; subPackages = "."; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix b/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix index 13f741c544..8b9be06abb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ colorama decorator psutil pyte six ]; - checkInputs = [ go mock pytestCheckHook pytest-mock ]; + nativeCheckInputs = [ go mock pytestCheckHook pytest-mock ]; disabledTests = lib.optionals stdenv.isDarwin [ "test_settings_defaults" diff --git a/third_party/nixpkgs/pkgs/tools/misc/timelimit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/timelimit/default.nix index 22b71ca0f8..01de2c01c8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/timelimit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/timelimit/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-5IEAF8zCKaCVH6BAxjoa/2rrue9pRGBBkFzN57d+g+g="; }; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; doCheck = true; installFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix index cbcc2ba38d..4d1ff026f2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tlp/default.nix @@ -71,7 +71,7 @@ ++ lib.optionals enableRDW [ "install-rdw" "install-man-rdw" ]; doCheck = true; - checkInputs = [ checkbashisms perlcritic shellcheck ]; + nativeCheckInputs = [ checkbashisms perlcritic shellcheck ]; checkTarget = [ "checkall" ]; # TODO: Consider using resholve here diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux/CVE-2022-47016.patch b/third_party/nixpkgs/pkgs/tools/misc/tmux/CVE-2022-47016.patch new file mode 100644 index 0000000000..e6ced83042 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux/CVE-2022-47016.patch @@ -0,0 +1,72 @@ +From 01f753df5dc269cf054b94c3f210aa880872d602 Mon Sep 17 00:00:00 2001 +From: nicm +Date: Wed, 24 Aug 2022 07:22:30 +0000 +Subject: [PATCH] Check for NULL returns from bufferevent_new. + +(cherry picked from commit e86752820993a00e3d28350cbe46878ba95d9012) +--- + control.c | 4 ++++ + file.c | 4 ++++ + window.c | 2 ++ + 3 files changed, 10 insertions(+) + +diff --git a/control.c b/control.c +index 73286e00..6183a006 100644 +--- a/control.c ++++ b/control.c +@@ -775,6 +775,8 @@ control_start(struct client *c) + + cs->read_event = bufferevent_new(c->fd, control_read_callback, + control_write_callback, control_error_callback, c); ++ if (cs->read_event == NULL) ++ fatalx("out of memory"); + bufferevent_enable(cs->read_event, EV_READ); + + if (c->flags & CLIENT_CONTROLCONTROL) +@@ -782,6 +784,8 @@ control_start(struct client *c) + else { + cs->write_event = bufferevent_new(c->out_fd, NULL, + control_write_callback, control_error_callback, c); ++ if (cs->write_event == NULL) ++ fatalx("out of memory"); + } + bufferevent_setwatermark(cs->write_event, EV_WRITE, CONTROL_BUFFER_LOW, + 0); +diff --git a/file.c b/file.c +index b2f155fe..04a907bf 100644 +--- a/file.c ++++ b/file.c +@@ -585,6 +585,8 @@ file_write_open(struct client_files *files, struct tmuxpeer *peer, + + cf->event = bufferevent_new(cf->fd, NULL, file_write_callback, + file_write_error_callback, cf); ++ if (cf->event == NULL) ++ fatalx("out of memory"); + bufferevent_enable(cf->event, EV_WRITE); + goto reply; + +@@ -744,6 +746,8 @@ file_read_open(struct client_files *files, struct tmuxpeer *peer, + + cf->event = bufferevent_new(cf->fd, file_read_callback, NULL, + file_read_error_callback, cf); ++ if (cf->event == NULL) ++ fatalx("out of memory"); + bufferevent_enable(cf->event, EV_READ); + return; + +diff --git a/window.c b/window.c +index c0cd9bdc..294a1f08 100644 +--- a/window.c ++++ b/window.c +@@ -1042,6 +1042,8 @@ window_pane_set_event(struct window_pane *wp) + + wp->event = bufferevent_new(wp->fd, window_pane_read_callback, + NULL, window_pane_error_callback, wp); ++ if (wp->event == NULL) ++ fatalx("out of memory"); + wp->ictx = input_init(wp, wp->event, &wp->palette); + + bufferevent_enable(wp->event, EV_READ|EV_WRITE); +-- +2.39.1 + diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix index 9ffe21c8cf..a630dbc374 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmux/default.nix @@ -1,12 +1,13 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , bison , libevent , ncurses , pkg-config -, withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , withUtf8proc ? true, utf8proc # gets Unicode updates faster than glibc , withUtempter ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, libutempter }: @@ -35,6 +36,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-SygHxTe7N4y7SdzKixPFQvqRRL57Fm8zWYHfTpW+yVY="; }; + patches = [ + ./CVE-2022-47016.patch + ]; + nativeBuildInputs = [ pkg-config autoreconfHook diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix index 768e4d33e3..1b21a4d602 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix @@ -6,18 +6,13 @@ let in pypkgs.buildPythonApplication rec { pname = "tmuxp"; - version = "1.12.1"; + version = "1.23.0"; src = pypkgs.fetchPypi { inherit pname version; - sha256 = "078624c5ac7aa4142735f856fadb9281fcebb10e6b98d1be2b2f2bbd106613b9"; + sha256 = "Ix/43QFOa0kCP5xndszFGk0p12w/t/z+fVcYRIj9y0s="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "libtmux>=0.12.0,<0.13.0" "libtmux" - ''; - # No tests in archive doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix index 44029fb5d4..aaaa297a55 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "10.2.4"; + version = "10.3.0"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-b1nWTQ+m4b6XzDTR36ubf5nTdUuWK94F2P4Q3tUvHAw="; + hash = "sha256-BKrErM1d90o+yJ/R0vVgXDBwPgQSP3Qj26x4JmB7SXw="; }; - cargoHash = "sha256-7GSkFh0Fefl9VlCdPdVZ9IsyN0IKUob5c43v84PtrcI="; + cargoHash = "sha256-jm97lfWHTtd3tE+Yql9CIss78B+bW9nUQAhs5anDb6c="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/misc/torrenttools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/torrenttools/default.nix index 8e9bbba446..f8da452c52 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/torrenttools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/torrenttools/default.nix @@ -10,7 +10,7 @@ , fmt , gsl-lite , howard-hinnant-date -, libyamlcpp +, yaml-cpp , ninja , nlohmann_json , openssl @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { fmt gsl-lite howard-hinnant-date - libyamlcpp + yaml-cpp nlohmann_json openssl re2 diff --git a/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix b/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix index 508f0f4cee..16f4d1eb55 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/toybox/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { # ...this is fixed in latest git, so doCheck can likely be enabled for next release # see https://github.com/landley/toybox/commit/b928ec480cd73fd83511c0f5ca786d1b9f3167c3 #doCheck = true; - checkInputs = [ which ]; # used for tests with checkFlags = [ "DEBUG=true" ]; + nativeCheckInputs = [ which ]; # used for tests with checkFlags = [ "DEBUG=true" ]; checkTarget = "tests"; NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/trash-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/trash-cli/default.nix index fe79830d78..1ef54f05d7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/trash-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/trash-cli/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ psutil six ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/trashy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/trashy/default.nix index 7d3b3952a7..fb42a886fe 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/trashy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/trashy/default.nix @@ -2,16 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "trashy"; - version = "1.0.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "oberblastmeister"; repo = "trashy"; rev = "v${version}"; - sha256 = "sha256-b50Q7knJzXKDfM1kw6wLvXunhgOXVs+zYvZx/NYqMdk="; + sha256 = "sha256-xYSk0M8oNwbwZbKWDXMQlnt7vKi0p3+2Tr4eXCvtHEM="; }; - cargoSha256 = "sha256-2hNNLXuAHd1bquhHimniqryTVMfBmPAOossggICScqQ="; + cargoSha256 = "sha256-ZWqWtWzb+CLH1ravBb/oV+aPxplEyiC1wEFhvchcLqg="; + + # this patch must be removed after oberblastmeister/trashy#70 is solved or new + # version is released. + cargoPatches = [ ./lock-version.patch ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/trashy/lock-version.patch b/third_party/nixpkgs/pkgs/tools/misc/trashy/lock-version.patch new file mode 100644 index 0000000000..3e95a3fbfd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/trashy/lock-version.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 7af0268..dc197a0 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -889,7 +889,7 @@ dependencies = [ + + [[package]] + name = "trashy" +-version = "1.0.3" ++version = "2.0.0" + dependencies = [ + "aho-corasick", + "ansi_term", diff --git a/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix b/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix index 4a76a3a004..c437369c91 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "trillian"; - version = "1.5.0"; - vendorSha256 = "sha256-235uQK4E/GLl5XLBd6lkTIgWIjT9MZZGnyfZbOoTFo0="; + version = "1.5.1"; + vendorSha256 = "sha256-L2aZYwlJq9yVaaKgxa9NoqXTKD/pUq2OMiFftP364Kw="; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XZHVGuIN+5mFbaxOprhdHlpgz2NE2NsJxGWJciDMUqI="; + sha256 = "sha256-v5feUTiK6ql0YcRR6RDAj+pS/PZ7vDnSf0ue2rtWb8k="; }; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix index 7e0c12535b..2383a96eed 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "True Type to Postscript Type 3 converter, fpdf"; - homepage = "http://ttf2pt1.sourceforge.net/index.html"; + homepage = "https://ttf2pt1.sourceforge.net/index.html"; license = "ttf2pt1"; platforms = lib.platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/twspace-crawler/default.nix b/third_party/nixpkgs/pkgs/tools/misc/twspace-crawler/default.nix new file mode 100644 index 0000000000..eead04e013 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/twspace-crawler/default.nix @@ -0,0 +1,23 @@ +{ lib, buildNpmPackage, fetchFromGitHub }: + +buildNpmPackage rec { + pname = "twspace-crawler"; + version = "1.11.13"; + + src = fetchFromGitHub { + owner = "HitomaruKonpaku"; + repo = "twspace-crawler"; + rev = "v${version}"; + hash = "sha256-MGFVIQDb++oVbTQubl7CNYwT/ofTNFQfFiveXcNgQpA="; + }; + + npmDepsHash = "sha256-zKy/DngBwnfUqG6JfCULoDIrg1V16hX0Q4zNz45z888="; + + meta = with lib; { + description = "Script to monitor & download Twitter Spaces 24/7"; + homepage = "https://github.com/HitomaruKonpaku/twspace-crawler"; + changelog = "https://github.com/HitomaruKonpaku/twspace-crawler/raw/v${version}/CHANGELOG.md"; + license = licenses.isc; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/twspace-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/twspace-dl/default.nix index e1a3f06b2e..f2451dc06a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/twspace-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/twspace-dl/default.nix @@ -2,15 +2,18 @@ python3Packages.buildPythonApplication rec { pname = "twspace-dl"; - version = "2022.6.6.1"; + version = "2023.1.22.1"; - format = "setuptools"; + format = "pyproject"; src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "47622f306f2601185b00d6ef24f821810adcc581b7361c423eec979263725afc"; + inherit version; + pname = "twspace_dl"; + sha256 = "050e78b4583374351c288114e3b01ab34b0b19ad2d4971d15c5519521cf3f2f4"; }; + nativeBuildInputs = with python3Packages; [ poetry-core ]; + propagatedBuildInputs = with python3Packages; [ requests ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/uair/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uair/default.nix new file mode 100644 index 0000000000..cdada5e469 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/uair/default.nix @@ -0,0 +1,37 @@ +{ fetchFromGitHub +, installShellFiles +, lib +, rustPlatform +, scdoc +}: + +rustPlatform.buildRustPackage rec { + pname = "uair"; + version = "v0.4.0"; + + src = fetchFromGitHub { + owner = "metent"; + repo = pname; + rev = version; + hash = "sha256-xGPc371Dfo455rnfacXVDgC9SXU5s8jqw4ttSCBqWyk="; + }; + + cargoHash = "sha256-tHcMR8ExIlzYZzacBYyyk2d5by20jG4ihM0yU0K6Xhg="; + + nativeBuildInputs = [ installShellFiles scdoc ]; + + preFixup = '' + scdoc < docs/uair.1.scd > docs/uair.1 + scdoc < docs/uair.5.scd > docs/uair.5 + scdoc < docs/uairctl.1.scd > docs/uairctl.1 + + installManPage docs/*.[1-9] + ''; + + meta = with lib; { + description = "An extensible pomodoro timer"; + homepage = "https://github.com/metent/uair"; + license = licenses.mit; + maintainers = with maintainers; [ thled ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/undocker/default.nix b/third_party/nixpkgs/pkgs/tools/misc/undocker/default.nix index 4608f4b6c1..25f6b385ac 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/undocker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/undocker/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { hash = "sha256-SmtM25sijcm5NF0ZrSqrRQDXiLMNp8WGAZX9yKvj1rQ="; }; - vendorHash = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorHash = null; meta = with lib; { homepage = "https://git.sr.ht/~motiejus/undocker"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix index cfe1c570c7..f1a28f1af4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "upterm"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "owenthereal"; repo = "upterm"; rev = "v${version}"; - hash = "sha256-ywwqX4aw9vc2kptYZisArTpdz7Cf49Z0jMdP90KXejs="; + hash = "sha256-wjbptcGy3wOZPm/11El7Xqz6NrR8G19V9zfU5pKFGuk="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/misc/usbimager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/usbimager/default.nix index 6903039f6a..89ce91ef3e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/usbimager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/usbimager/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "usbimager"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitLab { owner = "bztsrc"; repo = pname; rev = version; - sha256 = "1j0g1anmdwc3pap3m4kfzqjfkn7q0vpmqniii2kcz7svs5h3ybga"; + sha256 = "sha256-CEGUXJXqXmD8uT93T9dg49Lf5vTpAzQjdnhYmbR5zTI="; }; sourceRoot = "source/src/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix index fa17625d59..1ac2e31243 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation rec { pname = "uutils-coreutils"; - version = "0.0.16"; + version = "0.0.17"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "sha256-03Y7966xB+3iJ1LSZPiuXMR7krhb6Wiri455ycA50SU="; + sha256 = "sha256-r4IpmwZaRKzesvq7jAjCvfvZVmfcvwj23zMH3VnlC4I="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-97yyOZCw4bJMpbH2ubyNtAJa7EwJY0AnPWMiUUzIM0M="; + hash = "sha256-ZbGLBjjAsdEhWK3/RS+yRI70xqV+5fzg76Y2Lip1m9A="; }; nativeBuildInputs = [ rustPlatform.cargoSetupHook sphinx ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix index fb68b5191b..93b451bedc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.8l"; + version = "0.9.8q"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-6hZvnZXnoS97uQKxBbSJmMN1bGp42p0v4kJH7F+3mjU="; + sha256 = "sha256-oY0zmyAgxMHPcBxFNdByQfeLIquw6eQ2SSfCgTKtO7Q="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix index 0f3096cc4b..a2bd46321b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vttest/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20221111"; + version = "20221229"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "sha256-asC/ZqWAc3gP3rdGMRT1HYCxzJ6O8djHNjBT/Nwxgac="; + sha256 = "sha256-a2oQmsrwVpz3Zg0g3NFTuD4yjpuT2uTnO5hbvMaxi/g="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/wakapi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wakapi/default.nix new file mode 100644 index 0000000000..c04c98e053 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/wakapi/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "wakapi"; + version = "2.6.1"; + + src = fetchFromGitHub { + owner = "muety"; + repo = pname; + rev = version; + sha256 = "1bhd96la2ipwna9lic50pd5klcc3xj9yqd5rd1cgzznbm4ylpjqb"; + }; + + vendorHash = "sha256-fkSXaP9hHCCyO8mFB5CKPExifuNjTvDnXupjCVllG9I"; + + # Not a go module required by the project, contains development utilities + excludedPackages = [ "scripts" ]; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + homepage = "https://wakapi.dev/"; + changelog = "https://github.com/muety/wakapi/releases/tag/${version}"; + description = "A minimalist self-hosted WakaTime-compatible backend for coding statistics"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix index a2757d1bce..db52bae523 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wakatime/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakatime"; - version = "1.60.1"; + version = "1.61.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; rev = "v${version}"; - sha256 = "sha256-HOSNNeLtqyLahjG8AzhpfOb9Nmtd0XpI+AA03mlUBCQ="; + sha256 = "sha256-pd6kK1591dLEau9oKdd+A2y8rRerFQ+z2yY+/BsNUAI="; }; - vendorSha256 = "sha256-ANRcgeZYtcWGbK8c9KE8joo97d8LKvKA8/A+/rrjOoM="; + vendorHash = "sha256-R+VqIw8fztBH2WTf5vjqtMfASNnOTjA3DEndXYyyMi4="; meta = with lib; { inherit (src.meta) homepage; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wayback-machine-archiver/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wayback-machine-archiver/default.nix index 986ca165ed..71c0b63ad8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wayback-machine-archiver/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wayback-machine-archiver/default.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ pypandoc ]; propagatedBuildInputs = with python3.pkgs; [ requests ]; - checkInputs = with python3.pkgs; [ pytestCheckHook requests-mock ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook requests-mock ]; postPatch = '' substituteInPlace setup.py \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix index bc43d77bbf..12c411f3ef 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wimboot/default.nix @@ -2,17 +2,26 @@ stdenv.mkDerivation rec { pname = "wimboot"; - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "ipxe"; repo = "wimboot"; rev = "v${version}"; - sha256 = "sha256-LaPH6nGQanweAG0niS75hr7zbO/9A3iZjS8wHD//oJ4="; + sha256 = "sha256-rbJONP3ge+2+WzCIpTUZeieQz9Q/MZfEUmQVbZ+9Dro="; }; sourceRoot = "source/src"; + # Workaround '-idirafter' ordering bug in staging-next: + # https://github.com/NixOS/nixpkgs/pull/210004 + # where libc '-idirafter' gets added after user's idirafter and + # breaks. + # TODO(trofi): remove it in staging once fixed in cc-wrapper. + preConfigure = '' + export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] stdenv.hostPlatform.config}=$(< ${stdenv.cc}/nix-support/libc-cflags) + ''; + buildInputs = [ libbfd zlib libiberty ]; makeFlags = [ "wimboot.x86_64.efi" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wlc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wlc/default.nix index 2e76719012..7adf01316d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wlc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wlc/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { twine ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/xfstests/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xfstests/default.nix index aec0bd62ad..11fb3f5b70 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/xfstests/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/xfstests/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { version = "2022.09.04"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; + url = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; rev = "v${version}"; sha256 = "sha256-hPFoqNmB8pewvBN1nzVMkTrMHCo0xc8tmmIODaiDeRw="; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/xq/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xq/default.nix index 8168f9603a..410531d5a7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/xq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/xq/default.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "xq"; - version = "0.2.40"; + version = "0.2.42"; src = fetchCrate { inherit pname version; - sha256 = "sha256-sOCdNQ+prQRdj3Oeaa4HLhufbwtClUzzhnMDwSU4SJE="; + sha256 = "sha256-VR2ZUt0qvQBaFZr7Gui/LywsRrPubQlzYj1PQj05xhY="; }; - cargoSha256 = "sha256-b41D/sg+qD/SbwQvEqv3sFWuW15VQ4gEiL51I7/hOmI="; + cargoHash = "sha256-rX0fwJM8sHTuHIsmk9JpgWrTq1EA6Ksx7fFqWqY5R4k="; meta = with lib; { description = "Pure rust implementation of jq"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix index 7c2343c556..4b6d184839 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "12.1"; + version = "12.3"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "sha256-9WgTsjerV9k1sHnhob3xviRDfHa6W+szzGs0AGBJG+g="; + sha256 = "sha256-VaeA83Wk5N3uLf8Eb606w3KPwV/3be5D39wW2JuSdp0="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix index 47f3b1d298..8db40b7c0b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yle-dl/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { pythonPath = [ rtmpdump php wget ]; doCheck = false; # tests require network access - checkInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; passthru.tests.version = testers.testVersion { package = yle-dl; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytarchive/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ytarchive/default.nix index 65b801c761..968a280dae 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ytarchive/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ytarchive/default.nix @@ -1,17 +1,25 @@ -{ lib, buildGoModule, fetchFromGitHub, makeBinaryWrapper, ffmpeg }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, makeBinaryWrapper, ffmpeg }: buildGoModule rec { pname = "ytarchive"; - version = "unstable-2022-05-28"; + version = "0.3.2"; src = fetchFromGitHub { owner = "Kethsar"; repo = "ytarchive"; - rev = "8d48052f432ec6f78c6aed326e8a1db31ee8e706"; - sha256 = "sha256-IsG0YPVBzsbHLNs1m/AruDmm0n7vwN9Fj1KMOoQJQ+c="; + rev = "v${version}"; + hash = "sha256-fBYwLGg1h5pn8ZP5vZmzzIEvuXlBJ27p4tv7UVMwOEw="; }; - vendorSha256 = "sha256-r9fDFSCDItQ7YSj9aTY1LXRrFE9T3XD0X36ywCfu0R8="; + patches = [ + # Increase the Go version required. See https://github.com/Kethsar/ytarchive/pull/127 + (fetchpatch { + url = "https://github.com/Kethsar/ytarchive/commit/2a995ead4448d03c975378a1932ad975da1a6383.patch"; + sha256 = "sha256-Y+y/Sp/xOS9tBT+LQQ9vE+4n/2RH10umFEEEEVXgtuc="; + }) + ]; + + vendorHash = "sha256-8uTDcu8ucPzck+1dDoySGtc3l1+1USxCfUvdS+ncsnU="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/4.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/4.nix index 5e0f0b1d92..6d653caeeb 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/4.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/4.nix @@ -59,7 +59,7 @@ python3Packages.buildPythonPackage rec { --replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"' ''; - checkInputs = with python3Packages; [ pytestCheckHook makefun ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook makefun ]; meta = with lib; { homepage = "https://developers.yubico.com/yubikey-manager"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix index fe64a2df37..730dfabe00 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonPackage rec { --replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"' ''; - checkInputs = with python3Packages; [ pytestCheckHook makefun ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook makefun ]; meta = with lib; { homepage = "https://developers.yubico.com/yubikey-manager"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yutto/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yutto/default.nix index d246eb29b6..b132125d92 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yutto/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yutto/default.nix @@ -9,14 +9,14 @@ with python3.pkgs; buildPythonApplication rec { pname = "yutto"; - version = "2.0.0b16"; + version = "2.0.0b18"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-aGmayZGXmEyVuUKDKrgcYuPKsib/c5ou5CZ+Sag6Evk="; + hash = "sha256-BuubfySQfw4ljWTc1yyW4Zqle0VTimFLQ6enZA3joeQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix index aede201ee9..ad4ac08564 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zabbix-cli/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { requests ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix index da55481cc4..216d27eb4e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/aria2/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patchShebangs --build doc/manual-src/en/mkapiref.py ''; - checkInputs = [ cppunit ]; + nativeCheckInputs = [ cppunit ]; doCheck = false; # needs the net enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix index 1a3436c2c3..28c3ce4080 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/assh/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - checkInputs = lib.optionals stdenv.isDarwin [ ps ]; + nativeCheckInputs = lib.optionals stdenv.isDarwin [ ps ]; postInstall = '' wrapProgram "$out/bin/assh" \ diff --git a/third_party/nixpkgs/pkgs/tools/networking/atftp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/atftp/default.nix index bab2ecbe61..06b04170a3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/atftp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/atftp/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { tcp_wrappers ]; - checkInputs = [ + nativeCheckInputs = [ perl ps ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix index 8b8659f281..0ec15e9c35 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 = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-0gqd/bEj8ZDpf/3J2iZnGswTO6k8aJOuRiZXMZLm7zo="; + sha256 = "sha256-y1Btpp1xzjAezLaIJBF2+ghMgC/p8mHS/hStGIaKb1o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix b/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix index f81320eaab..2a466996f8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "brook"; - version = "20221010"; + version = "20230122"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-l5sdujUj6uHL7uuntAxagROvzOc/Z648ax6ZADtA/bk="; + sha256 = "sha256-M4AYbHbnRDvG55AvfRpcdpK4MU/cM1RBqn0JzhsKgsk="; }; - vendorSha256 = "sha256-kNd0TYaJmz7+bOXf7EaDsiU14eJmz9BPdhKmR7HhxCo="; + vendorHash = "sha256-sJbWAytX3JhFbaTwZHgGNv9rPNTwn0v/bbeaIsfyBro="; meta = with lib; { homepage = "https://github.com/txthinking/brook"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix b/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix index 846c966d00..87808b4a22 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/burpsuite/default.nix @@ -1,38 +1,67 @@ -{ lib, stdenv, fetchurl, jdk11, runtimeShell, unzip, chromium }: - -stdenv.mkDerivation rec { - pname = "burpsuite"; - version = "2021.12"; +{ lib, fetchurl, jdk, buildFHSUserEnv, unzip, makeDesktopItem }: +let + version = "2022.12.7"; src = fetchurl { name = "burpsuite.jar"; urls = [ - "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" - "https://web.archive.org/web/https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar" + "https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" + "https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" ]; - sha256 = "sha256-BLX/SgHctXciOZoA6Eh4zuDJoxNSZgvoj2Teg1fV80g="; + sha256 = "2e354c2aadc58267bc282dde462d20b3aca7108077eb141d49f89a16172763cf"; }; - dontUnpack = true; - dontBuild = true; - installPhase = '' - runHook preInstall + name = "burpsuite-${version}"; + description = "An integrated platform for performing security testing of web applications"; + desktopItem = makeDesktopItem rec { + name = "burpsuite"; + exec = name; + icon = name; + desktopName = "Burp Suite Community Edition"; + comment = description; + categories = [ "Development" "Security" "System" ]; + }; - mkdir -p $out/bin - echo '#!${runtimeShell} - eval "$(${unzip}/bin/unzip -p ${src} chromium.properties)" - mkdir -p "$HOME/.BurpSuite/burpbrowser/$linux64" - ln -sf "${chromium}/bin/chromium" "$HOME/.BurpSuite/burpbrowser/$linux64/chrome" - exec ${jdk11}/bin/java -jar ${src} "$@"' > $out/bin/burpsuite - chmod +x $out/bin/burpsuite +in +buildFHSUserEnv { + inherit name; - runHook postInstall + runScript = "${jdk}/bin/java -jar ${src}"; + + targetPkgs = pkgs: with pkgs; [ + alsa-lib + at-spi2-core + cairo + cups + dbus + expat + glib + gtk3 + libdrm + libudev0-shim + libxkbcommon + mesa.drivers + nspr + nss + pango + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + ]; + + extraInstallCommands = '' + mv "$out/bin/${name}" "$out/bin/burpsuite" # name includes the version number + mkdir -p "$out/share/pixmaps" + ${lib.getBin unzip}/bin/unzip -p ${src} resources/Media/icon64community.png > "$out/share/pixmaps/burpsuite.png" + cp -r ${desktopItem}/share/applications $out/share ''; - preferLocalBuild = true; - meta = with lib; { - description = "An integrated platform for performing security testing of web applications"; + inherit description; longDescription = '' Burp Suite is an integrated platform for performing security testing of web applications. Its various tools work seamlessly together to support the entire testing process, from @@ -43,8 +72,8 @@ stdenv.mkDerivation rec { downloadPage = "https://portswigger.net/burp/freedownload"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - platforms = jdk11.meta.platforms; - hydraPlatforms = []; + platforms = jdk.meta.platforms; + hydraPlatforms = [ ]; maintainers = with maintainers; [ bennofs ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/cantoolz/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cantoolz/default.nix index ca0d05131c..1f9308b741 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cantoolz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cantoolz/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { bitstring ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/cdpr/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cdpr/default.nix index a3f821bdbb..6879b7e9d7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cdpr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cdpr/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cisco Discovery Protocol Reporter"; - homepage = "http://cdpr.sourceforge.net/"; + homepage = "https://cdpr.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.sgo ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/chisel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/chisel/default.nix index d7dac44b28..d14dd66e14 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/chisel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/chisel/default.nix @@ -1,24 +1,28 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { pname = "chisel"; - version = "1.7.7"; + version = "1.8.1"; src = fetchFromGitHub { owner = "jpillora"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-3EaVUGcwkJWX0FxIaHddUehJIdbxAPfBm8esXKCUuhM="; + rev = "refs/tags/v${version}"; + hash = "sha256-N2voSclNH7lGbUkZo2gkrEb6XoA5f0BzNgAzQs1lOKQ="; }; - vendorSha256 = "sha256-Oko9nduKW76NIUCVyF0lPzEH+TFT1el9VGIbm5lQXtM="; + vendorHash = "sha256-p/5g4DLoUhEPFBtAbMiIgc6O4eAfbiqBjCqYkyUHy70="; - ldflags = [ "-s" "-w" "-X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/jpillora/chisel/share.BuildVersion=${version}" + ]; - # tests require access to the network + # Tests require access to the network doCheck = false; meta = with lib; { @@ -30,6 +34,7 @@ buildGoModule rec { used to provide a secure endpoint into your network. ''; homepage = "https://github.com/jpillora/chisel"; + changelog = "https://github.com/jpillora/chisel/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/circus/default.nix b/third_party/nixpkgs/pkgs/tools/networking/circus/default.nix index c9aba8dc4e..9749378f71 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/circus/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/circus/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { --replace "pyzmq>=13.1.0,<17.0" "pyzmq>13.1.0" ''; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; doCheck = false; # weird error diff --git a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix index e5594d2e0c..7415636673 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SE+nZIatvwyc6JubMb7YUlNiJv+LYtJjFMlKEoJzEn8="; + hash = "sha256-f/iSnSaRr1dqMRKb7GDZdc2WuykO42XMSNKwMOwuagc="; }; - vendorSha256 = "sha256-ikcGZ1Gfxb4zBkav8MDi3+xNbvhqHIk6NhLfI2ne3ns="; + vendorHash = "sha256-fDn6UlijI2TJPF4FS50u1MMDxnd8eDTbqHLnGso/FoU="; # Do not build testing suit excludedPackages = [ "./test" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/cntlm/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cntlm/default.nix index a3b0b9ac55..238b936331 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cntlm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cntlm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "NTLM/NTLMv2 authenticating HTTP proxy"; - homepage = "http://cntlm.sourceforge.net/"; + homepage = "https://cntlm.sourceforge.net/"; license = licenses.gpl2; maintainers = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/connman/connman/default.nix b/third_party/nixpkgs/pkgs/tools/networking/connman/connman/default.nix index bfe609f852..da1a6107e4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/connman/connman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/connman/connman/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv +{ lib +, nixosTests +, stdenv , fetchurl , fetchpatch , pkg-config @@ -170,6 +172,8 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests.connman = nixosTests.connman; + meta = with lib; { description = "A daemon for managing internet connections"; homepage = "https://git.kernel.org/pub/scm/network/connman/connman.git/"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dcap/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dcap/default.nix index 3ee1a389ef..3a19bf627a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dcap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dcap/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ cunit ]; + nativeCheckInputs = [ cunit ]; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index a0b3f35795..b3552a28e5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -8,7 +8,7 @@ , pkg-config , systemd , hostname -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , extraTags ? [ ] }: diff --git a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index 81c721a20a..87162c4e0d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , udev , runtimeShellPackage @@ -18,6 +19,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-gZNXY07+0epc9E7AGyTT0/iFL+yLQkmSXcxWZ8VON2w="; }; + patches = [ + # dhcpcd with privsep SIGSYS's on dhcpcd -U + # https://github.com/NetworkConfiguration/dhcpcd/issues/147 + (fetchpatch { + url = "https://github.com/NetworkConfiguration/dhcpcd/commit/38befd4e867583002b96ec39df733585d74c4ff5.patch"; + hash = "sha256-nS2zmLuQBYhLfoPp0DOwxF803Hh32EE4OUKGBTTukE0="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev diff --git a/third_party/nixpkgs/pkgs/tools/networking/dirb/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dirb/default.nix index e8826ee645..957cbed631 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dirb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dirb/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { meta = { description = "A web content scanner"; - homepage = "http://dirb.sourceforge.net/"; + homepage = "https://dirb.sourceforge.net/"; maintainers = with lib.maintainers; [ bennofs ]; license = with lib.licenses; [ gpl2 ]; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix index 6d4e28f6cb..766bb68e0f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsmasq/default.nix @@ -5,14 +5,13 @@ , nixosTests }: -with lib; let - copts = concatStringsSep " " ([ + copts = lib.concatStringsSep " " ([ "-DHAVE_IDN" "-DHAVE_DNSSEC" - ] ++ optionals dbusSupport [ + ] ++ lib.optionals dbusSupport [ "-DHAVE_DBUS" - ] ++ optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.isLinux [ "-DHAVE_CONNTRACK" ]); in @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; - postBuild = optionalString stdenv.isLinux '' + postBuild = lib.optionalString stdenv.isLinux '' make -C contrib/lease-tools ''; @@ -51,17 +50,17 @@ stdenv.mkDerivation rec { # module can create it in Nix-land? postInstall = '' install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf - '' + optionalString stdenv.isDarwin '' + '' + lib.optionalString stdenv.isDarwin '' install -Dm644 contrib/MacOSX-launchd/uk.org.thekelleys.dnsmasq.plist \ $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist substituteInPlace $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist \ --replace "/usr/local/sbin" "$out/bin" - '' + optionalString stdenv.isLinux '' + '' + lib.optionalString stdenv.isLinux '' install -Dm755 contrib/lease-tools/dhcp_lease_time $out/bin/dhcp_lease_time install -Dm755 contrib/lease-tools/dhcp_release $out/bin/dhcp_release install -Dm755 contrib/lease-tools/dhcp_release6 $out/bin/dhcp_release6 - '' + optionalString dbusSupport '' + '' + lib.optionalString dbusSupport '' install -Dm644 dbus/dnsmasq.conf $out/share/dbus-1/system.d/dnsmasq.conf mkdir -p $out/share/dbus-1/system-services cat < $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service @@ -75,8 +74,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle libidn ] - ++ optionals dbusSupport [ dbus ] - ++ optionals stdenv.isLinux [ libnetfilter_conntrack ]; + ++ lib.optionals dbusSupport [ dbus ] + ++ lib.optionals stdenv.isLinux [ libnetfilter_conntrack ]; passthru.tests = { prometheus-exporter = nixosTests.prometheus-exporters.dnsmasq; @@ -87,7 +86,7 @@ stdenv.mkDerivation rec { kubernetes-dns-multi = nixosTests.kubernetes.dns-multi-node; }; - meta = { + meta = with lib; { description = "An integrated DNS, DHCP and TFTP server for small networks"; homepage = "https://www.thekelleys.org.uk/dnsmasq/doc.html"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/tools/networking/easyrsa/default.nix b/third_party/nixpkgs/pkgs/tools/networking/easyrsa/default.nix index bcc0a81d5e..b69906a343 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/easyrsa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/easyrsa/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "easyrsa"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "OpenVPN"; repo = "easy-rsa"; rev = "v${version}"; - sha256 = "sha256-errF7bNhX3oYEMDwB/B1W5hBWhOD+GCgET3lA121PHc="; + sha256 = "sha256-nZjEBAJnho2Qis5uzQs1sVZVFHHSgJVa5aJS+dAfFCg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix b/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix index 9c5c8efa5a..0f5a2aebc9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, tcl }: +{ lib, stdenv, fetchurl, tcl }: stdenv.mkDerivation rec { pname = "eggdrop"; - version = "1.9.3"; + version = "1.9.4"; - src = fetchFromGitHub { - owner = "eggheads"; - repo = "eggdrop"; - rev = "v${version}"; - sha256 = "sha256-BYPDIPn1nuVhnPjs2vZ6KC6pjBVYDWsRjB8c1Z6UUdE="; + src = fetchurl { + url = "https://ftp.eggheads.org/pub/eggdrop/source/${lib.versions.majorMinor version}/eggdrop-${version}.tar.gz"; + hash = "sha256-DCh+N+h7XBidScnl2I9cwzhsmMB0MdPmAzgDwYkCltE="; }; buildInputs = [ tcl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix b/third_party/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix index 900d54dc74..22ed2dcb80 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/eternal-terminal/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "eternal-terminal"; - version = "6.2.1"; + version = "6.2.4"; src = fetchFromGitHub { owner = "MisterTea"; repo = "EternalTerminal"; - rev = "et-v${version}"; - hash = "sha256-YQ8Qx6RTmDoNWY8AQlnBJJendQl+tF1QA+Z6h/ar9qs="; + rev = "refs/tags/et-v${version}"; + hash = "sha256-9W9Pz0VrFU+HNpf98I3CLrn8+kpjjNLOUK8gGcDJcI8="; }; nativeBuildInputs = [ @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Remote shell that automatically reconnects without interrupting the session"; homepage = "https://eternalterminal.dev/"; + changelog = "https://github.com/MisterTea/EternalTerminal/releases/tag/et-v${version}"; license = licenses.asl20; maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/tools/networking/fdm/default.nix b/third_party/nixpkgs/pkgs/tools/networking/fdm/default.nix index 7e66fde030..731fe83dc9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/fdm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/fdm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fdm"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "nicm"; repo = pname; rev = version; - sha256 = "sha256-w7jgFq/uWGTF8+CsQCwXKu3eJ7Yjp1WWY4DGQhpBFmQ="; + sha256 = "sha256-Gqpz+N1ELU5jQpPJAG9s8J9UHWOJNhkT+s7+xuQazd0="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; - maintainers = with maintainers; [ ninjin raskin ]; + maintainers = with maintainers; [ raskin ]; platforms = with platforms; linux; homepage = "https://github.com/nicm/fdm"; downloadPage = "https://github.com/nicm/fdm/releases"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix index 57e75462e3..873afdea2e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix @@ -1,7 +1,5 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: -with lib; - buildGoModule rec { pname = "flannel"; version = "0.20.2"; @@ -23,7 +21,7 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) flannel; }; - meta = { + meta = with lib; { description = "Network fabric for containers, designed for Kubernetes"; license = licenses.asl20; homepage = "https://github.com/flannel-io/flannel"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix index fc5e675ec9..4d6c54564b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.45.0"; + version = "0.46.1"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ybcc1k0XSX+ZiG7Z1Bwai1RCypZfrHqhi3uJNhJYILo="; + sha256 = "sha256-/itziNmIDIuj3sKpB+SEiiwvJqdH5nmTkpFdMSY5L0g="; }; - vendorSha256 = "sha256-ZwBSptOsFcxz+xBpjrsvnLvky8kSN4uFx1fXcdDwAmk="; + vendorHash = "sha256-dU9rhYgYgP1qTPR3ykUgyg+B1bBVJwizWooyCpdpnm0="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix b/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix index 6a8e7abd10..2c52f05557 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/getmail6/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.18.11"; + version = "6.18.12"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EJ1lnSeawWezOYZxAHx3QX9kWGoayWZ2vkFY21l+Ijc="; + hash = "sha256-b+zDoiOD80BTP5VDpW/swur8zJOqYEWe05e/ZupZjyk="; }; # needs a Docker setup diff --git a/third_party/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix b/third_party/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix index 6558d72ecd..5b00de2fda 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -1,22 +1,19 @@ -{ stdenv, lib, fetchFromGitHub -, cmake, qtwebsockets, qtwebengine, wrapQtAppsHook, openconnect +{ stdenv, lib, fetchurl +, cmake, qtwebsockets, qtwebengine, qtkeychain, wrapQtAppsHook, openconnect }: stdenv.mkDerivation rec { pname = "globalprotect-openconnect"; - version = "1.4.8"; + version = "1.4.9"; - src = fetchFromGitHub { - owner = "yuezk"; - repo = "GlobalProtect-openconnect"; - fetchSubmodules = true; - rev = "v${version}"; - sha256 = "sha256-PQAlGeHVayImKalCNv2SwPcxD0ts4BVSqeo1hKYmnMA="; + src = fetchurl { + url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz"; + hash = "sha256-vhvVKESLbqHx3XumxbIWOXIreDkW3yONDMXMHxhjsvk="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ openconnect qtwebsockets qtwebengine ]; + buildInputs = [ openconnect qtwebsockets qtwebengine qtkeychain ]; patchPhase = '' substituteInPlace GPService/gpservice.h \ diff --git a/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix index 9e27cf7039..b0de8d09c7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-aVvzbWMh/r1k3AKDHipWkwEevYPj8Xfix8PfIMYXiTM="; + sha256 = "sha256-UGRGJqeVWrt8NVf9d5Mk7k+k2Is/fwHv2X0hmyXvTZs="; }; vendorHash = "sha256-9Vi8qrcFC2SazcGVgAf1vbKvxd8rTMgye63wSCaFonk="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix index f8274f98cc..0daf963bf3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "godns"; - version = "2.9.1"; + version = "2.9.3"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-ZTp7MQTl1FbahmnStXFML4KeL736CXY5rE2gilP3txg="; + sha256 = "sha256-b83cJUTUbJ9Rwvj7HUIGNNq9RJQLkH1CaaS+4dQ2I2o="; }; vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gost/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gost/default.nix index 0c12652586..f36ee2d3e2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gost/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gost/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gost"; - version = "2.11.1"; + version = "2.11.5"; src = fetchFromGitHub { owner = "ginuerzh"; repo = "gost"; rev = "v${version}"; - sha256 = "1mxgjvx99bz34f132827bqk56zgvh5rw3h2xmc524wvx59k9zj2a"; + sha256 = "sha256-UBjrWeBw9+qKQ/+1T1W/3e0vrigp540URIyM2d9iCE8="; }; - vendorSha256 = "1cgb957ipkiix3x0x84c77a1i8l679q3kqykm1lhb4f19x61dqjh"; + vendorHash = "sha256-lA4uW0cc0XqU9pjVEMapFLb3eD20Lea9PbkgL3sjJns="; postPatch = '' substituteInPlace http2_test.go \ diff --git a/third_party/nixpkgs/pkgs/tools/networking/gsocket/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gsocket/default.nix new file mode 100644 index 0000000000..e25a31a0a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/gsocket/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, autoreconfHook, openssl }: + +stdenv.mkDerivation rec { + pname = "gsocket"; + version = "1.4.39"; + + src = fetchFromGitHub { + owner = "hackerschoice"; + repo = "gsocket"; + rev = "v${version}"; + sha256 = "sha256-iSII21X3F4Cb1UqF0aYw23N7CyeTQMmziRioEULx9Zk="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ openssl ]; + dontDisableStatic = true; + + meta = with lib; { + description = "Connect like there is no firewall, securely"; + homepage = "https://www.gsocket.io"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = [ maintainers.msm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix index 7928905762..1453fea66f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.6.6"; + version = "2.7.2"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-0MgMkMBK55WYtYuXSdU3h/APe1FRdefYID8nluamWU0="; + sha256 = "sha256-Y7xuwDAtDrvh+nacGWBmQN6DSsjLB0R7gHmctWPcDz8="; }; buildInputs = [ openssl zlib libxcrypt ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/htpdate/default.nix b/third_party/nixpkgs/pkgs/tools/networking/htpdate/default.nix index e821163f22..936e582a1a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/htpdate/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/htpdate/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.3.6"; + version = "1.3.7"; pname = "htpdate"; src = fetchFromGitHub { owner = "twekkel"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0NLlBNYTJ+hmQLH/UYwIOIbq3G1sDo/A03xFHsXdzig="; + sha256 = "sha256-XdqQQw87gvWvdx150fQhnCio478PNCQBMw/g/l/T1ZA="; }; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/httplab/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httplab/default.nix index 40851d370c..2fe0f15b38 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httplab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httplab/default.nix @@ -1,21 +1,30 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: -buildGoPackage rec { +buildGoModule rec { pname = "httplab"; version = "0.4.0"; - rev = "v${version}"; - - goPackagePath = "github.com/gchaincl/httplab"; src = fetchFromGitHub { - owner = "gchaincl"; + owner = "qustavo"; repo = "httplab"; - inherit rev; - sha256 = "0442nnpxyfl2gi9pilv7q6cxs2cd98wblg8d4nw6dx98yh4h99zs"; + rev = "v${version}"; + hash = "sha256-+qcECfQo9Wa4JQ09ujhKjQndmcFn03hTfII636+1ghA="; }; + vendorHash = null; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/qustavo/httplab/commit/80680bebc83f1ed19216f60339c62cd9213d736b.patch"; + hash = "sha256-y4KO3FGwKNAfM+4uR3KDbV90d/4JeBGvWtfirDJrWZk="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { - homepage = "https://github.com/gchaincl/httplab"; + homepage = "https://github.com/qustavo/httplab"; description = "Interactive WebServer"; license = licenses.mit; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/hurl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/hurl/default.nix index fa14d0ec5b..4a56b8b651 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/hurl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/hurl/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "1.8.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - sha256 = "sha256-d2iWLswlKBow1B+cOaSmsHVWXk/ugwf3pn3OiLhCml0="; + sha256 = "sha256-CQDyIGUIijNphOVo+aYZ7SqkxE4md9+H3D/g7jdqV+M="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { # Tests require network access to a test server doCheck = false; - cargoSha256 = "sha256-A3vl7QRKuox8aE0FsEOiVH/5sRMnKNcdjT2wWPLhd+4="; + cargoSha256 = "sha256-wNiEULv+0WlZruxibcKqsw4Ym3retwjoGKXxzACcEeA="; postInstall = '' installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1 diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix index e835007fdc..6cc64a171d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/i2p/default.nix @@ -1,12 +1,23 @@ -{ lib, stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which, java-service-wrapper }: +{ lib +, stdenv +, ps +, coreutils +, fetchurl +, jdk +, jre +, ant +, gettext +, which +, java-service-wrapper +}: stdenv.mkDerivation rec { pname = "i2p"; - version = "1.9.0"; + version = "2.1.0"; src = fetchurl { url = "https://files.i2p-projekt.de/${version}/i2psource_${version}.tar.bz2"; - sha256 = "sha256-V/YYFQmMNVk9ft4wX5i5AVxMYTxyIxrQhOaAaj4qo3E="; + sha256 = "sha256-gwmMEncgTFVpKEsys37xN2VrJ7/hXvkD7KLafCaSiNE="; }; buildInputs = [ jdk ant gettext which ]; @@ -47,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "https://geti2p.net"; sourceProvenance = with sourceTypes; [ fromSource - binaryBytecode # source bundles dependencies as jars + binaryBytecode # source bundles dependencies as jars ]; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix index 353aea94a8..041fe636bd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.44.0"; + version = "2.45.1"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-9LnT0613z2I9bA0FhcTgINBnXG17ulz6flA13B1Vijs="; + sha256 = "sha256-gyHnLoELjL/IQbtgH2W25xw30l+9akH7jgQfjp4y5sg="; }; buildInputs = [ boost zlib openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix index 9f92496490..73d47c1417 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/igmpproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "igmpproxy"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "pali"; repo = "igmpproxy"; rev = version; - sha256 = "sha256-B7mq+5pKWMO4dJeFPB7tiyjDQjj90g/kmYB2ApBE3Ic="; + sha256 = "sha256-kv8XtZ/z8zPHYSZ4k4arn2Y+L2xegr2DwhvlguJV820="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/imapsync/default.nix b/third_party/nixpkgs/pkgs/tools/networking/imapsync/default.nix index 5604145a18..0fb519ad5a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/imapsync/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/imapsync/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mail folder synchronizer between IMAP servers"; homepage = "https://imapsync.lamiral.info/"; - license = licenses.wtfpl; + license = licenses.nlpl; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ip2unix/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ip2unix/default.nix index 7e2eef70b8..c4c03cae3a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ip2unix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ip2unix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, libyamlcpp, systemd +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, yaml-cpp, systemd , python3Packages, asciidoc, libxslt, docbook_xml_dtd_45, docbook_xsl , libxml2, docbook5 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { systemd ]; - buildInputs = [ libyamlcpp ]; + buildInputs = [ yaml-cpp ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ivpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ivpn/default.nix new file mode 100644 index 0000000000..7a475478a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/ivpn/default.nix @@ -0,0 +1,46 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, wirelesstools +}: + +builtins.mapAttrs (pname: attrs: buildGoModule (attrs // rec { + inherit pname; + version = "3.10.0"; + + src = fetchFromGitHub { + owner = "ivpn"; + repo = "desktop-app"; + rev = "v${version}"; + hash = "sha256-oX1PWIBPDcvBTxstEiN2WosiVUNXJoloppkpcABSi7Y="; + }; + + ldflags = [ + "-s" + "-w" + "-X github.com/ivpn/desktop-app/daemon/version._version=${version}" + "-X github.com/ivpn/desktop-app/daemon/version._time=1970-01-01" + ]; + + postInstall = '' + mv $out/bin/{${attrs.modRoot},${pname}} + ''; + + meta = with lib; { + description = "Official IVPN Desktop app"; + homepage = "https://www.ivpn.net/apps"; + changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ urandom ]; + }; +})) { + ivpn = { + modRoot = "cli"; + vendorHash = "sha256-5FvKR1Kz91Yi/uILVFyJRnwFZSmZ5qnotXqOI4fKLbY="; + }; + ivpn-service = { + modRoot = "daemon"; + vendorHash = "sha256-9Rk6ruMpyWtQe+90kw4F8OLq7/JcDSrG6ufkfcrS4W8="; + buildInputs = [ wirelesstools ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/libnids/default.nix b/third_party/nixpkgs/pkgs/tools/networking/libnids/default.nix index a2cf239b56..f02e3bef9e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/libnids/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/libnids/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { description = "An E-component of Network Intrusion Detection System which emulates the IP stack of Linux 2.0.x"; - homepage = "http://libnids.sourceforge.net/"; + homepage = "https://libnids.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.symphorien ]; # probably also bsd and solaris diff --git a/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix b/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix index b7ae9f0099..c78c12c8fa 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/linkchecker/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { requests ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ parameterized pytestCheckHook ]; @@ -51,7 +51,6 @@ python3.pkgs.buildPythonApplication rec { ] ++ lib.optionals stdenv.isDarwin [ "tests/checker/test_content_allows_robots.py" "tests/checker/test_http*.py" - "tests/checker/test_noproxy.py" "tests/test_network.py" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix b/third_party/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix index 74d32b4523..30a400df0a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/logmein-hamachi/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl }: -with lib; - let arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x64" diff --git a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix index 225b208822..3d15124b7d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mailutils/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; }) ]; - checkInputs = [ dejagnu ]; + nativeCheckInputs = [ dejagnu ]; doCheck = false; # fails 1 out of a bunch of tests, looks like a bug doInstallCheck = false; # fails diff --git a/third_party/nixpkgs/pkgs/tools/networking/minissdpd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minissdpd/default.nix index 869abe92e5..9b24f4fc6b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minissdpd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minissdpd/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "minissdpd"; - version = "1.5.20180223"; + version = "1.6.0"; src = fetchurl { - sha256 = "1c47h1zil04jnbxiaaci2rm8jij47zp5156v48hb6m87nh4l5adv"; + sha256 = "sha256-9MLepqRy4KXMncotxMH8NrpVOOrPjXk4JSkyUXJVRr0="; url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz"; name = "${pname}-${version}.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mmsd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mmsd/default.nix index 120d1f19be..43891d612b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mmsd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mmsd/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "unstable-2019-07-15"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/network/ofono/mmsd.git"; + url = "https://git.kernel.org/pub/scm/network/ofono/mmsd.git"; rev = "f4b8b32477a411180be1823fdc460b4f7e1e3c9c"; sha256 = "0hcnpyhsi7b5m825dhnwbp65yi0961wi8mipzdvaw5nc693xv15b"; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/modemmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/modemmanager/default.nix index cb768b8e95..01c70f3bf3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/modemmanager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/modemmanager/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; - installCheckInputs = [ + nativeInstallCheckInputs = [ python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix index 8c09f1e430..9d2286e227 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.8.13"; + version = "1.8.14"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = "v${version}"; - hash = "sha256-uXrJOBF3X8UF1ktTfAoYgzc0QBLvyzzGQVJVfs8tjng="; + hash = "sha256-m6if0Br9WRPR8POwOM0Iwido3UR/V0BlkuaLcWsf/c0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix index c35cf14717..713a4eef55 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mubeng"; - version = "0.12.0-dev"; + version = "0.13.0"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - hash = "sha256-NBZmu0VcVUhJSdM3fzZ+4Q5oX8uxO6GLpEUq74x8HUU="; + hash = "sha256-FfqldK2iDB4Cy5M1uMUDEikV8JMMBzh2kgmvtZiJTOc="; }; - vendorHash = "sha256-1JxyP6CrJ4/g7o3eGeN1kRXJU/jNLEB8fW1bjJytQqQ="; + vendorHash = "sha256-5YqourXzrRdfmWdHE/ZsRTze2h02ZHAsprQrSTZFrhY="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix index 66b2706204..c601770652 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix @@ -25,11 +25,6 @@ stdenv.mkDerivation rec { test = nixosTests.nbd; }; - # Glib calls `clock_gettime', which is in librt. Linking that library - # here ensures that a proper rpath is added to the executable so that - # it can be loaded at run-time. - NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lrt -lpthread"; - meta = { homepage = "https://nbd.sourceforge.io/"; description = "Map arbitrary files as block devices over the network"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix index ad3bf67527..6746f456cf 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ndjbdns/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, systemd, pkg-config }: -with lib; - stdenv.mkDerivation { version = "1.06"; pname = "ndjbdns"; @@ -15,9 +13,9 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ] - ++ optional stdenv.isLinux systemd; + ++ lib.optional stdenv.isLinux systemd; - meta = { + meta = with lib; { description = "A brand new release of the Djbdns"; longDescription = '' Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein. diff --git a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix index cc05f53817..c1becc886a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netbird/default.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.11.6"; + version = "0.12.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q86GVCRppBU9qiCch0sjTnSsjl17xU5l3o72cBF3zZo="; + sha256 = "sha256-ajfNHkdYNJCuDhFmww1X0d9F0dmo2/h0GlfLYWvTHKc="; }; - vendorSha256 = "sha256-TfHBvcG3e+yjifPVo0ZgcvLvD16fni4m71nCr4cCBD4="; + vendorHash = "sha256-3uEcb0nVHrfHZTZ/j/9l6zR1zMfLR0mVaN/Hydyam4Q="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; diff --git a/third_party/nixpkgs/pkgs/tools/networking/netcat/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netcat/default.nix index ef035d3c67..1443794b74 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netcat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netcat/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utility which reads and writes data across network connections"; - homepage = "http://netcat.sourceforge.net/"; + homepage = "https://netcat.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ngrok/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ngrok/default.nix index f12ae31a54..fb1574bfdc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ngrok/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ngrok/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl }: -with lib; - let versions = lib.importJSON ./versions.json; arch = if stdenv.isi686 then "386" else if stdenv.isx86_64 then "amd64" @@ -37,10 +35,10 @@ stdenv.mkDerivation { # Stripping causes SEGFAULT on x86_64-darwin dontStrip = true; - meta = { + meta = with lib; { description = "Allows you to expose a web server running on your local machine to the internet"; homepage = "https://ngrok.com/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; maintainers = with maintainers; [ bobvanderlinden brodes ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ngrok/versions.json b/third_party/nixpkgs/pkgs/tools/networking/ngrok/versions.json index 1d71e81d9b..bd2f75e5eb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ngrok/versions.json +++ b/third_party/nixpkgs/pkgs/tools/networking/ngrok/versions.json @@ -1,38 +1,38 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/26QHEgwoE5Z/ngrok-v3-3.1.0-linux-386", - "sha256": "85f1da543cd77021862c757186220c414b849bb25a31c9e8cc280bc843bb3ba6", - "version": "3.1.0" + "url": "https://bin.equinox.io/a/64nFcrEHYrW/ngrok-v3-3.1.1-linux-386", + "sha256": "ab7aa2adfa5e29da618142878e1aec93cc55ea5c8f7e69c2582baaad2e149b64", + "version": "3.1.1" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/7UAdGDeyg6i/ngrok-v3-3.1.0-linux-amd64", - "sha256": "2f6d941d421987daa37fbf3c726d875c9e3ef1c2e26bbf452223d64c0d2b2adb", - "version": "3.1.0" + "url": "https://bin.equinox.io/a/dqrwdoEvP2Q/ngrok-v3-3.1.1-linux-amd64", + "sha256": "9e6575f21e71b0b89b775bf66aecac68535573965391b48bfe488e18b1796b9a", + "version": "3.1.1" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/hAZN7QUBMxw/ngrok-v3-3.1.0-linux-arm", - "sha256": "27ace158cadd1e5e5c6e9b2f0652bdf7ab0d4cf39e3d9454fbefcc6c6ec03d56", - "version": "3.1.0" + "url": "https://bin.equinox.io/a/biK8Eisfsar/ngrok-v3-3.1.1-linux-arm", + "sha256": "fe5c1e3918b8973397ec70a6a46d2c70c784720dc95add6e7059ed501bf498bd", + "version": "3.1.1" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/5skoQje3DKb/ngrok-v3-3.1.0-linux-arm64", - "sha256": "668cc681c4d5bd6b4d205b8332091f8236575ebebd900b5ef9d273116471d820", - "version": "3.1.0" + "url": "https://bin.equinox.io/a/d45uz1Sks8d/ngrok-v3-3.1.1-linux-arm64", + "sha256": "bf1ba6948bb20d31427eb453504d7fb1bfe447c25665172b8b6b4547c5b65f0f", + "version": "3.1.1" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/h7mizaTkyfP/ngrok-v3-3.1.0-darwin-amd64", - "sha256": "5f607e9f3aa699ae4e85ceeb25c275d9e720614f457423bc4657b3f48168cfad", - "version": "3.1.0" + "url": "https://bin.equinox.io/a/24zbF9PjSKm/ngrok-v3-3.1.1-darwin-amd64", + "sha256": "9b1d77f0701089fd10e03a2c0835b4f04f1cc5155339336128c5491821d48513", + "version": "3.1.1" }, "darwin-arm64": { "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/46gUrn19J7F/ngrok-v3-3.1.0-darwin-arm64", - "sha256": "0a2119d6ef9dcc0b6203d38b536483c417a59c355d505e92a4b6c7c96810ef4b", - "version": "3.1.0" + "url": "https://bin.equinox.io/a/kxP7ohERZDY/ngrok-v3-3.1.1-darwin-arm64", + "sha256": "886ca873580717ca25ba9e7e3d06a0710b07cfd16bd939a43c9aa128aee00951", + "version": "3.1.1" } } diff --git a/third_party/nixpkgs/pkgs/tools/networking/norouter/default.nix b/third_party/nixpkgs/pkgs/tools/networking/norouter/default.nix index e0f6a8f3ae..8c65089cdf 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/norouter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/norouter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "norouter"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "norouter"; repo = pname; rev = "v${version}"; - sha256 = "0h5jzxm4fw50781zj76r5ksnxkzsnrygrykpa913v9nd24c09c7m"; + sha256 = "sha256-EY/Yfyaz2DeQKHJ4awpQDbrVkse9crIZlLzfviPy3Tk="; }; - vendorSha256 = "sha256-DZ2kcNV8AzNogAUTaeus4rz9gCFo0wm306jcz/cAj0M="; + vendorSha256 = "sha256-RxrmYfEm1Maq8byoLXUr5RfXcwgqpCcAq5enMnl9V9E="; subPackages = [ "cmd/norouter" ]; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/nqptp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nqptp/default.nix new file mode 100644 index 0000000000..de7f5ffbbf --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/nqptp/default.nix @@ -0,0 +1,28 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +}: + +stdenv.mkDerivation rec { + version = "unstable-2022-09-12"; + pname = "nqptp"; + + src = fetchFromGitHub { + owner = "mikebrady"; + repo = pname; + rev = "476e69697d2ec1a28d399432aed23c580e3e570a"; + hash = "sha256-UPUYEX5YUl//OcsBKuGgKLaAMzn2F+ksNRQJ3/pkbKc="; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + meta = with lib; { + homepage = "https://github.com/mikebrady/nqptp"; + description = "Daemon and companion application to Shairport Sync that monitors timing data from any PTP clocks"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ jordanisaacs ]; + platforms = platforms.linux ++ platforms.freebsd; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/nxdomain/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nxdomain/default.nix index 4e7a708125..a90c7f0c23 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nxdomain/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nxdomain/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ dnspython ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postCheck = '' echo example.org > simple.list diff --git a/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix index 3733998c10..2b8b09d174 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; src = fetchgit { - url = "git://git.kernel.org/pub/scm/network/ofono/ofono.git"; + url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git"; rev = version; sha256 = "sha256-T8rfReruvHGQCN9IDGIrFCoNjFKKMnUGPKzxo2HTZFQ="; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix b/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix index 555fd43035..146a2fc6ea 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix @@ -15,6 +15,8 @@ , zlib , vpnc-scripts , PCSC +, useDefaultExternalBrowser ? true +, xdg-utils , autoreconfHook }: @@ -32,7 +34,8 @@ stdenv.mkDerivation rec { buildInputs = [ gmp libxml2 stoken zlib (if useOpenSSL then openssl else gnutls) ] ++ lib.optional stdenv.isDarwin PCSC - ++ lib.optional stdenv.isLinux p11-kit; + ++ lib.optional stdenv.isLinux p11-kit + ++ lib.optional (stdenv.isLinux && useDefaultExternalBrowser) xdg-utils; nativeBuildInputs = [ pkg-config autoreconfHook ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/openconnect/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openconnect/default.nix index e0e0b6078f..1ea893948d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openconnect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openconnect/default.nix @@ -26,6 +26,3 @@ in rec { useOpenSSL = true; }; } - - - diff --git a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix index 0426066995..87b7ae1970 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openfortivpn/default.nix @@ -2,7 +2,7 @@ , openssl , ppp , systemd -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , withPpp ? stdenv.isLinux }: diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix index ebe2604f4e..c1b2199d0f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix @@ -30,7 +30,6 @@ , linkOpenssl ? true }: -with lib; stdenv.mkDerivation rec { inherit pname version src; @@ -57,12 +56,12 @@ stdenv.mkDerivation rec { # This is not the same as the libkrb5 from the inputs! pkgs.libkrb5 is # needed here to access krb5-config in order to cross compile. See: # https://github.com/NixOS/nixpkgs/pull/107606 - ++ optional withKerberos pkgs.libkrb5 + ++ lib.optional withKerberos pkgs.libkrb5 ++ extraNativeBuildInputs; buildInputs = [ zlib openssl libedit ] - ++ optional withFIDO libfido2 - ++ optional withKerberos libkrb5 - ++ optional stdenv.isLinux pam; + ++ lib.optional withFIDO libfido2 + ++ lib.optional withKerberos libkrb5 + ++ lib.optional stdenv.isLinux pam; preConfigure = '' # Setting LD causes `configure' and `make' to disagree about which linker @@ -80,11 +79,11 @@ stdenv.mkDerivation rec { "--with-libedit=yes" "--disable-strip" (if stdenv.isLinux then "--with-pam" else "--without-pam") - ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" - ++ optional withFIDO "--with-security-key-builtin=yes" - ++ optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") - ++ optional stdenv.isDarwin "--disable-libutil" - ++ optional (!linkOpenssl) "--without-openssl" + ] ++ lib.optional (etcDir != null) "--sysconfdir=${etcDir}" + ++ lib.optional withFIDO "--with-security-key-builtin=yes" + ++ lib.optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") + ++ lib.optional stdenv.isDarwin "--disable-libutil" + ++ lib.optional (!linkOpenssl) "--without-openssl" ++ extraConfigureFlags; ${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null}= [ "-laudit" ] ++ lib.optionals withKerberos [ "-lkeyutils" ]; @@ -97,7 +96,7 @@ stdenv.mkDerivation rec { doCheck = true; enableParallelChecking = false; - checkInputs = optional (!stdenv.isDarwin) hostname; + nativeCheckInputs = lib.optional (!stdenv.isDarwin) hostname; preCheck = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # construct a dummy HOME export HOME=$(realpath ../dummy-home) @@ -145,7 +144,7 @@ stdenv.mkDerivation rec { # integration tests hard to get working on darwin with its shaky # sandbox # t-exec tests fail on musl - checkTarget = optional (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "t-exec" + checkTarget = lib.optional (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "t-exec" # other tests are less demanding of the environment ++ [ "unit" "file-tests" "interop-tests" ]; @@ -165,7 +164,7 @@ stdenv.mkDerivation rec { borgbackup-integration = nixosTests.borgbackup; }; - meta = { + meta = with lib; { description = "An implementation of the SSH protocol${extraDesc}"; homepage = "https://www.openssh.com/"; changelog = "https://www.openssh.com/releasenotes.html"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix index d13ea56691..0ef5076eaf 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix @@ -5,9 +5,8 @@ , iproute2 , lzo , openssl -, openssl_1_1 , pam -, useSystemd ? stdenv.isLinux +, useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , update-systemd-resolved , util-linux @@ -74,12 +73,6 @@ let in { - openvpn_24 = generic { - version = "2.4.12"; - sha256 = "1vjx82nlkxrgzfiwvmmlnz8ids5m2fiqz7scy1smh3j9jnf2v5b6"; - extraBuildInputs = [ openssl_1_1 ]; - }; - openvpn = generic { version = "2.5.8"; sha256 = "1cixqm4gn2d1v8qkbww75j30fzvxz13gc7whcmz54i0x4fvibwx6"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index dd165fa138..3c9a6e7233 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A GTK Gnutella client, optimized for speed and scalability"; - homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella + homepage = "https://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog"; maintainers = [ maintainers.doronbehar ]; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index a47483a11f..620d953c88 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec { ] ++ twisted.optional-dependencies.tls ++ twisted.optional-dependencies.conch; - checkInputs = with python3Packages; [ mock hypothesis twisted ]; + nativeCheckInputs = with python3Packages; [ mock hypothesis twisted ]; # Install the documentation. postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/pptp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pptp/default.nix index 7af9e324f2..142105e202 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pptp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pptp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PPTP client for Linux"; - homepage = "http://pptpclient.sourceforge.net/"; + homepage = "https://pptpclient.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/pptpd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pptpd/default.nix index 8a80228119..c7bd929b18 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pptpd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pptpd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://poptop.sourceforge.net/dox/"; + homepage = "https://poptop.sourceforge.net/dox/"; description = "The PPTP Server for Linux"; platforms = platforms.linux; maintainers = with maintainers; [ obadz ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix index 09cca7d2ee..0764c27408 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pritunl-client/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "pritunl-client"; - version = "1.3.3373.6"; + version = "1.3.3420.31"; src = fetchFromGitHub { owner = "pritunl"; repo = "pritunl-client-electron"; rev = version; - sha256 = "sha256-Ttg6SNDcNIQlbNnKQY32hmsrgLhzHkeQfwlmCHe0bI0="; + sha256 = "sha256-FKLYpn2HeAVGN9OjLowv2BJRLZKReqXLPFvbin/jaBo="; }; modRoot = "cli"; - vendorSha256 = "sha256-fI2RIzvfbqBgchsvY8hsiecXYItM2XX9h8oiP3zmfTA="; + vendorHash = "sha256-fI2RIzvfbqBgchsvY8hsiecXYItM2XX9h8oiP3zmfTA="; postInstall = '' mv $out/bin/cli $out/bin/pritunl-client diff --git a/third_party/nixpkgs/pkgs/tools/networking/qodem/default.nix b/third_party/nixpkgs/pkgs/tools/networking/qodem/default.nix index 3b16e30ac1..6451a7d8d3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/qodem/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/qodem/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses SDL gpm miniupnpc ]; meta = with lib; { - homepage = "http://qodem.sourceforge.net/"; + homepage = "https://qodem.sourceforge.net/"; description = "Re-implementation of the DOS-era Qmodem serial communications package"; longDescription = '' Qodem is a from-scratch clone implementation of the Qmodem diff --git a/third_party/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix index 7f15ef91e1..6202a0a614 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/radsecproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "radsecproxy"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-gSXjwQ9zJPVNzGqLsZzTEQ0OxbQUiUJYGxrEm56DZDE="; + sha256 = "sha256-/ldW2JQd8GuG0uspfa56vtzPg4ucj+HCL8gbo9oLReM="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ripe-atlas-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ripe-atlas-tools/default.nix index 05f3ef22bd..b425855480 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ripe-atlas-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ripe-atlas-tools/default.nix @@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication rec { "ripe.atlas.tools" ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/s3rs/default.nix b/third_party/nixpkgs/pkgs/tools/networking/s3rs/default.nix index f8c52cdc43..cb73eaf6b5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/s3rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/s3rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "s3rs"; - version = "0.4.16"; + version = "0.4.19"; src = fetchFromGitHub { owner = "yanganto"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n95ejw6EZ4zXzP16xFoUkVn1zIMcVgINy7m5NOz063A="; + sha256 = "sha256-mJ1bMfv/HY74TknpRvu8RIs1d2VlNreEVtHCtQSHQw8="; }; - cargoSha256 = "sha256-eecQi03w7lq3VAsv9o+3kulwhAXPoxuDPMu/ZCQEom4="; + cargoHash = "sha256-Q1EqEyNxWIx3wD8zuU7/MO3Qz6zsfBZbtT/IIUmJccE="; nativeBuildInputs = [ python3 perl pkg-config ]; buildInputs = [ openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/simple-dlna-browser/default.nix b/third_party/nixpkgs/pkgs/tools/networking/simple-dlna-browser/default.nix new file mode 100644 index 0000000000..c59a1e2891 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/simple-dlna-browser/default.nix @@ -0,0 +1,68 @@ +{ + # Derivation stuff + fetchFromGitHub, + lib, + makeWrapper, + stdenv, + # Dependencies + # Add these to the wrapper + curl, + gawk, + gnugrep, + gnused, + socat, + wget, +}: +stdenv.mkDerivation { + pname = "simple-dlna-browser"; + version = "unstable-2023-01-09"; + + src = fetchFromGitHub { + owner = "javier-lopez"; + repo = "learn"; + sparseCheckout = [ + "sh/tools/simple-dlna-browser" + ]; + rev = "666e2c402723251ba19ce9d7c11b83b06c15a2c5"; + sha256 = "sha256-jwPAEgti5DrjNnNVW/61GGTP+QedGAjz9kPwYhMAdTk="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + outputWrapper="$out/bin/simple-dlna-browser" + outputWrapped="$out/bin/wrapped-simple-dlna-browser" + + mkdir -p $out/bin + cp sh/tools/simple-dlna-browser $outputWrapped + makeWrapper $outputWrapped $outputWrapper \ + --prefix PATH : ${lib.makeBinPath [ + curl + gawk + gnugrep + gnused + socat + wget + ]} + + # Set the program name to a fixed value + # Normally it is guessed by the filename, but we don't want it to be the name of the wrapper + sed -i -e 's/PROGNAME=".*"/PROGNAME="simple-dlna-browser"/' $outputWrapped + ''; + + meta = { + description = "Query dlna media servers"; + longDescription = '' + A bash script that allows simple interactions with [DLNA] media servers. + It is a light-weight, CLI alternative to [VLC], [Kodi], and other players. + + [DLNA]: https://en.wikipedia.org/wiki/Digital_Living_Network_Alliance + [Kodi]: https://kodi.tv/ + [VLC]: https://www.videolan.org/vlc/ + ''; + homepage = "https://github.com/javier-lopez/learn/blob/master/sh/tools/simple-dlna-browser"; + license = lib.licenses.fair; + maintainers = with lib.maintainers; [ loveisgrief ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix index 9f1664744b..aea1964e87 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/sing-box/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-OH4tuSnMdrJSkD7vxEA8dpQxWqh6bUXCOJ/y0fe2pME="; + hash = "sha256-FEwyJL6pFdp9vXIq1TUFGGDfKefFsVaajjX2U0R5Vog="; }; - vendorHash = "sha256-kCNtbtDnB7JZzsfUd2yMDi+pascHfxIbPVMwUVsP78g="; + vendorHash = "sha256-QTk4kKPPOhnCf/1NhWObwf8EsZC+k0EtdSBecD6jq04="; tags = [ "with_quic" diff --git a/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix index e925972424..d02a1ccac1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "37.1"; + version = "40"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - sha256 = "sha256-fj9NA8HLF/FdYNoS2g9KKDvqr3m41P+VU0eiVm7ku8A="; + sha256 = "sha256-Un4LUBWVwbWYK4rZY2+gdk6Zi+n36Xawma8Dok2Sa0U="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix b/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix index 97d9ff33dd..f58fd9a998 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/snabb/default.nix @@ -3,8 +3,6 @@ , fetchFromGitHub }: -with lib; - stdenv.mkDerivation rec { pname = "snabb"; version = "2022.10"; @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { cp src/snabb $out/bin ''; - meta = { + meta = with lib; { homepage = "https://github.com/SnabbCo/snabbswitch"; description = "Simple and fast packet networking toolkit"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/socat/default.nix b/third_party/nixpkgs/pkgs/tools/networking/socat/default.nix index 548d9bed76..00c0ad7bd1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/socat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/socat/default.nix @@ -5,6 +5,7 @@ , readline , stdenv , which +, buildPackages }: stdenv.mkDerivation rec { @@ -23,18 +24,17 @@ stdenv.mkDerivation rec { --replace /sbin/ifconfig ifconfig ''; - configureFlags = lib.optionals stdenv.hostPlatform.isMusl [ - # musl doesn't have getprotobynumber_r - "sc_cv_getprotobynumber_r=2" - ]; - buildInputs = [ openssl readline ]; hardeningEnable = [ "pie" ]; - checkInputs = [ which nettools ]; + nativeCheckInputs = [ which nettools ]; doCheck = false; # fails a bunch, hangs + passthru.tests = lib.optionalAttrs stdenv.buildPlatform.isLinux { + musl = buildPackages.pkgsMusl.socat; + }; + meta = with lib; { description = "Utility for bidirectional data transfer between two independent data channels"; homepage = "http://www.dest-unreach.org/socat/"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/sstp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sstp/default.nix index b297f2565f..a4f6d7772c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/sstp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/sstp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sstp-client"; - version = "1.0.17"; + version = "1.0.18"; src = fetchurl { url = "mirror://sourceforge/sstp-client/sstp-client/sstp-client-${version}.tar.gz"; - sha256 = "sha256-Kd07nHERrWmDzWY9Wi8Gnh+KlakTqryOFmlwFGZXkl0="; + sha256 = "sha256-2Hn081q36uh0hu3Ei1D5mpr2X162+0QnmTyleLsODcg="; }; postPatch = '' @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "SSTP client for Linux"; - homepage = "http://sstp-client.sourceforge.net/"; + homepage = "https://sstp-client.sourceforge.net/"; platforms = platforms.linux; maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/tools/networking/strongswan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/strongswan/default.nix index 119f81baf5..40d2b68c44 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/strongswan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/strongswan/default.nix @@ -14,8 +14,6 @@ # strongswan curl plugin may break. # See https://wiki.strongswan.org/projects/strongswan/wiki/Curl for more info. -with lib; - stdenv.mkDerivation rec { pname = "strongswan"; version = "5.9.8"; # Make sure to also update when upgrading! @@ -32,10 +30,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook perl gperf bison flex ]; buildInputs = [ curl gmp python3 ldns unbound openssl pcsclite ] - ++ optionals enableTNC [ trousers sqlite libxml2 ] - ++ optionals stdenv.isLinux [ systemd.dev pam iptables ] - ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]) - ++ optionals enableNetworkManager [ networkmanager glib ]; + ++ lib.optionals enableTNC [ trousers sqlite libxml2 ] + ++ lib.optionals stdenv.isLinux [ systemd.dev pam iptables ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]) + ++ lib.optionals enableNetworkManager [ networkmanager glib ]; patches = [ ./ext_auth-path.patch @@ -43,7 +41,7 @@ stdenv.mkDerivation rec { ./updown-path.patch ]; - postPatch = optionalString stdenv.isLinux '' + postPatch = lib.optionalString stdenv.isLinux '' # glibc-2.26 reorganized internal includes sed '1i#include ' -i src/libstrongswan/utils/utils/memory.h @@ -62,16 +60,16 @@ stdenv.mkDerivation rec { "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" "--enable-chapoly" "--enable-curl" ] - ++ optionals stdenv.isLinux [ + ++ lib.optionals stdenv.isLinux [ "--enable-farp" "--enable-dhcp" "--enable-systemd" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "--enable-xauth-pam" "--enable-forecast" "--enable-connmark" "--enable-af-alg" ] - ++ optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] - ++ optional (stdenv.hostPlatform.system == "i686-linux") "--enable-padlock" - ++ optionals enableTNC [ + ++ lib.optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] + ++ lib.optional (stdenv.hostPlatform.system == "i686-linux") "--enable-padlock" + ++ lib.optionals enableTNC [ "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20" "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation" @@ -80,11 +78,11 @@ stdenv.mkDerivation rec { "--with-tss=trousers" "--enable-aikgen" "--enable-sqlite" ] - ++ optionals enableNetworkManager [ + ++ lib.optionals enableNetworkManager [ "--enable-nm" "--with-nm-ca-dir=/etc/ssl/certs" ] # Taken from: https://wiki.strongswan.org/projects/strongswan/wiki/MacOSX - ++ optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ "--disable-systemd" "--disable-xauth-pam" "--disable-kernel-netlink" @@ -100,11 +98,11 @@ stdenv.mkDerivation rec { echo "include /etc/ipsec.secrets" >> $out/etc/ipsec.secrets ''; - NIX_LDFLAGS = optionalString stdenv.cc.isGNU "-lgcc_s" ; + NIX_LDFLAGS = lib.optionalString stdenv.cc.isGNU "-lgcc_s" ; passthru.tests = { inherit (nixosTests) strongswan-swanctl; }; - meta = { + meta = with lib; { description = "OpenSource IPsec-based VPN Solution"; homepage = "https://www.strongswan.org"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/tools/networking/stuntman/default.nix b/third_party/nixpkgs/pkgs/tools/networking/stuntman/default.nix index 1825a3971a..3d2ff6eeb5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/stuntman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/stuntman/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with lib; { description = "STUNTMAN - an open source STUN server and client"; - homepage = "http://www.stunprotocol.org/"; + homepage = "https://www.stunprotocol.org/"; license = licenses.asl20; maintainers = with maintainers; [ mattchrist ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix b/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix index 01c82c1fff..b630c62c3a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "3.0.35"; + version = "3.0.36"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-GTqB2wyDguzxrVgnkGiQGgkDVt+caaoyRvUdpeItPcA="; + sha256 = "sha256-nJsjGTtTM9ZjsqZCKKZFrLPZ4jIp1F0Spi6RzeuCzak="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tcpdump/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tcpdump/default.nix index 6726e5b751..73ccdb43fe 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tcpdump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tcpdump/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patchShebangs tests ''; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; buildInputs = [ libpcap ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix index 25525fc2b6..ddc0eae97e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpreplay"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "sha256-Wycs2Dtn1iiKI06hX4ns2TtPrdpl7dxE57X8svOVthU="; + sha256 = "sha256-IWMxaS4QwS1/JXlF53eSjXm9CREX8+T/tbMS6yygv3w="; }; buildInputs = [ libpcap ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix index dedafc52f9..3d67bbb079 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.84"; + version = "1.0.85"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NlEEakmut4WMI+mpm+SJOgHmWELRcl/dZJspks3VoqY="; + sha256 = "sha256-hjP+1uBcUfIFdRd0gbZXR+VsAF+6QrvV3//GrQhOKWc="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix b/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix index 173d2432a7..24f96e63d7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { pname = "tinc"; version = "1.1pre18"; - src = fetchgit { + src = fetchFromGitHub { + owner = "gsliepen"; + repo = "tinc"; rev = "release-${version}"; - url = "git://tinc-vpn.org/tinc"; - sha256 = "0a7d1xg34p54sv66lckn8rz2bpg7bl01najm2rxiwbsm956y7afm"; + hash = "sha256-1anjTUlVLx57FlUqGwBd590lfkZ2MmrM1qRcMl4P7Sg="; }; outputs = [ "out" "man" "info" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/traceroute/default.nix b/third_party/nixpkgs/pkgs/tools/networking/traceroute/default.nix index 46a52b11b9..e3eac708ae 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/traceroute/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/traceroute/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tracks the route taken by packets over an IP network"; - homepage = "http://traceroute.sourceforge.net/"; + homepage = "https://traceroute.sourceforge.net/"; changelog = "https://sourceforge.net/projects/traceroute/files/traceroute/traceroute-${version}/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ koral ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/udp2raw/default.nix b/third_party/nixpkgs/pkgs/tools/networking/udp2raw/default.nix new file mode 100644 index 0000000000..fdb95b121f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/udp2raw/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, iptables +}: + +stdenv.mkDerivation rec { + pname = "udp2raw"; + version = "20200818.0"; + + src = fetchFromGitHub { + owner = "wangyu-"; + repo = "udp2raw"; + rev = version; + hash = "sha256-TkTOfF1RfHJzt80q0mN4Fek3XSFY/8jdeAVtyluZBt8="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + makeFlags = [ "dynamic" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp udp2raw_dynamic $out/bin/udp2raw + wrapProgram $out/bin/udp2raw --prefix PATH : "${lib.makeBinPath [ iptables ]}" + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/wangyu-/udp2raw"; + description = "A tunnel which turns UDP traffic into encrypted UDP/FakeTCP/ICMP traffic by using a raw socket"; + license = licenses.mit; + changelog = "https://github.com/wangyu-/udp2raw/releases/tag/${version}"; + maintainers = with maintainers; [ chvp ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix index 3e42eaaaaf..690cf3d970 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.17.0"; + version = "1.17.1"; src = fetchurl { url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz"; - hash = "sha256-3LyV14kdn5EMZuTtyfHy/eTeou7Bjjr591rtRKAvE0E="; + hash = "sha256-7kCFzszhJYTmAPPYFKKPqCLfqs7B+UyEv9Z/ilVxpfQ="; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { sed -E '/CONFCMDLINE/ s;${storeDir}/[a-z0-9]{32}-;${storeDir}/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-;g' -i config.h ''; - checkInputs = [ bison ]; + nativeCheckInputs = [ bison ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix index 51f70abcc7..b0cca0985b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/v2ray/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-/n8GyKcTsus7BWspg6Br4ALH98A1dSpkNFNKkRlIqHs="; + hash = "sha256-Q7yro9jHNr+HSJkoO7D+T05+AK26eLtw9NfvDTWeMw8="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorSha256 = "sha256-85k6XWe12m2siejfoPJru87/AYdVSl+ag09jUkBIc0M="; + vendorSha256 = "sha256-uXxqqPNSa2s1KmBPzvYVdTmOLxaWer9+AupdvL3+qYU="; ldflags = [ "-s" "-w" "-buildid=" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix b/third_party/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix index a3b6b0f738..7b6a760f5f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/vpnc-scripts/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation { pname = "vpnc-scripts"; - version = "unstable-2021-09-24"; + version = "unstable-2023-01-03"; src = fetchgit { url = "https://gitlab.com/openconnect/vpnc-scripts.git"; - rev = "b749c2cadc2f32e2efffa69302861f9a7d4a4e5f"; - sha256 = "sha256-DDGpxzQBaOOG+MYDXnVEB6/Q4qmdNM+86XNRNl01UqU="; + rev = "22756827315bc875303190abb3756b5b1dd147ce"; + hash = "sha256-EWrDyXg47Ur9mFutaG8+oYOCAW9AZowzwwJp3YbogIY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wakeonlan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wakeonlan/default.nix index 1a50f09d51..80147ae39c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wakeonlan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wakeonlan/default.nix @@ -15,7 +15,7 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ perlPackages.TestPerlCritic perlPackages.TestPod perlPackages.TestPodCoverage ]; + nativeCheckInputs = [ perlPackages.TestPerlCritic perlPackages.TestPod perlPackages.TestPodCoverage ]; # Linting and formatting checks are of no interest for us. preCheck = '' rm -f t/93_pod_spell.t diff --git a/third_party/nixpkgs/pkgs/tools/networking/wifite2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wifite2/default.nix index cfae235f4c..90f663b0b4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wifite2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wifite2/default.nix @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { pixiewps ]; - checkInputs = propagatedBuildInputs ++ [ python3.pkgs.unittestCheckHook ]; + nativeCheckInputs = propagatedBuildInputs ++ [ python3.pkgs.unittestCheckHook ]; meta = with lib; { homepage = "https://github.com/kimocoder/wifite2"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/xdp-tools/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xdp-tools/default.nix index ffe60f6aa0..12c0647bf4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/xdp-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/xdp-tools/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { emacs-nox # to generate man pages from .org nukeReferences ]; - checkInputs = [ + nativeCheckInputs = [ wireshark-cli # for tshark ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix index 9f9463ce59..2f84a4d330 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/xl2tpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xl2tpd"; - version = "1.3.17"; + version = "1.3.18"; src = fetchFromGitHub { owner = "xelerance"; repo = "xl2tpd"; rev = "v${version}"; - sha256 = "sha256-ibHiQn6YBd80rXIxZeUSTNs9KOJXVGRlUIr753mLURk="; + sha256 = "sha256-Uc3PeTf/ow9p8noPcMLdT6S5dks9igDU6CC9koy+ff4="; }; buildInputs = [ libpcap ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/xray/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xray/default.nix index 29b898e8da..e59715e61f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/xray/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/xray/default.nix @@ -20,16 +20,16 @@ let in buildGoModule rec { pname = "xray"; - version = "1.7.0"; + version = "1.7.2"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - sha256 = "sha256-aNIb90obew+tvd/rYVddK1MmUqLXSqi9xAu65BQFvk0="; + sha256 = "sha256-jwCvo6+YXC471VqGWzcrnrLWOSJW2tBKa5SoynQg0Lo="; }; - vendorSha256 = "sha256-zZdUPjlul9f1jKy0Zf79KOToHIsvfgwDp6XpFPYyTzk="; + vendorSha256 = "sha256-P2g0MqlBScm6yTnpvL5T6l9ntsb4tK9k3Civ7rTevrE="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/yrd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/yrd/default.nix index 1aace6aefb..04fee4daf5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/yrd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/yrd/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { requests ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ nose ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix index 2a7c39879d..4cbcc3d48f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { wcwidth ]; - checkInputs = with python3Packages; [ nose pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ nose pytestCheckHook ]; # Disable tests that touch network or shell out to commands disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/zssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/zssh/default.nix index d512b03dbe..3c4be71998 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/zssh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/zssh/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = { description = "SSH and Telnet client with ZMODEM file transfer capability"; - homepage = "http://zssh.sourceforge.net/"; + homepage = "https://zssh.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = [ ]; # required by deepin-terminal platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/nix/info/default.nix b/third_party/nixpkgs/pkgs/tools/nix/info/default.nix index 898026a629..151a53f152 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/info/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/info/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; inherit doCheck; - checkInputs = [ shellcheck ]; + nativeCheckInputs = [ shellcheck ]; checkPhase = '' shellcheck ./nix-info diff --git a/third_party/nixpkgs/pkgs/tools/nix/info/info.sh b/third_party/nixpkgs/pkgs/tools/nix/info/info.sh index c309e8be16..6ec8273504 100755 --- a/third_party/nixpkgs/pkgs/tools/nix/info/info.sh +++ b/third_party/nixpkgs/pkgs/tools/nix/info/info.sh @@ -70,7 +70,7 @@ nixev() { } desc_system() { - nixev '(import {}).stdenv.hostPlatform.system' + nixev 'builtins.currentSystem' } desc_host_os() { @@ -98,7 +98,7 @@ desc_multi_user() { } desc_nixpkgs_path() { - nixev '' + nixev '' 2>/dev/null || echo "not found" } channel_facts() { diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-init/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nix-init/default.nix new file mode 100644 index 0000000000..473830097a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nix-init/default.nix @@ -0,0 +1,60 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, makeWrapper +, pkg-config +, zstd +, stdenv +, darwin +, nix +, nurl +, callPackage +, spdx-license-list-data +}: + +rustPlatform.buildRustPackage rec { + pname = "nix-init"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "nix-community"; + repo = "nix-init"; + rev = "v${version}"; + hash = "sha256-97aAlH03H8xTVhp45FwecNb7i/ZUtJG9OOYBx8Sf+YI="; + }; + + cargoHash = "sha256-uvn1cP6aIxfPKG/QLtHBd6fHjl7JNRtkZ4gIG2tpHVg="; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + pkg-config + ]; + + buildInputs = [ + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + postInstall = '' + wrapProgram $out/bin/nix-init \ + --prefix PATH : ${lib.makeBinPath [ nix nurl ]} + installManPage artifacts/nix-init.1 + installShellCompletion artifacts/nix-init.{bash,fish} --zsh artifacts/_nix-init + ''; + + GEN_ARTIFACTS = "artifacts"; + NIX_LICENSES = callPackage ./license.nix { }; + SPDX_LICENSE_LIST_DATA = "${spdx-license-list-data.json}/json/details"; + ZSTD_SYS_USE_PKG_CONFIG = true; + + meta = with lib; { + description = "Command line tool to generate Nix packages from URLs"; + homepage = "https://github.com/nix-community/nix-init"; + changelog = "https://github.com/nix-community/nix-init/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-init/license.nix b/third_party/nixpkgs/pkgs/tools/nix/nix-init/license.nix new file mode 100644 index 0000000000..28e798645d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nix-init/license.nix @@ -0,0 +1,23 @@ +# vendored from src/licenses.nix + +{ lib, writeText }: + +let + inherit (builtins) concatLists concatStringsSep length; + inherit (lib) flip licenses mapAttrsToList optional; + + inserts = concatLists + (flip mapAttrsToList licenses + (k: v: optional (v ? spdxId) '' xs.insert("${v.spdxId}", "${k}");'')); +in + +writeText "license.rs" '' + fn get_nix_licenses() -> rustc_hash::FxHashMap<&'static str, &'static str> { + let mut xs = std::collections::HashMap::with_capacity_and_hasher( + ${toString (length inserts)}, + Default::default(), + ); + ${concatStringsSep "\n " inserts} + xs + } +'' diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix new file mode 100644 index 0000000000..55bbbd9ffa --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, python3 +, python3Minimal +}: + +let + # python3Minimal can't be overridden with packages on Darwin, due to a missing framework. + # Instead of modifying stdenv, we take the easy way out, since most people on Darwin will + # just be hacking on the Nixpkgs manual (which also uses make-options-doc). + python = ((if stdenv.isDarwin then python3 else python3Minimal).override { + self = python; + includeSiteCustomize = true; + }); + + # TODO add our own small test suite, maybe add tests for these deps to channels? + markdown-it-py-no-tests = python.pkgs.markdown-it-py.override { + disableTests = true; + }; + mdit-py-plugins-no-tests = python.pkgs.mdit-py-plugins.override { + markdown-it-py = markdown-it-py-no-tests; + disableTests = true; + }; +in + +python.pkgs.buildPythonApplication { + pname = "nixos-render-docs"; + version = "0.0"; + format = "pyproject"; + + src = lib.cleanSourceWith { + filter = name: type: + lib.cleanSourceFilter name type + && ! (type == "directory" + && builtins.elem + (baseNameOf name) + [ + ".pytest_cache" + ".mypy_cache" + "__pycache__" + ]); + src = ./src; + }; + + nativeBuildInputs = [ + python.pkgs.setuptools + python.pkgs.pytestCheckHook + ]; + + propagatedBuildInputs = [ + markdown-it-py-no-tests + mdit-py-plugins-no-tests + python.pkgs.frozendict + ]; + + pytestFlagsArray = [ "-vvrP" "tests/" ]; + + meta = with lib; { + description = "Renderer for NixOS manual and option docs"; + license = licenses.mit; + maintainers = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py new file mode 100644 index 0000000000..5af13267b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/__init__.py @@ -0,0 +1,24 @@ +import argparse +import os +import sys +from typing import Any, Dict + +from .md import Converter +from . import manual +from . import options + +def main() -> None: + parser = argparse.ArgumentParser(description='render nixos manual bits') + + commands = parser.add_subparsers(dest='command', required=True) + + options.build_cli(commands.add_parser('options')) + manual.build_cli(commands.add_parser('manual')) + + args = parser.parse_args() + if args.command == 'options': + options.run_cli(args) + elif args.command == 'manual': + manual.run_cli(args) + else: + raise RuntimeError('command not hooked up', args) diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py new file mode 100644 index 0000000000..bad36e57a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/docbook.py @@ -0,0 +1,254 @@ +from collections.abc import Mapping, MutableMapping, Sequence +from frozendict import frozendict # type: ignore[attr-defined] +from typing import Any, cast, Optional, NamedTuple + +import markdown_it +from markdown_it.token import Token +from markdown_it.utils import OptionsDict +from xml.sax.saxutils import escape, quoteattr + +from .md import Renderer + +_xml_id_translate_table = { + ord('*'): ord('_'), + ord('<'): ord('_'), + ord(' '): ord('_'), + ord('>'): ord('_'), + ord('['): ord('_'), + ord(']'): ord('_'), + ord(':'): ord('_'), + ord('"'): ord('_'), +} +def make_xml_id(s: str) -> str: + return s.translate(_xml_id_translate_table) + +class Deflist: + has_dd = False + +class Heading(NamedTuple): + container_tag: str + level: int + +class DocBookRenderer(Renderer): + __output__ = "docbook" + _link_tags: list[str] + _deflists: list[Deflist] + _headings: list[Heading] + + def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None): + super().__init__(manpage_urls, parser) + self._link_tags = [] + self._deflists = [] + self._headings = [] + + def render(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + result = super().render(tokens, options, env) + result += self._close_headings(None, env) + return result + def renderInline(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + # HACK to support docbook links and xrefs. link handling is only necessary because the docbook + # manpage stylesheet converts - in urls to a mathematical minus, which may be somewhat incorrect. + for i, token in enumerate(tokens): + if token.type != 'link_open': + continue + token.tag = 'link' + # turn [](#foo) into xrefs + if token.attrs['href'][0:1] == '#' and tokens[i + 1].type == 'link_close': # type: ignore[index] + token.tag = "xref" + # turn into links without contents + if tokens[i + 1].type == 'text' and tokens[i + 1].content == token.attrs['href']: + tokens[i + 1].content = '' + + return super().renderInline(tokens, options, env) + + def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return escape(token.content) + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "\n" + def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + # should check options.breaks() and emit hard break if so + return "\n" + def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"{escape(token.content)}" + def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"{escape(token.content)}" + def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._link_tags.append(token.tag) + href = cast(str, token.attrs['href']) + (attr, start) = ('linkend', 1) if href[0] == '#' else ('xlink:href', 0) + return f"<{token.tag} {attr}={quoteattr(href[start:])}>" + def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"" + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "\n" + # HACK open and close para for docbook change size. remove soon. + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + spacing = ' spacing="compact"' if token.attrs.get('compact', False) else '' + return f"\n" + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "\n" + def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + info = f" language={quoteattr(token.info)}" if token.info != "" else "" + return f"{escape(token.content)}" + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "
" + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "
" + def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + # markdown-it emits tokens based on the html syntax tree, but docbook is + # slightly different. html has
{
{
}}
, + # docbook has {} + # we have to reject multiple definitions for the same term for time being. + def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._deflists.append(Deflist()) + return "" + def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._deflists.pop() + return "" + def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + self._deflists[-1].has_dd = False + return "" + def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + if self._deflists[-1].has_dd: + raise Exception("multiple definitions per term not supported") + self._deflists[-1].has_dd = True + return "" + def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "" + def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + if token.meta['name'] == 'command': + return f"{escape(token.content)}" + if token.meta['name'] == 'file': + return f"{escape(token.content)}" + if token.meta['name'] == 'var': + return f"{escape(token.content)}" + if token.meta['name'] == 'env': + return f"{escape(token.content)}" + if token.meta['name'] == 'option': + return f"" + if token.meta['name'] == 'manpage': + [page, section] = [ s.strip() for s in token.content.rsplit('(', 1) ] + section = section[:-1] + man = f"{page}({section})" + title = f"{escape(page)}" + vol = f"{escape(section)}" + ref = f"{title}{vol}" + if man in self._manpage_urls: + return f"{ref}" + else: + return ref + raise NotImplementedError("md node not supported yet", token) + def inline_anchor(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f'' + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + start = f' startingnumber="{token.attrs["start"]}"' if 'start' in token.attrs else "" + spacing = ' spacing="compact"' if token.attrs.get('compact', False) else '' + return f"" + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"" + def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + hlevel = int(token.tag[1:]) + result = self._close_headings(hlevel, env) + (tag, attrs) = self._heading_tag(token, tokens, i, options, env) + self._headings.append(Heading(tag, hlevel)) + attrs_str = "".join([ f" {k}={quoteattr(v)}" for k, v in attrs.items() ]) + return result + f'<{tag}{attrs_str}>\n' + def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return '' + + def _close_headings(self, level: Optional[int], env: MutableMapping[str, Any]) -> str: + # we rely on markdown-it producing h{1..6} tags in token.tag for this to work + result = [] + while len(self._headings): + if level is None or self._headings[-1].level >= level: + result.append(f"") + self._headings.pop() + else: + break + return "\n".join(result) + + def _heading_tag(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> tuple[str, dict[str, str]]: + attrs = {} + if id := token.attrs.get('id'): + attrs['xml:id'] = cast(str, id) + return ("section", attrs) diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py new file mode 100644 index 0000000000..361bc08778 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/manual.py @@ -0,0 +1,143 @@ +import argparse +import json + +from abc import abstractmethod +from collections.abc import MutableMapping, Sequence +from typing import Any, cast, NamedTuple, Optional, Union +from xml.sax.saxutils import escape, quoteattr +from markdown_it.token import Token +from markdown_it.utils import OptionsDict + +from .docbook import DocBookRenderer +from .md import Converter + +class RenderedSection: + id: Optional[str] + chapters: list[str] + + def __init__(self, id: Optional[str]) -> None: + self.id = id + self.chapters = [] + +class BaseConverter(Converter): + _sections: list[RenderedSection] + + def __init__(self, manpage_urls: dict[str, str]): + super().__init__(manpage_urls) + self._sections = [] + + def add_section(self, id: Optional[str], chapters: list[str]) -> None: + self._sections.append(RenderedSection(id)) + for content in chapters: + self._md.renderer._title_seen = False # type: ignore[attr-defined] + self._sections[-1].chapters.append(self._render(content)) + + @abstractmethod + def finalize(self) -> str: raise NotImplementedError() + +class ManualDocBookRenderer(DocBookRenderer): + # needed to check correctness of chapters. + # we may want to use front matter instead of this kind of heuristic. + _title_seen = False + + def _heading_tag(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> tuple[str, dict[str, str]]: + (tag, attrs) = super()._heading_tag(token, tokens, i, options, env) + if self._title_seen: + if token.tag == 'h1': + raise RuntimeError("only one title heading allowed", token) + return (tag, attrs) + self._title_seen = True + return ("chapter", attrs | { + 'xmlns': "http://docbook.org/ns/docbook", + 'xmlns:xlink': "http://www.w3.org/1999/xlink", + }) + + # TODO minimize docbook diffs with existing conversions. remove soon. + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return super().paragraph_open(token, tokens, i, options, env) + "\n " + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return "\n" + super().paragraph_close(token, tokens, i, options, env) + def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return f"\n{escape(token.content)}" + def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + info = f" language={quoteattr(token.info)}" if token.info != "" else "" + return f"\n{escape(token.content)}" + +class DocBookConverter(BaseConverter): + __renderer__ = ManualDocBookRenderer + + def finalize(self) -> str: + result = [] + + for section in self._sections: + id = "id=" + quoteattr(section.id) if section.id is not None else "" + result.append(f'
') + result += section.chapters + result.append(f'
') + + return "\n".join(result) + + + +class Section: + id: Optional[str] = None + chapters: list[str] + + def __init__(self) -> None: + self.chapters = [] + +class SectionAction(argparse.Action): + def __call__(self, parser: argparse.ArgumentParser, ns: argparse.Namespace, + values: Union[str, Sequence[Any], None], opt_str: Optional[str] = None) -> None: + sections = getattr(ns, self.dest) + if sections is None: sections = [] + sections.append(Section()) + setattr(ns, self.dest, sections) + +class SectionIDAction(argparse.Action): + def __call__(self, parser: argparse.ArgumentParser, ns: argparse.Namespace, + values: Union[str, Sequence[Any], None], opt_str: Optional[str] = None) -> None: + sections = getattr(ns, self.dest) + if sections is None: raise argparse.ArgumentError(self, "no active section") + sections[-1].id = cast(str, values) + +class ChaptersAction(argparse.Action): + def __call__(self, parser: argparse.ArgumentParser, ns: argparse.Namespace, + values: Union[str, Sequence[Any], None], opt_str: Optional[str] = None) -> None: + sections = getattr(ns, self.dest) + if sections is None: raise argparse.ArgumentError(self, "no active section") + sections[-1].chapters.extend(cast(Sequence[str], values)) + +def _build_cli_db(p: argparse.ArgumentParser) -> None: + p.add_argument('--manpage-urls', required=True) + p.add_argument("outfile") + p.add_argument("--section", dest="contents", action=SectionAction, nargs=0) + p.add_argument("--section-id", dest="contents", action=SectionIDAction) + p.add_argument("--chapters", dest="contents", action=ChaptersAction, nargs='+') + +def _run_cli_db(args: argparse.Namespace) -> None: + with open(args.manpage_urls, 'r') as manpage_urls: + md = DocBookConverter(json.load(manpage_urls)) + for section in args.contents: + chapters = [] + for p in section.chapters: + with open(p, 'r') as f: + chapters.append(f.read()) + md.add_section(section.id, chapters) + with open(args.outfile, 'w') as f: + f.write(md.finalize()) + +def build_cli(p: argparse.ArgumentParser) -> None: + formats = p.add_subparsers(dest='format', required=True) + _build_cli_db(formats.add_parser('docbook')) + +def run_cli(args: argparse.Namespace) -> None: + if args.format == 'docbook': + _run_cli_db(args) + else: + raise RuntimeError('format not hooked up', args) diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py new file mode 100644 index 0000000000..c08675870f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py @@ -0,0 +1,385 @@ +from abc import ABC +from collections.abc import Mapping, MutableMapping, Sequence +from frozendict import frozendict # type: ignore[attr-defined] +from typing import Any, Callable, Optional + +import re + +from .types import RenderFn + +import markdown_it +from markdown_it.token import Token +from markdown_it.utils import OptionsDict +from mdit_py_plugins.container import container_plugin # type: ignore[attr-defined] +from mdit_py_plugins.deflist import deflist_plugin # type: ignore[attr-defined] +from mdit_py_plugins.myst_role import myst_role_plugin # type: ignore[attr-defined] + +_md_escape_table = { + ord('*'): '\\*', + ord('<'): '\\<', + ord('['): '\\[', + ord('`'): '\\`', + ord('.'): '\\.', + ord('#'): '\\#', + ord('&'): '\\&', + ord('\\'): '\\\\', +} +def md_escape(s: str) -> str: + return s.translate(_md_escape_table) + +class Renderer(markdown_it.renderer.RendererProtocol): + _admonitions: dict[str, tuple[RenderFn, RenderFn]] + _admonition_stack: list[str] + + def __init__(self, manpage_urls: Mapping[str, str], parser: Optional[markdown_it.MarkdownIt] = None): + self._manpage_urls = manpage_urls + self.rules = { + 'text': self.text, + 'paragraph_open': self.paragraph_open, + 'paragraph_close': self.paragraph_close, + 'hardbreak': self.hardbreak, + 'softbreak': self.softbreak, + 'code_inline': self.code_inline, + 'code_block': self.code_block, + 'link_open': self.link_open, + 'link_close': self.link_close, + 'list_item_open': self.list_item_open, + 'list_item_close': self.list_item_close, + 'bullet_list_open': self.bullet_list_open, + 'bullet_list_close': self.bullet_list_close, + 'em_open': self.em_open, + 'em_close': self.em_close, + 'strong_open': self.strong_open, + 'strong_close': self.strong_close, + 'fence': self.fence, + 'blockquote_open': self.blockquote_open, + 'blockquote_close': self.blockquote_close, + 'dl_open': self.dl_open, + 'dl_close': self.dl_close, + 'dt_open': self.dt_open, + 'dt_close': self.dt_close, + 'dd_open': self.dd_open, + 'dd_close': self.dd_close, + 'myst_role': self.myst_role, + "container_admonition_open": self.admonition_open, + "container_admonition_close": self.admonition_close, + "inline_anchor": self.inline_anchor, + "heading_open": self.heading_open, + "heading_close": self.heading_close, + "ordered_list_open": self.ordered_list_open, + "ordered_list_close": self.ordered_list_close, + } + + self._admonitions = { + "{.note}": (self.note_open, self.note_close), + "{.caution}": (self.caution_open,self.caution_close), + "{.tip}": (self.tip_open, self.tip_close), + "{.important}": (self.important_open, self.important_close), + "{.warning}": (self.warning_open, self.warning_close), + } + self._admonition_stack = [] + + def admonition_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + tag = token.info.strip() + self._admonition_stack.append(tag) + return self._admonitions[tag][0](token, tokens, i, options, env) + def admonition_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + return self._admonitions[self._admonition_stack.pop()][1](token, tokens, i, options, env) + + def render(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + def do_one(i: int, token: Token) -> str: + if token.type == "inline": + assert token.children is not None + return self.renderInline(token.children, options, env) + elif token.type in self.rules: + return self.rules[token.type](tokens[i], tokens, i, options, env) + else: + raise NotImplementedError("md token not supported yet", token) + return "".join(map(lambda arg: do_one(*arg), enumerate(tokens))) + def renderInline(self, tokens: Sequence[Token], options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + def do_one(i: int, token: Token) -> str: + if token.type in self.rules: + return self.rules[token.type](tokens[i], tokens, i, options, env) + else: + raise NotImplementedError("md token not supported yet", token) + return "".join(map(lambda arg: do_one(*arg), enumerate(tokens))) + + def text(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def paragraph_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def paragraph_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def hardbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def softbreak(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def code_inline(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def code_block(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def link_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def link_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def list_item_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def list_item_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def bullet_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def em_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def em_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def strong_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def strong_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def fence(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def blockquote_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def blockquote_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def note_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def note_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def caution_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def caution_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def important_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def important_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def tip_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def tip_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def warning_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def warning_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dl_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dl_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dt_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dt_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dd_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def dd_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def myst_role(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def inline_anchor(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + def ordered_list_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported", token) + +def _is_escaped(src: str, pos: int) -> bool: + found = 0 + while pos >= 0 and src[pos] == '\\': + found += 1 + pos -= 1 + return found % 2 == 1 + +_INLINE_ANCHOR_PATTERN = re.compile(r"\{\s*#([\w-]+)\s*\}") + +def _inline_anchor_plugin(md: markdown_it.MarkdownIt) -> None: + def inline_anchor(state: markdown_it.rules_inline.StateInline, silent: bool) -> bool: + if state.src[state.pos] != '[': + return False + if _is_escaped(state.src, state.pos - 1): + return False + + # treat the inline span like a link label for simplicity. + label_begin = state.pos + 1 + label_end = markdown_it.helpers.parseLinkLabel(state, state.pos) + input_end = state.posMax + if label_end < 0: + return False + + # match id + match = _INLINE_ANCHOR_PATTERN.match(state.src[label_end + 1 : ]) + if not match: + return False + + if not silent: + token = state.push("inline_anchor", "", 0) # type: ignore[no-untyped-call] + token.attrs['id'] = match[1] + + state.pos = label_begin + state.posMax = label_end + state.md.inline.tokenize(state) + + state.pos = label_end + match.end() + 1 + state.posMax = input_end + return True + + md.inline.ruler.before("link", "inline_anchor", inline_anchor) + +def _inline_comment_plugin(md: markdown_it.MarkdownIt) -> None: + def inline_comment(state: markdown_it.rules_inline.StateInline, silent: bool) -> bool: + if state.src[state.pos : state.pos + 4] != '': # --> + state.pos = i + 3 + return True + + return False + + md.inline.ruler.after("autolink", "inline_comment", inline_comment) + +def _block_comment_plugin(md: markdown_it.MarkdownIt) -> None: + def block_comment(state: markdown_it.rules_block.StateBlock, startLine: int, endLine: int, + silent: bool) -> bool: + pos = state.bMarks[startLine] + state.tShift[startLine] + posMax = state.eMarks[startLine] + + if state.src[pos : pos + 4] != '': + state.line = nextLine + 1 + return True + + nextLine += 1 + + return False + + md.block.ruler.after("code", "block_comment", block_comment) + +_HEADER_ID_RE = re.compile(r"\s*\{\s*\#([\w-]+)\s*\}\s*$") + +class Converter(ABC): + __renderer__: Callable[[Mapping[str, str], markdown_it.MarkdownIt], Renderer] + + def __init__(self, manpage_urls: Mapping[str, str]): + self._manpage_urls = frozendict(manpage_urls) + + self._md = markdown_it.MarkdownIt( + "commonmark", + { + 'maxNesting': 100, # default is 20 + 'html': False, # not useful since we target many formats + 'typographer': True, # required for smartquotes + }, + renderer_cls=lambda parser: self.__renderer__(self._manpage_urls, parser) + ) + self._md.use( + container_plugin, + name="admonition", + validate=lambda name, *args: ( + name.strip() in self._md.renderer._admonitions # type: ignore[attr-defined] + ) + ) + self._md.use(deflist_plugin) + self._md.use(myst_role_plugin) + self._md.use(_inline_anchor_plugin) + self._md.use(_inline_comment_plugin) + self._md.use(_block_comment_plugin) + self._md.enable(["smartquotes", "replacements"]) + + def _post_parse(self, tokens: list[Token]) -> list[Token]: + for i in range(0, len(tokens)): + # parse header IDs. this is purposely simple and doesn't support + # classes or other inds of attributes. + if tokens[i].type == 'heading_open': + children = tokens[i + 1].children + assert children is not None + if len(children) == 0 or children[-1].type != 'text': + continue + if m := _HEADER_ID_RE.search(children[-1].content): + tokens[i].attrs['id'] = m[1] + children[-1].content = children[-1].content[:-len(m[0])].rstrip() + + # markdown-it signifies wide lists by setting the wrapper paragraphs + # of each item to hidden. this is not useful for our stylesheets, which + # signify this with a special css class on list elements instead. + wide_stack = [] + for i in range(0, len(tokens)): + if tokens[i].type in [ 'bullet_list_open', 'ordered_list_open' ]: + wide_stack.append([i, True]) + elif tokens[i].type in [ 'bullet_list_close', 'ordered_list_close' ]: + (idx, compact) = wide_stack.pop() + tokens[idx].attrs['compact'] = compact + elif len(wide_stack) > 0 and tokens[i].type == 'paragraph_open' and not tokens[i].hidden: + wide_stack[-1][1] = False + + return tokens + + def _parse(self, src: str, env: Optional[MutableMapping[str, Any]] = None) -> list[Token]: + tokens = self._md.parse(src, env if env is not None else {}) + return self._post_parse(tokens) + + def _render(self, src: str) -> str: + env: dict[str, Any] = {} + tokens = self._parse(src, env) + return self._md.renderer.render(tokens, self._md.options, env) # type: ignore[no-any-return] diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py new file mode 100644 index 0000000000..3667c7bbcd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/options.py @@ -0,0 +1,284 @@ +import argparse +import json + +from abc import abstractmethod +from collections.abc import MutableMapping, Sequence +from markdown_it.utils import OptionsDict +from markdown_it.token import Token +from typing import Any, Optional +from xml.sax.saxutils import escape, quoteattr + +from .docbook import DocBookRenderer, make_xml_id +from .md import Converter, md_escape +from .types import OptionLoc, Option, RenderedOption + +def option_is(option: Option, key: str, typ: str) -> Optional[dict[str, str]]: + if key not in option: + return None + if type(option[key]) != dict: + return None + if option[key].get('_type') != typ: # type: ignore[union-attr] + return None + return option[key] # type: ignore[return-value] + +class BaseConverter(Converter): + _options: dict[str, RenderedOption] + + def __init__(self, manpage_urls: dict[str, str], + revision: str, + document_type: str, + varlist_id: str, + id_prefix: str, + markdown_by_default: bool): + super().__init__(manpage_urls) + self._options = {} + self._revision = revision + self._document_type = document_type + self._varlist_id = varlist_id + self._id_prefix = id_prefix + self._markdown_by_default = markdown_by_default + + def _format_decl_def_loc(self, loc: OptionLoc) -> tuple[Optional[str], str]: + # locations can be either plain strings (specific to nixpkgs), or attrsets + # { name = "foo/bar.nix"; url = "https://github.com/....."; } + if isinstance(loc, str): + # Hyperlink the filename either to the NixOS github + # repository (if it’s a module and we have a revision number), + # or to the local filesystem. + if not loc.startswith('/'): + if self._revision == 'local': + href = f"https://github.com/NixOS/nixpkgs/blob/master/{loc}" + else: + href = f"https://github.com/NixOS/nixpkgs/blob/{self._revision}/{loc}" + else: + href = f"file://{loc}" + # Print the filename and make it user-friendly by replacing the + # /nix/store/ prefix by the default location of nixos + # sources. + if not loc.startswith('/'): + name = f"" + elif 'nixops' in loc and '/nix/' in loc: + name = f"" + else: + name = loc + return (href, name) + else: + return (loc['url'] if 'url' in loc else None, loc['name']) + + @abstractmethod + def _decl_def_header(self, header: str) -> list[str]: raise NotImplementedError() + + @abstractmethod + def _decl_def_entry(self, href: Optional[str], name: str) -> list[str]: raise NotImplementedError() + + @abstractmethod + def _decl_def_footer(self) -> list[str]: raise NotImplementedError() + + def _render_decl_def(self, header: str, locs: list[OptionLoc]) -> list[str]: + result = [] + result += self._decl_def_header(header) + for loc in locs: + href, name = self._format_decl_def_loc(loc) + result += self._decl_def_entry(href, name) + result += self._decl_def_footer() + return result + + def _render_code(self, option: Option, key: str) -> list[str]: + if lit := option_is(option, key, 'literalMD'): + return [ self._render(f"*{key.capitalize()}:*\n{lit['text']}") ] + elif lit := option_is(option, key, 'literalExpression'): + code = lit['text'] + # for multi-line code blocks we only have to count ` runs at the beginning + # of a line, but this is much easier. + multiline = '\n' in code + longest, current = (0, 0) + for c in code: + current = current + 1 if c == '`' else 0 + longest = max(current, longest) + # inline literals need a space to separate ticks from content, code blocks + # need newlines. inline literals need one extra tick, code blocks need three. + ticks, sep = ('`' * (longest + (3 if multiline else 1)), '\n' if multiline else ' ') + code = f"{ticks}{sep}{code}{sep}{ticks}" + return [ self._render(f"*{key.capitalize()}:*\n{code}") ] + elif key in option: + raise Exception(f"{key} has unrecognized type", option[key]) + else: + return [] + + def _render_description(self, desc: str | dict[str, str]) -> list[str]: + if isinstance(desc, str) and self._markdown_by_default: + return [ self._render(desc) ] + elif isinstance(desc, dict) and desc.get('_type') == 'mdDoc': + return [ self._render(desc['text']) ] + else: + raise Exception("description has unrecognized type", desc) + + @abstractmethod + def _related_packages_header(self) -> list[str]: raise NotImplementedError() + + def _convert_one(self, option: dict[str, Any]) -> list[str]: + result = [] + + if desc := option.get('description'): + result += self._render_description(desc) + if typ := option.get('type'): + ro = " *(read only)*" if option.get('readOnly', False) else "" + result.append(self._render(f"*Type:* {md_escape(typ)}{ro}")) + + result += self._render_code(option, 'default') + result += self._render_code(option, 'example') + + if related := option.get('relatedPackages'): + result += self._related_packages_header() + result.append(self._render(related)) + if decl := option.get('declarations'): + result += self._render_decl_def("Declared by", decl) + if defs := option.get('definitions'): + result += self._render_decl_def("Defined by", defs) + + return result + + def add_options(self, options: dict[str, Any]) -> None: + for (name, option) in options.items(): + try: + self._options[name] = RenderedOption(option['loc'], self._convert_one(option)) + except Exception as e: + raise Exception(f"Failed to render option {name}") from e + + @abstractmethod + def finalize(self) -> str: raise NotImplementedError() + +class OptionsDocBookRenderer(DocBookRenderer): + def heading_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported in options doc", token) + def heading_close(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + raise RuntimeError("md token not supported in options doc", token) + + # TODO keep optionsDocBook diff small. remove soon if rendering is still good. + def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + token.attrs['compact'] = False + return super().ordered_list_open(token, tokens, i, options, env) + def bullet_list_open(self, token: Token, tokens: Sequence[Token], i: int, options: OptionsDict, + env: MutableMapping[str, Any]) -> str: + token.attrs['compact'] = False + return super().bullet_list_open(token, tokens, i, options, env) + +class DocBookConverter(BaseConverter): + __renderer__ = OptionsDocBookRenderer + + def _render_code(self, option: dict[str, Any], key: str) -> list[str]: + if lit := option_is(option, key, 'literalDocBook'): + return [ f"{key.capitalize()}: {lit['text']}" ] + else: + return super()._render_code(option, key) + + def _render_description(self, desc: str | dict[str, Any]) -> list[str]: + if isinstance(desc, str) and not self._markdown_by_default: + return [ f"{desc}" ] + else: + return super()._render_description(desc) + + def _related_packages_header(self) -> list[str]: + return [ + "", + " Related packages:", + "", + ] + + def _decl_def_header(self, header: str) -> list[str]: + return [ + f"{header}:", + "" + ] + + def _decl_def_entry(self, href: Optional[str], name: str) -> list[str]: + if href is not None: + href = " xlink:href=" + quoteattr(href) + return [ + f"", + escape(name), + "" + ] + + def _decl_def_footer(self) -> list[str]: + return [ "" ] + + def finalize(self) -> str: + keys = list(self._options.keys()) + keys.sort(key=lambda opt: [ (0 if p.startswith("enable") else 1 if p.startswith("package") else 2, p) + for p in self._options[opt].loc ]) + + result = [] + + result.append('') + if self._document_type == 'appendix': + result += [ + '', + ' Configuration Options', + ] + result += [ + f'', + ] + + for name in keys: + id = make_xml_id(self._id_prefix + name) + result += [ + "", + # NOTE adding extra spaces here introduces spaces into xref link expansions + (f"" + + f""), + "" + ] + result += self._options[name].lines + result += [ + "", + "" + ] + + result.append("") + if self._document_type == 'appendix': + result.append("") + + return "\n".join(result) + +def _build_cli_db(p: argparse.ArgumentParser) -> None: + p.add_argument('--manpage-urls', required=True) + p.add_argument('--revision', required=True) + p.add_argument('--document-type', required=True) + p.add_argument('--varlist-id', required=True) + p.add_argument('--id-prefix', required=True) + p.add_argument('--markdown-by-default', default=False, action='store_true') + p.add_argument("infile") + p.add_argument("outfile") + +def _run_cli_db(args: argparse.Namespace) -> None: + with open(args.manpage_urls, 'r') as manpage_urls: + md = DocBookConverter( + json.load(manpage_urls), + revision = args.revision, + document_type = args.document_type, + varlist_id = args.varlist_id, + id_prefix = args.id_prefix, + markdown_by_default = args.markdown_by_default) + + with open(args.infile, 'r') as f: + md.add_options(json.load(f)) + with open(args.outfile, 'w') as f: + f.write(md.finalize()) + +def build_cli(p: argparse.ArgumentParser) -> None: + formats = p.add_subparsers(dest='format', required=True) + _build_cli_db(formats.add_parser('docbook')) + +def run_cli(args: argparse.Namespace) -> None: + if args.format == 'docbook': + _run_cli_db(args) + else: + raise RuntimeError('format not hooked up', args) diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py new file mode 100644 index 0000000000..7814b3a485 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/types.py @@ -0,0 +1,13 @@ +from collections.abc import Sequence, MutableMapping +from typing import Any, Callable, Optional, Tuple, NamedTuple + +from markdown_it.token import Token +from markdown_it.utils import OptionsDict + +OptionLoc = str | dict[str, str] +Option = dict[str, str | dict[str, str] | list[OptionLoc]] + +RenderedOption = NamedTuple('RenderedOption', [('loc', list[str]), + ('lines', list[str])]) + +RenderFn = Callable[[Token, Sequence[Token], int, OptionsDict, MutableMapping[str, Any]], str] diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/pyproject.toml b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/pyproject.toml new file mode 100644 index 0000000000..d66643ef84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/pyproject.toml @@ -0,0 +1,15 @@ +[project] +name = "nixos-render-docs" +version = "0.0" +description = "Renderer for NixOS manual and option docs" +classifiers = [ + "Programming Language :: Python :: 3", + "License :: OSI Approved :: MIT License", + "Operating System :: OS Independent", +] + +[project.scripts] +nixos-render-docs = "nixos_render_docs:main" + +[build-system] +requires = ["setuptools"] diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py new file mode 100644 index 0000000000..0b73cdc8e7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_headings.py @@ -0,0 +1,102 @@ +import nixos_render_docs + +from markdown_it.token import Token + +class Converter(nixos_render_docs.md.Converter): + # actual renderer doesn't matter, we're just parsing. + __renderer__ = nixos_render_docs.docbook.DocBookRenderer + +def test_heading_id_absent() -> None: + c = Converter({}) + assert c._parse("# foo") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo', markup='', info='', meta={}, block=False, hidden=False) + ], + content='foo', markup='', info='', meta={}, block=True, hidden=False), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + +def test_heading_id_present() -> None: + c = Converter({}) + assert c._parse("# foo {#foo}\n## bar { #bar}\n### bal { #bal} ") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={'id': 'foo'}, map=[0, 1], level=0, + children=None, content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo {#foo}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='heading_open', tag='h2', nesting=1, attrs={'id': 'bar'}, map=[1, 2], level=0, + children=None, content='', markup='##', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[1, 2], level=1, + content='bar { #bar}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='bar', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h2', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='##', info='', meta={}, block=True, hidden=False), + Token(type='heading_open', tag='h3', nesting=1, attrs={'id': 'bal'}, map=[2, 3], level=0, + children=None, content='', markup='###', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[2, 3], level=1, + content='bal { #bal}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='bal', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h3', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='###', info='', meta={}, block=True, hidden=False) + ] + +def test_heading_id_incomplete() -> None: + c = Converter({}) + assert c._parse("# foo {#}") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo {#}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo {#}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + +def test_heading_id_double() -> None: + c = Converter({}) + assert c._parse("# foo {#a} {#b}") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={'id': 'b'}, map=[0, 1], level=0, + children=None, content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo {#a} {#b}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo {#a}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + +def test_heading_id_suffixed() -> None: + c = Converter({}) + assert c._parse("# foo {#a} s") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo {#a} s', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo {#a} s', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py new file mode 100644 index 0000000000..0f5d284073 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_lists.py @@ -0,0 +1,182 @@ +import nixos_render_docs +import pytest + +from markdown_it.token import Token + +class Converter(nixos_render_docs.md.Converter): + # actual renderer doesn't matter, we're just parsing. + __renderer__ = nixos_render_docs.docbook.DocBookRenderer + +@pytest.mark.parametrize("ordered", [True, False]) +def test_list_wide(ordered: bool) -> None: + t, tag, m, e1, e2, i1, i2 = ( + ("ordered", "ol", ".", "1.", "2.", "1", "2") if ordered else ("bullet", "ul", "-", "-", "-", "", "") + ) + c = Converter({}) + assert c._parse(f"{e1} a\n\n{e2} b") == [ + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={'compact': False}, map=[0, 3], level=0, + children=None, content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 2], level=1, children=None, + content='', markup=m, info=i1, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=3, + content='a', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[2, 3], level=1, children=None, + content='', markup=m, info=i2, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[2, 3], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[2, 3], level=3, + content='b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_close', tag=tag, nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False) + ] + +@pytest.mark.parametrize("ordered", [True, False]) +def test_list_narrow(ordered: bool) -> None: + t, tag, m, e1, e2, i1, i2 = ( + ("ordered", "ol", ".", "1.", "2.", "1", "2") if ordered else ("bullet", "ul", "-", "-", "-", "", "") + ) + c = Converter({}) + assert c._parse(f"{e1} a\n{e2} b") == [ + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={'compact': True}, map=[0, 2], level=0, + children=None, content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=1, children=None, + content='', markup=m, info=i1, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=3, + content='a', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[1, 2], level=1, children=None, + content='', markup=m, info=i2, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[1, 2], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[1, 2], level=3, + content='b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_close', tag=tag, nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False) + ] + assert c._parse(f"{e1} - a\n{e2} b") == [ + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={'compact': True}, map=[0, 2], level=0, + children=None, content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=1, children=None, + content='', markup=m, info=i1, meta={}, block=True, hidden=False), + Token(type='bullet_list_open', tag='ul', nesting=1, attrs={'compact': True}, map=[0, 1], level=2, + children=None, content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=5, + content='a', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='bullet_list_close', tag='ul', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[1, 2], level=1, children=None, + content='', markup=m, info=i2, meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[1, 2], level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[1, 2], level=3, + content='b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_close', tag=tag, nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False) + ] + assert c._parse(f"{e1} - a\n{e2} - b") == [ + Token(type=f'{t}_list_open', tag=tag, nesting=1, attrs={'compact': True}, map=[0, 2], level=0, + children=None, content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=1, children=None, + content='', markup=m, info=i1, meta={}, block=True, hidden=False), + Token(type='bullet_list_open', tag='ul', nesting=1, attrs={'compact': True}, map=[0, 1], level=2, + children=None, content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[0, 1], level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=5, + content='a', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='bullet_list_close', tag='ul', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[1, 2], level=1, children=None, + content='', markup=m, info=i2, meta={}, block=True, hidden=False), + Token(type='bullet_list_open', tag='ul', nesting=1, attrs={'compact': True}, map=[1, 2], level=2, + children=None, content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_open', tag='li', nesting=1, attrs={}, map=[1, 2], level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[1, 2], level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='inline', tag='', nesting=0, attrs={}, map=[1, 2], level=5, + content='b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=4, children=None, + content='', markup='', info='', meta={}, block=True, hidden=True), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=3, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='bullet_list_close', tag='ul', nesting=-1, attrs={}, map=None, level=2, children=None, + content='', markup='-', info='', meta={}, block=True, hidden=False), + Token(type='list_item_close', tag='li', nesting=-1, attrs={}, map=None, level=1, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False), + Token(type=f'{t}_list_close', tag=tag, nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup=m, info='', meta={}, block=True, hidden=False) + ] diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py new file mode 100644 index 0000000000..5a02fabde0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_options.py @@ -0,0 +1,14 @@ +import nixos_render_docs + +from markdown_it.token import Token +import pytest + +def test_option_headings() -> None: + c = nixos_render_docs.options.DocBookConverter({}, 'local', 'none', 'vars', 'opt-', False) + with pytest.raises(RuntimeError) as exc: + c._render("# foo") + assert exc.value.args[0] == 'md token not supported in options doc' + assert exc.value.args[1] == Token( + type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False + ) diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py new file mode 100644 index 0000000000..4efcb9bdfc --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-render-docs/src/tests/test_plugins.py @@ -0,0 +1,279 @@ +import nixos_render_docs + +from markdown_it.token import Token + +class Converter(nixos_render_docs.md.Converter): + # actual renderer doesn't matter, we're just parsing. + __renderer__ = nixos_render_docs.docbook.DocBookRenderer + +def test_inline_anchor_simple() -> None: + c = Converter({}) + assert c._parse("[]{#test}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, content='[]{#test}', + markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'test'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_anchor_formatted() -> None: + c = Converter({}) + assert c._parse("a[b c `d` ***e***]{#test}f") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, + children=None, content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='a[b c `d` ***e***]{#test}f', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, + children=None, content='a', markup='', info='', meta={}, block=False, hidden=False), + Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'test'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='b c ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='code_inline', tag='code', nesting=0, attrs={}, map=None, level=0, + children=None, content='d', markup='`', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='em_open', tag='em', nesting=1, attrs={}, map=None, level=0, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='strong_open', tag='strong', nesting=1, attrs={}, map=None, level=1, + children=None, content='', markup='**', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=2, children=None, + content='e', markup='', info='', meta={}, block=False, hidden=False), + Token(type='strong_close', tag='strong', nesting=-1, attrs={}, map=None, level=1, + children=None, content='', markup='**', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='em_close', tag='em', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='f', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_anchor_in_heading() -> None: + c = Converter({}) + # inline anchors in headers are allowed, but header attributes should be preferred + assert c._parse("# foo []{#bar} baz") == [ + Token(type='heading_open', tag='h1', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='foo []{#bar} baz', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='foo ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'bar'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content=' baz', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='heading_close', tag='h1', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='#', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_anchor_on_links() -> None: + c = Converter({}) + assert c._parse("[ [a](#bar) ]{#foo}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, content='[ [a](#bar) ]{#foo}', + markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'foo'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='link_open', tag='a', nesting=1, attrs={'href': '#bar'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False), + Token(type='link_close', tag='a', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_anchor_nested() -> None: + # inline anchors may contain more anchors (even though this is a bit pointless) + c = Converter({}) + assert c._parse("[ [a]{#bar} ]{#foo}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='[ [a]{#bar} ]{#foo}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'foo'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content=' ', markup='', info='', meta={}, block=False, hidden=False), + Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'bar'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a ', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_anchor_escaping() -> None: + c = Converter({}) + assert c._parse("\\[a]{#bar}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='[a]{#bar}', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("\\\\[a]{#bar}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='\\\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='\\', markup='', info='', meta={}, block=False, hidden=False), + Token(type='inline_anchor', tag='', nesting=0, attrs={'id': 'bar'}, map=None, level=0, + children=None, content='', markup='', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("\\\\\\[a]{#bar}") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='\\[a]{#bar}', markup='', info='', meta={}, block=False, hidden=False) + ], + content='\\\\\\[a]{#bar}', markup='', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_comment_basic() -> None: + c = Converter({}) + assert c._parse("a b") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='a b', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a b', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("a") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='a', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_comment_does_not_nest_in_code() -> None: + c = Converter({}) + assert c._parse("`ac`") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='`ac`', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='code_inline', tag='code', nesting=0, attrs={}, map=None, level=0, children=None, + content='ac', markup='`', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_comment_does_not_nest_elsewhere() -> None: + c = Converter({}) + assert c._parse("*ac*") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='*ac*', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='em_open', tag='em', nesting=1, attrs={}, map=None, level=0, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False), + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=1, children=None, + content='ac', markup='', info='', meta={}, block=False, hidden=False), + Token(type='em_close', tag='em', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='*', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_inline_comment_can_be_escaped() -> None: + c = Converter({}) + assert c._parse("a\\c") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + content='a\\c', markup='', info='', meta={}, block=True, hidden=False, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='ac', markup='', info='', meta={}, block=False, hidden=False) + ]), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("a\\\\c") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a\\c', markup='', info='', meta={}, block=False, hidden=False) + ], + content='a\\\\c', markup='', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + assert c._parse("a\\\\\\c") == [ + Token(type='paragraph_open', tag='p', nesting=1, attrs={}, map=[0, 1], level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False), + Token(type='inline', tag='', nesting=0, attrs={}, map=[0, 1], level=1, + children=[ + Token(type='text', tag='', nesting=0, attrs={}, map=None, level=0, children=None, + content='a\\c', markup='', info='', meta={}, block=False, hidden=False) + ], + content='a\\\\\\c', markup='', info='', meta={}, block=True, hidden=False), + Token(type='paragraph_close', tag='p', nesting=-1, attrs={}, map=None, level=0, children=None, + content='', markup='', info='', meta={}, block=True, hidden=False) + ] + +def test_block_comment() -> None: + c = Converter({}) + assert c._parse("") == [] + assert c._parse("") == [] + assert c._parse("") == [] + assert c._parse("") == [] + assert c._parse("") == [] diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-hammering/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-hammering/default.nix new file mode 100644 index 0000000000..8cec4597d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-hammering/default.nix @@ -0,0 +1,63 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, stdenv +, makeWrapper +, python3 +, nix +}: + +let + version = "unstable-2022-11-15"; + + src = fetchFromGitHub { + owner = "jtojnar"; + repo = "nixpkgs-hammering"; + rev = "1b038ef38fececb39b65a4cdfa7273ed9d9359b4"; + hash = "sha256-5wZGGTahP1Tlu+WAgGx8Q9YnnHtyhfScl9j6X3W+Toc="; + }; + + meta = with lib; { + description = "A set of nit-picky rules that aim to point out and explain common mistakes in nixpkgs package pull requests"; + homepage = "https://github.com/jtojnar/nixpkgs-hammering"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; + + rust-checks = rustPlatform.buildRustPackage { + pname = "nixpkgs-hammering-rust-checks"; + inherit version src meta; + sourceRoot = "${src.name}/rust-checks"; + cargoHash = "sha256-YiC9mts6h15ZGdLKKmCVNNdTWDPtbDF0J5pwtjc6YKM="; + }; +in + +stdenv.mkDerivation { + pname = "nixpkgs-hammering"; + + inherit version src; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ python3 ]; + + installPhase = '' + runHook preInstall + + AST_CHECK_NAMES=$(find ${rust-checks}/bin -maxdepth 1 -type f -printf "%f:") + + install -Dt $out/bin tools/nixpkgs-hammer + wrapProgram $out/bin/nixpkgs-hammer \ + --prefix PATH : ${lib.makeBinPath [ nix rust-checks ]} \ + --set AST_CHECK_NAMES ''${AST_CHECK_NAMES%:} + + cp -r lib overlays $out + + runHook postInstall + ''; + + meta = meta // { + mainProgram = "nixpkgs-hammer"; + }; +} + diff --git a/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix index c923b5a058..db114d6b98 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.12.10"; + version = "2.12.11"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "sha256-VKgnnrEG1cx4cx6StWh+XaCe5meSU9LqZRH1ElMQkfk="; + sha256 = "sha256-vhEjzCuMvMZmzkCQK25JG3tT33KnX2fJbqdaTaeuhgo="; }; nativeBuildInputs = [ pkg-config scdoc ] diff --git a/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix index 9f18772466..121f06ba89 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { "--prefix" "PATH" ":" (lib.makeBinPath [ gitMinimal rpm dpkg fakeroot ]) ]; - checkInputs = with python3Packages; [ pytest ]; + nativeCheckInputs = with python3Packages; [ pytest ]; checkPhase = '' runHook preCheck py.test # inspiration: .gitlab-ci.yml diff --git a/third_party/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix index 151566ba8e..556b96ea20 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/appimagekit/default.nix @@ -109,7 +109,7 @@ in stdenv.mkDerivation rec { --unset SOURCE_DATE_EPOCH ''; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; # for debugging passthru = { diff --git a/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix index cad54499e3..e4edd20221 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "apt"; - version = "2.5.4"; + version = "2.5.5"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz"; - hash = "sha256-fFD2P6j4sozee0UFXfFok304LyiwBF1RM4KbcGNu+HI="; + hash = "sha256-cR0ixSnvyj6ZQ9rZielxXr8JfmMJKNru3S++WH4O/YU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/apx/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/apx/default.nix new file mode 100644 index 0000000000..77fed6e67e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/apx/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, installShellFiles +, docker +, distrobox +}: + +buildGoModule rec { + pname = "apx"; + version = "1.4.2"; + + src = fetchFromGitHub { + owner = "Vanilla-OS"; + repo = pname; + rev = version; + sha256 = "sha256-BswX4Jo/RReM/tXo29V9rIvKjN8ylECPe0oo0FCQcGY="; + }; + + vendorSha256 = null; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ + makeWrapper + installShellFiles + ]; + + postInstall = '' + mkdir -p $out/etc/apx + + cat > "$out/etc/apx/config.json" <=1.5.1,<2" "pynetdicom>=2,<3" \ - --replace "cryptography>=3.0,<4" "cryptography>=35,<40" \ - --replace "python-can>=3.3.3,<4" "python-can>=3.3.3,<5" \ - --replace "pyparsing>=2.4.7,<3" "pyparsing>=2.4.7,<4" \ - --replace "zeroconf>=0.30,<0.40" "zeroconf" - ''; - # Project has no tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/third_party/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix index 7b571380b3..dc05255bc7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { websockets ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-asyncio pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix b/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix index 6416adec0e..c301a90a55 100644 --- a/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix @@ -55,7 +55,7 @@ py.pkgs.buildPythonPackage rec { vivisect ] ++ viv-utils.optional-dependencies.flirt; - checkInputs = with py.pkgs; [ + nativeCheckInputs = with py.pkgs; [ pytest-sugar pytestCheckHook pyyaml diff --git a/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix b/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix index 125cab6b3f..76b71e24ac 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { libfprint ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ gobject-introspection # for setup hook python-dbusmock dbus-python diff --git a/third_party/nixpkgs/pkgs/tools/security/fulcio/default.nix b/third_party/nixpkgs/pkgs/tools/security/fulcio/default.nix index d099cd2c0d..91ec0a5c25 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fulcio/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "0.6.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZWDvFSx+zH/P0ZfdqxAe+c4jFUH8mfY1vpUXlIxw1sI="; + sha256 = "sha256-djnDHRD/vHfsem03896qcEb6uzgW3OCMBLqMDHca9vY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-LLvaaOZzp9b99eYOsfvbPRwZqSNfoinVUfYDmPiw5Mk="; + vendorSha256 = "sha256-X+M/E1kWhgS408PHwMg5jnDn2ad1NW6xvlLucuOLAeg="; nativeBuildInputs = [ installShellFiles ]; @@ -29,14 +29,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/sigstore/fulcio/pkg/server.gitVersion=v${version}" - "-X github.com/sigstore/fulcio/pkg/server.gitTreeState=clean" + "-X sigs.k8s.io/release-utils/version.gitVersion=v${version}" + "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" ]; # ldflags based on metadata from git and source preBuild = '' - ldflags+=" -X github.com/sigstore/fulcio/pkg/server.gitCommit=$(cat COMMIT)" - ldflags+=" -X github.com/sigstore/fulcio/pkg/server.buildDate=$(cat SOURCE_DATE_EPOCH)" + ldflags+=" -X sigs.k8s.io/release-utils/version.gitCommit=$(cat COMMIT)" + ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; preCheck = '' @@ -59,7 +59,7 @@ buildGoModule rec { installCheckPhase = '' runHook preInstallCheck $out/bin/fulcio --help - $out/bin/fulcio version | grep "v${version}" + $out/bin/fulcio version 2>&1 | grep "v${version}" runHook postInstallCheck ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/gallia/default.nix b/third_party/nixpkgs/pkgs/tools/security/gallia/default.nix index 785f6aae9f..f86d807d43 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gallia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gallia/default.nix @@ -2,18 +2,19 @@ , stdenv , fetchFromGitHub , python3 +, cacert }: python3.pkgs.buildPythonApplication rec { pname = "gallia"; - version = "1.0.3"; + version = "1.1.4"; format = "pyproject"; src = fetchFromGitHub { owner = "Fraunhofer-AISEC"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CoZ3niGuEjcaSyIGc0MIy95v64nTbhgqW/0uz4a/f1o="; + hash = "sha256-McHzHK404kDB992T2f84dZHDxujpPIz4qglYMmv3kTw="; }; nativeBuildInputs = with python3.pkgs; [ @@ -29,21 +30,18 @@ python3.pkgs.buildPythonApplication rec { construct msgspec pydantic + pygit2 tabulate - tomlkit - xdg + tomli zstandard ]; - checkInputs = with python3.pkgs; [ - pytestCheckHook - ]; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'aiofiles = "^0.8.0"' 'aiofiles = ">=0.8.0"' \ - --replace 'zstandard = "^0.17.0"' 'zstandard = "*"' - ''; + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + pytest-asyncio + ]; pythonImportsCheck = [ "gallia" @@ -54,10 +52,10 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with lib; { - description = "Pentesting framework with the focus on the automotive domain"; + description = "Extendable Pentesting Framework for the Automotive Domain"; homepage = "https://github.com/Fraunhofer-AISEC/gallia"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; + maintainers = with maintainers; [ fab rumpelsepp ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/gitjacker/default.nix b/third_party/nixpkgs/pkgs/tools/security/gitjacker/default.nix index 14d9ab9ccf..05bdb2b173 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gitjacker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gitjacker/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { propagatedBuildInputs = [ git ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; doCheck = !stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix index 607920e030..adae987301 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.15.2"; + version = "8.15.3"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - hash = "sha256-3hDAkKuKBp3Q61rDWXy4NWgOteSQAjcdom0GzM35hlc="; + hash = "sha256-eY4RqXDeEsriSdVtEQQKw3NPBOe/UzhXjh1TkW3fWp0="; }; vendorHash = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE="; diff --git a/third_party/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/third_party/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix index 22c11b3f2b..f7c22cddb5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gnupg-pkcs11-scd/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { gnupg-pkcs11 is a project to implement a BSD-licensed smart-card daemon to enable the use of PKCS#11 tokens with GnuPG. ''; - homepage = "http://gnupg-pkcs11.sourceforge.net/"; + homepage = "https://gnupg-pkcs11.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ matthiasbeyer philandstuff ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix b/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix index 64e454b22d..8b68fedd59 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gotrue/supabase.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotrue"; - version = "2.41.0"; + version = "2.42.0"; src = fetchFromGitHub { owner = "supabase"; repo = pname; rev = "v${version}"; - hash = "sha256-LqVFKpDlUqkjurFmeZ2YCuF3W1V3R5Dnw/5k1O0qjSc="; + hash = "sha256-ZLonPW7lXaBE039R21DWjRBa7xxRnH9rTNu4PDNOWoY="; }; vendorHash = "sha256-3dXfg9tblPx9V5LzzVm3UtCwGcPIAm2MaKm9JQi69mU="; diff --git a/third_party/nixpkgs/pkgs/tools/security/graphinder/default.nix b/third_party/nixpkgs/pkgs/tools/security/graphinder/default.nix index ce9ccc7079..f0256dff7c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/graphinder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/graphinder/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix index 862cde157a..9b3a9a44d9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "grype"; - version = "0.55.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-Y72h1YCf42RinGw2mKZb8Bz8ip+LUW377xwJht67Q1s="; + hash = "sha256-xNv4pI6iT6lNmjeUIW8ObPFJw9H1SiVTg9fRx6Osiwc="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorHash = "sha256-xzBOZyzwxVFTFgtmu7DLBpdkV9bwzJ9RETkdyV2HtQo="; + vendorHash = "sha256-Sez5jNFdL11cHBBPcY0b8qUiupmjPo9MHwUUi7FaNiA="; nativeBuildInputs = [ installShellFiles @@ -55,7 +55,7 @@ buildGoModule rec { ldflags+=" -X github.com/anchore/grype/internal/version.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; - checkInputs = [ openssl ]; + nativeCheckInputs = [ openssl ]; preCheck = '' # test all dirs (except excluded) unset subPackages diff --git a/third_party/nixpkgs/pkgs/tools/security/ioccheck/default.nix b/third_party/nixpkgs/pkgs/tools/security/ioccheck/default.nix index fb5c887a8b..be50d64832 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ioccheck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ioccheck/default.nix @@ -66,7 +66,7 @@ buildPythonApplication rec { vt-py ]; - checkInputs = with py.pkgs; [ + nativeCheckInputs = with py.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/john/default.nix b/third_party/nixpkgs/pkgs/tools/security/john/default.nix index 8409bd8d2b..745b027a05 100644 --- a/third_party/nixpkgs/pkgs/tools/security/john/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/john/default.nix @@ -2,8 +2,6 @@ , gcc, python3Packages, perl, perlPackages, makeWrapper, fetchpatch }: -with lib; - stdenv.mkDerivation rec { pname = "john"; version = "1.9.0-jumbo-1"; @@ -83,7 +81,7 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with lib; { description = "John the Ripper password cracker"; license = licenses.gpl2Plus; homepage = "https://github.com/openwall/john/"; diff --git a/third_party/nixpkgs/pkgs/tools/security/kestrel/default.nix b/third_party/nixpkgs/pkgs/tools/security/kestrel/default.nix index 16f3a4f52a..69622b71e0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kestrel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kestrel/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "kestrel"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "finfet"; repo = pname; rev = "v${version}"; - hash = "sha256-aJKqx/PY7BanzE5AtqmKxvkULgXXqueGnDniLd9tHOg="; + hash = "sha256-kEM81HIfWETVrUiqXu1+3az+Stg3GdjHE7FaxXJgNYk="; }; - cargoHash = "sha256-UnXaDdQzoYP1N2FnLjOQgiJKnCyCojXKKxVlWYZT0DE="; + cargoHash = "sha256-xv35oFawFLVXZS3Eum6RCo8LcVvHftfv+UvJYYmIDx4="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix b/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix index 8f0cd43bd1..a3342e0b38 100644 --- a/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/knockpy/default.nix @@ -5,13 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "knockpy"; - version = "5.4.0"; + version = "6.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "guelfoweb"; repo = "knock"; rev = "refs/tags/${version}"; - hash = "sha256-If8w6Z75nQsayJBqJs+D9++7kqCbkmwkszOaMATDTpY="; + hash = "sha256-O4tXq4pDzuTBEGAls2I9bfBRdHssF4rFBec4OtfUx6A="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/security/kube-hunter/default.nix b/third_party/nixpkgs/pkgs/tools/security/kube-hunter/default.nix index e082b3d217..823f3db9b4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kube-hunter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kube-hunter/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { kubernetes ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook requests-mock ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix index 14a6ef750e..9cc02e33d9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "lastpass-cli"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "lastpass"; repo = pname; rev = "v${version}"; - sha256 = "168jg8kjbylfgalhicn0llbykd7kdc9id2989gg0nxlgmnvzl58a"; + sha256 = "sha256-bPAENorvj48cyRpnMLmyENXlipSGhTLW+XVoyrPogTE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix index ce64b6847f..a7b266c34e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/lesspass-cli/default.nix @@ -24,7 +24,7 @@ buildPythonApplication rec { done ''; - checkInputs = [ pytest mock pexpect ]; + nativeCheckInputs = [ pytest mock pexpect ]; checkPhase = '' mv lesspass lesspass.hidden # ensure we're testing against *installed* package pytest tests diff --git a/third_party/nixpkgs/pkgs/tools/security/log4j-sniffer/default.nix b/third_party/nixpkgs/pkgs/tools/security/log4j-sniffer/default.nix index d894e39d7f..72cf2fb851 100644 --- a/third_party/nixpkgs/pkgs/tools/security/log4j-sniffer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/log4j-sniffer/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { vendorSha256 = null; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/log4shell-detector/default.nix b/third_party/nixpkgs/pkgs/tools/security/log4shell-detector/default.nix index 6c51c5bcd6..76fc657284 100644 --- a/third_party/nixpkgs/pkgs/tools/security/log4shell-detector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/log4shell-detector/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { zstandard ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/maigret/default.nix b/third_party/nixpkgs/pkgs/tools/security/maigret/default.nix index 0b9b372250..a8d7f4c6b5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/maigret/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/maigret/default.nix @@ -57,7 +57,7 @@ python3.pkgs.buildPythonApplication rec { yarl ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-httpserver pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/tools/security/minica/default.nix b/third_party/nixpkgs/pkgs/tools/security/minica/default.nix index b984221bec..902961e049 100644 --- a/third_party/nixpkgs/pkgs/tools/security/minica/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/minica/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-3p6rUFFiWXhX9BBbxqWxRoyRceexvNnqcFCyNi5HoaA="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/minisign/default.nix b/third_party/nixpkgs/pkgs/tools/security/minisign/default.nix index a0e6347304..2ab1babcaf 100644 --- a/third_party/nixpkgs/pkgs/tools/security/minisign/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/minisign/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "minisign"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { repo = "minisign"; owner = "jedisct1"; rev = version; - sha256 = "sha256-uqlX4m1e5NTqqyI99j1c6/w/YQWeJC39FufpxAf4JT4="; + sha256 = "sha256-sczGs6du797WUkfr3JiTI/bUHp7vKEeZtJdCryFcYu8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/modsecurity/default.nix b/third_party/nixpkgs/pkgs/tools/security/modsecurity/default.nix index be9b2f8c28..f8564bfe00 100644 --- a/third_party/nixpkgs/pkgs/tools/security/modsecurity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/modsecurity/default.nix @@ -3,8 +3,6 @@ , luaSupport ? false, lua5, perl }: -with lib; - let luaValue = if luaSupport then lua5 else "no"; optional = lib.optional; in @@ -42,14 +40,14 @@ stdenv.mkDerivation rec { patches = [ ./Makefile.am.patch ]; doCheck = true; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; postInstall = '' mkdir -p $nginx cp -R * $nginx ''; - meta = { + meta = with lib; { description = "Open source, cross-platform web application firewall (WAF)"; license = licenses.asl20; homepage = "https://www.modsecurity.org/"; diff --git a/third_party/nixpkgs/pkgs/tools/security/mongoaudit/default.nix b/third_party/nixpkgs/pkgs/tools/security/mongoaudit/default.nix index 4c15d1cfe9..3ba19256ec 100644 --- a/third_party/nixpkgs/pkgs/tools/security/mongoaudit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/mongoaudit/default.nix @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { urwid ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix b/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix index d6276b3cc4..fbabe92b19 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nmap/default.nix @@ -6,8 +6,6 @@ , withLua ? true }: -with lib; - stdenv.mkDerivation rec { pname = "nmap"; version = "7.93"; @@ -18,7 +16,7 @@ stdenv.mkDerivation rec { }; patches = [ ./zenmap.patch ] - ++ optionals stdenv.cc.isClang [( + ++ lib.optionals stdenv.cc.isClang [( # Fixes a compile error due an ambiguous reference to bind(2) in # nping/EchoServer.cc, which is otherwise resolved to std::bind. # https://github.com/nmap/nmap/pull/1363 @@ -29,7 +27,7 @@ stdenv.mkDerivation rec { } )]; - prePatch = optionalString stdenv.isDarwin '' + prePatch = lib.optionalString stdenv.isDarwin '' substituteInPlace libz/configure \ --replace /usr/bin/libtool ar \ --replace 'AR="libtool"' 'AR="ar"' \ @@ -43,7 +41,7 @@ stdenv.mkDerivation rec { "--without-zenmap" ]; - makeFlags = optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.bintools.targetPrefix}ar" "RANLIB=${stdenv.cc.bintools.targetPrefix}ranlib" "CC=${stdenv.cc.targetPrefix}gcc" @@ -56,7 +54,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 3 tests, probably needs the net - meta = { + meta = with lib; { description = "A free and open source utility for network discovery and security auditing"; homepage = "http://www.nmap.org"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix index de0e4be7bf..579f793297 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.8.7"; + version = "2.8.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-kEc56cT8EgrQ8qHRHcVjf8L+DwFeK4UDEXhGqs24lJM="; + hash = "sha256-limgyp13eh2FuD1MzqQn+NQ30fOJsvr8UT4kZrxnIPM="; }; - vendorHash = "sha256-cEgJOL4qpbxdWBwGzVviI/+3Exe746Mu749vtrSjOVU="; + vendorHash = "sha256-nmZpYShVNAqBO8adxCSt9t3ocB3elWna06pIBG6dQNY="; modRoot = "./v2"; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/offensive-azure/default.nix b/third_party/nixpkgs/pkgs/tools/security/offensive-azure/default.nix index 78d254fbbc..fb5dce6798 100644 --- a/third_party/nixpkgs/pkgs/tools/security/offensive-azure/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/offensive-azure/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { requests ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/pamtester/default.nix b/third_party/nixpkgs/pkgs/tools/security/pamtester/default.nix index face92a00a..d9e59290d6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pamtester/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pamtester/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utility program to test the PAM facility"; - homepage = "http://pamtester.sourceforge.net/"; + homepage = "https://pamtester.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/default.nix b/third_party/nixpkgs/pkgs/tools/security/pass/default.nix index afb6d2e0dc..498e715a8e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/default.nix @@ -11,8 +11,6 @@ , tombPluginSupport ? false }: -with lib; - assert x11Support -> xclip != null; assert waylandSupport -> wl-clipboard != null; @@ -35,7 +33,7 @@ let name = "pass"; paths = selected; nativeBuildInputs = [ makeWrapper ]; - buildInputs = concatMap (x: x.buildInputs) selected; + buildInputs = lib.concatMap (x: x.buildInputs) selected; postBuild = '' files=$(find $out/bin/ -type f -exec readlink -f {} \;) @@ -79,7 +77,7 @@ stdenv.mkDerivation rec { # dependencies (s.el) here. The user has to do this themselves. mkdir -p "$out/share/emacs/site-lisp" cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" - '' + optionalString dmenuSupport '' + '' + lib.optionalString dmenuSupport '' cp "contrib/dmenu/passmenu" "$out/bin/" ''; @@ -145,7 +143,7 @@ stdenv.mkDerivation rec { doCheck = false; doInstallCheck = true; - installCheckInputs = [ git ]; + nativeInstallCheckInputs = [ git ]; installCheckTarget = "test"; passthru = { diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix index c4c16b8ff8..c9bbabd5fb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { # Tests freeze on darwin with: pass-audit-1.1 (checkPhase): EOFError doCheck = !stdenv.isDarwin; - checkInputs = [ pythonPackages.green pass gnupg ]; + nativeCheckInputs = [ pythonPackages.green pass gnupg ]; checkPhase = '' ${pythonEnv}/bin/python3 setup.py green -q ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/import.nix b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/import.nix index d543ef9b25..ad2d2a7156 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/extensions/import.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/extensions/import.nix @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { secretstorage ]; - checkInputs = [ + nativeCheckInputs = [ gnupg pass python3Packages.pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/tools/security/pcsctools/default.nix b/third_party/nixpkgs/pkgs/tools/security/pcsctools/default.nix index d5fe8c4faa..ec2a5f3fb3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pcsctools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pcsctools/default.nix @@ -1,6 +1,7 @@ { stdenv , lib -, fetchurl +, fetchFromGitHub +, autoreconfHook , makeWrapper , pkg-config , systemd @@ -13,11 +14,13 @@ stdenv.mkDerivation rec { pname = "pcsc-tools"; - version = "1.6.0"; + version = "1.6.2"; - src = fetchurl { - url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ZRyN10vLM9tMFpNc5dgN0apusgup1cS5YxoJgybvi58="; + src = fetchFromGitHub { + owner = "LudovicRousseau"; + repo = pname; + rev = version; + sha256 = "sha256-c7md8m1llvz0EQqA0qY4aGb3guGFoj+8uS4hUTzie5o="; }; postPatch = '' @@ -29,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus perlPackages.perl pcsclite ] ++ lib.optional stdenv.isLinux systemd; - nativeBuildInputs = [ makeWrapper pkg-config ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; postInstall = '' wrapProgram $out/bin/scriptor \ @@ -46,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools used to test a PC/SC driver, card or reader"; - homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"; + homepage = "https://pcsc-tools.apdu.fr/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/security/pdfcrack/default.nix b/third_party/nixpkgs/pkgs/tools/security/pdfcrack/default.nix index 0aa94c4e8a..d4930b023b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pdfcrack/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pdfcrack/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://pdfcrack.sourceforge.net/"; + homepage = "https://pdfcrack.sourceforge.net/"; description = "Small command line driven tool for recovering passwords and content from PDF files"; license = with licenses; [ gpl2Plus ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/third_party/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix index c473ccf02a..6b021e9702 100644 --- a/third_party/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix +++ b/third_party/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -7,13 +7,13 @@ mkDerivation rec { pname = "proxmark3-rrg"; - version = "4.14831"; + version = "4.16191"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "proxmark3"; rev = "v${version}"; - sha256 = "sha256-s0D04V6vlGW7SVkJwzMKaVfXQoT3Wi0lu7RC61Es89A="; + sha256 = "sha256-l0aDp0s9ekUUHqkzGfVoSIf/4/GN2uiVGL/+QtKRCOs="; }; nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/prs/default.nix b/third_party/nixpkgs/pkgs/tools/security/prs/default.nix index c6981b9157..33df7e7948 100644 --- a/third_party/nixpkgs/pkgs/tools/security/prs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/prs/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; rev = "refs/tags/v${version}"; - hash = "sha256-kElHgThpNVPzr9DSdSFjxTmJ0ivfajgk6nekGRwb2dI="; + hash = "sha256-9/XKz+yOCFEB1VI2EK0xF5ecyBPeGztpGPo/aXQ6v5E="; }; - cargoHash = "sha256-dob1WVJEPLYkPi7kPP5A6yxxe+BSRdQTgWUUiLvVlbg="; + cargoHash = "sha256-kxIgToqhJhUgJcxnGRGG6I+YqM2diFgQDyn1jBxWAw8="; postPatch = '' # The GPGME backend is recommended diff --git a/third_party/nixpkgs/pkgs/tools/security/radamsa/default.nix b/third_party/nixpkgs/pkgs/tools/security/radamsa/default.nix index c8b084e1e3..ebcd2a4219 100644 --- a/third_party/nixpkgs/pkgs/tools/security/radamsa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/radamsa/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" "BINDIR=" ]; - checkInputs = [ bash ]; + nativeCheckInputs = [ bash ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/security/regexploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/regexploit/default.nix index be09c34254..b921cbcc3b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/regexploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/regexploit/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { pyyaml ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/rhash/default.nix b/third_party/nixpkgs/pkgs/tools/security/rhash/default.nix index 4b4103ff9f..6e73375be2 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rhash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rhash/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://rhash.sourceforge.net/"; + homepage = "https://rhash.sourceforge.net/"; description = "Console utility and library for computing and verifying hash sums of files"; license = licenses.bsd0; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix b/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix index 0795f84337..d4fb4676e4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rng-tools/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = "patchShebangs tests/*.sh"; - checkInputs = [ psmisc ]; # rngtestjitter.sh needs killall + nativeCheckInputs = [ psmisc ]; # rngtestjitter.sh needs killall doInstallCheck = true; installCheckPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/rnp/default.nix b/third_party/nixpkgs/pkgs/tools/security/rnp/default.nix index 7d96c4f60e..e7cb9d7637 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rnp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rnp/default.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ asciidoctor cmake gnupg gtest pkg-config python3 ]; - # NOTE: check-only inputs should ideally be moved to checkInputs, but it + # NOTE: check-only inputs should ideally be moved to nativeCheckInputs, but it # would fail during buildPhase. - # checkInputs = [ gtest python3 ]; + # nativeCheckInputs = [ gtest python3 ]; outputs = [ "out" "lib" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/routersploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/routersploit/default.nix index e2a511c811..e147e8feac 100644 --- a/third_party/nixpkgs/pkgs/tools/security/routersploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/routersploit/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-xdist pytestCheckHook threat9-test-bed diff --git a/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix b/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix index 849a921898..099e685fec 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rustscan/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin Security; - checkInputs = [ perl python3 ]; + nativeCheckInputs = [ perl python3 ]; # these tests require network access checkFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/scrypt/default.nix b/third_party/nixpkgs/pkgs/tools/security/scrypt/default.nix index 5a3ab9cb68..aad2873d4a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/scrypt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/scrypt/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - checkInputs = lib.optionals stdenv.isLinux [ util-linux ]; + nativeCheckInputs = lib.optionals stdenv.isLinux [ util-linux ]; meta = with lib; { description = "Encryption utility"; diff --git a/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix b/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix index bae8346287..fa07080d2d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix @@ -4,34 +4,27 @@ , autoreconfHook }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "secp256k1"; - version = "unstable-2022-02-06"; + version = "0.2.0"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; - rev = "5dcc6f8dbdb1850570919fc9942d22f728dbc0af"; - sha256 = "x9qG2S6tBSRseWaFIN9N2fRpY1vkv8idT3d3rfJnmaU="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-wYJIMCoo6ryeQN4ZnvEkJ5/332+AkaOwgplDuQQC5MU="; }; nativeBuildInputs = [ autoreconfHook ]; configureFlags = [ "--enable-benchmark=no" - "--enable-exhaustive-tests=no" - "--enable-experimental" - "--enable-module-ecdh" "--enable-module-recovery" - "--enable-module-schnorrsig" - "--enable-tests=yes" ]; doCheck = true; - checkPhase = "./tests"; - meta = with lib; { description = "Optimized C library for EC operations on curve secp256k1"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/semgrep/default.nix b/third_party/nixpkgs/pkgs/tools/security/semgrep/default.nix index c97d877b48..8a2b8f0273 100644 --- a/third_party/nixpkgs/pkgs/tools/security/semgrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/semgrep/default.nix @@ -64,7 +64,7 @@ buildPythonApplication rec { ]; doCheck = true; - checkInputs = [ git pytestCheckHook ] ++ (with pythonPackages; [ + nativeCheckInputs = [ git pytestCheckHook ] ++ (with pythonPackages; [ pytest-snapshot pytest-mock pytest-freezegun diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix index edeaec56da..f7f63f126b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec { lib.optionals pythonSupport [ pythonPackages.setuptools ] ; - checkInputs = lib.optionals pythonSupport [ + nativeCheckInputs = lib.optionals pythonSupport [ pythonPackages.pytest pythonPackages.pytest-runner ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/sigma-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/sigma-cli/default.nix index c0a21ef544..d039234f37 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sigma-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sigma-cli/default.nix @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { pysigma-pipeline-windows ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/snallygaster/default.nix b/third_party/nixpkgs/pkgs/tools/security/snallygaster/default.nix index e469e4b004..2f7f5d1219 100644 --- a/third_party/nixpkgs/pkgs/tools/security/snallygaster/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/snallygaster/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { dnspython ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/solo2-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/solo2-cli/default.nix index ad3df92873..ea4b05b79a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/solo2-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/solo2-cli/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "solo2-cli"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "solokeys"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+n+tc3BDHr93yc2TzvI1Xqpcl8fM+bF/KZdv0rWfIZ8="; + sha256 = "sha256-7tpO5ir42mIKJXD0NJzEPXi/Xe6LdyEeBQWNfOdgX5I="; }; - cargoSha256 = "sha256-2bBo5HXLYQj+R47exPyMbx/RIrykDHjRkLRNMjVAzEI="; + cargoHash = "sha256-X+IEeztSL312Yq9Loi3cNJuVfSGk/tRRBCsy0Juji7Y="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/spire/default.nix b/third_party/nixpkgs/pkgs/tools/security/spire/default.nix index 3addaf3dc2..7c7562d1ad 100644 --- a/third_party/nixpkgs/pkgs/tools/security/spire/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.4.1"; + version = "1.5.4"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YUsam6dIm5jDjUQ8U9puG3jvrNWCS0epaOvwo4hjixc="; + sha256 = "sha256-DHN1JL4CYnme3hPbkNPXWXsgFpJ9BIRnGPl/csr43iY="; }; - vendorSha256 = "sha256-EZWoMSBxdvnrdBmSrRYf4+2d1LCka7oUIhRAW+2n7CU="; + vendorHash = "sha256-5MveK7wZ4KpUEZ4lhm95/8bOi5NtYR4n0fSfZhC+GPo="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix index 34d39390b4..8a2ad022ce 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ssh-audit/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0ks1zr0ksma285sm2dyy0nsbrkpssdk4mdzc3srr4mcyd6v927jd"; }; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix index fc07714b55..1d364fb0ad 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ssh-to-pgp/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-OMWiJ1n8ynvIGcmotjuGGsRuAidYgVo5Y5JjrAw8fpc="; - checkInputs = [ gnupg ]; + nativeCheckInputs = [ gnupg ]; checkPhase = '' HOME=$TMPDIR go test . ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix b/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix index 686e9eeffc..f109886c9c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ]; - checkInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; postInstall = '' wrapProgram $out/bin/sshuttle \ diff --git a/third_party/nixpkgs/pkgs/tools/security/stacs/default.nix b/third_party/nixpkgs/pkgs/tools/security/stacs/default.nix index 352c217b76..672cd08284 100644 --- a/third_party/nixpkgs/pkgs/tools/security/stacs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/stacs/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { yara-python ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix index 7fc646b1e6..8a6cc97ff1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-upi0EL6iviLV7hrLkh5PUAhx3/98kMISqHdy7NFODwI="; + sha256 = "sha256-zIF7R0zIoqQx0epTJAVdesT6IOoNek7Blt7W3Ulng4A="; }; - vendorSha256 = "sha256-2uxDQVNTNBTj40vYMlCuwMPCQDGQfkdUc67qmP5+j7g="; + vendorHash = "sha256-JX5jUIMwd+eCYRytaf+EXV/xHh6CCS2Ia0K+UQZxG7E="; ldflags = [ "-buildid=" ]; @@ -46,6 +46,9 @@ buildGoModule rec { # Tests start http servers which need to bind to local addresses: # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted __darwinAllowLocalNetworking = true; + # Tests need to run in a reproducible order, otherwise they run unreliably on + # (at least) x86_64-linux. + checkFlags = [ "-p 1" ]; passthru.tests.step-ca = nixosTests.step-ca; diff --git a/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix b/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix index 635fccc006..e71b88c8c3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/swtpm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - checkInputs = [ + nativeCheckInputs = [ which ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix b/third_party/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix index 2ad7fe3e90..8b00431b6c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tcpcrypt/default.nix @@ -3,8 +3,6 @@ , libcap, libpcap, libnfnetlink, libnetfilter_conntrack, libnetfilter_queue }: -with lib; - stdenv.mkDerivation rec { pname = "tcpcrypt"; version = "0.5"; @@ -21,11 +19,11 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openssl libpcap ] - ++ optionals stdenv.isLinux [ libcap libnfnetlink libnetfilter_conntrack libnetfilter_queue ]; + ++ lib.optionals stdenv.isLinux [ libcap libnfnetlink libnetfilter_conntrack libnetfilter_queue ]; enableParallelBuilding = true; - meta = { + meta = with lib; { broken = stdenv.isDarwin; homepage = "http://tcpcrypt.org/"; description = "Fast TCP encryption"; diff --git a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix index 1a66d7aea0..989743fda8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/teler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/teler/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "teler"; - version = "2.0.0-dev.2"; + version = "2.0.0-dev.3"; src = fetchFromGitHub { owner = "kitabisa"; repo = "teler"; rev = "v${version}"; - hash = "sha256-GlpQBmJ7HSKPFieM7E5NOnqGlUjQv9Ywe6XF5QIi+c4="; + hash = "sha256-2QrHxToHxHTjSl76q9A8fXCkOZkCwh1fu1h+HDUGsGA="; }; - vendorHash = "sha256-g2YBMyLDGQZKxDBcZ1mca16jxODnJzcmMfFivBn6SdE="; + vendorHash = "sha256-gV/PJFcANeYTYUJG3PYNsApYaeBLx76+vVBvcuKDYO4="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/security/theharvester/default.nix b/third_party/nixpkgs/pkgs/tools/security/theharvester/default.nix index a78d9a23c1..b267cab354 100644 --- a/third_party/nixpkgs/pkgs/tools/security/theharvester/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/theharvester/default.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { uvloop ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix b/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix index 084d8638c9..620d38f377 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tlsx"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-5roEaWdvjMYoQJqfMxRKryb9frDnpoJOYTG5g2MSIy0="; + hash = "sha256-9Cs5lkt7lAgCl/q2Xc8W5A8/frKER/d3mS1KH9jAy68="; }; - vendorHash = "sha256-g7v7n8xwYOuE4ojOEjgNmbyytPuwbxQx1R6fXHpVrYU="; + vendorHash = "sha256-eQnrSE45UGRbJ7zO6TdBh6UKooUEnhVxg4cdgoFu5eM="; # Tests require network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/tor/update.nix b/third_party/nixpkgs/pkgs/tools/security/tor/update.nix index 50353ce32a..f0106aa26e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tor/update.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tor/update.nix @@ -10,8 +10,6 @@ , nix }: -with lib; - let downloadPageUrl = "https://dist.torproject.org"; @@ -28,7 +26,7 @@ writeScript "update-tor" '' set -eu -o pipefail -export PATH=${makeBinPath [ +export PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl @@ -63,7 +61,7 @@ sigFile=''${sigUrl##*/} export GNUPGHOME=$PWD/gnupg mkdir -m 700 -p "$GNUPGHOME" -gpg --batch --recv-keys ${concatStringsSep " " (map (x: "'${x}'") signingKeys)} +gpg --batch --recv-keys ${lib.concatStringsSep " " (map (x: "'${x}'") signingKeys)} gpg --batch --verify "$sigFile" "$checksumFile" sha256sum -c "$checksumFile" diff --git a/third_party/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix b/third_party/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix index b3efb6c542..cd3504b45f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tpm2-abrmd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook autoconf-archive which ]; buildInputs = [ tpm2-tss glib dbus ]; - checkInputs = [ cmocka ]; + nativeCheckInputs = [ cmocka ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/security/tracee/default.nix b/third_party/nixpkgs/pkgs/tools/security/tracee/default.nix index bb4b558fc6..89a8ba6bcc 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tracee/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tracee/default.nix @@ -19,15 +19,15 @@ let in buildGoModule rec { pname = "tracee"; - version = "0.9.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-w/x7KhopkADKvpDc5TE5Kf34pRY6HP3kX1Lqujnl0b8="; + sha256 = "sha256-fAbii/DEXx9WJpolc7amqF9TQj4oE5x0TCiNOtVasGo="; }; - vendorSha256 = "sha256-5RXNRNoMydFcemNGgyfqcUPtfMVgMYdiyWo/sZi8GQw="; + vendorSha256 = "sha256-eenhIsiJhPLgwJo2spIGURPkcsec3kO4L5UJ0FWniQc="; patches = [ ./use-our-libbpf.patch @@ -64,11 +64,10 @@ buildGoModule rec { mkdir -p $out/{bin,share/tracee} - cp ./dist/tracee-ebpf $out/bin - cp ./dist/tracee-rules $out/bin + mv ./dist/tracee-{ebpf,rules} $out/bin/ - cp -r ./dist/rules $out/share/tracee/ - cp -r ./cmd/tracee-rules/templates $out/share/tracee/ + mv ./dist/rules $out/share/tracee/ + mv ./cmd/tracee-rules/templates $out/share/tracee/ runHook postInstall ''; @@ -105,7 +104,12 @@ buildGoModule rec { is delivered as a Docker image that monitors the OS and detects suspicious behavior based on a pre-defined set of behavioral patterns. ''; - license = licenses.asl20; + license = with licenses; [ + # general license + asl20 + # pkg/ebpf/c/* + gpl2Plus + ]; maintainers = with maintainers; [ jk ]; platforms = [ "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch b/third_party/nixpkgs/pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch deleted file mode 100644 index 88a3e49725..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/tracee/test-EventFilters-prefix-nix-friendly.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go -index afbc5330..13745c70 100644 ---- a/tests/integration/integration_test.go -+++ b/tests/integration/integration_test.go -@@ -246,8 +246,8 @@ func Test_EventFilters(t *testing.T) { - eventFunc: checkExecve, - }, - { -- name: "trace only execve events that starts with /usr/bin", -- filterArgs: []string{"event=execve", "execve.pathname=/usr/bin*"}, -+ name: "trace only execve events that starts with /run", -+ filterArgs: []string{"event=execve", "execve.pathname=/run*"}, - eventFunc: checkExecve, - }, - { diff --git a/third_party/nixpkgs/pkgs/tools/security/trousers/default.nix b/third_party/nixpkgs/pkgs/tools/security/trousers/default.nix index 16536409b5..bec2084fd1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/trousers/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/trousers/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Trusted computing software stack"; - homepage = "http://trousers.sourceforge.net/"; + homepage = "https://trousers.sourceforge.net/"; license = licenses.bsd3; maintainers = [ maintainers.ak ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix index 09dc5a1dfa..3f4613b987 100644 --- a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.24.0"; + version = "3.26.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-MFGOw7SuTCf4no5iUxppaNjsDvhsuQQXcXutE3L7iRk="; + hash = "sha256-cjggYIc/xy7w8Q8yXd26QWr1ky4gMuwRAmxrEObVlx0="; }; - vendorHash = "sha256-UqoFEvixSk42UTMswc8tUDVxYVkfgkern3NeDyiUMMw="; + vendorHash = "sha256-z2na/CO/YqIYEAYJ9ATQ/wbOOBFt0Kr+ERN5TCFbZbA="; # Test cases run git clone and require network access doCheck = false; @@ -27,7 +27,7 @@ buildGoModule rec { description = "Find credentials all over the place"; homepage = "https://github.com/trufflesecurity/trufflehog"; changelog = "https://github.com/trufflesecurity/trufflehog/releases/tag/v${version}"; - license = with licenses; [ agpl3 ]; - maintainers = with maintainers; [ ]; + license = with licenses; [ agpl3Only ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/uddup/default.nix b/third_party/nixpkgs/pkgs/tools/security/uddup/default.nix index 5cde218bac..3516b4dcff 100644 --- a/third_party/nixpkgs/pkgs/tools/security/uddup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/uddup/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { colorama ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault-medusa/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault-medusa/default.nix index 84367b04ab..9cd6bd1fd4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault-medusa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault-medusa/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vault-medusa"; - version = "0.3.6"; + version = "0.4.1"; src = fetchFromGitHub { owner = "jonasvinther"; repo = "medusa"; rev = "v${version}"; - sha256 = "sha256-KAKHuUv6nFVi3ucXkXGs9yfy2WFBnIDaDiNLKXsEOlI="; + sha256 = "sha256-VL22p723LDHpn+WhKoPm3u1uSTMofJpy3tZNlgcWQSk="; }; - vendorSha256 = "sha256-DCq+Dke33trkntrXz49I1mDxsJodVbtZEbg1UF6Tmwk="; + vendorHash = "sha256-pptAtzw9vRguQJK73kjfM/wnTJDekXBWV3Yeb8p8LOY="; meta = with lib; { description = "A cli tool for importing and exporting Hashicorp Vault secrets"; diff --git a/third_party/nixpkgs/pkgs/tools/security/vexctl/default.nix b/third_party/nixpkgs/pkgs/tools/security/vexctl/default.nix index 3821fa77dc..335da7f93a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vexctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vexctl/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "vexctl"; - version = "0.0.2"; + version = "0.1.0"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "vex"; rev = "v${version}"; - sha256 = "sha256-rDq62vkrZ8/76LERchxijmQCgo58KXlAIfv4SwI7egY="; + sha256 = "sha256-f5UVX6x4DwjlcgMAv0GuKBH9UUzFhQ8pW8l+9pc7RQ4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -24,7 +24,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-7hhiJowtQv4JPqvpMiukL2JVgNeB5gi5X4p+AVGp4S0="; + vendorHash = "sha256-GZIssLLPg2dF7xsvsYn2MKYunMCpGbNA+6qCYBW++vk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix b/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix index c3eb53c3b2..a698a0a152 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vulnix/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { outputs = [ "out" "doc" "man" ]; nativeBuildInputs = [ ronn ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ freezegun pytest pytest-cov diff --git a/third_party/nixpkgs/pkgs/tools/security/wad/default.nix b/third_party/nixpkgs/pkgs/tools/security/wad/default.nix index 9b284a42a0..5dc81a7f56 100644 --- a/third_party/nixpkgs/pkgs/tools/security/wad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/wad/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { six ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ mock pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix b/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix index 4769db4816..6aec3dd105 100644 --- a/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/wapiti/default.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { ] ++ httpx.optional-dependencies.brotli ++ httpx.optional-dependencies.socks; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ respx pytest-asyncio pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/tools/security/wipe/default.nix b/third_party/nixpkgs/pkgs/tools/security/wipe/default.nix index 5b0f079e5a..5ced99060f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/wipe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/wipe/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Secure file wiping utility"; - homepage = "http://wipe.sourceforge.net/"; + homepage = "https://wipe.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.abbradar ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix b/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix index cea88a31f6..0d72541afe 100644 --- a/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.55"; + version = "1.0.61"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-80GP7w3YF7RNMTlSI5SCQfugjkNBweX5BcYk4ODimBQ="; + sha256 = "sha256-BAUvqRgcHVVFuTNX9W0PiYF3f1yd2mJxmE7It9as4gs="; }; - cargoHash = "sha256-WtqK8T/3Mo/y3cPn8d6kDzC59qE70JUHFdHk7mFpP1k="; + cargoHash = "sha256-baQP9GEkZx5dSm64GpQ0h5SKQUzZALyplRUKEKX0K8U="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/third_party/nixpkgs/pkgs/tools/system/awstats/default.nix b/third_party/nixpkgs/pkgs/tools/system/awstats/default.nix index e0fb92b519..21b76adf3e 100644 --- a/third_party/nixpkgs/pkgs/tools/system/awstats/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/awstats/default.nix @@ -1,12 +1,16 @@ -{ lib, fetchurl, perlPackages, jdk }: +{ lib +, fetchurl +, perlPackages +, jdk +}: perlPackages.buildPerlPackage rec { pname = "awstats"; - version = "7.8"; + version = "7.9"; src = fetchurl { url = "mirror://sourceforge/awstats/${pname}-${version}.tar.gz"; - sha256 = "1f6l0hd01jmz7hpg0py8qixxiq50n8gl37iypayskxmy05z8craa"; + sha256 = "sha256-YVF47TE9NDFfFaUi2xpdEsqcOV43hbsGKAq/+V2aBUY="; }; postPatch = '' @@ -15,6 +19,7 @@ perlPackages.buildPerlPackage rec { ''; outputs = [ "bin" "out" "doc" ]; # bin just links the user-run executable + propagatedBuildOutputs = [ ]; # otherwise out propagates bin -> cycle buildInputs = with perlPackages; [ ]; # plugins will need some @@ -53,10 +58,10 @@ perlPackages.buildPerlPackage rec { ''; meta = with lib; { + changelog = "https://www.awstats.org/docs/awstats_changelog.txt"; description = "Real-time logfile analyzer to get advanced statistics"; homepage = "https://awstats.org"; license = licenses.gpl3Plus; platforms = platforms.unix; }; } - diff --git a/third_party/nixpkgs/pkgs/tools/system/bar/default.nix b/third_party/nixpkgs/pkgs/tools/system/bar/default.nix index ddea8881ca..9ff8d2080f 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/bar/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = { description = "Console progress bar"; - homepage = "http://clpbar.sourceforge.net/"; + homepage = "https://clpbar.sourceforge.net/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.rdnetto ]; platforms = lib.platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix b/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix index 08b15bc4c9..9ca8fe25d1 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/bottom/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-g9MkS1ps4RTEvuZP9oJize+Uz7W6uCNNks+HjO771QU="; + sha256 = "sha256-UbzWI3f1ewFwg7BsqcvPZFeJt5E6alShxNuIKy+Tno0="; }; - cargoHash = "sha256-wVvGj58dmpLH+zMu9e/TQ7gTvwmgYIYX5MrVcnOMu/A="; + cargoHash = "sha256-ihCgaB+vP5YyqMIg8qrkCEvSQdc6Eq00D1r3PGc2WpA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/clinfo/default.nix b/third_party/nixpkgs/pkgs/tools/system/clinfo/default.nix index a9e7c0c81d..746f83690e 100644 --- a/third_party/nixpkgs/pkgs/tools/system/clinfo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/clinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clinfo"; - version = "3.0.21.02.21"; + version = "3.0.23.01.25"; src = fetchFromGitHub { owner = "Oblomov"; repo = "clinfo"; rev = version; - sha256 = "sha256-0ijfbfv1F6mnt1uFH/A4yOADJoAFrPMa3yAOFJW53ek="; + sha256 = "sha256-1jZP4SnLIHh3vQJLBp+j/eQ1c8XBGFR2hjYxflhpWAU="; }; buildInputs = lib.optionals (!stdenv.isDarwin) [ diff --git a/third_party/nixpkgs/pkgs/tools/system/consul-template/default.nix b/third_party/nixpkgs/pkgs/tools/system/consul-template/default.nix index d923f74a7f..7e8e242d7b 100644 --- a/third_party/nixpkgs/pkgs/tools/system/consul-template/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.29.4"; + version = "0.30.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - sha256 = "sha256-jFj5iVUS7qpH4Aq35KS8IDKA7PzGgire+flBpkCgwuA="; + sha256 = "sha256-Q2mNMgGnwyYXVsmP6cVVlGEs2fHUZKwrWepmmQXmNLo="; }; - vendorSha256 = "sha256-GKohljwH4/kBPoI3/RfxYsvzISv1WmVAo96sjKJrnHk="; + vendorHash = "sha256-75IFVVd4L70kEV5L7Ub9RpR9LMhkz3fB4b5eAYwkPPk="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/third_party/nixpkgs/pkgs/tools/system/dcfldd/default.nix b/third_party/nixpkgs/pkgs/tools/system/dcfldd/default.nix index 7dc6e1fc12..7047d41c5b 100644 --- a/third_party/nixpkgs/pkgs/tools/system/dcfldd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/dcfldd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An enhanced version of GNU dd"; - homepage = "http://dcfldd.sourceforge.net/"; + homepage = "https://dcfldd.sourceforge.net/"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/tools/system/dog/default.nix b/third_party/nixpkgs/pkgs/tools/system/dog/default.nix index 4073034a9b..c0b3db95ab 100644 --- a/third_party/nixpkgs/pkgs/tools/system/dog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/dog/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://lwn.net/Articles/421072/"; + homepage = "https://lwn.net/Articles/421072/"; description = "cat replacement"; license = licenses.gpl2Plus; maintainers = with maintainers; [ qknight ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/efivar/default.nix b/third_party/nixpkgs/pkgs/tools/system/efivar/default.nix index 37e8d664f2..8507c7c7ce 100644 --- a/third_party/nixpkgs/pkgs/tools/system/efivar/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/efivar/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { url = "https://github.com/rhboot/efivar/commit/ca48d3964d26f5e3b38d73655f19b1836b16bd2d.patch"; hash = "sha256-DkNFIK4i7Eypyf2UeK7qHW36N2FSVRJ2rnOVLriWi5c="; }) + (fetchpatch { + name = "musl-backport.patch"; + url = "https://github.com/rhboot/efivar/commit/cece3ffd5be2f8641eb694513f2b73e5eb97ffd3.patch"; + sha256 = "7/E0gboU0A45/BY6jGPLuvds6qKtNjzpgKgdNTaVaZQ="; + }) ]; nativeBuildInputs = [ pkg-config mandoc ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/envconsul/default.nix b/third_party/nixpkgs/pkgs/tools/system/envconsul/default.nix index daa92dc772..5d17f07854 100644 --- a/third_party/nixpkgs/pkgs/tools/system/envconsul/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/envconsul/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "envconsul"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "envconsul"; rev = "v${version}"; - sha256 = "sha256-Zt4jCqHfDTxSrAIASQgUqtYgcHU9xUs025YOxGXhTAg="; + sha256 = "sha256-9X0mSEMaLGdchf9g5EyRUsn7z6cvbG4QBPoaris7RwQ="; }; - vendorSha256 = "sha256-qxt2LNPDxdiszkjSjgzP7PG26BsZYq1itiyQfy9uaVI="; + vendorSha256 = "sha256-Vunq3lsM1aSXNIr3ZMqE03f0jEI5BpWwMYhZ41tiB9M="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/system/facter/default.nix b/third_party/nixpkgs/pkgs/tools/system/facter/default.nix index d1d18809a5..de4acffa63 100644 --- a/third_party/nixpkgs/pkgs/tools/system/facter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/facter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, util-linux }: +{ lib, stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, yaml-cpp, openssl, ruby, util-linux }: stdenv.mkDerivation rec { pname = "facter"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby util-linux ]; + buildInputs = [ boost cpp-hocon curl leatherman libwhereami yaml-cpp openssl ruby util-linux ]; meta = with lib; { homepage = "https://github.com/puppetlabs/facter"; diff --git a/third_party/nixpkgs/pkgs/tools/system/foremost/default.nix b/third_party/nixpkgs/pkgs/tools/system/foremost/default.nix index f3b353501f..0e1f118c20 100644 --- a/third_party/nixpkgs/pkgs/tools/system/foremost/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/foremost/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { sha256 = "0d2zxw0ijg8cd3ksgm8cf8jg128zr5x7z779jar90g9f47pm882h"; - url = "http://foremost.sourceforge.net/pkg/${pname}-${version}.tar.gz"; + url = "https://foremost.sourceforge.net/pkg/${pname}-${version}.tar.gz"; }; patches = [ ./makefile.patch ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { look at the data structures of a given file format allowing for a more reliable and faster recovery. ''; - homepage = "http://foremost.sourceforge.net/"; + homepage = "https://foremost.sourceforge.net/"; license = licenses.publicDomain; maintainers = [ maintainers.jiegec ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix b/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix index 15b658c991..edd1a8ecfd 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A diff-capable 'du' browser"; - homepage = "http://gt5.sourceforge.net/"; + homepage = "https://gt5.sourceforge.net/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; all; diff --git a/third_party/nixpkgs/pkgs/tools/system/honcho/default.nix b/third_party/nixpkgs/pkgs/tools/system/honcho/default.nix index 66d2172965..c7e25e5785 100644 --- a/third_party/nixpkgs/pkgs/tools/system/honcho/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/honcho/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = [ python3Packages.setuptools ]; - checkInputs = with python3Packages; [ jinja2 pytest mock coverage ]; + nativeCheckInputs = with python3Packages; [ jinja2 pytest mock coverage ]; # missing plugins doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix index e3dca89c46..305761e0c3 100644 --- a/third_party/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/htop/default.nix @@ -1,9 +1,10 @@ -{ lib, fetchFromGitHub, stdenv, autoreconfHook +{ lib, fetchFromGitHub, stdenv, autoreconfHook, pkg-config , ncurses , IOKit +, libcap +, libnl , sensorsSupport ? stdenv.isLinux, lm_sensors -, systemdSupport ? stdenv.isLinux && !stdenv.hostPlatform.isStatic -, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: assert systemdSupport -> stdenv.isLinux; @@ -19,15 +20,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-MwtsvdPHcUdegsYj9NGyded5XJQxXri1IM1j4gef1Xk="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ] + ++ lib.optional stdenv.isLinux pkg-config + ; buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin IOKit + ++ lib.optionals stdenv.isLinux [ libcap libnl ] ++ lib.optional sensorsSupport lm_sensors ++ lib.optional systemdSupport systemd ; configureFlags = [ "--enable-unicode" "--sysconfdir=/etc" ] + ++ lib.optionals stdenv.isLinux [ + "--enable-affinity" + "--enable-capabilities" + "--enable-delayacct" + ] ++ lib.optional sensorsSupport "--with-sensors" ; diff --git a/third_party/nixpkgs/pkgs/tools/system/hw-probe/default.nix b/third_party/nixpkgs/pkgs/tools/system/hw-probe/default.nix index d483bdad22..ee538f9266 100644 --- a/third_party/nixpkgs/pkgs/tools/system/hw-probe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/hw-probe/default.nix @@ -30,7 +30,7 @@ , xz # Conditionally recommended -, systemdSupport ? stdenv.isLinux +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd # Recommended diff --git a/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix b/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix index b990ce1c2e..df5138268a 100644 --- a/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "22.1"; + version = "22.2"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "sha256-nGWpUqBkpiiNuH5kEHWR1/+0aYIeLf9k3AmzQR85Swk="; + hash = "sha256-Z/brrDrT2J4RAS+pm1xaBqWO7PG6cAVgRpH3G6Nn39E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/system/idle3tools/default.nix b/third_party/nixpkgs/pkgs/tools/system/idle3tools/default.nix index f4de055a60..c0386fb66b 100644 --- a/third_party/nixpkgs/pkgs/tools/system/idle3tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/idle3tools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://idle3-tools.sourceforge.net/"; + homepage = "https://idle3-tools.sourceforge.net/"; description = "Tool to get/set the infamous idle3 timer in WD HDDs"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [viric]; diff --git a/third_party/nixpkgs/pkgs/tools/system/ipmiutil/default.nix b/third_party/nixpkgs/pkgs/tools/system/ipmiutil/default.nix index 2166a671ab..d691a86e24 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ipmiutil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ipmiutil/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An easy-to-use IPMI server management utility"; - homepage = "http://ipmiutil.sourceforge.net/"; + homepage = "https://ipmiutil.sourceforge.net/"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/tools/system/journalwatch/default.nix b/third_party/nixpkgs/pkgs/tools/system/journalwatch/default.nix index 3d85d13149..01324b65f6 100644 --- a/third_party/nixpkgs/pkgs/tools/system/journalwatch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/journalwatch/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = true; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest ''; diff --git a/third_party/nixpkgs/pkgs/tools/system/jsvc/default.nix b/third_party/nixpkgs/pkgs/tools/system/jsvc/default.nix index e0c1ebee90..85ae689f32 100644 --- a/third_party/nixpkgs/pkgs/tools/system/jsvc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/jsvc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jsvc"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz"; - sha256 = "sha256-Xd6J/TOGCDAtBl3baKJnOYnztJH+C+L2+e9RC0BUqEw="; + sha256 = "sha256-J5Gzd6R8CMqhsgRPrrHhD//LdpcVEQKnBB7i/pLL8ns="; }; buildInputs = [ commonsDaemon ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/jump/default.nix b/third_party/nixpkgs/pkgs/tools/system/jump/default.nix index 31b3cae446..c1e625e14c 100644 --- a/third_party/nixpkgs/pkgs/tools/system/jump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/jump/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "gsamokovarov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nlCuotEiAX2+xx7T8jWZo2p4LNLhWXDdcU6DxJprgx0="; + hash = "sha256-nlCuotEiAX2+xx7T8jWZo2p4LNLhWXDdcU6DxJprgx0="; }; - vendorSha256 = "sha256-nMUqZWdq//q/DNthvpKiYLq8f95O0QoItyX5w4vHzSA="; + vendorHash = "sha256-nMUqZWdq//q/DNthvpKiYLq8f95O0QoItyX5w4vHzSA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix index ee9d132de3..a84113fe20 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -14,8 +14,6 @@ , withDebug ? false }: -with lib; - let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { @@ -34,17 +32,17 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf ]; buildInputs = [ curl jemalloc libuv zlib ] - ++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] - ++ optionals (!stdenv.isDarwin) [ libcap libuuid ] - ++ optionals withCups [ cups ] - ++ optionals withDBengine [ lz4 ] - ++ optionals withIpmi [ freeipmi ] - ++ optionals withNetfilter [ libmnl libnetfilter_acct ] - ++ optionals withCloud [ json_c ] - ++ optionals withConnPubSub [ google-cloud-cpp grpc ] - ++ optionals withConnPrometheus [ snappy ] - ++ optionals (withCloud || withConnPrometheus) [ protobuf ] - ++ optionals withSsl [ openssl ]; + ++ lib.optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] + ++ lib.optionals (!stdenv.isDarwin) [ libcap libuuid ] + ++ lib.optionals withCups [ cups ] + ++ lib.optionals withDBengine [ lz4 ] + ++ lib.optionals withIpmi [ freeipmi ] + ++ lib.optionals withNetfilter [ libmnl libnetfilter_acct ] + ++ lib.optionals withCloud [ json_c ] + ++ lib.optionals withConnPubSub [ google-cloud-cpp grpc ] + ++ lib.optionals withConnPrometheus [ snappy ] + ++ lib.optionals (withCloud || withConnPrometheus) [ protobuf ] + ++ lib.optionals withSsl [ openssl ]; patches = [ # required to prevent plugins from relying on /etc @@ -68,12 +66,12 @@ in stdenv.mkDerivation rec { # We pick zlib.dev as a simple canary package with pkg-config input. disallowedReferences = [ zlib.dev ]; - NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; + NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; postInstall = '' ln -s ${go-d-plugin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d ln -s ${go-d-plugin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin - '' + optionalString (!stdenv.isDarwin) '' + '' + lib.optionalString (!stdenv.isDarwin) '' # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ $out/libexec/netdata/plugins.d/apps.plugin.org @@ -83,13 +81,13 @@ in stdenv.mkDerivation rec { $out/libexec/netdata/plugins.d/perf.plugin.org mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ $out/libexec/netdata/plugins.d/slabinfo.plugin.org - ${optionalString withIpmi '' + ${lib.optionalString withIpmi '' mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ $out/libexec/netdata/plugins.d/freeipmi.plugin.org ''} ''; - preConfigure = optionalString (!stdenv.isDarwin) '' + preConfigure = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace collectors/python.d.plugin/python_modules/third_party/lm_sensors.py \ --replace 'ctypes.util.find_library("sensors")' '"${lm_sensors.out}/lib/libsensors${stdenv.hostPlatform.extensions.sharedLibrary}"' ''; @@ -99,9 +97,9 @@ in stdenv.mkDerivation rec { "--sysconfdir=/etc" "--disable-ebpf" "--with-jemalloc=${jemalloc}" - ] ++ optionals (!withDBengine) [ + ] ++ lib.optionals (!withDBengine) [ "--disable-dbengine" - ] ++ optionals (!withCloud) [ + ] ++ lib.optionals (!withCloud) [ "--disable-cloud" ]; @@ -116,7 +114,7 @@ in stdenv.mkDerivation rec { tests.netdata = nixosTests.netdata; }; - meta = { + meta = with lib; { broken = stdenv.isDarwin || stdenv.buildPlatform != stdenv.hostPlatform; description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; diff --git a/third_party/nixpkgs/pkgs/tools/system/pdisk/default.nix b/third_party/nixpkgs/pkgs/tools/system/pdisk/default.nix index 87fc683063..e0a78b6b94 100644 --- a/third_party/nixpkgs/pkgs/tools/system/pdisk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/pdisk/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchzip +, fetchFromGitHub , fetchpatch , installShellFiles , libbsd @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { pname = "pdisk"; version = "0.9"; - src = fetchzip { - url = "https://opensource.apple.com/tarballs/pdisk/pdisk-${lib.versions.minor version}.tar.gz"; - sha256 = "sha256-+gBgnk/1juEHE0nXaz7laUaH7sxrX5SzsLGr0PHsdHs="; + src = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = pname; + rev = "${pname}-${lib.versions.minor version}"; + hash = "sha256-+gBgnk/1juEHE0nXaz7laUaH7sxrX5SzsLGr0PHsdHs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix b/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix index 09be16b1c9..859f66990c 100644 --- a/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix @@ -10,7 +10,7 @@ , fastJson , withKrb5 ? true , libkrb5 -, withSystemd ? stdenv.isLinux +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd , withJemalloc ? true , jemalloc diff --git a/third_party/nixpkgs/pkgs/tools/system/socklog/default.nix b/third_party/nixpkgs/pkgs/tools/system/socklog/default.nix index 7c40a8f0ca..dc9486a6e3 100644 --- a/third_party/nixpkgs/pkgs/tools/system/socklog/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/socklog/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchurl }: -with lib; - stdenv.mkDerivation rec { pname = "socklog"; version = "2.1.0"; @@ -49,7 +47,7 @@ stdenv.mkDerivation rec { doCheck = true; - meta = { + meta = with lib; { broken = stdenv.isDarwin; description = "System and kernel logging services"; homepage = "http://smarden.org/socklog/"; diff --git a/third_party/nixpkgs/pkgs/tools/system/systeroid/default.nix b/third_party/nixpkgs/pkgs/tools/system/systeroid/default.nix index 4fd26b5d48..88b19d1b92 100644 --- a/third_party/nixpkgs/pkgs/tools/system/systeroid/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/systeroid/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "systeroid"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VkkobNYkz8FunyaS6EJpfqOvDdwZJE+P2YTSJCgHZI0="; + sha256 = "sha256-uQa6n8DESnpO9xzfExywY6lG3nZkNSpjgEm5b+ayc8I="; }; postPatch = '' @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { --replace '"/usr/share/doc/kernel-doc-*/Documentation/*",' '"${linux-doc}/share/doc/linux-doc/*",' ''; - cargoSha256 = "sha256-ulmU33j2edzMA/L4KXiM5M6RhH3MmMAkA2DuHxdj2uk="; + cargoHash = "sha256-baxXSjbS/5i9xnQGdPYPqgu0c2HGEAU7j7X8wtKSznA="; buildInputs = [ xorg.libxcb diff --git a/third_party/nixpkgs/pkgs/tools/system/thinkfan/default.nix b/third_party/nixpkgs/pkgs/tools/system/thinkfan/default.nix index a564c946bc..dc6920a97b 100644 --- a/third_party/nixpkgs/pkgs/tools/system/thinkfan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/thinkfan/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , cmake -, libyamlcpp +, yaml-cpp , pkg-config , procps , coreutils @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ libyamlcpp ] ++ lib.optional smartSupport libatasmart; + buildInputs = [ yaml-cpp ] ++ lib.optional smartSupport libatasmart; meta = { description = "A simple, lightweight fan control program"; diff --git a/third_party/nixpkgs/pkgs/tools/system/throttled/default.nix b/third_party/nixpkgs/pkgs/tools/system/throttled/default.nix index 2729a16b86..f09c048086 100644 --- a/third_party/nixpkgs/pkgs/tools/system/throttled/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/throttled/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages }: +{ lib, stdenv, fetchFromGitHub, python3Packages, pciutils }: stdenv.mkDerivation rec { pname = "throttled"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "erpalma"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4aDa6REDHO7gr1czIv6NlepeMVJI93agxJjE2vHiEmk="; + sha256 = "sha256-0MsPp6y4r/uZB2SplKV+SAiJoxIs2jgOQmQoQQ2ZKwI="; }; nativeBuildInputs = [ python3Packages.wrapPython ]; @@ -20,12 +20,16 @@ stdenv.mkDerivation rec { ]; # The upstream unit both assumes the install location, and tries to run in a virtualenv - postPatch = ''sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/lenovo_fix.py|' -i systemd/lenovo_fix.service''; + postPatch = '' + sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/throttled.py|' -i systemd/throttled.service + + substituteInPlace throttled.py --replace "'setpci'" "'${pciutils}/bin/setpci'" + ''; installPhase = '' runHook preInstall - install -D -m755 -t $out/bin lenovo_fix.py - install -D -t $out/bin lenovo_fix.py mmio.py + install -D -m755 -t $out/bin throttled.py + install -D -t $out/bin throttled.py mmio.py install -D -m644 -t $out/etc etc/* install -D -m644 -t $out/lib/systemd/system systemd/* runHook postInstall diff --git a/third_party/nixpkgs/pkgs/tools/system/tuptime/default.nix b/third_party/nixpkgs/pkgs/tools/system/tuptime/default.nix index bc52c41457..b49063d680 100644 --- a/third_party/nixpkgs/pkgs/tools/system/tuptime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/tuptime/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tuptime"; - version = "5.2.1"; + version = "5.2.2"; src = fetchFromGitHub { - owner = "rfrail3"; + owner = "rfmoz"; repo = "tuptime"; rev = version; - sha256 = "sha256-C5Wg3z1PGqgUfdjsSKcI9lvR0a6NcJfsZd+wMl0Fz+U="; + sha256 = "sha256-YrZP2sovAwwfDBoKoobgkf0+7RmYFUtrV9jfBmDsNL8="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/wslu/default.nix b/third_party/nixpkgs/pkgs/tools/system/wslu/default.nix index f765da194c..6337e479bb 100644 --- a/third_party/nixpkgs/pkgs/tools/system/wslu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/wslu/default.nix @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { hash = "sha256-yhugh836BoSISbTu19ubLOrz5X31Opu5QtCR0DXrbWc="; }; + patches = [ + ./fallback-conf-nix-store.diff + ]; + + postPatch = '' + substituteInPlace src/wslu-header \ + --subst-var out + ''; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" diff --git a/third_party/nixpkgs/pkgs/tools/system/wslu/fallback-conf-nix-store.diff b/third_party/nixpkgs/pkgs/tools/system/wslu/fallback-conf-nix-store.diff new file mode 100644 index 0000000000..6315e78d7d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/wslu/fallback-conf-nix-store.diff @@ -0,0 +1,22 @@ +diff --git a/src/wslu-header b/src/wslu-header +index 5f33925..159c6af 100644 +--- a/src/wslu-header ++++ b/src/wslu-header +@@ -169,11 +169,17 @@ if [ -f "$HOME/.config/wslu/conf" ]; then + debug_echo "$HOME/.config/wslu/conf found, sourcing" + source "$HOME/.config/wslu/conf" + fi ++ + if [ -f "$HOME/.wslurc" ]; then + debug_echo "$HOME/.wslurc found, sourcing" + source "$HOME/.wslurc" + fi + ++if [ -f "@out@/share/wslu/conf" ]; then ++ debug_echo "@out@/share/wslu/conf found, sourcing" ++ source "@out@/share/wslu/conf" ++fi ++ + # functions + + function help { diff --git a/third_party/nixpkgs/pkgs/tools/system/wsmancli/default.nix b/third_party/nixpkgs/pkgs/tools/system/wsmancli/default.nix index ac6a561bb0..c9c07c81bc 100644 --- a/third_party/nixpkgs/pkgs/tools/system/wsmancli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/wsmancli/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "wsmancli"; - version = "2.6.0"; + version = "2.6.2"; src = fetchFromGitHub { owner = "Openwsman"; repo = "wsmancli"; rev = "v${version}"; - sha256 = "0a67fz9lj7xkyfqim6ai9kj7v6hzx94r1bg0g0l5dymgng648b9j"; + sha256 = "sha256-A2PVhQuKVTZ/nDKyy+vZVBNLB/3xujBYBzUEWcTIYYg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix b/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix index 57d0f548f0..282bd31571 100644 --- a/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/zenith/default.nix @@ -8,6 +8,8 @@ , llvmPackages }: +assert nvidiaSupport -> stdenv.isLinux; + rustPlatform.buildRustPackage rec { pname = "zenith"; version = "0.13.1"; @@ -19,6 +21,11 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-N/DvPVYGM/DjTvKvOlR60q6rvNyfAQlnvFnFG5nbUmQ="; }; + # remove cargo config so it can find the linker on aarch64-linux + postPatch = '' + rm .cargo/config + ''; + cargoSha256 = "sha256-Y/vvRJpv82Uc+Bu3lbZxRsu4TL6sAjz5AWHAHkwh98Y="; nativeBuildInputs = [ llvmPackages.clang ] ++ lib.optional nvidiaSupport makeWrapper; @@ -39,8 +46,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/bvaisvil/zenith"; license = licenses.mit; maintainers = with maintainers; [ bbigras ]; - # doesn't build on aarch64 https://github.com/bvaisvil/zenith/issues/19 - # see https://github.com/NixOS/nixpkgs/pull/88616 - platforms = platforms.x86; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock b/third_party/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock new file mode 100644 index 0000000000..439161d7b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock @@ -0,0 +1,347 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ahash" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "bitflags", + "textwrap", + "unicode-width", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "dlv-list" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68df3f2b690c1b86e65ef7830956aededf3cb0a16f898f79b9a6f421a7b6211b" +dependencies = [ + "rand", +] + +[[package]] +name = "fasteval" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f4cdac9e4065d7c48e30770f8665b8cef9a3a73a63a4056a33a5f395bc7cf75" + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hashbrown" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "liboverdrop" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a8bcc76c5aad4677420857a8744ec8aef80b1b21c5501e2f8c7ac3fda2e19ba" +dependencies = [ + "log", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "nix" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +dependencies = [ + "bitflags", + "cc", + "cfg-if", + "libc", + "memoffset", +] + +[[package]] +name = "ordered-multimap" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485" +dependencies = [ + "dlv-list", + "hashbrown", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "rust-ini" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "zram-generator" +version = "1.1.2" +dependencies = [ + "anyhow", + "clap", + "ctor", + "fasteval", + "fs_extra", + "liboverdrop", + "log", + "nix", + "rust-ini", + "tempfile", +] diff --git a/third_party/nixpkgs/pkgs/tools/system/zram-generator/default.nix b/third_party/nixpkgs/pkgs/tools/system/zram-generator/default.nix new file mode 100644 index 0000000000..679308b049 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/zram-generator/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, ronn +, systemd +, kmod +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "zram-generator"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "systemd"; + repo = pname; + rev = "v${version}"; + hash = "sha256-n+ZOWU+sPq9DcHgzQWTxxfMmiz239qdetXypqdy33cM="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + # RFE: Include Cargo.lock in sources + # https://github.com/systemd/zram-generator/issues/65 + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + substituteInPlace src/generator.rs \ + --replace 'Command::new("systemd-detect-virt")' 'Command::new("${systemd}/bin/systemd-detect-virt")' \ + --replace 'Command::new("modprobe")' 'Command::new("${kmod}/bin/modprobe")' + ''; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + pkg-config + ronn + ]; + + buildInputs = [ + systemd + ]; + + makeFlags = [ + "PREFIX=$(out)" + "SYSTEMD_SYSTEM_UNIT_DIR=$(out)/lib/systemd/system" + "SYSTEMD_SYSTEM_GENERATOR_DIR=$(out)/lib/systemd/system-generators" + ]; + + passthru = { + tests = { + inherit (nixosTests) zram-generator; + }; + updateScript = ./update.sh; + }; + + meta = with lib; { + homepage = "https://github.com/systemd/zram-generator"; + license = licenses.mit; + description = "Systemd unit generator for zram devices"; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/system/zram-generator/update.sh b/third_party/nixpkgs/pkgs/tools/system/zram-generator/update.sh new file mode 100755 index 0000000000..bd10e19631 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/zram-generator/update.sh @@ -0,0 +1,15 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p coreutils curl jq common-updater-scripts cargo +# shellcheck shell=bash + +set -euo pipefail + +version=$(curl -s https://api.github.com/repos/systemd/zram-generator/releases/latest | jq -r .tag_name) +update-source-version zram-generator "${version#v}" + +tmp=$(mktemp -d) +trap 'rm -rf -- "${tmp}"' EXIT + +git clone --depth 1 --branch "${version}" https://github.com/systemd/zram-generator.git "${tmp}/zram-generator" +cargo generate-lockfile --manifest-path "${tmp}/zram-generator/Cargo.toml" +cp "${tmp}/zram-generator/Cargo.lock" "$(dirname "$0")/Cargo.lock" diff --git a/third_party/nixpkgs/pkgs/tools/text/cidrgrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/cidrgrep/default.nix index c636eef3c4..2feadbabfd 100644 --- a/third_party/nixpkgs/pkgs/tools/text/cidrgrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/cidrgrep/default.nix @@ -11,7 +11,7 @@ buildGoModule { hash = "sha256-Bp1cST6/8ppvpgNxjUpwL498C9vTJmoWOKLJgmWqfEs="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; postInstall = '' mv $out/bin/cmd $out/bin/cidrgrep diff --git a/third_party/nixpkgs/pkgs/tools/text/cmigemo/default.nix b/third_party/nixpkgs/pkgs/tools/text/cmigemo/default.nix index 1f9ef7701b..7b2598a9cf 100644 --- a/third_party/nixpkgs/pkgs/tools/text/cmigemo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/cmigemo/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchFromGitHub, buildPackages -, libiconv, nkf, perl, which +, iconv, nkf, perl, which , skk-dicts }: -let - iconvBin = if stdenv.isDarwin then libiconv else buildPackages.stdenv.cc.libc; -in stdenv.mkDerivation { pname = "cmigemo"; version = "1.3e"; @@ -17,7 +14,7 @@ stdenv.mkDerivation { sha256 = "00a6kdmxp16b8x0p04ws050y39qspd1bqlfq74bkirc55b77a2m1"; }; - nativeBuildInputs = [ libiconv nkf perl which ]; + nativeBuildInputs = [ iconv nkf perl which ]; postUnpack = '' cp ${skk-dicts}/share/SKK-JISYO.L source/dict/ @@ -27,10 +24,6 @@ stdenv.mkDerivation { makeFlags = [ "INSTALL=install" ]; - preBuild = '' - makeFlagsArray+=(FILTER_UTF8="${lib.getBin iconvBin}/bin/iconv -t utf-8 -f cp932") - ''; - buildFlags = [ (if stdenv.isDarwin then "osx-all" else "gcc-all") ]; installTargets = [ (if stdenv.isDarwin then "osx-install" else "gcc-install") ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/codesearch/default.nix b/third_party/nixpkgs/pkgs/tools/text/codesearch/default.nix index b02d4fcd5f..f0a23d8d30 100644 --- a/third_party/nixpkgs/pkgs/tools/text/codesearch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/codesearch/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-i03w8PZ31j5EutUZaamZsHz+z4qgX4prePbj5DLA78s="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/comrak/default.nix b/third_party/nixpkgs/pkgs/tools/text/comrak/default.nix index f4ad0f485e..3f751dc4d7 100644 --- a/third_party/nixpkgs/pkgs/tools/text/comrak/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/comrak/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "comrak"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = pname; rev = version; - sha256 = "sha256-F6MZxbB3FYEJ8tzJ0tp9/s0aLaH35QUnOJS6mCVfzUQ="; + sha256 = "sha256-ZKIqjeRsNTQYaa5itBSnqQ1w54Yq/iY2EQfDN713KGM="; }; - cargoSha256 = "sha256-+QPzwfoxt6+gpb4bDMd++1dBKoXOTON0z2EDdgmyy60="; + cargoSha256 = "sha256-Xafdt4AGympN6CLctOWfbCNfhwp4XN6XmSYESgjhRPk="; meta = with lib; { description = "A CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix b/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix index e2573861f3..aaafad2794 100644 --- a/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.9.1"; + version = "3.10.0"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - sha256 = "sha256-n5eDe29+HhH4YHNLzRhIpx2ceH1pw0TaXdTtVZYNT48="; + sha256 = "sha256-4OEwee7izd2gxv7HMq5ziu88sj78QRtGH4bgooZXLow="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix b/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix index 56f5bae312..922a66a9e1 100644 --- a/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/csvkit/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ nose pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/d2/default.nix b/third_party/nixpkgs/pkgs/tools/text/d2/default.nix index 326e5b18ba..53cb9b876f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/d2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/d2/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "d2"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-z7R3lseEPWtBl5wjpMK8okQG31L1k2R/+B9M25TrI6s="; + hash = "sha256-bPEEL4t5R/2DnO1IKaTV5NIfT+RL9MVRuoBLlsSPJgM="; }; - vendorHash = "sha256-t94xCNteYRpbV2GzrD4ppD8xfUV1HTJPkipEzr36CaM="; + vendorHash = "sha256-IKISxtAo9zKV6nLGAUNjtNb/YzRK2QO7Wa4RSNthzPU="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix b/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix index a85e91b1a0..c376411e6f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gawk/default.nix @@ -16,7 +16,7 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { pname = "gawk" + lib.optionalString interactive "-interactive"; version = "5.2.1"; @@ -31,13 +31,19 @@ stdenv.mkDerivation (rec { ./darwin-no-pma.patch ]; + # PIE is incompatible with the "persistent malloc" ("pma") feature. + # While build system attempts to pass -no-pie to gcc. nixpkgs' `ld` + # wrapped still passes `-pie` flag to linker and breaks linkage. + # Let's disable "pie" until `ld` is fixed to do the right thing. + hardeningDisable = [ "pie" ]; + # When we do build separate interactive version, it makes sense to always include man. outputs = [ "out" "info" ] ++ lib.optional (!interactive) "man"; - nativeBuildInputs = lib.optional (doCheck && stdenv.isLinux) glibcLocales - # no-pma fix - ++ [ autoreconfHook ]; + # no-pma fix + nativeBuildInputs = [ autoreconfHook ] + ++ lib.optional (doCheck && stdenv.isLinux) glibcLocales; buildInputs = lib.optional withSigsegv libsigsegv ++ lib.optional interactive readline @@ -83,8 +89,4 @@ stdenv.mkDerivation (rec { platforms = platforms.unix ++ platforms.windows; maintainers = [ ]; }; -} // lib.optionalAttrs stdenv.hostPlatform.isMusl { - # PIE is incompatible with the "persistent malloc" ("pma") feature. - # FIXME: make unconditional in staging (added to avoid rebuilds in staging-next) - hardeningDisable = [ "pie" ]; -}) +} diff --git a/third_party/nixpkgs/pkgs/tools/text/gawk/gawkextlib.nix b/third_party/nixpkgs/pkgs/tools/text/gawk/gawkextlib.nix index 1d3f14ea33..d15d5ce75f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gawk/gawkextlib.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gawk/gawkextlib.nix @@ -38,7 +38,7 @@ let inherit gawk; inherit doCheck; - checkInputs = [ more ]; + nativeCheckInputs = [ more ]; meta = with lib; { homepage = "https://sourceforge.net/projects/gawkextlib/"; diff --git a/third_party/nixpkgs/pkgs/tools/text/gnupatch/default.nix b/third_party/nixpkgs/pkgs/tools/text/gnupatch/default.nix index 8d8fa7d0a8..f4cb20202f 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gnupatch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gnupatch/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; doCheck = stdenv.hostPlatform.libc != "musl"; # not cross; - checkInputs = [ed]; + nativeCheckInputs = [ed]; meta = { description = "GNU Patch, a program to apply differences to files"; diff --git a/third_party/nixpkgs/pkgs/tools/text/goawk/default.nix b/third_party/nixpkgs/pkgs/tools/text/goawk/default.nix index c65a05c2a7..a9d71f1faa 100644 --- a/third_party/nixpkgs/pkgs/tools/text/goawk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/goawk/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { sha256 = "sha256-I6KmNPFD8kkYDyek8lR1ZS7biPA/LYGwJqMoA2fG7Wg="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; - checkInputs = [ gawk ]; + nativeCheckInputs = [ gawk ]; postPatch = '' substituteInPlace goawk_test.go \ diff --git a/third_party/nixpkgs/pkgs/tools/text/hck/default.nix b/third_party/nixpkgs/pkgs/tools/text/hck/default.nix index a888e76552..a1d30da61d 100644 --- a/third_party/nixpkgs/pkgs/tools/text/hck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/hck/default.nix @@ -2,37 +2,23 @@ , rustPlatform , fetchFromGitHub , cmake -, stdenv -, CoreFoundation -, Security }: rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.7.5"; + version = "0.9.1"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "sha256-29uxcbqAnWCdxKqVdrMVtorXvSLUC+jlt4YwE19Gh+A="; + sha256 = "sha256-wsuXEHwnTP+vl8Gn1mfH+cKoasDdZ+ILiAaJ7510lsI="; }; - cargoSha256 = "sha256-VHuzv6Zq83byXDEEyYDtlaPC4DZ3GNJaJfO0ACrrqO8="; + cargoSha256 = "sha256-qWat0QIMLmMrbK/QCr3dSyWP27wFFQ+IDQAzLngThQE="; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; - - # link System as a dylib instead of a framework on macos - postPatch = lib.optionalString stdenv.isDarwin '' - core_affinity=../$(stripHash $cargoDeps)/core_affinity - oldHash=$(sha256sum $core_affinity/src/lib.rs | cut -d " " -f 1) - substituteInPlace $core_affinity/src/lib.rs --replace framework dylib - substituteInPlace $core_affinity/.cargo-checksum.json \ - --replace $oldHash $(sha256sum $core_affinity/src/lib.rs | cut -d " " -f 1) - ''; - 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"; diff --git a/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix index 715a4dbaae..1ab884b12d 100644 --- a/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "080v8h09pv8qwplin4kwfm0kmqjwdqjfxbpcdrv16sv4hwfwl5qd"; }; - checkInputs = [ + nativeCheckInputs = [ bash git less diff --git a/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix index ea0ecf58a9..1e17cda75d 100644 --- a/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/igrep/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "igrep"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "konradsz"; repo = "igrep"; rev = "v${version}"; - sha256 = "sha256-pXgmbSmOLeAtI7pP0X9go4KnlLv4RChBQNCPYeG4Q84="; + sha256 = "sha256-g6DY3+HwBNQ+jxByXyTJK5CjAaC48FpmsDf1qGGO/Lk="; }; - cargoHash = "sha256-n1AVD6PuZFdZbTuGxNHvR6ngoVmSAixabcJl6nIcyP0="; + cargoHash = "sha256-7cSUIwWyWPxFDuRWplidbI93zbBV84T7e4Q//Uwj6N4="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix b/third_party/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix index caa6335d45..3852229376 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ledger2beancount/default.nix @@ -1,7 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages, beancount }: -with lib; - let perlDeps = with perlPackages; [ DateCalc @@ -17,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "ledger2beancount"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "beancount"; repo = "ledger2beancount"; rev = version; - sha256 = "sha256-0Br+zuSUYrNP+ZL/FtNoaYoYBYho5kVfxu0tqKJSuBk="; + sha256 = "sha256-2LIP3ljK1HMAwjk2ueIf9pFL+UUnGDgx9GYNtRztdFY="; }; dontBuild = true; @@ -44,7 +42,7 @@ in stdenv.mkDerivation rec { --set PERL5LIB "${perlPackages.makeFullPerlPath perlDeps}" ''; - meta = { + meta = with lib; { description = "Ledger to Beancount text-based converter"; longDescription = '' A script to automatically convert Ledger-based textual ledgers to Beancount ones. diff --git a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix index dfff4ffefe..af084b4aa1 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mark"; - version = "8.6"; + version = "8.7"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-2HcCibcP3/E3nu+PoNFChLFyCwAeAdp6I8mN95747Sg="; + sha256 = "sha256-A6EfP7l95eg9uL6NDqiPSzQ59JmTdE96UqunHETns9M="; }; - vendorHash = "sha256-t2xiw1Z0BIT7pO4Z16XmsJE72RgL9Hobfy7LakpEYh4="; + vendorHash = "sha256-LJ288Z8xz/Xoy5I2OAk9v5hxRUkQcRTmNaQ31kHE8gQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-epub/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-epub/default.nix new file mode 100644 index 0000000000..47c118afa4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-epub/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, bzip2 +, CoreServices +}: + +let + pname = "mdbook-epub"; + version = "unstable-2022-12-25"; +in rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "michael-f-bryan"; + repo = pname; + rev = "2e1e48d0d1a1b4c1b0f866267e6666b41c598225"; + hash = "sha256-wjn/7dv/Z2OmwvH/XaEeCz/JOvJWlMJ60q5qozzOEWY="; + }; + + cargoHash = "sha256-4oSpQUYJDK0srABZMwJ8x8jv6DOnLShXSnjLjf8c9Ac="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + bzip2 + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + ]; + + meta = with lib; { + description = "mdbook backend for generating an e-book in the EPUB format"; + homepage = "https://michael-f-bryan.github.io/mdbook-epub"; + license = licenses.mpl20; + maintainers = with maintainers; [ yuu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-graphviz/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-graphviz/default.nix index ec683072e1..529009fa61 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-graphviz/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; - checkInputs = [ graphviz ]; + nativeCheckInputs = [ graphviz ]; meta = with lib; { description = "A preprocessor for mdbook, rendering Graphviz graphs to HTML at build time."; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix index 2d492f645d..c4fc19ef1a 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-katex"; - version = "0.3.2"; + version = "0.3.4"; src = fetchCrate { inherit pname version; - hash = "sha256-K96zIjWIHQN20LmmiqGEBv5/gi0CzHQt/FgRC00Z/lE="; + hash = "sha256-Bc9nUY2XyNlgOI436omg885Qm0BtqcrFsJz6qr2Zhys="; }; - cargoHash = "sha256-KIPP2tT9wrTrIy6YLgSCc4hgKJXT0ZJjp/ftSxs2row="; + cargoHash = "sha256-pH5ZN6bTjstrSTv0hdOoyWAdRLRjALarML3ZVoYvGRI="; OPENSSL_DIR = "${lib.getDev openssl}"; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-open-on-gh/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-open-on-gh/default.nix index f334645ba5..cba1e97591 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdbook-open-on-gh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-open-on-gh/default.nix @@ -1,26 +1,17 @@ -{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "mdbook-open-on-gh"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "badboy"; repo = pname; - rev = "2.2.0"; - hash = "sha256-x7ESuXoF5dYnJZpgDyYliVixCG4w/VX/Vhm3VqxsiEI="; + rev = version; + hash = "sha256-uXfvE34yRrTUjh/HTMvOeZVxX4Drt6sxziaazg0CR3I="; }; - cargoPatches = [ - # https://github.com/badboy/mdbook-open-on-gh/pull/7 - (fetchpatch { - name = "update-mdbook-for-rust-1.64.patch"; - url = "https://github.com/badboy/mdbook-open-on-gh/commit/bd20601bfcec144c9302b1ba1a1aff4b95b334d9.patch"; - hash = "sha256-3Df9Q3sqCpZzqCN9fi+wdeWjLUW4XdywIS3QUjsDE9g="; - }) - ]; - - cargoHash = "sha256-N0RwengTWk4luPIecIxzbFReGi+PtE77FJalPq1CdbA="; + cargoHash = "sha256-ol06ErggVLw2ThpXq9NRWEr7ymDSEBN4ae5zUmHKa7k="; meta = with lib; { description = "mdbook preprocessor to add a open-on-github link on every page"; diff --git a/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix index b022174502..47f74684c6 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mdcat/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-qpmzg1pmR4zv6wmwPB2ysgGU4v/QebpwKFpjbszEb/Q="; - checkInputs = [ ansi2html ]; + nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. checkFlags = [ "--skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length" diff --git a/third_party/nixpkgs/pkgs/tools/text/multitran/data/default.nix b/third_party/nixpkgs/pkgs/tools/text/multitran/data/default.nix index bfc148df78..78b6ee79ea 100644 --- a/third_party/nixpkgs/pkgs/tools/text/multitran/data/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/multitran/data/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://multitran.sourceforge.net/"; + homepage = "https://multitran.sourceforge.net/"; description = "Multitran data english-russian"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix b/third_party/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix index 91c4bb0ea7..c10a65c271 100644 --- a/third_party/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://multitran.sourceforge.net/"; + homepage = "https://multitran.sourceforge.net/"; description = "Multitran lib: library for reading Multitran's BTREE database format"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix b/third_party/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix index 0e6dd0d6e6..b035ce32cb 100644 --- a/third_party/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://multitran.sourceforge.net/"; + homepage = "https://multitran.sourceforge.net/"; description = "Multitran lib: enchanced locale facets"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix b/third_party/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix index 5cc8e724e7..41f17560d2 100644 --- a/third_party/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://multitran.sourceforge.net/"; + homepage = "https://multitran.sourceforge.net/"; description = "Multitran lib: main engine to query translations"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix b/third_party/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix index 454709b8eb..06317fe304 100644 --- a/third_party/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://multitran.sourceforge.net/"; + homepage = "https://multitran.sourceforge.net/"; description = "Multitran lib: basic useful functions"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix b/third_party/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix index 2428caada5..625f06734b 100644 --- a/third_party/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://multitran.sourceforge.net/"; + homepage = "https://multitran.sourceforge.net/"; description = "Multitran: simple command line utilities for dictionary maintenance"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [viric]; diff --git a/third_party/nixpkgs/pkgs/tools/text/ov/default.nix b/third_party/nixpkgs/pkgs/tools/text/ov/default.nix index 54ef6d7cb1..ebc7cdcf71 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ov/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ov/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "ov"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; rev = "refs/tags/v${version}"; - hash = "sha256-8xurv4RldKVeakYSkY4rxx9kCeXxKc7ou7bN1+uoY50="; + hash = "sha256-ow2tIML7+x0X3FSpr4UQ8bzzYhZJZ9pZL8eNReEjitQ="; }; - vendorHash = "sha256-hyvWyUJyDZgxlOJI5NhLNC6kf2e1SvH/msg2WMKTW4Y="; + vendorHash = "sha256-X2/kcXxdGwFvdiTu1MGyv90OngWmR/xR2YtjvmLkiVE="; ldflags = [ "-X main.Version=v${version}" diff --git a/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix b/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix index 37fc346eb0..a8bc284ccf 100644 --- a/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK32, boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "poedit"; - version = "3.1.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "vslavik"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook libxslt xmlto boost libtool pkg-config ]; - buildInputs = [ lucenepp nlohmann_json wxGTK30 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; + buildInputs = [ lucenepp nlohmann_json wxGTK32 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; propagatedBuildInputs = [ gettext ]; @@ -45,5 +45,7 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ dasj19 ]; + # configure: error: GTK+ build of wxWidgets is required + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix b/third_party/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix index f87bd5d7b1..5e175518b6 100644 --- a/third_party/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents"; license = lib.licenses.mit; - homepage = "http://openjade.sourceforge.net/"; + homepage = "https://openjade.sourceforge.net/"; platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix b/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix index d55afbc5dd..848bd5ce82 100644 --- a/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A suite of SGML/XML processing tools"; license = licenses.mit; - homepage = "http://openjade.sourceforge.net/"; + homepage = "https://openjade.sourceforge.net/"; platforms = platforms.unix; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/sift/default.nix b/third_party/nixpkgs/pkgs/tools/text/sift/default.nix index f282c28f8f..1e79570622 100644 --- a/third_party/nixpkgs/pkgs/tools/text/sift/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/sift/default.nix @@ -1,27 +1,34 @@ -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "sift"; version = "0.9.0"; - rev = "v${version}"; - goPackagePath = "github.com/svent/sift"; + src = fetchFromGitHub { + owner = "svent"; + repo = "sift"; + rev = "v${version}"; + hash = "sha256-IZ4Hwg5NzdSXtrIDNxtkzquuiHQOmLV1HSx8gpwE/i0="; + }; + + vendorHash = "sha256-y883la4R4jhsS99/ohgBC9SHggybAq9hreda6quG3IY="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/svent/sift/commit/b56fb3d0fd914c8a6c08b148e15dd8a07c7d8a5a.patch"; + hash = "sha256-mFCEpkgQ8XDPRQ3yKDZ5qY9tKGSuHs+RnhMeAlx33Ng="; + }) + ]; nativeBuildInputs = [ installShellFiles ]; - src = fetchFromGitHub { - inherit rev; - owner = "svent"; - repo = "sift"; - sha256 = "0bgy0jf84z1c3msvb60ffj4axayfchdkf0xjnsbx9kad1v10g7i1"; - }; + ldflags = [ "-s" "-w" ]; postInstall = '' - installShellCompletion --cmd sift --bash go/src/github.com/svent/sift/sift-completion.bash + installShellCompletion --cmd sift --bash sift-completion.bash ''; - goDeps = ./deps.nix; - meta = with lib; { description = "A fast and powerful alternative to grep"; homepage = "https://sift-tool.org"; diff --git a/third_party/nixpkgs/pkgs/tools/text/sift/deps.nix b/third_party/nixpkgs/pkgs/tools/text/sift/deps.nix deleted file mode 100644 index 038555fa3c..0000000000 --- a/third_party/nixpkgs/pkgs/tools/text/sift/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; - sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; - }; - } - { - goPackagePath = "github.com/svent/go-flags"; - fetch = { - type = "git"; - url = "https://github.com/svent/go-flags"; - rev = "4bcbad344f0318adaf7aabc16929701459009aa3"; - sha256 = "1gb416fgxl9gq4q6wsv3i2grq1mzbi7lvfvmfdqbxqbv9vizzh34"; - }; - } - { - goPackagePath = "github.com/svent/go-nbreader"; - fetch = { - type = "git"; - url = "https://github.com/svent/go-nbreader"; - rev = "7cef48da76dca6a496faa7fe63e39ed665cbd219"; - sha256 = "0hw11jj5r3f6qwydg41nc3c6aadlbkhc1qpxra2609lis0qa9h4r"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/tools/text/tab/default.nix b/third_party/nixpkgs/pkgs/tools/text/tab/default.nix index b70171e290..0802f7b983 100644 --- a/third_party/nixpkgs/pkgs/tools/text/tab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/tab/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-AhgWeV/ojB8jM16A5ggrOD1YjWfRVcoQbkd3S2bgdyE="; }; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = !stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/tools/text/teip/default.nix b/third_party/nixpkgs/pkgs/tools/text/teip/default.nix index 2b06917996..14e1914dea 100644 --- a/third_party/nixpkgs/pkgs/tools/text/teip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/teip/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; postInstall = '' installManPage man/teip.1 diff --git a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix index ff48164846..b6ee1d60a8 100644 --- a/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.9.5"; + version = "3.9.7"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - hash = "sha256-vaoEfNhkvbcZwjSMRwmWo42jPg6+7mrZx+jIesQnmL0="; + hash = "sha256-y6P0EQfp2HFmhn2c7RwX8jVLUOfLT+LVhtz+OIoaVSo="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/text/wdiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/wdiff/default.nix index 510cf18369..d6ed960cce 100644 --- a/third_party/nixpkgs/pkgs/tools/text/wdiff/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/wdiff/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix index 36d7dea4ce..387e3735c7 100644 --- a/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/xml/basex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "basex"; - version = "10.2"; + version = "10.4"; src = fetchurl { url = "http://files.basex.org/releases/${version}/BaseX${builtins.replaceStrings ["."] [""] version}.zip"; - hash = "sha256-byx1gY/tzUmdi120tQzUywj9XroLyxYVMb4UilkChNk="; + hash = "sha256-lwPEy4VVe2D36T3t0vnEodL6L8/Q6adOTGqWI0m7YpM="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix b/third_party/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix index 741dcaad34..05c9a16ad3 100644 --- a/third_party/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utilities for manipulating HTML and XML files"; - homepage = "http://www.w3.org/Tools/HTML-XML-utils/"; + homepage = "https://www.w3.org/Tools/HTML-XML-utils/"; license = licenses.w3c; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix b/third_party/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix index 39d53088ba..d76e9d1449 100644 --- a/third_party/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "A command line tool for manipulating and querying XML data"; - homepage = "http://xmlstar.sourceforge.net/"; + homepage = "https://xmlstar.sourceforge.net/"; license = lib.licenses.mit; platforms = lib.platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/tools/text/zim-tools/default.nix b/third_party/nixpkgs/pkgs/tools/text/zim-tools/default.nix index 319eb47be2..06c71b05c0 100644 --- a/third_party/nixpkgs/pkgs/tools/text/zim-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/zim-tools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ docopt_cpp file gumbo mustache-hpp zimlib zlib ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; doCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/tools/text/zoekt/default.nix b/third_party/nixpkgs/pkgs/tools/text/zoekt/default.nix index 1c14c4fa5b..9710932cde 100644 --- a/third_party/nixpkgs/pkgs/tools/text/zoekt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/zoekt/default.nix @@ -16,7 +16,7 @@ buildGoModule { vendorHash = "sha256-DiAqFJ8E5V0/eHztm92WVrf1XGPXmmOaVXaWHfQMn2k="; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix index 4cfecfccdb..5e80158d90 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix @@ -253,7 +253,7 @@ in python3.pkgs.buildPythonApplication rec { installManPage doc/asciidoc.1 doc/a2x.1 doc/testasciidoc.1 ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest pytest-mock ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix index 42ac92698b..3fa76f56d0 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { format. ''; license = licenses.mit; - homepage = "http://docbook2x.sourceforge.net/"; + homepage = "https://docbook2x.sourceforge.net/"; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/hevea/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/hevea/default.nix index c2d9238bdd..a0eb1f75a3 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/hevea/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/hevea/default.nix @@ -5,17 +5,18 @@ stdenv.mkDerivation rec { version = "2.36"; src = fetchurl { - url = "https://pauillac.inria.fr/~maranget/hevea/distri/hevea-${version}.tar.gz"; + url = "https://hevea.inria.fr/distri/hevea-${version}.tar.gz"; sha256 = "sha256-XWdZ13AqKVx2oSwbKhoWdUqw7B/+1z/J0LE4tB5yBkg="; }; - buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; + nativeBuildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "A quite complete and fast LATEX to HTML translator"; - homepage = "http://pauillac.inria.fr/~maranget/hevea/"; + homepage = "https://hevea.inria.fr/"; + changelog = "https://github.com/maranget/hevea/raw/v${version}/CHANGES"; license = licenses.qpl; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/rfc-bibtex/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/rfc-bibtex/default.nix index de38b4cd29..a748983222 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/rfc-bibtex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/rfc-bibtex/default.nix @@ -15,7 +15,7 @@ with python3.pkgs; buildPythonApplication rec { hash = "sha256-bPCNQqiG50vWVFA6J2kyxftwsXunHTNBdSkoIRYkb0s="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook vcrpy ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix index d694a3cda0..16fe6c579c 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/satysfi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ruby, dune_2, ocamlPackages +{ lib, stdenv, fetchFromGitHub, ruby, ocamlPackages , ipaexfont, junicode, lmodern, lmmath }: let @@ -28,13 +28,13 @@ let rev = "v1.4.2+satysfi"; sha256 = "17s5xrnpim54d1apy972b5l08bph4c0m5kzbndk600fl0vnlirnl"; }; - useDune2 = true; + duneVersion = "3"; nativeBuildInputs = [ ocamlPackages.cppo ]; propagatedBuildInputs = [ ocamlPackages.biniou ]; inherit (ocamlPackages.yojson) meta; }; in - stdenv.mkDerivation rec { + ocamlPackages.buildDunePackage rec { pname = "satysfi"; version = "0.0.8"; src = fetchFromGitHub { @@ -51,23 +51,24 @@ in $out/share/satysfi ''; - DUNE_PROFILE = "release"; + duneVersion = "3"; - nativeBuildInputs = [ ruby dune_2 ]; + nativeBuildInputs = with ocamlPackages; [ menhir cppo ]; buildInputs = [ camlpdf otfm yojson-with-position ] ++ (with ocamlPackages; [ - ocaml findlib menhir menhirLib - batteries camlimages core_kernel ppx_deriving uutf omd cppo re + menhirLib + batteries camlimages core_kernel ppx_deriving uutf omd re ]); - installPhase = '' - cp -r ${ipaexfont}/share/fonts/opentype/* lib-satysfi/dist/fonts/ - cp -r ${junicode}/share/fonts/junicode-ttf/* lib-satysfi/dist/fonts/ - cp -r ${lmodern}/share/fonts/opentype/public/lm/* lib-satysfi/dist/fonts/ - cp -r ${lmmath}/share/fonts/opentype/latinmodern-math.otf lib-satysfi/dist/fonts/ - make install PREFIX=$out LIBDIR=$out/share/satysfi - mkdir -p $out/share/satysfi/ + postInstall = '' + mkdir -p $out/share/satysfi/dist/fonts cp -r lib-satysfi/dist/ $out/share/satysfi/ + cp -r \ + ${ipaexfont}/share/fonts/opentype/* \ + ${junicode}/share/fonts/junicode-ttf/* \ + ${lmodern}/share/fonts/opentype/public/lm/* \ + ${lmmath}/share/fonts/opentype/latinmodern-math.otf \ + $out/share/satysfi/dist/fonts ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix index a20aa5dc09..6d652c38f2 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/sile/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.14.7"; + version = "0.14.8"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "01sx4368bws47989zdahhksgy5jgc1qw4hhvpib4qcz3fs6xpx9j"; + sha256 = "0r00s7c8ycc9haqf7p141gj5jn3k0kxpjdzb538f1jpwkgi6mjh9"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/soupault/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/soupault/default.nix index e6cd6de9e6..3c3b736bf2 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/soupault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/soupault/default.nix @@ -5,24 +5,31 @@ , testers }: -ocamlPackages.buildDunePackage rec { +let pname = "soupault"; - version = "4.3.1"; - minimalOCamlVersion = "4.08"; + version = "4.4.0"; +in +ocamlPackages.buildDunePackage { + inherit pname version; + + minimalOCamlVersion = "4.13"; + + duneVersion = "3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "PataphysicalSociety"; repo = pname; rev = version; - sha256 = "sha256-P8PGSJ7TOlnMoTcE5ZXqc7pJe4l+zRhBh0A/2iIJLQI="; + sha256 = "sha256-M4gaPxBxQ1Bk2C3BwvobYHyaWKIZgQ6buZ6S5wBlvPg="; }; buildInputs = with ocamlPackages; [ base64 camomile containers + digestif ezjsonm fileutils fmt diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix index 5ccc9ed156..89eaf0346a 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to convert DocBook to DVI, PostScript or PDF via LaTeX or ConTeXt"; - homepage = "http://dblatex.sourceforge.net/"; + homepage = "https://dblatex.sourceforge.net/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index baf6fcc687..6876e40900 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -53,7 +53,8 @@ let ''; }; - withLuaJIT = !(stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit); + # RISC-V: https://github.com/LuaJIT/LuaJIT/issues/628 + withLuaJIT = !(stdenv.hostPlatform.isPower && stdenv.hostPlatform.is64bit) && !stdenv.hostPlatform.isRiscV; in rec { # un-indented inherit (common) cleanBrokenLinks; diff --git a/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix b/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix index f75c38111a..32d9cc9d3d 100644 --- a/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/rav1e/default.nix @@ -3,8 +3,11 @@ , stdenv , rustPlatform , fetchCrate -, nasm +, pkg-config , cargo-c +, libgit2 +, nasm +, zlib , libiconv , Security }: @@ -24,7 +27,9 @@ in rustPlatform.buildRustPackage rec { auditable = true; # TODO: remove when this is the default - nativeBuildInputs = [ nasm cargo-c ]; + depsBuildBuild = [ pkg-config ]; + + nativeBuildInputs = [ cargo-c libgit2 nasm zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv diff --git a/third_party/nixpkgs/pkgs/tools/video/rtmpdump/default.nix b/third_party/nixpkgs/pkgs/tools/video/rtmpdump/default.nix index 6e05f81fcd..b6293ffbc5 100644 --- a/third_party/nixpkgs/pkgs/tools/video/rtmpdump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/rtmpdump/default.nix @@ -12,7 +12,6 @@ assert (gnutlsSupport || opensslSupport); -with lib; stdenv.mkDerivation { pname = "rtmpdump"; version = "unstable-2021-02-19"; @@ -36,20 +35,20 @@ stdenv.mkDerivation { "prefix=$(out)" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ] - ++ optional gnutlsSupport "CRYPTO=GNUTLS" - ++ optional opensslSupport "CRYPTO=OPENSSL" - ++ optional stdenv.isDarwin "SYS=darwin" - ++ optional stdenv.cc.isClang "CC=clang"; + ++ lib.optional gnutlsSupport "CRYPTO=GNUTLS" + ++ lib.optional opensslSupport "CRYPTO=OPENSSL" + ++ lib.optional stdenv.isDarwin "SYS=darwin" + ++ lib.optional stdenv.cc.isClang "CC=clang"; propagatedBuildInputs = [ zlib ] - ++ optionals gnutlsSupport [ gnutls nettle ] - ++ optional opensslSupport openssl; + ++ lib.optionals gnutlsSupport [ gnutls nettle ] + ++ lib.optional opensslSupport openssl; outputs = [ "out" "dev" ]; separateDebugInfo = true; - meta = { + meta = with lib; { description = "Toolkit for RTMP streams"; homepage = "https://rtmpdump.mplayerhq.hu/"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/tools/video/tsduck/default.nix b/third_party/nixpkgs/pkgs/tools/video/tsduck/default.nix index e2db2e80ce..bb4757a4cf 100644 --- a/third_party/nixpkgs/pkgs/tools/video/tsduck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/tsduck/default.nix @@ -49,6 +49,14 @@ stdenv.mkDerivation rec { sed -i"" \ -e '/TSUNIT_TEST(testHomeDirectory);/ d' \ src/utest/utestSysUtils.cpp + + sed -i"" \ + -e '/TSUNIT_TEST(testIPv4Address);/ d' \ + -e '/TSUNIT_TEST(testIPv4AddressConstructors);/ d' \ + -e '/TSUNIT_TEST(testIPv4SocketAddressConstructors);/ d' \ + -e '/TSUNIT_TEST(testTCPSocket);/ d' \ + -e '/TSUNIT_TEST(testUDPSocket);/ d' \ + src/utest/utestNetworking.cpp ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/video/yamdi/default.nix b/third_party/nixpkgs/pkgs/tools/video/yamdi/default.nix index 92737e27ee..6665637e63 100644 --- a/third_party/nixpkgs/pkgs/tools/video/yamdi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/video/yamdi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Yet Another MetaData Injector for FLV"; - homepage = "http://yamdi.sourceforge.net/"; + homepage = "https://yamdi.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.ryanartecona ]; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix index af784bce98..e58b8f342d 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix @@ -16,7 +16,6 @@ let self = localPython; packageOverrides = self: super: { cement = changeVersion super.cement.overridePythonAttrs "2.8.2" "1li2whjzfhbpg6fjb6r1r92fb3967p1xv6hqs3j787865h2ysrc7"; - future = changeVersion super.future.overridePythonAttrs "0.16.0" "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773"; wcwidth = changeVersion super.wcwidth.overridePythonAttrs "0.1.9" "1wf5ycjx8s066rdvr0fgz4xds9a8zhs91c4jzxvvymm1c8l8cwzf"; semantic-version = changeVersion super.semantic-version.overridePythonAttrs "2.8.5" "d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"; pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { @@ -48,10 +47,11 @@ with localPython.pkgs; buildPythonApplication rec { preConfigure = '' substituteInPlace setup.py \ --replace "six>=1.11.0,<1.15.0" "six==1.16.0" \ - --replace "requests>=2.20.1,<=2.26" "requests==2.28.1" \ + --replace "requests>=2.20.1,<=2.26" "requests<3" \ --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<2" \ --replace "pathspec==0.9.0" "pathspec>=0.10.0,<0.11.0" \ --replace "colorama>=0.2.5,<0.4.4" "colorama>=0.2.5,<=0.4.6" \ + --replace "future>=0.16.0,<0.17.0" "future" \ --replace "termcolor == 1.1.0" "termcolor>=2.0.0,<2.2.0" ''; @@ -61,7 +61,7 @@ with localPython.pkgs; buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - checkInputs = [ + nativeCheckInputs = [ pytest mock nose diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix index 4b5f335938..40e3bfd5c1 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { requests ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook httpretty dmidecode diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix index 57c0d51d40..39aadcf8e3 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "govc"; - version = "0.30.0"; + version = "0.30.2"; subPackages = [ "govc" ]; @@ -10,10 +10,10 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-BMkty2H42fAILw/zRiAWE5cOX9WCZIs0503QODLHqxo="; + sha256 = "sha256-Jt71nrviElNj5UjWzdP51x3My59KAT+EtrQfodR3GfA="; }; - vendorSha256 = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k="; + vendorHash = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix index ebca615133..47c75e930d 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "0.57.1"; + version = "0.58.0"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - sha256 = "sha256-b832NNAoLYiHfvAm2eWGa8Odlppj8hLKl7jQA09s+4k="; + sha256 = "sha256-SZ7NN93/lnN2DsNrxKEziiJsLDkFkaCbWMTcUWYiO+w="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix index e75541d5ee..e25fcb3a19 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -11,10 +11,10 @@ }: let - sha256 = "0lngwmb9j3nzwhkhq4r9sy82gwjry14lvjjgm8vfivbbakjdl7xp"; + sha256 = "0r5by5d6wr5zbsaj211s99qg28nr7wm8iri6jxnksx5b375dah6g"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.139.0"; - specSha256 = "1z050vm049gb8vynp34iz9jpxwbpmbf5vbs1jsirwqbfhr1skslz"; + specVersion = "4.140.0"; + specSha256 = "0ay54m4aa8bmmpjc7s66rfzqzk4w25h48b9a665y29g67ybb432g"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; sha256 = specSha256; @@ -24,7 +24,7 @@ in buildPythonApplication rec { pname = "linode-cli"; - version = "5.25.0"; + version = "5.26.1"; src = fetchFromGitHub { owner = "linode"; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/udocker/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/udocker/default.nix index a209984776..4fbccf813f 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/udocker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/udocker/default.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { }) ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/swayimg/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/swayimg/default.nix index 24f44fa8d3..f3ba661e91 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/swayimg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/swayimg/default.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation rec { pname = "swayimg"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "artemsen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-864riSvWhWV4X84UeZ+xfQBOAQmwMrX6s90TXMGeruY="; + sha256 = "sha256-Iq7T00hvr9Mv50V/GKJBddjoeHdFa2DneVaXyxhMCE0="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/way-displays/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/way-displays/default.nix index f27c15f70d..60f2b3e837 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/way-displays/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/way-displays/default.nix @@ -4,18 +4,18 @@ , pkg-config , wayland , libinput -, libyamlcpp +, yaml-cpp }: stdenv.mkDerivation rec { pname = "way-displays"; - version = "1.6.2"; + version = "1.7.1"; src = fetchFromGitHub { owner = "alex-courtis"; repo = "way-displays"; rev = "${version}"; - sha256 = "sha256-/dZDYc0XQ1fZYAsk9bd8vMAh7GMKuY6FX0WK5of+AMk="; + sha256 = "sha256-o8fju0EQy2KS5yxe9DP3A8ewYgA2GzJtMY41BGJUZis="; }; strictDeps = true; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland - libyamlcpp + yaml-cpp libinput ]; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix index 4551f3d5f4..637876e0a3 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "wlr-randr"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ="; + sha256 = "sha256-iJSHCQbom+V0TrtEYrjMrMkdc6PoZrjhtcgebZYjQjI="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 39f375fa99..8e828c88c0 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -217,6 +217,8 @@ mapAliases ({ clang11Stdenv = lowPrio llvmPackages_11.stdenv; clang12Stdenv = lowPrio llvmPackages_12.stdenv; clang13Stdenv = lowPrio llvmPackages_13.stdenv; + clang14Stdenv = lowPrio llvmPackages_14.stdenv; + clang15Stdenv = lowPrio llvmPackages_15.stdenv; clangAnalyzer = throw "'clangAnalyzer' has been renamed to/replaced by 'clang-analyzer'"; # Converted to throw 2022-02-22 clasp = clingo; # added 2022-12-22 @@ -343,7 +345,6 @@ mapAliases ({ debian_devscripts = throw "'debian_devscripts' has been renamed to/replaced by 'debian-devscripts'"; # Converted to throw 2022-02-22 debugedit-unstable = debugedit; # Added 2021-11-22 - 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 deisctl = throw "deisctl was removed ; the service does not exist anymore"; # added 2022-02-06 deis = throw "deis was removed ; the service does not exist anymore"; # added 2022-02-06 @@ -419,6 +420,7 @@ mapAliases ({ emacsPackagesNgGen = throw "'emacsPackagesNgGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18 + empathy = throw "empathy was removed as it is unmaintained and no longer launches due to libsoup3 migration"; # Added 2023-01-20 enblendenfuse = throw "'enblendenfuse' has been renamed to/replaced by 'enblend-enfuse'"; # Converted to throw 2022-02-22 enchant1 = throw "enchant1 has been removed from nixpkgs, as it was unmaintained"; # Added 2023-01-18 encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06 @@ -526,7 +528,7 @@ mapAliases ({ glib_networking = throw "'glib_networking' has been renamed to/replaced by 'glib-networking'"; # Converted to throw 2022-02-22 glimpse = throw "glimpse was removed, as the project was discontinued. You can use gimp instead."; # Added 2022-07-11 gmailieer = lieer; # Added 2020-04-19 - gmic_krita_qt = gmic-qt-krita; # Added 2019-09-07 + gmic-qt-krita = throw "gmic-qt-krita was removed as it's no longer supported upstream."; # Converted to throw 2023-02-02 gmvault = throw "gmvault has been removed because it is unmaintained, mostly broken, and insecure"; # Added 2021-03-08 gnash = throw "gnash has been removed; broken and abandoned upstream"; # added 2022-02-06 gnome-breeze = throw "gnome-breeze has been removed, use libsForQt5.breeze-gtk instead"; # Added 2022-04-22 @@ -585,6 +587,8 @@ mapAliases ({ graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15 graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15 gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03 + gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17 + gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17 grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07 gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 @@ -823,6 +827,8 @@ mapAliases ({ libva-full = throw "'libva-full' has been renamed to/replaced by 'libva'"; # Converted to throw 2022-02-22 libva1-full = throw "'libva1-full' has been renamed to/replaced by 'libva1'"; # Converted to throw 2022-02-22 libwnck3 = libwnck; + libyamlcpp = yaml-cpp; # Added 2023-01-29 + libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29 lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lighttable = throw "'lighttable' crashes (SIGSEGV) on startup, has not been updated in years and depends on deprecated GTK2"; # Added 2022-06-15 lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2"; # Added 2022-01-14 @@ -839,7 +845,6 @@ mapAliases ({ linuxPackages_4_9 = linuxKernel.packages.linux_4_9; linuxPackages_5_10 = linuxKernel.packages.linux_5_10; linuxPackages_5_15 = linuxKernel.packages.linux_5_15; - linuxPackages_5_17 = linuxKernel.packages.linux_5_17; linuxPackages_5_18 = linuxKernel.packages.linux_5_18; linuxPackages_5_19 = linuxKernel.packages.linux_5_19; linuxPackages_5_4 = linuxKernel.packages.linux_5_4; @@ -860,7 +865,6 @@ mapAliases ({ linux_4_9 = linuxKernel.kernels.linux_4_9; linux_5_10 = linuxKernel.kernels.linux_5_10; linux_5_15 = linuxKernel.kernels.linux_5_15; - linux_5_17 = linuxKernel.kernels.linux_5_17; linux_5_18 = linuxKernel.kernels.linux_5_18; linux_5_19 = linuxKernel.kernels.linux_5_19; linux_5_4 = linuxKernel.kernels.linux_5_4; @@ -978,6 +982,7 @@ mapAliases ({ mpc_cli = mpc-cli; # moved from top-level 2022-01-24 mpd_clientlib = libmpdclient; # Added 2021-02-11 mpich2 = throw "'mpich2' has been renamed to/replaced by 'mpich'"; # Converted to throw 2022-02-22 + mps-youtube = throw "'mps-youtube' has been removed as it's unmaintained and stopped working. Use 'yewtube', a maintained fork"; # Added 2022-12-29 mqtt-bench = throw "mqtt-bench has been dropped due to the lack of maintenance from upstream since 2017"; # Added 2022-06-02 msf = throw "'msf' has been renamed to/replaced by 'metasploit'"; # Converted to throw 2022-02-22 multimc = throw "multimc was removed from nixpkgs; use prismlauncher instead (see https://github.com/NixOS/nixpkgs/pull/154051 for more information)"; # Added 2022-01-08 @@ -1087,6 +1092,7 @@ mapAliases ({ opensans-ttf = throw "'opensans-ttf' has been renamed to/replaced by 'open-sans'"; # Converted to throw 2022-02-22 openssh_with_kerberos = throw "'openssh_with_kerberos' has been renamed to/replaced by 'openssh'"; # Converted to throw 2022-02-22 openssl_3_0 = openssl_3; # Added 2022-06-27 + openvpn_24 = throw "openvpn_24 has been removed, because it went EOL. 2.5.x or newer is still available"; # Added 2023-01-23 orchis = orchis-theme; # Added 2021-06-09 osxfuse = macfuse-stubs; # Added 2021-03-20 otter-browser = throw "otter-browser has been removed from nixpkgs, as it was unmaintained"; # Added 2020-02-02 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 09af730bf0..3dcfc0f5d6 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -112,6 +112,12 @@ with pkgs; tests = callPackages ../test {}; + defaultPkgConfigPackages = + # We don't want nix-env -q to enter this, because all of these are aliases. + dontRecurseIntoAttrs ( + import ./pkg-config/defaultPkgConfigPackages.nix pkgs + ); + ### Nixpkgs maintainer tools nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { }; @@ -159,9 +165,10 @@ with pkgs; autoreconfHook = callPackage ( { makeSetupHook, autoconf, automake, gettext, libtool }: - makeSetupHook - { deps = [ autoconf automake gettext libtool ]; } - ../build-support/setup-hooks/autoreconf.sh + makeSetupHook { + name = "autoreconf-hook"; + deps = [ autoconf automake gettext libtool ]; + } ../build-support/setup-hooks/autoreconf.sh ) { }; autoreconfHook264 = autoreconfHook.override { @@ -203,8 +210,9 @@ with pkgs; substitutions = { canonicalize_jar = canonicalize-jar; }; } ../build-support/setup-hooks/canonicalize-jars.sh; - ensureNewerSourcesHook = { year }: makeSetupHook {} - (writeScript "ensure-newer-sources-hook.sh" '' + ensureNewerSourcesHook = { year }: makeSetupHook { + name = "ensure-newer-sources-hook"; + } (writeScript "ensure-newer-sources-hook.sh" '' postUnpackHooks+=(_ensureNewerSources) _ensureNewerSources() { '${findutils}/bin/find' "$sourceRoot" \ @@ -276,6 +284,8 @@ with pkgs; activate-linux = callPackage ../applications/misc/activate-linux { }; + ansi = callPackage ../development/tools/ansi { }; + arti = callPackage ../tools/security/arti { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -337,9 +347,10 @@ with pkgs; # ValueError: ZIP does not support timestamps before 1980 ensureNewerSourcesForZipFilesHook = ensureNewerSourcesHook { year = "1980"; }; - updateAutotoolsGnuConfigScriptsHook = makeSetupHook - { substitutions = { gnu_config = gnu-config;}; } - ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh; + updateAutotoolsGnuConfigScriptsHook = makeSetupHook { + name = "update-autotools-gnu-config-scripts-hook"; + substitutions = { gnu_config = gnu-config; }; + } ../build-support/setup-hooks/update-autotools-gnu-config-scripts.sh; gogUnpackHook = makeSetupHook { name = "gog-unpack-hook"; @@ -421,10 +432,14 @@ with pkgs; commix = callPackage ../tools/security/commix { }; + compdb = callPackage ../tools/misc/compdb { }; + conserver = callPackage ../tools/misc/conserver { }; containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; + coost = callPackage ../development/libraries/coost { }; + crc = callPackage ../applications/networking/cluster/crc { }; coordgenlibs = callPackage ../development/libraries/coordgenlibs { }; @@ -522,10 +537,15 @@ with pkgs; probe-run = callPackage ../development/tools/rust/probe-run { inherit (darwin.apple_sdk.frameworks) AppKit IOKit; + inherit (darwin) DarwinTools; }; mix2nix = callPackage ../development/tools/mix2nix { }; + n98-magerun = callPackage ../development/tools/misc/n98-magerun { }; + + n98-magerun2 = callPackage ../development/tools/misc/n98-magerun2 { }; + prisma-engines = callPackage ../development/tools/database/prisma-engines { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -606,7 +626,9 @@ with pkgs; diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; - dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; + dieHook = makeSetupHook { + name = "die-hook"; + } ../build-support/setup-hooks/die.sh; archiver = callPackage ../applications/misc/archiver { }; @@ -655,12 +677,10 @@ with pkgs; dotnet-sdk_7 = dotnetCorePackages.sdk_7_0; dotnet-runtime_3 = dotnetCorePackages.runtime_3_1; - dotnet-runtime_5 = dotnetCorePackages.runtime_5_0; dotnet-runtime_6 = dotnetCorePackages.runtime_6_0; dotnet-runtime_7 = dotnetCorePackages.runtime_7_0; dotnet-aspnetcore_3 = dotnetCorePackages.aspnetcore_3_1; - dotnet-aspnetcore_5 = dotnetCorePackages.aspnetcore_5_0; dotnet-aspnetcore_6 = dotnetCorePackages.aspnetcore_6_0; dotnet-aspnetcore_7 = dotnetCorePackages.aspnetcore_7_0; @@ -699,6 +719,8 @@ with pkgs; ebook2cw = callPackage ../applications/radio/ebook2cw { }; + qdmr = libsForQt5.callPackage ../applications/radio/qdmr { }; + edwin = callPackage ../data/fonts/edwin { }; etBook = callPackage ../data/fonts/et-book { }; @@ -935,6 +957,8 @@ with pkgs; fetchgx = callPackage ../build-support/fetchgx { }; + fetchPypi = callPackage ../build-support/fetchpypi { }; + resolveMirrorURLs = {url}: fetchurl { showURLs = true; inherit url; @@ -955,11 +979,15 @@ with pkgs; madonctl = callPackage ../applications/misc/madonctl { }; - copyDesktopItems = makeSetupHook { } ../build-support/setup-hooks/copy-desktop-items.sh; + copyDesktopItems = makeSetupHook { + name = "copy-desktop-items-hook"; + } ../build-support/setup-hooks/copy-desktop-items.sh; makeDesktopItem = callPackage ../build-support/make-desktopitem { }; - copyPkgconfigItems = makeSetupHook { } ../build-support/setup-hooks/copy-pkgconfig-items.sh; + copyPkgconfigItems = makeSetupHook { + name = "copy-pkg-config-items-hook"; + } ../build-support/setup-hooks/copy-pkgconfig-items.sh; makePkgconfigItem = callPackage ../build-support/make-pkgconfigitem { }; @@ -976,17 +1004,17 @@ with pkgs; makeWrapper = makeShellWrapper; - makeShellWrapper = makeSetupHook - { deps = [ dieHook ]; - substitutions = { - # targetPackages.runtimeShell only exists when pkgs == targetPackages (when targetPackages is not __raw) - shell = if targetPackages ? runtimeShell then targetPackages.runtimeShell else throw "makeWrapper/makeShellWrapper must be in nativeBuildInputs"; - }; - passthru = { - tests = tests.makeWrapper; - }; - } - ../build-support/setup-hooks/make-wrapper.sh; + makeShellWrapper = makeSetupHook { + name = "make-shell-wrapper-hook"; + deps = [ dieHook ]; + substitutions = { + # targetPackages.runtimeShell only exists when pkgs == targetPackages (when targetPackages is not __raw) + shell = if targetPackages ? runtimeShell then targetPackages.runtimeShell else throw "makeWrapper/makeShellWrapper must be in nativeBuildInputs"; + }; + passthru = { + tests = tests.makeWrapper; + }; + } ../build-support/setup-hooks/make-wrapper.sh; makeBinaryWrapper = callPackage ../build-support/setup-hooks/make-binary-wrapper { }; @@ -1027,9 +1055,10 @@ with pkgs; setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { }; - shortenPerlShebang = makeSetupHook - { deps = [ dieHook ]; } - ../build-support/setup-hooks/shorten-perl-shebang.sh; + shortenPerlShebang = makeSetupHook { + name = "shorten-perl-shebang-hook"; + deps = [ dieHook ]; + } ../build-support/setup-hooks/shorten-perl-shebang.sh; singularity-tools = callPackage ../build-support/singularity-tools { }; @@ -1066,7 +1095,9 @@ with pkgs; inherit (lib.systems) platforms; - setJavaClassPath = makeSetupHook { } ../build-support/setup-hooks/set-java-classpath.sh; + setJavaClassPath = makeSetupHook { + name = "set-java-classpath-hook"; + } ../build-support/setup-hooks/set-java-classpath.sh; fixDarwinDylibNames = makeSetupHook { name = "fix-darwin-dylib-names-hook"; @@ -1077,23 +1108,31 @@ with pkgs; writeDarwinBundle = callPackage ../build-support/make-darwin-bundle/write-darwin-bundle.nix { }; desktopToDarwinBundle = makeSetupHook { + name = "desktop-to-darwin-bundle-hook"; deps = [ writeDarwinBundle librsvg imagemagick python3Packages.icnsutil ]; } ../build-support/setup-hooks/desktop-to-darwin-bundle.sh; - keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh; + keepBuildTree = makeSetupHook { + name = "keep-build-tree-hook"; + } ../build-support/setup-hooks/keep-build-tree.sh; - enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; + enableGCOVInstrumentation = makeSetupHook { + name = "enable-gcov-instrumentation-hook"; + } ../build-support/setup-hooks/enable-coverage-instrumentation.sh; - makeGCOVReport = makeSetupHook - { deps = [ lcov enableGCOVInstrumentation ]; } - ../build-support/setup-hooks/make-coverage-analysis-report.sh; + makeGCOVReport = makeSetupHook { + name = "make-gcov-report-hook"; + deps = [ lcov enableGCOVInstrumentation ]; + } ../build-support/setup-hooks/make-coverage-analysis-report.sh; makeHardcodeGsettingsPatch = callPackage ../build-support/make-hardcode-gsettings-patch { }; # intended to be used like nix-build -E 'with import {}; enableDebugging fooPackage' enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; }; - findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; + findXMLCatalogs = makeSetupHook { + name = "find-xml-catalogs-hook"; + } ../build-support/setup-hooks/find-xml-catalogs.sh; wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { makeWrapper = makeBinaryWrapper; @@ -1103,11 +1142,17 @@ with pkgs; wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; - separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; + separateDebugInfo = makeSetupHook { + name = "separate-debug-info-hook"; + } ../build-support/setup-hooks/separate-debug-info.sh; - setupDebugInfoDirs = makeSetupHook { } ../build-support/setup-hooks/setup-debug-info-dirs.sh; + setupDebugInfoDirs = makeSetupHook { + name = "setup-debug-info-dirs-hook"; + } ../build-support/setup-hooks/setup-debug-info-dirs.sh; - useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh; + useOldCXXAbi = makeSetupHook { + name = "use-old-cxx-abi-hook"; + } ../build-support/setup-hooks/use-old-cxx-abi.sh; iconConvTools = callPackage ../build-support/icon-conv-tools {}; @@ -1334,6 +1379,8 @@ with pkgs; amidst = callPackage ../tools/games/minecraft/amidst { }; + askalono = callPackage ../tools/misc/askalono { }; + asleap = callPackage ../tools/networking/asleap { }; butler = callPackage ../games/itch/butler.nix { @@ -1360,8 +1407,12 @@ with pkgs; davinci-resolve = callPackage ../applications/video/davinci-resolve { }; + dolbybcsoftwaredecode = callPackage ../applications/audio/dolbybcsoftwaredecode { }; + dwarfs = callPackage ../tools/filesystems/dwarfs { }; + copier = callPackage ../tools/misc/copier { }; + gamemode = callPackage ../tools/games/gamemode { libgamemode32 = pkgsi686Linux.gamemode.lib; }; @@ -1384,6 +1435,8 @@ with pkgs; gfshare = callPackage ../tools/security/gfshare { }; + gh-actions-cache = callPackage ../tools/misc/gh-actions-cache { }; + gh-cal = callPackage ../tools/misc/gh-cal { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -1420,12 +1473,16 @@ with pkgs; httm = callPackage ../tools/filesystems/httm { }; + inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service; + jobber = callPackage ../tools/system/jobber {}; kanata = callPackage ../tools/system/kanata { }; kanata-with-cmd = kanata.override { withCmd = true; }; + kaufkauflist = callPackage ../applications/misc/kaufkauflist { }; + ksmbd-tools = callPackage ../os-specific/linux/ksmbd-tools { }; ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; @@ -1476,6 +1533,8 @@ with pkgs; sgrep = callPackage ../tools/text/sgrep { }; + simple-dlna-browser = callPackage ../tools/networking/simple-dlna-browser { }; + sorted-grep = callPackage ../tools/text/sorted-grep { }; smbscan = callPackage ../tools/security/smbscan { }; @@ -1838,7 +1897,6 @@ with pkgs; git-town = callPackage ../applications/version-management/git-town { }; git-trim = callPackage ../applications/version-management/git-trim { - openssl = openssl_1_1; inherit (darwin.apple_sdk.frameworks) Security; }; @@ -1874,6 +1932,8 @@ with pkgs; gitnuro = callPackage ../applications/version-management/gitnuro { }; + gitprompt-rs = callPackage ../applications/version-management/gitprompt-rs/default.nix { }; + gitsign = callPackage ../applications/version-management/gitsign { }; gitstats = callPackage ../applications/version-management/gitstats { }; @@ -1972,7 +2032,12 @@ with pkgs; wxGTK = wxGTK32; }; - box64 = callPackage ../applications/emulators/box64 { }; + box64 = callPackage ../applications/emulators/box64 { + hello-x86_64 = if stdenv.hostPlatform.isx86_64 then + hello + else + pkgsCross.gnu64.hello; + }; caprice32 = callPackage ../applications/emulators/caprice32 { }; @@ -2079,9 +2144,7 @@ with pkgs; description = mame.meta.description + " (tools only)"; } (lib.getOutput "tools" mame); - mednafen = callPackage ../applications/emulators/mednafen { - inherit (darwin) libiconv; - }; + mednafen = callPackage ../applications/emulators/mednafen { }; mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; @@ -2112,7 +2175,7 @@ with pkgs; pcsxr = callPackage ../applications/emulators/pcsxr { }; - ppsspp = callPackage ../applications/emulators/ppsspp { }; + ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { }; ppsspp-sdl = ppsspp; @@ -2122,7 +2185,7 @@ with pkgs; }; ppsspp-qt = ppsspp.override { - inherit (libsForQt5) qtbase qtmultimedia wrapQtAppsHook; + enableQt = true; enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/11628 }; @@ -2130,6 +2193,8 @@ with pkgs; punes = libsForQt5.callPackage ../applications/emulators/punes { }; + punes-qt6 = qt6Packages.callPackage ../applications/emulators/punes { }; + py65 = python3Packages.callPackage ../applications/emulators/py65 { }; resim = callPackage ../applications/emulators/resim {}; @@ -2138,6 +2203,8 @@ with pkgs; ripes = libsForQt5.callPackage ../applications/emulators/ripes { }; + rpcemu = callPackage ../applications/emulators/rpcemu { }; + rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { }; ruffle = callPackage ../applications/emulators/ruffle { }; @@ -2185,6 +2252,7 @@ with pkgs; zesarux = callPackage ../applications/emulators/zesarux { }; zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; + zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { }; ### APPLICATIONS/EMULATORS/BSNES @@ -2198,13 +2266,19 @@ with pkgs; dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; - dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix { - inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; + dolphin-emu-beta = qt6Packages.callPackage ../applications/emulators/dolphin-emu/master.nix { + inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; + stdenv = + if stdenv.isDarwin && stdenv.isAarch64 then llvmPackages_14.stdenv + # https://github.com/NixOS/nixpkgs/issues/201254 + else if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv + else stdenv; }; dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; + fmt = fmt_8; }; ### APPLICATIONS/EMULATORS/RETROARCH @@ -2307,6 +2381,8 @@ with pkgs; portfolio-filemanager = callPackage ../applications/file-managers/portfolio-filemanager { }; + potreeconverter = callPackage ../applications/graphics/potreeconverter { }; + ranger = callPackage ../applications/file-managers/ranger { }; sfm = callPackage ../applications/file-managers/sfm { }; @@ -2462,9 +2538,7 @@ with pkgs; lilo = callPackage ../tools/misc/lilo { }; - logseq = callPackage ../applications/misc/logseq { - electron = electron_20; - }; + logseq = callPackage ../applications/misc/logseq { }; natls = callPackage ../tools/misc/natls { }; @@ -2860,6 +2934,8 @@ with pkgs; inherit (nodePackages) bitwarden-cli; + bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { }; + inherit (nodePackages) concurrently; bklk = callPackage ../applications/misc/bklk { }; @@ -3153,9 +3229,7 @@ with pkgs; gmni = callPackage ../applications/networking/browsers/gmni { }; - gmnisrv = callPackage ../servers/gemini/gmnisrv { - openssl = openssl_1_1; - }; + gmnisrv = callPackage ../servers/gemini/gmnisrv { }; gmnitohtml = callPackage ../applications/misc/gmnitohtml { }; @@ -3256,8 +3330,12 @@ with pkgs; itch = callPackage ../games/itch {}; + itchiodl = callPackage ../games/itchiodl { }; + itd = callPackage ../applications/misc/itd { }; + kord = callPackage ../applications/misc/kord { }; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; leetcode-cli = callPackage ../applications/misc/leetcode-cli { }; @@ -3352,7 +3430,7 @@ with pkgs; kjv = callPackage ../applications/misc/kjv { }; - lukesmithxyz-bible-kjv = callPackage ../applications/misc/lukesmithxyz-bible/kjv.nix { }; + lukesmithxyz-bible-kjv = callPackage ../applications/misc/kjv/lukesmithxyz-kjv.nix { }; luigi = callPackage ../applications/networking/cluster/luigi { }; @@ -3727,7 +3805,9 @@ with pkgs; brutespray = callPackage ../tools/security/brutespray { }; breakpointHook = assert stdenv.buildPlatform.isLinux; - makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh; + makeSetupHook { + name = "breakpoint-hook"; + } ../build-support/setup-hooks/breakpoint-hook.sh; btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { }; @@ -3859,6 +3939,8 @@ with pkgs; cde = callPackage ../tools/package-management/cde { }; + cdxgen = callPackage ../tools/security/cdxgen { }; + ceres-solver = callPackage ../development/libraries/ceres-solver { gflags = null; # only required for examples/tests }; @@ -4077,6 +4159,8 @@ with pkgs; changedetection-io = callPackage ../servers/web-apps/changedetection-io { }; + clini = callPackage ../tools/misc/clini { }; + clipster = callPackage ../tools/misc/clipster { }; clockify = callPackage ../applications/office/clockify { @@ -4150,6 +4234,8 @@ with pkgs; csv2latex = callPackage ../tools/misc/csv2latex { }; + csvq = callPackage ../development/tools/csvq { }; + csvs-to-sqlite = callPackage ../tools/misc/csvs-to-sqlite { }; cucumber = callPackage ../development/tools/cucumber {}; @@ -4708,12 +4794,6 @@ with pkgs; gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { }; - # NOTE: If overriding qt version, krita needs to use the same qt version as - # well. - gmic-qt-krita = gmic-qt.override { - variant = "krita"; - }; - gpg-tui = callPackage ../tools/security/gpg-tui { inherit (darwin.apple_sdk.frameworks) AppKit Foundation; inherit (darwin) libobjc libresolv; @@ -4761,6 +4841,8 @@ with pkgs; gsctl = callPackage ../applications/misc/gsctl { }; + gsocket = callPackage ../tools/networking/gsocket { }; + gthree = callPackage ../development/libraries/gthree { }; gtg = callPackage ../applications/office/gtg { }; @@ -5267,6 +5349,8 @@ with pkgs; pika = callPackage ../applications/graphics/pika { }; + pkg = callPackage ../tools/package-management/pkg { }; + playerctl = callPackage ../tools/audio/playerctl { }; pn = callPackage ../tools/text/pn { }; @@ -5306,7 +5390,6 @@ with pkgs; procs = darwin.apple_sdk_11_0.callPackage ../tools/admin/procs { inherit (darwin.apple_sdk_11_0.frameworks) Security; inherit (darwin.apple_sdk_11_0) Libsystem; - inherit (darwin) libiconv; }; procyon = callPackage ../tools/misc/procyon { }; @@ -5325,10 +5408,14 @@ with pkgs; river = callPackage ../applications/window-managers/river { }; - rivercarro = callPackage ../applications/misc/rivercarro { }; + rivercarro = callPackage ../applications/misc/rivercarro { + zig = zig_0_9; + }; rmapi = callPackage ../applications/misc/remarkable/rmapi { }; + rmate-sh = callPackage ../tools/misc/rmate-sh { }; + rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { }; rm-improved = callPackage ../applications/misc/rm-improved { }; @@ -5703,6 +5790,8 @@ with pkgs; byzanz = callPackage ../applications/video/byzanz {}; + algolia-cli = callPackage ../development/tools/algolia-cli { }; + anydesk = callPackage ../applications/networking/remote/anydesk { }; anystyle-cli = callPackage ../tools/misc/anystyle-cli { }; @@ -5784,6 +5873,7 @@ with pkgs; libceph = ceph.lib; inherit (callPackages ../tools/filesystems/ceph { lua = lua5_4; + fmt = fmt_8; }) ceph ceph-client; @@ -5907,9 +5997,7 @@ with pkgs; cpuminer = callPackage ../tools/misc/cpuminer { }; - crabz = callPackage ../tools/compression/crabz { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; + crabz = callPackage ../tools/compression/crabz { }; ethash = callPackage ../development/libraries/ethash { }; @@ -6558,6 +6646,8 @@ with pkgs; drone-runner-docker = callPackage ../development/tools/continuous-integration/drone-runner-docker { }; + drone-runner-ssh = callPackage ../development/tools/continuous-integration/drone-runner-ssh { }; + dropbear = callPackage ../tools/networking/dropbear { }; dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; @@ -6642,6 +6732,8 @@ with pkgs; edk2-uefi-shell = callPackage ../tools/misc/edk2-uefi-shell { }; + edlib = callPackage ../development/libraries/science/biology/edlib { }; + eff = callPackage ../development/interpreters/eff { }; eflite = callPackage ../applications/audio/eflite {}; @@ -7166,7 +7258,9 @@ with pkgs; findutils = callPackage ../tools/misc/findutils { }; - findup = callPackage ../tools/misc/findup { }; + findup = callPackage ../tools/misc/findup { + zig = zig_0_9; + }; bsd-finger = callPackage ../tools/networking/bsd-finger { }; bsd-fingerd = bsd-finger.override({ buildClient = false; }); @@ -7509,11 +7603,8 @@ with pkgs; gitkraken = callPackage ../applications/version-management/gitkraken { }; - gitlab = callPackage ../applications/version-management/gitlab { - openssl = openssl_1_1; - }; + gitlab = callPackage ../applications/version-management/gitlab { }; gitlab-ee = callPackage ../applications/version-management/gitlab { - openssl = openssl_1_1; gitlabEnterprise = true; }; @@ -7765,7 +7856,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - graphviz-nox = graphviz.override { + graphviz-nox = callPackage ../tools/graphics/graphviz { + inherit (darwin.apple_sdk.frameworks) ApplicationServices; withXorg = false; libdevil = libdevil-nox; }; @@ -8504,9 +8596,7 @@ with pkgs; jot = callPackage ../applications/misc/jot { }; - journaldriver = callPackage ../tools/misc/journaldriver { - openssl = openssl_1_1; - }; + journaldriver = callPackage ../tools/misc/journaldriver { }; jp = callPackage ../development/tools/jp { }; @@ -8590,6 +8680,7 @@ with pkgs; kakoune-unwrapped = callPackage ../applications/editors/kakoune { # See comments on https://github.com/NixOS/nixpkgs/pull/198836 # Remove below when stdenv for linux-aarch64 become recent enough. + # https://github.com/NixOS/nixpkgs/issues/201254 stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; }; kakoune = wrapKakoune kakoune-unwrapped { @@ -8603,7 +8694,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - kakoune-cr = callPackage ../tools/misc/kakoune-cr { }; + kakoune-cr = callPackage ../tools/misc/kakoune-cr { crystal = crystal_1_2; }; katana = callPackage ../tools/security/katana { }; @@ -8701,6 +8792,8 @@ with pkgs; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; + krunner-translator = libsForQt5.callPackage ../tools/misc/krunner-translator { }; + krunvm = callPackage ../applications/virtualization/krunvm { inherit (darwin) sigtool; }; @@ -8884,6 +8977,8 @@ with pkgs; mani = callPackage ../development/tools/mani { }; + manifest-tool = callPackage ../development/tools/manifest-tool { }; + mask = callPackage ../development/tools/mask { }; mathpix-snipping-tool = callPackage ../tools/misc/mathpix-snipping-tool { }; @@ -8926,6 +9021,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdbook-epub = callPackage ../tools/text/mdbook-epub { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + mdbook-cmdrun = callPackage ../tools/text/mdbook-cmdrun { }; mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz { @@ -8975,7 +9074,17 @@ with pkgs; memtester = callPackage ../tools/system/memtester { }; - mesa-demos = callPackage ../tools/graphics/mesa-demos { }; + mesa-demos = + let + wayland' = wayland.override { withLibraries = stdenv.isLinux; }; + in + callPackage ../tools/graphics/mesa-demos { + wayland = wayland'; + wayland-protocols = wayland-protocols.override { + wayland = wayland'; + wayland-scanner = wayland'.bin; + }; + }; mhonarc = perlPackages.MHonArc; @@ -9702,7 +9811,7 @@ with pkgs; mole = callPackage ../tools/networking/mole { }; morgen = callPackage ../applications/office/morgen { - electron = electron_15; + electron = electron_22; }; mosh = callPackage ../tools/networking/mosh { }; @@ -9921,7 +10030,7 @@ with pkgs; grocy = callPackage ../servers/grocy { }; inherit (callPackage ../servers/nextcloud {}) - nextcloud23 nextcloud24 nextcloud25; + nextcloud23 nextcloud24 nextcloud25 nextcloud26; nextcloud23Packages = ( callPackage ../servers/nextcloud/packages { apps = lib.importJSON ../servers/nextcloud/packages/23.json; @@ -9932,6 +10041,9 @@ with pkgs; nextcloud25Packages = ( callPackage ../servers/nextcloud/packages { apps = lib.importJSON ../servers/nextcloud/packages/25.json; }); + nextcloud26Packages = ( callPackage ../servers/nextcloud/packages { + apps = lib.importJSON ../servers/nextcloud/packages/26.json; + }); nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; @@ -10284,7 +10396,11 @@ with pkgs; openimagedenoise_1_2_x = callPackage ../development/libraries/openimagedenoise/1_2_x.nix { }; - openmvg = callPackage ../applications/science/misc/openmvg { }; + openmvg = callPackage ../applications/science/misc/openmvg { + inherit (llvmPackages) openmp; + }; + + openmvs = callPackage ../applications/science/misc/openmvs { }; openntpd = callPackage ../tools/networking/openntpd { }; @@ -10346,7 +10462,6 @@ with pkgs; opentsdb = callPackage ../tools/misc/opentsdb {}; inherit (callPackages ../tools/networking/openvpn {}) - openvpn_24 openvpn; openvpn3 = callPackage ../tools/networking/openvpn3 { }; @@ -10848,7 +10963,7 @@ with pkgs; pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; poedit = callPackage ../tools/text/poedit { - wxGTK30 = wxGTK30.override { withWebKit = true; }; + wxGTK32 = wxGTK32.override { withWebKit = true; }; }; polaris = callPackage ../servers/polaris { }; @@ -11053,7 +11168,7 @@ with pkgs; rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; rtabmap = libsForQt5.callPackage ../applications/video/rtabmap/default.nix { - pcl = pcl.override { vtk = vtkWithQt5; }; + pcl = pcl.override { vtk_8 = vtk_8_withQt5; }; }; rtaudio = callPackage ../development/libraries/audio/rtaudio { @@ -11216,9 +11331,7 @@ with pkgs; read-edid = callPackage ../os-specific/linux/read-edid { }; - readstat = callPackage ../applications/science/math/readstat { - inherit (pkgs.darwin) libiconv; - }; + readstat = callPackage ../applications/science/math/readstat { }; redir = callPackage ../tools/networking/redir { }; @@ -11410,6 +11523,8 @@ with pkgs; rpm-ostree = callPackage ../tools/misc/rpm-ostree { gperf = gperf_3_0; + # https://github.com/NixOS/nixpkgs/issues/201254 + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; }; rpm2targz = callPackage ../tools/archivers/rpm2targz { }; @@ -11466,6 +11581,8 @@ with pkgs; rustdesk = callPackage ../applications/networking/remote/rustdesk { }; + rustfilt = callPackage ../development/tools/rust/rustfilt { }; + rustscan = callPackage ../tools/security/rustscan { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12619,6 +12736,8 @@ with pkgs; oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; + ttfb = callPackage ../development/tools/ttfb { }; + twilight = callPackage ../tools/graphics/twilight { libX11 = xorg.libX11; }; @@ -12627,6 +12746,8 @@ with pkgs; twitterBootstrap = callPackage ../development/web/twitter-bootstrap {}; + twspace-crawler = callPackage ../tools/misc/twspace-crawler { }; + twspace-dl = callPackage ../tools/misc/twspace-dl { }; twtxt = python3Packages.callPackage ../applications/networking/twtxt { }; @@ -12651,6 +12772,8 @@ with pkgs; ua = callPackage ../tools/networking/ua { }; + uair = callPackage ../tools/misc/uair { }; + ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { }; ubridge = callPackage ../tools/networking/ubridge { }; @@ -12665,6 +12788,8 @@ with pkgs; udftools = callPackage ../tools/filesystems/udftools {}; + udp2raw = callPackage ../tools/networking/udp2raw { }; + udpreplay = callPackage ../tools/networking/udpreplay { }; udpt = callPackage ../servers/udpt { }; @@ -12900,6 +13025,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) OpenCL; }; + wakapi = callPackage ../tools/misc/wakapi { }; + wakatime = python2Packages.callPackage ../tools/misc/wakatime { }; weather = callPackage ../applications/misc/weather { }; @@ -13010,6 +13137,8 @@ with pkgs; xray = callPackage ../tools/networking/xray { }; + xteve = callPackage ../servers/xteve { }; + testdisk = libsForQt5.callPackage ../tools/system/testdisk { }; testdisk-qt = testdisk.override { enableQt = true; }; @@ -13938,6 +14067,7 @@ with pkgs; clang_12 = llvmPackages_12.clang; clang_13 = llvmPackages_13.clang; clang_14 = llvmPackages_14.clang; + clang_15 = llvmPackages_15.clang; clang-tools = callPackage ../development/tools/clang-tools { llvmPackages = llvmPackages_latest; @@ -13983,6 +14113,10 @@ with pkgs; llvmPackages = llvmPackages_14; }; + clang-tools_15 = callPackage ../development/tools/clang-tools { + llvmPackages = llvmPackages_15; + }; + clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { llvmPackages = llvmPackages_latest; inherit (llvmPackages_latest) clang; @@ -14039,18 +14173,18 @@ with pkgs; }; inherit (callPackages ../development/compilers/crystal { - llvmPackages = if stdenv.system == "aarch64-darwin" then llvmPackages_11 else llvmPackages_10; + llvmPackages = llvmPackages_13; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }) - crystal_1_0 - crystal_1_1 crystal_1_2 + crystal_1_7 crystal; crystal2nix = callPackage ../development/compilers/crystal2nix { }; icr = callPackage ../development/tools/icr { }; - scry = callPackage ../development/tools/scry { }; + scry = callPackage ../development/tools/scry { crystal = crystal_1_2; }; dasm = callPackage ../development/compilers/dasm { }; @@ -14531,13 +14665,28 @@ with pkgs; gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; - gccgo = wrapCC ((if stdenv.hostPlatform.isMusl then gcc_latest else gcc).cc.override { + gccgo = wrapCC (gcc.cc.override { name = "gccgo"; langCC = true; #required for go. langC = true; langGo = true; langJit = true; profiledCompiler = false; + } // { + # not supported on darwin: https://github.com/golang/go/issues/463 + meta.broken = stdenv.hostPlatform.isDarwin; + }); + + gccgo12 = wrapCC (gcc12.cc.override { + name = "gccgo"; + langCC = true; #required for go. + langC = true; + langGo = true; + langJit = true; + profiledCompiler = false; + } // { + # not supported on darwin: https://github.com/golang/go/issues/463 + meta.broken = stdenv.hostPlatform.isDarwin; }); ghdl = ghdl-mcode; @@ -14889,9 +15038,7 @@ with pkgs; jwasm = callPackage ../development/compilers/jwasm { }; - kind2 = callPackage ../development/compilers/kind2 { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kind2 = darwin.apple_sdk_11_0.callPackage ../development/compilers/kind2 { }; knightos-genkfs = callPackage ../development/tools/knightos/genkfs { }; @@ -14952,6 +15099,7 @@ with pkgs; lld_12 = llvmPackages_12.lld; lld_13 = llvmPackages_13.lld; lld_14 = llvmPackages_14.lld; + lld_15 = llvmPackages_15.lld; lldb = llvmPackages_latest.lldb; lldb_5 = llvmPackages_5.lldb; @@ -14964,6 +15112,7 @@ with pkgs; lldb_12 = llvmPackages_12.lldb; lldb_13 = llvmPackages_13.lldb; lldb_14 = llvmPackages_14.lldb; + lldb_15 = llvmPackages_15.lldb; llvm = llvmPackages.llvm; llvm_5 = llvmPackages_5.llvm; @@ -14976,6 +15125,7 @@ with pkgs; llvm_12 = llvmPackages_12.llvm; llvm_13 = llvmPackages_13.llvm; llvm_14 = llvmPackages_14.llvm; + llvm_15 = llvmPackages_15.llvm; libllvm = llvmPackages.libllvm; llvm-manpages = llvmPackages.llvm-manpages; @@ -15070,6 +15220,13 @@ with pkgs; targetLlvm = targetPackages.llvmPackages_14.llvm or llvmPackages_14.llvm; })); + llvmPackages_15 = recurseIntoAttrs (callPackage ../development/compilers/llvm/15 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_15.tools; + targetLlvmLibraries = targetPackages.llvmPackages_15.libraries or llvmPackages_15.libraries; + targetLlvm = targetPackages.llvmPackages_15.llvm or llvmPackages_15.llvm; + })); + llvmPackages_latest = llvmPackages_14; llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { }); @@ -15086,7 +15243,9 @@ with pkgs; microscheme = callPackage ../development/compilers/microscheme { }; - mint = callPackage ../development/compilers/mint { }; + minimacy = callPackage ../development/compilers/minimacy { }; + + mint = callPackage ../development/compilers/mint { crystal = crystal_1_2; }; mitama-cpp-result = callPackage ../development/libraries/mitama-cpp-result { }; @@ -15206,7 +15365,9 @@ with pkgs; opaline = callPackage ../development/tools/ocaml/opaline { }; - opam = callPackage ../development/tools/ocaml/opam { }; + opam = callPackage ../development/tools/ocaml/opam { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; opam_1_2 = callPackage ../development/tools/ocaml/opam/1.2.2.nix { inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; @@ -15519,7 +15680,6 @@ with pkgs; }; cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; cargo-bitbake = callPackage ../development/tools/rust/cargo-bitbake { }; cargo-c = callPackage ../development/tools/rust/cargo-c { @@ -15535,9 +15695,7 @@ with pkgs; cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-deb = callPackage ../development/tools/rust/cargo-deb { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cargo-deb = callPackage ../development/tools/rust/cargo-deb { }; cargo-deps = callPackage ../development/tools/rust/cargo-deps { }; cargo-edit = callPackage ../development/tools/rust/cargo-edit { inherit (darwin.apple_sdk.frameworks) Security; @@ -15551,7 +15709,7 @@ with pkgs; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; cargo-lock = callPackage ../development/tools/rust/cargo-lock { }; cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; }; cargo-pgx = callPackage ../development/tools/rust/cargo-pgx { inherit (darwin.apple_sdk.frameworks) Security; @@ -15574,6 +15732,7 @@ with pkgs; cargo-cache = callPackage ../development/tools/rust/cargo-cache { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-careful = callPackage ../development/tools/rust/cargo-careful { }; cargo-chef = callPackage ../development/tools/rust/cargo-chef { }; cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation; @@ -15590,6 +15749,7 @@ with pkgs; cargo-diet = callPackage ../development/tools/rust/cargo-diet { }; cargo-embed = callPackage ../development/tools/rust/cargo-embed { inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin) DarwinTools; }; cargo-espmonitor = callPackage ../development/tools/rust/cargo-espmonitor { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; @@ -15597,13 +15757,13 @@ with pkgs; cargo-feature = callPackage ../development/tools/rust/cargo-feature { }; cargo-flash = callPackage ../development/tools/rust/cargo-flash { inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin) DarwinTools; }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { - inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) Security CoreFoundation; }; @@ -15666,7 +15826,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-watch = callPackage ../development/tools/rust/cargo-watch { - inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices Foundation; }; cargo-wipe = callPackage ../development/tools/rust/cargo-wipe { }; cargo-workspaces = callPackage ../development/tools/rust/cargo-workspaces { @@ -15702,9 +15862,7 @@ with pkgs; maturin = callPackage ../development/tools/rust/maturin { inherit (darwin.apple_sdk.frameworks) Security; }; - panamax = callPackage ../development/tools/rust/panamax { - inherit (darwin.apple_sdk.frameworks) Security; - }; + panamax = callPackage ../development/tools/rust/panamax { }; ograc = callPackage ../development/tools/rust/ograc { }; @@ -15804,8 +15962,6 @@ with pkgs; spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { }; - spirv-llvm-translator_14 = callPackage ../development/compilers/spirv-llvm-translator { llvm = llvm_14; }; - sqldeveloper = callPackage ../development/tools/database/sqldeveloper { jdk = oraclejdk; }; @@ -15832,7 +15988,10 @@ with pkgs; svdtools = callPackage ../development/embedded/svdtools { }; - swift = callPackage ../development/compilers/swift { }; + swiftPackages = recurseIntoAttrs (callPackage ../development/compilers/swift { }); + inherit (swiftPackages) swift swiftpm sourcekit-lsp; + + swiftpm2nix = callPackage ../development/tools/swiftpm2nix { }; swiProlog = callPackage ../development/compilers/swi-prolog { openssl = openssl_1_1; @@ -16066,7 +16225,6 @@ with pkgs; cliscord = callPackage ../misc/cliscord { inherit (darwin.apple_sdk.frameworks) Security; - openssl = openssl_1_1; }; clisp = callPackage ../development/interpreters/clisp { @@ -16380,7 +16538,7 @@ with pkgs; bluezSupport = true; x11Support = true; }; - python311Full = python310.override { + python311Full = python311.override { self = python311Full; pythonAttr = "python311Full"; bluezSupport = true; @@ -16466,6 +16624,8 @@ with pkgs; pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {}; wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix {}; + pw-volume = callPackage ../tools/audio/pw-volume {}; + pyradio = callPackage ../applications/audio/pyradio {}; racket = callPackage ../development/interpreters/racket { @@ -16520,7 +16680,7 @@ with pkgs; rbenv = callPackage ../development/ruby-modules/rbenv { }; inherit (callPackage ../development/interpreters/ruby { - inherit (darwin) libiconv libobjc libunwind; + inherit (darwin) libobjc libunwind; inherit (darwin.apple_sdk.frameworks) Foundation; }) mkRubyVersion @@ -17248,6 +17408,8 @@ with pkgs; cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { }; + cloudlog = callPackage ../applications/radio/cloudlog { }; + cloudflare-warp = callPackage ../tools/networking/cloudflare-warp { }; cloudfoundry-cli = callPackage ../applications/networking/cluster/cloudfoundry-cli { }; @@ -17388,6 +17550,8 @@ with pkgs; datree = callPackage ../development/tools/datree { }; + detekt = callPackage ../development/tools/detekt { }; + dcadec = callPackage ../development/tools/dcadec { }; dejagnu = callPackage ../development/tools/misc/dejagnu { }; @@ -17681,8 +17845,6 @@ with pkgs; inherit jdk8 jdk11 jdk17; }; gradleGen = gradle-packages.gen; - gradle_4 = callPackage gradle-packages.gradle_4 { }; - gradle_5 = callPackage gradle-packages.gradle_5 { }; gradle_6 = callPackage gradle-packages.gradle_6 { }; gradle_7 = callPackage gradle-packages.gradle_7 { }; gradle = gradle_7; @@ -17916,6 +18078,8 @@ with pkgs; litestream = callPackage ../development/tools/database/litestream {}; + ls-lint = callPackage ../development/tools/ls-lint { }; + lsof = callPackage ../development/tools/misc/lsof { }; ltrace = callPackage ../development/tools/misc/ltrace { }; @@ -18239,6 +18403,8 @@ with pkgs; inherit (callPackage ../development/tools/replay-io { }) replay-io replay-node-cli; + reshape = callPackage ../development/tools/reshape { } ; + retdec = callPackage ../development/tools/analysis/retdec { stdenv = gcc8Stdenv; }; @@ -18615,11 +18781,13 @@ with pkgs; xcodebuild6 = xcodebuild.override { stdenv = llvmPackages_6.stdenv; }; xcbuild = xcodebuild; xcbuildHook = makeSetupHook { + name = "xcbuild-hook"; deps = [ xcbuild ]; } ../development/tools/xcbuild/setup-hook.sh ; # xcbuild with llvm 6 xcbuild6Hook = makeSetupHook { + name = "xcbuild6-hook"; deps = [ xcodebuild6 ]; } ../development/tools/xcbuild/setup-hook.sh ; @@ -18655,7 +18823,9 @@ with pkgs; ytt = callPackage ../development/tools/ytt {}; - zls = callPackage ../development/tools/zls { }; + zls = callPackage ../development/tools/zls { + zig = zig_0_9; + }; zydis = callPackage ../development/libraries/zydis { }; @@ -19224,6 +19394,8 @@ with pkgs; discordchatexporter-cli = callPackage ../tools/backup/discordchatexporter-cli { }; + discord-gamesdk = callPackage ../development/libraries/discord-gamesdk { }; + discord-rpc = callPackage ../development/libraries/discord-rpc { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -19319,6 +19491,8 @@ with pkgs; expat = callPackage ../development/libraries/expat { }; + exprtk = callPackage ../development/libraries/exprtk { }; + eventlog = callPackage ../development/libraries/eventlog { }; faac = callPackage ../development/libraries/faac { }; @@ -19462,10 +19636,9 @@ with pkgs; flyway = callPackage ../development/tools/flyway { }; - inherit (callPackages ../development/libraries/fmt { }) fmt_7 fmt_8 fmt_9; + inherit (callPackages ../development/libraries/fmt { }) fmt_8 fmt_9; - fmt = fmt_7; - fmt_latest = fmt_9; + fmt = fmt_9; fplll = callPackage ../development/libraries/fplll {}; fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {}; @@ -20645,6 +20818,12 @@ with pkgs; libcutl = callPackage ../development/libraries/libcutl { }; + libcxxrt = callPackage ../development/libraries/libcxxrt { + stdenv = if stdenv.hostPlatform.useLLVM or false + then overrideCC stdenv buildPackages.llvmPackages.tools.clangNoLibcxx + else stdenv; + }; + libdaemon = callPackage ../development/libraries/libdaemon { }; libdatovka = callPackage ../development/libraries/libdatovka { }; @@ -20678,14 +20857,14 @@ with pkgs; libdeltachat = callPackage ../development/libraries/libdeltachat { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - inherit (darwin) libiconv; }; libdevil = callPackage ../development/libraries/libdevil { inherit (darwin.apple_sdk.frameworks) OpenGL; }; - libdevil-nox = libdevil.override { + libdevil-nox = callPackage ../development/libraries/libdevil { + inherit (darwin.apple_sdk.frameworks) OpenGL; withXorg = false; }; @@ -20747,9 +20926,7 @@ with pkgs; libedit = callPackage ../development/libraries/libedit { }; - libelf = if stdenv.isFreeBSD - then callPackage ../development/libraries/libelf-freebsd { } - else callPackage ../development/libraries/libelf { }; + libelf = callPackage ../development/libraries/libelf { }; libelfin = callPackage ../development/libraries/libelfin { }; @@ -21137,17 +21314,15 @@ with pkgs; # We also provide `libiconvReal`, which will always be a standalone libiconv, # just in case you want it regardless of platform. libiconv = - if lib.elem stdenv.hostPlatform.libc ["glibc" "musl" "wasilibc"] - then glibcIconv (if stdenv.hostPlatform != stdenv.buildPlatform + if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" "nblibc" "wasilibc" ] + then libcIconv (if stdenv.hostPlatform != stdenv.buildPlatform then libcCross else stdenv.cc.libc) else if stdenv.hostPlatform.isDarwin then darwin.libiconv - else if stdenv.hostPlatform.isNetBSD - then null else libiconvReal; - glibcIconv = libc: let + libcIconv = libc: let inherit (libc) pname version; libcDev = lib.getDev libc; in runCommand "${pname}-iconv-${version}" { strictDeps = true; } '' @@ -21157,6 +21332,14 @@ with pkgs; libiconvReal = callPackage ../development/libraries/libiconv { }; + iconv = + if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" ] then + lib.getBin stdenv.cc.libc + else if stdenv.hostPlatform.isDarwin then + lib.getBin darwin.libiconv + else + lib.getBin libiconvReal; + # On non-GNU systems we need GNU Gettext for libintl. libintl = if stdenv.hostPlatform.libc != "glibc" then gettext else null; @@ -21343,6 +21526,8 @@ with pkgs; libopusenc = callPackage ../development/libraries/libopusenc { }; + liboqs = callPackage ../development/libraries/liboqs { }; + libosinfo = callPackage ../development/libraries/libosinfo { }; libosip = callPackage ../development/libraries/osip {}; @@ -21543,6 +21728,8 @@ with pkgs; libtsm = callPackage ../development/libraries/libtsm { }; + libsv = callPackage ../development/libraries/libsv { }; + libgeotiff = callPackage ../development/libraries/libgeotiff { }; libu2f-host = callPackage ../development/libraries/libu2f-host { }; @@ -21726,7 +21913,6 @@ with pkgs; libxml2 = callPackage ../development/libraries/libxml2 { python = python3; - inherit (darwin) libiconv; }; libxml2Python = let @@ -21763,9 +21949,9 @@ with pkgs; libyaml = callPackage ../development/libraries/libyaml { }; - libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; + yaml-cpp = callPackage ../development/libraries/yaml-cpp { }; - libyamlcpp_0_3 = callPackage ../development/libraries/libyaml-cpp/0.3.0.nix { }; + yaml-cpp_0_3 = callPackage ../development/libraries/yaml-cpp/0.3.0.nix { }; libyang = callPackage ../development/libraries/libyang { }; @@ -21880,6 +22066,7 @@ with pkgs; memorymapping = callPackage ../development/libraries/memorymapping { }; memorymappingHook = makeSetupHook { + name = "memorymapping-hook"; deps = [ memorymapping ]; } ../development/libraries/memorymapping/setup-hook.sh; @@ -21887,6 +22074,7 @@ with pkgs; memstream = callPackage ../development/libraries/memstream { }; memstreamHook = makeSetupHook { + name = "memstream-hook"; deps = [ memstream ]; } ../development/libraries/memstream/setup-hook.sh; @@ -21910,7 +22098,7 @@ with pkgs; libGLU = mesa_glu; mesa = callPackage ../development/libraries/mesa { - llvmPackages = llvmPackages_latest; + llvmPackages = llvmPackages_15; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; inherit (darwin.apple_sdk_11_0.frameworks) OpenGL; inherit (darwin.apple_sdk_11_0.libs) Xplugin; @@ -22011,7 +22199,10 @@ with pkgs; mtpfs = callPackage ../tools/filesystems/mtpfs { }; - mtxclient = callPackage ../development/libraries/mtxclient { }; + mtxclient = callPackage ../development/libraries/mtxclient { + # https://github.com/NixOS/nixpkgs/issues/201254 + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; + }; mu = callPackage ../tools/networking/mu { texinfo = texinfo4; @@ -22562,9 +22753,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; - qmake48Hook = makeSetupHook - { substitutions = { qt4 = qt48; }; } - ../development/libraries/qt-4.x/4.8/qmake-hook.sh; + qmake48Hook = makeSetupHook { + name = "qmake4.8-hook"; + substitutions = { qt4 = qt48; }; + } ../development/libraries/qt-4.x/4.8/qmake-hook.sh; qmake4Hook = qmake48Hook; @@ -22625,10 +22817,13 @@ with pkgs; qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix { inherit lib pkgs qt6; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); quark-engine = callPackage ../tools/security/quark-engine { }; + quantlib = callPackage ../development/libraries/quantlib { }; + quesoglc = callPackage ../development/libraries/quesoglc { }; quickder = callPackage ../development/libraries/quickder {}; @@ -22811,6 +23006,7 @@ with pkgs; SDL_compat = callPackage ../development/libraries/SDL_compat { inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin) autoSignDarwinBinariesHook; }; SDL = SDL_classic; @@ -23163,7 +23359,7 @@ with pkgs; subtitleeditor = callPackage ../applications/video/subtitleeditor { }; - suil = callPackage ../development/libraries/audio/suil { }; + suil = darwin.apple_sdk_11_0.callPackage ../development/libraries/audio/suil { }; sundials = callPackage ../development/libraries/sundials { python = python3; @@ -23382,6 +23578,8 @@ with pkgs; vkdt = callPackage ../applications/graphics/vkdt { }; + vkdt-wayland = callPackage ../applications/graphics/vkdt { glfw = glfw-wayland; }; + vlock = callPackage ../misc/screensavers/vlock { }; virtualpg = callPackage ../development/libraries/virtualpg { }; @@ -23409,7 +23607,7 @@ with pkgs; stdenv = gcc9Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration + inherit (darwin.apple_sdk.frameworks) AGL Cocoa CoreServices DiskArbitration IOKit CFNetwork Security ApplicationServices CoreText IOSurface ImageIO OpenGL GLUT; }; @@ -23419,18 +23617,20 @@ with pkgs; vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration + inherit (darwin.apple_sdk.frameworks) AGL Cocoa CoreServices DiskArbitration IOKit CFNetwork Security ApplicationServices CoreText IOSurface ImageIO OpenGL GLUT; }; vtk_9_withQt5 = vtk_9.override { enableQt = true; }; - vtk = vtk_8; - vtkWithQt5 = vtk_8_withQt5; + vtk = vtk_9; + vtkWithQt5 = vtk_9_withQt5; vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; + vulkan-cts = callPackage ../tools/graphics/vulkan-cts { }; + vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; }; @@ -23652,9 +23852,15 @@ with pkgs; libzra = callPackage ../development/libraries/libzra { }; # requires a newer Apple SDK - zig = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig { + zig_0_9 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.9.1.nix { llvmPackages = llvmPackages_13; }; + # requires a newer Apple SDK + zig_0_10 = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig/0.10.nix { + llvmPackages = llvmPackages_15; + }; + # Zig 0.10.1 is broken on Darwin, so use 0.9.1 on Darwin instead. + zig = if stdenv.isDarwin then zig_0_9 else zig_0_10; zimlib = callPackage ../development/libraries/zimlib { }; @@ -23990,14 +24196,17 @@ with pkgs; cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + python = python2; }; cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + python = python2; }; cassandra_4 = callPackage ../servers/nosql/cassandra/4.nix { # Effective Cassandra 4.0.2 there is full Java 11 support # -- https://cassandra.apache.org/doc/latest/cassandra/new/java11.html jre = pkgs.jdk11_headless; + python = python3; }; cassandra = cassandra_3_11; @@ -24088,6 +24297,8 @@ with pkgs; diod = callPackage ../servers/diod { lua = lua5_1; }; + directx-headers = callPackage ../development/libraries/directx-headers {}; + directx-shader-compiler = callPackage ../tools/graphics/directx-shader-compiler {}; dkimproxy = callPackage ../servers/mail/dkimproxy { }; @@ -24371,6 +24582,8 @@ with pkgs; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; + mbusd = callPackage ../servers/mbusd { }; + memcached = callPackage ../servers/memcached {}; merecat = callPackage ../servers/http/merecat { }; @@ -24885,6 +25098,7 @@ with pkgs; prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; prometheus-sachet = callPackage ../servers/monitoring/prometheus/sachet.nix { }; prometheus-script-exporter = callPackage ../servers/monitoring/prometheus/script-exporter.nix { }; + prometheus-shelly-exporter = callPackage ../servers/monitoring/prometheus/shelly-exporter.nix { }; prometheus-smartctl-exporter = callPackage ../servers/monitoring/prometheus/smartctl-exporter { }; prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; @@ -25458,6 +25672,8 @@ with pkgs; erofs-utils = callPackage ../os-specific/linux/erofs-utils { }; + evdev-proto = callPackage ../os-specific/bsd/freebsd/evdev-proto { }; + fscryptctl = callPackage ../os-specific/linux/fscryptctl { }; # unstable until the first 1.x release fscrypt-experimental = callPackage ../os-specific/linux/fscrypt { }; @@ -25502,6 +25718,8 @@ with pkgs; fan2go = callPackage ../os-specific/linux/fan2go { }; + fanctl = callPackage ../os-specific/linux/fanctl { }; + fatrace = callPackage ../os-specific/linux/fatrace { }; ffado = libsForQt5.callPackage ../os-specific/linux/ffado { @@ -26010,6 +26228,8 @@ with pkgs; iferr = callPackage ../development/tools/iferr { }; + gci = callPackage ../development/tools/gci { }; + ginkgo = callPackage ../development/tools/ginkgo { }; gdlv = darwin.apple_sdk_11_0.callPackage ../development/tools/gdlv { @@ -26170,6 +26390,8 @@ with pkgs; perf-tools = callPackage ../os-specific/linux/perf-tools { }; + picoprobe-udev-rules = callPackage ../os-specific/linux/picoprobe-udev-rules { }; + pipes = callPackage ../misc/screensavers/pipes { }; pipes-rs = callPackage ../misc/screensavers/pipes-rs { }; @@ -26275,6 +26497,8 @@ with pkgs; rtw89-firmware = callPackage ../os-specific/linux/firmware/rtw89-firmware { }; + rvvm = callPackage ../applications/virtualization/rvvm { }; + s3ql = callPackage ../tools/backup/s3ql { }; sasutils = callPackage ../os-specific/linux/sasutils { }; @@ -26430,6 +26654,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + trust-dns = callPackage ../servers/dns/trust-dns { }; + tunctl = callPackage ../os-specific/linux/tunctl { }; twa = callPackage ../tools/networking/twa { }; @@ -26674,7 +26900,7 @@ with pkgs; bgnet = callPackage ../data/documentation/bgnet { }; - bibata-cursors = callPackage ../data/icons/bibata-cursors { }; + bibata-cursors = callPackage ../data/icons/bibata-cursors { attrs = python3Packages.attrs; }; bibata-extra-cursors = callPackage ../data/icons/bibata-cursors/extra.nix { }; bibata-cursors-translucent = callPackage ../data/icons/bibata-cursors/translucent.nix { }; @@ -26817,6 +27043,8 @@ with pkgs; dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; + dotcolon-fonts = callPackage ../data/fonts/dotcolon-fonts { }; + e17gtk = callPackage ../data/themes/e17gtk { }; eb-garamond = callPackage ../data/fonts/eb-garamond { }; @@ -26837,6 +27065,10 @@ with pkgs; eunomia = callPackage ../data/fonts/eunomia { }; + fa_1 = callPackage ../data/fonts/fa_1 { }; + + f1_8 = callPackage ../data/fonts/f1_8 { }; + f5_6 = callPackage ../data/fonts/f5_6 { }; faba-icon-theme = callPackage ../data/icons/faba-icon-theme { }; @@ -27122,6 +27354,8 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; + lxgw-neoxihei = callPackage ../data/fonts/lxgw-neoxihei { }; + lxgw-wenkai = callPackage ../data/fonts/lxgw-wenkai { }; maia-icon-theme = libsForQt5.callPackage ../data/icons/maia-icon-theme { }; @@ -27174,6 +27408,8 @@ with pkgs; medio = callPackage ../data/fonts/medio { }; + melete = callPackage ../data/fonts/melete { }; + mno16 = callPackage ../data/fonts/mno16 { }; mnist = callPackage ../data/machine-learning/mnist { }; @@ -27210,6 +27446,8 @@ with pkgs; myrica = callPackage ../data/fonts/myrica { }; + nacelle = callPackage ../data/fonts/nacelle { }; + nafees = callPackage ../data/fonts/nafees { }; nanum = callPackage ../data/fonts/nanum { }; @@ -27388,6 +27626,7 @@ with pkgs; roapi-http = callPackage ../servers/roapi/http.nix { }; rose-pine-gtk-theme = callPackage ../data/themes/rose-pine-gtk { }; + rose-pine-icon-theme = callPackage ../data/icons/rose-pine { }; route159 = callPackage ../data/fonts/route159 { }; @@ -27503,6 +27742,8 @@ with pkgs; roboto-mono = callPackage ../data/fonts/roboto-mono { }; + roboto-serif = callPackage ../data/fonts/roboto-serif { }; + roboto-slab = callPackage ../data/fonts/roboto-slab { }; hasklig = callPackage ../data/fonts/hasklig {}; @@ -27965,6 +28206,10 @@ with pkgs; av-98 = callPackage ../applications/networking/browsers/av-98 { }; + avalanchego = callPackage ../applications/networking/avalanchego { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; + avizo = callPackage ../applications/misc/avizo { }; avocode = callPackage ../applications/graphics/avocode {}; @@ -28258,6 +28503,8 @@ with pkgs; cava = callPackage ../applications/audio/cava { }; + cavalier = callPackage ../applications/audio/cavalier { }; + cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -28374,9 +28621,11 @@ with pkgs; complete-alias = callPackage ../tools/misc/complete-alias { }; + completely = callPackage ../tools/misc/completely { }; + confclerk = libsForQt5.callPackage ../applications/misc/confclerk { }; - copyq = libsForQt5.callPackage ../applications/misc/copyq { }; + copyq = qt6Packages.callPackage ../applications/misc/copyq { }; corectrl = libsForQt5.callPackage ../applications/misc/corectrl { }; @@ -28623,7 +28872,7 @@ with pkgs; dunst = callPackage ../applications/misc/dunst { }; du-dust = callPackage ../tools/misc/dust { - inherit (darwin.apple_sdk.frameworks) AppKit; + inherit (darwin.apple_sdk_11_0.frameworks) AppKit; }; dutree = callPackage ../tools/misc/dutree { }; @@ -28774,8 +29023,6 @@ with pkgs; # If you turn this into "real" alias again, please add it to pkgs/top-level/packages-config.nix again too emacsPackages = emacs.pkgs; - inherit (gnome) empathy; - emptty = callPackage ../applications/display-managers/emptty {}; endeavour = callPackage ../applications/office/endeavour { }; @@ -28856,6 +29103,8 @@ with pkgs; go-motion = callPackage ../development/tools/go-motion { }; + go-musicfox = callPackage ../applications/audio/go-musicfox { }; + gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; greenfoot = callPackage ../applications/editors/greenfoot { @@ -29027,6 +29276,8 @@ with pkgs; gauche = callPackage ../development/interpreters/gauche { }; + gazelle-origin = python3Packages.callPackage ../tools/misc/gazelle-origin { }; + gcal = callPackage ../applications/misc/gcal { }; gcstar = callPackage ../applications/misc/gcstar { }; @@ -29155,9 +29406,7 @@ with pkgs; wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { }; }; - goldendict = libsForQt5.callPackage ../applications/misc/goldendict { - inherit (darwin) libiconv; - }; + goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; @@ -29227,6 +29476,8 @@ with pkgs; w_scan = callPackage ../applications/video/w_scan { }; + w_scan2 = callPackage ../applications/video/w_scan2 { }; + wavrsocvt = callPackage ../applications/misc/audio/wavrsocvt { }; welle-io = libsForQt5.callPackage ../applications/radio/welle-io { }; @@ -29744,6 +29995,7 @@ with pkgs; hledger-interest = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-interest; hledger-ui = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-ui; hledger-web = haskell.lib.compose.justStaticExecutables haskellPackages.hledger-web; + hledger-utils = with python3.pkgs; toPythonApplication hledger-utils; homebank = callPackage ../applications/office/homebank { gtk = gtk3; @@ -29963,7 +30215,9 @@ with pkgs; waybar = callPackage ../applications/misc/waybar {}; - waylock = callPackage ../applications/misc/waylock {}; + waylock = callPackage ../applications/misc/waylock { + zig = zig_0_9; + }; wayshot = callPackage ../tools/misc/wayshot { }; @@ -30537,6 +30791,7 @@ with pkgs; ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird { + # https://github.com/NixOS/nixpkgs/issues/201254 stdenv = if stdenv.isDarwin then llvmPackages_14.stdenv else gcc11Stdenv; }; @@ -30879,7 +31134,9 @@ with pkgs; merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; - mepo = callPackage ../applications/misc/mepo { }; + mepo = callPackage ../applications/misc/mepo { + zig = zig_0_9; + }; meshcentral = callPackage ../tools/admin/meshcentral { }; @@ -31073,7 +31330,6 @@ with pkgs; jujutsu = callPackage ../applications/version-management/jujutsu { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; - inherit (darwin) libiconv; }; nbstripout = callPackage ../applications/version-management/nbstripout { }; @@ -31086,6 +31342,8 @@ with pkgs; pragha = libsForQt5.callPackage ../applications/audio/pragha { }; + river-tag-overlay = callPackage ../applications/misc/river-tag-overlay { }; + rofi-mpd = callPackage ../applications/audio/rofi-mpd { }; rofi-bluetooth = callPackage ../applications/misc/rofi-bluetooth { }; @@ -31121,6 +31379,8 @@ with pkgs; buildGoModule = buildGo118Module; # tests fail with 1.19 }; + nqptp = callPackage ../tools/networking/nqptp { }; + mailspring = callPackage ../applications/networking/mailreaders/mailspring {}; mm = callPackage ../applications/networking/instant-messengers/mm { }; @@ -31129,8 +31389,6 @@ with pkgs; mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; - mps-youtube = callPackage ../applications/misc/mps-youtube { }; - mplayer = callPackage ../applications/video/mplayer ({ libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); @@ -31156,6 +31414,7 @@ with pkgs; sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {}; thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { }; vr-reversal = callPackage ../applications/video/mpv/scripts/vr-reversal.nix {}; + webtorrent-mpv-hook = callPackage ../applications/video/mpv/scripts/webtorrent-mpv-hook.nix { }; youtube-quality = callPackage ../applications/video/mpv/scripts/youtube-quality.nix { }; cutter = callPackage ../applications/video/mpv/scripts/cutter.nix { }; }; @@ -31294,7 +31553,10 @@ with pkgs; oroborus = callPackage ../applications/window-managers/oroborus {}; - osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; + osm2pgsql = callPackage ../tools/misc/osm2pgsql { + # fmt_9 is not supported: https://github.com/openstreetmap/osm2pgsql/issues/1859 + fmt = fmt_8; + }; ostinato = libsForQt5.callPackage ../applications/networking/ostinato { }; @@ -31317,6 +31579,8 @@ with pkgs; pdfmixtool = libsForQt5.callPackage ../applications/office/pdfmixtool { }; + pdfmm = callPackage ../applications/office/pdfmm {}; + pig = callPackage ../applications/networking/cluster/pig { }; pijul = callPackage ../applications/version-management/pijul { }; @@ -31512,6 +31776,7 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; ncdu = callPackage ../tools/misc/ncdu { }; + ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; ncdc = callPackage ../applications/networking/p2p/ncdc { }; @@ -31531,7 +31796,10 @@ with pkgs; ngt = callPackage ../development/libraries/ngt { }; - nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { }; + nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { + # https://github.com/NixOS/nixpkgs/issues/201254 + stdenv = if stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU then gcc11Stdenv else stdenv; + }; nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; @@ -31622,7 +31890,9 @@ with pkgs; boost = boost175; }; - openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { }; + openimageio = darwin.apple_sdk_11_0.callPackage ../development/libraries/openimageio { + fmt = fmt_8; + }; openjump = callPackage ../applications/misc/openjump { }; @@ -31669,9 +31939,7 @@ with pkgs; organicmaps = libsForQt5.callPackage ../applications/misc/organicmaps { }; - osm2xmap = callPackage ../applications/misc/osm2xmap { - libyamlcpp = libyamlcpp_0_3; - }; + osm2xmap = callPackage ../applications/misc/osm2xmap { }; osmctools = callPackage ../applications/misc/osmctools { }; @@ -31822,6 +32090,8 @@ with pkgs; pianoteq = callPackage ../applications/audio/pianoteq { }; + pianotrans = callPackage ../applications/audio/pianotrans { }; + picard = callPackage ../applications/audio/picard { }; picocom = callPackage ../tools/misc/picocom { @@ -31942,6 +32212,10 @@ with pkgs; polymake = callPackage ../applications/science/math/polymake { }; + pomodoro = callPackage ../applications/misc/pomodoro { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + pomotroid = callPackage ../applications/misc/pomotroid { electron = electron_9; }; @@ -32380,6 +32654,8 @@ with pkgs; secretscanner = callPackage ../tools/security/secretscanner { }; + setconf = python3.pkgs.callPackage ../tools/misc/setconf { }; + semiphemeral = callPackage ../tools/misc/semiphemeral { }; semver = callPackage ../applications/misc/semver { }; @@ -32646,6 +32922,8 @@ with pkgs; spotify = callPackage ../applications/audio/spotify { }; + spotify-player = callPackage ../applications/audio/spotify-player { }; + spotifywm = callPackage ../applications/audio/spotifywm { }; psst = callPackage ../applications/audio/psst { }; @@ -33246,7 +33524,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Foundation; }; - qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt5.callPackage ../applications/office/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { }; @@ -33506,6 +33784,8 @@ with pkgs; webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; + webcord = callPackage ../applications/networking/instant-messengers/webcord {}; + webex = callPackage ../applications/networking/instant-messengers/webex {}; webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; @@ -33543,6 +33823,8 @@ with pkgs; weston = callPackage ../applications/window-managers/weston { }; + wgnord = callPackage ../applications/networking/wgnord/default.nix {}; + whalebird = callPackage ../applications/misc/whalebird { electron = electron_19; }; @@ -33651,9 +33933,7 @@ with pkgs; xannotate = callPackage ../tools/X11/xannotate {}; - xaos = callPackage ../applications/graphics/xaos { - libpng = libpng12; - }; + xaos = libsForQt5.callPackage ../applications/graphics/xaos { }; xastir = callPackage ../applications/misc/xastir { rastermagick = imagemagick6; @@ -33920,6 +34200,8 @@ with pkgs; yelp-tools = callPackage ../development/misc/yelp-tools { }; + yewtube = callPackage ../applications/misc/yewtube { }; + yokadi = python3Packages.callPackage ../applications/misc/yokadi {}; yoshimi = callPackage ../applications/audio/yoshimi { }; @@ -34016,6 +34298,8 @@ with pkgs; inherit (nodePackages) zx; + zxfer = callPackage ../applications/system/zxfer {}; + zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { guiModule = "zest"; fftw = fftwSinglePrec; @@ -34286,7 +34570,7 @@ with pkgs; openethereum = callPackage ../applications/blockchains/openethereum { }; polkadot = callPackage ../applications/blockchains/polkadot { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; particl-core = callPackage ../applications/blockchains/particl-core { }; @@ -34517,7 +34801,9 @@ with pkgs; inherit (perlPackages) PathTiny; }; - blackshades = callPackage ../games/blackshades { }; + blackshades = callPackage ../games/blackshades { + zig = zig_0_9; + }; blobby = callPackage ../games/blobby { }; @@ -34964,7 +35250,6 @@ with pkgs; moon-buggy = callPackage ../games/moon-buggy { }; inherit (callPackages ../games/minetest { - inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; }) minetestclient_5 minetestserver_5; @@ -35096,9 +35381,7 @@ with pkgs; pentobi = libsForQt5.callPackage ../games/pentobi { }; - performous = callPackage ../games/performous { - boost = boost166; - }; + performous = callPackage ../games/performous { }; pinball = callPackage ../games/pinball { }; @@ -35367,7 +35650,9 @@ with pkgs; teetertorture = callPackage ../games/teetertorture { }; - teeworlds = callPackage ../games/teeworlds { }; + teeworlds = callPackage ../games/teeworlds { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; tengine = callPackage ../servers/http/tengine { openssl = openssl_1_1; @@ -35595,6 +35880,8 @@ with pkgs; cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); inherit (cinnamon) mint-x-icons mint-y-icons; + deepin = recurseIntoAttrs (callPackage ../desktops/deepin { }); + enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { }); gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); @@ -35993,6 +36280,8 @@ with pkgs; svaba = callPackage ../applications/science/biology/svaba { }; + tandem-aligner = callPackage ../applications/science/biology/tandem-aligner { }; + tebreak = callPackage ../applications/science/biology/tebreak { }; treemix = callPackage ../applications/science/biology/treemix { }; @@ -37080,6 +37369,8 @@ with pkgs; apt = callPackage ../tools/package-management/apt { }; + apx = callPackage ../tools/package-management/apx { }; + dpkg = callPackage ../tools/package-management/dpkg { }; dumb = callPackage ../misc/dumb { }; @@ -37087,6 +37378,8 @@ with pkgs; dump = callPackage ../tools/backup/dump { }; dxvk = callPackage ../misc/dxvk { }; + dxvk_1 = callPackage ../misc/dxvk/dxvk.nix { dxvkVersion = "1.10"; }; + dxvk_2 = callPackage ../misc/dxvk/dxvk.nix { dxvkVersion = "2.1"; }; ecdsatool = callPackage ../tools/security/ecdsatool { }; @@ -37186,9 +37479,7 @@ with pkgs; gummy = callPackage ../tools/misc/gummy { }; - hck = callPackage ../tools/text/hck { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - }; + hck = callPackage ../tools/text/hck { }; helm = callPackage ../applications/audio/helm { }; @@ -37234,7 +37525,11 @@ with pkgs; colima = callPackage ../applications/virtualization/colima { }; - lima = callPackage ../applications/virtualization/lima { }; + lima = callPackage ../applications/virtualization/lima { + inherit (darwin) sigtool; + }; + + lima-bin = callPackage ../applications/virtualization/lima/bin.nix { }; logtop = callPackage ../tools/misc/logtop { }; @@ -37280,7 +37575,9 @@ with pkgs; kompose = callPackage ../applications/networking/cluster/kompose { }; - kompute = callPackage ../development/libraries/kompute { }; + kompute = callPackage ../development/libraries/kompute { + fmt = fmt_8; + }; kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; @@ -37302,7 +37599,7 @@ with pkgs; inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Security SystemConfiguration; }; - lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; + lilypond = callPackage ../misc/lilypond { }; lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { }; @@ -37466,11 +37763,15 @@ with pkgs; nixos-install-tools = callPackage ../tools/nix/nixos-install-tools { }; + nixos-render-docs = callPackage ../tools/nix/nixos-render-docs { }; + nixdoc = callPackage ../tools/nix/nixdoc {}; dnadd = callPackage ../tools/nix/dnadd { }; - nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { }; + nix-eval-jobs = callPackage ../tools/package-management/nix-eval-jobs { + nix = nixVersions.nix_2_12; # fails to build with 2.13 + }; nix-doc = callPackage ../tools/package-management/nix-doc { }; @@ -37487,6 +37788,8 @@ with pkgs; nix-info = callPackage ../tools/nix/info { }; nix-info-tested = nix-info.override { doCheck = true; }; + nix-init = callPackage ../tools/nix/nix-init { }; + nix-index-unwrapped = callPackage ../tools/package-management/nix-index { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -37546,6 +37849,8 @@ with pkgs; nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; + nixpkgs-hammering = callPackage ../tools/nix/nixpkgs-hammering { }; + rnix-hashes = callPackage ../tools/nix/rnix-hashes { }; nixos-artwork = callPackage ../data/misc/nixos-artwork { }; @@ -37641,7 +37946,7 @@ with pkgs; pgadmin4 = callPackage ../tools/admin/pgadmin { }; - pgmodeler = libsForQt5.callPackage ../applications/misc/pgmodeler { }; + pgmodeler = qt6Packages.callPackage ../applications/misc/pgmodeler { }; physlock = callPackage ../misc/screensavers/physlock { }; @@ -38428,9 +38733,7 @@ with pkgs; simplehttp2server = callPackage ../servers/simplehttp2server { }; - simple-http-server = callPackage ../servers/simple-http-server { - inherit (darwin.apple_sdk.frameworks) Security; - }; + simple-http-server = callPackage ../servers/simple-http-server { }; diceware = with python3Packages; toPythonApplication diceware; @@ -38646,12 +38949,16 @@ with pkgs; xmcp = callPackage ../tools/X11/xmcp { }; + yesplaymusic = callPackage ../applications/audio/yesplaymusic { }; + ymuse = callPackage ../applications/audio/ymuse { }; zk = callPackage ../applications/office/zk {}; zktree = callPackage ../applications/misc/zktree {}; + zram-generator = callPackage ../tools/system/zram-generator { }; + zrythm = callPackage ../applications/audio/zrythm { inherit (plasma5Packages) breeze-icons; }; @@ -38666,7 +38973,7 @@ with pkgs; mictray = callPackage ../tools/audio/mictray { }; - swift-corelibs-libdispatch = callPackage ../development/libraries/swift-corelibs-libdispatch { }; + swift-corelibs-libdispatch = swiftPackages.Dispatch; swaysettings = callPackage ../applications/misc/swaysettings { }; @@ -38678,6 +38985,8 @@ with pkgs; tuner = callPackage ../applications/audio/tuner { }; + locate-dominating-file = callPackage ../tools/misc/locate-dominating-file { }; + jfrog-cli = callPackage ../tools/misc/jfrog-cli { }; ov = callPackage ../tools/text/ov { }; @@ -38687,4 +38996,6 @@ with pkgs; tubekit-unwrapped = callPackage ../applications/networking/cluster/tubekit { }; resgate = callPackage ../servers/resgate { }; + + oversteer = callPackage ../applications/misc/oversteer { }; } diff --git a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix index 2d0fde6d07..c727db80db 100644 --- a/third_party/nixpkgs/pkgs/top-level/beam-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/beam-packages.nix @@ -1,11 +1,13 @@ -{ beam +{ lib +, beam , callPackage , openssl_1_1 , wxGTK32 , buildPackages , stdenv , wxSupport ? true -, systemdSupport ? stdenv.isLinux +, systemd +, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd }: let diff --git a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix index ddf0be41a3..cf00c3da93 100644 --- a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix @@ -104,6 +104,10 @@ impure-cmds // appleSourcePackages // chooseLibs // { stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; }; + cctools-apple = callPackage ../os-specific/darwin/cctools/apple.nix { + stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv; + }; + # TODO: remove alias. cf-private = self.apple_sdk.frameworks.CoreFoundation; @@ -116,6 +120,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { rewrite-tbd = callPackage ../os-specific/darwin/rewrite-tbd { }; checkReexportsHook = pkgs.makeSetupHook { + name = "darwin-check-reexports-hook"; deps = [ pkgs.darwin.print-reexports ]; } ../os-specific/darwin/print-reexports/setup-hook.sh; @@ -136,6 +141,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { signingUtils = callPackage ../os-specific/darwin/signing-utils { }; autoSignDarwinBinariesHook = pkgs.makeSetupHook { + name = "auto-sign-darwin-binaries-hook"; deps = [ self.signingUtils ]; } ../os-specific/darwin/signing-utils/auto-sign-hook.sh; diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index b4beafcfd3..6a1c4bcf5d 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -406,7 +406,7 @@ in { ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; }; ghcjs = packages.ghcjs810; diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix index 5de691a3b1..5d15cff25d 100644 --- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -159,18 +159,11 @@ in { ]; }; - linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream"; - linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0 = callPackage ../os-specific/linux/kernel/linux-6.0.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; + linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream"; linux_6_1 = callPackage ../os-specific/linux/kernel/linux-6.1.nix { kernelPatches = [ @@ -248,7 +241,7 @@ in { linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0_hardened = hardenedKernelFor kernels.linux_6_0 { }; + linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; })); @@ -532,10 +525,9 @@ in { linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); - linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23 linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17 linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01 - linux_6_0 = recurseIntoAttrs (packagesFor kernels.linux_6_0); + linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20 linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); }; @@ -577,7 +569,7 @@ in { linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { }); linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream"; linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream"; - linux_6_0_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_0 { }); + linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream"; linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { }); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); diff --git a/third_party/nixpkgs/pkgs/top-level/make-tarball.nix b/third_party/nixpkgs/pkgs/top-level/make-tarball.nix index 6858e37fab..dbe96bd096 100644 --- a/third_party/nixpkgs/pkgs/top-level/make-tarball.nix +++ b/third_party/nixpkgs/pkgs/top-level/make-tarball.nix @@ -47,10 +47,10 @@ pkgs.releaseTools.sourceTarball { opts=(--option build-users-group "") nix-store --init - header "checking eval-release.nix" + echo "checking eval-release.nix" nix-instantiate --eval --strict --show-trace ./maintainers/scripts/eval-release.nix > /dev/null - header "checking find-tarballs.nix" + echo "checking find-tarballs.nix" nix-instantiate --readonly-mode --eval --strict --show-trace --json \ ./maintainers/scripts/find-tarballs.nix \ --arg expr 'import ./maintainers/scripts/all-tarballs.nix' > $TMPDIR/tarballs.json @@ -61,7 +61,7 @@ pkgs.releaseTools.sourceTarball { exit 1 fi - header "generating packages.json" + echo "generating packages.json" mkdir -p $out/nix-support echo -n '{"version":2,"packages":' > tmp nix-env -f . -I nixpkgs=$src -qa --meta --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp diff --git a/third_party/nixpkgs/pkgs/top-level/nim-packages.nix b/third_party/nixpkgs/pkgs/top-level/nim-packages.nix index ca52d7f52b..ddd33e151e 100644 --- a/third_party/nixpkgs/pkgs/top-level/nim-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/nim-packages.nix @@ -14,8 +14,12 @@ lib.makeScope newScope (self: astpatternmatching = callPackage ../development/nim-packages/astpatternmatching { }; + asynctools = callPackage ../development/nim-packages/asynctools { }; + base32 = callPackage ../development/nim-packages/base32 { }; + base45 = callPackage ../development/nim-packages/base45 { }; + bumpy = callPackage ../development/nim-packages/bumpy { }; c2nim = callPackage ../development/nim-packages/c2nim { }; diff --git a/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix b/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix index e2b81b20c5..ab9dac4b38 100644 --- a/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix +++ b/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix @@ -32,7 +32,7 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; } # Check that all-packages.nix evaluates on a number of platforms without any warnings. for platform in ${pkgs.lib.concatStringsSep " " supportedSystems}; do - header "checking Nixpkgs on $platform" + echo "checking Nixpkgs on $platform" # To get a call trace; see https://nixos.org/manual/nixpkgs/stable/#function-library-lib.trivial.warn # Relies on impure eval diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 03bd642550..301495961e 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -1477,7 +1477,9 @@ let trie = callPackage ../development/ocaml-modules/trie { }; - tsdl = callPackage ../development/ocaml-modules/tsdl { }; + tsdl = callPackage ../development/ocaml-modules/tsdl { + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback; + }; tsdl-image = callPackage ../development/ocaml-modules/tsdl-image { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index b2ef4f4e57..525d737b82 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -3587,7 +3587,7 @@ let hash = "sha256-G9Q3Y8ajcxgwl6MOeH9dZxOw2ydRHFLVMyZrWdLPp4A="; }; propagatedBuildInputs = [ ClassStd ]; - checkInputs = [ TestPod TestPodCoverage ]; + nativeCheckInputs = [ TestPod TestPodCoverage ]; meta = { description = "Faster but less secure than Class::Std"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -5258,7 +5258,7 @@ let url = "mirror://cpan/authors/id/F/FE/FELIPE/Crypt-Perl-0.34.tar.gz"; hash = "sha256-DhyyI98AQfbZsBDxHm+XqXq1WhGKJzk460/oXUA/GxE="; }; - checkInputs = [ pkgs.openssl MathBigIntGMP ]; + nativeCheckInputs = [ pkgs.openssl MathBigIntGMP ]; buildInputs = [ CallContext FileSlurp FileWhich TestClass TestDeep TestException TestFailWarnings TestNoWarnings ]; propagatedBuildInputs = [ BytesRandomSecureTiny ClassAccessor ConvertASN1 CryptFormat MathProvablePrime SymbolGet TryTiny ]; meta = { @@ -8320,7 +8320,7 @@ let url = "mirror://cpan/authors/id/P/PM/PMAKHOLM/Encode-IMAPUTF7-1.05.tar.gz"; hash = "sha256-RwMF3cN0g8/o08FtE3cKKAEfYAv1V6y4w+B3OZl8N+E="; }; - checkInputs = [ TestNoWarnings ]; + nativeCheckInputs = [ TestNoWarnings ]; meta = { description = "IMAP modified UTF-7 encoding"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -9780,7 +9780,7 @@ let propagatedBuildInputs = [ CGI DateTimeFormatStrptime HTMLTableExtract JSON JSONParse LWPProtocolHttps StringUtil TextTemplate ]; buildInputs = [ TestPod ]; meta = { - homepage = "http://finance-quote.sourceforge.net/"; + homepage = "https://finance-quote.sourceforge.net/"; description = "Get stock and mutual fund quotes from various exchanges"; license = with lib.licenses; [gpl2 ]; }; @@ -10220,7 +10220,7 @@ let url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.049.tar.gz"; hash = "sha256-RkYoy53QKLEEOMI4kt5vijAgI1Wk5OsBv9E7jP41r1c="; }; - checkInputs = [ pkgs.cairo CairoGObject ]; + nativeCheckInputs = [ pkgs.cairo CairoGObject ]; propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; preCheck = '' # Our gobject-introspection patches make the shared library paths absolute @@ -10464,7 +10464,7 @@ let }; buildInputs = [ pkgs.libtiff ExtUtilsDepends ExtUtilsPkgConfig ]; propagatedBuildInputs = [ Readonly ]; - checkInputs = [ TestRequires TestDeep pkgs.hexdump ]; + nativeCheckInputs = [ TestRequires TestDeep pkgs.hexdump ]; meta = { description = "Perl extension for the libtiff library"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -10647,7 +10647,7 @@ let }; buildInputs = [ pkgs.gtk3 ]; propagatedBuildInputs = [ Readonly Gtk3 ]; - checkInputs = [ TestDifferences TestDeep ImageMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; + nativeCheckInputs = [ TestDifferences TestDeep ImageMagick TryTiny TestMockObject CarpAlways pkgs.librsvg ]; checkPhase = '' ${pkgs.xvfb-run}/bin/xvfb-run -s '-screen 0 800x600x24' \ make test @@ -12507,11 +12507,11 @@ let ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.54"; + version = "12.55"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - hash = "sha256-KnT6le0CfqS8yP/qpx4HgVsJmp38oPQIc36tNUzpfc8="; + hash = "sha256-CFgb16GnYPIKG0PLbTiSfm7FRdWZBtroXH32c5Ru6gg="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; @@ -12911,12 +12911,12 @@ let }; }; - libapreq2 = buildPerlPackage { + libapreq2 = buildPerlPackage rec { pname = "libapreq2"; - version = "2.16"; + version = "2.17"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/libapreq2-2.16.tar.gz"; - hash = "sha256-4EyFWj6gcLiGNWn7rgL+go9TSsiHVbI+JNOGPMlZg0k="; + url = "mirror://apache/httpd/libapreq/${pname}-${version}.tar.gz"; + hash = "sha256-BGSH8ITBL6HIIq/8X33lbv7ZtIkFpCbmMaa5ScEU2Gw="; }; outputs = [ "out" ]; buildInputs = [ pkgs.apacheHttpd pkgs.apr pkgs.aprutil ApacheTest ExtUtilsXSBuilder ]; @@ -13944,7 +13944,7 @@ let substituteInPlace Makefile.PL --replace 'if has_module' 'if 0; #' ''; doCheck = !stdenv.isDarwin; - checkInputs = [ HTTPDaemon TestFatal TestNeeds TestRequiresInternet ]; + nativeCheckInputs = [ HTTPDaemon TestFatal TestNeeds TestRequiresInternet ]; meta = { description = "The World-Wide Web library for Perl"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -18041,7 +18041,7 @@ let rev = "5fccc0c270e25c65ef634304630af74b48807d21"; hash = "sha256-pveVyFdEe/TQCEI83RrQTWr7aoYrgOGaNqc1wJeiAnw="; }; - checkInputs = [ HTTPMessage LWP TestSharedFork HTTPServerSimple TestTCP TestUNIXSock ]; + nativeCheckInputs = [ HTTPMessage LWP TestSharedFork HTTPServerSimple TestTCP TestUNIXSock ]; buildInputs = [ ModuleInstall ]; propagatedBuildInputs = [ NetServer ServerStarter ]; meta = { @@ -19145,7 +19145,7 @@ let url = "mirror://cpan/authors/id/P/PM/PMPERRY/PDF-Builder-3.022.tar.gz"; hash = "sha256-SCskaQxxhfLn+7r5pIKz0SieJduAC/SPKVn1Epl3yjE="; }; - checkInputs = [ TestException TestMemoryCycle ]; + nativeCheckInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; meta = { description = "Facilitates the creation and modification of PDF files"; @@ -20646,7 +20646,7 @@ let propagatedBuildInputs = [ DigestSHA1 URI ]; meta = { description = "Collaborative, content-based spam filtering network agent"; - homepage = "http://razor.sourceforge.net/"; + homepage = "https://razor.sourceforge.net/"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21351,7 +21351,7 @@ let }; propagatedBuildInputs = [ ClassInspector IOSessionData LWPProtocolHttps TaskWeaken XMLParser ]; buildInputs = [ TestWarn XMLParserLite ]; - checkInputs = [ HTTPDaemon ]; + nativeCheckInputs = [ HTTPDaemon ]; meta = { description = "Perl's Web Services Toolkit"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -22646,12 +22646,12 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "8.10.0"; + version = "9.0.0"; src = fetchFromGitLab { owner = "libvirt"; repo = "libvirt-perl"; rev = "v${version}"; - hash = "sha256-rVTofRtnYDF5CmWp3SB2+kJZz4u6+OTzNAUwiDrqdTo="; + hash = "sha256-QiaB272kxs/Y3/l8KbFy8f9iyOCxhzfA/h2FnfGzmE4="; }; nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; @@ -25327,7 +25327,7 @@ let hash = "sha256-wZHG1ezrjLdcBWUZI2BmLSAtcWutB6IzxLMppChNxxs="; }; nativeBuildInputs = [ shortenPerlShebang ]; - checkInputs = [ ListMoreUtils TestDifferences TestException ]; + nativeCheckInputs = [ ListMoreUtils TestDifferences TestException ]; postInstall = '' shortenPerlShebang $out/bin/Markdown.pl ''; diff --git a/third_party/nixpkgs/pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix b/third_party/nixpkgs/pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix new file mode 100644 index 0000000000..b3cf3cdca2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/top-level/pkg-config/defaultPkgConfigPackages.nix @@ -0,0 +1,45 @@ +/* A set of aliases to be used in generated expressions. + + In case of ambiguity, this will pick a sensible default. + + This was initially based on cabal2nix's mapping. + + It'd be nice to generate this mapping, based on a set of derivations. + It can not be fully automated, so it should be a expression or tool + that makes suggestions about which pkg-config module names can be added. + */ +pkgs: + +let + inherit (pkgs) lib; + inherit (lib) + all + flip + mapAttrs + mapAttrsToList + getAttrFromPath + importJSON + ; + + data = importJSON ./pkg-config-data.json; + inherit (data) modules; + + platform = pkgs.stdenv.hostPlatform; + + isSupported = moduleData: + moduleData?supportedWhenPlatformAttrsEqual -> + all (x: x) ( + mapAttrsToList + (k: v: platform?${k} && platform.${k} == v) + moduleData.supportedWhenPlatformAttrsEqual + ); + + modulePkgs = flip mapAttrs modules (_moduleName: moduleData: + if moduleData?attrPath && isSupported moduleData then + getAttrFromPath moduleData.attrPath pkgs + else + null + ); + +in + modulePkgs diff --git a/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json b/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json new file mode 100644 index 0000000000..61ed9098b9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json @@ -0,0 +1,964 @@ +{ + "version": { + "major": 0, + "minor": 1 + }, + "modules": { + "IL": { + "attrPath": [ + "libdevil" + ] + }, + "ImageMagick": { + "attrPath": [ + "imagemagick" + ] + }, + "MagickWand": { + "attrPath": [ + "imagemagick" + ] + }, + "Qt5Concurrent": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Core": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5DBus": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Gui": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Network": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5OpenGL": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5OpenGLExtensions": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5PrintSupport": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Qml": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5QmlModels": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5Quick": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5QuickTest": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5QuickWidgets": { + "attrPath": [ + "qt5", + "qtdeclarative" + ] + }, + "Qt5Sql": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Test": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Widgets": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "Qt5Xml": { + "attrPath": [ + "qt5", + "qtbase" + ] + }, + "SoapySDR": { + "attrPath": [ + "soapysdr" + ] + }, + "alsa": { + "attrPath": [ + "alsa-lib" + ] + }, + "alsa-topology": { + "attrPath": [ + "alsa-lib" + ] + }, + "appindicator-0.1": { + "attrPath": [ + "libappindicator-gtk2" + ] + }, + "appindicator3-0.1": { + "attrPath": [ + "libappindicator-gtk3" + ] + }, + "bzip2": { + "attrPath": [ + "bzip2" + ] + }, + "cairo-gobject": { + "attrPath": [ + "cairo" + ] + }, + "cairo-pdf": { + "attrPath": [ + "cairo" + ] + }, + "cairo-ps": { + "attrPath": [ + "cairo" + ] + }, + "cairo-svg": { + "attrPath": [ + "cairo" + ] + }, + "dbusmenu-glib-0.4": { + "attrPath": [ + "libdbusmenu" + ] + }, + "dbusmenu-gtk3-0.4": { + "attrPath": [ + "libdbusmenu-gtk3" + ] + }, + "egl": { + "attrPath": [ + "libGL" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "fftw3": { + "attrPath": [ + "fftw" + ] + }, + "fftw3f": { + "attrPath": [ + "fftwFloat" + ] + }, + "form": { + "attrPath": [ + "ncurses" + ] + }, + "formw": { + "attrPath": [ + "ncurses" + ] + }, + "freealut": { + "attrPath": [ + "freealut" + ] + }, + "freetype2": { + "attrPath": [ + "freetype" + ] + }, + "gdk-2.0": { + "attrPath": [ + "gtk2" + ] + }, + "gdk-3.0": { + "attrPath": [ + "gtk3" + ] + }, + "gdk-pixbuf-2.0": { + "attrPath": [ + "gdk-pixbuf" + ] + }, + "gdk-x11-2.0": { + "attrPath": [ + "gtk2-x11" + ] + }, + "gdk-x11-3.0": { + "attrPath": [ + "gtk3-x11" + ] + }, + "geos": { + "attrPath": [ + "geos" + ] + }, + "gio-2.0": { + "attrPath": [ + "glib" + ] + }, + "gl": { + "attrPath": [ + "libGL" + ] + }, + "glew": { + "attrPath": [ + "glew" + ] + }, + "glu": { + "attrPath": [ + "libGLU" + ] + }, + "glut": { + "attrPath": [ + "freeglut" + ] + }, + "gnome-keyring-1": { + "attrPath": [ + "libgnome-keyring" + ] + }, + "gnome-vfs-2.0": { + "attrPath": [ + "gnome2", + "gnome_vfs" + ] + }, + "gnome-vfs-module-2.0": { + "attrPath": [ + "gnome2", + "gnome_vfs" + ] + }, + "gobject-2.0": { + "attrPath": [ + "glib" + ] + }, + "gobject-introspection-1.0": { + "attrPath": [ + "gobject-introspection" + ] + }, + "gstreamer-audio-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gstreamer-base-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gstreamer-controller-1.0": { + "attrPath": [ + "gst_all_1", + "gstreamer" + ] + }, + "gstreamer-net-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gstreamer-video-1.0": { + "attrPath": [ + "gst_all_1", + "gst-plugins-base" + ] + }, + "gthread-2.0": { + "attrPath": [ + "glib" + ] + }, + "gtk+-2.0": { + "attrPath": [ + "gtk2" + ] + }, + "gtk+-3.0": { + "attrPath": [ + "gtk3" + ] + }, + "gtk+-x11-2.0": { + "attrPath": [ + "gtk2-x11" + ] + }, + "gtksourceview-3.0": { + "attrPath": [ + "gtksourceview3" + ] + }, + "hidapi": { + "attrPath": [ + "hidapi" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": true + } + }, + "hidapi-hidraw": { + "attrPath": [ + "hidapi" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "hidapi-libusb": { + "attrPath": [ + "hidapi" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "icu-i18n": { + "attrPath": [ + "icu" + ] + }, + "icu-io": { + "attrPath": [ + "icu" + ] + }, + "icu-uc": { + "attrPath": [ + "icu" + ] + }, + "imlib2": { + "attrPath": [ + "imlib2" + ] + }, + "jack": { + "attrPath": [ + "libjack2" + ] + }, + "javascriptcoregtk-4.0": { + "attrPath": [ + "webkitgtk" + ] + }, + "lapack": { + "attrPath": [ + "liblapack" + ] + }, + "libR": { + "attrPath": [ + "R" + ] + }, + "libavutil": { + "attrPath": [ + "ffmpeg" + ] + }, + "libb2": { + "attrPath": [ + "libb2" + ] + }, + "libbrotlidec": { + "attrPath": [ + "brotli" + ] + }, + "libbrotlienc": { + "attrPath": [ + "brotli" + ] + }, + "libcrypto": { + "attrPath": [ + "openssl" + ] + }, + "libecpg": { + "attrPath": [ + "postgresql" + ] + }, + "libecpg_compat": { + "attrPath": [ + "postgresql" + ] + }, + "libgsasl": { + "attrPath": [ + "gsasl" + ] + }, + "libidn": { + "attrPath": [ + "libidn" + ] + }, + "libjpeg": { + "attrPath": [ + "libjpeg" + ] + }, + "liblzma": { + "attrPath": [ + "xz" + ] + }, + "libmagic": { + "attrPath": [ + "file" + ] + }, + "libmnl": { + "attrPath": [ + "libmnl" + ] + }, + "libnotify": { + "attrPath": [ + "libnotify" + ] + }, + "libpcap": { + "attrPath": [ + "libpcap" + ] + }, + "libpcre": { + "attrPath": [ + "pcre" + ] + }, + "libpcre2-16": { + "attrPath": [ + "pcre2" + ] + }, + "libpcre2-32": { + "attrPath": [ + "pcre2" + ] + }, + "libpcre2-8": { + "attrPath": [ + "pcre2" + ] + }, + "libpcre2-posix": { + "attrPath": [ + "pcre2" + ] + }, + "libpgtypes": { + "attrPath": [ + "postgresql" + ] + }, + "libpng": { + "attrPath": [ + "libpng" + ] + }, + "libpq": { + "attrPath": [ + "postgresql" + ] + }, + "libpulse": { + "attrPath": [ + "libpulseaudio" + ] + }, + "libpulse-mainloop-glib": { + "attrPath": [ + "libpulseaudio" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "libpulse-simple": { + "attrPath": [ + "libpulseaudio" + ] + }, + "libqrencode": { + "attrPath": [ + "qrencode" + ] + }, + "librtlsdr": { + "attrPath": [ + "rtl-sdr" + ] + }, + "libsass": { + "attrPath": [ + "libsass" + ] + }, + "libsctp": { + "attrPath": [ + "lksctp-tools" + ] + }, + "libsecp256k1": { + "attrPath": [ + "secp256k1" + ] + }, + "libsodium": { + "attrPath": [ + "libsodium" + ] + }, + "libsoup-gnome-2.4": { + "attrPath": [ + "libsoup" + ] + }, + "libssh2": { + "attrPath": [ + "libssh2" + ] + }, + "libssl": { + "attrPath": [ + "openssl" + ] + }, + "libstatgrab": { + "attrPath": [ + "libstatgrab" + ] + }, + "libsystemd": { + "attrPath": [ + "systemd" + ] + }, + "libturbojpeg": { + "attrPath": [ + "libjpeg" + ] + }, + "libudev": { + "attrPath": [ + "systemd" + ] + }, + "libxml-2.0": { + "attrPath": [ + "libxml2" + ] + }, + "libzip": { + "attrPath": [ + "libzip" + ] + }, + "libzmq": { + "attrPath": [ + "zeromq" + ] + }, + "menu": { + "attrPath": [ + "ncurses" + ] + }, + "menuw": { + "attrPath": [ + "ncurses" + ] + }, + "ncurses": { + "attrPath": [ + "ncurses" + ] + }, + "ncurses++": { + "attrPath": [ + "ncurses" + ] + }, + "ncurses++w": { + "attrPath": [ + "ncurses" + ] + }, + "ncursesw": { + "attrPath": [ + "ncurses" + ] + }, + "netsnmp": { + "attrPath": [ + "net_snmp" + ] + }, + "nix-cmd": { + "attrPath": [ + "nix" + ] + }, + "nix-expr": { + "attrPath": [ + "nix" + ] + }, + "nix-main": { + "attrPath": [ + "nix" + ] + }, + "nix-store": { + "attrPath": [ + "nix" + ] + }, + "odbc": { + "attrPath": [ + "unixODBC" + ] + }, + "ompi": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-c": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-cxx": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-f77": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-f90": { + "attrPath": [ + "openmpi" + ] + }, + "ompi-fort": { + "attrPath": [ + "openmpi" + ] + }, + "openblas": { + "attrPath": [ + "openblasCompat" + ] + }, + "openssl": { + "attrPath": [ + "openssl" + ] + }, + "orte": { + "attrPath": [ + "openmpi" + ] + }, + "panel": { + "attrPath": [ + "ncurses" + ] + }, + "panelw": { + "attrPath": [ + "ncurses" + ] + }, + "pangocairo": { + "attrPath": [ + "pango" + ] + }, + "poppler-glib": { + "attrPath": [ + "poppler_gi" + ] + }, + "python": { + "attrPath": [ + "python3" + ] + }, + "ruby-2.7": { + "attrPath": [ + "ruby_2_7" + ] + }, + "ruby-3.0": { + "attrPath": [ + "ruby_3_0" + ] + }, + "ruby-3.1": { + "attrPath": [ + "ruby_3_1" + ] + }, + "sdl2": { + "attrPath": [ + "SDL2" + ] + }, + "sndfile": { + "attrPath": [ + "libsndfile" + ] + }, + "sqlite3": { + "attrPath": [ + "sqlite" + ] + }, + "taglib": { + "attrPath": [ + "taglib" + ] + }, + "taglib_c": { + "attrPath": [ + "taglib" + ] + }, + "tdjson": { + "attrPath": [ + "tdlib" + ] + }, + "tensorflow": { + "attrPath": [ + "libtensorflow" + ] + }, + "uuid": { + "attrPath": [ + "libossp_uuid" + ] + }, + "vte-2.91": { + "attrPath": [ + "vte" + ] + }, + "wayland-client": { + "attrPath": [ + "wayland" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "wayland-cursor": { + "attrPath": [ + "wayland" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "wayland-scanner": { + "attrPath": [ + "wayland" + ] + }, + "wayland-server": { + "attrPath": [ + "wayland" + ], + "supportedWhenPlatformAttrsEqual": { + "isDarwin": false + } + }, + "webkit2gtk-4.0": { + "attrPath": [ + "webkitgtk" + ] + }, + "webkit2gtk-web-extension-4.0": { + "attrPath": [ + "webkitgtk" + ] + }, + "x11": { + "attrPath": [ + "xorg", + "libX11" + ] + }, + "xau": { + "attrPath": [ + "xorg", + "libXau" + ] + }, + "xcursor": { + "attrPath": [ + "xorg", + "libXcursor" + ] + }, + "xerces-c": { + "attrPath": [ + "xercesc" + ] + }, + "xext": { + "attrPath": [ + "xorg", + "libXext" + ] + }, + "xft": { + "attrPath": [ + "xorg", + "libXft" + ] + }, + "xi": { + "attrPath": [ + "xorg", + "libXi" + ] + }, + "xinerama": { + "attrPath": [ + "xorg", + "libXinerama" + ] + }, + "xkbcommon": { + "attrPath": [ + "libxkbcommon" + ] + }, + "xpm": { + "attrPath": [ + "xorg", + "libXpm" + ] + }, + "xrandr": { + "attrPath": [ + "xorg", + "libXrandr" + ] + }, + "xrender": { + "attrPath": [ + "xorg", + "libXrender" + ] + }, + "xscrnsaver": { + "attrPath": [ + "xorg", + "libXScrnSaver" + ] + }, + "xtst": { + "attrPath": [ + "xorg", + "libXtst" + ] + }, + "xxf86vm": { + "attrPath": [ + "xorg", + "libXxf86vm" + ] + }, + "yaml-0.1": { + "attrPath": [ + "libyaml" + ] + }, + "zlib": { + "attrPath": [ + "zlib" + ] + } + } +} diff --git a/third_party/nixpkgs/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix b/third_party/nixpkgs/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix new file mode 100644 index 0000000000..3768711798 --- /dev/null +++ b/third_party/nixpkgs/pkgs/top-level/pkg-config/test-defaultPkgConfigPackages.nix @@ -0,0 +1,45 @@ +# cd nixpkgs +# nix-build -A tests.pkg-config.defaultPkgConfigPackages +{ lib, pkg-config, defaultPkgConfigPackages, runCommand, testers }: +let + inherit (lib.strings) escapeNixIdentifier; + + allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) defaultPkgConfigPackages; + + # nix-build rejects attribute names with periods + # This will build those regardless. + tests-combined = runCommand "pkg-config-checks" { + allTests = lib.attrValues allTests; + } '' + touch $out + ''; + + makePkgConfigTestMaybe = moduleName: pkg: + if ! lib.isDerivation pkg + then + throw "pkg-config module `${escapeNixIdentifier moduleName}` is not defined to be a derivation. Please check the attribute value for `${escapeNixIdentifier moduleName}` in `pkgs/top-level/pkg-config-packages.nix` in Nixpkgs." + + else if ! pkg?meta.unsupported + then + throw "pkg-config module `${escapeNixIdentifier moduleName}` does not have a `meta.unsupported` attribute. This can't be right. Please check the attribute value for `${escapeNixIdentifier moduleName}` in `pkgs/top-level/pkg-config-packages.nix` in Nixpkgs." + + else if pkg.meta.unsupported + then + # We return `null` instead of doing a `filterAttrs`, because with + # `filterAttrs` the evaluator would not be able to return the attribute + # set without first evaluating all of the attribute _values_. This would + # be rather expensive, and severly slow down the use case of getting a + # single test, which we want to do in `passthru.tests`, or interactively. + null + + else if ! pkg?meta.broken + then + throw "pkg-config module `${escapeNixIdentifier moduleName}` does not have a `meta.broken` attribute. This can't be right. Please check the attribute value for `${escapeNixIdentifier moduleName}` in `pkgs/top-level/pkg-config.packages.nix` in Nixpkgs." + + else if pkg.meta.broken + then null + + else testers.hasPkgConfigModule { inherit moduleName; package = pkg; }; + +in + lib.recurseIntoAttrs allTests // { inherit tests-combined; } diff --git a/third_party/nixpkgs/pkgs/top-level/pkg-config/tests.nix b/third_party/nixpkgs/pkgs/top-level/pkg-config/tests.nix new file mode 100644 index 0000000000..bcc8e7b4ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/top-level/pkg-config/tests.nix @@ -0,0 +1,21 @@ +# cd nixpkgs +# nix-build -A tests.pkg-config +{ lib, stdenv, ... }: + +let + # defaultPkgConfigPackages test needs a Nixpkgs with allowUnsupportedPlatform + # in order to filter out the unsupported packages without throwing any errors + # tryEval would be too fragile, masking different problems as if they're + # unsupported platform problems. + allPkgs = import ../default.nix { + system = stdenv.hostPlatform.system; + localSystem = stdenv.hostPlatform.system; + config = { + allowUnsupportedSystem = true; + }; + overlays = []; + }; +in +lib.recurseIntoAttrs { + defaultPkgConfigPackages = allPkgs.callPackage ./test-defaultPkgConfigPackages.nix { }; +} diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index 5430ab54c6..d9728d8cb5 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix @@ -33,6 +33,7 @@ in ### Deprecated aliases - for backward compatibility mapAliases ({ + abodepy = jaraco-abode; # added 2023-02-01 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30 anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 @@ -55,6 +56,7 @@ mapAliases ({ demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04 + dictpath = pathable; # added 2023-01-28 diff_cover = diff-cover; # added 2021-07-02 discogs_client = discogs-client; # added 2021-07-02 djangorestframework-jwt = drf-jwt; # added 2021-07-20 @@ -129,6 +131,7 @@ mapAliases ({ nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 notifymuch = throw "notifymuch has been promoted to a top-level attribute"; # added 2022-10-02 ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28 + pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19 pam = python-pam; # added 2020-09-07. PasteDeploy = pastedeploy; # added 2021-10-07 pathpy = path; # added 2022-04-12 @@ -145,6 +148,7 @@ mapAliases ({ protonup = protonup-ng; # Added 2022-11-06 pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pushbullet = pushbullet-py; # Added 2022-10-15 + pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02 pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15 pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 @@ -211,6 +215,7 @@ mapAliases ({ sharkiqpy = sharkiq; # added 2022-05-21 smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 + somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01 SPARQLWrapper = sparqlwrapper; sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03 sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 @@ -218,6 +223,7 @@ mapAliases ({ SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23 tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25 tensorflow-build_2 = tensorflow-build; # added 2021-11-25 + tensorflow-estimator = tensorflow-estimator-bin; # added 2023-01-17 tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 tensorflow-tensorboard = tensorboard; # added 2022-03-06 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 8517b61116..3ca8170ac7 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -18,8 +18,6 @@ self: super: with self; { aardwolf = callPackage ../development/python-modules/aardwolf { }; - abodepy = callPackage ../development/python-modules/abodepy { }; - absl-py = callPackage ../development/python-modules/absl-py { }; accuweather = callPackage ../development/python-modules/accuweather { }; @@ -308,6 +306,8 @@ self: super: with self; { aiorun = callPackage ../development/python-modules/aiorun { }; + aioruuvigateway = callPackage ../development/python-modules/aioruuvigateway { }; + aiorwlock = callPackage ../development/python-modules/aiorwlock { }; aiosenseme = callPackage ../development/python-modules/aiosenseme { }; @@ -332,6 +332,8 @@ self: super: with self; { aiosmtplib = callPackage ../development/python-modules/aiosmtplib { }; + aiosomecomfort = callPackage ../development/python-modules/aiosomecomfort { }; + aiosqlite = callPackage ../development/python-modules/aiosqlite { }; aiosteamist = callPackage ../development/python-modules/aiosteamist { }; @@ -1212,6 +1214,8 @@ self: super: with self; { bellows = callPackage ../development/python-modules/bellows { }; + bencoder = callPackage ../development/python-modules/bencoder { }; + beniget = callPackage ../development/python-modules/beniget { }; bespon = callPackage ../development/python-modules/bespon { }; @@ -1258,9 +1262,7 @@ self: super: with self; { bitbox02 = callPackage ../development/python-modules/bitbox02 { }; - bitcoinlib = callPackage ../development/python-modules/bitcoinlib { - openssl = pkgs.openssl_1_1; - }; + bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; bitcoin-utils-fork-minimal = callPackage ../development/python-modules/bitcoin-utils-fork-minimal { }; @@ -1483,6 +1485,8 @@ self: super: with self; { bundlewrap = callPackage ../development/python-modules/bundlewrap { }; + bx-py-utils = callPackage ../development/python-modules/bx-py-utils { }; + bx-python = callPackage ../development/python-modules/bx-python { }; bwapy = callPackage ../development/python-modules/bwapy { }; @@ -2379,14 +2383,14 @@ self: super: with self; { dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; + dicom-numpy = callPackage ../development/python-modules/dicom-numpy { }; + dict2xml = callPackage ../development/python-modules/dict2xml { }; dictdiffer = callPackage ../development/python-modules/dictdiffer { }; dictionaries = callPackage ../development/python-modules/dictionaries { }; - dictpath = callPackage ../development/python-modules/dictpath { }; - dicttoxml = callPackage ../development/python-modules/dicttoxml { }; dicttoxml2 = callPackage ../development/python-modules/dicttoxml2 { }; @@ -2580,6 +2584,8 @@ self: super: with self; { django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; + django-login-required-middleware = callPackage ../development/python-modules/django-login-required-middleware { }; + django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; django-model-utils = callPackage ../development/python-modules/django-model-utils { }; @@ -2808,6 +2814,10 @@ self: super: with self; { dragonfly = callPackage ../development/python-modules/dragonfly { }; + drawille = callPackage ../development/python-modules/drawille { }; + + drawilleplot = callPackage ../development/python-modules/drawilleplot { }; + dremel3dpy = callPackage ../development/python-modules/dremel3dpy { }; drf-jwt = callPackage ../development/python-modules/drf-jwt { }; @@ -2931,6 +2941,10 @@ self: super: with self; { editorconfig = callPackage ../development/python-modules/editorconfig { }; + edlib = callPackage ../development/python-modules/edlib { + inherit (pkgs) edlib; + }; + edward = callPackage ../development/python-modules/edward { }; effect = callPackage ../development/python-modules/effect { }; @@ -3055,6 +3069,8 @@ self: super: with self; { espeak-phonemizer = callPackage ../development/python-modules/espeak-phonemizer { }; + esphome-dashboard-api = callPackage ../development/python-modules/esphome-dashboard-api { }; + esprima = callPackage ../development/python-modules/esprima { }; escapism = callPackage ../development/python-modules/escapism { }; @@ -3067,7 +3083,6 @@ self: super: with self; { etebase = callPackage ../development/python-modules/etebase { inherit (pkgs.darwin.apple_sdk.frameworks) Security; - openssl = pkgs.openssl_1_1; }; etebase-server = callPackage ../servers/etebase { }; @@ -3652,6 +3667,8 @@ self: super: with self; { garminconnect = callPackage ../development/python-modules/garminconnect { }; + gassist-text = callPackage ../development/python-modules/gassist-text { }; + gast = callPackage ../development/python-modules/gast { }; gatt = callPackage ../development/python-modules/gatt { }; @@ -3702,6 +3719,8 @@ self: super: with self; { gemfileparser = callPackage ../development/python-modules/gemfileparser { }; + gemfileparser2 = callPackage ../development/python-modules/gemfileparser2 { }; + genanki = callPackage ../development/python-modules/genanki { }; generic = callPackage ../development/python-modules/generic { }; @@ -4189,6 +4208,8 @@ self: super: with self; { hdate = callPackage ../development/python-modules/hdate { }; + hdf5plugin = callPackage ../development/python-modules/hdf5plugin { }; + ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; ha-philipsjs = callPackage ../development/python-modules/ha-philipsjs{ }; @@ -4305,6 +4326,8 @@ self: super: with self; { hkdf = callPackage ../development/python-modules/hkdf { }; + hledger-utils = callPackage ../development/python-modules/hledger-utils { }; + hlk-sw16 = callPackage ../development/python-modules/hlk-sw16 { }; hmmlearn = callPackage ../development/python-modules/hmmlearn { }; @@ -4745,6 +4768,8 @@ self: super: with self; { itemloaders = callPackage ../development/python-modules/itemloaders { }; + iteration-utilities = callPackage ../development/python-modules/iteration-utilities { }; + iterm2 = callPackage ../development/python-modules/iterm2 { }; itsdangerous = callPackage ../development/python-modules/itsdangerous { }; @@ -4763,10 +4788,14 @@ self: super: with self; { janus = callPackage ../development/python-modules/janus { }; + jaraco-abode = callPackage ../development/python-modules/jaraco-abode { }; + jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; + jaraco-email = callPackage ../development/python-modules/jaraco-email { }; + jaraco-context = callPackage ../development/python-modules/jaraco-context { }; jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; @@ -4775,6 +4804,8 @@ self: super: with self; { jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; + jaraco-net = callPackage ../development/python-modules/jaraco-net { }; + jaraco_stream = callPackage ../development/python-modules/jaraco_stream { }; jaraco-test = callPackage ../development/python-modules/jaraco-test { }; @@ -4795,9 +4826,6 @@ self: super: with self; { jaxlib-build = callPackage ../development/python-modules/jaxlib rec { inherit (pkgs.darwin) cctools; - buildBazelPackage = pkgs.buildBazelPackage.override { - stdenv = if stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else stdenv; - }; # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'. cudaSupport = pkgs.config.cudaSupport or false; IOKit = pkgs.darwin.apple_sdk_11_0.IOKit; @@ -4840,6 +4868,8 @@ self: super: with self; { jinja2 = callPackage ../development/python-modules/jinja2 { }; + jinja2-ansible-filters = callPackage ../development/python-modules/jinja2-ansible-filters { }; + jinja2-git = callPackage ../development/python-modules/jinja2-git { }; jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; @@ -5533,6 +5563,8 @@ self: super: with self; { lsassy = callPackage ../development/python-modules/lsassy { }; + lsprotocol = callPackage ../development/python-modules/lsprotocol { }; + luddite = callPackage ../development/python-modules/luddite { }; ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; @@ -5561,10 +5593,7 @@ self: super: with self; { lzstring = callPackage ../development/python-modules/lzstring { }; - m2crypto = callPackage ../development/python-modules/m2crypto { - # https://gitlab.com/m2crypto/m2crypto/-/issues/310 - openssl = pkgs.openssl_1_1; - }; + m2crypto = callPackage ../development/python-modules/m2crypto { }; m2r = callPackage ../development/python-modules/m2r { }; @@ -5610,6 +5639,8 @@ self: super: with self; { mailsuite = callPackage ../development/python-modules/mailsuite { }; + maison = callPackage ../development/python-modules/maison { }; + Mako = callPackage ../development/python-modules/Mako { }; malduck= callPackage ../development/python-modules/malduck { }; @@ -5901,6 +5932,8 @@ self: super: with self; { mkdocstrings-python = callPackage ../development/python-modules/mkdocstrings-python { }; + mkdocs-mermaid2-plugin = callPackage ../development/python-modules/mkdocs-mermaid2-plugin { }; + mkl-service = callPackage ../development/python-modules/mkl-service { }; ml-collections = callPackage ../development/python-modules/ml-collections { }; @@ -6153,6 +6186,8 @@ self: super: with self; { nomadnet = callPackage ../development/python-modules/nomadnet { }; + nox = callPackage ../development/python-modules/nox { }; + nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; @@ -6505,6 +6540,8 @@ self: super: with self; { objax = callPackage ../development/python-modules/objax { }; + objsize = callPackage ../development/python-modules/objsize { }; + objgraph = callPackage ../development/python-modules/objgraph { # requires both the graphviz package and python package graphvizPkgs = pkgs.graphviz; @@ -6626,6 +6663,8 @@ self: super: with self; { openrouteservice = callPackage ../development/python-modules/openrouteservice { }; + opensearch-py = callPackage ../development/python-modules/opensearch-py { }; + opensensemap-api = callPackage ../development/python-modules/opensensemap-api { }; opensfm = callPackage ../development/python-modules/opensfm { }; @@ -6754,8 +6793,6 @@ self: super: with self; { packvers = callPackage ../development/python-modules/packvers { }; - pafy = callPackage ../development/python-modules/pafy { }; - pagelabels = callPackage ../development/python-modules/pagelabels { }; paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; @@ -7040,6 +7077,8 @@ self: super: with self; { pi1wire = callPackage ../development/python-modules/pi1wire { }; + piano-transcription-inference = callPackage ../development/python-modules/piano-transcription-inference { }; + piccata = callPackage ../development/python-modules/piccata { }; pick = callPackage ../development/python-modules/pick { }; @@ -7160,6 +7199,8 @@ self: super: with self; { pyfreedompro = callPackage ../development/python-modules/pyfreedompro { }; + pygments-style-github = callPackage ../development/python-modules/pygments-style-github { }; + pygti = callPackage ../development/python-modules/pygti { }; pyheos = callPackage ../development/python-modules/pyheos { }; @@ -7656,8 +7697,6 @@ self: super: with self; { pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; - pyalmond = callPackage ../development/python-modules/pyalmond { }; - pyamg = callPackage ../development/python-modules/pyamg { }; pyaml = callPackage ../development/python-modules/pyaml { }; @@ -8199,6 +8238,8 @@ self: super: with self; { inherit (pkgs) libusb1; }; + pylibjpeg-libjpeg = callPackage ../development/python-modules/pylibjpeg-libjpeg { }; + pyliblo = callPackage ../development/python-modules/pyliblo { }; pylibmc = callPackage ../development/python-modules/pylibmc { }; @@ -8291,6 +8332,8 @@ self: super: with self; { pymediaroom = callPackage ../development/python-modules/pymediaroom { }; + pymedio = callPackage ../development/python-modules/pymedio { }; + pymeeus = callPackage ../development/python-modules/pymeeus { }; pymelcloud = callPackage ../development/python-modules/pymelcloud { }; @@ -8887,6 +8930,8 @@ self: super: with self; { pytenable = callPackage ../development/python-modules/pytenable { }; + pytensor = callPackage ../development/python-modules/pytensor { }; + pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; pytesseract = callPackage ../development/python-modules/pytesseract { }; @@ -9628,6 +9673,8 @@ self: super: with self; { pyyaml-env-tag = callPackage ../development/python-modules/pyyaml-env-tag { }; + pyyaml-include = callPackage ../development/python-modules/pyyaml-include { }; + pyzerproc = callPackage ../development/python-modules/pyzerproc { }; pyzmq = callPackage ../development/python-modules/pyzmq { }; @@ -9823,6 +9870,8 @@ self: super: with self; { rednose = callPackage ../development/python-modules/rednose { }; + redshift-connector = callPackage ../development/python-modules/redshift-connector { }; + reedsolo = callPackage ../development/python-modules/reedsolo { }; reflink = callPackage ../development/python-modules/reflink { }; @@ -9845,6 +9894,8 @@ self: super: with self; { remi = callPackage ../development/python-modules/remi { }; + remote-pdb = callPackage ../development/python-modules/remote-pdb { }; + renault-api = callPackage ../development/python-modules/renault-api { }; rencode = callPackage ../development/python-modules/rencode { }; @@ -10153,6 +10204,8 @@ self: super: with self; { safe = callPackage ../development/python-modules/safe { }; + safe-pysha3 = callPackage ../development/python-modules/safe-pysha3 { }; + safeio = callPackage ../development/python-modules/safeio { }; safety = callPackage ../development/python-modules/safety { }; @@ -10494,6 +10547,8 @@ self: super: with self; { sip_4 = callPackage ../development/python-modules/sip/4.x.nix { }; + siuba = callPackage ../development/python-modules/siuba { }; + six = callPackage ../development/python-modules/six { }; sjcl = callPackage ../development/python-modules/sjcl { }; @@ -10650,8 +10705,6 @@ self: super: with self; { somajo = callPackage ../development/python-modules/somajo { }; - somecomfort = callPackage ../development/python-modules/somecomfort { }; - somfy-mylink-synergy = callPackage ../development/python-modules/somfy-mylink-synergy { }; sonarr = callPackage ../development/python-modules/sonarr { }; @@ -10722,6 +10775,8 @@ self: super: with self; { sphinx-book-theme = callPackage ../development/python-modules/sphinx-book-theme { }; + sphinx-codeautolink = callPackage ../development/python-modules/sphinx-codeautolink { }; + sphinx-comments = callPackage ../development/python-modules/sphinx-comments { }; sphinx-design = callPackage ../development/python-modules/sphinx-design { }; @@ -10730,14 +10785,22 @@ self: super: with self; { sphinx-fortran = callPackage ../development/python-modules/sphinx-fortran { }; + sphinx-hoverxref = callPackage ../development/python-modules/sphinx-hoverxref { }; + sphinx-jupyterbook-latex = callPackage ../development/python-modules/sphinx-jupyterbook-latex { }; sphinx-multitoc-numbering = callPackage ../development/python-modules/sphinx-multitoc-numbering { }; + sphinx-notfound-page = callPackage ../development/python-modules/sphinx-notfound-page { }; + sphinx-pytest = callPackage ../development/python-modules/sphinx-pytest { }; + sphinx-prompt = callPackage ../development/python-modules/sphinx-prompt { }; + sphinx-thebe = callPackage ../development/python-modules/sphinx-thebe { }; + sphinx-tabs = callPackage ../development/python-modules/sphinx-tabs { }; + sphinx-togglebutton = callPackage ../development/python-modules/sphinx-togglebutton { }; sphinxcontrib-actdiag = callPackage ../development/python-modules/sphinxcontrib-actdiag { }; @@ -10806,6 +10869,8 @@ self: super: with self; { sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; + sphinx-jquery = callPackage ../development/python-modules/sphinx-jquery { }; + sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { }; sphinx-autodoc-typehints = callPackage ../development/python-modules/sphinx-autodoc-typehints { }; @@ -10838,6 +10903,8 @@ self: super: with self; { sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; + sphinx-version-warning = callPackage ../development/python-modules/sphinx-version-warning { }; + sphinxext-opengraph = callPackage ../development/python-modules/sphinxext-opengraph { }; spidev = callPackage ../development/python-modules/spidev { }; @@ -10888,6 +10955,8 @@ self: super: with self; { sqlsoup = callPackage ../development/python-modules/sqlsoup { }; + sqltrie = callPackage ../development/python-modules/sqltrie { }; + srp = callPackage ../development/python-modules/srp { }; srpenergy = callPackage ../development/python-modules/srpenergy { }; @@ -11198,11 +11267,13 @@ self: super: with self; { tensorflow-datasets = callPackage ../development/python-modules/tensorflow-datasets { }; - tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { }; + tensorflow-estimator-bin = callPackage ../development/python-modules/tensorflow-estimator/bin.nix { }; tensorflow-metadata = callPackage ../development/python-modules/tensorflow-metadata { }; - tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; + tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { + inherit (pkgs.darwin) cctools; + }; tensorflow = self.tensorflow-build; @@ -11375,6 +11446,8 @@ self: super: with self; { timezonefinder = callPackage ../development/python-modules/timezonefinder { }; + timm = callPackage ../development/python-modules/timm { }; + tinycss2 = callPackage ../development/python-modules/tinycss2 { }; tinycss = callPackage ../development/python-modules/tinycss { }; @@ -11470,6 +11543,8 @@ self: super: with self; { torchinfo = callPackage ../development/python-modules/torchinfo { }; + torchlibrosa = callPackage ../development/python-modules/torchlibrosa { }; + torchvision = callPackage ../development/python-modules/torchvision { }; torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { }; @@ -11570,6 +11645,8 @@ self: super: with self; { trytond = callPackage ../development/python-modules/trytond { }; + ttach = callPackage ../development/python-modules/ttach { }; + ttls = callPackage ../development/python-modules/ttls { }; ttp = callPackage ../development/python-modules/ttp { }; @@ -11845,6 +11922,8 @@ self: super: with self; { uptime = callPackage ../development/python-modules/uptime { }; + uptime-kuma-api = callPackage ../development/python-modules/uptime-kuma-api { }; + uptime-kuma-monitor = callPackage ../development/python-modules/uptime-kuma-monitor { }; uranium = callPackage ../development/python-modules/uranium { }; @@ -12052,6 +12131,8 @@ self: super: with self; { warcio = callPackage ../development/python-modules/warcio { }; + ward = callPackage ../development/python-modules/ward { }; + warlock = callPackage ../development/python-modules/warlock { }; warrant = callPackage ../development/python-modules/warrant { }; @@ -12533,8 +12614,6 @@ self: super: with self; { zimports = callPackage ../development/python-modules/zimports { }; - zipfile36 = callPackage ../development/python-modules/zipfile36 { }; - zipp = callPackage ../development/python-modules/zipp { }; zipstream = callPackage ../development/python-modules/zipstream { }; diff --git a/third_party/nixpkgs/pkgs/top-level/qt6-packages.nix b/third_party/nixpkgs/pkgs/top-level/qt6-packages.nix index e566a8af75..9d6a58cb3b 100644 --- a/third_party/nixpkgs/pkgs/top-level/qt6-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/qt6-packages.nix @@ -7,6 +7,7 @@ { lib , pkgs , qt6 +, stdenv }: (lib.makeScope pkgs.newScope ( self: @@ -24,6 +25,8 @@ let in (qt6 // { + inherit stdenv; + # LIBRARIES inherit (kdeFrameworks) kcoreaddons; diff --git a/third_party/nixpkgs/pkgs/top-level/release-cross.nix b/third_party/nixpkgs/pkgs/top-level/release-cross.nix index b8719294f9..f15349da64 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-cross.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-cross.nix @@ -34,6 +34,8 @@ let nix = nativePlatforms; nixUnstable = nativePlatforms; mesa = nativePlatforms; + rustc = nativePlatforms; + cargo = nativePlatforms; }; gnuCommon = lib.recursiveUpdate common { diff --git a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix index 4ae1a50eb7..d1bf5cf7b6 100644 --- a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix @@ -1013,10 +1013,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l6mvn60qa215rjy0zjymvjb0vcgnbi4vj9d80v4qq1n6b9ld9xy"; + sha256 = "sha256-bkSvvD2SClHJ5FyERpyqZaWp0im7NNhn+wplbmnZD84="; type = "gem"; }; - version = "1.12.0"; + version = "1.13.1"; }; github-pages = { dependencies = ["github-pages-health-check" "jekyll" "jekyll-avatar" "jekyll-coffeescript" "jekyll-commonmark-ghpages" "jekyll-default-layout" "jekyll-feed" "jekyll-gist" "jekyll-github-metadata" "jekyll-include-cache" "jekyll-mentions" "jekyll-optional-front-matter" "jekyll-paginate" "jekyll-readme-index" "jekyll-redirect-from" "jekyll-relative-links" "jekyll-remote-theme" "jekyll-sass-converter" "jekyll-seo-tag" "jekyll-sitemap" "jekyll-swiss" "jekyll-theme-architect" "jekyll-theme-cayman" "jekyll-theme-dinky" "jekyll-theme-hacker" "jekyll-theme-leap-day" "jekyll-theme-merlot" "jekyll-theme-midnight" "jekyll-theme-minimal" "jekyll-theme-modernist" "jekyll-theme-primer" "jekyll-theme-slate" "jekyll-theme-tactile" "jekyll-theme-time-machine" "jekyll-titles-from-headings" "jemoji" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "minima" "nokogiri" "rouge" "terminal-table"];